[evolution] Update Japanese translation

[Damned-Lies <translations src gnome org>]

commit f5667d1e0d54a6942170e7a5afc3396aba5f47a8
Author: sujiniku <sujinikusityuu gmail com>
Date:   Sun Mar 19 22:19:28 2017 +0000

    Update Japanese translation

 po/ja.po |26620 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 17125 insertions(+), 9495 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index dcad1ac..832f0e1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,629 +9,4260 @@
 # OKANO Takayoshi <kano na rim or jp>, 2010, 2011.
 # Shushi Kurose <md81bird hitaki net>, 2011.
 # Hideki Yamane <henrich debian org>, 2011.
+# Jiro Matsuzawa <jmatsuzawa gnome org>, 2014.
 #
-#: ../shell/main.c:554
+#: ../src/shell/main.c:519
 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: 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"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-03-08 11:50+0000\n"
+"PO-Revision-Date: 2016-04-14 17:06+0900\n"
+"Last-Translator: sujiniku <sujinikusityuu gmail com>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
-#: ../addressbook/addressbook.error.xml.h:1
+#: ../evolution.appdata.xml.in.h:1 ../data/evolution.desktop.in.in.h:1
+#: ../src/mail/e-mail-browser.c:1098
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
+#: ../src/shell/e-shell-window-private.c:240
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../evolution.appdata.xml.in.h:2 ../data/evolution.desktop.in.in.h:4
+msgid "Manage your email, contacts and schedule"
+msgstr "メールや連絡先、予定などを管理します"
+
+#: ../evolution.appdata.xml.in.h:3
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+"Evolution は個人情報管理アプリケーションで、メール、カレンダー、アドレス帳の"
+"機能を総合的に提供しています。"
+
+#: ../evolution.appdata.xml.in.h:4
+#, fuzzy
+#| 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."
+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-alarm-notify.desktop.in.in.h:1
+msgid "Evolution Alarm Notify"
+msgstr "Evolution アラーム通知"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Calendar event notifications"
+msgstr "カレンダーのイベント通知"
+
+#: ../data/evolution.desktop.in.in.h:2 ../src/shell/e-shell-utils.c:428
+msgid "Groupware Suite"
+msgstr "グループウェアスイートです。"
+
+#: ../data/evolution.desktop.in.in.h:3
+msgid "Evolution Mail and Calendar"
+msgstr "Evolution のメールとカレンダー"
+
+#: ../data/evolution.desktop.in.in.h:5
+msgid "email;calendar;contact;addressbook;task;"
+msgstr ""
+"email;calendar;contact;addressbook;task;mail;E-メール;Eメール;電子メール;電子"
+"メイル;カレンダー;暦;コンタクト;連絡先;相手;相手先;アドレス帳;電話帳;タスク;"
+"作業;仕事;"
+
+#: ../data/evolution.desktop.in.in.h:6
+msgid "New Window"
+msgstr "新しいウィンドウ"
+
+#: ../data/evolution.desktop.in.in.h:7
+#, fuzzy
+#| msgid "Compose Message"
+msgid "Compose a Message"
+msgstr "メッセージの作成"
+
+#: ../data/evolution.desktop.in.in.h:8
+#: ../src/e-util/e-name-selector-dialog.c:448
+#: ../src/modules/addressbook/e-book-shell-backend.c:303
+#: ../src/modules/addressbook/e-book-shell-view.c:371
+msgid "Contacts"
+msgstr "連絡先"
+
+#: ../data/evolution.desktop.in.in.h:9
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:833
+#: ../src/e-util/e-send-options.c:544
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
+#: ../src/modules/calendar/e-cal-shell-view.c:577
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "カレンダー"
+
+#: ../data/evolution.desktop.in.in.h:10 ../src/e-util/e-send-options.c:536
+#: ../src/mail/importers/elm-importer.c:330
+#: ../src/mail/importers/kmail-importer.c:251
+#: ../src/mail/importers/pine-importer.c:423
+#: ../src/modules/mail/e-mail-shell-view.c:1240
+#: ../src/smime/gui/certificate-manager.c:1682
+msgid "Mail"
+msgstr "メール"
+
+#: ../data/evolution.desktop.in.in.h:11 ../src/calendar/gui/e-memo-table.c:368
+#: ../src/modules/calendar/e-cal-shell-content.c:1665
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:194
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:209
+#: ../src/modules/calendar/e-memo-shell-view.c:313
+msgid "Memos"
+msgstr "メモ"
+
+#: ../data/evolution.desktop.in.in.h:12 ../src/calendar/gui/e-task-table.c:696
+#: ../src/calendar/gui/print.c:2408
+#: ../src/calendar/importers/icalendar-importer.c:77
+#: ../src/calendar/importers/icalendar-importer.c:1114
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
+#: ../src/modules/calendar/e-cal-shell-content.c:1625
+#: ../src/modules/calendar/e-task-shell-view-actions.c:218
+#: ../src/modules/calendar/e-task-shell-view-actions.c:233
+#: ../src/modules/calendar/e-task-shell-view.c:471
+msgid "Tasks"
+msgstr "タスク"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
+msgid "Enable address formatting"
+msgstr "アドレスの表示形式を有効にする"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
+msgid ""
+"Whether addresses should be formatted according to standard in their "
+"destination country"
+msgstr "アドレスを送信先の国の標準に合わせた形式にするかどうか"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
+msgid "Autocomplete length"
+msgstr "自動補完の長さ"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr "Evolution が自動補完を行う前に入力しておく必要のある文字数です。"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr "自動補完した連絡先にメールアドレスを付けるかどうか"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+"エントリで自動補完した連絡先の名前にメールアドレスを強制的に表示するかどうか"
+"です。"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
+msgid "URI for the folder last used in the select names dialog"
+msgstr "名前選択ダイアログで最後に使用したフォルダーの URI"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
+msgid "URI for the folder last used in the select names dialog."
+msgstr "名前選択ダイアログで最後に使用したフォルダーの URI です。"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
+msgid "Contact layout style"
+msgstr "連絡先のレイアウトスタイル"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
+#, fuzzy
+#| msgid ""
+#| "The layout style determines where to place the preview pane in relation "
+#| "to the contact list. \"0\" (Classic View) places the preview pane below "
+#| "the contact list. \"1\" (Vertical View) places the preview pane next to "
+#| "the contact list."
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. “0” (Classic View) places the preview pane below the "
+"contact list. “1” (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
+"レイアウトスタイルの値によって、プレビューペインは連絡先の一覧に対してどこに"
+"配置されるかが決まります。\"0\" (クラシックビュー) だとプレビューペインは連絡"
+"先の一覧の下に配置されます。\"1\" (垂直ビュー) はプレビューペインは連絡先の一"
+"覧の隣に配置されます。"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
+msgid "Contact preview pane position (horizontal)"
+msgstr "連絡先のプレビューペインの位置 (水平)"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr "水平に配置した時の連絡先のプレビューペインの位置です。"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
+msgid "Contact preview pane position (vertical)"
+msgstr "連絡先のプレビューペインの位置 (垂直)"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr "垂直に配置した時の連絡先のプレビューペインの位置です。"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
+msgid "Show maps"
+msgstr "mapを表示する"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
+msgid "Whether to show maps in preview pane"
+msgstr "プレビューペインにmapを表示するかどうか"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
+msgid "Primary address book"
+msgstr "主アドレス帳"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:18
+#, fuzzy
+#| msgid ""
+#| "The UID of the selected (or \"primary\") address book in the sidebar of "
+#| "the \"Contacts\" view"
+msgid ""
+"The UID of the selected (or “primary”) address book in the sidebar of the "
+"“Contacts” view"
+msgstr ""
+"「連絡先」ビューのサイドバーに選択されたアドレス帳 (あるいは主アドレス帳) の "
+"UID"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
+msgid "Show preview pane"
+msgstr "プレビューペインを表示するかどうか"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
+msgid "Whether to show the preview pane."
+msgstr "プレビューペインを表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
+msgid "true"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
+#, fuzzy
+#| msgid "Whether to show timezone field in the event/meeting editor"
+msgid "Whether to show phone numbers in the editor"
+msgstr "イベント/会議のエディターでタイムゾーンの項目を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show SIP addresses in the editor"
+msgstr "イベント/会議のエディターでカテゴリの項目を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show IM addresses in the editor"
+msgstr "イベント/会議のエディターでカテゴリの項目を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show mailing Home addresses in the editor"
+msgstr "イベント/会議のエディターでカテゴリの項目を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show mailing addresses Work in the editor"
+msgstr "イベント/会議のエディターでカテゴリの項目を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show mailing addresses Other in the editor"
+msgstr "イベント/会議のエディターでカテゴリの項目を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show Web Addresses in the editor"
+msgstr "イベント/会議のエディターでカテゴリの項目を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
+#, fuzzy
+#| msgid "Whether to show timezone field in the event/meeting editor"
+msgid "Whether to show job information in the editor"
+msgstr "イベント/会議のエディターでタイムゾーンの項目を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show Miscellaneous information in the editor"
+msgstr "イベント/会議のエディターでカテゴリの項目を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show notes in the editor"
+msgstr "イベント/会議のエディターでカテゴリの項目を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:32
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "Whether to show Certificates tab in the editor"
+msgstr "イベント/会議のエディターでカテゴリの項目を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "メールの本文を Unicode に変換するかどうか"
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"メールの本文を Unicode の UTF-8 に変換して、いろいろな文字集合から構成された "
+"\"スパム\" や \"ハム\" の語句を一元化するかどうかです。"
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:3
+msgid "Full path command to run Bogofilter"
+msgstr ""
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:4
+msgid ""
+"Full path to a Bogofilter command. If not set, then a compile-time path is "
+"used, usually /usr/bin/bogofilter. The command should not contain any other "
+"arguments."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
+msgid "Save directory for reminder audio"
+msgstr "リマインダー音のファイルを保存するディレクトリ"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
+msgid "Directory for saving reminder audio files"
+msgstr "リマインダー音のファイルを保存するディレクトリ"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
+msgid "Birthday and anniversary reminder value"
+msgstr "誕生日と記念日のリマインダーの値"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:4
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr "誕生日や記念日のリマインダーを決定する単位の数。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
+msgid "Birthday and anniversary reminder units"
+msgstr "誕生日と記念日のリマインダーの単位"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
+#, fuzzy
+#| msgid ""
+#| "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+#| "\"days\""
+msgid ""
+"Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
+msgstr ""
+"誕生日や記念日のリマインダーの単位。\"minutes\"、\"hours\" または \"days\"。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
+msgid "Compress weekends in month view"
+msgstr "月間ビューで週末を丸めるかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday"
+msgstr ""
+"月間ビューで週末を短く表示 (土曜日と日曜日をまとめて表示) するかどうかです。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
+msgid "Ask for confirmation when deleting items"
+msgstr "アイテムを削除する時に確認するかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
+msgid "Whether to ask for confirmation when deleting an appointment or task"
+msgstr "予定またはタスクを削除する際に確認するかどうかです。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
+msgid "Confirm expunge"
+msgstr "抹消する前に確認するかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
+msgid "Whether to ask for confirmation when expunging appointments and tasks"
+msgstr "予定とタスクを抹消 (完全に削除) する際に確認するかどうかです。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
+msgid "Month view vertical pane position"
+msgstr "月間ビューの垂直ペインの位置"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar"
+msgstr "カレンダービューとカレンダー本体とを分割する垂直ペインの位置です。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
+msgid "Workday end hour"
+msgstr "平日の終了時刻 (時)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:16
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
+msgstr "平日の終了時刻 (24時間制の書式: 0〜23) です。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
+msgid "Workday end minute"
+msgstr "平日の終了時刻 (分)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "平日の終了時刻 (分: 0〜59) です。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
+msgid "Workday start hour"
+msgstr "平日の開始時刻 (時)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr "平日の開始時刻 (24時間制の書式: 0〜23) です。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
+msgid "Workday start minute"
+msgstr "平日の開始時刻 (分)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "平日の開始時刻 (分: 0〜59) です。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
+#, fuzzy
+#| msgid "Workday start hour"
+msgid "Workday start time for Monday"
+msgstr "平日の開始時刻 (時)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+#, fuzzy
+#| msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgid ""
+"Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, "
+"or -1 to use day-start-hour and day-start-minute"
+msgstr "平日の開始時刻 (24時間制の書式: 0〜23) です。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+#, fuzzy
+#| msgid "Workday end hour"
+msgid "Workday end time for Monday"
+msgstr "平日の終了時刻 (時)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+#, fuzzy
+#| msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
+msgid ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-1 to use day-end-hour and day-end-minute"
+msgstr "平日の終了時刻 (24時間制の書式: 0〜23) です。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+#, fuzzy
+#| msgid "Workday start minute"
+msgid "Workday start time for Tuesday"
+msgstr "平日の開始時刻 (分)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+#, fuzzy
+#| msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
+msgid ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-1 to use day-start-hour and day-start-minute"
+msgstr "平日の終了時刻 (24時間制の書式: 0〜23) です。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+#, fuzzy
+#| msgid "Workday end minute"
+msgid "Workday end time for Tuesday"
+msgstr "平日の終了時刻 (分)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+#, fuzzy
+#| msgid "Workday start minute"
+msgid "Workday start time for Wednesday"
+msgstr "平日の開始時刻 (分)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+#, fuzzy
+#| msgid "Workday end minute"
+msgid "Workday end time for Wednesday"
+msgstr "平日の終了時刻 (分)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+#, fuzzy
+#| msgid "Workday start hour"
+msgid "Workday start time for Thursday"
+msgstr "平日の開始時刻 (時)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+#, fuzzy
+#| msgid "Workday end hour"
+msgid "Workday end time for Thursday"
+msgstr "平日の終了時刻 (時)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+#, fuzzy
+#| msgid "Workday start hour"
+msgid "Workday start time for Friday"
+msgstr "平日の開始時刻 (時)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+#, fuzzy
+#| msgid "Workday end hour"
+msgid "Workday end time for Friday"
+msgstr "平日の終了時刻 (時)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+#, fuzzy
+#| msgid "Workday start hour"
+msgid "Workday start time for Saturday"
+msgstr "平日の開始時刻 (時)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+#, fuzzy
+#| msgid "Workday end hour"
+msgid "Workday end time for Saturday"
+msgstr "平日の終了時刻 (時)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+#, fuzzy
+#| msgid "Workday start hour"
+msgid "Workday start time for Sunday"
+msgstr "平日の開始時刻 (時)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+#, fuzzy
+#| msgid "Workday end hour"
+msgid "Workday end time for Sunday"
+msgstr "平日の終了時刻 (時)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
+msgid "The second timezone for a Day View"
+msgstr "日間ビューで表示する2番目のタイムゾーン"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
+#, fuzzy
+#| msgid ""
+#| "Shows the second time zone in a Day View, if set. Value is similar to one "
+#| "used in a 'timezone' key"
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a “timezone” key"
+msgstr ""
+"日間ビューで表示する2番目のタイムゾーンで、'timezone' キーで指定した値と同じ"
+"形式にしてください。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
+msgid "Recently used second time zones in a Day View"
+msgstr "日間ビューで現在使用している2番目のタイムゾーン"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
+msgid "List of recently used second time zones in a Day View"
+msgstr "日間ビューで現在使用しているタイムゾーンのリストです。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
+msgid "Maximum number of recently used timezones to remember"
+msgstr "同時に使用するタイムゾーンの個数 (最大値)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
+#, fuzzy
+#| msgid ""
+#| "Maximum number of recently used timezones to remember in a 'day-second-"
+#| "zones' list"
+msgid ""
+"Maximum number of recently used timezones to remember in a “day-second-"
+"zones” list"
+msgstr ""
+"'day-second-zones' の中で同時に使用するタイムゾーンの個数 (最大値) です。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
+msgid "Default reminder value"
+msgstr "リマインダーのデフォルトの値"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
+msgid "Number of units for determining a default reminder"
+msgstr "デフォルトのリマインダーを決定する単位の数。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
+msgid "Default reminder units"
+msgstr "リマインダーの単位 (デフォルト)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
+#, fuzzy
+#| msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
+msgid "Units for a default reminder, “minutes”, “hours” or “days”"
+msgstr ""
+"デフォルトのリマインダーの単位。\"minutes\"、\"hours\" または \"days\"。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+#, fuzzy
+#| msgid "Default reminder value"
+msgid "Default reminder snooze interval, in minutes"
+msgstr "リマインダーのデフォルトの値"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+msgid ""
+"Default reminder snooze interval, in minutes, to be filled in the reminder "
+"notification dialog"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
+msgid "Show categories field in the event/meeting/task editor"
+msgstr "イベント/会議/タスクエディターの中にカテゴリを表示するかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "イベント/会議のエディターでカテゴリの項目を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "イベント/タスク/会議エディターの中に役割を表示するかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr "イベント/タスク/会議のエディターで役割の項目を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "イベント/タスク/会議エディターの中に RSVP を表示するかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "イベント/タスク/会議のエディターで RSVP の項目を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
+msgid "Show status field in the event/task/meeting editor"
+msgstr "イベント/タスク/会議エディターの中にステータスを表示するかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr ""
+"イベント/タスク/会議のエディターでステータスの項目を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
+msgid "Show timezone field in the event/meeting editor"
+msgstr "イベント/会議エディターの中にタイムゾーンを表示するかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "イベント/会議のエディターでタイムゾーンの項目を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+msgid "Show type field in the event/task/meeting editor"
+msgstr "イベント/タスク/会議エディターの中に種類を表示するかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr "イベント/タスク/会議のエディターで種類の項目を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+msgid "Hide completed tasks"
+msgstr "完了したタスクを隠すかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+msgid "Whether to hide completed tasks in the tasks view"
+msgstr "タスクビューで完了したタスクを隠すかどうかです。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+msgid "Hide task units"
+msgstr "隠すタスクの単位"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+#, fuzzy
+#| msgid ""
+#| "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days"
+#| "\""
+msgid "Units for determining when to hide tasks, “minutes”, “hours” or “days”"
+msgstr ""
+"タスクを隠すときを決定する単位。\"minutes\"、\"hours\" または \"days\"。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+msgid "Hide task value"
+msgstr "タスクの値を隠すかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+msgid "Number of units for determining when to hide tasks"
+msgstr "いつタスクを隠すかを決定する単位の数。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+msgid "Horizontal pane position"
+msgstr "水平方向ペインの位置"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels"
+msgstr ""
+"月間ビュー以外でカレンダーとタスクの一覧の間にある水平方向ペインの位置です "
+"(ピクセル単位)。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+msgid "Last reminder time"
+msgstr "最後のリマインダー時刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+msgid "Time the last reminder ran, in time_t"
+msgstr "最後にリマインダーを表示した時間 (time_t 単位) です。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+#, fuzzy
+#| msgctxt "iCalImp"
+#| msgid "has reminders"
+msgid "Allow past reminders"
+msgstr "リマインダーあり"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+msgid ""
+"Whether can show reminders for events/tasks/memos which already happened"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+#, fuzzy
+#| msgid "Marcus Bains Line Color - Day View"
+msgid "Marcus Bains Line Color — Day View"
+msgstr "Marcus Bains Line の色 - 日間ビュー"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+msgid "Color to draw the Marcus Bains line in the Day View"
+msgstr "日間ビューの中に描画する \"Marcus Bains line\" の色です。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+#, fuzzy
+#| msgid "Marcus Bains Line Color - Time bar"
+msgid "Marcus Bains Line Color — Time bar"
+msgstr "Marcus Bains Line の色 - 時間バー"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
+msgstr ""
+"時間バーの中に描画する \"Marcus Bains Line\" の色です (デフォルトは空)。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+msgid "Marcus Bains Line"
+msgstr "Marcus Bains Line を表示するかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
+msgstr ""
+"カレンダーの中に \"Marcus Bains Line\" (現在時刻での線) を描画するかどうかで"
+"す。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+msgid "Memo preview pane position (horizontal)"
+msgstr "メモのプレビューペインの位置 (水平)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+msgid "Position of the task preview pane when oriented horizontally"
+msgstr "水平方向に配置された場合のメモのプレビューペインの位置です。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
+msgid "Memo layout style"
+msgstr "メモのレイアウトスタイル"
+
+# /apps/evolution/calendar/display/memo_layout
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#, fuzzy
+#| msgid ""
+#| "The layout style determines where to place the preview pane in relation "
+#| "to the memo list. \"0\" (Classic View) places the preview pane below the "
+#| "memo list. \"1\" (Vertical View) places the preview pane next to the memo "
+#| "list"
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. “0” (Classic View) places the preview pane below the memo "
+"list. “1” (Vertical View) places the preview pane next to the memo list"
+msgstr ""
+"レイアウトスタイルの値によって、プレビューペインはメモの一覧に対してどこに配"
+"置されるかが決まります。\"0\" (クラシックビュー) だとプレビューペインはメモの"
+"一覧の下に配置されます。\"1\" (垂直ビュー) はプレビューペインはメモの一覧の隣"
+"に配置されます。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+msgid "Memo preview pane position (vertical)"
+msgstr "メモのプレビューペインの位置 (垂直)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+msgid "Position of the memo preview pane when oriented vertically"
+msgstr "垂直方向に配置された場合のメモのプレビューペインの位置です。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+msgid "Month view horizontal pane position"
+msgstr "月間ビューの水平ペインの位置"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels"
+msgstr ""
+"月間ビュー以外でビューとカレンダーとタスクの一覧の間にある水平方向ペインの位"
+"置です (ピクセル単位)。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+msgid "Scroll Month View by a week, not by a month"
+msgstr "月間ビューを月単位でなく、週単位でスクロールするかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+msgid "Whether to scroll a Month View by a week, not by a month"
+msgstr "月間ビューを月単位でなく、週単位でスクロールするかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+msgid "Reminder programs"
+msgstr "リマインダープログラム"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+msgid "Programs that are allowed to be run by reminders"
+msgstr "リマインダーが実行するプログラムです。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+msgid "Show display reminders in notification tray"
+msgstr "パネルの通知領域にリマインダーを表示するかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+msgid "Whether or not to use the notification tray for display reminders"
+msgstr ""
+"リマインダーを表示する際に \"パネルの通知領域\" を利用するかどうかです。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#, fuzzy
+#| msgid "Show display reminders in notification tray"
+msgid "Show reminder notification dialog always on top"
+msgstr "パネルの通知領域にリマインダーを表示するかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+msgid ""
+"Whether or not to show reminder notification dialog always on top. Note this "
+"works only as a hint for the window manager, which may or may not obey it."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+msgid "Preferred New button item"
+msgstr "新しいボタンの望ましい項目"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+msgid "Name of the preferred New toolbar button item"
+msgstr "新しいツールバーボタンの望ましい項目の名前"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+msgid "Primary calendar"
+msgstr "優先カレンダー"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#, fuzzy
+#| msgid ""
+#| "The UID of the selected (or \"primary\") calendar in the sidebar of the "
+#| "\"Calendar\" view"
+msgid ""
+"The UID of the selected (or “primary”) calendar in the sidebar of the "
+"“Calendar” view"
+msgstr ""
+"「カレンダー」ビューのサイドバーに表示する選択した(あるいは主)カレンダーの一"
+"覧の UID"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+msgid "Primary memo list"
+msgstr "優先メモの一覧"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#, fuzzy
+#| msgid ""
+#| "The UID of the selected (or \"primary\") memo list in the sidebar of the "
+#| "\"Memos\" view"
+msgid ""
+"The UID of the selected (or “primary”) memo list in the sidebar of the "
+"“Memos” view"
+msgstr ""
+"「メモ」ビューのサイドバーに表示する選択した(あるいは主)メモの一覧の UID"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+msgid "Primary task list"
+msgstr "優先タスクの一覧"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#, fuzzy
+#| msgid ""
+#| "The UID of the selected (or \"primary\") task list in the sidebar of the "
+#| "\"Tasks\" view"
+msgid ""
+"The UID of the selected (or “primary”) task list in the sidebar of the "
+"“Tasks” view"
+msgstr ""
+"「タスク」ビューのサイドバーに表示する選択した(あるいは主)タスクの一覧の UID"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+msgid "Free/busy template URL"
+msgstr "スケジュールテンプレートの URL"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain"
+msgstr ""
+"スケジュールデータの代替えとして使用する URL テンプレートでは、%u はメールア"
+"ドレスのユーザー部分に、%d はドメイン名にそれぞれ置き換えられます。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+msgid "Recurrent Events in Italic"
+msgstr "繰り返しの日付をイタリック体で"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+msgid "Show days with recurrent events in italic font in bottom left calendar"
+msgstr "繰り返しのイベントをカレンダーの左下にイタリック体で表示する。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+msgid "Search range for time-based searching in years"
+msgstr "年単位で時間を元に検索する範囲"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+msgid ""
+"How many years can the time-based search go forward or backward from "
+"currently selected day when searching for another occurrence; default is ten "
+"years"
+msgstr ""
+"他の出来事を検索するときに現在選択している日を基準に前後何年間を検索対象とす"
+"るか。デフォルトは10年です。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+msgid "Show appointment end times in week and month views"
+msgstr "週間と月間ビューの中に予定の期日を表示するかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+msgid "Whether to display the end time of events in the week and month views"
+msgstr "週間と月間ビューで予定の期日を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#, fuzzy
+#| msgid "Show appointment end times in week and month views"
+msgid "Show appointment icons in the month view"
+msgstr "週間と月間ビューの中に予定の期日を表示するかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#, fuzzy
+#| msgid ""
+#| "Whether to display the end time of events in the week and month views"
+msgid "Whether to show icons of events in the month view"
+msgstr "週間と月間ビューで予定の期日を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+msgid "Show the memo preview pane"
+msgstr "メモのプレビューペインを表示"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#, fuzzy
+#| msgid "If \"true\", show the memo preview pane in the main window"
+msgid "If “true”, show the memo preview pane in the main window"
+msgstr ""
+"\"true\" ならば、メインウインドウにメモのプレビューペインを表示します。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+msgid "Show the task preview pane"
+msgstr "タスクのプレビューペインを表示"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#, fuzzy
+#| msgid "If \"true\", show the task preview pane in the main window"
+msgid "If “true”, show the task preview pane in the main window"
+msgstr ""
+"\"true\" ならば、メインウインドウにタスクのプレビューペインを表示します。"
+
+# 翻訳メモ: "Date Navigator" は "Date Navigator Calendar" の略か?
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "日間ビューと平日ビューとカレンダーで週番号を表示するかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+msgid "Whether to show week numbers in various places in the Calendar"
+msgstr "カレンダーの各所に週番号を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+msgid "Vertical position for the tag pane"
+msgstr "タグペインの垂直方向の位置"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+msgid "Highlight tasks due today"
+msgstr "今日が期限のタスクの強調表示"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+msgid ""
+"Whether highlight tasks due today with a special color (task-due-today-color)"
+msgstr ""
+"今日が期限のタスクを特別な色で強調表示するかどうか (task-due-today-color)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+msgid "Tasks due today color"
+msgstr "今日が期限のタスクの色"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#, fuzzy
+#| msgid ""
+#| "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
+#| "together with task-due-today-highlight"
+msgid ""
+"Background color of tasks that are due today, in “#rrggbb” format. Used "
+"together with task-due-today-highlight"
+msgstr ""
+"今日が期限のタスクの背景色です (書式は \"#rrggbb\")。task-due-today-"
+"highlight と組み合わせて使われます。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+msgid "Task preview pane position (horizontal)"
+msgstr "タスクのプレビューペインの位置 (水平)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+msgid "Task layout style"
+msgstr "タスクのレイアウトスタイル"
+
+# /apps/evolution/calendar/display/task_layout
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#, fuzzy
+#| msgid ""
+#| "The layout style determines where to place the preview pane in relation "
+#| "to the task list. \"0\" (Classic View) places the preview pane below the "
+#| "task list. \"1\" (Vertical View) places the preview pane next to the task "
+#| "list"
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. “0” (Classic View) places the preview pane below the task "
+"list. “1” (Vertical View) places the preview pane next to the task list"
+msgstr ""
+"レイアウトスタイルの値によって、プレビューペインはタスクの一覧に対してどこに"
+"配置されるかが決まります。\"0\" (クラシックビュー) だとプレビューペインはタス"
+"クの一覧の下に配置されます。\"1\" (垂直ビュー) ではプレビューペインはタスクの"
+"一覧の隣に配置されます。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+msgid "Task preview pane position (vertical)"
+msgstr "タスクのプレビューペインの位置 (垂直)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+msgid "Position of the task preview pane when oriented vertically"
+msgstr "垂直方向に配置された場合のタスクプレビューのペインの位置です。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#, fuzzy
+#| msgid "Hide completed tasks"
+msgid "Show reminders for completed tasks"
+msgstr "完了したタスクを隠すかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+msgid ""
+"Whether to show reminders for completed tasks. When set to false, reminders "
+"for completed tasks are suppressed."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+msgid "Highlight overdue tasks"
+msgstr "期限を過ぎたタスクの色"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+msgid ""
+"Whether highlight overdue tasks with a special color (task-overdue-color)"
+msgstr ""
+"期限を過ぎたタスクを特別な色で強調表示するかどうか (task-overdue-color)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
+msgid "Overdue tasks color"
+msgstr "期限を過ぎたタスクの色"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
+#, fuzzy
+#| msgid ""
+#| "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
+#| "together with task-overdue-highlight."
+msgid ""
+"Background color of tasks that are overdue, in “#rrggbb” format. Used "
+"together with task-overdue-highlight."
+msgstr ""
+"期限が過ぎたタスクの背景色です (書式は \"#rrggbb\")。task-overdue-highlight "
+"と組み合わせて使われます。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
+msgid "Time divisions"
+msgstr "時分割の単位"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+msgid "Intervals shown in Day and Work Week views, in minutes"
+msgstr "日間と平日ビューで表示する時間の間隔 (分単位) です。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
+msgid "Timezone"
+msgstr "タイムゾーン"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
+#, fuzzy
+#| msgid ""
+#| "The default timezone to use for dates and times in the calendar, as an "
+#| "untranslated Olson timezone database location like \"America/New York\""
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olson timezone database location like “America/New York”"
+msgstr ""
+"カレンダーの日付と時刻で使用するタイムゾーンのデフォルト値で、Olsen タイム"
+"ゾーンデータベースの場所 (例: \"America/New York\") です。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
+msgid "Twenty four hour time format"
+msgstr "時刻の書式を24時間制にするかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
+msgid "Whether to show times in twenty four hour format instead of using am/pm"
+msgstr "時刻を午前/午後の代わりに 24時間制で表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
+msgid "Birthday and anniversary reminder"
+msgstr "誕生日と記念日のリマインダー"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr "誕生日や記念日にリマインダーを指定するかどうか。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
+msgid "Default appointment reminder"
+msgstr "デフォルトで予定のリマインダーを指定するかどうか"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
+msgid "Whether to set a default reminder for appointments"
+msgstr "予定にデフォルトのリマインダーを指定するかどうかです。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
+msgid "Use system timezone"
+msgstr "システムのタイムゾーンを使用する"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+msgid "Use the system timezone instead of the timezone selected in Evolution"
+msgstr ""
+"Evolution で選択したタイムゾーンではなく、システムのタイムゾーンを使用する"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
+msgid "First day of the week"
+msgstr "週の開始日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
+msgid "Monday is a work day"
+msgstr "月曜日は作業日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
+msgid "Tuesday is a work day"
+msgstr "火曜日は作業日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
+msgid "Wednesday is a work day"
+msgstr "水曜日は作業日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+msgid "Thursday is a work day"
+msgstr "木曜日は作業日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+msgid "Friday is a work day"
+msgstr "金曜日は作業日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
+msgid "Saturday is a work day"
+msgstr "土曜日は作業日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
+msgid "Sunday is a work day"
+msgstr "日曜日は作業日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
+msgid "Create events, memos and tasks as Private by default"
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
+msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
+msgstr ""
+"(非推奨) 一週間の始まりを表す曜日で、日曜日 (0) から土曜日 (6) で指定します。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
+#, fuzzy
+#| msgid ""
+#| "This key was deprecated in version 3.10 and should no longer be used. Use "
+#| "\"week-start-day-name\" instead."
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"“week-start-day-name” instead."
+msgstr ""
+"このキーはバージョン 3.10 で非推奨となっていて、もう使うべきではありませ"
+"ん。\"week-start-day-name\" を代わりに使ってください。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:162
+msgid "(Deprecated) Work days"
+msgstr "(非推奨) 作業日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:163
+#, fuzzy
+#| msgid ""
+#| "Days on which the start and end of work hours should be indicated. (This "
+#| "key was deprecated in version 3.10 and should no longer be used. Use the "
+#| "\"work-day-monday\", \"work-day-tuesday\", etc. keys instead.)"
+msgid ""
+"Days on which the start and end of work hours should be indicated. (This key "
+"was deprecated in version 3.10 and should no longer be used. Use the “work-"
+"day-monday”, “work-day-tuesday”, etc. keys instead.)"
+msgstr ""
+"平日の開始/終了時刻を表示する日数です。(このキーはバージョン 3.10 で非推奨と"
+"なっていて、もう使うべきではありません。\"work-day-monday\" や \"work-day-"
+"tuesday\" 等のキーを代わりに使ってください。)"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:1
+msgid "Previous Evolution version"
+msgstr "Evolution の以前のバージョン"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:2
+#, fuzzy
+#| msgid ""
+#| "The most recently used version of Evolution, expressed as \"major.minor."
+#| "micro\". This is used for data and settings migration from older to newer "
+#| "versions."
+msgid ""
+"The most recently used version of Evolution, expressed as “major.minor."
+"micro”. This is used for data and settings migration from older to newer "
+"versions."
+msgstr ""
+"これは最も最近まで利用していた Evolution のバージョンで、\"主.副.細\" の形式"
+"で表します。これは古いバージョンからもっと新しいバージョンにデータや設定を移"
+"行するのに利用されます。"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:3
+msgid "List of disabled plugins"
+msgstr "無効にされているプラグイン一覧"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:4
+msgid "The list of disabled plugins in Evolution"
+msgstr "Evolution で無効にされているプラグインの一覧"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:5
+#, fuzzy
+#| msgid "The window's X coordinate"
+msgid "The window’s X coordinate"
+msgstr "デフォルトのウィンドウの横方向の統合"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:6
+#, fuzzy
+#| msgid "The window's Y coordinate"
+msgid "The window’s Y coordinate"
+msgstr "デフォルトのウィンドウの縦方向の統合"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:7
+#, fuzzy
+#| msgid "The window's width in pixels"
+msgid "The window’s width in pixels"
+msgstr "ウィンドウの幅 (単位ピクセル)"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:8
+#, fuzzy
+#| msgid "The window's height in pixels"
+msgid "The window’s height in pixels"
+msgstr "ウィンドウの高さ (単位ピクセル)"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:9
+msgid "Whether the window is maximized"
+msgstr "ウィンドウが最大化されているかどうか"
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
+#, fuzzy
+#| msgid "Gnome Calendar's calendar import done"
+msgid "GNOME Calendar’s calendar import done"
+msgstr "Gnome Calendar のカレンダー取り込み完了"
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
+#, fuzzy
+#| msgid "Whether calendar from Gnome Calendar has been imported or not"
+msgid "Whether calendar from GNOME Calendar has been imported or not"
+msgstr "Gnome Calendar からのカレンダー取り込みが完了しているかどうか"
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
+#, fuzzy
+#| msgid "Gnome Calendar's tasks import done"
+msgid "GNOME Calendar’s tasks import done"
+msgstr "Gnome Calendar のタスク取り込み完了"
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
+#, fuzzy
+#| msgid "Whether tasks from Gnome Calendar have been imported or not"
+msgid "Whether tasks from GNOME Calendar have been imported or not"
+msgstr "Gnome Calendar からのタスク取り込みが完了しているかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "デフォルトのメーラーをチェックするかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "Evolution を起動するたびに、デフォルトのメーラーかどうかを確認します。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
+msgid "Default charset in which to compose messages"
+msgstr "メッセージ作成時のデフォルトの文字集合"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
+#, fuzzy
+#| msgid "Default charset in which to compose messages."
+msgid "Default charset in which to compose messages. Uses UTF-8, if not set."
+msgstr "メッセージを作成する際に使用するデフォルトの文字集合です。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
+#, fuzzy
+#| msgid "_Show the photograph of sender in the message preview"
+msgid "Name of the editor to prefer in the message composer"
+msgstr "プレビュー時に送信者の写真を表示する(_S)"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
+msgid ""
+"If the name doesn’t correspond to any known editor, then the built-in WebKit "
+"editor is used."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
+msgid "Path where picture gallery should search for its content"
+msgstr "画像ギャラリの内容を検索する場所のパス"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
+#, fuzzy
+#| msgid ""
+#| "This value can be an empty string, which means it'll use the system "
+#| "Picture folder, usually set to ~/Pictures. This folder will be also used "
+#| "when the set path is not pointing to the existent folder"
+msgid ""
+"This value can be an empty string, which means it’ll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder"
+msgstr ""
+"この値は空文字列でも構いません。その場合はシステムの画像フォルダー (普通は ~/"
+"Pictures ) を使います。指定されたパスが存在していないフォルダーを指していた場"
+"合にも使われます。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
+msgid "Spell check inline"
+msgstr "インラインでスペルをチェックするかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
+msgid "Draw spelling error indicators on words as you type."
+msgstr "必要であれば入力した単語の上にスペル間違いを表すマークを描画します。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
+msgid "Automatic link recognition"
+msgstr "リンクを自動的に識別するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
+msgid "Recognize links in text and replace them."
+msgstr "文字列の中に含まれているリンク情報を識別して URI タグで置き換えます。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+msgid "Automatic emoticon recognition"
+msgstr "顔文字を自動的に識別するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+msgid ""
+"Recognize emoticons in text and replace them with images or Unicode "
+"characters."
+msgstr ""
+"文字列の中に含まれている顔文字の情報を識別して画像またはユニコードに置き換え"
+"るかどうかです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+msgid "Unicode emoticons"
+msgstr "Unicode 顔文字"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+msgid "Use Unicode characters for emoticons."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+msgid "Attribute message"
+msgstr "属性メッセージ"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author"
+msgstr ""
+"メッセージに返信する時に挿入されるテキストで、元のメッセージの送信者を表わす"
+"メッセージです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+msgid "Forward message"
+msgstr "転送メッセージ"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows"
+msgstr ""
+"メッセージを転送する時に挿入されるテキスト。続きに転送しようとするメッセージ"
+"があることを示すものです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
+msgid "Original message"
+msgstr "オリジナルのメッセージ。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows"
+msgstr ""
+"メッセージに返信する時に挿入されるテキスト。続きに元のメッセージがあることを"
+"示すものです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
+msgid "Group Reply replies to list"
+msgstr "「グループに返信」でメーリングリストへ返信"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
+#, fuzzy
+#| msgid ""
+#| "Instead of the normal \"Reply to All\" behaviour, this option will make "
+#| "the 'Group Reply' toolbar button try to reply only to the mailing list "
+#| "through which you happened to receive the copy of the message to which "
+#| "you're replying."
+msgid ""
+"Instead of the normal “Reply to All” behaviour, this option will make the "
+"“Group Reply” toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you’re "
+"replying."
+msgstr ""
+"通常の「全員へ返信」の動作の代わりに、このオプションではツールバーの「グルー"
+"プへ返信」のボタンをメーリングリストにのみ返信できるようにします。それによっ"
+"てメーリングリスト経由で返信したメールのメッセージのコピーを受け取ってしまっ"
+"たりしないようにします。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+msgid "Put the cursor at the bottom of replies"
+msgstr "返信時は最下部で入力を開始する"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
+msgstr ""
+"ユーザーはメッセージに返信するとき、カーソルがどこにいってしまったのかに対し"
+"てとても神経質です。これはカーソルがメッセージの上か、それとも下のどちらに移"
+"動するかを決定します。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
+msgid "Always request read receipt"
+msgstr "常に開封通知を要求するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr "デフォルトですべてのメッセージに開封通知の要求を追加するかどうかです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
+msgid "Send HTML mail by default"
+msgstr "デフォルトで HTML メールを送信するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
+msgid "Send HTML mail by default."
+msgstr "デフォルトで HTML 形式のメールを送信するかどうかです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
+msgid "Spell checking languages"
+msgstr "スペルをチェックする言語"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+msgid "List of dictionary language codes used for spell checking."
+msgstr "スペルチェックで使用する辞書の言語コードを要素とするリストです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+#, fuzzy
+#| msgid "Show \"Bcc\" field when sending a mail message"
+msgid "Show “Bcc” field when sending a mail message"
+msgstr "メールを送る時に \"Bcc\" フィールドを表示する"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#, fuzzy
+#| msgid ""
+#| "Show the \"Bcc\" field when sending a mail message. This is controlled "
+#| "from the View menu when a mail account is chosen."
+msgid ""
+"Show the “Bcc” field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"メールを送る時に、\"Bcc\" フィールドを表示します。メールのアカウントを選択し"
+"た時に、「表示」メニューからコントロールできます。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#, fuzzy
+#| msgid "Show \"Cc\" field when sending a mail message"
+msgid "Show “Cc” field when sending a mail message"
+msgstr "メールを送る時に \"Cc\" フィールドを表示する"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#, fuzzy
+#| msgid ""
+#| "Show the \"Cc\" field when sending a mail message. This is controlled "
+#| "from the View menu when a mail account is chosen."
+msgid ""
+"Show the “Cc” field when sending a mail message. This is controlled from the "
+"View menu when a mail account is chosen."
+msgstr ""
+"メールを送る時に、\"Cc\" フィールドを表示します。メールのアカウントを選択した"
+"時に、「表示」メニューからコントロールできます。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#, fuzzy
+#| msgid "Show \"Cc\" field when sending a mail message"
+msgid "Show “From” override field when sending a mail message"
+msgstr "メールを送る時に \"Cc\" フィールドを表示する"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#, fuzzy
+#| msgid ""
+#| "Show the \"Cc\" field when sending a mail message. This is controlled "
+#| "from the View menu when a mail account is chosen."
+msgid ""
+"Show the “From” override field when sending a mail message. This is "
+"controlled from the View menu when a mail account is chosen."
+msgstr ""
+"メールを送る時に、\"Cc\" フィールドを表示します。メールのアカウントを選択した"
+"時に、「表示」メニューからコントロールできます。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#, fuzzy
+#| msgid "Show \"Reply To\" field when sending a mail message"
+msgid "Show “Reply To” field when sending a mail message"
+msgstr "メールを送信する時に \"Reply To\" フィールドを表示する"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#, fuzzy
+#| msgid ""
+#| "Show the \"Reply To\" field when sending a mail message. This is "
+#| "controlled from the View menu when a mail account is chosen."
+msgid ""
+"Show the “Reply To” field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
+"メールを送る時に、\"Reply-To\" フィールドを表示します。メールのアカウントを選"
+"択した時に、「表示」メニューからコントロールできます。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#, fuzzy
+#| msgid "Show \"From\" field when posting to a newsgroup"
+msgid "Show “From” field when posting to a newsgroup"
+msgstr "ニュースグループに投稿する時に \"From\" フィールドを表示する"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#, fuzzy
+#| msgid ""
+#| "Show the \"From\" field when posting to a newsgroup. This is controlled "
+#| "from the View menu when a news account is chosen."
+msgid ""
+"Show the “From” field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+"ニュースグループに投稿する時に、\"From\" フィールドを表示します。NetNews のア"
+"カウントを選択した時に、「表示」メニューからコントロールできます。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#, fuzzy
+#| msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgid "Show “Reply To” field when posting to a newsgroup"
+msgstr "ニュースグループに投稿する時に \"Reply To\" フィールドを表示する"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#, fuzzy
+#| msgid ""
+#| "Show the \"Reply To\" field when posting to a newsgroup. This is "
+#| "controlled from the View menu when a news account is chosen."
+msgid ""
+"Show the “Reply To” field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+"ニュースグループに投稿する時に、\"Reply-To\" フィールドを表示します。NetNews "
+"のアカウントを選択した時に、「表示」メニューからコントロールできます。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+msgid "Digitally sign replies when the original message is signed"
+msgstr "オリジナルのメッセージが署名されている場合デジタル署名して返信する"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+msgid ""
+"Automatically enable PGP or S/MIME signatures when replying to a message "
+"which is also PGP or S/MIME signed."
+msgstr ""
+"PGP や S/MIME で署名されているメッセージに返信する場合は自動で PGP や S/MIME "
+"署名を有効にします。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+msgid "Encode filenames in an Outlook/GMail way"
+msgstr "Outlook/GMail 同様にエンコードしたファイル名を使用するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+msgid ""
+"Encode filenames in the mail headers same as Outlook or GMail do, to let "
+"them display correctly filenames with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
+msgstr ""
+"メールのヘッダー中のファイル名を Outlook や GMail と同じ方法でエンコードし、"
+"Evolution から送る UTF-8 の文字のファイル名が Outlook や GMail でも正しく表示"
+"できるようにします。Outlook や GMailは RFC 2231 の規格には準拠していません"
+"が、不正確な RFC 2047 の規格を使っています。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+msgid "Send messages through Outbox folder"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+msgid ""
+"Always save messages to Outbox folder when sending, to let a user choose "
+"when the messages should be sent."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+msgid "Put personalized signatures at the top of replies"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+msgstr ""
+"ユーザーはメッセージに返信するとき、署名がどこにいってしまったのかに対してと"
+"ても神経質です。これは署名がメッセージの上か、それとも下のどちらに配置される"
+"かを決定します。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+msgid "Do not add signature delimiter"
+msgstr "署名の区切りを追加しない"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr "メール作成時に署名の前に区切り文字を付加したくない時に、TRUE にします"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+msgid "Ignore list Reply-To:"
+msgstr "メーリングリストの Reply-To: を無視"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#, fuzzy
+#| msgid ""
+#| "Some mailing lists set a Reply-To: header to trick users into sending "
+#| "replies to the list, even when they ask Evolution to make a private "
+#| "reply. Setting this option to TRUE will attempt to ignore such Reply-To: "
+#| "headers, so that Evolution will do as you ask it. If you use the private "
+#| "reply action, it will reply privately, while if you use the 'Reply to "
+#| "List' action it will do that. It works by comparing the Reply-To: header "
+#| "with a List-Post: header, if there is one."
+msgid ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the “Reply to List” action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+msgstr ""
+"メーリングリストによっては、Evolution で私信として返信しようとしても、メーリ"
+"ングリストの側で Reply-To: ヘッダーを付けてユーザーの返信をメーリングリスト自"
+"身に宛てるよう誘導しています。このオプションを TRUE にすると、そのような "
+"Reply-To: ヘッダーを無視し、Evolution があなたにどうするのかを確認するように"
+"なります。私信として返信するように選択した場合、私信として返信が送られます。"
+"一方、「メーリングリストに返信」を選択すると、そうなります。これは Reply-To: "
+"ヘッダーと、List-Post: ヘッダーが存在しているならば、それらを比較することで実"
+"現されます。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#, fuzzy
+#| msgid "List of localized 'Re'"
+msgid "List of localized “Re”"
+msgstr "'Re' の地域化一覧"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#, fuzzy
+#| msgid ""
+#| "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
+#| "text when replying to a message, as an addition to the standard \"Re\" "
+#| "prefix. An example is 'SV,AV'."
+msgid ""
+"Comma-separated list of localized “Re” abbreviations to skip in a subject "
+"text when replying to a message, as an addition to the standard “Re” prefix. "
+"An example is “SV,AV”."
+msgstr ""
+"メッセージに返信するときに件名のテキストとして使う略語 'Re' を地域化した語"
+"が、標準的な \"Re\" 以外にあればその一覧をコンマ区切りで。例としては 'SV,AV' "
+"等。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#, fuzzy
+#| msgid "List of localized 'Re'"
+msgid "List of localized “Re” separators"
+msgstr "'Re' の地域化一覧"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#, fuzzy
+#| msgid ""
+#| "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
+#| "text when replying to a message, as an addition to the standard \"Re\" "
+#| "prefix. An example is 'SV,AV'."
+msgid ""
+"A list of localized “Re” separators, used to skip in a subject text when "
+"replying to a message, as an addition to the standard “:” and the Unicode "
+"“︰” separators."
+msgstr ""
+"メッセージに返信するときに件名のテキストとして使う略語 'Re' を地域化した語"
+"が、標準的な \"Re\" 以外にあればその一覧をコンマ区切りで。例としては 'SV,AV' "
+"等。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+msgid "Number of characters for wrapping"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+msgid "Will autowrap lines after given number of characters."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+msgid ""
+"Number of To and CC recipients to ask “prompt-on-many-to-cc-recips” from"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+msgid ""
+"When to ask, when the number of To and CC recipients reaches this value."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+msgid ""
+"If set to “true”, the Sign and Encrypt buttons for either PGP or S/MIME are "
+"always shown in the composer’s toolbar. Otherwise they are shown only when "
+"being used."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+msgid "Wrap quoted text in replies"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+msgid "If set to “true” quoted text in replies will be wrapped."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+msgid "Whether to obey Content-Disposition:inline message header hint"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+msgid ""
+"Set to “false” to block automatic display of attachments with Content-"
+"Disposition: inline."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+msgid "Save file format for drag-and-drop operation"
+msgstr "ドラッグ & ドロップ操作で保存する場合のファイル形式"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#, fuzzy
+#| msgid "Can be either 'mbox' or 'pdf'."
+msgid "Can be either “mbox” or “pdf”."
+msgstr "'mbox' または 'pdf' が使えます。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+msgid "Show image animations"
+msgstr "アニメーションを表示する"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+"HTML メールでアニメーション画像を有効にする。多くのユーザーはアニメーション画"
+"像を鬱陶しいと感じ、静止画像を好みます。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+msgid "Enable or disable type ahead search feature"
+msgstr "インクリメンタル検索の機能を有効にするかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
+msgstr ""
+"フォルダーの対話的な検索ができるようにサイドバーでの検索機能を有効にする。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+msgid "Enable or disable magic space bar"
+msgstr "マジックスペースバーを有効にするかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+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:79
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr "すべてのフォルダーに同様のメッセージの一覧ビューの設定を使う"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr ""
+"これを有効にすると、すべてのフォルダーに同様のメッセージの一覧ビューの設定を"
+"使うようになります。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#, fuzzy
+#| msgid "Mark citations in the message \"Preview\""
+msgid "Mark citations in the message “Preview”"
+msgstr "メッセージの \"プレビュー\" で引用符を表示するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#, fuzzy
+#| msgid "Mark citations in the message \"Preview\"."
+msgid "Mark citations in the message “Preview”."
+msgstr "メッセージの \"プレビュー\" で引用符を使用するかどうかです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+msgid "Citation highlight color"
+msgstr "引用を強調表示する時の色"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+msgid "Citation highlight color."
+msgstr "引用を強調表示する時の色です。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+msgid "Enable/disable caret mode"
+msgstr "キャレットモードにするかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+"キャレットモードを有効にするかどうかです (有効にするとメールを読む際にカーソ"
+"ルが表示されます)。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+msgid "Default charset in which to display messages"
+msgstr "メッセージ表示時のデフォルトの文字集合"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+msgid "Default charset in which to display messages."
+msgstr "メッセージを表示する際に使用するデフォルトの文字集合です。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+msgid "Automatically load images for HTML messages over HTTP"
+msgstr "HTML のメッセージにある画像を自動で読み込むかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+msgid "Show notification about missing remote content"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+msgid ""
+"When the message preview shows a message which requires to download remote "
+"content, while the download is not allowed for the user or the site, then "
+"show a notification about it on top of the preview panel."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+msgid "Show Animations"
+msgstr "アニメーションを表示するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+msgid "Show animated images as animations."
+msgstr "アニメーション画像を動かします。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+msgid "Show all message headers"
+msgstr "すべてのメッセージヘッダーを表示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+msgid "Show all the headers when viewing a messages."
+msgstr "メッセージを表示する時にすべてのヘッダーを表示します。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+msgid "List of headers to show when viewing a message."
+msgstr "メッセージを表示する時に表示するヘッダー一覧。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+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:98
+msgid "Show photo of the sender"
+msgstr "送信者の FACE を表示するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+msgid "Show the photo of the sender in the message reading pane."
+msgstr "メッセージのプレビューに送信者の FACE を表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#, fuzzy
+#| msgid "Show photo of the sender"
+msgid "Search gravatar.com for photo of the sender"
+msgstr "送信者の FACE を表示するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+msgid "Allow searching also at gravatar.com for photo of the sender."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+msgid "Mark as Seen after specified timeout"
+msgstr "指定した時間が経過したら既読マークを付与するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+msgid "Mark as Seen after specified timeout."
+msgstr "指定した時間が経過したら既読マークを付与するかどうかです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#, fuzzy
+#| msgid "Mark as Seen after specified timeout"
+msgid "Mark as Seen always after specified timeout"
+msgstr "指定した時間が経過したら既読マークを付与するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+msgid ""
+"If set to true, the selected message will be set as unread after the timeout "
+"also after the folder change."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+msgid "Timeout for marking messages as seen"
+msgstr "既読マークを付与するまでの時間"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+msgid "Timeout in milliseconds for marking messages as seen."
+msgstr "メッセージを選択してから既読マークを付与するまでの時間(ミリ秒)です。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#, fuzzy
+#| msgid "Show Attachment _Bar"
+msgid "Show Attachment Bar"
+msgstr "添付ファイルバーを表示する(_B)"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+msgid ""
+"Show Attachment Bar below the message preview pane when the message has "
+"attachments."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+msgid "Sender email-address column in the message list"
+msgstr "メッセージの一覧に差出人のアドレスを表示するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+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:112
+msgid "Show deleted messages in the message-list"
+msgstr "メッセージの一覧に削除したメッセージを表示するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+"メッセージの一覧に削除したメッセージを (打ち消し線を付けて) 表示するかどうか"
+"です。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#, fuzzy
+#| msgid "Show deleted messages in the message-list"
+msgid "Show junk messages in the message-list"
+msgstr "メッセージの一覧に削除したメッセージを表示するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#, fuzzy
+#| msgid "Show deleted messages (with a strike-through) in the message-list."
+msgid "Show junk messages (with a red strike-through) in the message-list."
+msgstr ""
+"メッセージの一覧に削除したメッセージを (打ち消し線を付けて) 表示するかどうか"
+"です。"
+
+# "検索フォルダ"は適訳ではない
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+msgid "Enable Unmatched search folder"
+msgstr "一致していない仮想フォルダーを有効にするかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+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:118
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "フォルダー毎のプレビューを隠し選択を解除するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#, fuzzy
+#| 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."
+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:120
+msgid "Height of the message-list pane"
+msgstr "メッセージの一覧ペインのウィンドウの高さ"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+msgid "Height of the message-list pane."
+msgstr "メッセージの一覧ペインのウィンドウの高さです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+msgid "Whether message headers are collapsed in the user interface"
+msgstr ""
+"ユーザーインターフェース内でメッセージのヘッダーを畳んだ状態にするかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+msgid "Width of the message-list pane"
+msgstr "メッセージの一覧ペインの幅"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+msgid "Width of the message-list pane."
+msgstr "メッセージの一覧ペインの幅です。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+msgid "Layout style"
+msgstr "レイアウトスタイル"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#, fuzzy
+#| 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."
+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:127
+msgid "Variable width font"
+msgstr "可変幅のフォント"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+msgid "The variable width font for mail display."
+msgstr "メールを表示する際の可変幅フォントです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+msgid "Terminal font"
+msgstr "端末のフォント"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+msgid "The terminal font for mail display."
+msgstr "メールを表示する際の固定幅フォントです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+msgid "Use custom fonts"
+msgstr "カスタムフォントを使用するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+msgid "Use custom fonts for displaying mail."
+msgstr "メールを表示する際に独自のフォントを使用するかどうかです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+msgid "Compress display of addresses in TO/CC/BCC"
+msgstr "差出人/Cc/Bcc でメールアドレスの表示を隠すかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+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:135
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr "差出人/Cc/Bcc で表示を制限するメールアドレスの個数"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#, fuzzy
+#| msgid ""
+#| "This sets the number of addresses to show in default message list view, "
+#| "beyond which a '...' is shown."
+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:137
+msgid "Thread the message-list based on Subject"
+msgstr "メッセージの一覧を件名でスレッド表示するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+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:139
+msgid "Default value for thread expand state"
+msgstr "デフォルトでスレッドを展開した状態にするかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+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:141
+msgid "Whether sort threads based on latest message in that thread"
+msgstr "スレッドの中にあるメールを最新のメッセージを基点に並べ替えるかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#, fuzzy
+#| 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."
+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 の再起動が必要になります。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+msgid "Whether sort thread children always ascending"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#, fuzzy
+#| 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."
+msgid ""
+"This setting specifies whether the thread children should be sorted always "
+"ascending, rather than using the same sort order as in the thread root level."
+msgstr ""
+"スレッドの中にある最新のメッセージを基点にすべてのスレッドを並べ替えるかどう"
+"かを指定します。変更したら Evolution の再起動が必要になります。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+msgid "Sort accounts alphabetically in a folder tree"
+msgstr "フォルダーツリーでアカウントをアルファベット順にする"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+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」の例外を除いて、アル"
+"ファベット順にユーザーにより指定された順序で並べ替えられます。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+msgid "Log filter actions"
+msgstr "ログをフィルタリングするかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+msgid "Log filter actions to the specified log file."
+msgstr ""
+"指定したログファイルに対してログのフィルタリング処理を行うかどうかです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+msgid "Logfile to log filter actions"
+msgstr "フィルタリングするログファイル"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+msgid "Logfile to log filter actions."
+msgstr "フィルタリング処理の対象となるログファイルです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+msgid "Flush Outbox after filtering"
+msgstr "フィルターした後、送信トレイを空にする"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#, fuzzy
+#| 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."
+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:153
+msgid "Default forward style"
+msgstr "デフォルトの転送スタイル"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+msgid "Default reply style"
+msgstr "デフォルトの返信スタイル"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#, fuzzy
+#| msgid ""
+#| "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message with a key "
+"accelerator."
+msgstr "送信するメールの件名が空の場合は送信前に警告するかどうかです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+msgid "Prompt on empty subject"
+msgstr "件名が空の場合は警告するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+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:159
+msgid "Prompt when emptying the trash"
+msgstr "ゴミ箱を空にするときに確認"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+msgid "Prompt the user when he or she tries to empty the trash."
+msgstr "ゴミ箱を空にしようとしたときにユーザーに警告するかどうかです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+msgid "Prompt when user expunges"
+msgstr "完全に削除する場合は警告するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr "フォルダーを完全に抹消する前にユーザーに警告するかどうかです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr "受信者としてメールアドレスが入力されていないのに送ろうとする前に確認"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+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:165
+msgid "Prompt when user only fills Bcc"
+msgstr "ユーザーが Bcc しか入力なかったら警告するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+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:167
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr "HTML をユーザーが送信する前に警告するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+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:169
+msgid "Prompt when user tries to open 10 or more messages at once"
+msgstr "10 通以上のメッセージを一度に開こうとしたら確認するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+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:171
+msgid "Prompt while marking multiple messages"
+msgstr "複数のメッセージにマークする場合は確認するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "複数のメッセージにマークを付与する際に毎回確認するかどうか。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+msgid "Prompt when deleting messages in search folder"
+msgstr "仮想フォルダーでメッセージを削除する際に確認するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+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:175
+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:176
+#, fuzzy
+#| 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."
+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:177
+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:178
+#, fuzzy
+#| 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."
+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:179
+msgid "Prompt when replying privately to list messages"
+msgstr ""
+"メーリングリストのメッセージにプライベートに返信しようとしている時に確認"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+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:181
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "メーリングリストがプライベート宛の返信の設定を上書きしている時に確認"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+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:183
+msgid "Prompt when replying to many recipients"
+msgstr "たくさんの相手に返信しようとしている時に確認"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+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:185
+#, fuzzy
+#| msgid ""
+#| "It disables/enables the repeated prompts to warn that you are trying to "
+#| "send a message to recipients not entered as mail addresses"
+msgid ""
+"Prompt when switching composer format and the content needs to lose its "
+"formatting"
+msgstr ""
+"受信者にメールアドレスが入力されていないメッセージを送ろうとした時に繰り返し"
+"警告するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#, fuzzy
+#| msgid ""
+#| "It disables/enables the repeated prompts to warn that you are trying to "
+#| "send a message to recipients not entered as mail addresses"
+msgid ""
+"It disables/enables the repeated prompts to warn that you are switching "
+"composer format and the content needs to lose its formatting."
+msgstr ""
+"受信者にメールアドレスが入力されていないメッセージを送ろうとした時に繰り返し"
+"警告するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#, fuzzy
+#| msgid "Prompt when replying to many recipients"
+msgid "Prompt when sending to many To and CC recipients"
+msgstr "たくさんの相手に返信しようとしている時に確認"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+msgid ""
+"Enable or disable the prompt when sending to many To and CC recipients. The "
+"“composer-many-to-cc-recips-num” defines the threshold."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+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:190
+msgid "Empty Trash folders on exit"
+msgstr "終了時にゴミ箱フォルダーを空にするかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Evolution を終了する時にゴミ箱フォルダーを空にするかどうかです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+msgid "Minimum days between emptying the trash on exit"
+msgstr "終了時にゴミ箱を空にするまでの最短の日数"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr "終了時にゴミ箱のフォルダーを空にするまでの最短の日数です。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+msgid "Last time Empty Trash was run"
+msgstr "最後にゴミ箱を空にした時間"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+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:196
+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:197
+msgid "Level beyond which the message should be logged."
+msgstr "ログを記録すべきメッセージレベルの最小値"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#, fuzzy
+#| msgid ""
+#| "This can have three possible values. \"0\" for errors. \"1\" for "
+#| "warnings. \"2\" for debug messages."
+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:199
+#, fuzzy
+#| msgid "Show original \"Date\" header value."
+msgid "Show original “Date” header value."
+msgstr "元の \"Date\" ヘッダーの値を表示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#, fuzzy
+#| 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."
+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:201
+msgid "List of Labels and their associated colors"
+msgstr "ラベルと対応する色のリスト"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+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:203
+msgid "Check incoming mail being junk"
+msgstr "受信メールがジャンクかどうかをチェックするかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+msgid "Run junk test on incoming mail."
+msgstr "メールを受信したらジャンクのテストを実施するかどうかです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+msgid "Empty Junk folders on exit"
+msgstr "終了時にジャンクフォルダーを空にするかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "Evolution を終了する時にジャンクフォルダーを空にするかどうかです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+msgid "Minimum days between emptying the junk on exit"
+msgstr "終了時にジャンクを空にするまでの最短の日数"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr "終了時にジャンクフォルダーを空にするまでの最短の日数です。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+msgid "Last time Empty Junk was run"
+msgstr "最後にジャンクフォルダーを空にした時間"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+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:211
+msgid "The default plugin for Junk hook"
+msgstr "ジャンクメールのテストで使用するデフォルトのプラグイン"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#, fuzzy
+#| 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."
+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:213
+msgid "Determines whether to lookup in address book for sender email"
+msgstr "差出人をアドレス帳から検索するかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#, fuzzy
+#| 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."
+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:215
+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:216
+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:217
+msgid "Determines whether to use custom headers to check for junk"
+msgstr "独自のヘッダーを利用してジャンクをチェックするかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+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:219
+msgid "Custom headers to use while checking for junk."
+msgstr "ジャンクかどうかをチェックする際に使用する独自のヘッダー"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#, fuzzy
+#| msgid ""
+#| "Custom headers to use while checking for junk. The list elements are "
+#| "string in the format \"headername=value\"."
+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:221
+msgid "UID string of the default account."
+msgstr "デフォルトのアカウントを表す UID (文字列)"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+msgid "Save directory"
+msgstr "保存先のフォルダー"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+msgid "Directory for saving mail component files."
+msgstr "メールに添付されたファイルを保存する先のフォルダーです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+msgid "Composer load/attach directory"
+msgstr "Composer 読み込み/保存ディレクトリ"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+msgid "Directory for loading/attaching files to composer."
+msgstr "メールに添付されたファイルを読み込む/保存する先のフォルダーです。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+msgid "Check for new messages on start"
+msgstr "起動時に新着メッセージをチェックする"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+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:228
+msgid "Check for new messages in all active accounts"
+msgstr "アクティブなアカウントの新着メールをチェックする"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#, fuzzy
+#| 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."
+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:230
+msgid "Server synchronization interval"
+msgstr "サーバーと同期する間隔"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+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:232
+#, fuzzy
+#| msgid "Confirm _when expunging a folder"
+msgid "Allow expunge in virtual folders"
+msgstr "フォルダーを抹消する前に確認する(_W)"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+msgid ""
+"Enables Expunge in virtual folders, which means that the Folder→Expunge will "
+"be callable in virtual folders, while the expunge itself will be done in all "
+"folders for all deleted messages within the virtual folder, not only for "
+"deleted messages belonging to the virtual folder."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../src/mail/mail-config.ui.h:9
+msgid "Inherit theme colors in HTML format"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+msgid ""
+"When enabled the theme colors for background, text and links are sent in "
+"resulting HTML formatted message."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+msgid "An Archive folder for On This Computer folders."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+msgid ""
+"An Archive folder to use for Messages|Archive... feature when in an On This "
+"Computer folder."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+msgid "(Deprecated) Default forward style"
+msgstr "(非推奨) デフォルトの転送スタイル"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#, fuzzy
+#| msgid ""
+#| "This key was deprecated in version 3.10 and should no longer be used. Use "
+#| "\"forward-style-name\" instead."
+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:240
+msgid "(Deprecated) Default reply style"
+msgstr "(非推奨) デフォルトの返信スタイル"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+#, fuzzy
+#| msgid ""
+#| "This key was deprecated in version 3.10 and should no longer be used. Use "
+#| "\"reply-style-name\" instead."
+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:242
+msgid "(Deprecated) List of custom headers and whether they are enabled."
+msgstr "(非推奨) 独自のヘッダーとそれらを有効にするかどうかのリスト"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
+#, fuzzy
+#| msgid ""
+#| "This key was deprecated in version 3.10 and should no longer be used. Use "
+#| "\"show-headers\" instead."
+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:244
+msgid "(Deprecated) Load images for HTML messages over HTTP"
+msgstr "(非推奨) HTML のメッセージにある画像を読み込むかどうか"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
+#, fuzzy
+#| msgid ""
+#| "This key was deprecated in version 3.10 and should no longer be used. Use "
+#| "\"image-loading-policy\" instead."
+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:246
+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:247
+#, fuzzy
+#| msgid ""
+#| "This key was deprecated in version 3.10 and should no longer be used. Use "
+#| "\"browser-close-on-reply-policy\" instead."
+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\" を代わりに使ってください。"
+
+#. Translators: This is the a list of words for the attach reminder plugin to look
+#. for in a message body. Please use any number of words here in your language that might
+#. indicate that an attachment should have been attached to the message.
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:4
+msgid "['attachment','attaching','attached','enclosed']"
+msgstr "['attachment','attaching','attached','enclosed','添付','アタッチ']"
+
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr "添付し忘れ防止プラグインでメッセージの本文から検索する一連のキーワード"
+
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:6
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr "添付し忘れ防止プラグインでメッセージの本文から検索する一連のキーワード"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:1
+msgid "Address book source"
+msgstr "アドレス帳のソース"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
+msgid "Address book to use for storing automatically synced contacts."
+msgstr "連絡先の自動同期に使用するアドレス帳を選択してください:"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
+msgid "Auto sync Pidgin contacts"
+msgstr "Pidgin の連絡先の自動同期"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
+msgid "Whether Pidgin contacts should be automatically synced."
+msgstr "Pidgin の連絡先を自動的に同期するかどうか"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
+msgid "Enable autocontacts"
+msgstr "連絡先自動収集の有効化"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
+#, fuzzy
+#| msgid ""
+#| "Whether contacts should be automatically added to the user's address book."
+msgid ""
+"Whether contacts should be automatically added to the user’s address book."
+msgstr "連絡先をユーザーのアドレス帳に自動的に追加するかどうか"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
+msgid "Pidgin address book source"
+msgstr "Pidgin アドレス帳のソース"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
+msgid ""
+"Address book to use for storing automatically synced contacts from Pidgin."
+msgstr "Pidgin から連絡先を自動的に同期するのに使用するアドレス帳"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
+msgid "Pidgin check interval"
+msgstr "Pidgin チェック間隔"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
+msgid "Check interval for Pidgin syncing of contacts."
+msgstr "Pidgin をチェックして連絡先を同期する間隔"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
+msgid "Pidgin last sync MD5"
+msgstr "Pidgin 最終同期時の MD5"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
+msgid "Pidgin last sync MD5."
+msgstr "Pidgin 最終同期時の MD5"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
+msgid "Pidgin last sync time"
+msgstr "Pidgin 最終同期時刻"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
+msgid "Pidgin last sync time."
+msgstr "Pidgin 最終同期時刻"
+
+#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
+msgid "List of Custom Headers"
+msgstr "独自ヘッダーのリスト"
+
+#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
+#, fuzzy
+#| msgid ""
+#| "The key specifies the list of custom headers that you can add to an "
+#| "outgoing message. The format for specifying a Header and Header value is: "
+#| "Name of the custom header followed by \"=\" and the values separated by "
+#| "\";\""
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by “=” and the values separated by “;”"
+msgstr ""
+"送信するメールに独自のヘッダーとして挿入するキーのリストです。その書式は \"="
+"\" の次に独自ヘッダーの名前を指定して \";\" でその値を区切ります。"
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
+msgid "Default External Editor"
+msgstr "デフォルトの外部エディター"
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr "デフォルトで使用するエディターのコマンドです。"
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
+msgid "Automatically launch when a new mail is edited"
+msgstr "新規メールの作成時に自動的に起動"
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:4
+msgid "Automatically launch editor when key is pressed in the mail composer."
+msgstr "メールの作成ウィンドウでキーが押されたら自動的にエディターを起動"
+
+#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
+msgid "Insert Face picture by default"
+msgstr "デフォルトで顔画像を添付"
+
+#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
+msgid ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+msgstr ""
+"デフォルトで送信するメッセージに顔画像を添付するかどうか。この項目をチェック"
+"する前に、画像が設定されているかどうか確認してください。さもなければ、何も起"
+"こりません。"
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
+msgid "Delete processed"
+msgstr "処理済みを削除"
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:2
+msgid "Whether to delete processed iTip objects"
+msgstr "処理済みの iTip オブジェクトを削除するかどうか"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
+msgid "Notify new messages for Inbox only."
+msgstr "受信箱のみ新着メッセージを通知するかどうか"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr "受信箱 (Inbox) フォルダーのみ新着メッセージを通知するかどうかです。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:3
+msgid "Enable D-Bus messages."
+msgstr "D-Bus メッセージを有効にする"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:4
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr "新しいメールが届いたらD-Bus メッセージを生成する。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
+msgid "Enable icon in notification area."
+msgstr "通知領域にアイコンを表示するかどうか"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr ""
+"新しいメールが届いたらパネルの通知領域にアイコンを表示して通知するかどうかで"
+"す。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:7
+msgid "Popup message together with the icon."
+msgstr "アイコンとともにメッセージを表示する"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:8
+msgid "Whether show message over the icon when new messages arrive."
+msgstr ""
+"新しいメールが届いたときにアイコンに重ねてメッセージを表示するかどうか。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
+msgid "Enable audible notifications when new messages arrive."
+msgstr "新しいメールが届いたときに音による通知を有効にする。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
+#, fuzzy
+#| msgid ""
+#| "Whether to make a sound of any kind when new messages arrive. If \"false"
+#| "\", the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-"
+#| "file\" and \"notify-sound-use-theme\" keys are disregarded."
+msgid ""
+"Whether to make a sound of any kind when new messages arrive. If “false”, "
+"the “notify-sound-beep”, “notify-sound-file”, “notify-sound-play-file” and "
+"“notify-sound-use-theme” keys are disregarded."
+msgstr ""
+"新しいメールが届いたときに音による通知を有効にするかどうか。\"false\" にする"
+"と \"notify-sound-beep\"、\"notify-sound-file\"、\"notify-sound-play-file"
+"\"、\"notify-sound-use-theme\" 各キーは無視されます。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
+msgid "Whether to emit a beep."
+msgstr "ビープ音を鳴らすかどうか"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
+msgid "Whether to emit a beep when new messages arrive."
+msgstr "新しいメールが届いたらビープ音を鳴らすかどうかです。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
+msgid "Sound filename to be played."
+msgstr "演奏する音声ファイル"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
+#, fuzzy
+#| msgid ""
+#| "Sound file to be played when new messages arrive, if \"notify-sound-play-"
+#| "file\" is \"true\"."
+msgid ""
+"Sound file to be played when new messages arrive, if “notify-sound-play-"
+"file” is “true”."
+msgstr ""
+"\"notify-sound-play-file\" が true の場合に新しいメールが届いたら演奏する音声"
+"ファイルです。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
+msgid "Whether to play a sound file."
+msgstr "音声ファイルを演奏するかどうか"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
+#, fuzzy
+#| msgid ""
+#| "Whether to play a sound file when new messages arrive. The name of the "
+#| "sound file is given by the 'notify-sound-file' key."
+msgid ""
+"Whether to play a sound file when new messages arrive. The name of the sound "
+"file is given by the “notify-sound-file” key."
+msgstr ""
+"音声ファイルを演奏するかどうかです。音声ファイルの名前は 'notify-sound-file' "
+"キーで指定します。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
+msgid "Use sound theme"
+msgstr "サウンドテーマを使用"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr ""
+"ビープモードでない場合、新しいメッセージが届いた時にテーマの音を鳴らします。"
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
+msgid "Mode to use when displaying mails"
+msgstr "メールの表示モード"
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
+#, fuzzy
+#| msgid ""
+#| "The mode to use for displaying mails. \"normal\" makes Evolution choose "
+#| "the best part to show, \"prefer_plain\" makes it use the text part, if "
+#| "present, and \"only_plain\" forces Evolution to only show plain text"
+msgid ""
+"The mode to use for displaying mails. “normal” makes Evolution choose the "
+"best part to show, “prefer_plain” makes it use the text part, if present, "
+"“prefer_source” makes it use the text part, if present, otherwise shows HTML "
+"source, and “only_plain” forces Evolution to only show plain text"
+msgstr ""
+"メール表示に使うモード。\"normal\" では表示に最適なものを Evolution が選択"
+"し、\"prefer_plain\" ではテキストの部分があればそれを、\"only_plain\" では "
+"Evolution はプレーンテキストだけを表示します。"
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
+msgid "Whether to show suppressed HTML output"
+msgstr "隠された HTML 出力を表示するかどうか"
+
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
+msgid "List of Destinations for publishing"
+msgstr "スケジュールを公開するサーバー URL 一覧"
+
+#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
+msgid ""
+"The key specifies the list of destinations to where publish calendars. Each "
+"values specifies an XML with setup for publishing to one destination."
+msgstr ""
+"このキーはカレンダーを公開する先の一覧を指定します。値はそれぞれ1つの公開先を"
+"設定する1つの XML を指定します。"
+
+#: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"テンプレートプラグインがメッセージの本文を代用するために使用するキーと値のペ"
+"アを要素とするリストです。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
+msgid "Skip development warning dialog"
+msgstr "開発版であることを警告するダイアログをスキップするかどうか"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+"Evolution の開発バージョンである旨を警告するダイアログを表示しないようにする"
+"かどうかです。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
+msgid "Initial attachment view"
+msgstr "添付表示の初期状態"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
+#, fuzzy
+#| msgid ""
+#| "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is "
+#| "List View."
+msgid ""
+"Initial view for attachment bar widgets. “0” is Icon View, “1” is List View."
+msgstr ""
+"添付バーのウィジェットの初期表示。\"0\" ならばアイコン表示、\"1\" ならば一覧"
+"表示"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
+msgid "Initial file chooser folder"
+msgstr "初期ファイル選択フォルダー"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "GtkFileChooser ダイアログの初期フォルダー"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
+msgid "Compression format used by autoar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
+msgid ""
+"Compression format used when compressing attached directories with autoar."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
+msgid "Compression filter used by autoar"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
+msgid ""
+"Compression filter used when compressing attached directories with autoar."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
+#: ../src/shell/main.c:320
+msgid "Start in offline mode"
+msgstr "オフラインモードで起動するかどうか"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr ""
+"オンラインモードではなく、オフラインモードで Evolution を起動するかどうかで"
+"す。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
+msgid "Offline folder paths"
+msgstr "オフライン時フォルダーパス"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage."
+msgstr "オフライン時用にローカルディスクと同期するフォルダーのパスのリスト"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
+msgid "Enable express mode"
+msgstr "エクスプレスモードを有効にする"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
+msgid "Flag that enables a much simplified user interface."
+msgstr "より簡易化されたインターフェースを有効にするフラグ"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
+msgid "List of button names to hide in the window switcher"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
+msgid ""
+"Valid values are “mail”, “addressbook”, “calendar”, “tasks” and “memos”. "
+"Change of this requires restart of the application."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
+msgid "Window buttons are visible"
+msgstr "ウィンドウボタンを表示するかどうか"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
+msgid "Whether the window buttons should be visible."
+msgstr "ウィンドウボタンを表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
+msgid "Window button style"
+msgstr "ウィンドウボタンのスタイル"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
+#, fuzzy
+#| msgid ""
+#| "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+#| "\"toolbar\". If \"toolbar\" is set, the style of the buttons is "
+#| "determined by the GNOME toolbar setting."
+msgid ""
+"The style of the window buttons. Can be “text”, “icons”, “both”, “toolbar”. "
+"If “toolbar” is set, the style of the buttons is determined by the GNOME "
+"toolbar setting."
+msgstr ""
+"ウィンドウボタンのスタイルです。利用可能な値は \"text\"、\"icons\"、\"both"
+"\"、\"toolbar\" です。\"toolbar\" がセットされていたら、ボタンのスタイルは "
+"GNOME デスクトップのツールバーの設定に従います。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
+#, fuzzy
+#| msgid "Sidebar is visible"
+msgid "Menubar is visible"
+msgstr "サイドバーを表示するかどうか"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
+#, fuzzy
+#| msgid "Whether the sidebar should be visible."
+msgid "Whether the menubar should be visible."
+msgstr "サイドバーを表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
+msgid "Toolbar is visible"
+msgstr "ツールバーを表示するかどうか"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
+msgid "Whether the toolbar should be visible."
+msgstr "ツールバーを表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
+msgid "Sidebar is visible"
+msgstr "サイドバーを表示するかどうか"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:28
+msgid "Whether the sidebar should be visible."
+msgstr "サイドバーを表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:29
+msgid "Statusbar is visible"
+msgstr "ステータスバーを表示するかどうか"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:30
+msgid "Whether the status bar should be visible."
+msgstr "ステータスバーを表示するかどうかです。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:31
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "起動時にデフォルトで表示するコンポーネントの ID/エイリアスです。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:32
+msgid "Default sidebar width"
+msgstr "サイドバーの幅 (デフォルト)"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:33
+msgid "The default width for the sidebar, in pixels."
+msgstr "サイドバーのデフォルトの幅です (ピクセル単位)"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:34
+msgid "Enable special WebKit developer features"
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:35
+msgid "Any change of this option requires restart of Evolution."
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
+msgid "Use only local spam tests."
+msgstr "ジャンクのテストはローカルのみにするかどうか"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
+msgid "Use only the local spam tests (no DNS)."
+msgstr ""
+"(DNS を使用せずに) ローカルの受信箱に対してのみジャンクメールのテストをするか"
+"どうかです。"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
+msgid "Full path command to run spamassassin"
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
+msgid ""
+"Full path to a spamassassin command. If not set, then a compile-time path is "
+"used, usually /usr/bin/spamassassin. The command should not contain any "
+"other arguments."
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
+msgid "Full path command to run sa-learn"
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
+msgid ""
+"Full path to a sa-learn command. If not set, then a compile-time path is "
+"used, usually /usr/bin/sa-learn. The command should not contain any other "
+"arguments."
+msgstr ""
+
+#: ../data/views/addressbook/galview.xml.h:1
+msgid "_Address Cards"
+msgstr "アドレスカード(_A)"
+
+#: ../data/views/addressbook/galview.xml.h:2
+#: ../data/views/calendar/galview.xml.h:5
+msgid "_List View"
+msgstr "一覧ビュー(_L)"
+
+#: ../data/views/addressbook/galview.xml.h:3
+msgid "By _Company"
+msgstr "会社の一覧(_C)"
+
+#: ../data/views/calendar/galview.xml.h:1
+msgid "_Day View"
+msgstr "日間ビュー(_D)"
+
+#: ../data/views/calendar/galview.xml.h:2
+msgid "_Work Week View"
+msgstr "平日ビュー(_W)"
+
+#: ../data/views/calendar/galview.xml.h:3
+msgid "W_eek View"
+msgstr "週間ビュー(_E)"
+
+#: ../data/views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr "月間ビュー(_M)"
+
+#: ../data/views/mail/galview.xml.h:1
+msgid "_Messages"
+msgstr "メッセージ表示(_M)"
+
+#: ../data/views/mail/galview.xml.h:2
+msgid "As _Sent Folder"
+msgstr "送信済フォルダー表示(_S)"
+
+#: ../data/views/mail/galview.xml.h:3
+msgid "By Su_bject"
+msgstr "件名順(_B)"
+
+#: ../data/views/mail/galview.xml.h:4
+msgid "By Se_nder"
+msgstr "差出人順(_N)"
+
+#: ../data/views/mail/galview.xml.h:5
+msgid "By S_tatus"
+msgstr "ステータス順(_T)"
+
+#: ../data/views/mail/galview.xml.h:6
+msgid "By _Follow Up Flag"
+msgstr "フォローアップフラグ順(_F)"
+
+#: ../data/views/mail/galview.xml.h:7
+msgid "For _Wide View"
+msgstr "ワイドビュー向け(_W)"
+
+#: ../data/views/mail/galview.xml.h:8
+msgid "As Sent Folder for Wi_de View"
+msgstr "ワイド表示の送信済フォルダー表示(_D)"
+
+#: ../data/views/memos/galview.xml.h:1
+msgid "_Memos"
+msgstr "メモ(_M)"
+
+#: ../data/views/tasks/galview.xml.h:1
+#: ../src/plugins/pst-import/pst-importer.c:571
+msgid "_Tasks"
+msgstr "タスク(_T)"
+
+#: ../data/views/tasks/galview.xml.h:2
+msgid "With _Due Date"
+msgstr "期日(_D)"
+
+#: ../data/views/tasks/galview.xml.h:3
+msgid "With _Status"
+msgstr "ステータス(_S)"
+
+#: ../src/addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
 msgstr "このアドレス帳を開けませんでした。"
 
-#: ../addressbook/addressbook.error.xml.h:2
-msgid "This address book server might be unreachable or the server name may be misspelled or your network 
connection could be down."
-msgstr "このアドレス帳サーバーとは通信できないか、またはサーバー名が間違っているか、あるいはお使いのネットワークがダウンしている可能性があります。"
+#: ../src/addressbook/addressbook.error.xml.h:2
+msgid ""
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+"このアドレス帳サーバーとは通信できないか、またはサーバー名が間違っているか、"
+"あるいはお使いのネットワークがダウンしている可能性があります。"
 
-#: ../addressbook/addressbook.error.xml.h:3
+#: ../src/addressbook/addressbook.error.xml.h:3
 msgid "Failed to authenticate with LDAP server."
 msgstr "LDAP サーバーを使った認証に失敗しました。"
 
-#: ../addressbook/addressbook.error.xml.h:4
-msgid "Check to make sure your password is spelled correctly and that you are using a supported login 
method. Remember that many passwords are case sensitive; your caps lock might be on."
-msgstr "パスワードのつづりが正しいか、そしてサポートされているログイン方法を利用しているか確認してください。パスワードは大文字/小文字を区別することに留意してください ([Caps Lock] 
キーが押下されているかもしれません)。"
+#: ../src/addressbook/addressbook.error.xml.h:4
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"パスワードのつづりが正しいか、そしてサポートされているログイン方法を利用して"
+"いるか確認してください。パスワードは大文字/小文字を区別することに留意してくだ"
+"さい ([Caps Lock] キーが押下されているかもしれません)。"
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../src/addressbook/addressbook.error.xml.h:5
 msgid "This address book server does not have any suggested search bases."
 msgstr "このアドレス帳サーバーには推奨される検索ベースがありません。"
 
-#: ../addressbook/addressbook.error.xml.h:6
-msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it 
may be misconfigured. Ask your administrator for supported search bases."
-msgstr "この LDAP サーバーは古いバージョンの LDAP 
を使用している可能性があるため、この機能を利用できないか、あるいは設定ミスかもしれません。サポートしている検索ベースについては、システム管理者にお尋ねください。"
+#: ../src/addressbook/addressbook.error.xml.h:6
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"この LDAP サーバーは古いバージョンの LDAP を使用している可能性があるため、こ"
+"の機能を利用できないか、あるいは設定ミスかもしれません。サポートしている検索"
+"ベースについては、システム管理者にお尋ねください。"
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../src/addressbook/addressbook.error.xml.h:7
 msgid "This server does not support LDAPv3 schema information."
 msgstr "このサーバーは LDAPv3 スキーマ情報をサポートしていません。"
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../src/addressbook/addressbook.error.xml.h:8
 msgid "Could not get schema information for LDAP server."
 msgstr "LDAP サーバーのスキーマ情報を取得できませんでした。"
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../src/addressbook/addressbook.error.xml.h:9
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP サーバーが妥当なスキーマ情報を返しませんでした。"
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../src/addressbook/addressbook.error.xml.h:10
 msgid "Could not remove address book."
 msgstr "アドレス帳を削除できませんでした。"
 
-#: ../addressbook/addressbook.error.xml.h:11
-msgid "Delete address book '{0}'?"
+#: ../src/addressbook/addressbook.error.xml.h:11
+#, fuzzy
+#| msgid "Delete address book '{0}'?"
+msgid "Delete address book “{0}”?"
 msgstr "アドレス帳の '{0}' を削除しますか?"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../src/addressbook/addressbook.error.xml.h:12
 msgid "This address book will be removed permanently."
 msgstr "このアドレス帳は完全に削除されます。"
 
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:66
+#: ../src/addressbook/addressbook.error.xml.h:13
+#: ../src/calendar/calendar.error.xml.h:7 ../src/mail/mail.error.xml.h:69
 msgid "Do _Not Delete"
 msgstr "削除しない(_N)"
 
-#: ../addressbook/addressbook.error.xml.h:14
-msgid "Delete remote address book &quot;{0}&quot;?"
+#: ../src/addressbook/addressbook.error.xml.h:14
+#, fuzzy
+#| msgid "Delete remote address book &quot;{0}&quot;?"
+msgid "Delete remote address book “{0}”?"
 msgstr "リモートアドレス帳 &quot;{0}&quot; を削除しますか?"
 
-#: ../addressbook/addressbook.error.xml.h:15
-msgid "This will permanently remove the address book &quot;{0}&quot; from the server. Are you sure you want 
to proceed?"
-msgstr "これはアドレス帳 &quot;{0}&quot; をサーバーから恒久的に削除します。続けてよろしいですか?"
+#: ../src/addressbook/addressbook.error.xml.h:15
+#, fuzzy
+#| msgid ""
+#| "This will permanently remove the address book &quot;{0}&quot; from the "
+#| "server. Are you sure you want to proceed?"
+msgid ""
+"This will permanently remove the address book “{0}” from the server. Are you "
+"sure you want to proceed?"
+msgstr ""
+"これはアドレス帳 &quot;{0}&quot; をサーバーから恒久的に削除します。続けてよろ"
+"しいですか?"
 
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:61
+#: ../src/addressbook/addressbook.error.xml.h:16
+#: ../src/calendar/calendar.error.xml.h:65
 msgid "_Delete From Server"
 msgstr "サーバーから削除(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../src/addressbook/addressbook.error.xml.h:17
 msgid "Category editor not available."
 msgstr "カテゴリエディターは利用できません。"
 
-#: ../addressbook/addressbook.error.xml.h:18
-msgid "Unable to open address book '{0}'"
+#: ../src/addressbook/addressbook.error.xml.h:18
+#, fuzzy
+#| msgid "Unable to open address book '{0}'"
+msgid "Unable to open address book “{0}”"
 msgstr "アドレス帳 '{0}' を開けません"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../src/addressbook/addressbook.error.xml.h:19
 msgid "Unable to perform search."
 msgstr "検索を実施できません。"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../src/addressbook/addressbook.error.xml.h:20
+#, fuzzy
+#| msgid "Unable to open address book '{0}'"
+msgid "Failed to refresh address book “{0}”"
+msgstr "アドレス帳 '{0}' を開けません"
+
+#: ../src/addressbook/addressbook.error.xml.h:21
 msgid "Would you like to save your changes?"
 msgstr "変更した部分を保存しますか?"
 
-#: ../addressbook/addressbook.error.xml.h:21
-msgid "You have made modifications to this contact. Do you want to save these changes?"
+#: ../src/addressbook/addressbook.error.xml.h:22
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
 msgstr "この連絡先を変更しています。これらの変更を保存しますか?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../src/addressbook/addressbook.error.xml.h:23
 msgid "_Discard"
 msgstr "破棄する(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../src/addressbook/addressbook.error.xml.h:24
 msgid "Cannot move contact."
 msgstr "連絡先を移動できません。"
 
-#: ../addressbook/addressbook.error.xml.h:24
-msgid "You are attempting to move a contact from one address book to another but it cannot be removed from 
the source. Do you want to save a copy instead?"
-msgstr "あるアドレス帳から別のアドレス帳へ連絡先を移動する際に、その連絡先を移動元から削除できませんでした。連絡先を移動する代わりにコピーしますか?"
+#: ../src/addressbook/addressbook.error.xml.h:25
+msgid ""
+"You are attempting to move a contact from one address book to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"あるアドレス帳から別のアドレス帳へ連絡先を移動する際に、その連絡先を移動元か"
+"ら削除できませんでした。連絡先を移動する代わりにコピーしますか?"
 
-#: ../addressbook/addressbook.error.xml.h:25
-msgid "The image you have selected is large. Do you want to resize and store it?"
+#: ../src/addressbook/addressbook.error.xml.h:26
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
 msgstr "選択した画像が大きすぎます。サイズを変更してから保存しますか?"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../src/addressbook/addressbook.error.xml.h:27
 msgid "_Resize"
 msgstr "大きさを変更する(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../src/addressbook/addressbook.error.xml.h:28
 msgid "_Use as it is"
 msgstr "そのまま使う(_U)"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../src/addressbook/addressbook.error.xml.h:29
 msgid "_Do not save"
 msgstr "保存しない(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../src/addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "{0}を保存できません。"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../src/addressbook/addressbook.error.xml.h:31
 msgid "Error saving {0} to {1}: {2}"
 msgstr "{0}を{1}へ保存する際にエラーが発生しました: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:31
-msgid "Address '{0}' already exists."
+#: ../src/addressbook/addressbook.error.xml.h:32
+#, fuzzy
+#| msgid "Address '{0}' already exists."
+msgid "Address “{0}” already exists."
 msgstr "住所の '{0}' が重複しています。"
 
-#: ../addressbook/addressbook.error.xml.h:32
-msgid "A contact already exists with this address. Would you like to add a new card with the same address 
anyway?"
-msgstr "このアドレスは既に連絡先に存在しています。とにかく同じアドレスを新しいカードに追加しますか?"
-
-#: ../addressbook/addressbook.error.xml.h:33
-#: ../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
+#: ../src/addressbook/addressbook.error.xml.h:33
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+msgstr ""
+"このアドレスは既に連絡先に存在しています。とにかく同じアドレスを新しいカード"
+"に追加しますか?"
+
+#: ../src/addressbook/addressbook.error.xml.h:34
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:721
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1355
+#: ../src/e-util/e-mail-signature-manager.c:328
+#: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:23
+#: ../src/mail/e-mail-account-manager.c:719
+#: ../src/mail/e-mail-label-manager.c:371
+#: ../src/mail/em-folder-properties.c:1031
+#: ../src/mail/em-vfolder-editor-rule.c:397
+#: ../src/mail/em-vfolder-editor-rule.c:626 ../src/mail/mail-config.ui.h:60
+#: ../src/modules/mail/em-composer-prefs.c:422
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:543
+#: ../src/plugins/email-custom-header/email-custom-header.c:837
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:32
+#: ../src/plugins/templates/templates.c:463
 msgid "_Add"
 msgstr "追加する(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../src/addressbook/addressbook.error.xml.h:35
 msgid "Some addresses already exist in this contact list."
 msgstr "アドレスのうちのいくつかは既にこの連絡先一覧にあります。"
 
-#: ../addressbook/addressbook.error.xml.h:35
-msgid "You are trying to add addresses that are part of this list already. Would you like to add them 
anyway?"
-msgstr "この一覧の一部と同じアドレスを追加しようとしています。とにかく追加しますか?"
+#: ../src/addressbook/addressbook.error.xml.h:36
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr ""
+"この一覧の一部と同じアドレスを追加しようとしています。とにかく追加しますか?"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../src/addressbook/addressbook.error.xml.h:37
 msgid "Skip duplicates"
 msgstr "重複をスキップする"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../src/addressbook/addressbook.error.xml.h:38
 msgid "Add with duplicates"
 msgstr "重複したものを追加する"
 
-#: ../addressbook/addressbook.error.xml.h:38
-msgid "List '{0}' is already in this contact list."
+#: ../src/addressbook/addressbook.error.xml.h:39
+#, fuzzy
+#| msgid "List '{0}' is already in this contact list."
+msgid "List “{0}” is already in this contact list."
 msgstr "リスト '{0}' は既にこの連絡先一覧にあります。"
 
-#: ../addressbook/addressbook.error.xml.h:39
-msgid "A contact list named '{0}' is already in this contact list. Would you like to add it anyway?"
-msgstr "この連絡先一覧と同じ名前の連絡先一覧が既に存在しています。とにかく追加しますか?"
+#: ../src/addressbook/addressbook.error.xml.h:40
+#, fuzzy
+#| msgid ""
+#| "A contact list named '{0}' is already in this contact list. Would you "
+#| "like to add it anyway?"
+msgid ""
+"A contact list named “{0}” is already in this contact list. Would you like "
+"to add it anyway?"
+msgstr ""
+"この連絡先一覧と同じ名前の連絡先一覧が既に存在しています。とにかく追加します"
+"か?"
 
-#: ../addressbook/addressbook.error.xml.h:40
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1250
+#: ../src/addressbook/addressbook.error.xml.h:41
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1280
 msgid "Failed to delete contact"
 msgstr "連絡先の削除に失敗しました"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../src/addressbook/addressbook.error.xml.h:42
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "このアドレス帳にある連絡先を削除するために必要な権限がありません。"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../src/addressbook/addressbook.error.xml.h:43
 msgid "Cannot add new contact"
 msgstr "新しい連絡先を追加できません"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:44
-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}' は読み込み専用のアドレス帳で変更はできません。左側の連絡先のビューから別のアドレス帳を選択してください。"
+#: ../src/addressbook/addressbook.error.xml.h:45
+#, fuzzy
+#| 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."
+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
+#: ../src/addressbook/addressbook.error.xml.h:46
 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:734
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:756
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3037
+#: ../src/addressbook/addressbook.error.xml.h:48
+#, fuzzy
+#| 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."
+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}' に保存できません。アドレス帳がまだ開かれた状態にある"
+"ためです。こちらで開かれるのを待つか、別のアドレス帳を選択してください。"
+
+#: ../src/addressbook/addressbook.error.xml.h:49
+#, fuzzy
+#| msgid "Search for text in the displayed contact"
+msgid "Something has gone wrong when displaying the contact"
+msgstr "表示されている連絡先中の文字列を検索します"
+
+#: ../src/addressbook/addressbook.error.xml.h:50
+msgid ""
+"A WebKitWebProcess crashed when displaying the contact. You can try again by "
+"moving to another contact and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+msgstr ""
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:1
+msgid "Show Telephone"
+msgstr "電話を表示"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:2
+#, fuzzy
+#| msgid "_To This Address"
+msgid "Show SIP Address"
+msgstr "このアドレスへ(_T)"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:3
+msgid "Show Instant Messaging"
+msgstr "インスタントメッセンジャーを表示"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Show Web Addresses"
+msgstr "ウェブアドレスを表示"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:5
+msgid "Show Job section"
+msgstr "仕事を表示"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:6
+msgid "Show Miscellaneous"
+msgstr "その他を表示"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:7
+msgid "Show Home Mailing Address"
+msgstr "自宅メールアドレスを表示"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:8
+msgid "Show Work Mailing Address"
+msgstr "仕事メールアドレスを表示"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:9
+msgid "Show Other Mailing Address"
+msgstr "その他のメールアドレスを表示"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:10
+msgid "Show Notes"
+msgstr "注釈を表示"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:11
+#, fuzzy
+#| msgid "Certificates"
+msgid "Show Certificates"
+msgstr "証明書"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:725
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:747
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3108
 msgid "Contact Editor"
 msgstr "連絡先エディター"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1996
+#: ../src/mail/mail-config.ui.h:37
+msgid "Options"
+msgstr "オプション"
+
+#. This is only shown if the EActivity has a GCancellable.
+#. no flags
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3271
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3504
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4319
+#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:220
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:453
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:14
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:472
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:716
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:316
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1360
+#: ../src/calendar/gui/e-cal-dialogs.c:694
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:301
+#: ../src/composer/e-composer-actions.c:227 ../src/e-util/e-activity-bar.c:357
+#: ../src/e-util/e-attachment-dialog.c:309
+#: ../src/e-util/e-attachment-store.c:664
+#: ../src/e-util/e-attachment-store.c:832 ../src/e-util/e-attachment-view.c:301
+#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:140
+#: ../src/e-util/e-category-editor.c:211 ../src/e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-color-chooser-widget.c:125
+#: ../src/e-util/e-filter-datespec.c:289
+#: ../src/e-util/e-html-editor-actions.c:321
+#: ../src/e-util/e-html-editor-actions.c:415
+#: ../src/e-util/e-image-chooser-dialog.c:169
+#: ../src/e-util/e-mail-signature-script-dialog.c:366
+#: ../src/e-util/e-passwords.c:468 ../src/e-util/e-rule-context.c:813
+#: ../src/e-util/e-rule-editor.c:178 ../src/e-util/e-rule-editor.c:280
+#: ../src/e-util/e-rule-editor.c:789 ../src/e-util/e-send-options.ui.h:16
+#: ../src/e-util/e-source-config-dialog.c:377
+#: ../src/e-util/e-source-selector-dialog.c:370
+#: ../src/e-util/e-table-config.c:548 ../src/e-util/e-table-config.ui.h:3
+#: ../src/e-util/e-timezone-dialog.ui.h:2
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4065
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:267
+#: ../src/mail/e-mail-config-window.c:331 ../src/mail/e-mail-label-dialog.c:194
+#: ../src/mail/e-mail-tag-editor.c:168 ../src/mail/em-folder-selector.c:318
+#: ../src/mail/mail-config.ui.h:2 ../src/mail/mail.error.xml.h:16
+#: ../src/mail/mail-send-recv.c:747 ../src/mail/mail-send-recv.c:829
+#: ../src/mail/mail-vfolder-ui.c:149 ../src/mail/mail-vfolder-ui.c:271
+#: ../src/modules/backup-restore/evolution-backup-tool.c:932
+#: ../src/modules/calendar/e-cal-attachment-handler.c:283
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
+#: ../src/plugins/face/face.c:295
+#: ../src/plugins/publish-calendar/publish-calendar.c:788
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:419
+#: ../src/plugins/save-calendar/save-calendar.c:185
+#: ../src/shell/e-shell-content.c:657 ../src/shell/e-shell-content.c:764
+#: ../src/shell/e-shell-utils.c:70 ../src/shell/e-shell-utils.c:139
+#: ../src/smime/gui/certificate-manager.c:665
+#: ../src/smime/gui/certificate-manager.c:742
+#: ../src/smime/gui/certificate-manager.c:966
+#: ../src/smime/gui/certificate-manager.c:1348
+#: ../src/smime/gui/e-cert-selector.c:235 ../src/smime/gui/smime-ui.ui.h:17
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3505
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:719
+#: ../src/calendar/calendar.error.xml.h:47
+#: ../src/calendar/gui/e-comp-editor.c:2107
+#: ../src/composer/e-composer-actions.c:228
+#: ../src/composer/e-composer-actions.c:348
+#: ../src/e-util/e-attachment-store.c:833
+#: ../src/e-util/e-mail-signature-script-dialog.c:370
+#: ../src/e-util/e-web-view.c:4066
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:268
+#: ../src/shell/e-shell-content.c:658 ../src/shell/e-shell-utils.c:140
+#: ../src/smime/gui/certificate-manager.c:666
+#: ../src/smime/gui/certificate-manager.c:743
+msgid "_Save"
+msgstr "保存(_S)"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../src/calendar/gui/e-comp-editor.c:2004
+#: ../src/calendar/gui/e-comp-editor.c:2076
+#: ../src/e-util/e-preferences-window.c:380
+#: ../src/e-util/e-send-options.ui.h:15
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
+#: ../src/shell/e-shell.c:1309 ../src/shell/e-shell-window-actions.c:964
+msgid "_Help"
+msgstr "ヘルプ(_H)"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Image"
 msgstr "画像"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:18
 msgid "Nic_kname:"
 msgstr "ニックネーム(_K):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "_File under:"
 msgstr "ファイルのグループ(_F);"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
 msgid "_Where:"
 msgstr "ファイルの場所(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#: ../calendar/gui/dialogs/event-page.ui.h:16
-#: ../calendar/gui/dialogs/memo-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:27
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Ca_tegories..."
 msgstr "カテゴリ(_T)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Full _Name..."
 msgstr "氏名(_N)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-msgid "_Wants to receive HTML mail"
-msgstr "HTML メールの受信を許可する(_W)"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/widgets/eab-contact-merging.c:408
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:980
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:750
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1169
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "メール"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:24
+msgid "_Wants to receive HTML mail"
+msgstr "HTML メールの受信を許可する(_W)"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Telephone"
 msgstr "電話"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:26
+#, fuzzy
+#| msgid "Address"
+msgid "SIP Address"
+msgstr "住所"
+
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "Instant Messaging"
 msgstr "インスタントメッセンジャー"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:971
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../src/addressbook/importers/evolution-vcard-importer.c:981
 msgid "Contact"
 msgstr "連絡先"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Home Page:"
 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:25
-#: ../modules/itip-formatter/itip-view.c:1891
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../src/calendar/gui/e-comp-editor-event.c:727
+#: ../src/modules/itip-formatter/itip-view.c:2045
 msgid "_Calendar:"
 msgstr "カレンダー(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Free/Busy:"
 msgstr "スケジュール(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Video Chat:"
 msgstr "ビデオチャット(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "Home Page:"
 msgstr "ホームページ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:96
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../src/modules/cal-config-google/e-cal-config-google.c:97
 msgid "Calendar:"
 msgstr "カレンダー:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "Free/Busy:"
 msgstr "スケジュール:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "Video Chat:"
 msgstr "ビデオチャット:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Blog:"
 msgstr "ブログ(_B):"
 
 #. Translators: an accessibility name
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "Blog:"
 msgstr "ブログ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "Web Addresses"
 msgstr "ウェブのアドレス"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-msgid "Web addresses"
-msgstr "ウェブのアドレス"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Profession:"
 msgstr "団体(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgctxt "Job"
 msgid "_Title:"
 msgstr "敬称(前つけ)(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Company:"
 msgstr "会社(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Department:"
 msgstr "担当部署(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Office:"
 msgstr "オフィス(_O):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_Manager:"
 msgstr "マネージャー(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Assistant:"
 msgstr "アシスタント(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "Job"
 msgstr "仕事"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Spouse:"
 msgstr "配偶者(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Birthday:"
 msgstr "誕生日(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "_Anniversary:"
 msgstr "記念日(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:692
-#: ../calendar/gui/e-calendar-view.c:2288
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:881
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
+#: ../src/calendar/gui/e-calendar-view.c:2045
 msgid "Anniversary"
 msgstr "記念日"
 
-#. XXX Allow the category icons to be referenced as named
-#. *     icons, since GtkAction does not support GdkPixbufs.
-#. Get the icon file for some default category.  Doesn't matter
-#. * 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:691
-#: ../calendar/gui/e-calendar-view.c:2287 ../shell/main.c:127
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:880
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
+#: ../src/calendar/gui/e-calendar-view.c:2044
 msgid "Birthday"
 msgstr "誕生日"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
 msgstr "その他"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:55
 msgid "Personal Information"
 msgstr "個人の情報"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:56
 msgid "_City:"
 msgstr "市(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:57
 msgid "_Zip/Postal Code:"
 msgstr "郵便番号(_Z):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:58
 msgid "_State/Province:"
 msgstr "県/州(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:59
 msgid "_Country:"
 msgstr "国(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:60
 msgid "_PO Box:"
 msgstr "私書箱(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:61
+#: ../src/composer/e-composer-from-header.c:122
 msgid "_Address:"
 msgstr "住所(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../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
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:62
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:83
+#: ../src/addressbook/gui/widgets/e-contact-map.c:367
 msgid "Home"
 msgstr "自宅"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../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
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:63
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:848
+#: ../src/addressbook/gui/widgets/e-contact-map.c:380
 msgid "Work"
 msgstr "仕事"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../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
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:64
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:513
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:915
+#: ../src/calendar/gui/e-cal-model.c:3823
 msgid "Other"
 msgstr "その他"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:65
 msgid "Mailing Address"
 msgstr "住所"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:66
+#: ../src/mail/filtertypes.xml.in.h:50 ../src/mail/searchtypes.xml.in.h:52
+#: ../src/mail/vfoldertypes.xml.in.h:53
 msgid "Notes"
 msgstr "注釈"
 
-#: ../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:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:602
-msgid "Jabber"
-msgstr "Jabber"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:604
-msgid "Yahoo"
-msgstr "Yahoo"
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:67
+msgid "Add _PGP"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:605
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:68
+msgid "Add _X.509"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:603
-msgid "MSN"
-msgstr "MSN"
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:69
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1371
+#: ../src/e-util/e-attachment-view.c:355 ../src/e-util/e-filter-rule.c:223
+#: ../src/e-util/e-mail-signature-manager.c:368
+#: ../src/e-util/e-name-selector-dialog.c:1037
+#: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:25
+#: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:438
+#: ../src/mail/em-folder-properties.c:1037
+#: ../src/mail/em-vfolder-editor-rule.c:631 ../src/mail/mail-config.ui.h:61
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:553
+#: ../src/plugins/email-custom-header/email-custom-header.c:847
+#: ../src/plugins/publish-calendar/publish-calendar.c:789
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../src/plugins/templates/templates.c:473
+msgid "_Remove"
+msgstr "削除(_R)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
-msgid "ICQ"
-msgstr "ICQ"
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:70
+msgid "Load P_GP"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
-msgid "GroupWise"
-msgstr "GroupWise"
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:71
+msgid "_Load X.509"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
-msgid "Skype"
-msgstr "Skype"
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:72
+#: ../src/modules/addressbook/e-book-shell-backend.c:314
+msgid "Certificates"
+msgstr "証明書"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:607
-msgid "Twitter"
-msgstr "Twitter"
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:260
+#: ../src/calendar/gui/e-comp-editor.c:2039
+#: ../src/e-util/e-html-editor-actions.c:913
+msgid "_Undo"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/dialogs/comp-editor.c:1301 ../e-util/e-focus-tracker.c:121
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:262
+#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/e-util/e-focus-tracker.c:120
 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
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:267
+#: ../src/calendar/gui/e-comp-editor.c:2046
+#: ../src/e-util/e-html-editor-actions.c:899
+msgid "_Redo"
+msgstr "やり直し(_R)"
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:269
+#: ../src/calendar/gui/e-comp-editor.c:2048 ../src/e-util/e-focus-tracker.c:136
 msgid "Redo"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/widgets/eab-gui-util.c:503
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:501
 msgid "Error adding contact"
 msgstr "連絡先を追加する際にエラーが発生しました"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:330
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:321
 msgid "Error modifying contact"
 msgstr "連絡先を修正する際にエラーが発生しました"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:350
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:341
 msgid "Error removing contact"
 msgstr "連絡先を削除する際にエラーが発生しました"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:750
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3031
-#, c-format
-msgid "Contact Editor - %s"
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:741
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3102
+#, fuzzy, c-format
+#| msgid "Contact Editor - %s"
+msgid "Contact Editor — %s"
 msgstr "連絡先エディター - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3572
-msgid "Please select an image for this contact"
-msgstr "この連絡先の画像を選択してください"
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3238
+#, fuzzy
+#| msgid "Certificates"
+msgid "X.509 certificates"
+msgstr "証明書"
 
-#: ../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
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3243
+msgid "PGP keys"
+msgstr ""
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3249
+#: ../src/smime/gui/certificate-manager.c:689
+#: ../src/smime/gui/certificate-manager.c:978
+msgid "All files"
+msgstr "すべてのファイル"
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3269
 #, fuzzy
-#| msgid "Open"
+#| msgid "OpenPGP _Key ID:"
+msgid "Open PGP key"
+msgstr "OpenPGP 鍵の ID(_K):"
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3269
+#, fuzzy
+#| msgid "Select certificate"
+msgid "Open X.509 certificate"
+msgstr "証明書の選択"
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4320
+#: ../src/e-util/e-attachment-store.c:662 ../src/e-util/e-category-editor.c:148
+#: ../src/e-util/e-html-editor-actions.c:322
+#: ../src/e-util/e-html-editor-actions.c:416
+#: ../src/e-util/e-image-chooser-dialog.c:172 ../src/plugins/face/face.c:296
+#: ../src/shell/e-shell-utils.c:71 ../src/smime/gui/certificate-manager.c:967
 msgid "_Open"
-msgstr "開く"
+msgstr "開く(_O)"
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3289
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3520
+#, fuzzy
+#| msgid "Choose an iCalendar file"
+msgid "Chosen file is not a local file."
+msgstr "iCalendar ファイルを選択してください"
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3302
+#, fuzzy, c-format
+#| msgid "Failed to import certificate"
+msgid "Failed to load certificate: %s"
+msgstr "証明書のインポートに失敗しました"
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
+msgctxt "cert-kind"
+msgid "X.509"
+msgstr ""
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
+msgctxt "cert-kind"
+msgid "PGP"
+msgstr ""
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
+msgid "Save PGP key"
+msgstr ""
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
+#, fuzzy
+#| msgid "Select certificate"
+msgid "Save X.509 certificate"
+msgstr "証明書の選択"
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3532
+#, fuzzy, c-format
+#| msgid "Failed to import certificate"
+msgid "Failed to save certificate: %s"
+msgstr "証明書のインポートに失敗しました"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3577
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4316
+msgid "Please select an image for this contact"
+msgstr "この連絡先の画像を選択してください"
+
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4321
 msgid "_No image"
 msgstr "画像なし(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3926
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4670
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -639,275 +4270,476 @@ msgstr ""
 "連絡先データが間違っています:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3932
-#, c-format
-msgid "'%s' has an invalid format"
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4676
+#, fuzzy, c-format
+#| msgid "'%s' has an invalid format"
+msgid "“%s” has an invalid format"
 msgstr "'%s' の書式が間違っています"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3940
-#, c-format
-msgid "'%s' cannot be a future date"
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4684
+#, fuzzy, c-format
+#| msgid "'%s' cannot be a future date"
+msgid "“%s” cannot be a future date"
 msgstr "'%s' は未来の日付になり得ません"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3948
-#, c-format
-msgid "%s'%s' has an invalid format"
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4692
+#, fuzzy, c-format
+#| msgid "%s'%s' has an invalid format"
+msgid "%s“%s” has an invalid format"
 msgstr "%s'%s' の書式が間違っています"
 
-#: ../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"
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4705
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4719
+#, fuzzy, c-format
+#| msgid "%s'%s' is empty"
+msgid "%s“%s” is empty"
 msgstr "%s'%s' は空です"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3990
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4734
 msgid "Invalid contact."
 msgstr "連絡先が正しくありません。"
 
-#: ../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"
+#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:221
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:454
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:317
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:302
+#: ../src/e-util/e-attachment-dialog.c:311
+#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:212
+#: ../src/e-util/e-charset-combo-box.c:100
+#: ../src/e-util/e-color-chooser-widget.c:126
+#: ../src/e-util/e-filter-datespec.c:290
+#: ../src/e-util/e-html-editor-link-dialog.c:255
+#: ../src/e-util/e-passwords.c:469 ../src/e-util/e-rule-context.c:814
+#: ../src/e-util/e-rule-editor.c:179 ../src/e-util/e-rule-editor.c:281
+#: ../src/e-util/e-rule-editor.c:790 ../src/e-util/e-send-options.ui.h:17
+#: ../src/e-util/e-source-config-dialog.c:378
+#: ../src/e-util/e-source-selector-dialog.c:371
+#: ../src/e-util/e-table-config.c:549 ../src/e-util/e-table-config.ui.h:4
+#: ../src/e-util/e-timezone-dialog.ui.h:3
+#: ../src/mail/e-mail-config-window.c:332 ../src/mail/e-mail-tag-editor.c:169
+#: ../src/mail/em-folder-selector.c:44 ../src/mail/mail-config.ui.h:3
+#: ../src/mail/mail-dialogs.ui.h:24 ../src/mail/mail-vfolder-ui.c:150
+#: ../src/mail/mail-vfolder-ui.c:272
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:420
+#: ../src/shell/e-shell-content.c:659 ../src/shell/e-shell-content.c:765
+#: ../src/shell/main.c:180 ../src/smime/gui/certificate-manager.c:1349
+#: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
 msgid "_OK"
-msgstr "OK"
+msgstr "_OK"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:451
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:449
 msgid "Contact Quick-Add"
 msgstr "連絡先の簡易追加"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "_Edit Full"
 msgstr "すべて編集(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:507
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:503
 msgid "_Full name"
 msgstr "氏名(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:520
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:516
 msgid "E_mail"
 msgstr "メール(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:533
+#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:529
 msgid "_Select Address Book"
 msgstr "アドレス帳の選択(_S)"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:1
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Mr."
 msgstr "ミスター"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:2
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:2
 msgid "Mrs."
 msgstr "ミセス"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:3
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:3
 msgid "Ms."
 msgstr "夫人"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:4
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:4
 msgid "Miss"
 msgstr "ミス"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:5
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:5
 msgid "Dr."
 msgstr "ドクター"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:6
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:6
 msgid "Sr."
 msgstr "伯爵"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:7
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:7
 msgid "Jr."
 msgstr "ジュニア"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:8
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:8
 msgid "I"
 msgstr "一代目"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:9
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:9
 msgid "II"
 msgstr "二代目"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:10
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:10
 msgid "III"
 msgstr "三代目"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:11
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:11
 msgid "Esq."
 msgstr "様"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:12
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:12
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Full Name"
 msgstr "氏名"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:15
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_First:"
 msgstr "名(_F):"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:16
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:16
 msgctxt "FullName"
 msgid "_Title:"
 msgstr "敬称(前つけ)(_T):"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:17
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Middle:"
 msgstr "ミドルネーム(_M):"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:18
+#: ../src/addressbook/gui/contact-editor/fullname.ui.h:18
 msgid "_Last:"
 msgstr "姓(_L):"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:19
+#: ../src/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:817
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:815
 msgid "Contact List Editor"
 msgstr "連絡先の一覧エディター"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "_List name:"
 msgstr "一覧の名前(_L):"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "Members"
 msgstr "メンバー"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "メールアドレスを入力するか、連絡先を下の一覧の中にドラッグしてください(_T):"
+msgstr ""
+"メールアドレスを入力するか、連絡先を下の一覧の中にドラッグしてください(_T):"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr "メールをこの一覧に送信したらアドレスを隠す(_H)"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
 msgid "Add an email to the List"
 msgstr "一覧にメールアドレスを追加"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:12
 msgid "Remove an email address from the List"
 msgstr "メールアドレスを一覧から削除"
 
-#: ../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)"
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:13
+msgid "_Select..."
+msgstr "選択(_S)..."
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
 msgid "Insert email addresses from Address Book"
 msgstr "アドレス帳からメールアドレスを挿入"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:12
-msgid "_Select..."
-msgstr "選択(_S)..."
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:13
-#: ../e-util/filter.ui.h:19
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
+#: ../src/e-util/filter.ui.h:26
 msgid "_Top"
-msgstr ""
+msgstr "上段(_T)"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
-#: ../e-util/filter.ui.h:20
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
+#: ../src/e-util/e-source-selector.c:3469 ../src/e-util/filter.ui.h:27
 #, fuzzy
 #| msgid "_Update"
 msgid "_Up"
 msgstr "更新する(_U)"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
-#: ../e-util/filter.ui.h:21
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
+#: ../src/e-util/e-source-selector.c:3470 ../src/e-util/filter.ui.h:28
 msgid "_Down"
 msgstr ""
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../e-util/filter.ui.h:22
+#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
+#: ../src/e-util/filter.ui.h:29
 msgid "_Bottom"
-msgstr ""
+msgstr "下段(_B)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:942
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:940
 msgid "Contact List Members"
 msgstr "連絡先の一覧のメンバー"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1486
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1499
 msgid "_Members"
 msgstr "メンバー(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1626
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1639
 msgid "Error adding list"
 msgstr "一覧を追加する際にエラーが発生しました"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1659
 msgid "Error modifying list"
 msgstr "一覧を修正する際にエラーが発生しました"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1679
 msgid "Error removing list"
 msgstr "一覧を削除する際にエラーが発生しました"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:243
-#: ../calendar/gui/tasktypes.xml.h:14
+#: ../src/addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1222
+msgid "Name contains"
+msgstr "氏名が次を含む"
+
+#: ../src/addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1215
+msgid "Email begins with"
+msgstr "メールが次で始まる"
+
+#: ../src/addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../src/calendar/gui/caltypes.xml.in.h:26
+#: ../src/calendar/gui/memotypes.xml.in.h:19
+#: ../src/calendar/gui/tasktypes.xml.in.h:30
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1208
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1662
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:782
+#: ../src/modules/calendar/e-task-shell-view-actions.c:983
+msgid "Any field contains"
+msgstr "いずれかの項目が次を含む"
+
+#: ../src/addressbook/gui/widgets/ea-addressbook-view.c:92
+#: ../src/addressbook/gui/widgets/ea-addressbook-view.c:101
+#: ../src/addressbook/gui/widgets/ea-minicard-view.c:223
+msgid "evolution address book"
+msgstr "Evolution アドレス帳"
+
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:149
+msgid "Copy _Email Address"
+msgstr "メールアドレスのコピー(_E)"
+
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:151
+#: ../src/e-util/e-web-view.c:368
+msgid "Copy the email address to the clipboard"
+msgstr "メールアドレスをクリップボードにコピー"
+
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:156
+#: ../src/e-util/e-web-view.c:380
+msgid "_Send New Message To..."
+msgstr "新しいメッセージの送信(_S)..."
+
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:158
+#: ../src/e-util/e-web-view.c:382
+msgid "Send a mail message to this address"
+msgstr "このアドレスにメールのメッセージを送信"
+
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:290
+#: ../src/e-util/e-web-view.c:1317
+#, c-format
+msgid "Click to mail %s"
+msgstr "クリックすると %s さんにメールします"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:142
+msgid "Open map"
+msgstr "地図を開く"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:438
+msgid "SIP"
+msgstr ""
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:682
+msgid "List Members:"
+msgstr "リストのメンバー:"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:754
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Nickname"
+msgstr "あだ名"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:755
+msgid "AIM"
+msgstr "AIM"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:756
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:757
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:758
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:759
+msgid "MSN"
+msgstr "MSN"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:760
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:761
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:762
+msgid "Skype"
+msgstr "Skype"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:763
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:825
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Company"
+msgstr "会社"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:826
+msgid "Department"
+msgstr "担当部署"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:827
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "事務所"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:828
+msgid "Profession"
+msgstr "団体"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:829
+msgid "Position"
+msgstr "役職"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:830
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Manager"
+msgstr "マネージャー"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:831
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+msgid "Assistant"
+msgstr "アシスタント"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:832
+msgid "Video Chat"
+msgstr "ビデオチャット"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:834
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Free/Busy"
+msgstr "スケジュール"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:835
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:876
+msgid "Phone"
+msgstr "電話"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:836
+msgid "Fax"
+msgstr "FAX"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:838
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:879
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:905
+msgid "Address"
+msgstr "住所"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:874
+msgid "Home Page"
+msgstr "ホームページ"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:875
+msgid "Web Log"
+msgstr "ブログ"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:877
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "携帯電話"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:882
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Spouse"
+msgstr "配偶者"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:892
+msgid "Personal"
+msgstr "プライベート"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:937
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Note"
+msgstr "ノート"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1133
+msgid "List Members"
+msgstr "メンバーのリスト化"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1154
+msgid "Job Title"
+msgstr "勤務先"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1195
+msgid "Home page"
+msgstr "ホームページ"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1205
+msgid "Blog"
+msgstr "ブログ"
+
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:259
+#: ../src/calendar/gui/e-cal-component-preview.c:308
+#: ../src/calendar/gui/e-cal-model-tasks.c:314
+#: ../src/calendar/gui/e-cal-model-tasks.c:556
+#: ../src/calendar/gui/e-task-table.c:209
+#: ../src/calendar/gui/e-task-table.c:224
+#: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3586
+#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:966
 msgid "Cancelled"
 msgstr "キャンセルされた"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:345
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:455
 msgid "Merge Contact"
 msgstr "連絡先のマージ"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:363
-#: ../addressbook/gui/widgets/eab-contact-merging.c:627
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:473
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:722
 msgid "_Merge"
 msgstr "マージする(_M)"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:616
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:711
 msgid "Duplicate Contact Detected"
 msgstr "重複する連絡先を検出しました"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:674
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:769
 #, 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 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 save the changes anyway?"
-msgstr "この連絡先と同じ名前あるいはメールアドレスが既にこのフォルダーにあります。とにかく変更を保存しますか?"
+msgstr ""
+"この連絡先と同じ名前あるいはメールアドレスが既にこのフォルダーにあります。と"
+"にかく変更を保存しますか?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:677
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:772
 #, fuzzy
 #| msgid ""
 #| "The name or email address of this contact already exists\n"
@@ -919,129 +4751,224 @@ msgstr ""
 "この連絡先と同じ名前あるいはメールアドレスが\n"
 "既にこのフォルダーにあります。とにかく追加しますか?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:692
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:787
 msgid "Changed Contact:"
 msgstr "変更後の連絡先:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:694
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:789
 msgid "New Contact:"
 msgstr "新しい連絡先:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:733
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:828
 msgid "Conflicting Contact:"
 msgstr "重複している連絡先:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:735
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:830
 #, fuzzy
 #| msgid "Contact: "
 msgid "Old Contact:"
 msgstr "連絡先: "
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1150
-msgid "Name contains"
-msgstr "氏名が次を含む"
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:119
+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/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1143
-msgid "Email begins with"
-msgstr "メールが次で始まる"
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:138
+#, 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/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: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 "いずれかの項目が次を含む"
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:151
+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 パッケージをインストール"
+"する必要があります。"
+
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:160
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"このアドレス帳を開けませんでした。考えられる原因としては誤った URI を指定した"
+"か、またはサーバーがダウンしているかのどちらかです。"
+
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Detailed error message:"
+msgstr "エラーの詳細:"
+
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:209
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"サーバー側で設定されている検索結果の個数またはクライアント側で\n"
+"設定されている表示可能な個数以上の検索結果が見つかりました。\n"
+"さらにキーワードを追加して絞り込み検索を行うか、このアドレス帳の\n"
+"ディレクトリサーバーに対する設定で検索結果の上限を上げてみてください。"
+
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:216
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"configured for this address book.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+msgstr ""
+"この検索にかかった時間がサーバーの制限時間または\n"
+"このアドレス帳に対して設定した制限時間を越えました。\n"
+"さらにキーワードを追加して絞り込み検索を行うか、このアドレス帳の\n"
+"ディレクトリサーバーに対する設定で制限時間の上限を上げてみてください。"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:224
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr ""
+"このアドレス帳のバックエンドは、この問い合わせを解析できませんでした。 %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:229
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr ""
+"このアドレス帳のバックエンドは、この問い合わせの実行を拒否しました。 %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:235
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:241
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "この問い合わせは完全に終了しませんでした。 %s"
+
+#. This is a filename. Translators take note.
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:263
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:314
+msgid "Select Address Book"
+msgstr "アドレス帳の選択"
+
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:396
+msgid "list"
+msgstr "一覧"
+
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:585
+msgid "Move contact to"
+msgstr "連絡先の移動先"
+
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:587
+msgid "Copy contact to"
+msgstr "連絡先のコピー先"
+
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:590
+msgid "Move contacts to"
+msgstr "複数の連絡先の移動先"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:162
+#: ../src/addressbook/gui/widgets/eab-gui-util.c:592
+msgid "Copy contacts to"
+msgstr "複数の連絡先のコピー先"
+
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:160
 msgid "No contacts"
 msgstr "連絡先なし"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:164
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d個の連絡先"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:372
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:370
 msgid "Error getting book view"
 msgstr "ブックビューの取得でエラーが発生しました"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:819
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:817
 msgid "Search Interrupted"
 msgstr "検索が中断されました"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
+#: ../src/addressbook/gui/widgets/e-addressbook-table-adapter.c:219
 msgid "Error modifying card"
 msgstr "カードの修正中にエラーが発生しました"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:648
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:680
 msgid "Cut selected contacts to the clipboard"
 msgstr "選択した連絡先をカットして、クリップボードにコピーします"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:654
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:686
 msgid "Copy selected contacts to the clipboard"
 msgstr "選択した連絡先をコピーして、クリップボードにコピーします"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:660
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:692
 msgid "Paste contacts from the clipboard"
 msgstr "クリップボードからタスクを貼り付けます"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:666
-#: ../modules/addressbook/e-book-shell-view-actions.c:950
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:698
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1018
 msgid "Delete selected contacts"
 msgstr "選択した連絡先を削除します"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:672
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Select all visible contacts"
 msgstr "すべての表示されている連絡先を選択します"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1328
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "これらの連絡先の一覧を本当に削除してもよろしいですか?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1332
 msgid "Are you sure you want to delete this contact list?"
 msgstr "この連絡先の一覧を本当に削除してもよろしいですか?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1336
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "この連絡先の一覧 (%s) を本当に削除してもよろしいですか?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1342
 msgid "Are you sure you want to delete these contacts?"
 msgstr "これらの連絡先を本当に削除してもよろしいですか?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1346
 msgid "Are you sure you want to delete this contact?"
 msgstr "この連絡先を本当に削除してもよろしいですか?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1350
 #, 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
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1361
+#: ../src/calendar/gui/e-comp-editor.c:1997 ../src/e-util/e-focus-tracker.c:783
+#: ../src/e-util/evolution-source-viewer.c:806
+#: ../src/mail/e-mail-account-manager.c:737
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1090
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:676
+#: ../src/modules/calendar/e-task-shell-view-actions.c:830
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
+#: ../src/shell/e-shell-window-actions.c:822
+#: ../src/smime/gui/certificate-manager.c:1672 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "削除(_D)"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1476
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1508
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1053,109 +4980,101 @@ msgstr[0] ""
 "%d 個の連絡先を %d 個の新しいウィンドウで開こうとしています。\n"
 "本当にこれらの連絡先をすべて表示してもよろしいですか?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
-msgid "_Don't Display"
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1516
+#, fuzzy
+#| msgid "_Don't Display"
+msgid "_Don’t Display"
 msgstr "表示しない(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1517
 msgid "Display _All Contacts"
 msgstr "すべての連絡先の表示(_A)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "File As"
 msgstr "別名"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Given Name"
 msgstr "クリスチャンネーム"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Family Name"
 msgstr "苗字"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
-msgid "Nickname"
-msgstr "あだ名"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "メール2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 msgid "Email 3"
 msgstr "メール3"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Assistant Phone"
 msgstr "アシスタントの電話"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 msgid "Business Phone"
 msgstr "仕事の電話"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Business Phone 2"
 msgstr "仕事の電話2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Business Fax"
 msgstr "仕事の FAX"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Callback Phone"
 msgstr "得意先の電話"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Car Phone"
 msgstr "車載電話"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Company Phone"
 msgstr "会社の電話"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Home Phone"
 msgstr "自宅の電話"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Phone 2"
 msgstr "自宅の電話2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "自宅の FAX"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "ISDN Phone"
 msgstr "ISDN 電話"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:689
-msgid "Mobile Phone"
-msgstr "携帯電話"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "その他の電話"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Other Fax"
 msgstr "その他の FAX"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Pager"
 msgstr "ポケベル"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Primary Phone"
 msgstr "電話"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Radio"
 msgstr "ラジオ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Telex"
 msgstr "テレックス"
 
@@ -1165,96 +5084,96 @@ msgstr "テレックス"
 #. Device for Deaf". However, you probably want to leave this
 #. abbreviation unchanged unless you know that there is actually a
 #. different and established translation for this in your language.
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
-msgid "Company"
-msgstr "会社"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "単位"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
-msgid "Office"
-msgstr "事務所"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "敬称 (前つけ)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:666
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: ../src/calendar/gui/e-meeting-list-view.c:658
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "役割"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../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:657
-msgid "Assistant"
-msgstr "アシスタント"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "ウェブサイト"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:42
 msgid "Journal"
 msgstr "ジャーナル"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../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:87
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:6
+#: ../src/calendar/gui/e-memo-table.etspec.h:4
+#: ../src/calendar/gui/e-task-table.etspec.h:12
+#: ../src/e-util/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "カテゴリ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:693
-msgid "Spouse"
-msgstr "配偶者"
+#: ../src/addressbook/gui/widgets/ea-minicard.c:31
+msgid "Open"
+msgstr "開く"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:748
-msgid "Note"
-msgstr "ノート"
+#: ../src/addressbook/gui/widgets/ea-minicard.c:157
+msgid "Contact List: "
+msgstr "連絡先の一覧: "
+
+#: ../src/addressbook/gui/widgets/ea-minicard.c:158
+msgid "Contact: "
+msgstr "連絡先: "
+
+#: ../src/addressbook/gui/widgets/ea-minicard.c:180
+msgid "evolution minicard"
+msgstr "Evolution ミニカード"
+
+#: ../src/addressbook/gui/widgets/ea-minicard-view.c:33
+msgid "New Contact"
+msgstr "新しい連絡先"
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:375
+#: ../src/addressbook/gui/widgets/ea-minicard-view.c:34
+msgid "New Contact List"
+msgstr "新しい連絡先の一覧"
+
+#: ../src/addressbook/gui/widgets/ea-minicard-view.c:206
+#, 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個のカードがあります"
+
+#: ../src/addressbook/gui/widgets/e-contact-map-window.c:374
 msgid "Contacts Map"
 msgstr "連絡先の地図"
 
 #. Zoom-in button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:410
+#: ../src/addressbook/gui/widgets/e-contact-map-window.c:409
 #, 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
+#: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
+#: ../src/mail/e-mail-reader.c:2421
 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"
+#: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
+#: ../src/e-util/e-html-editor-actions.c:1872
+#: ../src/e-util/e-html-editor-find-dialog.c:250
+#: ../src/shell/e-shell-window-actions.c:899
 msgid "_Find"
-msgstr "今すぐ検索(_F)"
+msgstr "検索(_F)"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1264,7 +5183,7 @@ msgstr ""
 "\n"
 "連絡先の検索中..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1278,7 +5197,7 @@ msgstr ""
 "\n"
 "または、ダブルクリックして新しい連絡先を作成してください。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1292,7 +5211,7 @@ msgstr ""
 "\n"
 "ダブルクリックをして新しい連絡先を作成してください。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:200
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1302,7 +5221,7 @@ msgstr ""
 "\n"
 "連絡先の検索です。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:202
+#: ../src/addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1312,2031 +5231,2761 @@ msgstr ""
 "\n"
 "このビューの中に表示できるアイテムはありません。"
 
-#: ../addressbook/gui/widgets/e-minicard.c:92
-msgid "Work Email"
-msgstr "勤務先のメール"
-
-#: ../addressbook/gui/widgets/e-minicard.c:93
-msgid "Home Email"
-msgstr "自宅のメール"
-
-#: ../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: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:35
-msgid "New Contact"
-msgstr "新しい連絡先"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact List"
-msgstr "新しい連絡先の一覧"
-
-#: ../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:33
-msgid "Open"
-msgstr "開く"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:159
-msgid "Contact List: "
-msgstr "連絡先の一覧: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:160
-msgid "Contact: "
-msgstr "連絡先: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:187
-msgid "evolution minicard"
-msgstr "Evolution ミニカード"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:149
-msgid "Copy _Email Address"
-msgstr "メールアドレスのコピー(_E)"
-
-#: ../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: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: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: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:136
-msgid "Open map"
-msgstr "地図を開く"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:535
-msgid "List Members:"
-msgstr "リストのメンバー:"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
-msgid "Department"
-msgstr "担当部署"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
-msgid "Profession"
-msgstr "団体"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
-msgid "Position"
-msgstr "役職"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:658
-msgid "Video Chat"
-msgstr "ビデオチャット"
-
-#: ../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: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:661
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:688
-msgid "Phone"
-msgstr "電話"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:662
-msgid "Fax"
-msgstr "FAX"
-
-#: ../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:686
-msgid "Home Page"
-msgstr "ホームページ"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
-msgid "Web Log"
-msgstr "ブログ"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
-msgid "Personal"
-msgstr "プライベート"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:944
-msgid "List Members"
-msgstr "メンバーのリスト化"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:965
-msgid "Job Title"
-msgstr "勤務先"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1006
-msgid "Home page"
-msgstr "ホームページ"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1016
-msgid "Blog"
-msgstr "ブログ"
-
-#: ../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: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: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: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:172
-msgid "Detailed error message:"
-msgstr "エラーの詳細:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this address book."
-msgstr ""
-"サーバー側で設定されている検索結果の個数またはクライアント側で\n"
-"設定されている表示可能な個数以上の検索結果が見つかりました。\n"
-"さらにキーワードを追加して絞り込み検索を行うか、このアドレス帳の\n"
-"ディレクトリサーバーに対する設定で検索結果の上限を上げてみてください。"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:218
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"configured for this address book.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this address book."
-msgstr ""
-"この検索にかかった時間がサーバーの制限時間または\n"
-"このアドレス帳に対して設定した制限時間を越えました。\n"
-"さらにキーワードを追加して絞り込み検索を行うか、このアドレス帳の\n"
-"ディレクトリサーバーに対する設定で制限時間の上限を上げてみてください。"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:226
-#, c-format
-msgid "The backend for this address book was unable to parse this query. %s"
-msgstr "このアドレス帳のバックエンドは、この問い合わせを解析できませんでした。 %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:231
-#, c-format
-msgid "The backend for this address book refused to perform this query. %s"
-msgstr "このアドレス帳のバックエンドは、この問い合わせの実行を拒否しました。 %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:237
-#: ../addressbook/gui/widgets/eab-gui-util.c:243
-#, c-format
-msgid "This query did not complete successfully. %s"
-msgstr "この問い合わせは完全に終了しませんでした。 %s"
-
-#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:265
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-msgid "Select Address Book"
-msgstr "アドレス帳の選択"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:398
-msgid "list"
-msgstr "一覧"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:587
-msgid "Move contact to"
-msgstr "連絡先の移動先"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:589
-msgid "Copy contact to"
-msgstr "連絡先のコピー先"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:592
-msgid "Move contacts to"
-msgstr "複数の連絡先の移動先"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
-msgid "Copy contacts to"
-msgstr "複数の連絡先のコピー先"
-
-#: ../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
+#: ../src/addressbook/importers/evolution-csv-importer.c:745
+#: ../src/addressbook/importers/evolution-ldif-importer.c:547
+#: ../src/addressbook/importers/evolution-vcard-importer.c:247
+#: ../src/calendar/importers/icalendar-importer.c:479
+#: ../src/calendar/importers/icalendar-importer.c:976
+#: ../src/calendar/importers/icalendar-importer.c:1016
+#: ../src/shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "インポート中..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1081
+#: ../src/addressbook/importers/evolution-csv-importer.c:927
+#, fuzzy
+#| msgid "Can not open file"
+msgid "Can’t open .csv file"
+msgstr "ファイルを開けません"
+
+#: ../src/addressbook/importers/evolution-csv-importer.c:1096
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlook の連絡先 CSV/Tab ファイル (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1082
+#: ../src/addressbook/importers/evolution-csv-importer.c:1097
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlook 連絡先 CSV/Tab インポーター"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1090
+#: ../src/addressbook/importers/evolution-csv-importer.c:1105
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozilla の連絡先 CSV/Tab ファイル (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1091
+#: ../src/addressbook/importers/evolution-csv-importer.c:1106
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilla 連絡先 CSV/Tab インポーター"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1099
+#: ../src/addressbook/importers/evolution-csv-importer.c:1114
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolution の連絡先 CSV/Tab ファイル (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1100
+#: ../src/addressbook/importers/evolution-csv-importer.c:1115
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolution 連絡先 CSV/Tab インポーター"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:806
+#: ../src/addressbook/importers/evolution-ldif-importer.c:717
+#, fuzzy
+#| msgid "Can not open file"
+msgid "Can’t open .ldif file"
+msgstr "ファイルを開けません"
+
+#: ../src/addressbook/importers/evolution-ldif-importer.c:819
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP データ交換フォーマット (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:807
+#: ../src/addressbook/importers/evolution-ldif-importer.c:820
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF インポーター"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:634
+#: ../src/addressbook/importers/evolution-vcard-importer.c:644
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf、.gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:635
+#: ../src/addressbook/importers/evolution-vcard-importer.c:645
 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:763
+#: ../src/addressbook/printing/e-contact-print.c:872
 #, c-format
 msgid "Page %d"
 msgstr "ページ %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
-msgid "Specify the output file instead of standard output"
-msgstr "標準出力のかわりに出力するファイルを指定する"
+#: ../src/addressbook/util/eab-book-util.c:34
+#, fuzzy
+#| msgid "Work Email"
+msgctxt "addressbook-label"
+msgid "Work Email"
+msgstr "勤務先のメール"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
-msgid "OUTPUTFILE"
-msgstr "OUTPUTFILE"
+#: ../src/addressbook/util/eab-book-util.c:35
+#, fuzzy
+#| msgid "Home Email"
+msgctxt "addressbook-label"
+msgid "Home Email"
+msgstr "自宅のメール"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
-msgid "List local address book folders"
-msgstr "ローカルにあるアドレス帳フォルダーの一覧を出力する"
+#: ../src/addressbook/util/eab-book-util.c:36
+#, fuzzy
+#| msgid "Other Email"
+msgctxt "addressbook-label"
+msgid "Other Email"
+msgstr "その他のメール"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
-msgid "Show cards as vcard or csv file"
-msgstr "表示するカードの種類を指定する (vCard または CSV 形式)"
+#: ../src/addressbook/util/eab-book-util.c:42
+#, fuzzy
+#| msgid "Work"
+msgctxt "addressbook-label"
+msgid "Work SIP"
+msgstr "仕事"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
-msgid "[vcard|csv]"
-msgstr "[vcard|csv]"
+#: ../src/addressbook/util/eab-book-util.c:43
+#, fuzzy
+#| msgid "Home Page"
+msgctxt "addressbook-label"
+msgid "Home SIP"
+msgstr "ホームページ"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
-msgid "Command line arguments error, please use --help option to see the usage."
-msgstr "コマンドラインの引数エラーです (`--help` を指定してオプションを確認してください)"
+#: ../src/addressbook/util/eab-book-util.c:44
+#, fuzzy
+#| msgid "Other"
+msgctxt "addressbook-label"
+msgid "Other SIP"
+msgstr "その他"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:147
-msgid "Only support csv or vcard format."
-msgstr "CSV または vCard のフォーマットのみサポートしています"
+#: ../src/addressbook/util/eab-book-util.c:72
+msgctxt "addressbook-label"
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:178
-msgid "Unhandled error"
-msgstr "処理できないエラー"
+#: ../src/addressbook/util/eab-book-util.c:73
+msgctxt "addressbook-label"
+msgid "Jabber"
+msgstr "Jabber"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:624
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-msgid "Can not open file"
-msgstr "ファイルを開けません"
+#: ../src/addressbook/util/eab-book-util.c:74
+msgctxt "addressbook-label"
+msgid "Yahoo"
+msgstr "Yahoo"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:75
-#, c-format
-msgid "Failed to open client '%s': %s"
-msgstr "クライアント '%s' を開けません: %s"
+#: ../src/addressbook/util/eab-book-util.c:75
+msgctxt "addressbook-label"
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:105
+#: ../src/addressbook/util/eab-book-util.c:76
+msgctxt "addressbook-label"
+msgid "MSN"
+msgstr "MSN"
+
+#: ../src/addressbook/util/eab-book-util.c:77
+msgctxt "addressbook-label"
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../src/addressbook/util/eab-book-util.c:78
+msgctxt "addressbook-label"
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../src/addressbook/util/eab-book-util.c:79
+msgctxt "addressbook-label"
+msgid "Skype"
+msgstr "Skype"
+
+#: ../src/addressbook/util/eab-book-util.c:80
+msgctxt "addressbook-label"
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../src/addressbook/util/eab-book-util.c:81
+msgctxt "addressbook-label"
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#. To Translators:
+#. * if an email address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../src/addressbook/util/eab-book-util.c:124
+#, fuzzy
+#| msgid "Email"
+msgctxt "addressbook-label"
+msgid "Email"
+msgstr "メール"
+
+#. To Translators:
+#. * if a SIP address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * SIP=Session Initiation Protocol, used for voice over IP
+#.
+#: ../src/addressbook/util/eab-book-util.c:171
+msgctxt "addressbook-label"
+msgid "SIP"
+msgstr ""
+
+#. To Translators:
+#. * if an IM address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * IM=Instant Messaging
+#.
+#: ../src/addressbook/util/eab-book-util.c:214
+#, fuzzy
+#| msgid "AIM"
+msgctxt "addressbook-label"
+msgid "IM"
+msgstr "AIM"
+
+#. To Translators:
+#. * if a phone number type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../src/addressbook/util/eab-book-util.c:269
+#, fuzzy
+#| msgid "Phone"
+msgctxt "addressbook-label"
+msgid "Phone"
+msgstr "電話"
+
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:103
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分間"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:118
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:116
 msgid "hour"
 msgid_plural "hours"
 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:131
-#: ../calendar/gui/dialogs/recurrence-page.c:1249
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:129
 msgid "day"
 msgid_plural "days"
 msgstr[0] "日"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:343
+#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:357
 msgid "Start time"
 msgstr "開始時刻"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:1
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:1
+#: ../src/calendar/alarm-notify/alarm-queue.c:1988
 msgid "Appointments"
 msgstr "予定"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:2
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:2
 msgid "Dismiss _All"
 msgstr "すべて停止(_A)"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:3
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:3
 msgid "_Snooze"
 msgstr "再通知(_S)"
 
-#: ../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
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:4
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1363
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
+#: ../src/calendar/gui/e-comp-editor.c:2062
+#: ../src/e-util/e-html-editor-actions.c:922
+#: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/filter.ui.h:24
+#: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:171
+#: ../src/mail/e-mail-label-manager.c:380
+#: ../src/mail/em-folder-properties.c:1034 ../src/mail/mail-config.ui.h:65
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:548
+#: ../src/plugins/email-custom-header/email-custom-header.c:842
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../src/plugins/templates/templates.c:468
+#: ../src/shell/e-shell-window-actions.c:950 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#, fuzzy
-#| msgid "Print"
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:5
 msgid "_Print"
-msgstr "印刷"
+msgstr "印刷(_P)"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:165
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../src/e-util/e-alert-dialog.c:162
 msgid "_Dismiss"
 msgstr "停止(_D)"
 
-#: ../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
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../src/calendar/alarm-notify/alarm-queue.c:1955
+#: ../src/calendar/alarm-notify/alarm-queue.c:1965
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
+#: ../src/modules/itip-formatter/itip-view.c:1678
+#: ../src/modules/itip-formatter/itip-view.c:1789
 msgid "Location:"
 msgstr "場所:"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:8
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:8
 msgid "location of appointment"
 msgstr "予定の場所"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
+#: ../src/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:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
-#: ../e-util/e-interval-chooser.c:142
-#: ../modules/calendar/e-cal-shell-view-actions.c:351
-#: ../plugins/publish-calendar/publish-calendar.ui.h:6
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:10
+#: ../src/e-util/e-interval-chooser.c:144 ../src/e-util/filter.ui.h:8
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:342
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "日"
 
-#: ../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:140
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:11
+#: ../src/e-util/e-interval-chooser.c:142 ../src/e-util/filter.ui.h:7
 msgid "hours"
 msgstr "時間"
 
-#: ../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:138
-#: ../mail/e-mail-config-provider-page.c:526
+#: ../src/calendar/alarm-notify/alarm-notify.ui.h:12
+#: ../src/e-util/e-interval-chooser.c:140 ../src/e-util/filter.ui.h:6
+#: ../src/mail/e-mail-config-provider-page.c:571
 msgid "minutes"
 msgstr "分"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1678
-#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../src/calendar/alarm-notify/alarm-queue.c:1756
+#: ../src/calendar/alarm-notify/alarm-queue.c:1936
 msgid "No summary available."
 msgstr "サマリはありません。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1687
-#: ../calendar/alarm-notify/alarm-queue.c:1689
+#: ../src/calendar/alarm-notify/alarm-queue.c:1765
+#: ../src/calendar/alarm-notify/alarm-queue.c:1767
 msgid "No description available."
 msgstr "説明はありません。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1697
+#: ../src/calendar/alarm-notify/alarm-queue.c:1775
 msgid "No location information available."
 msgstr "場所の情報はありません。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1702
-#: ../calendar/alarm-notify/alarm-queue.c:1806
-#: ../calendar/alarm-notify/alarm-queue.c:2147
+#: ../src/calendar/alarm-notify/alarm-queue.c:1780
+#: ../src/calendar/alarm-notify/alarm-queue.c:1927
+#: ../src/calendar/alarm-notify/alarm-queue.c:2278
 msgid "Evolution Reminders"
 msgstr "Evolution リマインダー"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1746
+#: ../src/calendar/alarm-notify/alarm-queue.c:1823
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "%d個のリマインダーがあります"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1965
+#: ../src/calendar/alarm-notify/alarm-queue.c:2096
 msgid "Warning"
 msgstr "警告"
 
-#: ../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
+#: ../src/calendar/alarm-notify/alarm-queue.c:2097
+#: ../src/mail/mail-dialogs.ui.h:20
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:112
 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
+#: ../src/calendar/alarm-notify/alarm-queue.c:2098
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:113
 msgid "_Yes"
 msgstr "はい(_Y)"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1971
+#: ../src/calendar/alarm-notify/alarm-queue.c:2102
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following 
program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Evolution カレンダーのリマインダーが呼び出されました。このリマインダーは次のプログラムを起動するように設定されています。\n"
+"Evolution カレンダーのリマインダーが呼び出されました。このリマインダーは次の"
+"プログラムを起動するように設定されています。\n"
 "\n"
 "        %s\n"
 "\n"
 "本当に、このプログラムを起動してもよろしいですか?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1986
+#: ../src/calendar/alarm-notify/alarm-queue.c:2117
 msgid "Do not ask me about this program again."
 msgstr "このメッセージを二度と表示しない"
 
-#: ../calendar/alarm-notify/util.c:43
+#: ../src/calendar/alarm-notify/util.c:65
 msgid "invalid time"
 msgstr "時間が正しくありません"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:369
-#: ../calendar/gui/misc.c:103
+#. Translator: Entire string is like "Pop up an alert %d days before start"
+#: ../src/calendar/alarm-notify/util.c:91
+#: ../src/calendar/gui/e-alarm-list.c:368 ../src/calendar/gui/misc.c:95
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d日間"
+
+#. Translator: Entire string is like "Pop up an alert %d hours before start"
+#: ../src/calendar/alarm-notify/util.c:97
+#: ../src/calendar/gui/e-alarm-list.c:380 ../src/calendar/gui/misc.c:101
 #, 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:75 ../calendar/gui/e-alarm-list.c:375
-#: ../calendar/gui/misc.c:109
+#. Translator: Entire string is like "Pop up an alert %d minutes before start"
+#: ../src/calendar/alarm-notify/util.c:103
+#: ../src/calendar/gui/e-alarm-list.c:386 ../src/calendar/gui/misc.c:107
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 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"
+#. Translator: Entire string is like "Pop up an alert %d seconds before start"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:381
-#: ../calendar/gui/misc.c:113
+#: ../src/calendar/alarm-notify/util.c:107
+#: ../src/calendar/gui/e-alarm-list.c:392 ../src/calendar/gui/misc.c:111
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d秒間"
 
-#: ../calendar/calendar.error.xml.h:1
+#: ../src/calendar/calendar.error.xml.h:1
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "出席者全員に会議キャンセル通知を送信しますか?"
 
-#: ../calendar/calendar.error.xml.h:2
-msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
-msgstr "キャンセル通知を送信しないと、会議がキャンセルされたことが他の出席者には周知されないかもしれません。"
+#: ../src/calendar/calendar.error.xml.h:2
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+"キャンセル通知を送信しないと、会議がキャンセルされたことが他の出席者には周知"
+"されないかもしれません。"
 
-#: ../calendar/calendar.error.xml.h:3
+#: ../src/calendar/calendar.error.xml.h:3
 msgid "Do _not Send"
 msgstr "送信しない(_N)"
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../src/calendar/calendar.error.xml.h:4
 msgid "_Send Notice"
 msgstr "通知する(_S)"
 
-#: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:192
+#: ../src/calendar/calendar.error.xml.h:5
+#: ../src/calendar/gui/e-cal-dialogs.c:507
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "本当にこの会議を削除してもよろしいですか?"
 
-#: ../calendar/calendar.error.xml.h:6
-msgid "All information on this meeting will be deleted and can not be restored."
+#: ../src/calendar/calendar.error.xml.h:6
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr "この会議のすべての情報が削除されるので復旧できなくなります。"
 
-#: ../calendar/calendar.error.xml.h:8
-msgid "If you do not send a cancelation notice, the other participants may not know the task has been 
deleted."
-msgstr "キャンセル通知を送信しないと、タスクが削除されたことが他の出席者には周知されないかもしれません。"
+#: ../src/calendar/calendar.error.xml.h:8
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+"キャンセル通知を送信しないと、タスクが削除されたことが他の出席者には周知され"
+"ないかもしれません。"
 
-#: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:195
+#: ../src/calendar/calendar.error.xml.h:9
+#: ../src/calendar/gui/e-cal-dialogs.c:510
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "本当にこのタスクを削除してもよろしいですか?"
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../src/calendar/calendar.error.xml.h:10
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "このタスクのすべての情報が削除されるので復旧できなくなります。"
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../src/calendar/calendar.error.xml.h:11
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "このメモのキャンセル通知を送信しますか?"
 
-#: ../calendar/calendar.error.xml.h:12
-msgid "If you do not send a cancelation notice, the other participants may not know the memo has been 
deleted."
-msgstr "キャンセル通知を送信しないと、メモが削除されたことが他の出席者には周知されないかもしれません。"
+#: ../src/calendar/calendar.error.xml.h:12
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
+msgstr ""
+"キャンセル通知を送信しないと、メモが削除されたことが他の出席者には周知されな"
+"いかもしれません。"
 
-#: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:198
+#: ../src/calendar/calendar.error.xml.h:13
+#: ../src/calendar/gui/e-cal-dialogs.c:513
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "本当にこのメモを削除してもよろしいですか?"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../src/calendar/calendar.error.xml.h:14
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr "このメモのすべての情報が削除されるので復旧できなくなります。"
 
-#: ../calendar/calendar.error.xml.h:15
-msgid "Are you sure you want to delete the meeting titled '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:15
+#, fuzzy
+#| msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgid "Are you sure you want to delete the meeting titled “{0}”?"
 msgstr "本当に '{0}' というタイトルの会議を削除してもよろしいですか?"
 
-#: ../calendar/calendar.error.xml.h:16
-msgid "Are you sure you want to delete the appointment titled '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:16
+#, fuzzy
+#| msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgid "Are you sure you want to delete the appointment titled “{0}”?"
 msgstr "本当にサマリが '{0}' の予定を削除してもよろしいですか?"
 
-#: ../calendar/calendar.error.xml.h:17
-msgid "All information on this appointment will be deleted and can not be restored."
+#: ../src/calendar/calendar.error.xml.h:17
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
 msgstr "この予定の情報がすべて削除されるので復旧できなくなります。"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../src/calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete this appointment?"
 msgstr "本当にこの予定を削除してもよろしいですか?"
 
-#: ../calendar/calendar.error.xml.h:19
-msgid "Are you sure you want to delete the '{0}' task?"
+#: ../src/calendar/calendar.error.xml.h:19
+#, fuzzy
+#| msgid "Are you sure you want to delete the '{0}' task?"
+msgid "Are you sure you want to delete the “{0}” task?"
 msgstr "本当に '{0}' というタスクを削除してもよろしいですか?"
 
-#: ../calendar/calendar.error.xml.h:20
-msgid "Are you sure you want to delete the memo '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:20
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete the memo “{0}”?"
 msgstr "本当に '{0}' というメモを削除してもよろしいですか?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../src/calendar/calendar.error.xml.h:21
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr "このメモにあるすべての情報が削除されるので復旧できなくなります。"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../src/calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "本当に {0}個の予定を削除してもよろしいですか?"
 
-#: ../calendar/calendar.error.xml.h:23
-msgid "All information on these appointments will be deleted and can not be restored."
+#: ../src/calendar/calendar.error.xml.h:23
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
 msgstr "これらの予定の情報がすべて削除されるので復旧できなくなります。"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../src/calendar/calendar.error.xml.h:24
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "本当に {0}個のタスクを削除してもよろしいですか?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../src/calendar/calendar.error.xml.h:25
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "これらのタスクの情報がすべて削除されるので復旧できなくなります。"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../src/calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "本当に {0}個のメモを削除してもよろしいですか?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../src/calendar/calendar.error.xml.h:27
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr "これらのメモの情報がすべて削除されるので復旧できなくなります。"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../src/calendar/calendar.error.xml.h:28
 msgid "Would you like to save your changes to this meeting?"
 msgstr "この会議の変更を保存しますか?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../src/calendar/calendar.error.xml.h:29
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "この会議は変更されていますが、まだ保存していません。"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../src/calendar/calendar.error.xml.h:30
 msgid "_Save Changes"
 msgstr "変更を保存する(_S)"
 
-#: ../calendar/calendar.error.xml.h:31
-#: ../composer/mail-composer.error.xml.h:16
+#: ../src/calendar/calendar.error.xml.h:31
+#: ../src/composer/mail-composer.error.xml.h:13
 msgid "_Discard Changes"
 msgstr "変更を破棄する(_D)"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../src/calendar/calendar.error.xml.h:32
 msgid "Would you like to save your changes to this appointment?"
 msgstr "この予定の変更を保存しますか?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../src/calendar/calendar.error.xml.h:33
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "この予定は変更されていますが、まだ保存していません。"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../src/calendar/calendar.error.xml.h:34
 msgid "Would you like to save your changes to this task?"
 msgstr "このタスクの変更を保存しますか?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../src/calendar/calendar.error.xml.h:35
 msgid "You have changed this task, but not yet saved it."
 msgstr "このタスクは変更されていますが、まだ保存していません。"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../src/calendar/calendar.error.xml.h:36
 msgid "Would you like to save your changes to this memo?"
 msgstr "このメモの変更を保存しますか?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../src/calendar/calendar.error.xml.h:37
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "このメモは変更されていますが、まだ保存していません。"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../src/calendar/calendar.error.xml.h:38
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "会議開催通知を出席者へ送信しますか?"
 
-#: ../calendar/calendar.error.xml.h:39
-msgid "Email invitations will be sent to all participants and allow them to reply."
-msgstr "すべての出席者へ会議開催通知を送信するので返事をお願いできるようになります。"
+#: ../src/calendar/calendar.error.xml.h:39
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+"すべての出席者へ会議開催通知を送信するので返事をお願いできるようになります。"
 
-#: ../calendar/calendar.error.xml.h:40
-#: ../composer/mail-composer.error.xml.h:13 ../mail/mail.error.xml.h:8
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../src/calendar/calendar.error.xml.h:40
+#: ../src/composer/mail-composer.error.xml.h:38 ../src/mail/mail.error.xml.h:8
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "送信する(_S)"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../src/calendar/calendar.error.xml.h:41
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "更新した会議の情報を出席者へ送信しますか?"
 
-#: ../calendar/calendar.error.xml.h:42
-msgid "Sending updated information allows other participants to keep their calendars up to date."
-msgstr "更新した情報を送信すると、他の出席者が自分たちのカレンダー情報を更新できるようになります。"
+#: ../src/calendar/calendar.error.xml.h:42
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+"更新した情報を送信すると、他の出席者が自分たちのカレンダー情報を更新できるよ"
+"うになります。"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../src/calendar/calendar.error.xml.h:43
 msgid "Would you like to send this task to participants?"
 msgstr "このタスクを出席者へ送信しますか?"
 
-#: ../calendar/calendar.error.xml.h:44
-msgid "Email invitations will be sent to all participants and allow them to accept this task."
-msgstr "すべての出席者へ会議開催通知を送信するので、このタスクを受諾することができます。"
+#: ../src/calendar/calendar.error.xml.h:44
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+"すべての出席者へ会議開催通知を送信するので、このタスクを受諾することができま"
+"す。"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../src/calendar/calendar.error.xml.h:45
 msgid "Download in progress. Do you want to save the task?"
 msgstr "ダウンロード中です。タスクを保存しますか?"
 
-#: ../calendar/calendar.error.xml.h:46
-msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
-msgstr "添付ファイルをダウンロードしています。ここでタスクを保存してしまうと、いくつかの添付ファイルが失われてしまいます。"
+#: ../src/calendar/calendar.error.xml.h:46
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+"添付ファイルをダウンロードしています。ここでタスクを保存してしまうと、いくつ"
+"かの添付ファイルが失われてしまいます。"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../src/calendar/calendar.error.xml.h:48
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "ダウンロード中です。予定を保存しますか?"
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these 
attachments."
-msgstr "添付ファイルをダウンロードしています。ここで予定を保存してしまうと、いくつかの添付ファイルが失われてしまいます。"
+#: ../src/calendar/calendar.error.xml.h:49
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
+"添付ファイルをダウンロードしています。ここで予定を保存してしまうと、いくつか"
+"の添付ファイルが失われてしまいます。"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../src/calendar/calendar.error.xml.h:50
 msgid "Would you like to send updated task information to participants?"
 msgstr "更新したタスク情報を出席者へ送信しますか?"
 
-#: ../calendar/calendar.error.xml.h:51
-msgid "Sending updated information allows other participants to keep their task lists up to date."
-msgstr "更新した情報を送信すると、他の出席者が自分たちのタスクの一覧を更新できるようになります。"
+#: ../src/calendar/calendar.error.xml.h:51
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+"更新した情報を送信すると、他の出席者が自分たちのタスクの一覧を更新できるよう"
+"になります。"
+
+#: ../src/calendar/calendar.error.xml.h:52
+#, fuzzy
+#| msgid "Would you like to send this task to participants?"
+msgid "Would you like to send this memo to participants?"
+msgstr "このタスクを出席者へ送信しますか?"
+
+#: ../src/calendar/calendar.error.xml.h:53
+#, fuzzy
+#| msgid ""
+#| "Email invitations will be sent to all participants and allow them to "
+#| "accept this task."
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this memo."
+msgstr ""
+"すべての出席者へ会議開催通知を送信するので、このタスクを受諾することができま"
+"す。"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../src/calendar/calendar.error.xml.h:54
+#, fuzzy
+#| msgid "Would you like to send updated meeting information to participants?"
+msgid "Would you like to send updated memo information to participants?"
+msgstr "更新した会議の情報を出席者へ送信しますか?"
+
+#: ../src/calendar/calendar.error.xml.h:55
+#, fuzzy
+#| msgid ""
+#| "Sending updated information allows other participants to keep their task "
+#| "lists up to date."
+msgid ""
+"Sending updated information allows other participants to keep their memo "
+"lists up to date."
+msgstr ""
+"更新した情報を送信すると、他の出席者が自分たちのタスクの一覧を更新できるよう"
+"になります。"
+
+#: ../src/calendar/calendar.error.xml.h:56
 msgid "Editor could not be loaded."
 msgstr "エディターを読み込めませんでした。"
 
-#: ../calendar/calendar.error.xml.h:53
-msgid "Delete calendar '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:57
+#, fuzzy
+#| msgid "Delete calendar '{0}'?"
+msgid "Delete calendar “{0}”?"
 msgstr "'{0}' というカレンダーを削除しますか?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../src/calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "このカレンダーは完全に削除されます。"
 
-#: ../calendar/calendar.error.xml.h:55
-msgid "Delete task list '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:59
+#, fuzzy
+#| msgid "Delete task list '{0}'?"
+msgid "Delete task list “{0}”?"
 msgstr "タスクの一覧の '{0}' を削除しますか?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../src/calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "このタスクの一覧は完全に削除されます。"
 
-#: ../calendar/calendar.error.xml.h:57
-msgid "Delete memo list '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:61
+#, fuzzy
+#| msgid "Delete memo list '{0}'?"
+msgid "Delete memo list “{0}”?"
 msgstr "メモの一覧の '{0}' を削除しますか?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../src/calendar/calendar.error.xml.h:62
 msgid "This memo list will be removed permanently."
 msgstr "このメモの一覧は完全に削除されます。"
 
-#: ../calendar/calendar.error.xml.h:59
-msgid "Delete remote calendar '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:63
+#, fuzzy
+#| msgid "Delete remote calendar '{0}'?"
+msgid "Delete remote calendar “{0}”?"
 msgstr "'{0}' というリモートのカレンダーを削除しますか?"
 
-#: ../calendar/calendar.error.xml.h:60
-msgid "This will permanently remove the calendar '{0}' from the server. Are you sure you want to proceed?"
-msgstr "これはカレンダー '{0}' をサーバーから完全に抹消します。続けてよろしいですか?"
+#: ../src/calendar/calendar.error.xml.h:64
+#, fuzzy
+#| msgid ""
+#| "This will permanently remove the calendar '{0}' from the server. Are you "
+#| "sure you want to proceed?"
+msgid ""
+"This will permanently remove the calendar “{0}” from the server. Are you "
+"sure you want to proceed?"
+msgstr ""
+"これはカレンダー '{0}' をサーバーから完全に抹消します。続けてよろしいですか?"
 
-#: ../calendar/calendar.error.xml.h:62
-msgid "Delete remote task list '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:66
+#, fuzzy
+#| msgid "Delete remote task list '{0}'?"
+msgid "Delete remote task list “{0}”?"
 msgstr "リモートのタスク一覧 '{0}' を削除しますか?"
 
-#: ../calendar/calendar.error.xml.h:63
-msgid "This will permanently remove the task list '{0}' from the server. Are you sure you want to proceed?"
-msgstr "これはタスク一覧 '{0}' をサーバーから完全に抹消します。続けてよろしいですか?"
+#: ../src/calendar/calendar.error.xml.h:67
+#, fuzzy
+#| msgid ""
+#| "This will permanently remove the task list '{0}' from the server. Are you "
+#| "sure you want to proceed?"
+msgid ""
+"This will permanently remove the task list “{0}” from the server. Are you "
+"sure you want to proceed?"
+msgstr ""
+"これはタスク一覧 '{0}' をサーバーから完全に抹消します。続けてよろしいですか?"
 
-#: ../calendar/calendar.error.xml.h:64
-msgid "Delete remote memo list '{0}'?"
+#: ../src/calendar/calendar.error.xml.h:68
+#, fuzzy
+#| msgid "Delete remote memo list '{0}'?"
+msgid "Delete remote memo list “{0}”?"
 msgstr "リモートのメモ一覧 '{0}' を削除しますか?"
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "This will permanently remove the memo list '{0}' from the server. Are you sure you want to proceed?"
-msgstr "これはメモ一覧 '{0}' をサーバーから完全に抹消します。続けてよろしいですか?"
+#: ../src/calendar/calendar.error.xml.h:69
+#, fuzzy
+#| msgid ""
+#| "This will permanently remove the memo list '{0}' from the server. Are you "
+#| "sure you want to proceed?"
+msgid ""
+"This will permanently remove the memo list “{0}” from the server. Are you "
+"sure you want to proceed?"
+msgstr ""
+"これはメモ一覧 '{0}' をサーバーから完全に抹消します。続けてよろしいですか?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../src/calendar/calendar.error.xml.h:70
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "本当にサマリのない予定を保存してもよろしいですか?"
 
-#: ../calendar/calendar.error.xml.h:67
-msgid "Adding a meaningful summary to your appointment will give you an idea of what your appointment is 
about."
-msgstr "予定に意味のあるサマリを追加しておくと、何についての予定だったのかがわかりやすくなります。"
+#: ../src/calendar/calendar.error.xml.h:71
+msgid ""
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
+msgstr ""
+"予定に意味のあるサマリを追加しておくと、何についての予定だったのかがわかりや"
+"すくなります。"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../src/calendar/calendar.error.xml.h:72
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "本当にサマリのないタスクを保存してもよろしいですか?"
 
-#: ../calendar/calendar.error.xml.h:69
-msgid "Adding a meaningful summary to your task will give you an idea of what your task is about."
-msgstr "タスクに意味のあるサマリを追加しておくと、何についてのタスクだったのかがわかりやすくなります。"
+#: ../src/calendar/calendar.error.xml.h:73
+msgid ""
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
+msgstr ""
+"タスクに意味のあるサマリを追加しておくと、何についてのタスクだったのかがわか"
+"りやすくなります。"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../src/calendar/calendar.error.xml.h:74
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "本当にサマリのないメモを保存してもよろしいですか?"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:72
-msgid "Error loading calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:76
+#, fuzzy
+#| msgid "Error loading calendar '{0}'"
+msgid "Error loading calendar “{0}”"
 msgstr "カレンダー '{0}' を読み込む際にエラー"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../src/calendar/calendar.error.xml.h:77
 msgid "The calendar is not marked for offline usage."
 msgstr "カレンダーがオフライン使用になっていません。"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../src/calendar/calendar.error.xml.h:78
 msgid "Cannot save event"
 msgstr "イベントを保存できません"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:76
-msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can 
accept appointments."
-msgstr "'{0}' は読み込み専用のカレンダーなので変更はできません。予定を書き込むことが可能なカレンダーを選択してください。"
+#: ../src/calendar/calendar.error.xml.h:80
+#, fuzzy
+#| msgid ""
+#| "'{0}' is a read-only calendar and cannot be modified. Please select a "
+#| "different calendar that can accept appointments."
+msgid ""
+"“{0}” is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr ""
+"'{0}' は読み込み専用のカレンダーなので変更はできません。予定を書き込むことが"
+"可能なカレンダーを選択してください。"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../src/calendar/calendar.error.xml.h:81
 msgid "Cannot save task"
 msgstr "タスクを保存できません"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:79
-msgid "'{0}' does not support assigned tasks, please select a different task list."
-msgstr "'{0}' は割り当てられたタスクをサポートしていません。別のタスク一覧を選んでください。"
+#: ../src/calendar/calendar.error.xml.h:83
+#, fuzzy
+#| msgid ""
+#| "'{0}' does not support assigned tasks, please select a different task "
+#| "list."
+msgid ""
+"“{0}” does not support assigned tasks, please select a different task list."
+msgstr ""
+"'{0}' は割り当てられたタスクをサポートしていません。別のタスク一覧を選んでく"
+"ださい。"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:81
-msgid "Error loading task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:85
+#, fuzzy
+#| msgid "Error loading task list '{0}'"
+msgid "Error loading task list “{0}”"
 msgstr "タスク一覧 '{0}' を読み込む際にエラー"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../src/calendar/calendar.error.xml.h:86
 msgid "The task list is not marked for offline usage."
 msgstr "タスクの一覧がオフライン使用になっていません。"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:84
-msgid "Error loading memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:88
+#, fuzzy
+#| msgid "Error loading memo list '{0}'"
+msgid "Error loading memo list “{0}”"
 msgstr "メモ一覧 '{0}' を読み込む際にエラー"
 
-#: ../calendar/calendar.error.xml.h:85
+#: ../src/calendar/calendar.error.xml.h:89
 msgid "The memo list is not marked for offline usage."
 msgstr "メモの一覧がオフライン使用になっていません。"
 
+#. Translators: {0} is the name of the calendar/memo list/task list.
+#: ../src/calendar/calendar.error.xml.h:91
+#, fuzzy
+#| msgid "Failed to copy a memo into the memo list '{0}'"
+msgid "Failed to add timezone to “{0}”"
+msgstr "メモ一覧 '{0}' へのメモのコピーに失敗しました"
+
+#. The {0} is a calendar/memo list/task list name, which is useless here
+#: ../src/calendar/calendar.error.xml.h:93
+#, fuzzy
+#| msgid "Could not save attachments"
+msgid "Failed to save attachments"
+msgstr "添付ファイルを保存できませでした"
+
+#. Translators: {0} is the name of the calendar.
+#: ../src/calendar/calendar.error.xml.h:95
+#, fuzzy
+#| msgid "Failed to copy an event into the calendar '{0}'"
+msgid "Failed to open calendar “{0}”"
+msgstr "カレンダー '{0}' へのイベントのコピーに失敗しました"
+
+#. Translators: {0} is the name of the memo list.
+#: ../src/calendar/calendar.error.xml.h:97
+#, fuzzy
+#| msgid "Failed to copy a memo into the memo list '{0}'"
+msgid "Failed to open memo list “{0}”"
+msgstr "メモ一覧 '{0}' へのメモのコピーに失敗しました"
+
+#. Translators: {0} is the name of the task list.
+#: ../src/calendar/calendar.error.xml.h:99
+#, fuzzy
+#| msgid "Failed to copy a task into the task list '{0}'"
+msgid "Failed to open task list “{0}”"
+msgstr "タスク一覧 '{0}' へのタスクのコピーに失敗しました"
+
+#. Translators: {0} is the name of the calendar.
+#: ../src/calendar/calendar.error.xml.h:101
+#, fuzzy
+#| msgid "Failed to copy an event into the calendar '{0}'"
+msgid "Failed to create an event in the calendar “{0}”"
+msgstr "カレンダー '{0}' へのイベントのコピーに失敗しました"
+
+#. Translators: {0} is the name of the memo list.
+#: ../src/calendar/calendar.error.xml.h:103
+#, fuzzy
+#| msgid "Failed to copy a memo into the memo list '{0}'"
+msgid "Failed to create a memo in the memo list “{0}”"
+msgstr "メモ一覧 '{0}' へのメモのコピーに失敗しました"
+
+#. Translators: {0} is the name of the task list.
+#: ../src/calendar/calendar.error.xml.h:105
+#, fuzzy
+#| msgid "Failed to copy a task into the task list '{0}'"
+msgid "Failed to create a task in the task list “{0}”"
+msgstr "タスク一覧 '{0}' へのタスクのコピーに失敗しました"
+
+#. Translators: {0} is the name of the calendar.
+#: ../src/calendar/calendar.error.xml.h:107
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to modify an event in the calendar “{0}”"
+msgstr "カレンダー '{0}' へのイベントの移動に失敗しました"
+
+#. Translators: {0} is the name of the memo list.
+#: ../src/calendar/calendar.error.xml.h:109
+#, fuzzy
+#| msgid "Failed to move a memo into the memo list '{0}'"
+msgid "Failed to modify a memo in the memo list “{0}”"
+msgstr "メモ一覧 '{0}' へのメモの移動に失敗しました"
+
+#. Translators: {0} is the name of the task list.
+#: ../src/calendar/calendar.error.xml.h:111
+#, fuzzy
+#| msgid "Failed to move a task into the task list '{0}'"
+msgid "Failed to modify a task in the task list “{0}”"
+msgstr "タスク一覧 '{0}' へのタスクの移動に失敗しました"
+
+#. Translators: {0} is the name of the calendar.
+#: ../src/calendar/calendar.error.xml.h:113
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to delete an event in the calendar “{0}”"
+msgstr "カレンダー '{0}' へのイベントの移動に失敗しました"
+
+#. Translators: {0} is the name of the memo list.
+#: ../src/calendar/calendar.error.xml.h:115
+#, fuzzy
+#| msgid "Failed to move a memo into the memo list '{0}'"
+msgid "Failed to delete a memo in the memo list “{0}”"
+msgstr "メモ一覧 '{0}' へのメモの移動に失敗しました"
+
+#. Translators: {0} is the name of the task list.
+#: ../src/calendar/calendar.error.xml.h:117
+#, fuzzy
+#| msgid "Failed to move a task into the task list '{0}'"
+msgid "Failed to delete a task in the task list “{0}”"
+msgstr "タスク一覧 '{0}' へのタスクの移動に失敗しました"
+
+#. Translators: {0} is the name of the calendar.
+#: ../src/calendar/calendar.error.xml.h:119
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to update an event in the calendar “{0}”"
+msgstr "カレンダー '{0}' へのイベントの移動に失敗しました"
+
+#. Translators: {0} is the name of the memo list.
+#: ../src/calendar/calendar.error.xml.h:121
+#, fuzzy
+#| msgid "Failed to move a memo into the memo list '{0}'"
+msgid "Failed to update a memo in the memo list “{0}”"
+msgstr "メモ一覧 '{0}' へのメモの移動に失敗しました"
+
+#. Translators: {0} is the name of the task list.
+#: ../src/calendar/calendar.error.xml.h:123
+#, fuzzy
+#| msgid "Failed to move a task into the task list '{0}'"
+msgid "Failed to update a task in the task list “{0}”"
+msgstr "タスク一覧 '{0}' へのタスクの移動に失敗しました"
+
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:87
-msgid "Failed to copy an event into the calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:125
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to send an event to the calendar “{0}”"
+msgstr "カレンダー '{0}' へのイベントの移動に失敗しました"
+
+#. Translators: {0} is the name of the memo list.
+#: ../src/calendar/calendar.error.xml.h:127
+#, fuzzy
+#| msgid "Failed to move a memo into the memo list '{0}'"
+msgid "Failed to send a memo to the memo list “{0}”"
+msgstr "メモ一覧 '{0}' へのメモの移動に失敗しました"
+
+#. Translators: {0} is the name of the task list.
+#: ../src/calendar/calendar.error.xml.h:129
+#, fuzzy
+#| msgid "Failed to move a task into the task list '{0}'"
+msgid "Failed to send a task to the task list “{0}”"
+msgstr "タスク一覧 '{0}' へのタスクの移動に失敗しました"
+
+#. Translators: {0} is the name of the calendar.
+#: ../src/calendar/calendar.error.xml.h:131
+#, fuzzy
+#| msgid "Error loading calendar '{0}'"
+msgid "Error creating view for the calendar “{0}”"
+msgstr "カレンダー '{0}' を読み込む際にエラー"
+
+#. Translators: {0} is the name of the task list.
+#: ../src/calendar/calendar.error.xml.h:133
+#, fuzzy
+#| msgid "Error loading task list '{0}'"
+msgid "Error creating view for the task list “{0}”"
+msgstr "タスク一覧 '{0}' を読み込む際にエラー"
+
+#. Translators: {0} is the name of the memo list.
+#: ../src/calendar/calendar.error.xml.h:135
+#, fuzzy
+#| msgid "Error loading memo list '{0}'"
+msgid "Error creating view for the memo list “{0}”"
+msgstr "メモ一覧 '{0}' を読み込む際にエラー"
+
+#. Translators: {0} is the name of the calendar.
+#: ../src/calendar/calendar.error.xml.h:137
+#, fuzzy
+#| msgid "Failed to copy an event into the calendar '{0}'"
+msgid "Failed to copy an event into the calendar “{0}”"
 msgstr "カレンダー '{0}' へのイベントのコピーに失敗しました"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:89
-msgid "Failed to copy a task into the task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:139
+#, fuzzy
+#| msgid "Failed to copy a task into the task list '{0}'"
+msgid "Failed to copy a task into the task list “{0}”"
 msgstr "タスク一覧 '{0}' へのタスクのコピーに失敗しました"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:91
-msgid "Failed to copy a memo into the memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:141
+#, fuzzy
+#| msgid "Failed to copy a memo into the memo list '{0}'"
+msgid "Failed to copy a memo into the memo list “{0}”"
 msgstr "メモ一覧 '{0}' へのメモのコピーに失敗しました"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:93
-msgid "Failed to move an event into the calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:143
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to move an event into the calendar “{0}”"
 msgstr "カレンダー '{0}' へのイベントの移動に失敗しました"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:95
-msgid "Failed to move a task into the task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:145
+#, fuzzy
+#| msgid "Failed to move a task into the task list '{0}'"
+msgid "Failed to move a task into the task list “{0}”"
 msgstr "タスク一覧 '{0}' へのタスクの移動に失敗しました"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:97
-msgid "Failed to move a memo into the memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:147
+#, fuzzy
+#| msgid "Failed to move a memo into the memo list '{0}'"
+msgid "Failed to move a memo into the memo list “{0}”"
+msgstr "メモ一覧 '{0}' へのメモの移動に失敗しました"
+
+#. Translators: {0} is the name of the calendar.
+#: ../src/calendar/calendar.error.xml.h:149
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to get an event from the calendar “{0}”"
+msgstr "カレンダー '{0}' へのイベントの移動に失敗しました"
+
+#. Translators: {0} is the name of the task list.
+#: ../src/calendar/calendar.error.xml.h:151
+#, fuzzy
+#| msgid "Failed to move a task into the task list '{0}'"
+msgid "Failed to get a task from the task list “{0}”"
+msgstr "タスク一覧 '{0}' へのタスクの移動に失敗しました"
+
+#. Translators: {0} is the name of the memo list.
+#: ../src/calendar/calendar.error.xml.h:153
+#, fuzzy
+#| msgid "Failed to move a memo into the memo list '{0}'"
+msgid "Failed to get a memo from the memo list “{0}”"
 msgstr "メモ一覧 '{0}' へのメモの移動に失敗しました"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:99
-msgid "Copying an event into the calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:155
+#, fuzzy
+#| msgid "Copying an event into the calendar '{0}'"
+msgid "Copying an event into the calendar “{0}”"
 msgstr "カレンダー '{0}' にイベントをコピーしています"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:101
-msgid "Copying a task into the task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:157
+#, fuzzy
+#| msgid "Copying a task into the task list '{0}'"
+msgid "Copying a task into the task list “{0}”"
 msgstr "タスク一覧 '{0}' にタスクをコピーしています"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:103
-msgid "Copying a memo into the memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:159
+#, fuzzy
+#| msgid "Copying a memo into the memo list '{0}'"
+msgid "Copying a memo into the memo list “{0}”"
 msgstr "メモ一覧 '{0}' にメモをコピーしています"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:105
-msgid "Moving an event into the calendar '{0}'"
+#: ../src/calendar/calendar.error.xml.h:161
+#, fuzzy
+#| msgid "Moving an event into the calendar '{0}'"
+msgid "Moving an event into the calendar “{0}”"
 msgstr "カレンダー '{0}' にイベントを移動しています"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:107
-msgid "Moving a task into the task list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:163
+#, fuzzy
+#| msgid "Moving a task into the task list '{0}'"
+msgid "Moving a task into the task list “{0}”"
 msgstr "タスク一覧 '{0}' にタスクを移動しています"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:109
-msgid "Moving a memo into the memo list '{0}'"
+#: ../src/calendar/calendar.error.xml.h:165
+#, fuzzy
+#| msgid "Moving a memo into the memo list '{0}'"
+msgid "Moving a memo into the memo list “{0}”"
 msgstr "メモ一覧 '{0}' にメモを移動しています"
 
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../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:375
+#. Translators: {0} is the name of the calendar.
+#: ../src/calendar/calendar.error.xml.h:167
+#, fuzzy
+#| msgid "Delete remote calendar '{0}'?"
+msgid "Failed to refresh calendar “{0}”"
+msgstr "'{0}' というリモートのカレンダーを削除しますか?"
+
+#. Translators: {0} is the name of the task list.
+#: ../src/calendar/calendar.error.xml.h:169
+#, fuzzy
+#| msgid "Failed to move a task into the task list '{0}'"
+msgid "Failed to refresh task list “{0}”"
+msgstr "タスク一覧 '{0}' へのタスクの移動に失敗しました"
+
+#. Translators: {0} is the name of the memo list.
+#: ../src/calendar/calendar.error.xml.h:171
+#, fuzzy
+#| msgid "Failed to move a memo into the memo list '{0}'"
+msgid "Failed to refresh memo list “{0}”"
+msgstr "メモ一覧 '{0}' へのメモの移動に失敗しました"
+
+#: ../src/calendar/calendar.error.xml.h:172
+#, fuzzy
+#| msgid "Make this Occurrence _Movable"
+msgid "Failed to make an occurrence movable"
+msgstr "このイベントを移動可能にする(_M)"
+
+#: ../src/calendar/calendar.error.xml.h:173
+#, fuzzy
+#| msgid "Create a new window displaying this view"
+msgid "Something has gone wrong when displaying the event"
+msgstr "このビューを表示する新しいウィンドウを作成します"
+
+#: ../src/calendar/calendar.error.xml.h:174
+msgid ""
+"A WebKitWebProcess crashed when displaying the event. You can try again by "
+"moving to another event and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+msgstr ""
+
+#: ../src/calendar/calendar.error.xml.h:175
+#, fuzzy
+#| msgid "Create a new window displaying this view"
+msgid "Something has gone wrong when displaying the memo"
+msgstr "このビューを表示する新しいウィンドウを作成します"
+
+#: ../src/calendar/calendar.error.xml.h:176
+msgid ""
+"A WebKitWebProcess crashed when displaying the memo. You can try again by "
+"moving to another memo and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+msgstr ""
+
+#: ../src/calendar/calendar.error.xml.h:177
+#, fuzzy
+#| msgid "Mode to use when displaying mails"
+msgid "Something has gone wrong when displaying the task"
+msgstr "メールの表示モード"
+
+#: ../src/calendar/calendar.error.xml.h:178
+msgid ""
+"A WebKitWebProcess crashed when displaying the task. You can try again by "
+"moving to another task and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+msgstr ""
+
+#: ../src/calendar/gui/caltypes.xml.in.h:1
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:3
+#: ../src/calendar/gui/e-memo-table.etspec.h:2
+#: ../src/calendar/gui/e-task-table.etspec.h:4
+#: ../src/calendar/gui/memotypes.xml.in.h:1
+#: ../src/calendar/gui/tasktypes.xml.in.h:1
+#: ../src/plugins/save-calendar/csv-format.c:373
 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:55
+#: ../src/calendar/gui/caltypes.xml.in.h:2
+#: ../src/calendar/gui/memotypes.xml.in.h:2
+#: ../src/calendar/gui/tasktypes.xml.in.h:2 ../src/mail/filtertypes.xml.in.h:2
+#: ../src/mail/searchtypes.xml.in.h:2 ../src/mail/vfoldertypes.xml.in.h:2
 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:56
+#: ../src/calendar/gui/caltypes.xml.in.h:3
+#: ../src/calendar/gui/memotypes.xml.in.h:3
+#: ../src/calendar/gui/tasktypes.xml.in.h:3 ../src/mail/filtertypes.xml.in.h:3
+#: ../src/mail/searchtypes.xml.in.h:3 ../src/mail/vfoldertypes.xml.in.h:3
 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:7 ../e-util/e-attachment-tree-view.c:527
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../src/calendar/gui/caltypes.xml.in.h:4
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:4
+#: ../src/calendar/gui/memotypes.xml.in.h:4
+#: ../src/calendar/gui/tasktypes.xml.in.h:4
+#: ../src/e-util/e-attachment-tree-view.c:147
+#: ../src/e-util/e-table-config.ui.h:20
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
 msgstr "説明"
 
-#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:5
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../src/calendar/gui/caltypes.xml.in.h:5
+#: ../src/calendar/gui/memotypes.xml.in.h:5
+#: ../src/calendar/gui/tasktypes.xml.in.h:7
 msgid "Any Field"
 msgstr "いずれかの項目"
 
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:7
+#: ../src/calendar/gui/caltypes.xml.in.h:6
+#: ../src/calendar/gui/memotypes.xml.in.h:7
 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:75
+#: ../src/calendar/gui/caltypes.xml.in.h:7
+#: ../src/calendar/gui/memotypes.xml.in.h:8
+#: ../src/calendar/gui/tasktypes.xml.in.h:9 ../src/mail/filtertypes.xml.in.h:4
+#: ../src/mail/searchtypes.xml.in.h:4 ../src/mail/vfoldertypes.xml.in.h:4
 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:73
+#: ../src/calendar/gui/caltypes.xml.in.h:8
+#: ../src/calendar/gui/memotypes.xml.in.h:9
+#: ../src/calendar/gui/tasktypes.xml.in.h:10 ../src/mail/filtertypes.xml.in.h:5
+#: ../src/mail/searchtypes.xml.in.h:5 ../src/mail/vfoldertypes.xml.in.h:5
 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: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
+#: ../src/calendar/gui/caltypes.xml.in.h:9
+#: ../src/calendar/gui/e-cal-list-view.c:238
+#: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-cal-model.c:310
+#: ../src/calendar/gui/e-task-table.c:522
+#: ../src/calendar/gui/memotypes.xml.in.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:250 ../calendar/gui/e-cal-model.c:462
-#: ../calendar/gui/e-task-table.c:547 ../calendar/gui/memotypes.xml.h:11
+#: ../src/calendar/gui/caltypes.xml.in.h:10
+#: ../src/calendar/gui/e-cal-list-view.c:239
+#: ../src/calendar/gui/e-cal-model.c:312 ../src/calendar/gui/e-task-table.c:523
+#: ../src/calendar/gui/memotypes.xml.in.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: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
+#: ../src/calendar/gui/caltypes.xml.in.h:11
+#: ../src/calendar/gui/e-cal-list-view.c:240
+#: ../src/calendar/gui/e-cal-model.c:314 ../src/calendar/gui/e-task-table.c:524
+#: ../src/calendar/gui/memotypes.xml.in.h:12
+#: ../src/e-util/e-html-editor-page-dialog.c:113
+#: ../src/e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "機密"
 
-#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:6
-#: ../calendar/gui/tasktypes.xml.h:5
+#: ../src/calendar/gui/caltypes.xml.in.h:12
+#: ../src/calendar/gui/memotypes.xml.in.h:6
+#: ../src/calendar/gui/tasktypes.xml.in.h:5
 msgid "Organizer"
 msgstr "主催者"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-#: ../calendar/gui/tasktypes.xml.h:6
+#: ../src/calendar/gui/caltypes.xml.in.h:13
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../src/calendar/gui/tasktypes.xml.in.h:6
 msgid "Attendee"
 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:903
-#: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../src/calendar/gui/caltypes.xml.in.h:14
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:5
+#: ../src/mail/message-list.etspec.h:14
+#: ../src/plugins/publish-calendar/publish-calendar.c:860
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
+#: ../src/plugins/save-calendar/csv-format.c:387
 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:326
+#: ../src/calendar/gui/caltypes.xml.in.h:15
+#: ../src/calendar/gui/memotypes.xml.in.h:13
+#: ../src/calendar/gui/tasktypes.xml.in.h:23
+#: ../src/e-util/e-categories-selector.c:328
 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:53
-#: ../em-format/e-mail-formatter-print-headers.c:203
-#: ../mail/em-filter-i18n.h:6
+#: ../src/calendar/gui/caltypes.xml.in.h:16
+#: ../src/calendar/gui/memotypes.xml.in.h:14
+#: ../src/calendar/gui/tasktypes.xml.in.h:15
+#: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/em-format/e-mail-formatter-print-headers.c:155
+#: ../src/mail/filtertypes.xml.in.h:47 ../src/mail/searchtypes.xml.in.h:49
+#: ../src/mail/vfoldertypes.xml.in.h:50
 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:18
+#: ../src/calendar/gui/caltypes.xml.in.h:17
+#: ../src/calendar/gui/memotypes.xml.in.h:15
+#: ../src/calendar/gui/tasktypes.xml.in.h:16
+#: ../src/mail/filtertypes.xml.in.h:48 ../src/mail/searchtypes.xml.in.h:50
+#: ../src/mail/vfoldertypes.xml.in.h:51
 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:16
+#: ../src/calendar/gui/caltypes.xml.in.h:18
+#: ../src/calendar/gui/memotypes.xml.in.h:16
+#: ../src/calendar/gui/tasktypes.xml.in.h:17
+#: ../src/mail/filtertypes.xml.in.h:49 ../src/mail/searchtypes.xml.in.h:51
+#: ../src/mail/vfoldertypes.xml.in.h:52
 msgid "Do Not Exist"
 msgstr "がない"
 
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:309
-#: ../calendar/gui/dialogs/event-editor.c:330
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:15
+#: ../src/calendar/gui/caltypes.xml.in.h:19
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2003
 msgid "Recurrence"
 msgstr "繰り返し"
 
-#: ../calendar/gui/caltypes.xml.h:20
+#: ../src/calendar/gui/caltypes.xml.in.h:20
 msgid "Occurs"
 msgstr "発生"
 
-#: ../calendar/gui/caltypes.xml.h:21
+#: ../src/calendar/gui/caltypes.xml.in.h:21
 msgid "Less Than"
 msgstr "次より小さい"
 
-#: ../calendar/gui/caltypes.xml.h:22
+#: ../src/calendar/gui/caltypes.xml.in.h:22
 msgid "Exactly"
 msgstr "次に一致"
 
-#: ../calendar/gui/caltypes.xml.h:23
+#: ../src/calendar/gui/caltypes.xml.in.h:23
 msgid "More Than"
 msgstr "次より大きい"
 
-#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:28
+#: ../src/calendar/gui/caltypes.xml.in.h:24
+#: ../src/calendar/gui/memotypes.xml.in.h:17
+#: ../src/calendar/gui/tasktypes.xml.in.h:28
 msgid "Summary Contains"
 msgstr "サマリが次のものを含む"
 
-#: ../calendar/gui/caltypes.xml.h:25 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:29
+#: ../src/calendar/gui/caltypes.xml.in.h:25
+#: ../src/calendar/gui/memotypes.xml.in.h:18
+#: ../src/calendar/gui/tasktypes.xml.in.h:29
 msgid "Description Contains"
 msgstr "説明が次のものを含む"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:668
-msgid "Edit Reminder"
-msgstr "リマインダーを編集する"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:896
-#: ../calendar/gui/e-alarm-list.c:411
-msgid "Pop up an alert"
-msgstr "警告をポップアップする"
+#: ../src/calendar/gui/ea-cal-view.c:281
+msgid "New Appointment"
+msgstr "新しい予定"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:897
-#: ../calendar/gui/e-alarm-list.c:407
-msgid "Play a sound"
-msgstr "サウンドを演奏する"
+#: ../src/calendar/gui/ea-cal-view.c:282
+msgid "New All Day Event"
+msgstr "新しい終日のイベント"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../calendar/gui/e-alarm-list.c:419
-msgid "Run a program"
-msgstr "プログラムを実行する"
+#: ../src/calendar/gui/ea-cal-view.c:283
+msgid "New Meeting"
+msgstr "新しい会議"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:899
-#: ../calendar/gui/e-alarm-list.c:415
-msgid "Send an email"
-msgstr "メールを送信する"
+#: ../src/calendar/gui/ea-cal-view.c:284
+msgid "Go to Today"
+msgstr "今日へ移動"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:908
-msgid "before"
-msgstr "前"
+#: ../src/calendar/gui/ea-cal-view.c:285
+msgid "Go to Date"
+msgstr "指定日へ移動"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:909
-msgid "after"
-msgstr "後"
+#: ../src/calendar/gui/ea-cal-view-event.c:232
+msgid "It has reminders."
+msgstr "リマインダーがあります。"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:918
-msgid "start of appointment"
-msgstr "予定開始"
+#: ../src/calendar/gui/ea-cal-view-event.c:235
+msgid "It has recurrences."
+msgstr "繰り返しがあります。"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:919
-msgid "end of appointment"
-msgstr "予定終了"
+#: ../src/calendar/gui/ea-cal-view-event.c:238
+msgid "It is a meeting."
+msgstr "会議です。"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "minute(s)"
-msgstr "分"
+#: ../src/calendar/gui/ea-cal-view-event.c:245
+#, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr "カレンダーのイベント: サマリは %s"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-msgid "hour(s)"
-msgstr "時間"
+#: ../src/calendar/gui/ea-cal-view-event.c:248
+msgid "Calendar Event: It has no summary."
+msgstr "カレンダーのイベント: サマリなし。"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-msgid "day(s)"
-msgstr "日"
+#: ../src/calendar/gui/ea-cal-view-event.c:271
+msgid "calendar view event"
+msgstr "カレンダーの表示イベント"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-msgid "Add Reminder"
-msgstr "リマインダーを追加する"
+#: ../src/calendar/gui/ea-cal-view-event.c:503
+msgid "Grab Focus"
+msgstr "フォーカスの取得"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
-#: ../calendar/gui/dialogs/event-editor.c:352
-msgid "Reminder"
-msgstr "リマインダー"
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../src/calendar/gui/ea-day-view.c:105 ../src/calendar/gui/ea-week-view.c:105
+#, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "%d個のイベントあり"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
-msgid "Repeat"
-msgstr "繰り返し"
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../src/calendar/gui/ea-day-view.c:112 ../src/calendar/gui/ea-week-view.c:108
+msgid "It has no events."
+msgstr "イベントなし"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the reminder"
-msgstr "リマインダーを繰り返す(_R)"
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../src/calendar/gui/ea-day-view.c:119
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "平日ビュー: %s (%s)"
 
-#. 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:14
-msgid "extra times every"
-msgstr "回 / "
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../src/calendar/gui/ea-day-view.c:126
+#, c-format
+msgid "Day View: %s. %s"
+msgstr "日間ビュー: %s (%s)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:32
-msgid "Options"
-msgstr "オプション"
+#: ../src/calendar/gui/ea-day-view.c:155
+msgid "calendar view for a work week"
+msgstr "平日のカレンダー表示"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-msgid "Custom _message"
-msgstr "メッセージをカスタマイズ(_M)"
+#: ../src/calendar/gui/ea-day-view.c:157
+msgid "calendar view for one or more days"
+msgstr "一日以上のカレンダー表示"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
-msgid "Mes_sage:"
-msgstr "メッセージ(_S):"
+#: ../src/calendar/gui/ea-day-view-main-item.c:264
+#: ../src/calendar/gui/ea-week-view-main-item.c:293
+msgid "a table to view and select the current time range"
+msgstr "現在時刻の範囲を表示/選択するためのテーブル"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-msgid "Custom reminder sound"
-msgstr "リマインダー音をカスタマイズする"
+#: ../src/calendar/gui/ea-jump-button.c:148
+msgid "Jump button"
+msgstr "ジャンプボタン"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
-msgid "_Sound:"
-msgstr "サウンド(_S):"
+#: ../src/calendar/gui/ea-jump-button.c:157
+msgid "Click here, you can find more events."
+msgstr "ここをクリックすると、他のイベントを検索できます"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
-msgid "Select A File"
-msgstr "ファイルの選択"
+#. Translator: Entire string is like "Pop up an alert %d weeks before start"
+#: ../src/calendar/gui/e-alarm-list.c:374
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d週間"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-msgid "_Program:"
-msgstr "プログラム(_P):"
+#. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../src/calendar/gui/e-alarm-list.c:419
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1827
+#, fuzzy
+#| msgid "Play a sound"
+msgctxt "cal-reminders"
+msgid "Play a sound"
+msgstr "サウンドを演奏する"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-msgid "_Arguments:"
-msgstr "引数(_A):"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../src/calendar/gui/e-alarm-list.c:423
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1825
+#, fuzzy
+#| msgid "Pop up an alert"
+msgctxt "cal-reminders"
+msgid "Pop up an alert"
+msgstr "警告をポップアップする"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-msgid "Send To:"
-msgstr "送信先:"
+#. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../src/calendar/gui/e-alarm-list.c:427
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1831
+#, fuzzy
+#| msgid "Send an email"
+msgctxt "cal-reminders"
+msgid "Send an email"
+msgstr "メールを送信する"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:239
-msgid "Action/Trigger"
-msgstr "アクション"
+#. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../src/calendar/gui/e-alarm-list.c:431
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1829
+#, fuzzy
+#| msgid "Run a program"
+msgctxt "cal-reminders"
+msgid "Run a program"
+msgstr "プログラムを実行する"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-#: ../calendar/gui/dialogs/event-page.ui.h:28
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
-msgid "Reminders"
-msgstr "リマインダー"
+#: ../src/calendar/gui/e-alarm-list.c:437
+#, fuzzy
+#| msgid "Unknown action to be performed"
+msgctxt "cal-reminders"
+msgid "Unknown action to be performed"
+msgstr "実行するアクションが不明です"
 
-#: ../calendar/gui/dialogs/changed-comp.c:59
-msgid "This event has been deleted."
-msgstr "このイベントは削除されました。"
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../src/calendar/gui/e-alarm-list.c:452
+#, fuzzy, c-format
+#| msgid "%s %s before the start of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s before the start"
+msgstr "予定を開始する %2$s前に%1$s"
 
-#: ../calendar/gui/dialogs/changed-comp.c:63
-msgid "This task has been deleted."
-msgstr "このタスクは削除されました。"
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../src/calendar/gui/e-alarm-list.c:458
+#, fuzzy, c-format
+#| msgid "%s %s after the start of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s after the start"
+msgstr "予定を開始する %2$s後に%1$s"
 
-#: ../calendar/gui/dialogs/changed-comp.c:67
-msgid "This memo has been deleted."
-msgstr "このメモは削除されました。"
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../src/calendar/gui/e-alarm-list.c:465
+#, fuzzy, c-format
+#| msgid "%s attachment"
+msgctxt "cal-reminders"
+msgid "%s at the start"
+msgstr "添付ファイル: %s"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
-#, c-format
-msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  変更しました。これらの変更を無視してエディターを閉じますか?"
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../src/calendar/gui/e-alarm-list.c:477
+#, fuzzy, c-format
+#| msgid "%s %s before the end of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s before the end"
+msgstr "予定を終了する %2$s前に%1$s"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
-#, c-format
-msgid "%s  You have made no changes, close the editor?"
-msgstr "%s  何も変更していませんが、エディターを閉じますか?"
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../src/calendar/gui/e-alarm-list.c:483
+#, fuzzy, c-format
+#| msgid "%s %s after the end of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s after the end"
+msgstr "予定を終了する %2$s後に%1$s"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
-msgid "This event has been changed."
-msgstr "このイベントは変更されました。"
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../src/calendar/gui/e-alarm-list.c:490
+#, fuzzy, c-format
+#| msgid "%s attachment"
+msgctxt "cal-reminders"
+msgid "%s at the end"
+msgstr "添付ファイル: %s"
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
-msgid "This task has been changed."
-msgstr "このタスクは変更されました。"
+#. 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"
+#: ../src/calendar/gui/e-alarm-list.c:514
+#, fuzzy, c-format
+#| msgid "%s at %s"
+msgctxt "cal-reminders"
+msgid "%s at %s"
+msgstr "%2$sの時点で%1$s"
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This memo has been changed."
-msgstr "このメモは変更されました。"
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound". "Trigger types" are absolute or relative dates
+#: ../src/calendar/gui/e-alarm-list.c:522
+#, fuzzy, c-format
+#| msgid "%s for an unknown trigger type"
+msgctxt "cal-reminders"
+msgid "%s for an unknown trigger type"
+msgstr "トリガーの種類が不明な %s"
 
-#: ../calendar/gui/dialogs/changed-comp.c:102
+#: ../src/calendar/gui/ea-week-view.c:112
 #, c-format
-msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  変更しました。この変更を無視してエディターを更新しますか?"
+msgid "Month View: %s. %s"
+msgstr "月間ビュー: %s (%s)"
 
-#: ../calendar/gui/dialogs/changed-comp.c:104
+#: ../src/calendar/gui/ea-week-view.c:117
 #, c-format
-msgid "%s  You have made no changes, update the editor?"
-msgstr "%s  何も変更していませんが、エディターを更新しますか?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:271
-msgid "Could not save attachments"
-msgstr "添付ファイルを保存できませでした"
+msgid "Week View: %s. %s"
+msgstr "週間ビュー: %s (%s)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:626
-msgid "Could not update object"
-msgstr "オブジェクトを更新できませんでした"
+#: ../src/calendar/gui/ea-week-view.c:146
+msgid "calendar view for a month"
+msgstr "一ヶ月のカレンダー表示"
 
-#: ../calendar/gui/dialogs/comp-editor.c:760
-msgid "Edit Appointment"
-msgstr "予定の編集"
+#: ../src/calendar/gui/ea-week-view.c:148
+msgid "calendar view for one or more weeks"
+msgstr "一週間以上のカレンダー表示"
 
-#: ../calendar/gui/dialogs/comp-editor.c:767
-#, c-format
-msgid "Meeting - %s"
-msgstr "会議 - %s"
+#: ../src/calendar/gui/e-cal-component-preview.c:214
+#: ../src/e-util/e-filter-rule.c:770 ../src/mail/e-mail-config-page.c:127
+msgid "Untitled"
+msgstr "タイトルなし"
 
-#: ../calendar/gui/dialogs/comp-editor.c:769
-#, c-format
-msgid "Appointment - %s"
-msgstr "予定 - %s"
+#: ../src/calendar/gui/e-cal-component-preview.c:222
+msgid "Categories:"
+msgstr "カテゴリ:"
 
-#: ../calendar/gui/dialogs/comp-editor.c:775
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "タスクの割当て - %s"
+#: ../src/calendar/gui/e-cal-component-preview.c:256
+msgid "Summary:"
+msgstr "サマリ:"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
-#, c-format
-msgid "Task - %s"
-msgstr "タスク - %s"
+#: ../src/calendar/gui/e-cal-component-preview.c:264
+msgid "Start Date:"
+msgstr "開始日:"
 
-#: ../calendar/gui/dialogs/comp-editor.c:782
-#, c-format
-msgid "Memo - %s"
-msgstr "メモ - %s"
+#: ../src/calendar/gui/e-cal-component-preview.c:275
+msgid "End Date:"
+msgstr "終了日:"
 
-#: ../calendar/gui/dialogs/comp-editor.c:798
-msgid "No Summary"
-msgstr "サマリ無し"
+#: ../src/calendar/gui/e-cal-component-preview.c:286
+msgid "Due Date:"
+msgstr "期日:"
 
-#: ../calendar/gui/dialogs/comp-editor.c:919
-msgid "Keep original item?"
-msgstr "アイテムをそのままにしておきますか?"
-
-#: ../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)"
+#: ../src/calendar/gui/e-cal-component-preview.c:298
+#: ../src/modules/itip-formatter/itip-view.c:1681
+#: ../src/modules/itip-formatter/itip-view.c:1798
+msgid "Status:"
+msgstr "ステータス:"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1224
-msgid "Close the current window"
-msgstr "現在のウィンドウを閉じます"
+#: ../src/calendar/gui/e-cal-component-preview.c:302
+#: ../src/calendar/gui/e-cal-model-tasks.c:310
+#: ../src/calendar/gui/e-cal-model-tasks.c:552
+#: ../src/calendar/gui/e-cal-model-tasks.c:633
+#: ../src/calendar/gui/e-task-table.c:205
+#: ../src/calendar/gui/e-task-table.c:220
+#: ../src/calendar/gui/e-task-table.c:632 ../src/calendar/gui/print.c:3580
+msgid "In Progress"
+msgstr "進行中"
 
-#. 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)..."
+#: ../src/calendar/gui/e-cal-component-preview.c:305
+#: ../src/calendar/gui/e-cal-model-tasks.c:312
+#: ../src/calendar/gui/e-cal-model-tasks.c:554
+#: ../src/calendar/gui/e-meeting-store.c:202
+#: ../src/calendar/gui/e-meeting-store.c:225
+#: ../src/calendar/gui/e-task-table.c:207
+#: ../src/calendar/gui/e-task-table.c:222
+#: ../src/calendar/gui/e-task-table.c:633 ../src/calendar/gui/print.c:3583
+#: ../src/calendar/gui/tasktypes.xml.in.h:13
+#: ../src/plugins/save-calendar/csv-format.c:377
+msgid "Completed"
+msgstr "完了"
 
-#: ../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 "選択した連絡先/予定をコピーします"
+#: ../src/calendar/gui/e-cal-component-preview.c:312
+#: ../src/calendar/gui/e-cal-model-tasks.c:308
+#: ../src/calendar/gui/e-cal-model-tasks.c:550
+#: ../src/calendar/gui/e-task-table.c:203
+#: ../src/calendar/gui/e-task-table.c:218
+#: ../src/calendar/gui/e-task-table.c:631 ../src/calendar/gui/print.c:3577
+#: ../src/calendar/gui/tasktypes.xml.in.h:11
+msgid "Not Started"
+msgstr "開始していない"
 
-#. 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 ""
+#: ../src/calendar/gui/e-cal-component-preview.c:325
+msgid "Priority:"
+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 "選択した連絡先/予定を切り取ります"
+#: ../src/calendar/gui/e-cal-component-preview.c:327
+#: ../src/calendar/gui/e-task-table.c:548
+#: ../src/calendar/gui/tasktypes.xml.in.h:19
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:322
+msgid "High"
+msgstr "高い"
 
-#: ../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 "選択したものを削除"
+#: ../src/calendar/gui/e-cal-component-preview.c:329
+#: ../src/calendar/gui/e-cal-model.c:1888
+#: ../src/calendar/gui/e-task-table.c:549
+#: ../src/calendar/gui/tasktypes.xml.in.h:20
+#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:321
+msgid "Normal"
+msgstr "普通"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1252
-msgid "View help"
-msgstr "ヘルプを表示する"
+#: ../src/calendar/gui/e-cal-component-preview.c:331
+#: ../src/calendar/gui/e-task-table.c:550
+#: ../src/calendar/gui/tasktypes.xml.in.h:21
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:320
+msgid "Low"
+msgstr "低い"
 
-#. 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"
+#: ../src/calendar/gui/e-cal-component-preview.c:350
+#: ../src/mail/e-mail-config-service-page.c:671
+msgid "Description:"
+msgstr "説明:"
 
-#: ../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 "クリップボードへ貼り付けます"
+#: ../src/calendar/gui/e-cal-component-preview.c:381
+msgid "Web Page:"
+msgstr "ウェブページ:"
 
-#: ../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)..."
+#: ../src/calendar/gui/e-cal-data-model.c:1631
+#, fuzzy, c-format
+#| msgid "Opening calendar '%s'"
+msgid "Creating view for calendar “%s”"
+msgstr "カレンダー %s を開いています"
 
-#: ../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 "プレビュー"
+#: ../src/calendar/gui/e-cal-data-model.c:1635
+#, fuzzy, c-format
+#| msgid "Opening task list '%s'"
+msgid "Creating view for task list “%s”"
+msgstr "タスク一覧 %s を開いています"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
-msgid "Save current changes"
-msgstr "現在の変更を保存"
+#: ../src/calendar/gui/e-cal-data-model.c:1639
+#, fuzzy, c-format
+#| msgid "Opening memo list '%s'"
+msgid "Creating view for memo list “%s”"
+msgstr "メモ一覧 %s を開いています"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
-#: ../e-util/e-mail-signature-editor.c:316
-msgid "Save and Close"
-msgstr "保存して閉じる"
+#: ../src/calendar/gui/e-cal-dialogs.c:219 ../src/calendar/gui/e-cal-ops.c:1955
+msgid "Destination is read only"
+msgstr "転送先は読み込み専用"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1287
-msgid "Save current changes and close editor"
-msgstr "現在の変更を保存してエディターを閉じる"
+#: ../src/calendar/gui/e-cal-dialogs.c:299
+#, fuzzy, c-format
+#| msgid "Copying an event into the calendar '{0}'"
+msgid "Copying events to the calendar “%s”"
+msgstr "カレンダー '{0}' にイベントをコピーしています"
 
-#: ../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 "すべて選択"
+#: ../src/calendar/gui/e-cal-dialogs.c:305
+#, fuzzy, c-format
+#| msgid "Copying a memo into the memo list '{0}'"
+msgid "Copying memos to the memo list “%s”"
+msgstr "メモ一覧 '{0}' にメモをコピーしています"
 
-#: ../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 "すべての文字列を選択します"
+#: ../src/calendar/gui/e-cal-dialogs.c:311
+#, fuzzy, c-format
+#| msgid "Copying a task into the task list '{0}'"
+msgid "Copying tasks to the task list “%s”"
+msgstr "タスク一覧 '{0}' にタスクをコピーしています"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
-msgid "_Classification"
-msgstr "区分(_C)"
+#: ../src/calendar/gui/e-cal-dialogs.c:530
+#, fuzzy
+#| msgid "_Delete this item from all other recipient's mailboxes?"
+msgid "_Delete this item from all other recipient’s mailboxes?"
+msgstr "このアイテムを他のすべての受信箱から削除しますか?(_D)"
 
-#: ../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)"
+#: ../src/calendar/gui/e-cal-dialogs.c:533
+msgid "_Retract comment"
+msgstr "コメントを取り消し(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
-msgid "_Insert"
-msgstr "添付(_I)"
+#: ../src/calendar/gui/e-cal-dialogs.c:692
+msgid "Select Date"
+msgstr "日付の選択"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1350
-#: ../composer/e-composer-actions.c:319
-msgid "_Options"
-msgstr "オプション(_O)"
+#: ../src/calendar/gui/e-cal-dialogs.c:693
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1248
+msgid "Select _Today"
+msgstr "今日にする(_T)"
 
-#: ../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)"
+#: ../src/calendar/gui/e-cal-dialogs.c:712
+msgid "January"
+msgstr "1月"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367
-#: ../composer/e-composer-actions.c:268
-msgid "_Attachment..."
-msgstr "ファイルの添付(_A)..."
+#: ../src/calendar/gui/e-cal-dialogs.c:713
+msgid "February"
+msgstr "2月"
 
-#: ../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 "ファイルを添付します"
+#: ../src/calendar/gui/e-cal-dialogs.c:714
+msgid "March"
+msgstr "3月"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-msgid "_Categories"
-msgstr "カテゴリ(_C)"
+#: ../src/calendar/gui/e-cal-dialogs.c:715
+msgid "April"
+msgstr "4月"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
-msgid "Toggles whether to display categories"
-msgstr "カテゴリの表示/非表示を切り替えます"
+#: ../src/calendar/gui/e-cal-dialogs.c:716
+msgid "May"
+msgstr "5月"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1385
-msgid "Time _Zone"
-msgstr "タイムゾーン(_Z)"
+#: ../src/calendar/gui/e-cal-dialogs.c:717
+msgid "June"
+msgstr "6月"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
-msgid "Toggles whether the time zone is displayed"
-msgstr "タイムゾーンの表示/非表示を切り替えます"
+#: ../src/calendar/gui/e-cal-dialogs.c:718
+msgid "July"
+msgstr "7月"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
-msgid "Pu_blic"
-msgstr "公開(_B)"
+#: ../src/calendar/gui/e-cal-dialogs.c:719
+msgid "August"
+msgstr "8月"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1398
-msgid "Classify as public"
-msgstr "公開として分類"
+#: ../src/calendar/gui/e-cal-dialogs.c:720
+msgid "September"
+msgstr "9月"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
-msgid "_Private"
-msgstr "非公開(_P)"
+#: ../src/calendar/gui/e-cal-dialogs.c:721
+msgid "October"
+msgstr "10月"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
-msgid "Classify as private"
-msgstr "非公開としての分類"
+#: ../src/calendar/gui/e-cal-dialogs.c:722
+msgid "November"
+msgstr "11月"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
-msgid "_Confidential"
-msgstr "極秘(_C)"
+#: ../src/calendar/gui/e-cal-dialogs.c:723
+msgid "December"
+msgstr "12月"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
-msgid "Classify as confidential"
-msgstr "極秘としての分類"
+#: ../src/calendar/gui/e-cal-dialogs.c:873
+#, c-format
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr "繰り返しのイベントを修正中です。何を修正しますか?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
-msgid "R_ole Field"
-msgstr "役割(_O)"
+#: ../src/calendar/gui/e-cal-dialogs.c:875
+#, c-format
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr "繰り返しのイベントを委任中です。何を委任しますか?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
-msgid "Toggles whether the Role field is displayed"
-msgstr "役割の表示/非表示を切り替えます"
+#: ../src/calendar/gui/e-cal-dialogs.c:879
+#, c-format
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr "繰り返しのタスクを修正中です。何を修正しますか?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1428
-msgid "_RSVP"
-msgstr "RSVP(_R)"
+#: ../src/calendar/gui/e-cal-dialogs.c:883
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "繰り返しのメモを修正中です。何を修正しますか?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "RSVP の表示/非表示を切り替えます"
+#: ../src/calendar/gui/e-cal-dialogs.c:909
+msgid "This Instance Only"
+msgstr "このインスタンスのみ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1436
-msgid "_Status Field"
-msgstr "ステータス(_S)"
+#: ../src/calendar/gui/e-cal-dialogs.c:913
+msgid "This and Prior Instances"
+msgstr "これと以前のインスタンス"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
-msgid "Toggles whether the Status field is displayed"
-msgstr "ステータスの表示/非表示を切り替えます"
+#: ../src/calendar/gui/e-cal-dialogs.c:919
+msgid "This and Future Instances"
+msgstr "これと将来のインスタンス"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1444
-msgid "_Type Field"
-msgstr "種類(_T)"
+#: ../src/calendar/gui/e-cal-dialogs.c:924
+msgid "All Instances"
+msgstr "すべてのインスタンス"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
-msgid "Toggles whether the Attendee Type is displayed"
-msgstr "出席者の種類の表示/非表示を切り替えます"
+#: ../src/calendar/gui/e-cal-dialogs.c:1174
+#: ../src/calendar/gui/e-cal-dialogs.c:1256
+msgid "Send my reminders with this event"
+msgstr "このイベントと一緒にリマインダーを送信する"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../composer/e-composer-actions.c:487
-msgid "Attach"
-msgstr "添付"
+#: ../src/calendar/gui/e-cal-dialogs.c:1176
+#: ../src/calendar/gui/e-cal-dialogs.c:1258
+msgid "Notify new attendees _only"
+msgstr "新しい参加者のみに通知(_O)"
 
-#: ../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 "更新が届いたらこのアイテムに対する変更を破棄する"
+#: ../src/calendar/gui/e-calendar-view.c:451
+msgid "Cut selected events to the clipboard"
+msgstr "選択したイベントを切り取ってクリップボードにコピーします"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3748
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:120
-msgid "attachment"
-msgstr "添付"
+#: ../src/calendar/gui/e-calendar-view.c:457
+msgid "Copy selected events to the clipboard"
+msgstr "選択したイベントをクリップボードにコピーします"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3818
-msgid "Unable to use current version!"
-msgstr "現在のバージョンを使用できません!"
+#: ../src/calendar/gui/e-calendar-view.c:463
+msgid "Paste events from the clipboard"
+msgstr "クリップボードからイベントを貼り付けます"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:440
-#, c-format
-msgid "Validation error: %s"
-msgstr "整合性のエラー: %s"
+#: ../src/calendar/gui/e-calendar-view.c:469
+msgid "Delete selected events"
+msgstr "選択したイベントを削除します"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:120
-msgid "Could not open destination"
-msgstr "転送先ソースを開けませんでした"
+#: ../src/calendar/gui/e-calendar-view.c:853
+msgid "Pasted text doesn’t contain valid iCalendar data"
+msgstr ""
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
-msgid "Destination is read only"
-msgstr "転送先は読み込み専用"
+#: ../src/calendar/gui/e-calendar-view.c:864
+#: ../src/calendar/gui/e-cal-ops.c:1552
+#, fuzzy
+#| msgid "Default User Calendar"
+msgid "Default calendar not found"
+msgstr "デフォルトのユーザーカレンダー"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:172
-msgid "Cannot create object"
-msgstr "オブジェクトを作成できません"
+#: ../src/calendar/gui/e-calendar-view.c:869
+#: ../src/calendar/gui/e-cal-ops.c:1555
+#, fuzzy
+#| msgid "Mark as default memo list"
+msgid "Default memo list not found"
+msgstr "デフォルトのメモ一覧にする"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:203
-msgid "Could not open source"
-msgstr "送信元ソースを開けませんでした"
+#: ../src/calendar/gui/e-calendar-view.c:874
+#: ../src/calendar/gui/e-cal-ops.c:1558
+#, fuzzy
+#| msgid "Mark as default task list"
+msgid "Default task list not found"
+msgstr "デフォルトのタスク一覧にする"
 
-#: ../calendar/gui/dialogs/delete-comp.c:215
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "このアイテムを他のすべての受信箱から削除しますか?(_D)"
+#: ../src/calendar/gui/e-calendar-view.c:963
+msgid "No suitable component found"
+msgstr ""
 
-#: ../calendar/gui/dialogs/delete-comp.c:218
-msgid "_Retract comment"
-msgstr "コメントを取り消し(_R)"
+#: ../src/calendar/gui/e-calendar-view.c:1033
+#, fuzzy
+#| msgid "Save as iCalendar"
+msgid "Pasting iCalendar data"
+msgstr "iCalendar 形式で保存"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:54
+#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
+#. Translators: It will display
+#. * "Organizer: NameOfTheUser <email ofuser com>"
+#. To Translators: It will display
+#. * "Organizer: NameOfTheUser <email ofuser com>"
+#: ../src/calendar/gui/e-calendar-view.c:1831
+#: ../src/calendar/gui/e-memo-table.c:493
+#: ../src/calendar/gui/e-task-table.c:818
 #, c-format
-msgid "The event could not be deleted due to a dbus error: %s"
-msgstr "D-Bus のエラーのためイベントを削除できませんでした: %s"
+msgid "Organizer: %s <%s>"
+msgstr "主催者: %s <%s>"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:58
+#. With SunOne accouts, there may be no ':' in organiser.value
+#. With SunOne accounts, there may be no ':' in
+#. * organizer.value.
+#: ../src/calendar/gui/e-calendar-view.c:1835
+#: ../src/calendar/gui/e-memo-table.c:498
+#: ../src/calendar/gui/e-task-table.c:822
 #, c-format
-msgid "The task could not be deleted due to a dbus error: %s"
-msgstr "D-Bus のエラーのためタスクを削除できませんでした: %s"
+msgid "Organizer: %s"
+msgstr "主催者: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:62
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../src/calendar/gui/e-calendar-view.c:1851
+#: ../src/calendar/gui/e-meeting-time-sel.c:2725
+#: ../src/calendar/gui/print.c:3531
 #, c-format
-msgid "The memo could not be deleted due to a dbus error: %s"
-msgstr "D-Bus のエラーのためメモを削除できませんでした: %s"
+msgid "Location: %s"
+msgstr "場所: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:66
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../src/calendar/gui/e-calendar-view.c:1891
 #, c-format
-msgid "The item could not be deleted due to a dbus error: %s"
-msgstr "D-Bus のエラーのためアイテムを削除できませんでした: %s"
+msgid "Time: %s %s"
+msgstr "時刻: %s %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
-msgid "The event could not be deleted because permission was denied"
-msgstr "権限がないのでイベントを削除できませんでした"
+#: ../src/calendar/gui/e-calendar-view.c:2277
+#: ../src/calendar/gui/e-calendar-view.c:2284
+#: ../src/calendar/gui/e-calendar-view.c:2291
+#: ../src/calendar/gui/e-calendar-view.c:2294
+msgid "%d %b %Y"
+msgstr "%Y年%B%e日"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The task could not be deleted because permission was denied"
-msgstr "権限がないのでタスクを削除できませんでした"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../src/calendar/gui/e-calendar-view.c:2282
+#: ../src/calendar/gui/e-day-view.c:3078
+#: ../src/calendar/gui/e-day-view-top-item.c:849
+#: ../src/calendar/gui/e-week-view-main-item.c:228
+msgid "%d %b"
+msgstr "%B%e日"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
-msgid "The memo could not be deleted because permission was denied"
-msgstr "権限がないのでメモを削除できませんでした"
+#: ../src/calendar/gui/e-calendar-view.c:2304
+msgid "%A %d %b %Y"
+msgstr "%Y年%B%e日 %A"
 
-#: ../calendar/gui/dialogs/delete-error.c:82
-msgid "The item could not be deleted because permission was denied"
-msgstr "権限がないのでアイテムを削除できませんでした"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../src/calendar/gui/e-calendar-view.c:2308
+#: ../src/calendar/gui/e-day-view.c:3062
+#: ../src/calendar/gui/e-day-view-top-item.c:845
+#: ../src/calendar/gui/e-week-view-main-item.c:214
+msgid "%a %d %b"
+msgstr "%m/%d (%a)"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:90
-#, c-format
-msgid "The event could not be deleted due to an error: %s"
-msgstr "エラーのためイベントを削除できませんでした: %s"
+#: ../src/calendar/gui/e-calendar-view.c:2311
+#: ../src/calendar/gui/e-calendar-view.c:2317
+#: ../src/calendar/gui/e-calendar-view.c:2320
+msgid "%a %d %b %Y"
+msgstr "%Y/%m/%d (%a)"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:94
-#, c-format
-msgid "The task could not be deleted due to an error: %s"
-msgstr "エラーのためタスクを削除できませんでした: %s"
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:1
+#: ../src/calendar/gui/e-memo-table.etspec.h:5
+msgid "Start Date"
+msgstr "開始日"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:98
-#, c-format
-msgid "The memo could not be deleted due to an error: %s"
-msgstr "エラーのためメモを削除できませんでした: %s"
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "終了日"
+
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:7
+#: ../src/calendar/gui/e-memo-table.etspec.h:6
+#: ../src/calendar/gui/e-task-table.etspec.h:13
+#: ../src/plugins/save-calendar/csv-format.c:378
+msgid "Created"
+msgstr "作成済"
+
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:8
+#: ../src/calendar/gui/e-memo-table.etspec.h:7
+#: ../src/calendar/gui/e-task-table.etspec.h:14
+msgid "Last modified"
+msgstr "最終更新日時"
+
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:9
+#: ../src/calendar/gui/e-memo-table.etspec.h:8
+#: ../src/calendar/gui/e-task-table.etspec.h:15
+#: ../src/em-format/e-mail-formatter-source.c:118
+msgid "Source"
+msgstr "ソース"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:102
+#: ../src/calendar/gui/e-cal-model.c:316
+#: ../src/calendar/gui/e-meeting-list-view.c:183
+#: ../src/calendar/gui/e-meeting-list-view.c:197
+#: ../src/calendar/gui/e-meeting-store.c:132
+#: ../src/calendar/gui/e-meeting-store.c:167
+#: ../src/calendar/gui/e-meeting-store.c:230 ../src/calendar/gui/print.c:1247
+#: ../src/calendar/gui/print.c:1264 ../src/e-util/e-charset.c:49
+#: ../src/modules/itip-formatter/itip-view.c:3412
+#: ../src/modules/itip-formatter/itip-view.c:6082
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
+msgid "Unknown"
+msgstr "不明"
+
+#: ../src/calendar/gui/e-cal-model.c:1402 ../src/calendar/gui/e-cal-ops.c:613
+#: ../src/calendar/gui/e-cal-ops.c:1249
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:289
 #, c-format
-msgid "The item could not be deleted due to an error: %s"
-msgstr "エラーのためアイテムを削除できませんでした: %s"
+msgid "Source with UID “%s” not found"
+msgstr ""
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
-msgid "Enter Delegate"
-msgstr "委任先の入力"
+#: ../src/calendar/gui/e-cal-model.c:1505 ../src/calendar/gui/e-cal-ops.c:185
+#: ../src/calendar/gui/e-cal-ops.c:1366
+#, fuzzy
+#| msgid "Create a new all day event"
+msgid "Creating an event"
+msgstr "新しい終日の予定を作成します"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:4
-msgid "Delegate To:"
-msgstr "委任先:"
+#: ../src/calendar/gui/e-cal-model.c:1509 ../src/calendar/gui/e-cal-ops.c:189
+#: ../src/calendar/gui/e-cal-ops.c:1370
+#, fuzzy
+#| msgid "Create a Mem_o"
+msgid "Creating a memo"
+msgstr "メモの作成(_O)"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:5
-msgid "Contacts..."
-msgstr "連絡先..."
+#: ../src/calendar/gui/e-cal-model.c:1513 ../src/calendar/gui/e-cal-ops.c:193
+#: ../src/calendar/gui/e-cal-ops.c:1374
+#, fuzzy
+#| msgid "Create a _Task"
+msgid "Creating a task"
+msgstr "タスクの作成(_T)"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
-msgid "_Reminders"
-msgstr "リマインダー(_R)"
+#: ../src/calendar/gui/e-cal-model.c:1890
+msgid "Recurring"
+msgstr "繰り返し"
 
-#: ../calendar/gui/dialogs/event-editor.c:206
-msgid "Set or unset reminders for this event"
-msgstr "このイベントのリマインダーをセットしたり解除します"
+#: ../src/calendar/gui/e-cal-model.c:1892
+msgid "Assigned"
+msgstr "割当て済み"
 
-#: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Show Time as _Busy"
-msgstr "予定ありにする(_B)"
+#: ../src/calendar/gui/e-cal-model.c:1894
+#: ../src/calendar/gui/e-cal-model-tasks.c:1136
+#: ../src/calendar/gui/e-meeting-list-view.c:207
+#: ../src/calendar/gui/e-meeting-store.c:174
+#: ../src/calendar/gui/e-meeting-store.c:184
+#: ../src/calendar/gui/e-meeting-store.c:1021
+msgid "Yes"
+msgstr "はい"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
-msgid "Toggles whether to show time as busy"
-msgstr "予定ありとして時刻を表示するかどうかを切り替えます"
+#: ../src/calendar/gui/e-cal-model.c:1894
+#: ../src/calendar/gui/e-cal-model-tasks.c:1136
+#: ../src/calendar/gui/e-meeting-list-view.c:208
+#: ../src/calendar/gui/e-meeting-store.c:186
+msgid "No"
+msgstr "いいえ"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
-msgid "_Recurrence"
-msgstr "繰り返す(_R)"
+#: ../src/calendar/gui/e-cal-model.c:3818
+#: ../src/calendar/gui/e-meeting-list-view.c:219
+#: ../src/calendar/gui/e-meeting-store.c:194
+#: ../src/calendar/gui/e-meeting-store.c:217
+#: ../src/modules/itip-formatter/itip-view.c:6070
+msgid "Accepted"
+msgstr "受諾済"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
-msgid "Make this a recurring event"
-msgstr "このイベントを繰り返します"
+#: ../src/calendar/gui/e-cal-model.c:3819
+#: ../src/calendar/gui/e-meeting-list-view.c:220
+#: ../src/calendar/gui/e-meeting-store.c:196
+#: ../src/calendar/gui/e-meeting-store.c:219
+#: ../src/modules/itip-formatter/itip-view.c:6076
+msgid "Declined"
+msgstr "辞退済"
 
-#: ../calendar/gui/dialogs/event-editor.c:232 ../e-util/e-send-options.ui.h:14
-msgid "Send Options"
-msgstr "送信オプション"
+#: ../src/calendar/gui/e-cal-model.c:3820
+#: ../src/calendar/gui/e-meeting-list-view.c:221
+#: ../src/calendar/gui/e-meeting-store.c:198
+#: ../src/calendar/gui/e-meeting-store.c:221
+#: ../src/calendar/gui/e-meeting-time-sel.c:533
+msgid "Tentative"
+msgstr "仮承認"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
-#: ../calendar/gui/dialogs/task-editor.c:95
-msgid "Insert advanced send options"
-msgstr "送信用の拡張オプションを挿入します"
+#: ../src/calendar/gui/e-cal-model.c:3821
+#: ../src/calendar/gui/e-meeting-list-view.c:222
+#: ../src/calendar/gui/e-meeting-store.c:200
+#: ../src/calendar/gui/e-meeting-store.c:223
+#: ../src/modules/itip-formatter/itip-view.c:6079
+msgid "Delegated"
+msgstr "委任済"
 
-#: ../calendar/gui/dialogs/event-editor.c:242
-msgid "All _Day Event"
-msgstr "終日のイベントにする(_D)"
+#: ../src/calendar/gui/e-cal-model.c:3822
+msgid "Needs action"
+msgstr "要アクション"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
-msgid "Toggles whether to have All Day Event"
-msgstr "終日のイベントにするかどうかを切り替えます"
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. * Status: Accepted: X   Declined: Y   ...
+#: ../src/calendar/gui/e-cal-model.c:3877
+#: ../src/calendar/gui/e-meeting-list-view.c:687
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../src/calendar/gui/e-task-table.etspec.h:11
+#: ../src/calendar/gui/tasktypes.xml.in.h:8 ../src/mail/filtertypes.xml.in.h:36
+#: ../src/mail/message-list.etspec.h:1 ../src/mail/searchtypes.xml.in.h:38
+#: ../src/mail/vfoldertypes.xml.in.h:38
+msgid "Status"
+msgstr "状態"
 
-#: ../calendar/gui/dialogs/event-editor.c:253
-msgid "_Free/Busy"
-msgstr "予定の有無(_F)"
+#: ../src/calendar/gui/e-cal-model-calendar.c:148
+#: ../src/calendar/gui/e-task-table.c:606
+msgid "Free"
+msgstr "予定なし"
 
-#: ../calendar/gui/dialogs/event-editor.c:255
-msgid "Query free / busy information for the attendees"
-msgstr "この出席者の予定を調べてみます"
+#: ../src/calendar/gui/e-cal-model-calendar.c:151
+#: ../src/calendar/gui/e-meeting-time-sel.c:534
+#: ../src/calendar/gui/e-task-table.c:607
+msgid "Busy"
+msgstr "予定あり"
 
-#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3496
-msgid "Appointment"
-msgstr "予定"
+#: ../src/calendar/gui/e-cal-model-tasks.c:496
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"地理的な位置は書式に合わせて入力してください: \n"
+"\n"
+"45.436845,125.862501"
 
-#: ../calendar/gui/dialogs/event-editor.c:376
-#: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../calendar/gui/e-meeting-list-view.c:164
-msgid "Attendees"
-msgstr "出席者"
+#. Translators: "None" for task's status
+#: ../src/calendar/gui/e-cal-model-tasks.c:548
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "なし"
 
-#: ../calendar/gui/dialogs/event-editor.c:573
-msgid "Print this event"
-msgstr "このイベントを印刷"
+#: ../src/calendar/gui/e-cal-ops.c:304
+msgid "Modifying an event"
+msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:557
-msgid "Event's start time is in the past"
-msgstr "イベントの開始時間が過去です"
+#: ../src/calendar/gui/e-cal-ops.c:308
+#, fuzzy
+#| msgid "Missing name."
+msgid "Modifying a memo"
+msgstr "名前がありません。"
 
-#: ../calendar/gui/dialogs/event-page.c:634
-msgid "Event cannot be edited, because the selected calendar is read only"
-msgstr "イベントを編集できません。選択したイベントは読み込み専用です"
+#: ../src/calendar/gui/e-cal-ops.c:312
+msgid "Modifying a task"
+msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:638
-msgid "Event cannot be fully edited, because you are not the organizer"
-msgstr "イベントのすべてを編集することはできません。あなたは主催者ではありません"
+#: ../src/calendar/gui/e-cal-ops.c:411
+#, fuzzy
+#| msgid "Removing attachments"
+msgid "Removing an event"
+msgstr "添付ファイルを削除中"
 
-#: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3171
-msgid "This event has reminders"
-msgstr "このイベントにはリマインダーがあります"
+#: ../src/calendar/gui/e-cal-ops.c:415
+#, fuzzy
+#| msgid "Removing attachments"
+msgid "Removing a memo"
+msgstr "添付ファイルを削除中"
 
-#: ../calendar/gui/dialogs/event-page.c:717
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-msgid "Or_ganizer:"
-msgstr "主催者(_G):"
+#: ../src/calendar/gui/e-cal-ops.c:419
+#, fuzzy
+#| msgid "Removing attachments"
+msgid "Removing a task"
+msgstr "添付ファイルを削除中"
 
-#: ../calendar/gui/dialogs/event-page.c:1302
-msgid "Event with no start date"
-msgstr "開始日のないイベント"
+#: ../src/calendar/gui/e-cal-ops.c:510
+#, fuzzy, c-format
+#| msgid "Meeting information sent"
+msgid "Deleting an event"
+msgid_plural "Deleting %d events"
+msgstr[0] "会議の情報の送信"
 
-#: ../calendar/gui/dialogs/event-page.c:1305
-msgid "Event with no end date"
-msgstr "終了日のないイベント"
+#: ../src/calendar/gui/e-cal-ops.c:514
+#, fuzzy, c-format
+#| msgid "Delete Memo"
+msgid "Deleting a memo"
+msgid_plural "Deleting %d memos"
+msgstr[0] "メモの削除"
 
-#: ../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 "開始日が間違っています"
+#: ../src/calendar/gui/e-cal-ops.c:518
+#, fuzzy, c-format
+#| msgid "Delete Task"
+msgid "Deleting a task"
+msgid_plural "Deleting %d tasks"
+msgstr[0] "タスクを委任"
 
-#: ../calendar/gui/dialogs/event-page.c:1494
-msgid "End date is wrong"
-msgstr "終了日が間違っています"
+#: ../src/calendar/gui/e-cal-ops.c:721
+#, fuzzy, c-format
+#| msgid "Print this event"
+msgid "Pasting an event"
+msgid_plural "Pasting %d events"
+msgstr[0] "このイベントを印刷"
 
-#: ../calendar/gui/dialogs/event-page.c:1518
-msgid "Start time is wrong"
-msgstr "開始時刻が間違っています"
+#: ../src/calendar/gui/e-cal-ops.c:736
+#, fuzzy, c-format
+#| msgid "Print this memo"
+msgid "Pasting a memo"
+msgid_plural "Pasting %d memos"
+msgstr[0] "このメモを印刷"
 
-#: ../calendar/gui/dialogs/event-page.c:1526
-msgid "End time is wrong"
-msgstr "終了時刻が間違っています"
+#: ../src/calendar/gui/e-cal-ops.c:751
+#, fuzzy, c-format
+#| msgid "Print this task"
+msgid "Pasting a task"
+msgid_plural "Pasting %d tasks"
+msgstr[0] "このタスクを印刷"
 
-#: ../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 "主催者が必要です。"
+#: ../src/calendar/gui/e-cal-ops.c:850
+#, fuzzy
+#| msgid "Updating objects"
+msgid "Updating an event"
+msgstr "オブジェクトの更新"
 
-#: ../calendar/gui/dialogs/event-page.c:1725
-#: ../calendar/gui/dialogs/task-page.c:1119
-msgid "At least one attendee is required."
-msgstr "最低一名の出席者が必要です。"
+#: ../src/calendar/gui/e-cal-ops.c:854
+#, fuzzy
+#| msgid "Updating objects"
+msgid "Updating a memo"
+msgstr "オブジェクトの更新"
 
-#: ../calendar/gui/dialogs/event-page.c:1931
-msgid "_Delegatees"
-msgstr "委任者(_D)"
+#: ../src/calendar/gui/e-cal-ops.c:858
+#, fuzzy
+#| msgid "Updating objects"
+msgid "Updating a task"
+msgstr "オブジェクトの更新"
 
-#: ../calendar/gui/dialogs/event-page.c:1933
-msgid "Atte_ndees"
-msgstr "出席者(_N)"
+#: ../src/calendar/gui/e-cal-ops.c:966
+#, fuzzy, c-format
+#| msgid "Moving an event into the calendar '{0}'"
+msgid "Getting events to purge in the calendar “%s”"
+msgstr "カレンダー '{0}' にイベントを移動しています"
 
-#: ../calendar/gui/dialogs/event-page.c:3451
-#, c-format
-msgid "%d day before appointment"
-msgid_plural "%d days before appointment"
-msgstr[0] "予定の %d日前"
+#: ../src/calendar/gui/e-cal-ops.c:970
+#, fuzzy, c-format
+#| msgid "Moving a memo into the memo list '{0}'"
+msgid "Getting memos to purge in the memo list “%s”"
+msgstr "メモ一覧 '{0}' にメモを移動しています"
 
-#: ../calendar/gui/dialogs/event-page.c:3457
+#: ../src/calendar/gui/e-cal-ops.c:974
+#, fuzzy, c-format
+#| msgid "Moving a task into the task list '{0}'"
+msgid "Getting tasks to purge in the task list “%s”"
+msgstr "タスク一覧 '{0}' にタスクを移動しています"
+
+#: ../src/calendar/gui/e-cal-ops.c:1000
+#, fuzzy, c-format
+#| msgid "Moving an event into the calendar '{0}'"
+msgid "Purging events in the calendar “%s”"
+msgstr "カレンダー '{0}' にイベントを移動しています"
+
+#: ../src/calendar/gui/e-cal-ops.c:1004
+#, fuzzy, c-format
+#| msgid "Moving a memo into the memo list '{0}'"
+msgid "Purging memos in the memo list “%s”"
+msgstr "メモ一覧 '{0}' にメモを移動しています"
+
+#: ../src/calendar/gui/e-cal-ops.c:1008
+#, fuzzy, c-format
+#| msgid "Moving a task into the task list '{0}'"
+msgid "Purging tasks in the task list “%s”"
+msgstr "タスク一覧 '{0}' にタスクを移動しています"
+
+#: ../src/calendar/gui/e-cal-ops.c:1108
+#, fuzzy
+#| msgid "Purging"
+msgid "Purging events"
+msgstr "抹消中"
+
+#: ../src/calendar/gui/e-cal-ops.c:1112
+#, fuzzy
+#| msgid "Print Memos"
+msgid "Purging memos"
+msgstr "メモの印刷"
+
+#: ../src/calendar/gui/e-cal-ops.c:1116
+#, fuzzy
+#| msgid "Print Tasks"
+msgid "Purging tasks"
+msgstr "タスクの印刷"
+
+#: ../src/calendar/gui/e-cal-ops.c:1218
+#, fuzzy
+#| msgid "Hide completed tasks"
+msgid "Expunging completed tasks"
+msgstr "完了したタスクを隠すかどうか"
+
+#: ../src/calendar/gui/e-cal-ops.c:2049
 #, c-format
-msgid "%d hour before appointment"
-msgid_plural "%d hours before appointment"
-msgstr[0] "予定の %d時間前"
+msgid "Moving an event"
+msgid_plural "Moving %d events"
+msgstr[0] ""
 
-#: ../calendar/gui/dialogs/event-page.c:3463
+#: ../src/calendar/gui/e-cal-ops.c:2050
+#, fuzzy, c-format
+#| msgid "Copying Items"
+msgid "Copying an event"
+msgid_plural "Copying %d events"
+msgstr[0] "アイテムのコピー中"
+
+#: ../src/calendar/gui/e-cal-ops.c:2056
+#, fuzzy, c-format
+#| msgid "Moving Items"
+msgid "Moving a memo"
+msgid_plural "Moving %d memos"
+msgstr[0] "アイテムの移動中"
+
+#: ../src/calendar/gui/e-cal-ops.c:2057
+#, fuzzy, c-format
+#| msgid "Copying Items"
+msgid "Copying a memo"
+msgid_plural "Copying %d memos"
+msgstr[0] "アイテムのコピー中"
+
+#: ../src/calendar/gui/e-cal-ops.c:2063
+#, fuzzy, c-format
+#| msgid "Moving Items"
+msgid "Moving a task"
+msgid_plural "Moving %d tasks"
+msgstr[0] "アイテムの移動中"
+
+#: ../src/calendar/gui/e-cal-ops.c:2064
+#, fuzzy, c-format
+#| msgid "Copying Items"
+msgid "Copying a task"
+msgid_plural "Copying %d tasks"
+msgstr[0] "アイテムのコピー中"
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: ../src/calendar/gui/e-cell-date-edit-text.c:163
+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.
+#: ../src/calendar/gui/e-cell-date-edit-text.c:166
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%Y/%m/%d (%a) %p%l:%M:%S"
+
+#: ../src/calendar/gui/e-cell-date-edit-text.c:174
 #, c-format
-msgid "%d minute before appointment"
-msgid_plural "%d minutes before appointment"
-msgstr[0] "予定の %d分前"
+msgid ""
+"The date must be entered in the format: \n"
+"%s"
+msgstr ""
+"日付は書式に合わせて入力してください: \n"
+"%s"
 
-#: ../calendar/gui/dialogs/event-page.c:3484
-msgid "Customize"
-msgstr "その他"
+#: ../src/calendar/gui/e-comp-editor-event.c:99
+#, fuzzy
+#| msgid "Event's start time is in the past"
+msgid "Event’s time is in the past"
+msgstr "イベントの開始時間が過去です"
 
-#. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3491
-msgctxt "cal-reminders"
-msgid "None"
-msgstr "なし"
+#: ../src/calendar/gui/e-comp-editor-event.c:200
+#, fuzzy
+#| msgid "Event cannot be edited, because the selected calendar is read only"
+msgid ""
+"Event cannot be edited, because the selected calendar could not be opened"
+msgstr "イベントを編集できません。選択したイベントは読み込み専用です"
 
-#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] 
minutes
-#: ../calendar/gui/dialogs/event-page.ui.h:2
-msgctxt "eventpage"
-msgid "for"
-msgstr "以下の期間:"
+#: ../src/calendar/gui/e-comp-editor-event.c:202
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr "イベントを編集できません。選択したイベントは読み込み専用です"
 
-#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-msgctxt "eventpage"
-msgid "until"
-msgstr "以下の日時まで:"
+#: ../src/calendar/gui/e-comp-editor-event.c:204
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr ""
+"イベントのすべてを編集することはできません。あなたは主催者ではありません"
 
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgctxt "eventpage"
-msgid "15 minutes before appointment"
-msgstr "予定の 15分前"
-
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:8
-msgctxt "eventpage"
-msgid "1 hour before appointment"
-msgstr "予定の 1時間前"
-
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgctxt "eventpage"
-msgid "1 day before appointment"
-msgstr "予定の 1日前"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-msgid "_Location:"
-msgstr "場所(_L):"
+#: ../src/calendar/gui/e-comp-editor-event.c:436
+#: ../src/calendar/gui/e-comp-editor-task.c:522
+#, fuzzy
+#| msgid "Start date is wrong"
+msgid "Start date is not a valid date"
+msgstr "開始日が間違っています"
 
-#: ../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:356
-msgid "_Description:"
-msgstr "説明(_D):"
+#: ../src/calendar/gui/e-comp-editor-event.c:438
+#, fuzzy
+#| msgid "Start time is wrong"
+msgid "Start time is not a valid time"
+msgstr "開始時刻が間違っています"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:14
-msgid "_Time:"
-msgstr "時刻(_T):"
+#: ../src/calendar/gui/e-comp-editor-event.c:442
+#: ../src/calendar/gui/e-comp-editor-event.c:458
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:199
+#: ../src/calendar/gui/e-comp-editor.c:338 ../src/mail/e-mail-display.c:2116
+#: ../src/mail/e-mail-reader-utils.c:646 ../src/mail/mail-send-recv.c:490
+#: ../src/mail/mail-send-recv.c:1288 ../src/plugins/face/face.c:174
+#: ../src/shell/e-shell.c:1073 ../src/shell/e-shell.c:1097
+#: ../src/smime/gui/certificate-manager.c:357
+msgid "Unknown error"
+msgstr "原因不明のエラー"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
-msgid "Time _zone:"
-msgstr "タイムゾーン(_Z):"
+#: ../src/calendar/gui/e-comp-editor-event.c:452
+#, fuzzy
+#| msgid "The calendar attached is not valid"
+msgid "End date is not a valid date"
+msgstr "添付されたカレンダーが不正です"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-msgid "_Summary:"
-msgstr "サマリ(_S):"
+#: ../src/calendar/gui/e-comp-editor-event.c:454
+#, fuzzy
+#| msgid "invalid time"
+msgid "End time is not a valid time"
+msgstr "時間が正しくありません"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:21
-msgid "Event Description"
-msgstr "イベントの内容"
+#: ../src/calendar/gui/e-comp-editor-event.c:586
+#: ../src/calendar/gui/e-comp-editor-memo.c:126
+#: ../src/calendar/gui/e-comp-editor-task.c:591
+msgid "_Categories"
+msgstr "カテゴリ(_C)"
 
-#: ../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)..."
+#: ../src/calendar/gui/e-comp-editor-event.c:588
+#: ../src/calendar/gui/e-comp-editor-memo.c:128
+#: ../src/calendar/gui/e-comp-editor-task.c:593
+msgid "Toggles whether to display categories"
+msgstr "カテゴリの表示/非表示を切り替えます"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:30
-msgid "_Reminder"
-msgstr "リマインダー(_R)"
+#: ../src/calendar/gui/e-comp-editor-event.c:594
+#: ../src/calendar/gui/e-comp-editor-task.c:599
+msgid "Time _Zone"
+msgstr "タイムゾーン(_Z)"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:31
-msgid "Custom Reminder:"
-msgstr "独自のリマインダー:"
+#: ../src/calendar/gui/e-comp-editor-event.c:596
+#: ../src/calendar/gui/e-comp-editor-task.c:601
+msgid "Toggles whether the time zone is displayed"
+msgstr "タイムゾーンの表示/非表示を切り替えます"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
-msgid "January"
-msgstr "1月"
+#: ../src/calendar/gui/e-comp-editor-event.c:602
+msgid "All _Day Event"
+msgstr "終日のイベントにする(_D)"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
-msgid "February"
-msgstr "2月"
+#: ../src/calendar/gui/e-comp-editor-event.c:604
+msgid "Toggles whether to have All Day Event"
+msgstr "終日のイベントにするかどうかを切り替えます"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
-msgid "March"
-msgstr "3月"
+#: ../src/calendar/gui/e-comp-editor-event.c:610
+msgid "Show Time as _Busy"
+msgstr "予定ありにする(_B)"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
-msgid "April"
-msgstr "4月"
+#: ../src/calendar/gui/e-comp-editor-event.c:612
+msgid "Toggles whether to show time as busy"
+msgstr "予定ありとして時刻を表示するかどうかを切り替えます"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
-msgid "May"
-msgstr "5月"
+#: ../src/calendar/gui/e-comp-editor-event.c:621
+msgid "Pu_blic"
+msgstr "公開(_B)"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
-msgid "June"
-msgstr "6月"
+#: ../src/calendar/gui/e-comp-editor-event.c:623
+msgid "Classify as public"
+msgstr "公開として分類"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
-msgid "July"
-msgstr "7月"
+#: ../src/calendar/gui/e-comp-editor-event.c:628
+msgid "_Private"
+msgstr "非公開(_P)"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
-msgid "August"
-msgstr "8月"
+#: ../src/calendar/gui/e-comp-editor-event.c:630
+msgid "Classify as private"
+msgstr "非公開としての分類"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
-msgid "September"
-msgstr "9月"
+#: ../src/calendar/gui/e-comp-editor-event.c:635
+msgid "_Confidential"
+msgstr "極秘(_C)"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
-msgid "October"
-msgstr "10月"
+#: ../src/calendar/gui/e-comp-editor-event.c:637
+msgid "Classify as confidential"
+msgstr "極秘としての分類"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
-msgid "November"
-msgstr "11月"
+#: ../src/calendar/gui/e-comp-editor-event.c:738
+#, fuzzy
+#| msgid "_Start time:"
+msgctxt "ECompEditor"
+msgid "_Start time:"
+msgstr "開始時刻(_S):"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
-msgid "December"
-msgstr "12月"
+#: ../src/calendar/gui/e-comp-editor-event.c:743
+#, fuzzy
+#| msgid "_End time:"
+msgctxt "ECompEditor"
+msgid "_End time:"
+msgstr "終了時刻(_E):"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-msgid "Select Date"
-msgstr "日付の選択"
+#: ../src/calendar/gui/e-comp-editor-event.c:753
+msgctxt "ECompEditor"
+msgid "All da_y event"
+msgstr "終日のイベントにする(_Y)"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
-msgid "Select _Today"
-msgstr "今日にする(_T)"
+#: ../src/calendar/gui/e-comp-editor-event.c:806
+#: ../src/calendar/gui/e-comp-editor-memo.c:213
+#: ../src/calendar/gui/e-comp-editor-task.c:765
+msgctxt "ECompEditorPage"
+msgid "General"
+msgstr "全般"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3500
-msgid "Memo"
-msgstr "メモ"
+#: ../src/calendar/gui/e-comp-editor-event.c:809
+#: ../src/calendar/gui/e-comp-editor-task.c:782
+msgctxt "ECompEditorPage"
+msgid "Reminders"
+msgstr "リマインダー"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:812
+#, fuzzy
+#| msgid "Recurrence"
+msgctxt "ECompEditorPage"
+msgid "Recurrence"
+msgstr "繰り返し"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:815
+#: ../src/calendar/gui/e-comp-editor-memo.c:216
+#: ../src/calendar/gui/e-comp-editor-task.c:785
+msgctxt "ECompEditorPage"
+msgid "Attachments"
+msgstr "添付ファイル"
+
+#: ../src/calendar/gui/e-comp-editor-event.c:825
+msgctxt "ECompEditorPage"
+msgid "Schedule"
+msgstr ""
+
+#: ../src/calendar/gui/e-comp-editor-event.c:857
+#, fuzzy, c-format
+#| msgid "Meeting - %s"
+msgid "Meeting — %s"
+msgstr "会議 - %s"
 
-#: ../calendar/gui/dialogs/memo-editor.c:155
-msgid "Print this memo"
-msgstr "このメモを印刷"
+#: ../src/calendar/gui/e-comp-editor-event.c:858
+#, fuzzy, c-format
+#| msgid "Appointment - %s"
+msgid "Appointment — %s"
+msgstr "予定 - %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:424
-msgid "Memo's start date is in the past"
-msgstr "メモの開始日が過去です"
+#: ../src/calendar/gui/e-comp-editor-memo.c:88
+#, fuzzy
+#| msgid "Memo cannot be edited, because the selected memo list is read only"
+msgid ""
+"Memo cannot be edited, because the selected memo list could not be opened"
+msgstr "メモは編集できません。選択したメモは読み込み専用です"
 
-#: ../calendar/gui/dialogs/memo-page.c:460
+#: ../src/calendar/gui/e-comp-editor-memo.c:90
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "メモは編集できません。選択したメモは読み込み専用です"
 
-#: ../calendar/gui/dialogs/memo-page.c:464
+#: ../src/calendar/gui/e-comp-editor-memo.c:92
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "メモのすべてを編集することはできません。あなたは主催者ではありません"
 
-#: ../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:34
+#: ../src/calendar/gui/e-comp-editor-memo.c:188
+#: ../src/calendar/gui/e-comp-editor-task.c:700
 msgid "_List:"
 msgstr "一覧(_L):"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:434
-#: ../calendar/gui/dialogs/task-page.ui.h:24
-msgid "Organi_zer:"
-msgstr "主催者(_Z):"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:5
-msgid "T_o:"
-msgstr "共有先(_O):"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:26
+#: ../src/calendar/gui/e-comp-editor-memo.c:195
+#: ../src/calendar/gui/e-comp-editor-task.c:707
+msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "開始日(_R):"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.ui.h:23
-msgid "Su_mmary:"
-msgstr "サマリ(_M):"
+#: ../src/calendar/gui/e-comp-editor-memo.c:247
+#, fuzzy, c-format
+#| msgid "Assigned Task - %s"
+msgid "Assigned Memo — %s"
+msgstr "タスクの割当て - %s"
+
+#: ../src/calendar/gui/e-comp-editor-memo.c:248
+#, fuzzy, c-format
+#| msgid "Memo - %s"
+msgid "Memo — %s"
+msgstr "メモ - %s"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:123
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:128
+#: ../src/em-format/e-mail-formatter-attachment.c:333
+#: ../src/e-util/e-attachment-bar.c:101 ../src/e-util/e-attachment-bar.c:106
+#: ../src/e-util/e-attachment-paned.c:175
+#: ../src/e-util/e-attachment-paned.c:180 ../src/mail/message-list.etspec.h:4
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "添付ファイル"
+
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:194
+#: ../src/e-util/e-attachment.c:2419
+#, fuzzy, c-format
+#| msgid "Could not load '%s'"
+msgid "Could not load “%s”"
+msgstr "'%s' を読み込めませんでした"
+
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:196
+#: ../src/e-util/e-attachment.c:2422
 #, c-format
-msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "繰り返しのイベントを修正中です。何を修正しますか?"
+msgid "Could not load the attachment"
+msgstr "添付ファイルを読み込めませんでした"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:401
+#, fuzzy
+#| msgid ""
+#| "Some attachments are being downloaded. Saving the task would result in "
+#| "the loss of these attachments."
+msgid ""
+"Some attachments are still being downloaded. Please wait until the download "
+"is finished."
+msgstr ""
+"添付ファイルをダウンロードしています。ここでタスクを保存してしまうと、いくつ"
+"かの添付ファイルが失われてしまいます。"
+
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:428
 #, c-format
-msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr "繰り返しのイベントを委任中です。何を委任しますか?"
+msgid "Attachment “%s” cannot be found, remove it from the list, please"
+msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:445
 #, c-format
-msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr "繰り返しのタスクを修正中です。何を修正しますか?"
+msgid "Attachment “%s” doesn’t have valid URI, remove it from the list, please"
+msgstr ""
+
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:606
+#: ../src/composer/e-composer-actions.c:320
+msgid "_Attachment..."
+msgstr "ファイルの添付(_A)..."
+
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:608
+#: ../src/composer/e-composer-actions.c:322
+#: ../src/e-util/e-attachment-view.c:343
+msgid "Attach a file"
+msgstr "ファイルを添付します"
+
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:615
+msgid "_Attachments"
+msgstr "添付ファイル(_A)"
+
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:617
+msgid "Show attachments"
+msgstr "添付ファイルを表示"
+
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:770
+#: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:725
+msgid "Icon View"
+msgstr "アイコンビュー"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:772
+#: ../src/e-util/e-attachment-bar.c:768 ../src/e-util/e-attachment-paned.c:727
+msgid "List View"
+msgstr "一覧ビュー"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:311
+#, fuzzy, c-format
+#| msgid "Cannot find matching event in the next %d year"
+#| msgid_plural "Cannot find matching event in the next %d years"
+msgid "Cannot find attendee “%s” in the list of attendees"
+msgstr "一致するイベントは次の %d 年以内には見つかりませんでした"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:318
 #, c-format
-msgid "You are modifying a recurring memo. What would you like to modify?"
-msgstr "繰り返しのメモを修正中です。何を修正しますか?"
+msgid "Not enough rights to delete attendee “%s”"
+msgstr ""
 
-#: ../calendar/gui/dialogs/recur-comp.c:88
-msgid "This Instance Only"
-msgstr "このインスタンスのみ"
+#: ../src/calendar/gui/e-comp-editor-page-general.c:348
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgid "Failed to delete selected attendee"
+msgid_plural "Failed to delete selected attendees"
+msgstr[0] "連絡先の削除に失敗しました"
 
-#: ../calendar/gui/dialogs/recur-comp.c:92
-msgid "This and Prior Instances"
-msgstr "これと以前のインスタンス"
+#: ../src/calendar/gui/e-comp-editor-page-general.c:581
+msgid "A_ttendees"
+msgstr "出席者(_T)"
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
-msgid "This and Future Instances"
-msgstr "これと将来のインスタンス"
+#: ../src/calendar/gui/e-comp-editor-page-general.c:583
+#, fuzzy
+#| msgid "Toggles whether the Attendee Type is displayed"
+msgid "Toggles whether the Attendees are displayed"
+msgstr "出席者の種類の表示/非表示を切り替えます"
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
-msgid "All Instances"
-msgstr "すべてのインスタンス"
+#: ../src/calendar/gui/e-comp-editor-page-general.c:592
+msgid "R_ole Field"
+msgstr "役割(_O)"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:574
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "この予定には Evolution が編集できない繰り返しがあります。"
+#: ../src/calendar/gui/e-comp-editor-page-general.c:594
+msgid "Toggles whether the Role field is displayed"
+msgstr "役割の表示/非表示を切り替えます"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1001
-msgid "Recurrence date is invalid"
-msgstr "繰り返しの日付が間違っています"
+#: ../src/calendar/gui/e-comp-editor-page-general.c:600
+msgid "_RSVP"
+msgstr "RSVP(_R)"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
-msgid "End time of the recurrence was before event's start"
-msgstr "繰り返しを終える時間がイベントを開始する時間より前です"
+#: ../src/calendar/gui/e-comp-editor-page-general.c:602
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "RSVP の表示/非表示を切り替えます"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:608
+msgid "_Status Field"
+msgstr "ステータス(_S)"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:610
+msgid "Toggles whether the Status field is displayed"
+msgstr "ステータスの表示/非表示を切り替えます"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:616
+msgid "_Type Field"
+msgstr "種類(_T)"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:618
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "出席者の種類の表示/非表示を切り替えます"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:943
+msgid "An organizer is required."
+msgstr "主催者が必要です。"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:953
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1084
+msgid "At least one attendee is required."
+msgstr "最低一名の出席者が必要です。"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1207
+msgid "Or_ganizer:"
+msgstr "主催者(_G):"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1286
+msgctxt "ECompEditor"
+msgid "Atte_ndees..."
+msgstr "出席者(_N)..."
+
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:325
+msgid "Add exception"
+msgstr "対象外の日の追加"
+
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:363
+msgid "Modify exception"
+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:1074
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:488
 msgid "on"
 msgstr "の"
 
@@ -3344,7 +7993,10 @@ 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:1155
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:569
+#, fuzzy
+#| msgid "first"
+msgctxt "ECompEditorPageRecur"
 msgid "first"
 msgstr "最初の"
 
@@ -3353,7 +8005,10 @@ 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:1161
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:575
+#, fuzzy
+#| msgid "second"
+msgctxt "ECompEditorPageRecur"
 msgid "second"
 msgstr "二番目の"
 
@@ -3361,7 +8016,10 @@ 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:1166
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:580
+#, fuzzy
+#| msgid "third"
+msgctxt "ECompEditorPageRecur"
 msgid "third"
 msgstr "三番目の"
 
@@ -3369,7 +8027,10 @@ 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:1171
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:585
+#, fuzzy
+#| msgid "fourth"
+msgctxt "ECompEditorPageRecur"
 msgid "fourth"
 msgstr "四番目の"
 
@@ -3377,7 +8038,10 @@ 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:1176
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:590
+#, fuzzy
+#| msgid "fifth"
+msgctxt "ECompEditorPageRecur"
 msgid "fifth"
 msgstr "五番目の"
 
@@ -3385,13 +8049,19 @@ 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:1181
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:595
+#, fuzzy
+#| msgid "last"
+msgctxt "ECompEditorPageRecur"
 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:1205
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:622
+#, fuzzy
+#| msgid "Other Date"
+msgctxt "ECompEditorPageRecur"
 msgid "Other Date"
 msgstr "その他の日"
 
@@ -3399,7 +8069,10 @@ 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:1211
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:628
+#, fuzzy
+#| msgid "1st to 10th"
+msgctxt "ECompEditorPageRecur"
 msgid "1st to 10th"
 msgstr "1日〜10日"
 
@@ -3407,7 +8080,10 @@ 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:1217
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:634
+#, fuzzy
+#| msgid "11th to 20th"
+msgctxt "ECompEditorPageRecur"
 msgid "11th to 20th"
 msgstr "11日〜20日"
 
@@ -3415,834 +8091,803 @@ 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:1223
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:640
+#, fuzzy
+#| msgid "21st to 31st"
+msgctxt "ECompEditorPageRecur"
 msgid "21st to 31st"
 msgstr "21日〜31日"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1250
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#. 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.
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:666
+#, fuzzy
+#| msgid "day"
+#| msgid_plural "days"
+msgctxt "ECompEditorPageRecur"
+msgid "day"
+msgstr "日"
+
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:667
+#, fuzzy
+#| msgid "Monday"
+msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "月曜日"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1251
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:668
+#, fuzzy
+#| msgid "Tuesday"
+msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "火曜日"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1252
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:669
+#, fuzzy
+#| msgid "Wednesday"
+msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "水曜日"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1253
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:670
+#, fuzzy
+#| msgid "Thursday"
+msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "木曜日"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1254
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:671
+#, fuzzy
+#| msgid "Friday"
+msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "金曜日"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1255
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:672
+#, fuzzy
+#| msgid "Saturday"
+msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "土曜日"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1256
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:673
+#, fuzzy
+#| msgid "Sunday"
+msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
 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:1387
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:802
+#, fuzzy
+#| msgid "on the"
+msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "の"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1572
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:992
+#, fuzzy
+#| msgid "occurrences"
+msgctxt "ECompEditorPageRecur"
 msgid "occurrences"
 msgstr "繰り返す"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2342
-msgid "Add exception"
-msgstr "対象外の日の追加"
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1485
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2015
+#, fuzzy
+#| msgid "This appointment rec_urs"
+msgctxt "ECompEditorPageRecur"
+msgid "This appointment rec_urs"
+msgstr "この予定を繰り返す(_U)"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2384
-msgid "Could not get a selection to modify."
-msgstr "変更する内容を取得できませんでした"
+#. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1490
+#, fuzzy
+#| msgid "This task recurs"
+msgctxt "ECompEditorPageRecur"
+msgid "This task rec_urs"
+msgstr "このタスクを繰り返す"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2390
-msgid "Modify exception"
-msgstr "対象外の日の変更"
+#. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1495
+#, fuzzy
+#| msgid "This memo recurs"
+msgctxt "ECompEditorPageRecur"
+msgid "This memo rec_urs"
+msgstr "このメモを繰り返す"
+
+#. Translators: Entire string is for example:     'This component 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1500
+#, fuzzy
+#| msgid "This appointment rec_urs"
+msgctxt "ECompEditorPageRecur"
+msgid "This component rec_urs"
+msgstr "この予定を繰り返す(_U)"
+
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1861
+#, fuzzy
+#| msgid "Recurrence date is invalid"
+msgid "Recurrence exception date is invalid"
+msgstr "繰り返しの日付が間違っています"
+
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1909
+#, fuzzy
+#| msgid "End time of the recurrence was before event's start"
+msgid "End time of the recurrence is before the start"
+msgstr "繰り返しを終える時間がイベントを開始する時間より前です"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2436
-msgid "Could not get a selection to delete."
-msgstr "削除する内容を取得できませんでした"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1952
+#, fuzzy
+#| msgid "Recurrence"
+msgid "R_ecurrence"
+msgstr "繰り返し"
+
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1954
+#, fuzzy
+#| msgid "It has recurrences."
+msgid "Set or unset recurrence"
+msgstr "繰り返しがあります。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2577
-msgid "Date/Time"
-msgstr "日付/時刻"
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2055
+#, fuzzy
+#| msgid "Every"
+msgctxt "ECompEditorPageRecur"
+msgid "Every"
+msgstr "毎"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-msgctxt "recurrpage"
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2090
+#, fuzzy
+#| msgid "day(s)"
+msgctxt "ECompEditorPageRecur"
 msgid "day(s)"
 msgstr "日"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
-msgctxt "recurrpage"
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2092
+#, fuzzy
+#| msgctxt "recurrpage"
+#| msgid "week(s)"
+msgctxt "ECompEditorPageRecur"
 msgid "week(s)"
 msgstr "週"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
-msgctxt "recurrpage"
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2094
+#, fuzzy
+#| msgctxt "recurrpage"
+#| msgid "month(s)"
+msgctxt "ECompEditorPageRecur"
 msgid "month(s)"
 msgstr "月"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
-msgctxt "recurrpage"
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2096
+#, fuzzy
+#| msgctxt "recurrpage"
+#| msgid "year(s)"
+msgctxt "ECompEditorPageRecur"
 msgid "year(s)"
 msgstr "年"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
-msgctxt "recurrpage"
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2125
+#, fuzzy
+#| msgctxt "eventpage"
+#| msgid "for"
+msgctxt "ECompEditorPageRecur"
 msgid "for"
-msgstr "以下の回数:"
+msgstr "以下の期間:"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
-msgctxt "recurrpage"
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2127
+#, fuzzy
+#| msgctxt "eventpage"
+#| msgid "until"
+msgctxt "ECompEditorPageRecur"
 msgid "until"
-msgstr "以下の時まで:"
+msgstr "以下の日時まで:"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
-msgctxt "recurrpage"
+#. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2129
+#, fuzzy
+#| msgctxt "recurrpage"
+#| msgid "forever"
+msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "永久に:"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-msgid "This appointment rec_urs"
-msgstr "この予定を繰り返す(_U)"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:17
-msgid "Every"
-msgstr "毎"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2145
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "この予定には Evolution が編集できない繰り返しがあります。"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2162
 msgid "Exceptions"
 msgstr "対象外の日"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:22
-msgid "Preview"
-msgstr "プレビュー"
-
-#: ../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:174
-#: ../calendar/gui/dialogs/send-comp.c:256
-msgid "Notify new attendees _only"
-msgstr "新しい参加者のみに通知(_O)"
-
-#: ../calendar/gui/dialogs/task-editor.c:93
-msgid "_Send Options"
-msgstr "送信オプション(_S)"
-
-#: ../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:285
-msgid "Print this task"
-msgstr "このタスクを印刷"
-
-#: ../calendar/gui/dialogs/task-page.c:330
-msgid "Task's start date is in the past"
-msgstr "タスクの開始日が過去です"
-
-#: ../calendar/gui/dialogs/task-page.c:331
-msgid "Task's due date is in the past"
-msgstr "タスクの期日が過去です"
-
-#: ../calendar/gui/dialogs/task-page.c:364
-msgid "Task cannot be edited, because the selected task list is read only"
-msgstr "タスクは完全には編集できません。選択したタスクの一覧は読み込み専用です"
-
-#: ../calendar/gui/dialogs/task-page.c:368
-msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "タスクのすべてを編集することはできません。あなたは主催者ではありません"
-
-#: ../calendar/gui/dialogs/task-page.c:372
-msgid "Task cannot be edited, because the selected task list does not support assigned tasks"
-msgstr "タスクを編集できません。選択したタスク一覧はタスク割り当てをサポートしていません。"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1777
+#: ../src/mail/mail-config.ui.h:64
+msgid "A_dd"
+msgstr "追加(_D)"
 
-#: ../calendar/gui/dialogs/task-page.c:1011
-msgid "Due date is wrong"
-msgstr "期日が間違っています"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2247
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1785
+#: ../src/mail/mail-config.ui.h:66
+#, fuzzy
+#| msgid "Remove"
+msgid "Re_move"
+msgstr "削除"
 
-#: ../calendar/gui/dialogs/task-page.c:1179
-#: ../calendar/gui/dialogs/task-page.c:1204
-msgid "Completed date is wrong"
-msgstr "完了日が間違っています"
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2255
+msgid "Preview"
+msgstr "プレビュー"
 
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../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 "高い"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:39
+#, fuzzy
+#| msgid "Send To:"
+msgid "Send To"
+msgstr "送信先:"
 
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:10
-#: ../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:308
-msgid "Normal"
-msgstr "普通"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1554
+msgid "_Reminders"
+msgstr "リマインダー(_R)"
 
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../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 "低い"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1556
+#, fuzzy
+#| msgid "Set or unset reminders for this event"
+msgid "Set or unset reminders"
+msgstr "このイベントのリマインダーをセットしたり解除します"
 
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:22
-#: ../e-util/e-send-options.ui.h:1
-msgid "Undefined"
-msgstr "未定義"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1609
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
+msgid "Reminders"
+msgstr "リマインダー"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:16
-#: ../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 "開始していない"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1638
+msgid "_Reminder"
+msgstr "リマインダー(_R)"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:18
-#: ../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 "進行中"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1671
+#, fuzzy, c-format
+#| msgid "%d day before appointment"
+#| msgid_plural "%d days before appointment"
+msgid "%d day before"
+msgid_plural "%d days before"
+msgstr[0] "予定の %d日前"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:20
-#: ../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:379
-msgid "Completed"
-msgstr "完了"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1678
+#, fuzzy, c-format
+#| msgid "%d hour before appointment"
+#| msgid_plural "%d hours before appointment"
+msgid "%d hour before"
+msgid_plural "%d hours before"
+msgstr[0] "予定の %d時間前"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../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 "キャンセル済み"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:25
-msgid "D_ue date:"
-msgstr "期日(_U):"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1685
+#, fuzzy, c-format
+#| msgid "%d minute before appointment"
+#| msgid_plural "%d minutes before appointment"
+msgid "%d minute before"
+msgid_plural "%d minutes before"
+msgstr[0] "予定の %d分前"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:28
-msgid "Time zone:"
-msgstr "タイムゾーン:"
+#. Translators: "None" for "No reminder set"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1693
+msgctxt "cal-reminders"
+msgid "None"
+msgstr "なし"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:35
-msgid "_Status:"
-msgstr "ステータス(_S):"
+#. Translators: Predefined reminder's description
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1695
+msgctxt "cal-reminders"
+msgid "15 minutes before"
+msgstr "15分前"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:36
-msgid "Date _completed:"
-msgstr "完了日(_C):"
+#. Translators: Predefined reminder's description
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1697
+msgctxt "cal-reminders"
+msgid "1 hour before"
+msgstr "1時間前"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:37
-msgid "_Percent complete:"
-msgstr "達成率(_P):"
+#. Translators: Predefined reminder's description
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1699
+msgctxt "cal-reminders"
+msgid "1 day before"
+msgstr "1日前"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:38
-msgid "Priorit_y:"
-msgstr "優先度(_Y):"
+#. Translators: "Custom" for "Custom reminder set"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1711
+msgctxt "cal-reminders"
+msgid "Custom"
+msgstr "カスタム"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:39
-msgid "C_lassification:"
-msgstr "分類(_L)"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1862
+msgctxt "cal-reminders"
+msgid "minute(s)"
+msgstr "分"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:40
-msgid "_Web Page:"
-msgstr "ウェブページ(_W):"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1864
+msgctxt "cal-reminders"
+msgid "hour(s)"
+msgstr "時間"
 
-#: ../calendar/gui/ea-cal-view.c:281
-msgid "New Appointment"
-msgstr "新しい予定"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1866
+msgctxt "cal-reminders"
+msgid "day(s)"
+msgstr "日"
 
-#: ../calendar/gui/ea-cal-view.c:282
-msgid "New All Day Event"
-msgstr "新しい終日のイベント"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1883
+msgctxt "cal-reminders"
+msgid "before"
+msgstr "前"
 
-#: ../calendar/gui/ea-cal-view.c:283
-msgid "New Meeting"
-msgstr "新しい会議"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1885
+msgctxt "cal-reminders"
+msgid "after"
+msgstr "後"
 
-#: ../calendar/gui/ea-cal-view.c:284
-msgid "Go to Today"
-msgstr "今日へ移動"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1901
+msgctxt "cal-reminders"
+msgid "start"
+msgstr "開始"
 
-#: ../calendar/gui/ea-cal-view.c:285
-msgid "Go to Date"
-msgstr "指定日へ移動"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1903
+msgctxt "cal-reminders"
+msgid "end"
+msgstr ""
 
-#: ../calendar/gui/ea-cal-view-event.c:297
-msgid "It has reminders."
-msgstr "リマインダーがあります。"
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1926
+msgid "Re_peat the reminder"
+msgstr "リマインダーを繰り返す(_P)"
 
-#: ../calendar/gui/ea-cal-view-event.c:300
-msgid "It has recurrences."
-msgstr "繰り返しがあります。"
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1951
+msgctxt "cal-reminders"
+msgid "extra times every"
+msgstr "回 / "
 
-#: ../calendar/gui/ea-cal-view-event.c:303
-msgid "It is a meeting."
-msgstr "会議です。"
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1988
+msgctxt "cal-reminders"
+msgid "minutes"
+msgstr "分"
 
-#: ../calendar/gui/ea-cal-view-event.c:310
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "カレンダーのイベント: サマリは %s"
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1990
+msgctxt "cal-reminders"
+msgid "hours"
+msgstr "時間"
 
-#: ../calendar/gui/ea-cal-view-event.c:313
-msgid "Calendar Event: It has no summary."
-msgstr "カレンダーのイベント: サマリなし。"
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1992
+msgctxt "cal-reminders"
+msgid "days"
+msgstr "日"
 
-#: ../calendar/gui/ea-cal-view-event.c:336
-msgid "calendar view event"
-msgstr "カレンダーの表示イベント"
+#. page_reminders->priv->custom_email_entry is initialized on demand
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2033
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2190
+msgctxt "cal-reminders"
+msgid "Custom _message"
+msgstr "メッセージをカスタマイズ(_M)"
 
-#: ../calendar/gui/ea-cal-view-event.c:568
-msgid "Grab Focus"
-msgstr "フォーカスの取得"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2077
+msgctxt "cal-reminders"
+msgid "Custom reminder _sound"
+msgstr "リマインダー音をカスタマイズする(_S)"
 
-#: ../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."
-msgstr[0] "%d個のイベントあり"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2088
+msgid "Select a sound file"
+msgstr "音声ファイルの選択"
 
-#. 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:118 ../calendar/gui/ea-week-view.c:113
-msgid "It has no events."
-msgstr "イベントなし"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2116
+msgid "_Program:"
+msgstr "プログラム(_P):"
 
-#: ../calendar/gui/ea-day-view.c:126
-#, c-format
-msgid "Work Week View: %s. %s"
-msgstr "平日ビュー: %s (%s)"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2141
+msgid "_Arguments:"
+msgstr "引数(_A):"
 
-#: ../calendar/gui/ea-day-view.c:133
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "日間ビュー: %s (%s)"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2173
+#, fuzzy
+#| msgid "Send To:"
+msgid "_Send To:"
+msgstr "送信先:"
 
-#: ../calendar/gui/ea-day-view.c:167
-msgid "calendar view for a work week"
-msgstr "平日のカレンダー表示"
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:443
+#, fuzzy
+#| msgid "_Schedule Meeting..."
+msgid "_Schedule"
+msgstr "会議のスケジュール(_S)..."
 
-#: ../calendar/gui/ea-day-view.c:169
-msgid "calendar view for one or more days"
-msgstr "一日以上のカレンダー表示"
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:445
+msgid "Query free / busy information for the attendees"
+msgstr "この出席者の予定を調べてみます"
 
-#: ../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 "現在時刻の範囲を表示/選択するためのテーブル"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:79
+msgctxt "ECompEditor"
+msgid "_Summary:"
+msgstr "サマリ(_S):"
 
-#: ../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 カレンダー"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:323
+#, fuzzy
+#| msgid "_Location:"
+msgctxt "ECompEditor"
+msgid "_Location:"
+msgstr "場所(_L):"
 
-#: ../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"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:456
+msgctxt "ECompEditor"
+msgid "_Categories..."
+msgstr "カテゴリ(_C)..."
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %d = day of month, %b = abbreviated month name.
-#. * You can change the order but don't change the
-#. * specifiers or add anything.
-#: ../calendar/gui/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)"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:555
+msgctxt "ECompEditor"
+msgid "_Description:"
+msgstr "説明(_D):"
 
-#: ../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)"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:686
+msgctxt "ECompEditor"
+msgid "_Web page:"
+msgstr "ウェブページ(_W):"
 
-#: ../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日"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1057
+msgctxt "ECompEditor"
+msgid "D_ue date:"
+msgstr "期日(_U):"
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. * month name. You can change the order but don't
-#. * change the specifiers or add anything.
-#: ../calendar/gui/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日"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1117
+msgctxt "ECompEditor"
+msgid "Date _completed:"
+msgstr "完了日(_C):"
 
-#: ../calendar/gui/ea-jump-button.c:150
-msgid "Jump button"
-msgstr "ジャンプボタン"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1133
+msgctxt "ECompEditor"
+msgid "Public"
+msgstr "公開"
 
-#: ../calendar/gui/ea-jump-button.c:159
-msgid "Click here, you can find more events."
-msgstr "ここをクリックすると、他のイベントを検索できます"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1134
+msgctxt "ECompEditor"
+msgid "Private"
+msgstr "非公開"
 
-#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:357 ../calendar/gui/misc.c:97
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d日間"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1135
+msgctxt "ECompEditor"
+msgid "Confidential"
+msgstr "機密"
 
-#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:363
-#, c-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] "%d週間"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1151
+msgctxt "ECompEditor"
+msgid "C_lassification:"
+msgstr "分類(_L)"
 
-#: ../calendar/gui/e-alarm-list.c:425
-msgid "Unknown action to be performed"
-msgstr "実行するアクションが不明です"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1170
+msgctxt "ECompEditor"
+msgid "Not Started"
+msgstr "開始していない"
 
-#: ../calendar/gui/e-alarm-list.c:440
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "予定を開始する %2$s前に%1$s"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
+msgctxt "ECompEditor"
+msgid "In Progress"
+msgstr "進行中"
 
-#: ../calendar/gui/e-alarm-list.c:446
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "予定を開始する %2$s後に%1$s"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1172
+msgctxt "ECompEditor"
+msgid "Completed"
+msgstr "完了"
 
-#. Translator: The %s refers to the base, which would be actions like
-#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:453
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "予定を開始した時点で%s"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1173
+#, fuzzy
+#| msgid "Cancelled"
+msgctxt "ECompEditor"
+msgid "Cancelled"
+msgstr "キャンセルされた"
 
-#: ../calendar/gui/e-alarm-list.c:465
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "予定を終了する %2$s前に%1$s"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1182
+msgctxt "ECompEditor"
+msgid "_Status:"
+msgstr "ステータス(_S):"
 
-#: ../calendar/gui/e-alarm-list.c:471
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "予定を終了する %2$s後に%1$s"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1212
+msgctxt "ECompEditor"
+msgid "Undefined"
+msgstr "未定義"
 
-#. Translator: The %s refers to the base, which would be actions like
-#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:478
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "予定を終了した時点で%s"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1213
+msgctxt "ECompEditor"
+msgid "High"
+msgstr "高い"
 
-#. 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:502
-#, c-format
-msgid "%s at %s"
-msgstr "%2$sの時点で%1$s"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1214
+msgctxt "ECompEditor"
+msgid "Normal"
+msgstr "普通"
 
-#. 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:510
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr "トリガーの種類が不明な %s"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1215
+msgctxt "ECompEditor"
+msgid "Low"
+msgstr "低い"
 
-#: ../calendar/gui/ea-week-view.c:119
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "月間ビュー: %s (%s)"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1224
+msgctxt "ECompEditor"
+msgid "Priorit_y:"
+msgstr "優先度(_Y):"
 
-#: ../calendar/gui/ea-week-view.c:124
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "週間ビュー: %s (%s)"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1278
+msgctxt "ECompEditor"
+msgid "Percent complete:"
+msgstr "達成率:"
 
-#: ../calendar/gui/ea-week-view.c:158
-msgid "calendar view for a month"
-msgstr "一ヶ月のカレンダー表示"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1359
+msgctxt "ECompEditor"
+msgid "Time _zone:"
+msgstr "タイムゾーン(_Z):"
 
-#: ../calendar/gui/ea-week-view.c:160
-msgid "calendar view for one or more weeks"
-msgstr "一週間以上のカレンダー表示"
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1484
+#, fuzzy
+#| msgid "Show Time as _Busy"
+msgctxt "ECompEditor"
+msgid "Show time as _busy"
+msgstr "予定ありにする(_B)"
 
-#: ../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 "タイトルなし"
+#: ../src/calendar/gui/e-comp-editor-task.c:224
+#, fuzzy
+#| msgid "Task's start date is in the past"
+msgid "Task’s start date is in the past"
+msgstr "タスクの開始日が過去です"
 
-#: ../calendar/gui/e-cal-component-preview.c:230
-msgid "Categories:"
-msgstr "カテゴリ:"
+#: ../src/calendar/gui/e-comp-editor-task.c:232
+#, fuzzy
+#| msgid "Task's due date is in the past"
+msgid "Task’s due date is in the past"
+msgstr "タスクの期日が過去です"
 
-#: ../calendar/gui/e-cal-component-preview.c:262
-msgid "Summary:"
-msgstr "サマリ:"
+#: ../src/calendar/gui/e-comp-editor-task.c:461
+#, fuzzy
+#| msgid "Task cannot be edited, because the selected task list is read only"
+msgid ""
+"Task cannot be edited, because the selected task list could not be opened"
+msgstr "タスクは完全には編集できません。選択したタスクの一覧は読み込み専用です"
 
-#: ../calendar/gui/e-cal-component-preview.c:271
-msgid "Start Date:"
-msgstr "開始日:"
+#: ../src/calendar/gui/e-comp-editor-task.c:463
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "タスクは完全には編集できません。選択したタスクの一覧は読み込み専用です"
 
-#: ../calendar/gui/e-cal-component-preview.c:283
-msgid "End Date:"
-msgstr "終了日:"
+#: ../src/calendar/gui/e-comp-editor-task.c:465
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "タスクのすべてを編集することはできません。あなたは主催者ではありません"
 
-#: ../calendar/gui/e-cal-component-preview.c:295
-msgid "Due Date:"
-msgstr "期日:"
+#: ../src/calendar/gui/e-comp-editor-task.c:533
+#, fuzzy
+#| msgid "Recurrence date is invalid"
+msgid "Due date is not a valid date"
+msgstr "繰り返しの日付が間違っています"
 
-#: ../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 "ステータス:"
+#: ../src/calendar/gui/e-comp-editor-task.c:544
+#, fuzzy
+#| msgid "Completed date is wrong"
+msgid "Completed date is not a valid date"
+msgstr "完了日が間違っています"
 
-#: ../calendar/gui/e-cal-component-preview.c:334
-msgid "Priority:"
-msgstr "優先度:"
+#: ../src/calendar/gui/e-comp-editor-task.c:555
+#, fuzzy
+#| msgid "1 minute in the future"
+#| msgid_plural "%d minutes in the future"
+msgid "Completed date cannot be in the future"
+msgstr "%d分後"
 
-#: ../calendar/gui/e-cal-component-preview.c:359
-#: ../mail/e-mail-config-service-page.c:671
-msgid "Description:"
-msgstr "説明:"
+#: ../src/calendar/gui/e-comp-editor-task.c:607
+#, fuzzy
+#| msgid "All _Day Event"
+msgid "All _Day Task"
+msgstr "終日のイベントにする(_D)"
 
-#: ../calendar/gui/e-cal-component-preview.c:390
-msgid "Web Page:"
-msgstr "ウェブページ:"
+#: ../src/calendar/gui/e-comp-editor-task.c:609
+#, fuzzy
+#| msgid "Toggles whether to have All Day Event"
+msgid "Toggles whether to have All Day Task"
+msgstr "終日のイベントにするかどうかを切り替えます"
 
-#: ../calendar/gui/e-calendar-selector.c:356
-#: ../modules/calendar/e-cal-shell-view-private.c:1096
+#: ../src/calendar/gui/e-comp-editor-task.c:818
 #, fuzzy, c-format
-#| msgid "Copying an event into the calendar '{0}'"
-msgid "Copying an event into the calendar %s"
-msgstr "カレンダー '{0}' にイベントをコピーしています"
+#| msgid "Assigned Task - %s"
+msgid "Assigned Task — %s"
+msgstr "タスクの割当て - %s"
 
-#: ../calendar/gui/e-calendar-selector.c:357
-#: ../modules/calendar/e-cal-shell-view-private.c:1095
+#: ../src/calendar/gui/e-comp-editor-task.c:819
 #, 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 "<ここをクリックしてタスクを追加してください>"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:2
-msgid "Start date"
-msgstr "開始日"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../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:585
-#: ../mail/e-mail-account-tree-view.c:158
-msgid "Type"
-msgstr "種類"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:5
-msgid "Completion date"
-msgstr "完了日"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:857
-msgid "Complete"
-msgstr "完了の状態"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:7
-msgid "Due date"
-msgstr "期日"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:9
-#, no-c-format
-msgid "% Complete"
-msgstr "完了 (%)"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:18
-#: ../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: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:49
-#: ../mail/message-list.etspec.h:1
-msgid "Status"
-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:380
-msgid "Created"
-msgstr "作成済"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-memo-table.etspec.h:7
-msgid "Last modified"
-msgstr "最終更新日時"
-
-#: ../calendar/gui/e-calendar-view.c:448
-msgid "Cut selected events to the clipboard"
-msgstr "選択したイベントを切り取ってクリップボードにコピーします"
-
-#: ../calendar/gui/e-calendar-view.c:454
-msgid "Copy selected events to the clipboard"
-msgstr "選択したイベントをクリップボードにコピーします"
-
-#: ../calendar/gui/e-calendar-view.c:460
-msgid "Paste events from the clipboard"
-msgstr "クリップボードからイベントを貼り付けます"
+#| msgid "Task - %s"
+msgid "Task — %s"
+msgstr "タスク - %s"
 
-#: ../calendar/gui/e-calendar-view.c:466
-msgid "Delete selected events"
-msgstr "選択したイベントを削除します"
+#: ../src/calendar/gui/e-comp-editor.c:253
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:125
+msgid "attachment"
+msgstr "添付"
 
-#: ../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 "指定したオブジェクトを削除します"
+#: ../src/calendar/gui/e-comp-editor.c:608
+#, fuzzy
+#| msgid "Send _updates to attendees"
+msgid "Sending notifications to attendees..."
+msgstr "更新情報を出席者へ送信する(_U)"
 
-#: ../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 "オブジェクトの更新"
+#: ../src/calendar/gui/e-comp-editor.c:993
+msgid "Saving changes..."
+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:2094 ../calendar/gui/e-memo-table.c:552
-#: ../calendar/gui/e-task-table.c:839
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "主催者: %s <%s>"
+#: ../src/calendar/gui/e-comp-editor.c:1249
+msgid "No Summary"
+msgstr "サマリ無し"
 
-#. 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:2098 ../calendar/gui/e-memo-table.c:557
-#: ../calendar/gui/e-task-table.c:843
-#, c-format
-msgid "Organizer: %s"
-msgstr "主催者: %s"
+#. == Button box ==
+#: ../src/calendar/gui/e-comp-editor.c:1976
+#: ../src/composer/e-composer-actions.c:327
+#: ../src/e-util/e-html-editor-dialog.c:194
+#: ../src/e-util/e-mail-signature-editor.c:309
+#: ../src/e-util/e-name-selector-dialog.c:548
+#: ../src/e-util/e-preferences-window.c:389
+#: ../src/e-util/e-table-field-chooser-dialog.c:205
+#: ../src/mail/e-mail-browser.c:127 ../src/mail/e-mail-notes.c:931
+#: ../src/mail/em-folder-properties.c:1158
+#: ../src/mail/em-subscription-editor.c:1765
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:254
+#: ../src/shell/e-shell-window-actions.c:278
+#: ../src/shell/e-shell-window-actions.c:787
+#: ../src/smime/gui/certificate-manager.c:2212
+msgid "_Close"
+msgstr "閉じる(_C)"
 
-#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../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"
+#: ../src/calendar/gui/e-comp-editor.c:1978
+msgid "Close the current window"
+msgstr "現在のウィンドウを閉じます"
 
-#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2145
-#, c-format
-msgid "Time: %s %s"
-msgstr "時刻: %s %s"
+#. copy menu item
+#: ../src/calendar/gui/e-comp-editor.c:1983 ../src/e-util/e-focus-tracker.c:773
+#: ../src/e-util/e-html-editor-actions.c:878 ../src/e-util/e-text.c:2110
+#: ../src/e-util/e-web-view.c:407 ../src/mail/e-mail-browser.c:134
+#: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:808
+msgid "_Copy"
+msgstr "コピー(_C)"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:1
-#: ../calendar/gui/e-memo-table.etspec.h:5
-msgid "Start Date"
-msgstr "開始日"
+#: ../src/calendar/gui/e-comp-editor.c:1985 ../src/e-util/e-focus-tracker.c:173
+#: ../src/e-util/e-focus-tracker.c:229 ../src/e-util/e-focus-tracker.c:282
+#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:409
+#: ../src/e-util/e-web-view.c:1942 ../src/mail/e-mail-browser.c:136
+#: ../src/shell/e-shell-window-actions.c:810
+msgid "Copy the selection"
+msgstr "選択した連絡先/予定をコピーします"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "終了日"
+#. cut menu item
+#: ../src/calendar/gui/e-comp-editor.c:1990 ../src/e-util/e-focus-tracker.c:768
+#: ../src/e-util/e-html-editor-actions.c:885 ../src/e-util/e-text.c:2096
+#: ../src/mail/e-mail-browser.c:141 ../src/shell/e-shell-window-actions.c:815
+msgid "Cu_t"
+msgstr "切り取り(_T)"
 
-#: ../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 "不明"
+#: ../src/calendar/gui/e-comp-editor.c:1992 ../src/e-util/e-focus-tracker.c:166
+#: ../src/e-util/e-focus-tracker.c:222 ../src/e-util/e-focus-tracker.c:276
+#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:1951
+#: ../src/mail/e-mail-browser.c:143 ../src/shell/e-shell-window-actions.c:817
+msgid "Cut the selection"
+msgstr "選択した連絡先/予定を切り取ります"
 
-#: ../calendar/gui/e-cal-model.c:1667
-msgid "Recurring"
-msgstr "繰り返し"
+#: ../src/calendar/gui/e-comp-editor.c:1999 ../src/e-util/e-focus-tracker.c:187
+#: ../src/e-util/e-focus-tracker.c:243 ../src/e-util/e-focus-tracker.c:784
+#: ../src/shell/e-shell-window-actions.c:824
+msgid "Delete the selection"
+msgstr "選択したものを削除"
 
-#: ../calendar/gui/e-cal-model.c:1669
-msgid "Assigned"
-msgstr "割当て済み"
+#: ../src/calendar/gui/e-comp-editor.c:2006
+msgid "View help"
+msgstr "ヘルプを表示する"
 
-#: ../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 "はい"
+#. paste menu item
+#: ../src/calendar/gui/e-comp-editor.c:2011 ../src/e-util/e-focus-tracker.c:778
+#: ../src/e-util/e-html-editor-actions.c:892 ../src/e-util/e-text.c:2122
+#: ../src/mail/e-mail-browser.c:148 ../src/shell/e-shell-window-actions.c:843
+msgid "_Paste"
+msgstr "貼り付け(_P)"
 
-#: ../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 "いいえ"
+#: ../src/calendar/gui/e-comp-editor.c:2013 ../src/e-util/e-focus-tracker.c:180
+#: ../src/e-util/e-focus-tracker.c:236 ../src/e-util/e-focus-tracker.c:288
+#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:1960
+#: ../src/mail/e-mail-browser.c:150 ../src/shell/e-shell-window-actions.c:845
+msgid "Paste the clipboard"
+msgstr "クリップボードへ貼り付けます"
 
-#: ../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 "受諾済"
+#: ../src/calendar/gui/e-comp-editor.c:2018
+#: ../src/composer/e-composer-actions.c:381 ../src/mail/e-mail-reader.c:2323
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1232
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1246
+msgid "_Print..."
+msgstr "印刷(_P)..."
 
-#: ../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 "辞退済"
+#: ../src/calendar/gui/e-comp-editor.c:2025 ../src/mail/e-mail-reader.c:2330
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1239
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1693
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:813
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1014
+msgid "Pre_view..."
+msgstr "プレビュー(_V)..."
 
-#: ../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 "仮承認"
+#: ../src/calendar/gui/e-comp-editor.c:2032 ../src/e-util/e-focus-tracker.c:788
+#: ../src/e-util/e-html-editor-actions.c:906 ../src/e-util/e-web-view.c:417
+#: ../src/mail/e-mail-browser.c:155 ../src/shell/e-shell-window-actions.c:920
+msgid "Select _All"
+msgstr "すべて選択(_A)"
 
-#: ../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 "委任済"
+#: ../src/calendar/gui/e-comp-editor.c:2034 ../src/e-util/e-focus-tracker.c:194
+#: ../src/e-util/e-focus-tracker.c:250 ../src/e-util/e-focus-tracker.c:789
+#: ../src/mail/e-mail-browser.c:157 ../src/shell/e-shell-window-actions.c:922
+msgid "Select all text"
+msgstr "すべての文字列を選択します"
 
-#: ../calendar/gui/e-cal-model.c:3956
-msgid "Needs action"
-msgstr "要アクション"
+#: ../src/calendar/gui/e-comp-editor.c:2055
+msgid "_Classification"
+msgstr "区分(_C)"
 
-#: ../calendar/gui/e-cal-model-calendar.c:124
-#: ../calendar/gui/e-task-table.c:630
-msgid "Free"
-msgstr "予定なし"
+#: ../src/calendar/gui/e-comp-editor.c:2069
+#: ../src/e-util/e-html-editor-actions.c:929
+#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:164
+#: ../src/mail/e-mail-notes.c:945 ../src/shell/e-shell-window-actions.c:957
+msgid "_File"
+msgstr "ファイル(_F)"
 
-#: ../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 "予定あり"
+#: ../src/calendar/gui/e-comp-editor.c:2083
+#: ../src/e-util/e-html-editor-actions.c:950
+msgid "_Insert"
+msgstr "添付(_I)"
 
-#: ../calendar/gui/e-cal-model-tasks.c:498
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"地理的な位置は書式に合わせて入力してください: \n"
-"\n"
-"45.436845,125.862501"
+#: ../src/calendar/gui/e-comp-editor.c:2090
+#: ../src/composer/e-composer-actions.c:371
+msgid "_Options"
+msgstr "オプション(_O)"
 
-#. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:550
-msgctxt "cal-task-status"
-msgid "None"
-msgstr "なし"
+#: ../src/calendar/gui/e-comp-editor.c:2097
+#: ../src/e-util/e-html-editor-actions.c:971 ../src/mail/e-mail-browser.c:178
+#: ../src/shell/e-shell-window-actions.c:1000
+#: ../src/smime/gui/certificate-manager.c:1662 ../src/smime/gui/smime-ui.ui.h:3
+msgid "_View"
+msgstr "表示(_V)"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: ../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"
+#: ../src/calendar/gui/e-comp-editor.c:2109
+msgid "Save current changes"
+msgstr "現在の変更を保存"
 
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: ../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"
+#: ../src/calendar/gui/e-comp-editor.c:2114
+#: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:940
+msgid "Save and Close"
+msgstr "保存して閉じる"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:169
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"%s"
-msgstr ""
-"日付は書式に合わせて入力してください: \n"
-"%s"
+#: ../src/calendar/gui/e-comp-editor.c:2116
+msgid "Save current changes and close editor"
+msgstr "現在の変更を保存してエディターを閉じる"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../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
+#: ../src/calendar/gui/e-day-view.c:2130 ../src/calendar/gui/e-week-view.c:1726
+#: ../src/calendar/gui/print.c:1070 ../src/calendar/gui/print.c:1089
+#: ../src/calendar/gui/print.c:2626 ../src/calendar/gui/print.c:2646
 msgid "am"
 msgstr "午前"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../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
+#: ../src/calendar/gui/e-day-view.c:2133 ../src/calendar/gui/e-week-view.c:1729
+#: ../src/calendar/gui/print.c:1075 ../src/calendar/gui/print.c:1091
+#: ../src/calendar/gui/print.c:2631 ../src/calendar/gui/print.c:2648
 msgid "pm"
 msgstr "午後"
 
@@ -4252,13 +8897,15 @@ 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:2779 ../calendar/gui/e-day-view-top-item.c:854
-#: ../calendar/gui/e-week-view-main-item.c:209 ../calendar/gui/print.c:2089
+#: ../src/calendar/gui/e-day-view.c:3045
+#: ../src/calendar/gui/e-day-view-top-item.c:841
+#: ../src/calendar/gui/e-week-view-main-item.c:205
+#: ../src/calendar/gui/print.c:2093
 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:3443
+#: ../src/calendar/gui/e-day-view.c:3770
 #, c-format
 msgid "Week %d"
 msgstr "第%d週"
@@ -4269,190 +8916,215 @@ 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:800
+#: ../src/calendar/gui/e-day-view-time-item.c:804
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i分間隔"
 
-#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../src/calendar/gui/e-day-view-time-item.c:829
 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:842
-#: ../modules/calendar/e-calendar-preferences.c:305
-#: ../modules/calendar/e-calendar-preferences.c:357
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../src/calendar/gui/e-day-view-time-item.c:846
+#: ../src/modules/calendar/e-calendar-preferences.c:313
+#: ../src/modules/calendar/e-calendar-preferences.c:365
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "なし"
 
-#: ../calendar/gui/e-day-view-time-item.c:876
-#: ../calendar/gui/e-timezone-entry.c:323
-#: ../modules/calendar/e-calendar-preferences.c:388
+#: ../src/calendar/gui/e-day-view-time-item.c:880
+#: ../src/calendar/gui/e-timezone-entry.c:322
+#: ../src/modules/calendar/e-calendar-preferences.c:396
 msgid "Select..."
 msgstr "選択..."
 
-#: ../calendar/gui/e-meeting-list-view.c:63
+#: ../src/calendar/gui/e-meeting-list-view.c:62
 msgid "Chair Persons"
 msgstr "議長"
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../src/calendar/gui/e-meeting-list-view.c:63
 msgid "Required Participants"
 msgstr "必須の参加者"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../src/calendar/gui/e-meeting-list-view.c:64
 msgid "Optional Participants"
 msgstr "任意の参加者"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../src/calendar/gui/e-meeting-list-view.c:65
 msgid "Resources"
 msgstr "リソース"
 
-#: ../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
+#: ../src/calendar/gui/e-meeting-list-view.c:163
+msgid "Attendees"
+msgstr "出席者"
+
+#: ../src/calendar/gui/e-meeting-list-view.c:179
+#: ../src/calendar/gui/e-meeting-store.c:107
+#: ../src/calendar/gui/e-meeting-store.c:124
+#: ../src/calendar/gui/e-meeting-store.c:1015 ../src/calendar/gui/print.c:1243
 msgid "Individual"
 msgstr "個人"
 
-#: ../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
+#: ../src/calendar/gui/e-meeting-list-view.c:180
+#: ../src/calendar/gui/e-meeting-store.c:109
+#: ../src/calendar/gui/e-meeting-store.c:126 ../src/calendar/gui/print.c:1244
+#: ../src/e-util/e-table-config.ui.h:1
 msgid "Group"
 msgstr "グループ"
 
-#: ../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
+#: ../src/calendar/gui/e-meeting-list-view.c:181
+#: ../src/calendar/gui/e-meeting-store.c:111
+#: ../src/calendar/gui/e-meeting-store.c:128 ../src/calendar/gui/print.c:1245
 msgid "Resource"
 msgstr "リソース"
 
-#: ../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
+#: ../src/calendar/gui/e-meeting-list-view.c:182
+#: ../src/calendar/gui/e-meeting-store.c:113
+#: ../src/calendar/gui/e-meeting-store.c:130 ../src/calendar/gui/print.c:1246
 msgid "Room"
 msgstr "ルーム"
 
-#: ../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
+#: ../src/calendar/gui/e-meeting-list-view.c:193
+#: ../src/calendar/gui/e-meeting-store.c:142
+#: ../src/calendar/gui/e-meeting-store.c:159 ../src/calendar/gui/print.c:1260
 msgid "Chair"
 msgstr "議長"
 
-#: ../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
+#: ../src/calendar/gui/e-meeting-list-view.c:194
+#: ../src/calendar/gui/e-meeting-store.c:144
+#: ../src/calendar/gui/e-meeting-store.c:161
+#: ../src/calendar/gui/e-meeting-store.c:1018 ../src/calendar/gui/print.c:1261
 msgid "Required Participant"
 msgstr "必須の参加者"
 
-#: ../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
+#: ../src/calendar/gui/e-meeting-list-view.c:195
+#: ../src/calendar/gui/e-meeting-store.c:146
+#: ../src/calendar/gui/e-meeting-store.c:163 ../src/calendar/gui/print.c:1262
 msgid "Optional Participant"
 msgstr "任意の参加者"
 
-#: ../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
+#: ../src/calendar/gui/e-meeting-list-view.c:196
+#: ../src/calendar/gui/e-meeting-store.c:148
+#: ../src/calendar/gui/e-meeting-store.c:165 ../src/calendar/gui/print.c:1263
 msgid "Non-Participant"
 msgstr "不参加者"
 
-#: ../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
+#: ../src/calendar/gui/e-meeting-list-view.c:218
+#: ../src/calendar/gui/e-meeting-store.c:192
+#: ../src/calendar/gui/e-meeting-store.c:215
+#: ../src/calendar/gui/e-meeting-store.c:1028
 msgid "Needs Action"
 msgstr "要アクション"
 
-#: ../calendar/gui/e-meeting-list-view.c:626
+#: ../src/calendar/gui/e-meeting-list-view.c:618
 msgid "Attendee                          "
 msgstr "出席者                          "
 
-#: ../calendar/gui/e-meeting-list-view.c:681
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+#: ../src/calendar/gui/e-meeting-list-view.c:644
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../src/calendar/gui/e-memo-table.etspec.h:3
+#: ../src/calendar/gui/e-task-table.etspec.h:3
+#: ../src/e-util/e-attachment-tree-view.c:205
+#: ../src/mail/e-mail-account-tree-view.c:158
+msgid "Type"
+msgstr "種類"
+
+#. To translators: RSVP means "please reply"
+#: ../src/calendar/gui/e-meeting-list-view.c:673
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "返信の有無"
 
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
+#: ../src/calendar/gui/e-meeting-store.c:204
+#: ../src/calendar/gui/e-meeting-store.c:227
 msgid "In Process"
 msgstr "進行中"
 
-#: ../calendar/gui/e-meeting-store.c:1909
+#: ../src/calendar/gui/e-meeting-store.c:1899
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
-msgstr "サーバー %s にユーザー %s でスケジュール情報にアクセスするためのパスワードを入力してください"
+msgstr ""
+"サーバー %s にユーザー %s でスケジュール情報にアクセスするためのパスワードを"
+"入力してください"
 
-#: ../calendar/gui/e-meeting-store.c:1919
+#: ../src/calendar/gui/e-meeting-store.c:1909
 #, c-format
 msgid "Failure reason: %s"
 msgstr "失敗しました。原因: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1924
-#: ../plugins/publish-calendar/publish-calendar.c:351
-#: ../smime/gui/component.c:63
+#: ../src/calendar/gui/e-meeting-store.c:1914
+#: ../src/plugins/publish-calendar/publish-calendar.c:349
+#: ../src/smime/gui/component.c:61
 msgid "Enter password"
 msgstr "パスワードの入力"
 
-#: ../calendar/gui/e-meeting-time-sel.c:529
+#: ../src/calendar/gui/e-meeting-time-sel.c:535
 msgid "Out of Office"
 msgstr "外出中"
 
-#: ../calendar/gui/e-meeting-time-sel.c:531
+#: ../src/calendar/gui/e-meeting-time-sel.c:537
 msgid "No Information"
 msgstr "情報なし"
 
-#: ../calendar/gui/e-meeting-time-sel.c:566
+#: ../src/calendar/gui/e-meeting-time-sel.c:553
+msgid "Atte_ndees..."
+msgstr "出席者(_N)..."
+
+#: ../src/calendar/gui/e-meeting-time-sel.c:572
 msgid "O_ptions"
 msgstr "オプション(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:586
+#: ../src/calendar/gui/e-meeting-time-sel.c:593
 msgid "Show _only working hours"
 msgstr "仕事中の時間だけ表示する(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../src/calendar/gui/e-meeting-time-sel.c:606
 msgid "Show _zoomed out"
 msgstr "縮小して表示する(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../src/calendar/gui/e-meeting-time-sel.c:624
 msgid "_Update free/busy"
 msgstr "スケジュールの更新(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../src/calendar/gui/e-meeting-time-sel.c:641
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:654
+#: ../src/calendar/gui/e-meeting-time-sel.c:661
 msgid "_Autopick"
 msgstr "自動ピックアップ(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../src/calendar/gui/e-meeting-time-sel.c:678
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../src/calendar/gui/e-meeting-time-sel.c:700
 msgid "_All people and resources"
 msgstr "すべての人達とリソース(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:703
+#: ../src/calendar/gui/e-meeting-time-sel.c:711
 msgid "All _people and one resource"
 msgstr "すべての人達とひとつのリソース(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../src/calendar/gui/e-meeting-time-sel.c:722
 msgid "_Required people"
 msgstr "必須な人達(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:724
+#: ../src/calendar/gui/e-meeting-time-sel.c:732
 msgid "Required people and _one resource"
 msgstr "必須な人達とひとつのリソース(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:763
+#: ../src/calendar/gui/e-meeting-time-sel.c:771
 msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:792
+#: ../src/calendar/gui/e-meeting-time-sel.c:800
 msgid "_End time:"
 msgstr "終了時刻(_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2660
+#: ../src/calendar/gui/e-meeting-time-sel.c:2721
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -4461,164 +9133,183 @@ msgstr ""
 "サマリ: %s\n"
 "場所: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3525
+#: ../src/calendar/gui/e-meeting-time-sel.c:2723
+#: ../src/calendar/gui/print.c:3520
 #, c-format
 msgid "Summary: %s"
 msgstr "サマリ: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Click here to add an attendee"
 msgstr "<ここをクリックして出席者を追加してください>"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Member"
 msgstr "メンバー"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Delegated To"
 msgstr "委任先"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Delegated From"
 msgstr "委任元"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:10
 msgid "Common Name"
 msgstr "共通の名前"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Language"
 msgstr "言語"
 
-#: ../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:514 ../calendar/gui/e-task-table.c:802
+#: ../src/calendar/gui/e-memo-table.c:455
+#: ../src/calendar/gui/e-task-table.c:781
 msgid "* No Summary *"
 msgstr "* サマリ無し *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:886
+#: ../src/calendar/gui/e-memo-table.c:540
+#: ../src/calendar/gui/e-task-table.c:863
 msgid "Start: "
 msgstr "開始: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:904
+#: ../src/calendar/gui/e-memo-table.c:560
+#: ../src/calendar/gui/e-task-table.c:882
 msgid "Due: "
 msgstr "期日: "
 
-#: ../calendar/gui/e-memo-table.c:741
+#: ../src/calendar/gui/e-memo-table.c:745
 msgid "Cut selected memos to the clipboard"
 msgstr "選択したメモを切り取ってクリップボードにコピーします"
 
-#: ../calendar/gui/e-memo-table.c:747
+#: ../src/calendar/gui/e-memo-table.c:751
 msgid "Copy selected memos to the clipboard"
 msgstr "選択したメモをクリップボードにコピーします"
 
-#: ../calendar/gui/e-memo-table.c:753
+#: ../src/calendar/gui/e-memo-table.c:757
 msgid "Paste memos from the clipboard"
 msgstr "クリップボードからメモを貼り付けます"
 
-#: ../calendar/gui/e-memo-table.c:759
-#: ../modules/calendar/e-memo-shell-view-actions.c:588
+#: ../src/calendar/gui/e-memo-table.c:763
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:558
 msgid "Delete selected memos"
 msgstr "選択したメモを削除します"
 
-#: ../calendar/gui/e-memo-table.c:765
+#: ../src/calendar/gui/e-memo-table.c:769
 msgid "Select all visible memos"
 msgstr "すべての表示されているメモを選択します"
 
-#: ../calendar/gui/e-memo-table.etspec.h:1
+#: ../src/calendar/gui/e-memo-table.etspec.h:1
 msgid "Click to add a memo"
 msgstr "<ここをクリックしてメモを追加してください>"
 
+#: ../src/calendar/gui/e-task-table.c:551
+#: ../src/calendar/gui/tasktypes.xml.in.h:22
+#: ../src/e-util/e-send-options.ui.h:1
+msgid "Undefined"
+msgstr "未定義"
+
 #. Translators: "%d%%" is the percentage of a task done.
 #. * %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:603
+#: ../src/calendar/gui/e-task-table.c:579
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../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: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:1039
+#: ../src/calendar/gui/e-task-table.c:1084
 msgid "Cut selected tasks to the clipboard"
 msgstr "選択したタスクを切り取ってクリップボードにコピーします"
 
-#: ../calendar/gui/e-task-table.c:1045
+#: ../src/calendar/gui/e-task-table.c:1090
 msgid "Copy selected tasks to the clipboard"
 msgstr "選択したタスクをクリップボードにコピーします"
 
-#: ../calendar/gui/e-task-table.c:1051
+#: ../src/calendar/gui/e-task-table.c:1096
 msgid "Paste tasks from the clipboard"
 msgstr "クリップボードからタスクを貼り付けます"
 
-#: ../calendar/gui/e-task-table.c:1057
-#: ../modules/calendar/e-task-shell-view-actions.c:712
+#: ../src/calendar/gui/e-task-table.c:1102
+#: ../src/modules/calendar/e-task-shell-view-actions.c:684
 msgid "Delete selected tasks"
 msgstr "選択したタスクを削除します"
 
-#: ../calendar/gui/e-task-table.c:1063
+#: ../src/calendar/gui/e-task-table.c:1108
 msgid "Select all visible tasks"
 msgstr "すべての表示されているタスクを選択します"
 
-#: ../calendar/gui/e-timezone-entry.c:334
+#: ../src/calendar/gui/e-task-table.etspec.h:1
+msgid "Click to add a task"
+msgstr "<ここをクリックしてタスクを追加してください>"
+
+#: ../src/calendar/gui/e-task-table.etspec.h:2
+msgid "Start date"
+msgstr "開始日"
+
+#: ../src/calendar/gui/e-task-table.etspec.h:5
+msgid "Completion date"
+msgstr "完了日"
+
+#: ../src/calendar/gui/e-task-table.etspec.h:6 ../src/mail/mail-send-recv.c:968
+msgid "Complete"
+msgstr "完了の状態"
+
+#: ../src/calendar/gui/e-task-table.etspec.h:7
+msgid "Due date"
+msgstr "期日"
+
+#: ../src/calendar/gui/e-task-table.etspec.h:9
+#, no-c-format
+msgid "% Complete"
+msgstr "完了 (%)"
+
+#: ../src/calendar/gui/e-task-table.etspec.h:10
+#: ../src/calendar/gui/tasktypes.xml.in.h:18
+#: ../src/plugins/save-calendar/csv-format.c:384
+msgid "Priority"
+msgstr "優先度"
+
+#: ../src/calendar/gui/e-timezone-entry.c:333
 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:226 ../calendar/gui/print.c:2068
+#: ../src/calendar/gui/e-week-view-main-item.c:222
+#: ../src/calendar/gui/print.c:2072
 msgid "%d %B"
 msgstr "%B%e日"
 
-#: ../calendar/gui/gnome-cal.c:2371
-msgid "Purging"
-msgstr "抹消中"
-
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
-#: ../calendar/gui/itip-utils.c:841
+#: ../src/calendar/gui/itip-utils.c:789 ../src/calendar/gui/itip-utils.c:851
+#: ../src/calendar/gui/itip-utils.c:985
 msgid "An organizer must be set."
 msgstr "主催者をセットしてください"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../src/calendar/gui/itip-utils.c:842
 msgid "At least one attendee is necessary"
 msgstr "最低一名の出席者が必要です"
 
-#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
+#: ../src/calendar/gui/itip-utils.c:1073 ../src/calendar/gui/itip-utils.c:1234
 msgid "Event information"
 msgstr "イベントの情報"
 
-#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
+#: ../src/calendar/gui/itip-utils.c:1076 ../src/calendar/gui/itip-utils.c:1237
 msgid "Task information"
 msgstr "タスクの情報"
 
-#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1096
+#: ../src/calendar/gui/itip-utils.c:1079 ../src/calendar/gui/itip-utils.c:1240
 msgid "Memo information"
 msgstr "メモの情報"
 
-#: ../calendar/gui/itip-utils.c:938 ../calendar/gui/itip-utils.c:1114
+#: ../src/calendar/gui/itip-utils.c:1082 ../src/calendar/gui/itip-utils.c:1258
 msgid "Free/Busy information"
 msgstr "スケジュールの情報"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../src/calendar/gui/itip-utils.c:1085
 msgid "Calendar information"
 msgstr "カレンダーの情報"
 
@@ -4626,7 +9317,7 @@ msgstr "カレンダーの情報"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:978
+#: ../src/calendar/gui/itip-utils.c:1122
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "受諾済"
@@ -4635,7 +9326,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:985
+#: ../src/calendar/gui/itip-utils.c:1129
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "(仮)受諾済"
@@ -4647,7 +9338,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:992 ../calendar/gui/itip-utils.c:1040
+#: ../src/calendar/gui/itip-utils.c:1136 ../src/calendar/gui/itip-utils.c:1184
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "辞退済"
@@ -4656,7 +9347,7 @@ msgstr "辞退済"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:999
+#: ../src/calendar/gui/itip-utils.c:1143
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "委任済"
@@ -4664,7 +9355,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:1012
+#: ../src/calendar/gui/itip-utils.c:1156
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "更新済"
@@ -4672,7 +9363,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:1019
+#: ../src/calendar/gui/itip-utils.c:1163
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "キャンセル"
@@ -4680,7 +9371,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:1026
+#: ../src/calendar/gui/itip-utils.c:1170
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "更新"
@@ -4688,452 +9379,521 @@ 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:1033
+#: ../src/calendar/gui/itip-utils.c:1177
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "反対案"
 
-#: ../calendar/gui/itip-utils.c:1111
+#: ../src/calendar/gui/itip-utils.c:1255
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "スケジュールの情報 (%s から %s)"
 
-#: ../calendar/gui/itip-utils.c:1119
+#: ../src/calendar/gui/itip-utils.c:1263
 msgid "iCalendar information"
 msgstr "iCalendar 情報"
 
-#: ../calendar/gui/itip-utils.c:1147
+#: ../src/calendar/gui/itip-utils.c:1292
+#, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "リソースを予約できません。新しいイベントが他のとかちあってます。"
 
-#: ../calendar/gui/itip-utils.c:1155
-#, c-format
-msgid "Unable to book a resource, error: %s"
+#: ../src/calendar/gui/itip-utils.c:1297
+#, fuzzy
+#| msgid "Unable to book a resource, error: %s"
+msgid "Unable to book a resource, error: "
 msgstr "リソースを予約できません。エラー: %s"
 
-#: ../calendar/gui/itip-utils.c:1327
+#: ../src/calendar/gui/itip-utils.c:1468
 msgid "You must be an attendee of the event."
 msgstr "イベントに出席しなければなりません。"
 
-#: ../calendar/gui/print.c:660
+#: ../src/calendar/gui/itip-utils.c:2149
+#, fuzzy
+#| msgid "Sending message"
+msgid "Sending an event"
+msgstr "メッセージの送信中"
+
+#: ../src/calendar/gui/itip-utils.c:2153
+#, fuzzy
+#| msgid "Sending message"
+msgid "Sending a memo"
+msgstr "メッセージの送信中"
+
+#: ../src/calendar/gui/itip-utils.c:2157
+#, fuzzy
+#| msgid "Sending Email"
+msgid "Sending a task"
+msgstr "メールの送信"
+
+#: ../src/calendar/gui/print.c:661
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/gui/print.c:660
+#: ../src/calendar/gui/print.c:661
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/gui/print.c:660
+#: ../src/calendar/gui/print.c:661
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/gui/print.c:660
+#: ../src/calendar/gui/print.c:661
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/gui/print.c:660
+#: ../src/calendar/gui/print.c:661
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/gui/print.c:661
+#: ../src/calendar/gui/print.c:662
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/gui/print.c:661
+#: ../src/calendar/gui/print.c:662
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/gui/print.c:661
+#: ../src/calendar/gui/print.c:662
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/gui/print.c:661
+#: ../src/calendar/gui/print.c:662
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/gui/print.c:661
+#: ../src/calendar/gui/print.c:662
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/gui/print.c:662
+#: ../src/calendar/gui/print.c:663
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/gui/print.c:662
+#: ../src/calendar/gui/print.c:663
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/gui/print.c:662
+#: ../src/calendar/gui/print.c:663
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/gui/print.c:662
+#: ../src/calendar/gui/print.c:663
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/gui/print.c:662
+#: ../src/calendar/gui/print.c:663
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:664
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:664
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:664
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:664
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:664
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:665
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:665
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:665
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:665
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:665
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:666
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:666
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:666
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:666
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:666
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:667
 msgid "31st"
 msgstr "31日"
 
+#. G_DATE_BAD_WEEKDAY
 #. Translators: These are workday abbreviations,
 #. * e.g. Su=Sunday and Th=thursday
-#. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:726
+#: ../src/calendar/gui/print.c:727
 msgid "Mo"
 msgstr "月"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:727
+#: ../src/calendar/gui/print.c:728
 msgid "Tu"
 msgstr "火"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:728
+#: ../src/calendar/gui/print.c:729
 msgid "We"
 msgstr "水"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:729
+#: ../src/calendar/gui/print.c:730
 msgid "Th"
 msgstr "木"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:730
+#: ../src/calendar/gui/print.c:731
 msgid "Fr"
 msgstr "金"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:731
+#: ../src/calendar/gui/print.c:732
 msgid "Sa"
 msgstr "土"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:732
+#: ../src/calendar/gui/print.c:733
 msgid "Su"
 msgstr "日"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3319
+#: ../src/calendar/gui/print.c:3313
 msgid " to "
 msgstr " から "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3329
+#: ../src/calendar/gui/print.c:3323
 msgid " (Completed "
 msgstr " (完了 "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3335
+#: ../src/calendar/gui/print.c:3329
 msgid "Completed "
 msgstr "完了しました "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3345
+#: ../src/calendar/gui/print.c:3339
 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:3352
+#: ../src/calendar/gui/print.c:3346
 msgid "Due "
 msgstr "期日 "
 
-#: ../calendar/gui/print.c:3555
+#: ../src/calendar/gui/print.c:3490
+msgid "Appointment"
+msgstr "予定"
+
+#: ../src/calendar/gui/print.c:3492 ../src/e-util/e-send-options.c:551
+msgid "Task"
+msgstr "タスク"
+
+#: ../src/calendar/gui/print.c:3494
+msgid "Memo"
+msgstr "メモ"
+
+#: ../src/calendar/gui/print.c:3550
 msgid "Attendees: "
 msgstr "出席者: "
 
-#: ../calendar/gui/print.c:3599
+#: ../src/calendar/gui/print.c:3594
 #, c-format
 msgid "Status: %s"
 msgstr "状態: %s"
 
-#: ../calendar/gui/print.c:3615
+#: ../src/calendar/gui/print.c:3610
 #, c-format
 msgid "Priority: %s"
 msgstr "優先度: %s"
 
-#: ../calendar/gui/print.c:3633
+#: ../src/calendar/gui/print.c:3628
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "達成率: %i"
 
-#: ../calendar/gui/print.c:3647
+#: ../src/calendar/gui/print.c:3642
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3661
+#: ../src/calendar/gui/print.c:3656
 #, c-format
 msgid "Categories: %s"
 msgstr "カテゴリ: %s"
 
-#: ../calendar/gui/print.c:3672
+#: ../src/calendar/gui/print.c:3667
 msgid "Contacts: "
 msgstr "連絡先: "
 
-#: ../calendar/gui/tasktypes.xml.h:12
+#: ../src/calendar/gui/tasktypes.xml.in.h:12
 msgid "In progress"
 msgstr "進行中である"
 
-#: ../calendar/gui/tasktypes.xml.h:25
+#: ../src/calendar/gui/tasktypes.xml.in.h:25
 #, no-c-format
 msgid "% Completed"
 msgstr "進捗率"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:69
+#: ../src/calendar/gui/tasktypes.xml.in.h:26
+#: ../src/mail/filtertypes.xml.in.h:31 ../src/mail/searchtypes.xml.in.h:33
+#: ../src/mail/vfoldertypes.xml.in.h:33
 msgid "is greater than"
 msgstr "が次より大きい"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:70
+#: ../src/calendar/gui/tasktypes.xml.in.h:27
+#: ../src/mail/filtertypes.xml.in.h:32 ../src/mail/searchtypes.xml.in.h:34
+#: ../src/mail/vfoldertypes.xml.in.h:34
 msgid "is less than"
 msgstr "が次より小さい"
 
-#: ../calendar/importers/icalendar-importer.c:77
+#: ../src/calendar/importers/icalendar-importer.c:76
 msgid "Appointments and Meetings"
 msgstr "予定と会議"
 
-#: ../calendar/importers/icalendar-importer.c:461
-#: ../calendar/importers/icalendar-importer.c:900
+#: ../src/calendar/importers/icalendar-importer.c:306
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:181
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:178
+msgid "New Calendar"
+msgstr "新しいカレンダー"
+
+#: ../src/calendar/importers/icalendar-importer.c:309
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:189
+#: ../src/modules/calendar/e-task-shell-view-actions.c:202
+msgid "New Task List"
+msgstr "新しいタスクの一覧"
+
+#: ../src/calendar/importers/icalendar-importer.c:351
+#, fuzzy
+#| msgid "Create a new calendar"
+msgid "Cre_ate new calendar"
+msgstr "新しいカレンダーを作成します"
+
+#: ../src/calendar/importers/icalendar-importer.c:355
+#, fuzzy
+#| msgid "Create a new task list"
+msgid "Cre_ate new task list"
+msgstr "新しいタスクの一覧を作成します"
+
+#: ../src/calendar/importers/icalendar-importer.c:501
+#: ../src/calendar/importers/icalendar-importer.c:944
 msgid "Opening calendar"
 msgstr "カレンダーを開く"
 
-#: ../calendar/importers/icalendar-importer.c:609
+#: ../src/calendar/importers/icalendar-importer.c:652
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar ファイル (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../src/calendar/importers/icalendar-importer.c:653
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar インポーター"
 
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../src/calendar/importers/icalendar-importer.c:745
 msgid "Reminder!"
 msgstr "リマインダーです!"
 
-#: ../calendar/importers/icalendar-importer.c:786
+#: ../src/calendar/importers/icalendar-importer.c:830
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar ファイル (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../src/calendar/importers/icalendar-importer.c:831
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar インポーター"
 
-#: ../calendar/importers/icalendar-importer.c:1064
+#: ../src/calendar/importers/icalendar-importer.c:1107
 msgid "Calendar Events"
 msgstr "カレンダーのイベント"
 
-#: ../calendar/importers/icalendar-importer.c:1108
+#: ../src/calendar/importers/icalendar-importer.c:1150
+#, fuzzy
+#| msgid "New Calendar"
+msgid "GNOME Calendar"
+msgstr "新しいカレンダー"
+
+#: ../src/calendar/importers/icalendar-importer.c:1151
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution カレンダーの高度なインポート用ツール"
 
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../src/calendar/importers/icalendar-importer.c:1222
+#: ../src/calendar/importers/icalendar-importer.c:1536
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "会議"
 
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../src/calendar/importers/icalendar-importer.c:1222
+#: ../src/calendar/importers/icalendar-importer.c:1536
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "イベント"
 
-#: ../calendar/importers/icalendar-importer.c:1182
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../src/calendar/importers/icalendar-importer.c:1225
+#: ../src/calendar/importers/icalendar-importer.c:1537
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "タスク"
 
-#: ../calendar/importers/icalendar-importer.c:1185
-#: ../calendar/importers/icalendar-importer.c:1495
+#: ../src/calendar/importers/icalendar-importer.c:1228
+#: ../src/calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "メモ"
 
-#: ../calendar/importers/icalendar-importer.c:1194
+#: ../src/calendar/importers/icalendar-importer.c:1237
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "繰り返しあり"
 
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../src/calendar/importers/icalendar-importer.c:1242
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "繰り返しのインスタンス"
 
-#: ../calendar/importers/icalendar-importer.c:1204
+#: ../src/calendar/importers/icalendar-importer.c:1247
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "リマインダーあり"
 
-#: ../calendar/importers/icalendar-importer.c:1209
+#: ../src/calendar/importers/icalendar-importer.c:1252
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "添付ファイルあり"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1222
+#: ../src/calendar/importers/icalendar-importer.c:1265
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "公開"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1225
+#: ../src/calendar/importers/icalendar-importer.c:1268
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "非公開"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1228
+#: ../src/calendar/importers/icalendar-importer.c:1271
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "極秘"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1232
+#: ../src/calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "区分"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1237
-#: ../calendar/importers/icalendar-importer.c:1537
+#. Translators: Column header for a component summary
+#: ../src/calendar/importers/icalendar-importer.c:1280
+#: ../src/calendar/importers/icalendar-importer.c:1580
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "サマリ"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../src/calendar/importers/icalendar-importer.c:1286
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "場所"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1251
-#: ../calendar/importers/icalendar-importer.c:1532
+#. Translators: Column header for a component start date/time
+#: ../src/calendar/importers/icalendar-importer.c:1294
+#: ../src/calendar/importers/icalendar-importer.c:1575
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "開始"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1262
+#: ../src/calendar/importers/icalendar-importer.c:1305
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "期日"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1274
+#: ../src/calendar/importers/icalendar-importer.c:1317
 msgctxt "iCalImp"
 msgid "End"
 msgstr "終了"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../src/calendar/importers/icalendar-importer.c:1327
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "カテゴリ"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1308
+#: ../src/calendar/importers/icalendar-importer.c:1351
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "完了"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1316
+#: ../src/calendar/importers/icalendar-importer.c:1359
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1327
-#: ../calendar/importers/icalendar-importer.c:1330
+#: ../src/calendar/importers/icalendar-importer.c:1370
+#: ../src/calendar/importers/icalendar-importer.c:1373
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "主催者"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1350
-#: ../calendar/importers/icalendar-importer.c:1353
+#: ../src/calendar/importers/icalendar-importer.c:1393
+#: ../src/calendar/importers/icalendar-importer.c:1396
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "出席者"
 
-#: ../calendar/importers/icalendar-importer.c:1367
+#: ../src/calendar/importers/icalendar-importer.c:1410
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "説明"
 
-#: ../calendar/importers/icalendar-importer.c:1527
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../src/calendar/importers/icalendar-importer.c:1570
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "種類"
@@ -5161,4946 +9921,3264 @@ msgstr "種類"
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:25
+#: ../src/calendar/zones.h:25
 msgid "Africa/Abidjan"
 msgstr "アフリカ/アビジャン"
 
-#: ../calendar/zones.h:26
+#: ../src/calendar/zones.h:26
 msgid "Africa/Accra"
 msgstr "アフリカ/アッカ"
 
-#: ../calendar/zones.h:27
+#: ../src/calendar/zones.h:27
 msgid "Africa/Addis_Ababa"
 msgstr "アフリカ/アジスアベバ"
 
-#: ../calendar/zones.h:28
+#: ../src/calendar/zones.h:28
 msgid "Africa/Algiers"
 msgstr "アフリカ/アルジェリア"
 
-#: ../calendar/zones.h:29
+#: ../src/calendar/zones.h:29
 msgid "Africa/Asmera"
 msgstr "アフリカ/アスメラ"
 
-#: ../calendar/zones.h:30
+#: ../src/calendar/zones.h:30
 msgid "Africa/Bamako"
 msgstr "アフリカ/バマコ"
 
-#: ../calendar/zones.h:31
+#: ../src/calendar/zones.h:31
 msgid "Africa/Bangui"
 msgstr "アフリカ/バングイ"
 
-#: ../calendar/zones.h:32
+#: ../src/calendar/zones.h:32
 msgid "Africa/Banjul"
 msgstr "アフリカ/バンジュル"
 
-#: ../calendar/zones.h:33
+#: ../src/calendar/zones.h:33
 msgid "Africa/Bissau"
 msgstr "アフリカ/ビサウ"
 
-#: ../calendar/zones.h:34
+#: ../src/calendar/zones.h:34
 msgid "Africa/Blantyre"
 msgstr "アフリカ/ブランティール"
 
-#: ../calendar/zones.h:35
+#: ../src/calendar/zones.h:35
 msgid "Africa/Brazzaville"
 msgstr "アフリカ/ブラッザビル"
 
-#: ../calendar/zones.h:36
+#: ../src/calendar/zones.h:36
 msgid "Africa/Bujumbura"
 msgstr "アフリカ/ブジュンブラ"
 
-#: ../calendar/zones.h:37
+#: ../src/calendar/zones.h:37
 msgid "Africa/Cairo"
 msgstr "アフリカ/カイロ"
 
-#: ../calendar/zones.h:38
+#: ../src/calendar/zones.h:38
 msgid "Africa/Casablanca"
 msgstr "アフリカ/カサブランカ"
 
-#: ../calendar/zones.h:39
+#: ../src/calendar/zones.h:39
 msgid "Africa/Ceuta"
 msgstr "アフリカ/セウタ"
 
-#: ../calendar/zones.h:40
+#: ../src/calendar/zones.h:40
 msgid "Africa/Conakry"
 msgstr "アフリカ/コナクリ"
 
-#: ../calendar/zones.h:41
+#: ../src/calendar/zones.h:41
 msgid "Africa/Dakar"
 msgstr "アフリカ/ダカール"
 
-#: ../calendar/zones.h:42
+#: ../src/calendar/zones.h:42
 msgid "Africa/Dar_es_Salaam"
 msgstr "アフリカ/ダッサラーム"
 
-#: ../calendar/zones.h:43
+#: ../src/calendar/zones.h:43
 msgid "Africa/Djibouti"
 msgstr "アフリカ/ジブチ"
 
-#: ../calendar/zones.h:44
+#: ../src/calendar/zones.h:44
 msgid "Africa/Douala"
 msgstr "アフリカ/ドゥアーラ"
 
-#: ../calendar/zones.h:45
+#: ../src/calendar/zones.h:45
 msgid "Africa/El_Aaiun"
 msgstr "アフリカ/アイウン"
 
-#: ../calendar/zones.h:46
+#: ../src/calendar/zones.h:46
 msgid "Africa/Freetown"
 msgstr "アフリカ/フリータウン"
 
-#: ../calendar/zones.h:47
+#: ../src/calendar/zones.h:47
 msgid "Africa/Gaborone"
 msgstr "アフリカ/ガボローネ"
 
-#: ../calendar/zones.h:48
+#: ../src/calendar/zones.h:48
 msgid "Africa/Harare"
 msgstr "アフリカ/ハラレ"
 
-#: ../calendar/zones.h:49
+#: ../src/calendar/zones.h:49
 msgid "Africa/Johannesburg"
 msgstr "アフリカ/ヨハネスブルグ"
 
-#: ../calendar/zones.h:50
+#: ../src/calendar/zones.h:50
 msgid "Africa/Kampala"
 msgstr "アフリカ/カンパラ"
 
-#: ../calendar/zones.h:51
+#: ../src/calendar/zones.h:51
 msgid "Africa/Khartoum"
 msgstr "アフリカ/ハルツーム"
 
-#: ../calendar/zones.h:52
+#: ../src/calendar/zones.h:52
 msgid "Africa/Kigali"
 msgstr "アフリカ/キガリ"
 
-#: ../calendar/zones.h:53
+#: ../src/calendar/zones.h:53
 msgid "Africa/Kinshasa"
 msgstr "アフリカ/キンシャサ"
 
-#: ../calendar/zones.h:54
+#: ../src/calendar/zones.h:54
 msgid "Africa/Lagos"
 msgstr "アフリカ/ラゴス"
 
-#: ../calendar/zones.h:55
+#: ../src/calendar/zones.h:55
 msgid "Africa/Libreville"
 msgstr "アフリカ/リーブルヴィル"
 
-#: ../calendar/zones.h:56
+#: ../src/calendar/zones.h:56
 msgid "Africa/Lome"
 msgstr "アフリカ/ロメ"
 
-#: ../calendar/zones.h:57
+#: ../src/calendar/zones.h:57
 msgid "Africa/Luanda"
 msgstr "アフリカ/ルアンダ"
 
-#: ../calendar/zones.h:58
+#: ../src/calendar/zones.h:58
 msgid "Africa/Lubumbashi"
 msgstr "アフリカ/ルブンバシ"
 
-#: ../calendar/zones.h:59
+#: ../src/calendar/zones.h:59
 msgid "Africa/Lusaka"
 msgstr "アフリカ/ルサカ"
 
-#: ../calendar/zones.h:60
+#: ../src/calendar/zones.h:60
 msgid "Africa/Malabo"
 msgstr "アフリカ/マラボ"
 
-#: ../calendar/zones.h:61
+#: ../src/calendar/zones.h:61
 msgid "Africa/Maputo"
 msgstr "アフリカ/マプト"
 
-#: ../calendar/zones.h:62
+#: ../src/calendar/zones.h:62
 msgid "Africa/Maseru"
 msgstr "アフリカ/マセル"
 
-#: ../calendar/zones.h:63
+#: ../src/calendar/zones.h:63
 msgid "Africa/Mbabane"
 msgstr "アフリカ/ムババネ"
 
-#: ../calendar/zones.h:64
+#: ../src/calendar/zones.h:64
 msgid "Africa/Mogadishu"
 msgstr "アフリカ/モガディシュ"
 
-#: ../calendar/zones.h:65
+#: ../src/calendar/zones.h:65
 msgid "Africa/Monrovia"
 msgstr "アフリカ/モンロビア"
 
-#: ../calendar/zones.h:66
+#: ../src/calendar/zones.h:66
 msgid "Africa/Nairobi"
 msgstr "アフリカ/ナイロビ"
 
-#: ../calendar/zones.h:67
+#: ../src/calendar/zones.h:67
 msgid "Africa/Ndjamena"
 msgstr "アフリカ/ウンジャメナ"
 
-#: ../calendar/zones.h:68
+#: ../src/calendar/zones.h:68
 msgid "Africa/Niamey"
 msgstr "アフリカ/ニアメ"
 
-#: ../calendar/zones.h:69
+#: ../src/calendar/zones.h:69
 msgid "Africa/Nouakchott"
 msgstr "アフリカ/ヌアクショット"
 
-#: ../calendar/zones.h:70
+#: ../src/calendar/zones.h:70
 msgid "Africa/Ouagadougou"
 msgstr "アフリカ/ワガドゥグー"
 
-#: ../calendar/zones.h:71
+#: ../src/calendar/zones.h:71
 msgid "Africa/Porto-Novo"
 msgstr "アフリカ/ポルトノボ"
 
-#: ../calendar/zones.h:72
+#: ../src/calendar/zones.h:72
 msgid "Africa/Sao_Tome"
 msgstr "アフリカ/サントメ"
 
-#: ../calendar/zones.h:73
+#: ../src/calendar/zones.h:73
 msgid "Africa/Timbuktu"
 msgstr "アフリカ/ティンブクトゥ"
 
-#: ../calendar/zones.h:74
+#: ../src/calendar/zones.h:74
 msgid "Africa/Tripoli"
 msgstr "アフリカ/トリポリ"
 
-#: ../calendar/zones.h:75
+#: ../src/calendar/zones.h:75
 msgid "Africa/Tunis"
 msgstr "アフリカ/チュニス"
 
-#: ../calendar/zones.h:76
+#: ../src/calendar/zones.h:76
 msgid "Africa/Windhoek"
 msgstr "アフリカ/ヴィントホーク"
 
-#: ../calendar/zones.h:77
+#: ../src/calendar/zones.h:77
 msgid "America/Adak"
 msgstr "アメリカ/エイダック"
 
-#: ../calendar/zones.h:78
+#: ../src/calendar/zones.h:78
 msgid "America/Anchorage"
 msgstr "アメリカ/アンカーレッジ"
 
-#: ../calendar/zones.h:79
+#: ../src/calendar/zones.h:79
 msgid "America/Anguilla"
 msgstr "アメリカ/アングイラ"
 
-#: ../calendar/zones.h:80
+#: ../src/calendar/zones.h:80
 msgid "America/Antigua"
 msgstr "アメリカ/アンチグア"
 
-#: ../calendar/zones.h:81
+#: ../src/calendar/zones.h:81
 msgid "America/Araguaina"
 msgstr "アメリカ/アラグアイナ"
 
-#: ../calendar/zones.h:82
+#: ../src/calendar/zones.h:82
 msgid "America/Aruba"
 msgstr "アメリカ/アルバ"
 
-#: ../calendar/zones.h:83
+#: ../src/calendar/zones.h:83
 msgid "America/Asuncion"
 msgstr "アメリカ/アスンシオン"
 
-#: ../calendar/zones.h:84
+#: ../src/calendar/zones.h:84
 msgid "America/Barbados"
 msgstr "アメリカ/バルバドス"
 
-#: ../calendar/zones.h:85
+#: ../src/calendar/zones.h:85
 msgid "America/Belem"
 msgstr "アメリカ/ベレン"
 
-#: ../calendar/zones.h:86
+#: ../src/calendar/zones.h:86
 msgid "America/Belize"
 msgstr "アメリカ/ベリーズ"
 
-#: ../calendar/zones.h:87
+#: ../src/calendar/zones.h:87
 msgid "America/Boa_Vista"
 msgstr "アメリカ/ボアビスタ"
 
-#: ../calendar/zones.h:88
+#: ../src/calendar/zones.h:88
 msgid "America/Bogota"
 msgstr "アメリカ/ボゴタ"
 
-#: ../calendar/zones.h:89
+#: ../src/calendar/zones.h:89
 msgid "America/Boise"
 msgstr "アメリカ/ボイシ"
 
-#: ../calendar/zones.h:90
+#: ../src/calendar/zones.h:90
 msgid "America/Buenos_Aires"
 msgstr "アメリカ/ブイノスアイレス"
 
-#: ../calendar/zones.h:91
+#: ../src/calendar/zones.h:91
 msgid "America/Cambridge_Bay"
 msgstr "アメリカ/キャンブリッジベイ"
 
-#: ../calendar/zones.h:92
+#: ../src/calendar/zones.h:92
 msgid "America/Cancun"
 msgstr "アメリカ/カンクン"
 
-#: ../calendar/zones.h:93
+#: ../src/calendar/zones.h:93
 msgid "America/Caracas"
 msgstr "アメリカ/カラッカス"
 
-#: ../calendar/zones.h:94
+#: ../src/calendar/zones.h:94
 msgid "America/Catamarca"
 msgstr "アメリカ/カタマルカ"
 
-#: ../calendar/zones.h:95
+#: ../src/calendar/zones.h:95
 msgid "America/Cayenne"
 msgstr "アメリカ/カイエンヌ"
 
-#: ../calendar/zones.h:96
+#: ../src/calendar/zones.h:96
 msgid "America/Cayman"
 msgstr "アメリカ/カイマン"
 
-#: ../calendar/zones.h:97
+#: ../src/calendar/zones.h:97
 msgid "America/Chicago"
 msgstr "アメリカ/シカゴ"
 
-#: ../calendar/zones.h:98
+#: ../src/calendar/zones.h:98
 msgid "America/Chihuahua"
 msgstr "アメリカ/チワワ"
 
-#: ../calendar/zones.h:99
+#: ../src/calendar/zones.h:99
 msgid "America/Cordoba"
 msgstr "アメリカ/コルドバ"
 
-#: ../calendar/zones.h:100
+#: ../src/calendar/zones.h:100
 msgid "America/Costa_Rica"
 msgstr "アメリカ/コスタリカ"
 
-#: ../calendar/zones.h:101
+#: ../src/calendar/zones.h:101
 msgid "America/Cuiaba"
 msgstr "アメリカ/クイアバ"
 
-#: ../calendar/zones.h:102
+#: ../src/calendar/zones.h:102
 msgid "America/Curacao"
 msgstr "アメリカ/キュラーソ"
 
-#: ../calendar/zones.h:103
+#: ../src/calendar/zones.h:103
 msgid "America/Danmarkshavn"
 msgstr "アメリカ/Danmarkshavn"
 
-#: ../calendar/zones.h:104
+#: ../src/calendar/zones.h:104
 msgid "America/Dawson"
 msgstr "アメリカ/ドースン"
 
-#: ../calendar/zones.h:105
+#: ../src/calendar/zones.h:105
 msgid "America/Dawson_Creek"
 msgstr "アメリカ/ドースンクリーク"
 
-#: ../calendar/zones.h:106
+#: ../src/calendar/zones.h:106
 msgid "America/Denver"
 msgstr "アメリカ/デンバー"
 
-#: ../calendar/zones.h:107
+#: ../src/calendar/zones.h:107
 msgid "America/Detroit"
 msgstr "アメリカ/デトロイト"
 
-#: ../calendar/zones.h:108
+#: ../src/calendar/zones.h:108
 msgid "America/Dominica"
 msgstr "アメリカ/ドミニカ"
 
-#: ../calendar/zones.h:109
+#: ../src/calendar/zones.h:109
 msgid "America/Edmonton"
 msgstr "アメリカ/エドモートン"
 
-#: ../calendar/zones.h:110
+#: ../src/calendar/zones.h:110
 msgid "America/Eirunepe"
 msgstr "アメリカ/エイルネペ"
 
-#: ../calendar/zones.h:111
+#: ../src/calendar/zones.h:111
 msgid "America/El_Salvador"
 msgstr "アメリカ/エルサルバドル"
 
-#: ../calendar/zones.h:112
+#: ../src/calendar/zones.h:112
 msgid "America/Fortaleza"
 msgstr "アメリカ/フォルタレザ"
 
-#: ../calendar/zones.h:113
+#: ../src/calendar/zones.h:113
 msgid "America/Glace_Bay"
 msgstr "アメリカ/グレースベイ"
 
-#: ../calendar/zones.h:114
+#: ../src/calendar/zones.h:114
 msgid "America/Godthab"
 msgstr "アメリカ/ゴッドホーブ"
 
-#: ../calendar/zones.h:115
+#: ../src/calendar/zones.h:115
 msgid "America/Goose_Bay"
 msgstr "アメリカ/グースベイ"
 
-#: ../calendar/zones.h:116
+#: ../src/calendar/zones.h:116
 msgid "America/Grand_Turk"
 msgstr "アメリカ/グランドターク"
 
-#: ../calendar/zones.h:117
+#: ../src/calendar/zones.h:117
 msgid "America/Grenada"
 msgstr "アメリカ/グレナダ"
 
-#: ../calendar/zones.h:118
+#: ../src/calendar/zones.h:118
 msgid "America/Guadeloupe"
 msgstr "アメリカ/グアドループ"
 
-#: ../calendar/zones.h:119
+#: ../src/calendar/zones.h:119
 msgid "America/Guatemala"
 msgstr "アメリカ/グアテマラ"
 
-#: ../calendar/zones.h:120
+#: ../src/calendar/zones.h:120
 msgid "America/Guayaquil"
 msgstr "アメリカ/グアヤキル"
 
-#: ../calendar/zones.h:121
+#: ../src/calendar/zones.h:121
 msgid "America/Guyana"
 msgstr "アメリカ/ガイアナ"
 
-#: ../calendar/zones.h:122
+#: ../src/calendar/zones.h:122
 msgid "America/Halifax"
 msgstr "アメリカ/ハリファックス"
 
-#: ../calendar/zones.h:123
+#: ../src/calendar/zones.h:123
 msgid "America/Havana"
 msgstr "アメリカ/ハバナ"
 
-#: ../calendar/zones.h:124
+#: ../src/calendar/zones.h:124
 msgid "America/Hermosillo"
 msgstr "アメリカ/エルモシージョ"
 
-#: ../calendar/zones.h:125
+#: ../src/calendar/zones.h:125
 msgid "America/Indiana/Indianapolis"
 msgstr "アメリカ/インディアナ/インディアナポリス"
 
-#: ../calendar/zones.h:126
+#: ../src/calendar/zones.h:126
 msgid "America/Indiana/Knox"
 msgstr "アメリカ/インディアナ/ノックス"
 
-#: ../calendar/zones.h:127
+#: ../src/calendar/zones.h:127
 msgid "America/Indiana/Marengo"
 msgstr "アメリカ/インディアナ/マレンゴ"
 
 # Hermosillo
-#: ../calendar/zones.h:128
+#: ../src/calendar/zones.h:128
 msgid "America/Indiana/Vevay"
 msgstr "アメリカ/インディアナ/Vevay"
 
-#: ../calendar/zones.h:129
+#: ../src/calendar/zones.h:129
 msgid "America/Indianapolis"
 msgstr "アメリカ/インディアナポリス"
 
-#: ../calendar/zones.h:130
+#: ../src/calendar/zones.h:130
 msgid "America/Inuvik"
 msgstr "アメリカ/Inuvik"
 
-#: ../calendar/zones.h:131
+#: ../src/calendar/zones.h:131
 msgid "America/Iqaluit"
 msgstr "アメリカ/Iqaluit"
 
-#: ../calendar/zones.h:132
+#: ../src/calendar/zones.h:132
 msgid "America/Jamaica"
 msgstr "アメリカ/ジャマイカ"
 
-#: ../calendar/zones.h:133
+#: ../src/calendar/zones.h:133
 msgid "America/Jujuy"
 msgstr "アメリカ/フフイ"
 
-#: ../calendar/zones.h:134
+#: ../src/calendar/zones.h:134
 msgid "America/Juneau"
 msgstr "アメリカ/ジュノー"
 
-#: ../calendar/zones.h:135
+#: ../src/calendar/zones.h:135
 msgid "America/Kentucky/Louisville"
 msgstr "アメリカ/ケンタッキー/ルイスビル"
 
-#: ../calendar/zones.h:136
+#: ../src/calendar/zones.h:136
 msgid "America/Kentucky/Monticello"
 msgstr "アメリカ/ケンタッキー/モンティセロ"
 
-#: ../calendar/zones.h:137
+#: ../src/calendar/zones.h:137
 msgid "America/La_Paz"
 msgstr "アメリカ/ラパス"
 
-#: ../calendar/zones.h:138
+#: ../src/calendar/zones.h:138
 msgid "America/Lima"
 msgstr "アメリカ/リマ"
 
-#: ../calendar/zones.h:139
+#: ../src/calendar/zones.h:139
 msgid "America/Los_Angeles"
 msgstr "アメリカ/ロサンジェルス"
 
-#: ../calendar/zones.h:140
+#: ../src/calendar/zones.h:140
 msgid "America/Louisville"
 msgstr "アメリカ/ルイスビル"
 
-#: ../calendar/zones.h:141
+#: ../src/calendar/zones.h:141
 msgid "America/Maceio"
 msgstr "アメリカ/マセイオ"
 
-#: ../calendar/zones.h:142
+#: ../src/calendar/zones.h:142
 msgid "America/Managua"
 msgstr "アメリカ/マナグア"
 
-#: ../calendar/zones.h:143
+#: ../src/calendar/zones.h:143
 msgid "America/Manaus"
 msgstr "アメリカ/マナウス"
 
-#: ../calendar/zones.h:144
+#: ../src/calendar/zones.h:144
 msgid "America/Martinique"
 msgstr "アメリカ/マルチニーク"
 
-#: ../calendar/zones.h:145
+#: ../src/calendar/zones.h:145
 msgid "America/Mazatlan"
 msgstr "アメリカ/マサトラン"
 
-#: ../calendar/zones.h:146
+#: ../src/calendar/zones.h:146
 msgid "America/Mendoza"
 msgstr "アメリカ/メンドーサ"
 
-#: ../calendar/zones.h:147
+#: ../src/calendar/zones.h:147
 msgid "America/Menominee"
 msgstr "アメリカ/メノミニー"
 
-#: ../calendar/zones.h:148
+#: ../src/calendar/zones.h:148
 msgid "America/Merida"
 msgstr "アメリカ/メリダ"
 
-#: ../calendar/zones.h:149
+#: ../src/calendar/zones.h:149
 msgid "America/Mexico_City"
 msgstr "アメリカ/メキシコシティ"
 
-#: ../calendar/zones.h:150
+#: ../src/calendar/zones.h:150
 msgid "America/Miquelon"
 msgstr "アメリカ/ミクロン"
 
-#: ../calendar/zones.h:151
+#: ../src/calendar/zones.h:151
 msgid "America/Monterrey"
 msgstr "アメリカ/モンテレー"
 
-#: ../calendar/zones.h:152
+#: ../src/calendar/zones.h:152
 msgid "America/Montevideo"
 msgstr "アメリカ/モンテビデオ"
 
-#: ../calendar/zones.h:153
+#: ../src/calendar/zones.h:153
 msgid "America/Montreal"
 msgstr "アメリカ/モントリオール"
 
-#: ../calendar/zones.h:154
+#: ../src/calendar/zones.h:154
 msgid "America/Montserrat"
 msgstr "アメリカ/モントセラト"
 
-#: ../calendar/zones.h:155
+#: ../src/calendar/zones.h:155
 msgid "America/Nassau"
 msgstr "アメリカ/ナッサウ"
 
-#: ../calendar/zones.h:156
+#: ../src/calendar/zones.h:156
 msgid "America/New_York"
 msgstr "アメリカ/ニューヨーク"
 
-#: ../calendar/zones.h:157
+#: ../src/calendar/zones.h:157
 msgid "America/Nipigon"
 msgstr "アメリカ/ニピゴン"
 
-#: ../calendar/zones.h:158
+#: ../src/calendar/zones.h:158
 msgid "America/Nome"
 msgstr "アメリカ/ノーム"
 
-#: ../calendar/zones.h:159
+#: ../src/calendar/zones.h:159
 msgid "America/Noronha"
 msgstr "アメリカ/ノロニャ"
 
-#: ../calendar/zones.h:160
+#: ../src/calendar/zones.h:160
 msgid "America/North_Dakota/Center"
 msgstr "アメリカ/ノースダコタ/中央"
 
-#: ../calendar/zones.h:161
+#: ../src/calendar/zones.h:161
 msgid "America/Panama"
 msgstr "アメリカ/パナマ"
 
-#: ../calendar/zones.h:162
+#: ../src/calendar/zones.h:162
 msgid "America/Pangnirtung"
 msgstr "アメリカ/パンナータング"
 
-#: ../calendar/zones.h:163
+#: ../src/calendar/zones.h:163
 msgid "America/Paramaribo"
 msgstr "アメリカ/パラマリボ"
 
-#: ../calendar/zones.h:164
+#: ../src/calendar/zones.h:164
 msgid "America/Phoenix"
 msgstr "アメリカ/フェニックス"
 
-#: ../calendar/zones.h:165
+#: ../src/calendar/zones.h:165
 msgid "America/Port-au-Prince"
 msgstr "アメリカ/ポルトープランス"
 
-#: ../calendar/zones.h:166
+#: ../src/calendar/zones.h:166
 msgid "America/Port_of_Spain"
 msgstr "アメリカ/ポートオブスペイン"
 
-#: ../calendar/zones.h:167
+#: ../src/calendar/zones.h:167
 msgid "America/Porto_Velho"
 msgstr "アメリカ/ポルトベリョ"
 
-#: ../calendar/zones.h:168
+#: ../src/calendar/zones.h:168
 msgid "America/Puerto_Rico"
 msgstr "アメリカ/プエルトリコ"
 
-#: ../calendar/zones.h:169
+#: ../src/calendar/zones.h:169
 msgid "America/Rainy_River"
 msgstr "アメリカ/レイニーリバー"
 
-#: ../calendar/zones.h:170
+#: ../src/calendar/zones.h:170
 msgid "America/Rankin_Inlet"
 msgstr "アメリカ/ランキン湾"
 
-#: ../calendar/zones.h:171
+#: ../src/calendar/zones.h:171
 msgid "America/Recife"
 msgstr "アメリカ/レシフェ"
 
-#: ../calendar/zones.h:172
+#: ../src/calendar/zones.h:172
 msgid "America/Regina"
 msgstr "アメリカ/リジャイナ"
 
-#: ../calendar/zones.h:173
+#: ../src/calendar/zones.h:173
 msgid "America/Rio_Branco"
 msgstr "アメリカ/リオブランコ"
 
-#: ../calendar/zones.h:174
+#: ../src/calendar/zones.h:174
 msgid "America/Rosario"
 msgstr "アメリカ/ロザリオ"
 
-#: ../calendar/zones.h:175
+#: ../src/calendar/zones.h:175
 msgid "America/Santiago"
 msgstr "アメリカ/サンチアゴ"
 
-#: ../calendar/zones.h:176
+#: ../src/calendar/zones.h:176
 msgid "America/Santo_Domingo"
 msgstr "アメリカ/サントドミンゴ"
 
-#: ../calendar/zones.h:177
+#: ../src/calendar/zones.h:177
 msgid "America/Sao_Paulo"
 msgstr "アメリカ/サンパウロ"
 
-#: ../calendar/zones.h:178
+#: ../src/calendar/zones.h:178
 msgid "America/Scoresbysund"
 msgstr "アメリカ/Scoresbysund"
 
-#: ../calendar/zones.h:179
+#: ../src/calendar/zones.h:179
 msgid "America/Shiprock"
 msgstr "アメリカ/シップロック"
 
-#: ../calendar/zones.h:180
+#: ../src/calendar/zones.h:180
 msgid "America/St_Johns"
 msgstr "アメリカ/セントジョーンズ"
 
-#: ../calendar/zones.h:181
+#: ../src/calendar/zones.h:181
 msgid "America/St_Kitts"
 msgstr "アメリカ/セントキッツ"
 
-#: ../calendar/zones.h:182
+#: ../src/calendar/zones.h:182
 msgid "America/St_Lucia"
 msgstr "アメリカ/セントルシア"
 
-#: ../calendar/zones.h:183
+#: ../src/calendar/zones.h:183
 msgid "America/St_Thomas"
 msgstr "アメリカ/セントトーマス"
 
-#: ../calendar/zones.h:184
+#: ../src/calendar/zones.h:184
 msgid "America/St_Vincent"
 msgstr "アメリカ/セントビンセント"
 
-#: ../calendar/zones.h:185
+#: ../src/calendar/zones.h:185
 msgid "America/Swift_Current"
 msgstr "アメリカ/スウィフトカレント"
 
-#: ../calendar/zones.h:186
+#: ../src/calendar/zones.h:186
 msgid "America/Tegucigalpa"
 msgstr "アメリカ/テグシガルパ"
 
-#: ../calendar/zones.h:187
+#: ../src/calendar/zones.h:187
 msgid "America/Thule"
 msgstr "アメリカ/チューレ"
 
-#: ../calendar/zones.h:188
+#: ../src/calendar/zones.h:188
 msgid "America/Thunder_Bay"
 msgstr "アメリカ/サンダーベイ"
 
-#: ../calendar/zones.h:189
+#: ../src/calendar/zones.h:189
 msgid "America/Tijuana"
 msgstr "アメリカ/ティファナ"
 
-#: ../calendar/zones.h:190
+#: ../src/calendar/zones.h:190
 msgid "America/Tortola"
 msgstr "アメリカ/トルトラ"
 
-#: ../calendar/zones.h:191
+#: ../src/calendar/zones.h:191
 msgid "America/Vancouver"
 msgstr "アメリカ/バンクーバー"
 
-#: ../calendar/zones.h:192
+#: ../src/calendar/zones.h:192
 msgid "America/Whitehorse"
 msgstr "アメリカ/ホワイトホース"
 
-#: ../calendar/zones.h:193
+#: ../src/calendar/zones.h:193
 msgid "America/Winnipeg"
 msgstr "アメリカ/ウィニペグ"
 
-#: ../calendar/zones.h:194
+#: ../src/calendar/zones.h:194
 msgid "America/Yakutat"
 msgstr "アメリカ/ヤクタット"
 
-#: ../calendar/zones.h:195
+#: ../src/calendar/zones.h:195
 msgid "America/Yellowknife"
 msgstr "アメリカ/イエローナイフ"
 
-#: ../calendar/zones.h:196
+#: ../src/calendar/zones.h:196
 msgid "Antarctica/Casey"
 msgstr "南極大陸/キャセイ"
 
-#: ../calendar/zones.h:197
+#: ../src/calendar/zones.h:197
 msgid "Antarctica/Davis"
 msgstr "南極大陸/デービス"
 
-#: ../calendar/zones.h:198
+#: ../src/calendar/zones.h:198
 msgid "Antarctica/DumontDUrville"
 msgstr "南極大陸/デュモンデュルヴィル"
 
-#: ../calendar/zones.h:199
+#: ../src/calendar/zones.h:199
 msgid "Antarctica/Mawson"
 msgstr "南極大陸/モーソン"
 
-#: ../calendar/zones.h:200
+#: ../src/calendar/zones.h:200
 msgid "Antarctica/McMurdo"
 msgstr "南極大陸/マックマード基地"
 
-#: ../calendar/zones.h:201
+#: ../src/calendar/zones.h:201
 msgid "Antarctica/Palmer"
 msgstr "南極大陸/パーマー"
 
-#: ../calendar/zones.h:202
+#: ../src/calendar/zones.h:202
 msgid "Antarctica/South_Pole"
 msgstr "南極大陸/南極"
 
-#: ../calendar/zones.h:203
+#: ../src/calendar/zones.h:203
 msgid "Antarctica/Syowa"
 msgstr "南極大陸/昭和基地"
 
-#: ../calendar/zones.h:204
+#: ../src/calendar/zones.h:204
 msgid "Antarctica/Vostok"
 msgstr "南極大陸/ボストーク"
 
-#: ../calendar/zones.h:205
+#: ../src/calendar/zones.h:205
 msgid "Arctic/Longyearbyen"
 msgstr "北極/ロングイールビュアン"
 
-#: ../calendar/zones.h:206
+#: ../src/calendar/zones.h:206
 msgid "Asia/Aden"
 msgstr "アジア/アデン"
 
-#: ../calendar/zones.h:207
+#: ../src/calendar/zones.h:207
 msgid "Asia/Almaty"
 msgstr "アジア/アルマティ"
 
-#: ../calendar/zones.h:208
+#: ../src/calendar/zones.h:208
 msgid "Asia/Amman"
 msgstr "アジア/アンマン"
 
-#: ../calendar/zones.h:209
+#: ../src/calendar/zones.h:209
 msgid "Asia/Anadyr"
 msgstr "アジア/アナジル"
 
-#: ../calendar/zones.h:210
+#: ../src/calendar/zones.h:210
 msgid "Asia/Aqtau"
 msgstr "アジア/アクタウ"
 
-#: ../calendar/zones.h:211
+#: ../src/calendar/zones.h:211
 msgid "Asia/Aqtobe"
 msgstr "アジア/アクトベ"
 
-#: ../calendar/zones.h:212
+#: ../src/calendar/zones.h:212
 msgid "Asia/Ashgabat"
 msgstr "アジア/アシガバード"
 
-#: ../calendar/zones.h:213
+#: ../src/calendar/zones.h:213
 msgid "Asia/Baghdad"
 msgstr "アジア/バグダッド"
 
-#: ../calendar/zones.h:214
+#: ../src/calendar/zones.h:214
 msgid "Asia/Bahrain"
 msgstr "アジア/バーレン"
 
-#: ../calendar/zones.h:215
+#: ../src/calendar/zones.h:215
 msgid "Asia/Baku"
 msgstr "アジア/バクー"
 
-#: ../calendar/zones.h:216
+#: ../src/calendar/zones.h:216
 msgid "Asia/Bangkok"
 msgstr "アジア/バンコック"
 
-#: ../calendar/zones.h:217
+#: ../src/calendar/zones.h:217
 msgid "Asia/Beirut"
 msgstr "アジア/ベイルート"
 
-#: ../calendar/zones.h:218
+#: ../src/calendar/zones.h:218
 msgid "Asia/Bishkek"
 msgstr "アジア/ビシュケク"
 
-#: ../calendar/zones.h:219
+#: ../src/calendar/zones.h:219
 msgid "Asia/Brunei"
 msgstr "アジア/ブルネイ"
 
-#: ../calendar/zones.h:220
+#: ../src/calendar/zones.h:220
 msgid "Asia/Calcutta"
 msgstr "アジア/カルカッタ"
 
-#: ../calendar/zones.h:221
+#: ../src/calendar/zones.h:221
 msgid "Asia/Choibalsan"
 msgstr "アジア/チョイバルサン"
 
-#: ../calendar/zones.h:222
+#: ../src/calendar/zones.h:222
 msgid "Asia/Chongqing"
 msgstr "アジア/重慶"
 
-#: ../calendar/zones.h:223
+#: ../src/calendar/zones.h:223
 msgid "Asia/Colombo"
 msgstr "アジア/コロンボ"
 
-#: ../calendar/zones.h:224
+#: ../src/calendar/zones.h:224
 msgid "Asia/Damascus"
 msgstr "アジア/ダマスカス"
 
-#: ../calendar/zones.h:225
+#: ../src/calendar/zones.h:225
 msgid "Asia/Dhaka"
 msgstr "アジア/ダッカ"
 
-#: ../calendar/zones.h:226
+#: ../src/calendar/zones.h:226
 msgid "Asia/Dili"
 msgstr "アジア/ディリ"
 
-#: ../calendar/zones.h:227
+#: ../src/calendar/zones.h:227
 msgid "Asia/Dubai"
 msgstr "アジア/ドバイ"
 
-#: ../calendar/zones.h:228
+#: ../src/calendar/zones.h:228
 msgid "Asia/Dushanbe"
 msgstr "アジア/ドゥシャンベ"
 
-#: ../calendar/zones.h:229
+#: ../src/calendar/zones.h:229
 msgid "Asia/Gaza"
 msgstr "アジア/ガザ"
 
-#: ../calendar/zones.h:230
+#: ../src/calendar/zones.h:230
 msgid "Asia/Harbin"
 msgstr "アジア/ハルピン"
 
-#: ../calendar/zones.h:231
+#: ../src/calendar/zones.h:231
 msgid "Asia/Hong_Kong"
 msgstr "アジア/香港"
 
-#: ../calendar/zones.h:232
+#: ../src/calendar/zones.h:232
 msgid "Asia/Hovd"
 msgstr "アジア/ホブド"
 
-#: ../calendar/zones.h:233
+#: ../src/calendar/zones.h:233
 msgid "Asia/Irkutsk"
 msgstr "アジア/イルクツーク"
 
-#: ../calendar/zones.h:234
+#: ../src/calendar/zones.h:234
 msgid "Asia/Istanbul"
 msgstr "アジア/イスタンブール"
 
-#: ../calendar/zones.h:235
+#: ../src/calendar/zones.h:235
 msgid "Asia/Jakarta"
 msgstr "アジア/ジャカルタ"
 
-#: ../calendar/zones.h:236
+#: ../src/calendar/zones.h:236
 msgid "Asia/Jayapura"
 msgstr "アジア/ジャヤプラ"
 
-#: ../calendar/zones.h:237
+#: ../src/calendar/zones.h:237
 msgid "Asia/Jerusalem"
 msgstr "アジア/エルサレム"
 
-#: ../calendar/zones.h:238
+#: ../src/calendar/zones.h:238
 msgid "Asia/Kabul"
 msgstr "アジア/カブール"
 
-#: ../calendar/zones.h:239
+#: ../src/calendar/zones.h:239
 msgid "Asia/Kamchatka"
 msgstr "アジア/カムチャッカ"
 
-#: ../calendar/zones.h:240
+#: ../src/calendar/zones.h:240
 msgid "Asia/Karachi"
 msgstr "アジア/カラチ"
 
-#: ../calendar/zones.h:241
+#: ../src/calendar/zones.h:241
 msgid "Asia/Kashgar"
 msgstr "アジア/カシュガル"
 
-#: ../calendar/zones.h:242
-msgid "Asia/Katmandu"
+#: ../src/calendar/zones.h:242
+#, fuzzy
+#| msgid "Asia/Katmandu"
+msgid "Asia/Kathmandu"
 msgstr "アジア/カタマンダ"
 
-#: ../calendar/zones.h:243
+#: ../src/calendar/zones.h:243
 msgid "Asia/Krasnoyarsk"
 msgstr "アジア/クラスノヤルスク"
 
-#: ../calendar/zones.h:244
+#: ../src/calendar/zones.h:244
 msgid "Asia/Kuala_Lumpur"
 msgstr "アジア/クアラルンプール"
 
-#: ../calendar/zones.h:245
+#: ../src/calendar/zones.h:245
 msgid "Asia/Kuching"
 msgstr "アジア/クチン"
 
-#: ../calendar/zones.h:246
+#: ../src/calendar/zones.h:246
 msgid "Asia/Kuwait"
 msgstr "アジア/クェート"
 
-#: ../calendar/zones.h:247
+#: ../src/calendar/zones.h:247
 msgid "Asia/Macao"
 msgstr "アジア/マカオ"
 
-#: ../calendar/zones.h:248
+#: ../src/calendar/zones.h:248
 msgid "Asia/Macau"
 msgstr "アジア/マカウ"
 
-#: ../calendar/zones.h:249
+#: ../src/calendar/zones.h:249
 msgid "Asia/Magadan"
 msgstr "アジア/マガダン"
 
-#: ../calendar/zones.h:250
+#: ../src/calendar/zones.h:250
 msgid "Asia/Makassar"
 msgstr "アジア/マカザール"
 
-#: ../calendar/zones.h:251
+#: ../src/calendar/zones.h:251
 msgid "Asia/Manila"
 msgstr "アジア/マニラ"
 
-#: ../calendar/zones.h:252
+#: ../src/calendar/zones.h:252
 msgid "Asia/Muscat"
 msgstr "アジア/マスカット"
 
-#: ../calendar/zones.h:253
+#: ../src/calendar/zones.h:253
 msgid "Asia/Nicosia"
 msgstr "アジア/ニコシア"
 
-#: ../calendar/zones.h:254
+#: ../src/calendar/zones.h:254
 msgid "Asia/Novosibirsk"
 msgstr "アジア/ノヴォシビルスク"
 
-#: ../calendar/zones.h:255
+#: ../src/calendar/zones.h:255
 msgid "Asia/Omsk"
 msgstr "アジア/オムスク"
 
-#: ../calendar/zones.h:256
+#: ../src/calendar/zones.h:256
 msgid "Asia/Oral"
 msgstr "アジア/オラル"
 
-#: ../calendar/zones.h:257
+#: ../src/calendar/zones.h:257
 msgid "Asia/Phnom_Penh"
 msgstr "アジア/プノンペン"
 
-#: ../calendar/zones.h:258
+#: ../src/calendar/zones.h:258
 msgid "Asia/Pontianak"
 msgstr "アジア/ポンティアナク"
 
-#: ../calendar/zones.h:259
+#: ../src/calendar/zones.h:259
 msgid "Asia/Pyongyang"
 msgstr "アジア/平壌"
 
-#: ../calendar/zones.h:260
+#: ../src/calendar/zones.h:260
 msgid "Asia/Qatar"
 msgstr "アジア/カタール"
 
-#: ../calendar/zones.h:261
+#: ../src/calendar/zones.h:261
 msgid "Asia/Qyzylorda"
 msgstr "アジア/キジルオルダ"
 
-#: ../calendar/zones.h:262
+#: ../src/calendar/zones.h:262
 msgid "Asia/Rangoon"
 msgstr "アジア/ラングーン"
 
-#: ../calendar/zones.h:263
+#: ../src/calendar/zones.h:263
 msgid "Asia/Riyadh"
 msgstr "アジア/リャド"
 
-#: ../calendar/zones.h:264
+#: ../src/calendar/zones.h:264
 msgid "Asia/Saigon"
 msgstr "アジア/サイゴン"
 
-#: ../calendar/zones.h:265
+#: ../src/calendar/zones.h:265
 msgid "Asia/Sakhalin"
 msgstr "アジア/サハリン"
 
-#: ../calendar/zones.h:266
+#: ../src/calendar/zones.h:266
 msgid "Asia/Samarkand"
 msgstr "アジア/サマルカンド"
 
-#: ../calendar/zones.h:267
+#: ../src/calendar/zones.h:267
 msgid "Asia/Seoul"
 msgstr "アジア/ソウル"
 
-#: ../calendar/zones.h:268
+#: ../src/calendar/zones.h:268
 msgid "Asia/Shanghai"
 msgstr "アジア/上海"
 
-#: ../calendar/zones.h:269
+#: ../src/calendar/zones.h:269
 msgid "Asia/Singapore"
 msgstr "アジア/シンガポール"
 
-#: ../calendar/zones.h:270
+#: ../src/calendar/zones.h:270
 msgid "Asia/Taipei"
 msgstr "アジア/台北"
 
-#: ../calendar/zones.h:271
+#: ../src/calendar/zones.h:271
 msgid "Asia/Tashkent"
 msgstr "アジア/タシケント"
 
-#: ../calendar/zones.h:272
+#: ../src/calendar/zones.h:272
 msgid "Asia/Tbilisi"
 msgstr "アジア/トビリシ"
 
-#: ../calendar/zones.h:273
+#: ../src/calendar/zones.h:273
 msgid "Asia/Tehran"
 msgstr "アジア/テヘラン"
 
-#: ../calendar/zones.h:274
+#: ../src/calendar/zones.h:274
 msgid "Asia/Thimphu"
 msgstr "アジア/ティンプー"
 
-#: ../calendar/zones.h:275
+#: ../src/calendar/zones.h:275
 msgid "Asia/Tokyo"
 msgstr "アジア/東京"
 
-#: ../calendar/zones.h:276
+#: ../src/calendar/zones.h:276
 msgid "Asia/Ujung_Pandang"
 msgstr "アジア/ウジュンパンダン"
 
-#: ../calendar/zones.h:277
+#: ../src/calendar/zones.h:277
 msgid "Asia/Ulaanbaatar"
 msgstr "アジア/ウランバタール"
 
-#: ../calendar/zones.h:278
+#: ../src/calendar/zones.h:278
 msgid "Asia/Urumqi"
 msgstr "アジア/ウルムチ"
 
-#: ../calendar/zones.h:279
+#: ../src/calendar/zones.h:279
 msgid "Asia/Vientiane"
 msgstr "アジア/ビエンチャン"
 
-#: ../calendar/zones.h:280
+#: ../src/calendar/zones.h:280
 msgid "Asia/Vladivostok"
 msgstr "アジア/ウラジオストック"
 
-#: ../calendar/zones.h:281
+#: ../src/calendar/zones.h:281
 msgid "Asia/Yakutsk"
 msgstr "アジア/イヤクツーク"
 
-#: ../calendar/zones.h:282
+#: ../src/calendar/zones.h:282
 msgid "Asia/Yekaterinburg"
 msgstr "アジア/エカテリンブルク"
 
-#: ../calendar/zones.h:283
+#: ../src/calendar/zones.h:283
 msgid "Asia/Yerevan"
 msgstr "アジア/エレバン"
 
-#: ../calendar/zones.h:284
+#: ../src/calendar/zones.h:284
 msgid "Atlantic/Azores"
 msgstr "大西洋/アゾーレス"
 
-#: ../calendar/zones.h:285
+#: ../src/calendar/zones.h:285
 msgid "Atlantic/Bermuda"
 msgstr "大西洋/バーミューダ"
 
-#: ../calendar/zones.h:286
+#: ../src/calendar/zones.h:286
 msgid "Atlantic/Canary"
 msgstr "大西洋/カナリア"
 
-#: ../calendar/zones.h:287
+#: ../src/calendar/zones.h:287
 msgid "Atlantic/Cape_Verde"
 msgstr "大西洋/ケープバーデ"
 
-#: ../calendar/zones.h:288
+#: ../src/calendar/zones.h:288
 msgid "Atlantic/Faeroe"
 msgstr "大西洋/フェロー"
 
-#: ../calendar/zones.h:289
+#: ../src/calendar/zones.h:289
 msgid "Atlantic/Jan_Mayen"
 msgstr "大西洋/ヤンマイエン"
 
-#: ../calendar/zones.h:290
+#: ../src/calendar/zones.h:290
 msgid "Atlantic/Madeira"
 msgstr "大西洋/マデイラ"
 
-#: ../calendar/zones.h:291
+#: ../src/calendar/zones.h:291
 msgid "Atlantic/Reykjavik"
 msgstr "大西洋/レイキャビク"
 
-#: ../calendar/zones.h:292
+#: ../src/calendar/zones.h:292
 msgid "Atlantic/South_Georgia"
 msgstr "大西洋/サウスジョージア"
 
-#: ../calendar/zones.h:293
+#: ../src/calendar/zones.h:293
 msgid "Atlantic/St_Helena"
 msgstr "大西洋/セントヘレナ"
 
-#: ../calendar/zones.h:294
+#: ../src/calendar/zones.h:294
 msgid "Atlantic/Stanley"
 msgstr "大西洋/スタンリー"
 
-#: ../calendar/zones.h:295
+#: ../src/calendar/zones.h:295
 msgid "Australia/Adelaide"
 msgstr "オーストラリア/アデレード"
 
-#: ../calendar/zones.h:296
+#: ../src/calendar/zones.h:296
 msgid "Australia/Brisbane"
 msgstr "オーストラリア/ブリスベン"
 
-#: ../calendar/zones.h:297
+#: ../src/calendar/zones.h:297
 msgid "Australia/Broken_Hill"
 msgstr "オーストラリア/ブロークンヒル"
 
-#: ../calendar/zones.h:298
+#: ../src/calendar/zones.h:298
 msgid "Australia/Darwin"
 msgstr "オーストラリア/ダーウィン"
 
-#: ../calendar/zones.h:299
+#: ../src/calendar/zones.h:299
 msgid "Australia/Hobart"
 msgstr "オーストラリア/ホバート"
 
-#: ../calendar/zones.h:300
+#: ../src/calendar/zones.h:300
 msgid "Australia/Lindeman"
 msgstr "オーストラリア/リンデマン"
 
-#: ../calendar/zones.h:301
+#: ../src/calendar/zones.h:301
 msgid "Australia/Lord_Howe"
 msgstr "オーストラリア/Lord_Howe"
 
-#: ../calendar/zones.h:302
+#: ../src/calendar/zones.h:302
 msgid "Australia/Melbourne"
 msgstr "オーストラリア/メルボルン"
 
-#: ../calendar/zones.h:303
+#: ../src/calendar/zones.h:303
 msgid "Australia/Perth"
 msgstr "オーストラリア/パース"
 
-#: ../calendar/zones.h:304
+#: ../src/calendar/zones.h:304
 msgid "Australia/Sydney"
 msgstr "オーストラリア/シドニー"
 
-#: ../calendar/zones.h:305
+#: ../src/calendar/zones.h:305
 msgid "Europe/Amsterdam"
 msgstr "ヨーロッパ/アムステルダム"
 
-#: ../calendar/zones.h:306
+#: ../src/calendar/zones.h:306
 msgid "Europe/Andorra"
 msgstr "ヨーロッパ/アンドラ"
 
-#: ../calendar/zones.h:307
+#: ../src/calendar/zones.h:307
 msgid "Europe/Athens"
 msgstr "ヨーロッパ/アテネ"
 
-#: ../calendar/zones.h:308
+#: ../src/calendar/zones.h:308
 msgid "Europe/Belfast"
 msgstr "ヨーロッパ/ベルファウスト"
 
-#: ../calendar/zones.h:309
+#: ../src/calendar/zones.h:309
 msgid "Europe/Belgrade"
 msgstr "ヨーロッパ/ベルグラード"
 
-#: ../calendar/zones.h:310
+#: ../src/calendar/zones.h:310
 msgid "Europe/Berlin"
 msgstr "ヨーロッパ/ベルリン"
 
-#: ../calendar/zones.h:311
+#: ../src/calendar/zones.h:311
 msgid "Europe/Bratislava"
 msgstr "ヨーロッパ/ブラチスラバ"
 
-#: ../calendar/zones.h:312
+#: ../src/calendar/zones.h:312
 msgid "Europe/Brussels"
 msgstr "ヨーロッパ/ブリュッセル"
 
-#: ../calendar/zones.h:313
+#: ../src/calendar/zones.h:313
 msgid "Europe/Bucharest"
 msgstr "ヨーロッパ/ブカレスト"
 
-#: ../calendar/zones.h:314
+#: ../src/calendar/zones.h:314
 msgid "Europe/Budapest"
 msgstr "ヨーロッパ/ブダペスト"
 
-#: ../calendar/zones.h:315
+#: ../src/calendar/zones.h:315
 msgid "Europe/Chisinau"
 msgstr "ヨーロッパ/キシニョフ"
 
-#: ../calendar/zones.h:316
+#: ../src/calendar/zones.h:316
 msgid "Europe/Copenhagen"
 msgstr "ヨーロッパ/コペンハーゲン"
 
-#: ../calendar/zones.h:317
+#: ../src/calendar/zones.h:317
 msgid "Europe/Dublin"
 msgstr "ヨーロッパ/ダブリン"
 
-#: ../calendar/zones.h:318
+#: ../src/calendar/zones.h:318
 msgid "Europe/Gibraltar"
 msgstr "ヨーロッパ/ジブラルタル"
 
-#: ../calendar/zones.h:319
+#: ../src/calendar/zones.h:319
 msgid "Europe/Helsinki"
 msgstr "ヨーロッパ/ヘルシンキ"
 
-#: ../calendar/zones.h:320
+#: ../src/calendar/zones.h:320
 msgid "Europe/Istanbul"
 msgstr "ヨーロッパ/イスタンブール"
 
-#: ../calendar/zones.h:321
+#: ../src/calendar/zones.h:321
 msgid "Europe/Kaliningrad"
 msgstr "ヨーロッパ/カリーニングラード"
 
-#: ../calendar/zones.h:322
+#: ../src/calendar/zones.h:322
 msgid "Europe/Kiev"
 msgstr "ヨーロッパ/キエフ"
 
-#: ../calendar/zones.h:323
+#: ../src/calendar/zones.h:323
 msgid "Europe/Lisbon"
 msgstr "ヨーロッパ/リスボン"
 
-#: ../calendar/zones.h:324
+#: ../src/calendar/zones.h:324
 msgid "Europe/Ljubljana"
 msgstr "ヨーロッパ/リュブリャナ"
 
-#: ../calendar/zones.h:325
+#: ../src/calendar/zones.h:325
 msgid "Europe/London"
 msgstr "ヨーロッパ/ロンドン"
 
-#: ../calendar/zones.h:326
+#: ../src/calendar/zones.h:326
 msgid "Europe/Luxembourg"
 msgstr "ヨーロッパ/ルクセンブルグ"
 
-#: ../calendar/zones.h:327
+#: ../src/calendar/zones.h:327
 msgid "Europe/Madrid"
 msgstr "ヨーロッパ/マドリッド"
 
-#: ../calendar/zones.h:328
+#: ../src/calendar/zones.h:328
 msgid "Europe/Malta"
 msgstr "ヨーロッパ/マルタ"
 
-#: ../calendar/zones.h:329
+#: ../src/calendar/zones.h:329
 msgid "Europe/Minsk"
 msgstr "ヨーロッパ/ミンスク"
 
-#: ../calendar/zones.h:330
+#: ../src/calendar/zones.h:330
 msgid "Europe/Monaco"
 msgstr "ヨーロッパ/モナコ"
 
-#: ../calendar/zones.h:331
+#: ../src/calendar/zones.h:331
 msgid "Europe/Moscow"
 msgstr "ヨーロッパ/モスクワ"
 
-#: ../calendar/zones.h:332
+#: ../src/calendar/zones.h:332
 msgid "Europe/Nicosia"
 msgstr "ヨーロッパ/ニコシア"
 
-#: ../calendar/zones.h:333
+#: ../src/calendar/zones.h:333
 msgid "Europe/Oslo"
 msgstr "ヨーロッパ/オスロ"
 
-#: ../calendar/zones.h:334
+#: ../src/calendar/zones.h:334
 msgid "Europe/Paris"
 msgstr "ヨーロッパ/パリ"
 
-#: ../calendar/zones.h:335
+#: ../src/calendar/zones.h:335
 msgid "Europe/Prague"
 msgstr "ヨーロッパ/プラハ"
 
-#: ../calendar/zones.h:336
+#: ../src/calendar/zones.h:336
 msgid "Europe/Riga"
 msgstr "ヨーロッパ/リガ"
 
-#: ../calendar/zones.h:337
+#: ../src/calendar/zones.h:337
 msgid "Europe/Rome"
 msgstr "ヨーロッパ/ローマ"
 
-#: ../calendar/zones.h:338
+#: ../src/calendar/zones.h:338
 msgid "Europe/Samara"
 msgstr "ヨーロッパ/サマラ"
 
-#: ../calendar/zones.h:339
+#: ../src/calendar/zones.h:339
 msgid "Europe/San_Marino"
 msgstr "ヨーロッパ/サンマリノ"
 
-#: ../calendar/zones.h:340
+#: ../src/calendar/zones.h:340
 msgid "Europe/Sarajevo"
 msgstr "ヨーロッパ/サラエボ"
 
-#: ../calendar/zones.h:341
+#: ../src/calendar/zones.h:341
 msgid "Europe/Simferopol"
 msgstr "ヨーロッパ/シンフェローポリ"
 
-#: ../calendar/zones.h:342
+#: ../src/calendar/zones.h:342
 msgid "Europe/Skopje"
 msgstr "ヨーロッパ/Skopje"
 
-#: ../calendar/zones.h:343
+#: ../src/calendar/zones.h:343
 msgid "Europe/Sofia"
 msgstr "ヨーロッパ/ソフィア"
 
-#: ../calendar/zones.h:344
+#: ../src/calendar/zones.h:344
 msgid "Europe/Stockholm"
 msgstr "ヨーロッパ/ストックホルム"
 
-#: ../calendar/zones.h:345
+#: ../src/calendar/zones.h:345
 msgid "Europe/Tallinn"
 msgstr "ヨーロッパ/タリン"
 
-#: ../calendar/zones.h:346
+#: ../src/calendar/zones.h:346
 msgid "Europe/Tirane"
 msgstr "ヨーロッパ/チラネ"
 
-#: ../calendar/zones.h:347
+#: ../src/calendar/zones.h:347
 msgid "Europe/Uzhgorod"
 msgstr "ヨーロッパ/ウジゴロド"
 
-#: ../calendar/zones.h:348
+#: ../src/calendar/zones.h:348
 msgid "Europe/Vaduz"
 msgstr "ヨーロッパ/ファドゥーツ"
 
-#: ../calendar/zones.h:349
+#: ../src/calendar/zones.h:349
 msgid "Europe/Vatican"
 msgstr "ヨーロッパ/バチカン"
 
-#: ../calendar/zones.h:350
+#: ../src/calendar/zones.h:350
 msgid "Europe/Vienna"
 msgstr "ヨーロッパ/ウィーン"
 
-#: ../calendar/zones.h:351
+#: ../src/calendar/zones.h:351
 msgid "Europe/Vilnius"
 msgstr "ヨーロッパ/ヴィリニュス"
 
-#: ../calendar/zones.h:352
+#: ../src/calendar/zones.h:352
 msgid "Europe/Warsaw"
 msgstr "ヨーロッパ/ワルシャワ"
 
-#: ../calendar/zones.h:353
+#: ../src/calendar/zones.h:353
 msgid "Europe/Zagreb"
 msgstr "ヨーロッパ/ザグレフ"
 
-#: ../calendar/zones.h:354
+#: ../src/calendar/zones.h:354
 msgid "Europe/Zaporozhye"
 msgstr "ヨーロッパ/ザポロジェ"
 
-#: ../calendar/zones.h:355
+#: ../src/calendar/zones.h:355
 msgid "Europe/Zurich"
 msgstr "ヨーロッパ/チューリッヒ"
 
-#: ../calendar/zones.h:356
+#: ../src/calendar/zones.h:356
 msgid "Indian/Antananarivo"
 msgstr "インド/アンタナナリボ"
 
-#: ../calendar/zones.h:357
+#: ../src/calendar/zones.h:357
 msgid "Indian/Chagos"
 msgstr "インド/チャゴス"
 
-#: ../calendar/zones.h:358
+#: ../src/calendar/zones.h:358
 msgid "Indian/Christmas"
 msgstr "インド/クリスマス"
 
-#: ../calendar/zones.h:359
+#: ../src/calendar/zones.h:359
 msgid "Indian/Cocos"
 msgstr "インド/ココス"
 
-#: ../calendar/zones.h:360
+#: ../src/calendar/zones.h:360
 msgid "Indian/Comoro"
 msgstr "インド/コモロス"
 
-#: ../calendar/zones.h:361
+#: ../src/calendar/zones.h:361
 msgid "Indian/Kerguelen"
 msgstr "インド/ケルゲレーヌ"
 
-#: ../calendar/zones.h:362
+#: ../src/calendar/zones.h:362
 msgid "Indian/Mahe"
 msgstr "インド/マエ"
 
-#: ../calendar/zones.h:363
+#: ../src/calendar/zones.h:363
 msgid "Indian/Maldives"
 msgstr "インド/モルジブ"
 
-#: ../calendar/zones.h:364
+#: ../src/calendar/zones.h:364
 msgid "Indian/Mauritius"
 msgstr "インド/マリシャス"
 
-#: ../calendar/zones.h:365
+#: ../src/calendar/zones.h:365
 msgid "Indian/Mayotte"
 msgstr "インド/マイヨット"
 
-#: ../calendar/zones.h:366
+#: ../src/calendar/zones.h:366
 msgid "Indian/Reunion"
 msgstr "インド/レユニオン"
 
-#: ../calendar/zones.h:367
+#: ../src/calendar/zones.h:367
 msgid "Pacific/Apia"
 msgstr "太平洋/アピア"
 
-#: ../calendar/zones.h:368
+#: ../src/calendar/zones.h:368
 msgid "Pacific/Auckland"
 msgstr "太平洋/オークランド"
 
-#: ../calendar/zones.h:369
+#: ../src/calendar/zones.h:369
 msgid "Pacific/Chatham"
 msgstr "太平洋/チャタム"
 
-#: ../calendar/zones.h:370
+#: ../src/calendar/zones.h:370
 msgid "Pacific/Easter"
 msgstr "太平洋/イースター"
 
-#: ../calendar/zones.h:371
+#: ../src/calendar/zones.h:371
 msgid "Pacific/Efate"
 msgstr "太平洋/エファテ"
 
-#: ../calendar/zones.h:372
+#: ../src/calendar/zones.h:372
 msgid "Pacific/Enderbury"
 msgstr "太平洋/エンダベリー"
 
-#: ../calendar/zones.h:373
+#: ../src/calendar/zones.h:373
 msgid "Pacific/Fakaofo"
 msgstr "太平洋/Fakaofo"
 
-#: ../calendar/zones.h:374
+#: ../src/calendar/zones.h:374
 msgid "Pacific/Fiji"
 msgstr "太平洋/フィジー"
 
-#: ../calendar/zones.h:375
+#: ../src/calendar/zones.h:375
 msgid "Pacific/Funafuti"
 msgstr "太平洋/フナフティ"
 
-#: ../calendar/zones.h:376
+#: ../src/calendar/zones.h:376
 msgid "Pacific/Galapagos"
 msgstr "太平洋/ガラパゴス"
 
-#: ../calendar/zones.h:377
+#: ../src/calendar/zones.h:377
 msgid "Pacific/Gambier"
 msgstr "太平洋/ガンビア"
 
-#: ../calendar/zones.h:378
+#: ../src/calendar/zones.h:378
 msgid "Pacific/Guadalcanal"
 msgstr "太平洋/ガダルカナル"
 
-#: ../calendar/zones.h:379
+#: ../src/calendar/zones.h:379
 msgid "Pacific/Guam"
 msgstr "太平洋/グアム"
 
-#: ../calendar/zones.h:380
+#: ../src/calendar/zones.h:380
 msgid "Pacific/Honolulu"
 msgstr "太平洋/ホノルル"
 
-#: ../calendar/zones.h:381
+#: ../src/calendar/zones.h:381
 msgid "Pacific/Johnston"
 msgstr "太平洋/ジョンストン"
 
-#: ../calendar/zones.h:382
+#: ../src/calendar/zones.h:382
 msgid "Pacific/Kiritimati"
 msgstr "太平洋/キリティマティ"
 
-#: ../calendar/zones.h:383
+#: ../src/calendar/zones.h:383
 msgid "Pacific/Kosrae"
 msgstr "太平洋/コシャエ"
 
-#: ../calendar/zones.h:384
+#: ../src/calendar/zones.h:384
 msgid "Pacific/Kwajalein"
 msgstr "太平洋/クワゼリン"
 
-#: ../calendar/zones.h:385
+#: ../src/calendar/zones.h:385
 msgid "Pacific/Majuro"
 msgstr "太平洋/マジュロ"
 
-#: ../calendar/zones.h:386
+#: ../src/calendar/zones.h:386
 msgid "Pacific/Marquesas"
 msgstr "太平洋/マルケサス"
 
-#: ../calendar/zones.h:387
+#: ../src/calendar/zones.h:387
 msgid "Pacific/Midway"
 msgstr "太平洋/ミッドウエイ"
 
-#: ../calendar/zones.h:388
+#: ../src/calendar/zones.h:388
 msgid "Pacific/Nauru"
 msgstr "太平洋/ナウル"
 
-#: ../calendar/zones.h:389
+#: ../src/calendar/zones.h:389
 msgid "Pacific/Niue"
 msgstr "太平洋/ニウエ"
 
-#: ../calendar/zones.h:390
+#: ../src/calendar/zones.h:390
 msgid "Pacific/Norfolk"
 msgstr "太平洋/ノーフォーク"
 
-#: ../calendar/zones.h:391
+#: ../src/calendar/zones.h:391
 msgid "Pacific/Noumea"
 msgstr "太平洋/ヌーメア"
 
-#: ../calendar/zones.h:392
+#: ../src/calendar/zones.h:392
 msgid "Pacific/Pago_Pago"
 msgstr "太平洋/パゴパゴ"
 
-#: ../calendar/zones.h:393
+#: ../src/calendar/zones.h:393
 msgid "Pacific/Palau"
 msgstr "太平洋/パラオ"
 
-#: ../calendar/zones.h:394
+#: ../src/calendar/zones.h:394
 msgid "Pacific/Pitcairn"
 msgstr "太平洋/ピトルケルン"
 
-#: ../calendar/zones.h:395
+#: ../src/calendar/zones.h:395
 msgid "Pacific/Ponape"
 msgstr "太平洋/ポナペ"
 
-#: ../calendar/zones.h:396
+#: ../src/calendar/zones.h:396
 msgid "Pacific/Port_Moresby"
 msgstr "太平洋/ポートモレスビー"
 
-#: ../calendar/zones.h:397
+#: ../src/calendar/zones.h:397
 msgid "Pacific/Rarotonga"
 msgstr "太平洋/ラロトンガ"
 
-#: ../calendar/zones.h:398
+#: ../src/calendar/zones.h:398
 msgid "Pacific/Saipan"
 msgstr "太平洋/サイパン"
 
-#: ../calendar/zones.h:399
+#: ../src/calendar/zones.h:399
 msgid "Pacific/Tahiti"
 msgstr "太平洋/タヒチ"
 
-#: ../calendar/zones.h:400
+#: ../src/calendar/zones.h:400
 msgid "Pacific/Tarawa"
 msgstr "太平洋/タラワ"
 
-#: ../calendar/zones.h:401
+#: ../src/calendar/zones.h:401
 msgid "Pacific/Tongatapu"
 msgstr "太平洋/トンガ"
 
-#: ../calendar/zones.h:402
+#: ../src/calendar/zones.h:402
 msgid "Pacific/Truk"
 msgstr "太平洋/トラック"
 
-#: ../calendar/zones.h:403
+#: ../src/calendar/zones.h:403
 msgid "Pacific/Wake"
 msgstr "太平洋/ウェーキ"
 
-#: ../calendar/zones.h:404
+#: ../src/calendar/zones.h:404
 msgid "Pacific/Wallis"
 msgstr "太平洋/ウォーリス"
 
-#: ../calendar/zones.h:405
+#: ../src/calendar/zones.h:405
 msgid "Pacific/Yap"
 msgstr "太平洋/ヤップ"
 
-#: ../composer/e-composer-actions.c:202
+#: ../src/composer/e-composer-actions.c:225
 msgid "Save as..."
 msgstr "名前を付けて保存..."
 
-#: ../composer/e-composer-actions.c:277
+#: ../src/composer/e-composer-actions.c:329
 msgid "Close the current file"
 msgstr "現在のファイルを閉じます"
 
-#: ../composer/e-composer-actions.c:282
+#: ../src/composer/e-composer-actions.c:334
 msgid "New _Message"
 msgstr "新しいメッセージ(_M)"
 
-#: ../composer/e-composer-actions.c:284
+#: ../src/composer/e-composer-actions.c:336
 msgid "Open New Message window"
 msgstr "新しいメッセージ作成ウィンドウを開きます"
 
-#: ../composer/e-composer-actions.c:289 ../shell/e-shell-window-actions.c:979
-#, fuzzy
-#| msgid "Mail Preferences"
+#: ../src/composer/e-composer-actions.c:341 ../src/shell/e-shell.c:1302
+#: ../src/shell/e-shell-window-actions.c:857
 msgid "_Preferences"
-msgstr "メールの設定"
+msgstr "設定(_P)"
 
-#: ../composer/e-composer-actions.c:291 ../shell/e-shell-window-actions.c:981
+#: ../src/composer/e-composer-actions.c:343
+#: ../src/shell/e-shell-window-actions.c:859
 msgid "Configure Evolution"
 msgstr "Evolution の設定"
 
-#: ../composer/e-composer-actions.c:298
+#: ../src/composer/e-composer-actions.c:350
 msgid "Save the current file"
 msgstr "現在のファイルを保存します"
 
-#: ../composer/e-composer-actions.c:303
+#: ../src/composer/e-composer-actions.c:355
 msgid "Save _As..."
 msgstr "名前を付けて保存(_A)..."
 
-#: ../composer/e-composer-actions.c:305
+#: ../src/composer/e-composer-actions.c:357
 msgid "Save the current file with a different name"
 msgstr "名前を付けて現在のファイルを保存します"
 
-#: ../composer/e-composer-actions.c:312
+#: ../src/composer/e-composer-actions.c:364
 msgid "Character _Encoding"
 msgstr "文字のエンコーディング(_E)"
 
-#: ../composer/e-composer-actions.c:336
+#: ../src/composer/e-composer-actions.c:388
 msgid "Print Pre_view"
 msgstr "印刷プレビュー(_V)"
 
-#: ../composer/e-composer-actions.c:343
+#: ../src/composer/e-composer-actions.c:395
 msgid "Save as _Draft"
 msgstr "下書きとして保存(_D)"
 
-#: ../composer/e-composer-actions.c:345
+#: ../src/composer/e-composer-actions.c:397
 msgid "Save as draft"
 msgstr "下書きとして保存します"
 
-#: ../composer/e-composer-actions.c:350
+#: ../src/composer/e-composer-actions.c:402
 msgid "S_end"
 msgstr "送信(_E)"
 
-#: ../composer/e-composer-actions.c:352
+#: ../src/composer/e-composer-actions.c:404
 msgid "Send this message"
 msgstr "メッセージを送信します"
 
-#: ../composer/e-composer-actions.c:360
+#: ../src/composer/e-composer-actions.c:412
 msgid "PGP _Encrypt"
 msgstr "PGP による暗号化(_E)"
 
-#: ../composer/e-composer-actions.c:362
+#: ../src/composer/e-composer-actions.c:414
 msgid "Encrypt this message with PGP"
 msgstr "PGP でこのメッセージを暗号化します"
 
-#: ../composer/e-composer-actions.c:368
+#: ../src/composer/e-composer-actions.c:420
 msgid "PGP _Sign"
 msgstr "PGP の署名(_S)"
 
-#: ../composer/e-composer-actions.c:370
+#: ../src/composer/e-composer-actions.c:422
 msgid "Sign this message with your PGP key"
 msgstr "PGP 鍵でこのメッセージに署名します"
 
-#: ../composer/e-composer-actions.c:376
+#: ../src/composer/e-composer-actions.c:428
 msgid "_Picture Gallery"
 msgstr "画像ギャラリー(_P)"
 
-#: ../composer/e-composer-actions.c:378
+#: ../src/composer/e-composer-actions.c:430
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "メッセージにドラッグできる画像のコレクションを表示"
 
-#: ../composer/e-composer-actions.c:384
+#: ../src/composer/e-composer-actions.c:436
 msgid "_Prioritize Message"
 msgstr "メッセージの優先度を上げる(_P)"
 
-#: ../composer/e-composer-actions.c:386
+#: ../src/composer/e-composer-actions.c:438
 msgid "Set the message priority to high"
 msgstr "メッセージの優先度を高くします"
 
-#: ../composer/e-composer-actions.c:392
+#: ../src/composer/e-composer-actions.c:444
 msgid "Re_quest Read Receipt"
 msgstr "開封通知を要求する(_Q)"
 
-#: ../composer/e-composer-actions.c:394
+#: ../src/composer/e-composer-actions.c:446
 msgid "Get delivery notification when your message is read"
 msgstr "相手がメッセージを読んだ時に配送通知を取得します"
 
-#: ../composer/e-composer-actions.c:400
+#: ../src/composer/e-composer-actions.c:452
 msgid "S/MIME En_crypt"
 msgstr "S/MIME による暗号化(_C)"
 
-#: ../composer/e-composer-actions.c:402
+#: ../src/composer/e-composer-actions.c:454
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "このメッセージを S/MIME 暗号認証を用いて暗号化します"
 
-#: ../composer/e-composer-actions.c:408
+#: ../src/composer/e-composer-actions.c:460
 msgid "S/MIME Sig_n"
 msgstr "S/MIME の署名(_N)"
 
-#: ../composer/e-composer-actions.c:410
+#: ../src/composer/e-composer-actions.c:462
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "S/MIME 署名証明書でこのメッセージに署名します"
 
-#: ../composer/e-composer-actions.c:416
+#: ../src/composer/e-composer-actions.c:516
 msgid "_Bcc Field"
 msgstr "Bcc(_B)"
 
-#: ../composer/e-composer-actions.c:418
+#: ../src/composer/e-composer-actions.c:518
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Bcc の表示/非表示を切り替えます"
 
-#: ../composer/e-composer-actions.c:424
+#: ../src/composer/e-composer-actions.c:524
 msgid "_Cc Field"
 msgstr "Cc(_C)"
 
-#: ../composer/e-composer-actions.c:426
+#: ../src/composer/e-composer-actions.c:526
 msgid "Toggles whether the CC field is displayed"
 msgstr "Cc の表示/非表示を切り替えます"
 
-#: ../composer/e-composer-actions.c:432
+#: ../src/composer/e-composer-actions.c:532
+msgid "_From Override Field"
+msgstr ""
+
+#: ../src/composer/e-composer-actions.c:534
+#, fuzzy
+#| msgid "Toggles whether the Role field is displayed"
+msgid ""
+"Toggles whether the From override field to change name or email address is "
+"displayed"
+msgstr "役割の表示/非表示を切り替えます"
+
+#: ../src/composer/e-composer-actions.c:540
 msgid "_Reply-To Field"
 msgstr "返信先(_R)"
 
-#: ../composer/e-composer-actions.c:434
+#: ../src/composer/e-composer-actions.c:542
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "返信先の表示/非表示を切り替えます"
 
-#: ../composer/e-composer-actions.c:493
+#: ../src/composer/e-composer-actions.c:597
+msgid "Attach"
+msgstr "添付"
+
+#: ../src/composer/e-composer-actions.c:603
 msgid "Save Draft"
 msgstr "下書きを保存します"
 
-#: ../composer/e-composer-header-table.c:38
+#: ../src/composer/e-composer-from-header.c:108
+#: ../src/e-util/e-mail-signature-script-dialog.c:416
+#: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../src/mail/e-mail-config-identity-page.c:553
+#: ../src/mail/e-mail-config-summary-page.c:333
+msgid "_Name:"
+msgstr "名前(_N):"
+
+#: ../src/composer/e-composer-header-table.c:36
 msgid "Enter the recipients of the message"
 msgstr "メッセージの宛先を入力します"
 
-#: ../composer/e-composer-header-table.c:40
+#: ../src/composer/e-composer-header-table.c:38
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "メッセージのカーボンコピー (Cc) を受けとる人のアドレスを入力します"
 
-#: ../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) としてメッセージを受け取る人のアドレスを入力します"
+#: ../src/composer/e-composer-header-table.c:41
+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:771
+#: ../src/composer/e-composer-header-table.c:840
 msgid "Fr_om:"
 msgstr "差出人(_O):"
 
-#: ../composer/e-composer-header-table.c:778
+#: ../src/composer/e-composer-header-table.c:847
 msgid "_Reply-To:"
 msgstr "返信先(_R):"
 
-#: ../composer/e-composer-header-table.c:783
+#: ../src/composer/e-composer-header-table.c:852
 msgid "_To:"
 msgstr "宛先(_T):"
 
-#: ../composer/e-composer-header-table.c:789
+#: ../src/composer/e-composer-header-table.c:858
 msgid "_Cc:"
 msgstr "Cc(_C):"
 
-#: ../composer/e-composer-header-table.c:795
+#: ../src/composer/e-composer-header-table.c:864
 msgid "_Bcc:"
 msgstr "Bcc(_B):"
 
-#: ../composer/e-composer-header-table.c:800
+#: ../src/composer/e-composer-header-table.c:869
 msgid "_Post To:"
 msgstr "送信先(_P):"
 
-#: ../composer/e-composer-header-table.c:804
+#: ../src/composer/e-composer-header-table.c:873
 msgid "S_ubject:"
 msgstr "件名(_U):"
 
-#: ../composer/e-composer-header-table.c:812
-#: ../mail/e-mail-config-identity-page.c:488
+#: ../src/composer/e-composer-header-table.c:883
+#: ../src/mail/e-mail-config-identity-page.c:746
 msgid "Si_gnature:"
 msgstr "署名(_G):"
 
-#: ../composer/e-composer-name-header.c:234
+#: ../src/composer/e-composer-name-header.c:237
 msgid "Click here for the address book"
 msgstr "ここをクリックするとアドレス帳が表示されます"
 
-#: ../composer/e-composer-post-header.c:183
+#: ../src/composer/e-composer-post-header.c:180
 msgid "Click here to select folders to post to"
 msgstr "<ここをクリックして投稿するフォルダーを選択してください>"
 
-#: ../composer/e-msg-composer.c:879
+#: ../src/composer/e-msg-composer.c:859
 #, c-format
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "送信メッセージに署名できません: このアカウントに対して署名付きの証明書がセットされていません"
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"送信メッセージに署名できません: このアカウントに対して署名付きの証明書がセッ"
+"トされていません"
 
-#: ../composer/e-msg-composer.c:888
+#: ../src/composer/e-msg-composer.c:868
 #, c-format
-msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
-msgstr "送信するメッセージを暗号化できません: このアカウントに対して暗号化された証明書がセットされていません"
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"送信するメッセージを暗号化できません: このアカウントに対して暗号化された証明"
+"書がセットされていません"
 
-#: ../composer/e-msg-composer.c:1569 ../composer/e-msg-composer.c:1981
+#: ../src/composer/e-msg-composer.c:1606 ../src/composer/e-msg-composer.c:2412
 msgid "Compose Message"
 msgstr "メッセージの作成"
 
-#: ../composer/e-msg-composer.c:4243
+#: ../src/composer/e-msg-composer.c:4763
 msgid "The composer contains a non-text message body, which cannot be edited."
-msgstr "メール作成ウィンドウのメッセージの中に編集のできない、文字列ではないものが含まれています。"
-
-#: ../composer/e-msg-composer.c:4943
-msgid "Untitled Message"
-msgstr "タイトルなしのメッセージ"
+msgstr ""
+"メール作成ウィンドウのメッセージの中に編集のできない、文字列ではないものが含"
+"まれています。"
 
-#: ../composer/mail-composer.error.xml.h:1
-msgid "You cannot attach the file &quot;{0}&quot; to this message."
+#: ../src/composer/mail-composer.error.xml.h:1
+#, fuzzy
+#| msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgid "You cannot attach the file “{0}” to this message."
 msgstr "このメッセージにファイル &quot;{0}&quot; を添付できません。"
 
-#: ../composer/mail-composer.error.xml.h:2
-msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+#: ../src/composer/mail-composer.error.xml.h:2
+#, fuzzy
+#| msgid ""
+#| "The file '{0}' is not a regular file and cannot be sent in a message."
+msgid "The file “{0}” is not a regular file and cannot be sent in a message."
 msgstr "'{0}' は通常のファイルではないのでメッセージで送信できません。"
 
-#: ../composer/mail-composer.error.xml.h:3
+#: ../src/composer/mail-composer.error.xml.h:3
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "{0}から添付されたメッセージを受け取れませんでした。"
 
-#: ../composer/mail-composer.error.xml.h:4
-msgid "Because &quot;{1}&quot;."
-msgstr "原因は &quot;{1}&quot; です。"
+#: ../src/composer/mail-composer.error.xml.h:4
+#: ../src/e-util/e-system.error.xml.h:5
+#, fuzzy
+#| msgid "Because \"{1}\"."
+msgid "Because “{1}”."
+msgstr "原因は \"{1}\" です。"
 
-#: ../composer/mail-composer.error.xml.h:5
+#: ../src/composer/mail-composer.error.xml.h:5
 msgid "Do you want to recover unfinished messages?"
 msgstr "完了していないメッセージを復旧しますか?"
 
-#: ../composer/mail-composer.error.xml.h:6
-msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow 
you to continue where you left off."
-msgstr "新しいメッセージを作成する際に Evolution が不意に終了しました。メッセージを復旧すると、作成していたところから続行できるかもしれません。"
+#: ../src/composer/mail-composer.error.xml.h:6
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+"新しいメッセージを作成する際に Evolution が不意に終了しました。メッセージを復"
+"旧すると、作成していたところから続行できるかもしれません。"
 
-#: ../composer/mail-composer.error.xml.h:7
+#: ../src/composer/mail-composer.error.xml.h:7
 msgid "_Do not Recover"
 msgstr "復旧しない(_D)"
 
-#: ../composer/mail-composer.error.xml.h:8
+#: ../src/composer/mail-composer.error.xml.h:8
 msgid "_Recover"
 msgstr "復旧する(_R)"
 
-#: ../composer/mail-composer.error.xml.h:9
-msgid "Could not save to autosave file &quot;{0}&quot;."
+#: ../src/composer/mail-composer.error.xml.h:9
+#, fuzzy
+#| msgid "Could not save to autosave file &quot;{0}&quot;."
+msgid "Could not save to autosave file “{0}”."
 msgstr "&quot;{0}&quot; という自動保存のファイルを保存できませんでした。"
 
-#: ../composer/mail-composer.error.xml.h:10
-msgid "Error saving to autosave because &quot;{1}&quot;."
+#: ../src/composer/mail-composer.error.xml.h:10
+#, fuzzy
+#| msgid "Error saving to autosave because &quot;{1}&quot;."
+msgid "Error saving to autosave because “{1}”."
 msgstr "自動保存する際にエラーが発生しました: &quot;{1}&quot;"
 
-#: ../composer/mail-composer.error.xml.h:11
-msgid "Download in progress. Do you want to send the mail?"
-msgstr "ダウンロード中です。メッセージを送信しますか?"
-
-#: ../composer/mail-composer.error.xml.h:12
-msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent 
without those pending attachments "
-msgstr " ダウンロードした添付ファイルはほとんどありません。このままメッセージを送信すると \"添付ファイルなし\" として送信されることになります。 "
-
-#: ../composer/mail-composer.error.xml.h:14
-msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
+#: ../src/composer/mail-composer.error.xml.h:11
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to discard the message, titled '{0}', you are "
+#| "composing?"
+msgid ""
+"Are you sure you want to discard the message, titled “{0}”, you are "
+"composing?"
 msgstr "本当に作成途中のメッセージ (件名: '{0}') を破棄してもよろしいですか?"
 
-#: ../composer/mail-composer.error.xml.h:15
-msgid "Closing this composer window will discard the message permanently, unless you choose to save the 
message in your Drafts folder. This will allow you to continue the message at a later date."
-msgstr "このウィンドウを閉じると、編集中のメッセージを完全に抹消することになります。ここで保存しておくと、後でメッセージの作成を続行することができます。"
+#: ../src/composer/mail-composer.error.xml.h:12
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
+msgstr ""
+"このウィンドウを閉じると、編集中のメッセージを完全に抹消することになります。"
+"ここで保存しておくと、後でメッセージの作成を続行することができます。"
 
 #. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:18
+#: ../src/composer/mail-composer.error.xml.h:15
 msgid "_Continue Editing"
 msgstr "編集を続行する(_C)"
 
-#: ../composer/mail-composer.error.xml.h:19
+#: ../src/composer/mail-composer.error.xml.h:16
 msgid "_Save Draft"
 msgstr "下書きを保存する(_S)"
 
-#: ../composer/mail-composer.error.xml.h:20
+#: ../src/composer/mail-composer.error.xml.h:17
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to discard the message, titled '{0}', you are "
+#| "composing?"
+msgid "Are you sure you want to discard the message you are composing?"
+msgstr "本当に作成途中のメッセージ (件名: '{0}') を破棄してもよろしいですか?"
+
+#: ../src/composer/mail-composer.error.xml.h:18
 msgid "Could not create message."
 msgstr "メッセージを作成できませんでした。"
 
-#: ../composer/mail-composer.error.xml.h:21
-msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr "&quot;{0}&quot; のため、別のメールオプションを選択した方が良いかもしれません。"
+#: ../src/composer/mail-composer.error.xml.h:19
+#, fuzzy
+#| msgid ""
+#| "Because &quot;{0}&quot;, you may need to select different mail options."
+msgid ""
+"You may need to select different mail options.\n"
+"\n"
+"Detailed error: {0}"
+msgstr ""
+"&quot;{0}&quot; のため、別のメールオプションを選択した方が良いかもしれませ"
+"ん。"
 
-#: ../composer/mail-composer.error.xml.h:22
-msgid "Could not read signature file &quot;{0}&quot;."
+#: ../src/composer/mail-composer.error.xml.h:22
+#, fuzzy
+#| msgid "Could not read signature file &quot;{0}&quot;."
+msgid "Could not read signature file “{0}”."
 msgstr "&quot;{0}&quot; という署名ファイルを読み込めませんでした。"
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../src/composer/mail-composer.error.xml.h:23
 msgid "All accounts have been removed."
 msgstr "すべてのアカウントが削除されています。"
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../src/composer/mail-composer.error.xml.h:24
 msgid "You need to configure an account before you can compose mail."
 msgstr "メールを作成する前にアカウントを設定してください。"
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../src/composer/mail-composer.error.xml.h:25
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "送信トレイに保存する際にエラーが発生しました。"
 
-#: ../composer/mail-composer.error.xml.h:26
-msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
-msgstr "&quot;{0}&quot; というエラーが報告されました。メッセージは送信されていません。"
+#: ../src/composer/mail-composer.error.xml.h:26
+#, fuzzy
+#| msgid ""
+#| "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgid "The reported error was “{0}”. The message has not been sent."
+msgstr ""
+"&quot;{0}&quot; というエラーが報告されました。メッセージは送信されていませ"
+"ん。"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../src/composer/mail-composer.error.xml.h:27
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "下書きフォルダーへの保存の際にエラーが発生しました。"
 
-#: ../composer/mail-composer.error.xml.h:28
-msgid "The reported error was &quot;{0}&quot;. The message has most likely not been saved."
-msgstr "&quot;{0}&quot; というエラーが報告されました。メッセージはおそらく保存されていません。"
+#: ../src/composer/mail-composer.error.xml.h:28
+#, fuzzy
+#| msgid ""
+#| "The reported error was &quot;{0}&quot;. The message has most likely not "
+#| "been saved."
+msgid ""
+"The reported error was “{0}”. The message has most likely not been saved."
+msgstr ""
+"&quot;{0}&quot; というエラーが報告されました。メッセージはおそらく保存されて"
+"いません。"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../src/composer/mail-composer.error.xml.h:29
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "送信中にエラーが発生しました。 どうしますか?"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:156
-msgid "The reported error was &quot;{0}&quot;."
+#: ../src/composer/mail-composer.error.xml.h:30
+#: ../src/mail/mail.error.xml.h:175
+#, fuzzy
+#| msgid "The reported error was &quot;{0}&quot;."
+msgid "The reported error was “{0}”."
 msgstr "&quot;{0}&quot; というエラーが報告されました。"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../src/composer/mail-composer.error.xml.h:31
 msgid "_Save to Outbox"
 msgstr "送信トレイに保存(_S)"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../src/composer/mail-composer.error.xml.h:32
 msgid "_Try Again"
 msgstr "再度試す(_T)"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../src/composer/mail-composer.error.xml.h:33
 msgid "Your message was sent, but an error occurred during post-processing."
-msgstr "メッセージは送信されました。しかしエラーが送信後の処理中に発生しました。"
+msgstr ""
+"メッセージは送信されました。しかしエラーが送信後の処理中に発生しました。"
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../src/composer/mail-composer.error.xml.h:34
 msgid "Saving message to Outbox."
 msgstr "メッセージを送信トレイに保存中。"
 
-#: ../composer/mail-composer.error.xml.h:35
-msgid "The message will be saved to your local Outbox folder, because the destination service is currently 
unavailable. You can send the message by clicking the Send/Receive button in Evolution's toolbar."
-msgstr "対象サービスが現在利用できないため、メッセージはローカルの送信トレイのフォルダーに保存されました。Evolution のツールバーの送信/受信ボタンを押すことで送信できます。"
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:1
-msgid "Evolution Alarm Notify"
-msgstr "Evolution アラーム通知"
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:2
-msgid "Calendar event notifications"
-msgstr "カレンダーのイベント通知"
-
-#: ../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:82
-msgid "Groupware Suite"
-msgstr "グループウェアスイートです。"
-
-#: ../data/evolution.desktop.in.in.h:3
-msgid "Evolution Mail and Calendar"
-msgstr "Evolution のメールとカレンダー"
-
-#: ../data/evolution.desktop.in.in.h:4
-msgid "Manage your email, contacts and schedule"
-msgstr "メールや連絡先、予定などを管理します"
-
-#: ../data/evolution.desktop.in.in.h:5
-msgid "email;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"
-msgstr "アドレスの表示形式を有効にする"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
-msgid "Whether addresses should be formatted according to standard in their destination country"
-msgstr "アドレスを送信先の国の標準に合わせた形式にするかどうか"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
-msgid "Autocomplete length"
-msgstr "自動補完の長さ"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
-msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
-msgstr "Evolution が自動補完を行う前に入力しておく必要のある文字数です。"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
-msgid "Show autocompleted name with an address"
-msgstr "自動補完した連絡先にメールアドレスを付けるかどうか"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
-msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
-msgstr "エントリで自動補完した連絡先の名前にメールアドレスを強制的に表示するかどうかです。"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
-msgid "URI for the folder last used in the select names dialog"
-msgstr "名前選択ダイアログで最後に使用したフォルダーの URI"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
-msgid "URI for the folder last used in the select names dialog."
-msgstr "名前選択ダイアログで最後に使用したフォルダーの URI です。"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
-msgid "Contact layout style"
-msgstr "連絡先のレイアウトスタイル"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
-msgid "The layout style determines where to place the preview pane in relation to the contact list. \"0\" 
(Classic View) places the preview pane below the contact list. \"1\" (Vertical View) places the preview pane 
next to the contact list."
-msgstr "レイアウトスタイルの値によって、プレビューペインは連絡先の一覧に対してどこに配置されるかが決まります。\"0\" (クラシックビュー) だとプレビューペインは連絡先の一覧の下に配置されます。\"1\" 
(垂直ビュー) はプレビューペインは連絡先の一覧の隣に配置されます。"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
-msgid "Contact preview pane position (horizontal)"
-msgstr "連絡先のプレビューペインの位置 (水平)"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
-msgid "Position of the contact preview pane when oriented horizontally."
-msgstr "水平に配置した時の連絡先のプレビューペインの位置です。"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
-msgid "Contact preview pane position (vertical)"
-msgstr "連絡先のプレビューペインの位置 (垂直)"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
-msgid "Position of the contact preview pane when oriented vertically."
-msgstr "垂直に配置した時の連絡先のプレビューペインの位置です。"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
-msgid "Show maps"
-msgstr "mapを表示する"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
-msgid "Whether to show maps in preview pane"
-msgstr "プレビューペインにmapを表示するかどうか"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
-msgid "Primary address book"
-msgstr "主アドレス帳"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:18
-msgid "The UID of the selected (or \"primary\") address book in the sidebar of the \"Contacts\" view"
-msgstr "「連絡先」ビューのサイドバーに選択されたアドレス帳 (あるいは主アドレス帳) の UID"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
-msgid "Show preview pane"
-msgstr "プレビューペインを表示するかどうか"
-
-#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
-msgid "Whether to show the preview pane."
-msgstr "プレビューペインを表示するかどうかです。"
-
-#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr "メールの本文を Unicode に変換するかどうか"
-
-#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
-msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
-msgstr "メールの本文を Unicode の UTF-8 に変換して、いろいろな文字集合から構成された \"スパム\" や \"ハム\" の語句を一元化するかどうかです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
-msgid "Save directory for reminder audio"
-msgstr "リマインダー音のファイルを保存するディレクトリ"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
-msgid "Directory for saving reminder audio files"
-msgstr "リマインダー音のファイルを保存するディレクトリ"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
-msgid "Birthday and anniversary reminder value"
-msgstr "誕生日と記念日のリマインダーの値"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:4
-msgid "Number of units for determining a birthday or anniversary reminder"
-msgstr "誕生日や記念日のリマインダーを決定する単位の数。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
-msgid "Birthday and anniversary reminder units"
-msgstr "誕生日と記念日のリマインダーの単位"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
-msgid "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or \"days\""
-msgstr "誕生日や記念日のリマインダーの単位。\"minutes\"、\"hours\" または \"days\"。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
-msgid "Compress weekends in month view"
-msgstr "月間ビューで週末を丸めるかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
-msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one 
weekday"
-msgstr "月間ビューで週末を短く表示 (土曜日と日曜日をまとめて表示) するかどうかです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
-msgid "Ask for confirmation when deleting items"
-msgstr "アイテムを削除する時に確認するかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
-msgid "Whether to ask for confirmation when deleting an appointment or task"
-msgstr "予定またはタスクを削除する際に確認するかどうかです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
-msgid "Confirm expunge"
-msgstr "抹消する前に確認するかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
-msgid "Whether to ask for confirmation when expunging appointments and tasks"
-msgstr "予定とタスクを抹消 (完全に削除) する際に確認するかどうかです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
-msgid "Month view vertical pane position"
-msgstr "月間ビューの垂直ペインの位置"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
-msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar"
-msgstr "カレンダービューとカレンダー本体とを分割する垂直ペインの位置です。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
-msgid "Workday end hour"
-msgstr "平日の終了時刻 (時)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:16
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
-msgstr "平日の終了時刻 (24時間制の書式: 0〜23) です。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
-msgid "Workday end minute"
-msgstr "平日の終了時刻 (分)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
-msgid "Minute the workday ends on, 0 to 59."
-msgstr "平日の終了時刻 (分: 0〜59) です。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
-msgid "Workday start hour"
-msgstr "平日の開始時刻 (時)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
-msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr "平日の開始時刻 (24時間制の書式: 0〜23) です。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
-msgid "Workday start minute"
-msgstr "平日の開始時刻 (分)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
-msgid "Minute the workday starts on, 0 to 59."
-msgstr "平日の開始時刻 (分: 0〜59) です。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-msgid "The second timezone for a Day View"
-msgstr "日間ビューで表示する2番目のタイムゾーン"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
-msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key"
-msgstr "日間ビューで表示する2番目のタイムゾーンで、'timezone' キーで指定した値と同じ形式にしてください。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
-msgid "Recently used second time zones in a Day View"
-msgstr "日間ビューで現在使用している2番目のタイムゾーン"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
-msgid "List of recently used second time zones in a Day View"
-msgstr "日間ビューで現在使用しているタイムゾーンのリストです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
-msgid "Maximum number of recently used timezones to remember"
-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' の中で同時に使用するタイムゾーンの個数 (最大値) です。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
-msgid "Default reminder value"
-msgstr "リマインダーのデフォルトの値"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
-msgid "Number of units for determining a default reminder"
-msgstr "デフォルトのリマインダーを決定する単位の数。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
-msgid "Default reminder units"
-msgstr "リマインダーの単位 (デフォルト)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
-msgstr "デフォルトのリマインダーの単位。\"minutes\"、\"hours\" または \"days\"。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
-msgid "Show categories field in the event/meeting/task editor"
-msgstr "イベント/会議/タスクエディターの中にカテゴリを表示するかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr "イベント/会議のエディターでカテゴリの項目を表示するかどうかです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
-msgid "Show Role field in the event/task/meeting editor"
-msgstr "イベント/タスク/会議エディターの中に役割を表示するかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
-msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "イベント/タスク/会議のエディターで役割の項目を表示するかどうかです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "イベント/タスク/会議エディターの中に RSVP を表示するかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
-msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "イベント/タスク/会議のエディターで RSVP の項目を表示するかどうかです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
-msgid "Show status field in the event/task/meeting editor"
-msgstr "イベント/タスク/会議エディターの中にステータスを表示するかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "イベント/タスク/会議のエディターでステータスの項目を表示するかどうかです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
-msgid "Show timezone field in the event/meeting editor"
-msgstr "イベント/会議エディターの中にタイムゾーンを表示するかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "イベント/会議のエディターでタイムゾーンの項目を表示するかどうかです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
-msgid "Show type field in the event/task/meeting editor"
-msgstr "イベント/タスク/会議エディターの中に種類を表示するかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
-msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "イベント/タスク/会議のエディターで種類の項目を表示するかどうかです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
-msgid "Hide completed tasks"
-msgstr "完了したタスクを隠すかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
-msgid "Whether to hide completed tasks in the tasks view"
-msgstr "タスクビューで完了したタスクを隠すかどうかです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
-msgid "Hide task units"
-msgstr "隠すタスクの単位"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
-msgstr "タスクを隠すときを決定する単位。\"minutes\"、\"hours\" または \"days\"。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
-msgid "Hide task value"
-msgstr "タスクの値を隠すかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
-msgid "Number of units for determining when to hide tasks"
-msgstr "いつタスクを隠すかを決定する単位の数。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
-msgid "Horizontal pane position"
-msgstr "水平方向ペインの位置"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
-msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in 
the month view, in pixels"
-msgstr "月間ビュー以外でカレンダーとタスクの一覧の間にある水平方向ペインの位置です (ピクセル単位)。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
-msgid "Last reminder time"
-msgstr "最後のリマインダー時刻"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
-msgid "Time the last reminder ran, in time_t"
-msgstr "最後にリマインダーを表示した時間 (time_t 単位) です。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
-msgid "Marcus Bains Line Color - Day View"
-msgstr "Marcus Bains Line の色 - 日間ビュー"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
-msgid "Color to draw the Marcus Bains line in the Day View"
-msgstr "日間ビューの中に描画する \"Marcus Bains line\" の色です。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
-msgid "Marcus Bains Line Color - Time bar"
-msgstr "Marcus Bains Line の色 - 時間バー"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
-msgstr "時間バーの中に描画する \"Marcus Bains Line\" の色です (デフォルトは空)。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
-msgid "Marcus Bains Line"
-msgstr "Marcus Bains Line を表示するかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
-msgstr "カレンダーの中に \"Marcus Bains Line\" (現在時刻での線) を描画するかどうかです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
-msgid "Memo preview pane position (horizontal)"
-msgstr "メモのプレビューペインの位置 (水平)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
-msgid "Position of the task preview pane when oriented horizontally"
-msgstr "水平方向に配置された場合のメモのプレビューペインの位置です。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
-msgid "Memo layout style"
-msgstr "メモのレイアウトスタイル"
-
-# /apps/evolution/calendar/display/memo_layout
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
-msgid "The layout style determines where to place the preview pane in relation to the memo list. \"0\" 
(Classic View) places the preview pane below the memo list. \"1\" (Vertical View) places the preview pane 
next to the memo list"
-msgstr "レイアウトスタイルの値によって、プレビューペインはメモの一覧に対してどこに配置されるかが決まります。\"0\" (クラシックビュー) だとプレビューペインはメモの一覧の下に配置されます。\"1\" 
(垂直ビュー) はプレビューペインはメモの一覧の隣に配置されます。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
-msgid "Memo preview pane position (vertical)"
-msgstr "メモのプレビューペインの位置 (垂直)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
-msgid "Position of the memo preview pane when oriented vertically"
-msgstr "垂直方向に配置された場合のメモのプレビューペインの位置です。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
-msgid "Month view horizontal pane position"
-msgstr "月間ビューの水平ペインの位置"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
-msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in 
the month view, in pixels"
-msgstr "月間ビュー以外でビューとカレンダーとタスクの一覧の間にある水平方向ペインの位置です (ピクセル単位)。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
-msgid "Scroll Month View by a week, not by a month"
-msgstr "月間ビューを月単位でなく、週単位でスクロールするかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
-msgid "Whether to scroll a Month View by a week, not by a month"
-msgstr "月間ビューを月単位でなく、週単位でスクロールするかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
-msgid "Reminder programs"
-msgstr "リマインダープログラム"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
-msgid "Programs that are allowed to be run by reminders"
-msgstr "リマインダーが実行するプログラムです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
-msgid "Show display reminders in notification tray"
-msgstr "パネルの通知領域にリマインダーを表示するかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
-msgid "Whether or not to use the notification tray for display reminders"
-msgstr "リマインダーを表示する際に \"パネルの通知領域\" を利用するかどうかです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
-msgid "Preferred New button item"
-msgstr "新しいボタンの望ましい項目"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
-msgid "Name of the preferred New toolbar button item"
-msgstr "新しいツールバーボタンの望ましい項目の名前"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
-msgid "Primary calendar"
-msgstr "優先カレンダー"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
-msgid "The UID of the selected (or \"primary\") calendar in the sidebar of the \"Calendar\" view"
-msgstr "「カレンダー」ビューのサイドバーに表示する選択した(あるいは主)カレンダーの一覧の UID"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
-msgid "Primary memo list"
-msgstr "優先メモの一覧"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
-msgid "The UID of the selected (or \"primary\") memo list in the sidebar of the \"Memos\" view"
-msgstr "「メモ」ビューのサイドバーに表示する選択した(あるいは主)メモの一覧の UID"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
-msgid "Primary task list"
-msgstr "優先タスクの一覧"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
-msgid "The UID of the selected (or \"primary\") task list in the sidebar of the \"Tasks\" view"
-msgstr "「タスク」ビューのサイドバーに表示する選択した(あるいは主)タスクの一覧の UID"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
-msgid "Free/busy template URL"
-msgstr "スケジュールテンプレートの URL"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
-#, no-c-format
-msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail 
address and %d is replaced by the domain"
-msgstr "スケジュールデータの代替えとして使用する URL テンプレートでは、%u はメールアドレスのユーザー部分に、%d はドメイン名にそれぞれ置き換えられます。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
-msgid "Recurrent Events in Italic"
-msgstr "繰り返しの日付をイタリック体で"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
-msgid "Show days with recurrent events in italic font in bottom left calendar"
-msgstr "繰り返しのイベントをカレンダーの左下にイタリック体で表示する。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
-msgid "Search range for time-based searching in years"
-msgstr "年単位で時間を元に検索する範囲"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
-msgid "How many years can the time-based search go forward or backward from currently selected day when 
searching for another occurrence; default is ten years"
-msgstr "他の出来事を検索するときに現在選択している日を基準に前後何年間を検索対象とするか。デフォルトは10年です。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
-msgid "Show appointment end times in week and month views"
-msgstr "週間と月間ビューの中に予定の期日を表示するかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
-msgid "Whether to display the end time of events in the week and month views"
-msgstr "週間と月間ビューで予定の期日を表示するかどうかです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
-msgid "Show the memo preview pane"
-msgstr "メモのプレビューペインを表示"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
-msgid "If \"true\", show the memo preview pane in the main window"
-msgstr "\"true\" ならば、メインウインドウにメモのプレビューペインを表示します。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
-msgid "Show the task preview pane"
-msgstr "タスクのプレビューペインを表示"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
-msgid "If \"true\", show the task preview pane in the main window"
-msgstr "\"true\" ならば、メインウインドウにタスクのプレビューペインを表示します。"
-
-# 翻訳メモ: "Date Navigator" は "Date Navigator Calendar" の略か?
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
-msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
-msgstr "日間ビューと平日ビューとカレンダーで週番号を表示するかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
-msgid "Whether to show week numbers in various places in the Calendar"
-msgstr "カレンダーの各所に週番号を表示するかどうかです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
-msgid "Vertical position for the tag pane"
-msgstr "タグペインの垂直方向の位置"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
-msgid "Highlight tasks due today"
-msgstr "今日が期限のタスクの強調表示"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
-msgid "Whether highlight tasks due today with a special color (task-due-today-color)"
-msgstr "今日が期限のタスクを特別な色で強調表示するかどうか (task-due-today-color)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
-msgid "Tasks due today color"
-msgstr "今日が期限のタスクの色"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format. Used together with 
task-due-today-highlight"
-msgstr "今日が期限のタスクの背景色です (書式は \"#rrggbb\")。task-due-today-highlight と組み合わせて使われます。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
-msgid "Task preview pane position (horizontal)"
-msgstr "タスクのプレビューペインの位置 (水平)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
-msgid "Task layout style"
-msgstr "タスクのレイアウトスタイル"
-
-# /apps/evolution/calendar/display/task_layout
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
-msgid "The layout style determines where to place the preview pane in relation to the task list. \"0\" 
(Classic View) places the preview pane below the task list. \"1\" (Vertical View) places the preview pane 
next to the task list"
-msgstr "レイアウトスタイルの値によって、プレビューペインはタスクの一覧に対してどこに配置されるかが決まります。\"0\" (クラシックビュー) だとプレビューペインはタスクの一覧の下に配置されます。\"1\" 
(垂直ビュー) ではプレビューペインはタスクの一覧の隣に配置されます。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
-msgid "Task preview pane position (vertical)"
-msgstr "タスクのプレビューペインの位置 (垂直)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
-msgid "Position of the task preview pane when oriented vertically"
-msgstr "垂直方向に配置された場合のタスクプレビューのペインの位置です。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
-msgid "Highlight overdue tasks"
-msgstr "期限を過ぎたタスクの色"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
-msgid "Whether highlight overdue tasks with a special color (task-overdue-color)"
-msgstr "期限を過ぎたタスクを特別な色で強調表示するかどうか (task-overdue-color)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
-msgid "Overdue tasks color"
-msgstr "期限を過ぎたタスクの色"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format. Used together with 
task-overdue-highlight."
-msgstr "期限が過ぎたタスクの背景色です (書式は \"#rrggbb\")。task-overdue-highlight と組み合わせて使われます。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
-msgid "Time divisions"
-msgstr "時分割の単位"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
-msgid "Intervals shown in Day and Work Week views, in minutes"
-msgstr "日間と平日ビューで表示する時間の間隔 (分単位) です。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
-msgid "Timezone"
-msgstr "タイムゾーン"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
-msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olson timezone 
database location like \"America/New York\""
-msgstr "カレンダーの日付と時刻で使用するタイムゾーンのデフォルト値で、Olsen タイムゾーンデータベースの場所 (例: \"America/New York\") です。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
-msgid "Twenty four hour time format"
-msgstr "時刻の書式を24時間制にするかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
-msgid "Whether to show times in twenty four hour format instead of using am/pm"
-msgstr "時刻を午前/午後の代わりに 24時間制で表示するかどうかです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
-msgid "Birthday and anniversary reminder"
-msgstr "誕生日と記念日のリマインダー"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
-msgid "Whether to set a reminder for birthdays and anniversaries"
-msgstr "誕生日や記念日にリマインダーを指定するかどうか。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
-msgid "Default appointment reminder"
-msgstr "デフォルトで予定のリマインダーを指定するかどうか"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
-msgid "Whether to set a default reminder for appointments"
-msgstr "予定にデフォルトのリマインダーを指定するかどうかです。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
-msgid "Use system timezone"
-msgstr "システムのタイムゾーンを使用する"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
-msgid "Use the system timezone instead of the timezone selected in Evolution"
-msgstr "Evolution で選択したタイムゾーンではなく、システムのタイムゾーンを使用する"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-msgid "First day of the week"
-msgstr "週の開始日"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
-msgid "Monday is a work day"
-msgstr "月曜日は作業日"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-msgid "Tuesday is a work day"
-msgstr "火曜日は作業日"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
-msgid "Wednesday is a work day"
-msgstr "水曜日は作業日"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
-msgid "Thursday is a work day"
-msgstr "木曜日は作業日"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
-msgid "Friday is a work day"
-msgstr "金曜日は作業日"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
-msgid "Saturday is a work day"
-msgstr "土曜日は作業日"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
-msgid "Sunday is a work day"
-msgstr "日曜日は作業日"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
-msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
-msgstr "(非推奨) 一週間の始まりを表す曜日で、日曜日 (0) から土曜日 (6) で指定します。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
-msgid "This key was deprecated in version 3.10 and should no longer be used. Use \"week-start-day-name\" 
instead."
-msgstr "このキーはバージョン 3.10 で非推奨となっていて、もう使うべきではありません。\"week-start-day-name\" を代わりに使ってください。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
-msgid "(Deprecated) Work days"
-msgstr "(非推奨) 作業日"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
-msgid "Days on which the start and end of work hours should be indicated. (This key was deprecated in 
version 3.10 and should no longer be used. Use the \"work-day-monday\", \"work-day-tuesday\", etc. keys 
instead.)"
-msgstr "平日の開始/終了時刻を表示する日数です。(このキーはバージョン 3.10 で非推奨となっていて、もう使うべきではありません。\"work-day-monday\" や 
\"work-day-tuesday\" 等のキーを代わりに使ってください。)"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:1
-msgid "Previous Evolution version"
-msgstr "Evolution の以前のバージョン"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:2
-msgid "The most recently used version of Evolution, expressed as \"major.minor.micro\". This is used for 
data and settings migration from older to newer versions."
-msgstr "これは最も最近まで利用していた Evolution のバージョンで、\"主.副.細\" の形式で表します。これは古いバージョンからもっと新しいバージョンにデータや設定を移行するのに利用されます。"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:3
-msgid "List of disabled plugins"
-msgstr "無効にされているプラグイン一覧"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:4
-msgid "The list of disabled plugins in Evolution"
-msgstr "Evolution で無効にされているプラグインの一覧"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:5
-msgid "The window's X coordinate"
-msgstr "デフォルトのウィンドウの横方向の統合"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:6
-msgid "The window's Y coordinate"
-msgstr "デフォルトのウィンドウの縦方向の統合"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:7
-msgid "The window's width in pixels"
-msgstr "ウィンドウの幅 (単位ピクセル)"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:8
-msgid "The window's height in pixels"
-msgstr "ウィンドウの高さ (単位ピクセル)"
-
-#: ../data/org.gnome.evolution.gschema.xml.in.h:9
-msgid "Whether the window is maximized"
-msgstr "ウィンドウが最大化されているかどうか"
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
-msgid "Gnome Calendar's calendar import done"
-msgstr "Gnome Calendar のカレンダー取り込み完了"
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
-msgid "Whether calendar from Gnome Calendar has been imported or not"
-msgstr "Gnome Calendar からのカレンダー取り込みが完了しているかどうか"
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
-msgid "Gnome Calendar's tasks import done"
-msgstr "Gnome Calendar のタスク取り込み完了"
-
-#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
-msgid "Whether tasks from Gnome Calendar have been imported or not"
-msgstr "Gnome Calendar からのタスク取り込みが完了しているかどうか"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "デフォルトのメーラーをチェックするかどうか"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
-msgid "Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "Evolution を起動するたびに、デフォルトのメーラーかどうかを確認します。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
-msgid "Default charset in which to compose messages"
-msgstr "メッセージ作成時のデフォルトの文字集合"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-msgid "Default charset in which to compose messages."
-msgstr "メッセージを作成する際に使用するデフォルトの文字集合です。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
-msgid "Path where picture gallery should search for its content"
-msgstr "画像ギャラリの内容を検索する場所のパス"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
-msgid "This value can be an empty string, which means it'll use the system Picture folder, usually set to 
~/Pictures. This folder will be also used when the set path is not pointing to the existent folder"
-msgstr "この値は空文字列でも構いません。その場合はシステムの画像フォルダー (普通は ~/Pictures ) を使います。指定されたパスが存在していないフォルダーを指していた場合にも使われます。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
-msgid "Spell check inline"
-msgstr "インラインでスペルをチェックするかどうか"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
-msgid "Draw spelling error indicators on words as you type."
-msgstr "必要であれば入力した単語の上にスペル間違いを表すマークを描画します。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
-msgid "Automatic link recognition"
-msgstr "リンクを自動的に識別するかどうか"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
-msgid "Recognize links in text and replace them."
-msgstr "文字列の中に含まれているリンク情報を識別して URI タグで置き換えます。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
-msgid "Automatic emoticon recognition"
-msgstr "スマイリーを自動的に識別するかどうか"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-msgid "Recognize emoticons in text and replace them with images."
-msgstr "文字列の中に含まれているスマイリーの情報を識別して画像に置き換えるかどうかです。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
-msgid "Attribute message"
-msgstr "属性メッセージ"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
-msgid "The text that is inserted when replying to a message, attributing the message to the original author"
-msgstr "メッセージに返信する時に挿入されるテキストで、元のメッセージの送信者を表わすメッセージです。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
-msgid "Forward message"
-msgstr "転送メッセージ"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
-msgid "The text that is inserted when forwarding a message, saying that the forwarded message follows"
-msgstr "メッセージを転送する時に挿入されるテキスト。続きに転送しようとするメッセージがあることを示すものです。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
-msgid "Original message"
-msgstr "オリジナルのメッセージ。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
-msgid "The text that is inserted when replying to a message (top posting), saying that the original message 
follows"
-msgstr "メッセージに返信する時に挿入されるテキスト。続きに元のメッセージがあることを示すものです。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
-msgid "Group Reply replies to list"
-msgstr "「グループに返信」でメーリングリストへ返信"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
-msgid "Instead of the normal \"Reply to All\" behaviour, this option will make the 'Group Reply' toolbar 
button try to reply only to the mailing list through which you happened to receive the copy of the message to 
which you're replying."
-msgstr 
"通常の「全員へ返信」の動作の代わりに、このオプションではツールバーの「グループへ返信」のボタンをメーリングリストにのみ返信できるようにします。それによってメーリングリスト経由で返信したメールのメッセージのコピーを受け取ってしまったりしないようにします。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
-msgid "Put the cursor at the bottom of replies"
-msgstr "返信時は最下部で入力を開始する"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
-msgid "Users get all up in arms over where the cursor should go when replying to a message. This determines 
whether the cursor is placed at the top of the message or the bottom."
-msgstr "ユーザーはメッセージに返信するとき、カーソルがどこにいってしまったのかに対してとても神経質です。これはカーソルがメッセージの上か、それとも下のどちらに移動するかを決定します。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
-msgid "Always request read receipt"
-msgstr "常に開封通知を要求するかどうか"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
-msgid "Whether a read receipt request gets added to every message by default."
-msgstr "デフォルトですべてのメッセージに開封通知の要求を追加するかどうかです。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
-msgid "Send HTML mail by default"
-msgstr "デフォルトで HTML メールを送信するかどうか"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
-msgid "Send HTML mail by default."
-msgstr "デフォルトで HTML 形式のメールを送信するかどうかです。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-msgid "Spell checking color"
-msgstr "スペルチェック結果に付与する色"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-msgid "Underline color for misspelled words when using inline spelling."
-msgstr "インラインのスペルチェックを行っている時につづりが間違っている時に付与する下線の色です。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
-msgid "Spell checking languages"
-msgstr "スペルをチェックする言語"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
-msgid "List of dictionary language codes used for spell checking."
-msgstr "スペルチェックで使用する辞書の言語コードを要素とするリストです。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
-msgid "Show \"Bcc\" field when sending a mail message"
-msgstr "メールを送る時に \"Bcc\" フィールドを表示する"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
-msgid "Show the \"Bcc\" field when sending a mail message. This is controlled from the View menu when a mail 
account is chosen."
-msgstr "メールを送る時に、\"Bcc\" フィールドを表示します。メールのアカウントを選択した時に、「表示」メニューからコントロールできます。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
-msgid "Show \"Cc\" field when sending a mail message"
-msgstr "メールを送る時に \"Cc\" フィールドを表示する"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-msgid "Show the \"Cc\" field when sending a mail message. This is controlled from the View menu when a mail 
account is chosen."
-msgstr "メールを送る時に、\"Cc\" フィールドを表示します。メールのアカウントを選択した時に、「表示」メニューからコントロールできます。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
-msgid "Show \"Reply To\" field when sending a mail message"
-msgstr "メールを送信する時に \"Reply To\" フィールドを表示する"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
-msgid "Show the \"Reply To\" field when sending a mail message. This is controlled from the View menu when a 
mail account is chosen."
-msgstr "メールを送る時に、\"Reply-To\" フィールドを表示します。メールのアカウントを選択した時に、「表示」メニューからコントロールできます。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-msgid "Show \"From\" field when posting to a newsgroup"
-msgstr "ニュースグループに投稿する時に \"From\" フィールドを表示する"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-msgid "Show the \"From\" field when posting to a newsgroup. This is controlled from the View menu when a 
news account is chosen."
-msgstr "ニュースグループに投稿する時に、\"From\" フィールドを表示します。NetNews のアカウントを選択した時に、「表示」メニューからコントロールできます。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
-msgid "Show \"Reply To\" field when posting to a newsgroup"
-msgstr "ニュースグループに投稿する時に \"Reply To\" フィールドを表示する"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-msgid "Show the \"Reply To\" field when posting to a newsgroup. This is controlled from the View menu when a 
news account is chosen."
-msgstr "ニュースグループに投稿する時に、\"Reply-To\" フィールドを表示します。NetNews のアカウントを選択した時に、「表示」メニューからコントロールできます。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
-msgid "Digitally sign replies when the original message is signed"
-msgstr "オリジナルのメッセージが署名されている場合デジタル署名して返信する"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
-msgid "Automatically enable PGP or S/MIME signatures when replying to a message which is also PGP or S/MIME 
signed."
-msgstr "PGP や S/MIME で署名されているメッセージに返信する場合は自動で PGP や S/MIME 署名を有効にします。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-msgid "Encode filenames in an Outlook/GMail way"
-msgstr "Outlook/GMail 同様にエンコードしたファイル名を使用するかどうか"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
-msgid "Encode filenames in the mail headers same as Outlook or GMail do, to let them display correctly 
filenames with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the 
incorrect RFC 2047 standard."
-msgstr "メールのヘッダー中のファイル名を Outlook や GMail と同じ方法でエンコードし、Evolution から送る UTF-8 の文字のファイル名が Outlook や GMail 
でも正しく表示できるようにします。Outlook や GMailは RFC 2231 の規格には準拠していませんが、不正確な RFC 2047 の規格を使っています。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
-msgid "Put personalized signatures at the top of replies"
-msgstr "返信の先頭に自分の署名を付けます"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
-msgid "Users get all up in arms over where their signature should go when replying to a message. This 
determines whether the signature is placed at the top of the message or the bottom."
-msgstr "ユーザーはメッセージに返信するとき、署名がどこにいってしまったのかに対してとても神経質です。これは署名がメッセージの上か、それとも下のどちらに配置されるかを決定します。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
-msgid "Do not add signature delimiter"
-msgstr "署名の区切りを追加しない"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
-msgid "Set to TRUE in case you do not want to add signature delimiter before your signature when composing a 
mail."
-msgstr "メール作成時に署名の前に区切り文字を付加したくない時に、TRUE にします"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
-msgid "Ignore list Reply-To:"
-msgstr "メーリングリストの Reply-To: を無視"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
-msgid "Some mailing lists set a Reply-To: header to trick users into sending replies to the list, even when 
they ask Evolution to make a private reply. Setting this option to TRUE will attempt to ignore such Reply-To: 
headers, so that Evolution will do as you ask it. If you use the private reply action, it will reply 
privately, while if you use the 'Reply to List' action it will do that. It works by comparing the Reply-To: 
header with a List-Post: header, if there is one."
-msgstr "メーリングリストによっては、Evolution で私信として返信しようとしても、メーリングリストの側で Reply-To: 
ヘッダーを付けてユーザーの返信をメーリングリスト自身に宛てるよう誘導しています。このオプションを TRUE にすると、そのような Reply-To: ヘッダーを無視し、Evolution 
があなたにどうするのかを確認するようになります。私信として返信するように選択した場合、私信として返信が送られます。一方、「メーリングリストに返信」を選択すると、そうなります。これは Reply-To: 
ヘッダーと、List-Post: ヘッダーが存在しているならば、それらを比較することで実現されます。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
-msgid "List of localized 'Re'"
-msgstr "'Re' の地域化一覧"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
-msgid "Comma-separated list of localized 'Re' abbreviations to skip in a subject text when replying to a 
message, as an addition to the standard \"Re\" prefix. An example is 'SV,AV'."
-msgstr "メッセージに返信するときに件名のテキストとして使う略語 'Re' を地域化した語が、標準的な \"Re\" 以外にあればその一覧をコンマ区切りで。例としては 'SV,AV' 等。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
-msgid "Save file format for drag-and-drop operation"
-msgstr "ドラッグ & ドロップ操作で保存する場合のファイル形式"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
-msgid "Can be either 'mbox' or 'pdf'."
-msgstr "'mbox' または 'pdf' が使えます。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-msgid "Show image animations"
-msgstr "アニメーションを表示する"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-msgid "Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a 
static image instead."
-msgstr "HTML メールでアニメーション画像を有効にする。多くのユーザーはアニメーション画像を鬱陶しいと感じ、静止画像を好みます。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-msgid "Enable or disable type ahead search feature"
-msgstr "インクリメンタル検索の機能を有効にするかどうか"
-
-#: ../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:59
-msgid "Enable or disable magic space bar"
-msgstr "マジックスペースバーを有効にするかどうか"
-
-#: ../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:61
-msgid "Enable to use a similar message list view settings for all folders"
-msgstr "すべてのフォルダーに同様のメッセージの一覧ビューの設定を使う"
-
-#: ../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:63
-msgid "Mark citations in the message \"Preview\""
-msgstr "メッセージの \"プレビュー\" で引用符を表示するかどうか"
-
-#: ../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:65
-msgid "Citation highlight color"
-msgstr "引用を強調表示する時の色"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
-msgid "Citation highlight color."
-msgstr "引用を強調表示する時の色です。"
-
-#: ../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: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:69
-msgid "Default charset in which to display messages"
-msgstr "メッセージ表示時のデフォルトの文字集合"
-
-#: ../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:71
-msgid "Automatically load images for HTML messages over HTTP"
-msgstr "HTML のメッセージにある画像を自動で読み込むかどうか"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
-msgid "Show Animations"
-msgstr "アニメーションを表示するかどうか"
-
-#: ../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:74
-msgid "Show all message headers"
-msgstr "すべてのメッセージヘッダーを表示"
-
-#: ../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:76
-msgid "List of headers to show when viewing a message."
-msgstr "メッセージを表示する時に表示するヘッダー一覧。"
-
-#: ../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:78
-msgid "Show photo of the sender"
-msgstr "送信者の FACE を表示するかどうか"
-
-#: ../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:80
-msgid "Mark as Seen after specified timeout"
-msgstr "指定した時間が経過したら既読マークを付与するかどうか"
-
-#: ../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:82
-msgid "Timeout for marking messages as seen"
-msgstr "既読マークを付与するまでの時間"
-
-#: ../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:84
-msgid "Sender email-address column in the message list"
-msgstr "メッセージの一覧に差出人のアドレスを表示するかどうか"
-
-#: ../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: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: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:88
-msgid "Show deleted messages in the message-list"
-msgstr "メッセージの一覧に削除したメッセージを表示するかどうか"
-
-#: ../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:90
-msgid "Enable Unmatched search folder"
-msgstr "一致していない仮想フォルダーを有効にするかどうか"
-
-#: ../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:92
-msgid "Hides the per-folder preview and removes the selection"
-msgstr "フォルダー毎のプレビューを隠し選択を解除するかどうか"
-
-#: ../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:94
-msgid "Height of the message-list pane"
-msgstr "メッセージの一覧ペインのウィンドウの高さ"
-
-#: ../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:96
-msgid "Whether message headers are collapsed in the user interface"
-msgstr "ユーザーインターフェース内でメッセージのヘッダーを畳んだ状態にするかどうか"
-
-#: ../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:98
-msgid "Width of the message-list pane."
-msgstr "メッセージの一覧ペインの幅です。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
-msgid "Layout style"
-msgstr "レイアウトスタイル"
-
-#: ../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:101
-msgid "Variable width font"
-msgstr "可変幅のフォント"
-
-#: ../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:103
-msgid "Terminal font"
-msgstr "端末のフォント"
-
-#: ../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:105
-msgid "Use custom fonts"
-msgstr "カスタムフォントを使用するかどうか"
-
-#: ../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:107
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "差出人/Cc/Bcc でメールアドレスの表示を隠すかどうか"
-
-#: ../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:109
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "差出人/Cc/Bcc で表示を制限するメールアドレスの個数"
-
-#: ../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:111
-msgid "Thread the message-list based on Subject"
-msgstr "メッセージの一覧を件名でスレッド表示するかどうか"
-
-#: ../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:113
-msgid "Default value for thread expand state"
-msgstr "デフォルトでスレッドを展開した状態にするかどうか"
-
-#: ../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:115
-msgid "Whether sort threads based on latest message in that thread"
-msgstr "スレッドの中にあるメールを最新のメッセージを基点に並べ替えるかどうか"
-
-#: ../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 の再起動が必要になります。"
-
-#: ../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: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」の例外を除いて、アルファベット順にユーザーにより指定された順序で並べ替えられます。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
-msgid "Log filter actions"
-msgstr "ログをフィルタリングするかどうか"
-
-#: ../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:121
-msgid "Logfile to log filter actions"
-msgstr "フィルタリングするログファイル"
-
-#: ../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:123
-msgid "Flush Outbox after filtering"
-msgstr "フィルターした後、送信トレイを空にする"
-
-#: ../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:125
-msgid "Default forward style"
-msgstr "デフォルトの転送スタイル"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
-msgid "Default reply style"
-msgstr "デフォルトの返信スタイル"
-
-#: ../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: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:129
-msgid "Prompt when emptying the trash"
-msgstr "ゴミ箱を空にするときに確認"
-
-#: ../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:131
-msgid "Prompt when user expunges"
-msgstr "完全に削除する場合は警告するかどうか"
-
-#: ../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:133
-msgid "Prompt before sending to recipients not entered as mail addresses"
-msgstr "受信者としてメールアドレスが入力されていないのに送ろうとする前に確認"
-
-#: ../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:135
-msgid "Prompt when user only fills Bcc"
-msgstr "ユーザーが Bcc しか入力なかったら警告するかどうか"
-
-#: ../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:137
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr "HTML をユーザーが送信する前に警告するかどうか"
-
-#: ../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: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: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:141
-msgid "Prompt while marking multiple messages"
-msgstr "複数のメッセージにマークする場合は確認するかどうか"
-
-#: ../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:143
-msgid "Prompt when deleting messages in search folder"
-msgstr "仮想フォルダーでメッセージを削除する際に確認するかどうか"
-
-#: ../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: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: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: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: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:149
-msgid "Prompt when replying privately to list messages"
-msgstr "メーリングリストのメッセージにプライベートに返信しようとしている時に確認"
-
-#: ../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:151
-msgid "Prompt when mailing list hijacks private replies"
-msgstr "メーリングリストがプライベート宛の返信の設定を上書きしている時に確認"
-
-#: ../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:153
-msgid "Prompt when replying to many recipients"
-msgstr "たくさんの相手に返信しようとしている時に確認"
-
-#: ../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: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:156
-msgid "Empty Trash folders on exit"
-msgstr "終了時にゴミ箱フォルダーを空にするかどうか"
-
-#: ../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:158
-msgid "Minimum days between emptying the trash on exit"
-msgstr "終了時にゴミ箱を空にするまでの最短の日数"
-
-#: ../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:160
-msgid "Last time Empty Trash was run"
-msgstr "最後にゴミ箱を空にした時間"
-
-#: ../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: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:163
-msgid "Level beyond which the message should be logged."
-msgstr "ログを記録すべきメッセージレベルの最小値"
-
-#: ../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:165
-msgid "Show original \"Date\" header value."
-msgstr "元の \"Date\" ヘッダーの値を表示"
-
-#: ../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:167
-msgid "List of Labels and their associated colors"
-msgstr "ラベルと対応する色のリスト"
-
-#: ../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:169
-msgid "Check incoming mail being junk"
-msgstr "受信メールがジャンクかどうかをチェックするかどうか"
-
-#: ../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:171
-msgid "Empty Junk folders on exit"
-msgstr "終了時にジャンクフォルダーを空にするかどうか"
-
-#: ../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:173
-msgid "Minimum days between emptying the junk on exit"
-msgstr "終了時にジャンクを空にするまでの最短の日数"
-
-#: ../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:175
-msgid "Last time Empty Junk was run"
-msgstr "最後にジャンクフォルダーを空にした時間"
-
-#: ../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:177
-msgid "The default plugin for Junk hook"
-msgstr "ジャンクメールのテストで使用するデフォルトのプラグイン"
-
-#: ../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:179
-msgid "Determines whether to lookup in address book for sender email"
-msgstr "差出人をアドレス帳から検索するかどうか"
-
-#: ../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: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: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:183
-msgid "Determines whether to use custom headers to check for junk"
-msgstr "独自のヘッダーを利用してジャンクをチェックするかどうか"
-
-#: ../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:185
-msgid "Custom headers to use while checking for junk."
-msgstr "ジャンクかどうかをチェックする際に使用する独自のヘッダー"
-
-#: ../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:187
-msgid "UID string of the default account."
-msgstr "デフォルトのアカウントを表す UID (文字列)"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
-msgid "Save directory"
-msgstr "保存先のフォルダー"
-
-#: ../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:190
-msgid "Composer load/attach directory"
-msgstr "Composer 読み込み/保存ディレクトリ"
-
-#: ../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:192
-msgid "Check for new messages on start"
-msgstr "起動時に新着メッセージをチェックする"
-
-#: ../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:194
-msgid "Check for new messages in all active accounts"
-msgstr "アクティブなアカウントの新着メールをチェックする"
-
-#: ../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:196
-msgid "Server synchronization interval"
-msgstr "サーバーと同期する間隔"
-
-#: ../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:198
-msgid "(Deprecated) Default forward style"
-msgstr "(非推奨) デフォルトの転送スタイル"
-
-#: ../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:200
-msgid "(Deprecated) Default reply style"
-msgstr "(非推奨) デフォルトの返信スタイル"
-
-#: ../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:202
-msgid "(Deprecated) List of custom headers and whether they are enabled."
-msgstr "(非推奨) 独自のヘッダーとそれらを有効にするかどうかのリスト"
-
-#: ../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:204
-msgid "(Deprecated) Load images for HTML messages over HTTP"
-msgstr "(非推奨) HTML のメッセージにある画像を読み込むかどうか"
-
-#: ../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: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: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\" を代わりに使ってください。"
-
-#. Translators: This is the a list of words for the attach reminder plugin to look
-#. for in a message body. Please use any number of words here in your language that might
-#. indicate that an attachment should have been attached to the message.
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:4
-msgid "['attachment','attaching','attached','enclosed']"
-msgstr "['attachment','attaching','attached','enclosed','添付','アタッチ']"
-
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
-msgid "List of clues for the attachment reminder plugin to look for in a message body"
-msgstr "添付し忘れ防止プラグインでメッセージの本文から検索する一連のキーワード"
-
-#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:6
-msgid "List of clues for the attachment reminder plugin to look for in a message body."
-msgstr "添付し忘れ防止プラグインでメッセージの本文から検索する一連のキーワード"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:1
-msgid "Address book source"
-msgstr "アドレス帳のソース"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
-msgid "Address book to use for storing automatically synced contacts."
-msgstr "連絡先の自動同期に使用するアドレス帳を選択してください:"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
-msgid "Auto sync Pidgin contacts"
-msgstr "Pidgin の連絡先の自動同期"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
-msgid "Whether Pidgin contacts should be automatically synced."
-msgstr "Pidgin の連絡先を自動的に同期するかどうか"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
-msgid "Enable autocontacts"
-msgstr "連絡先自動収集の有効化"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
-msgid "Whether contacts should be automatically added to the user's address book."
-msgstr "連絡先をユーザーのアドレス帳に自動的に追加するかどうか"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
-msgid "Pidgin address book source"
-msgstr "Pidgin アドレス帳のソース"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
-msgid "Address book to use for storing automatically synced contacts from Pidgin."
-msgstr "Pidgin から連絡先を自動的に同期するのに使用するアドレス帳"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
-msgid "Pidgin check interval"
-msgstr "Pidgin チェック間隔"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
-msgid "Check interval for Pidgin syncing of contacts."
-msgstr "Pidgin をチェックして連絡先を同期する間隔"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
-msgid "Pidgin last sync MD5"
-msgstr "Pidgin 最終同期時の MD5"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
-msgid "Pidgin last sync MD5."
-msgstr "Pidgin 最終同期時の MD5"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
-msgid "Pidgin last sync time"
-msgstr "Pidgin 最終同期時刻"
-
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
-msgid "Pidgin last sync time."
-msgstr "Pidgin 最終同期時刻"
-
-#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
-msgid "List of Custom Headers"
-msgstr "独自ヘッダーのリスト"
-
-#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
-msgid "The key specifies the list of custom headers that you can add to an outgoing message. The format for 
specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values separated 
by \";\""
-msgstr "送信するメールに独自のヘッダーとして挿入するキーのリストです。その書式は \"=\" の次に独自ヘッダーの名前を指定して \";\" でその値を区切ります。"
-
-#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
-msgid "Default External Editor"
-msgstr "デフォルトの外部エディター"
-
-#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
-msgid "The default command that must be used as the editor."
-msgstr "デフォルトで使用するエディターのコマンドです。"
-
-#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
-msgid "Automatically launch when a new mail is edited"
-msgstr "新規メールの作成時に自動的に起動"
-
-#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:4
-msgid "Automatically launch editor when key is pressed in the mail composer."
-msgstr "メールの作成ウィンドウでキーが押されたら自動的にエディターを起動"
-
-#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
-msgid "Insert Face picture by default"
-msgstr "デフォルトで顔画像を添付"
-
-#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
-msgid "Whether insert Face picture to outgoing messages by default. The picture should be set before 
checking this, otherwise nothing happens."
-msgstr "デフォルトで送信するメッセージに顔画像を添付するかどうか。この項目をチェックする前に、画像が設定されているかどうか確認してください。さもなければ、何も起こりません。"
-
-#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
-msgid "Delete processed"
-msgstr "処理済みを削除"
-
-#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:2
-msgid "Whether to delete processed iTip objects"
-msgstr "処理済みの iTip オブジェクトを削除するかどうか"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
-msgid "Notify new messages for Inbox only."
-msgstr "受信箱のみ新着メッセージを通知するかどうか"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
-msgid "Whether to notify new messages in Inbox folder only."
-msgstr "受信箱 (Inbox) フォルダーのみ新着メッセージを通知するかどうかです。"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:3
-msgid "Enable D-Bus messages."
-msgstr "D-Bus メッセージを有効にする"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:4
-msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "新しいメールが届いたらD-Bus メッセージを生成する。"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
-msgid "Enable icon in notification area."
-msgstr "通知領域にアイコンを表示するかどうか"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
-msgid "Show new mail icon in notification area when new messages arrive."
-msgstr "新しいメールが届いたらパネルの通知領域にアイコンを表示して通知するかどうかです。"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:7
-msgid "Popup message together with the icon."
-msgstr "アイコンとともにメッセージを表示する"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:8
-msgid "Whether show message over the icon when new messages arrive."
-msgstr "新しいメールが届いたときにアイコンに重ねてメッセージを表示するかどうか。"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
-msgid "Enable audible notifications when new messages arrive."
-msgstr "新しいメールが届いたときに音による通知を有効にする。"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
-msgid "Whether to make a sound of any kind when new messages arrive. If \"false\", the 
\"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-file\" and \"notify-sound-use-theme\" keys 
are disregarded."
-msgstr "新しいメールが届いたときに音による通知を有効にするかどうか。\"false\" にすると 
\"notify-sound-beep\"、\"notify-sound-file\"、\"notify-sound-play-file\"、\"notify-sound-use-theme\" 各キーは無視されます。"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
-msgid "Whether to emit a beep."
-msgstr "ビープ音を鳴らすかどうか"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
-msgid "Whether to emit a beep when new messages arrive."
-msgstr "新しいメールが届いたらビープ音を鳴らすかどうかです。"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
-msgid "Sound filename to be played."
-msgstr "演奏する音声ファイル"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-msgid "Sound file to be played when new messages arrive, if \"notify-sound-play-file\" is \"true\"."
-msgstr "\"notify-sound-play-file\" が true の場合に新しいメールが届いたら演奏する音声ファイルです。"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
-msgid "Whether to play a sound file."
-msgstr "音声ファイルを演奏するかどうか"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
-msgid "Whether to play a sound file when new messages arrive. The name of the sound file is given by the 
'notify-sound-file' key."
-msgstr "音声ファイルを演奏するかどうかです。音声ファイルの名前は 'notify-sound-file' キーで指定します。"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
-msgid "Use sound theme"
-msgstr "サウンドテーマを使用"
-
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
-msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr "ビープモードでない場合、新しいメッセージが届いた時にテーマの音を鳴らします。"
-
-#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
-msgid "Mode to use when displaying mails"
-msgstr "メールの表示モード"
-
-#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
-msgid "The mode to use for displaying mails. \"normal\" makes Evolution choose the best part to show, 
\"prefer_plain\" makes it use the text part, if present, and \"only_plain\" forces Evolution to only show 
plain text"
-msgstr "メール表示に使うモード。\"normal\" では表示に最適なものを Evolution が選択し、\"prefer_plain\" ではテキストの部分があればそれを、\"only_plain\" 
では Evolution はプレーンテキストだけを表示します。"
-
-#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
-msgid "Whether to show suppressed HTML output"
-msgstr "隠された HTML 出力を表示するかどうか"
-
-#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:1
-msgid "List of Destinations for publishing"
-msgstr "スケジュールを公開するサーバー URL 一覧"
-
-#: ../data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in.h:2
-msgid "The key specifies the list of destinations to where publish calendars. Each values specifies an XML 
with setup for publishing to one destination."
-msgstr "このキーはカレンダーを公開する先の一覧を指定します。値はそれぞれ1つの公開先を設定する1つの XML を指定します。"
-
-#: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
-msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
-msgstr "テンプレートプラグインがメッセージの本文を代用するために使用するキーと値のペアを要素とするリストです。"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
-msgid "Skip development warning dialog"
-msgstr "開発版であることを警告するダイアログをスキップするかどうか"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
-msgstr "Evolution の開発バージョンである旨を警告するダイアログを表示しないようにするかどうかです。"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
-msgid "Initial attachment view"
-msgstr "添付表示の初期状態"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
-msgid "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
-msgstr "添付バーのウィジェットの初期表示。\"0\" ならばアイコン表示、\"1\" ならば一覧表示"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
-msgid "Initial file chooser folder"
-msgstr "初期ファイル選択フォルダー"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
-msgid "Initial folder for GtkFileChooser dialogs."
-msgstr "GtkFileChooser ダイアログの初期フォルダー"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:307
-msgid "Start in offline mode"
-msgstr "オフラインモードで起動するかどうか"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
-msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr "オンラインモードではなく、オフラインモードで Evolution を起動するかどうかです。"
-
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
-msgid "Offline folder paths"
-msgstr "オフライン時フォルダーパス"
+#: ../src/composer/mail-composer.error.xml.h:35
+#, fuzzy
+#| msgid ""
+#| "The message will be saved to your local Outbox folder, because the "
+#| "destination service is currently unavailable. You can send the message by "
+#| "clicking the Send/Receive button in Evolution's toolbar."
+msgid ""
+"The message will be saved to your local Outbox folder, because the "
+"destination service is currently unavailable. You can send the message by "
+"clicking the Send/Receive button in Evolution’s toolbar."
+msgstr ""
+"対象サービスが現在利用できないため、メッセージはローカルの送信トレイのフォル"
+"ダーに保存されました。Evolution のツールバーの送信/受信ボタンを押すことで送信"
+"できます。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
-msgid "List of paths for the folders to be synchronized to disk for offline usage."
-msgstr "オフライン時用にローカルディスクと同期するフォルダーのパスのリスト"
+#: ../src/composer/mail-composer.error.xml.h:36
+#, fuzzy
+#| 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?"
+msgid "Are you sure you want to send the message?"
+msgstr "本当に %d 通のメッセージを一度に開いてもよろしいですか?"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-msgid "Enable express mode"
-msgstr "エクスプレスモードを有効にする"
+#: ../src/composer/mail-composer.error.xml.h:37
+msgid ""
+"A keyboard accelerator to send the message has been pressed. Either cancel "
+"sending the message, if it was done by an accident, or send the message."
+msgstr ""
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
-msgid "Flag that enables a much simplified user interface."
-msgstr "より簡易化されたインターフェースを有効にするフラグ"
+#: ../src/composer/mail-composer.error.xml.h:39
+#, fuzzy
+#| msgid "Are you sure you want to change the composer mode?"
+msgid "Are you sure you want to change the composer format?"
+msgstr "本当にこのコンポーザーモードを変更してもよろしいですか?"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
-msgid "Window buttons are visible"
-msgstr "ウィンドウボタンを表示するかどうか"
+#: ../src/composer/mail-composer.error.xml.h:40
+#, fuzzy
+#| msgid ""
+#| "Turning HTML mode off will cause the text to lose all formatting. Do you "
+#| "want to continue?"
+msgid ""
+"Switching to Plain Text format will cause the text to lose all the HTML "
+"formatting. Do you want to continue?"
+msgstr ""
+"HTML モードから切り換えると、テキストのフォーマットを失う恐れがあります。続行"
+"しますか?"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
-msgid "Whether the window buttons should be visible."
-msgstr "ウィンドウボタンを表示するかどうかです。"
+#: ../src/composer/mail-composer.error.xml.h:41
+#, fuzzy
+#| msgid "_Don't lose formatting"
+msgid "_Don’t lose formatting"
+msgstr "フォーマットしない(_D)"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
-msgid "Window button style"
-msgstr "ウィンドウボタンのスタイル"
+#: ../src/composer/mail-composer.error.xml.h:42
+msgid "Lose _formatting"
+msgstr "フォーマットを消去(_F)"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
-msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is 
set, the style of the buttons is determined by the GNOME toolbar setting."
-msgstr "ウィンドウボタンのスタイルです。利用可能な値は \"text\"、\"icons\"、\"both\"、\"toolbar\" です。\"toolbar\" がセットされていたら、ボタンのスタイルは 
GNOME デスクトップのツールバーの設定に従います。"
+#: ../src/composer/mail-composer.error.xml.h:43
+#, fuzzy
+#| msgid "An error occurred while saving to your Drafts folder."
+msgid "An error occurred while saving to your Templates folder."
+msgstr "下書きフォルダーへの保存の際にエラーが発生しました。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
-msgid "Toolbar is visible"
-msgstr "ツールバーを表示するかどうか"
+#: ../src/composer/mail-composer.error.xml.h:44
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to discard the message, titled '{0}', you are "
+#| "composing?"
+msgid "Are you sure you want to convert the message into a meeting?"
+msgstr "本当に作成途中のメッセージ (件名: '{0}') を破棄してもよろしいですか?"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
-msgid "Whether the toolbar should be visible."
-msgstr "ツールバーを表示するかどうかです。"
+#: ../src/composer/mail-composer.error.xml.h:45
+msgid ""
+"By converting the message into the meeting the composed message will be "
+"closed and the changes being done discarded."
+msgstr ""
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
-msgid "Sidebar is visible"
-msgstr "サイドバーを表示するかどうか"
+#: ../src/composer/mail-composer.error.xml.h:46
+#, fuzzy
+#| msgid "Create a _Meeting"
+msgid "Convert to _Meeting"
+msgstr "会議の作成(_M)"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
-msgid "Whether the sidebar should be visible."
-msgstr "サイドバーを表示するかどうかです。"
+#: ../src/composer/mail-composer.error.xml.h:47
+#, fuzzy
+#| 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?"
+msgid "Are you sure you want to convert the event into a message?"
+msgstr "本当に %d 通のメッセージを一度に開いてもよろしいですか?"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
-msgid "Statusbar is visible"
-msgstr "ステータスバーを表示するかどうか"
+#: ../src/composer/mail-composer.error.xml.h:48
+msgid ""
+"By converting the event into the message the editing window will be closed "
+"and the changes being done discarded."
+msgstr ""
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
-msgid "Whether the status bar should be visible."
-msgstr "ステータスバーを表示するかどうかです。"
+#: ../src/composer/mail-composer.error.xml.h:49
+#, fuzzy
+#| msgid "Important Messages"
+msgid "Convert to _Message"
+msgstr "重要なメッセージ"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-msgid "ID or alias of the component to be shown by default at start-up."
-msgstr "起動時にデフォルトで表示するコンポーネントの ID/エイリアスです。"
+#: ../src/composer/mail-composer.error.xml.h:50
+#, fuzzy
+#| msgid "Are you sure you want to save the memo without a summary?"
+msgid "Are you sure you want to convert the memo into a message?"
+msgstr "本当にサマリのないメモを保存してもよろしいですか?"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-msgid "Default sidebar width"
-msgstr "サイドバーの幅 (デフォルト)"
+#: ../src/composer/mail-composer.error.xml.h:51
+msgid ""
+"By converting the memo into the message the editing window will be closed "
+"and the changes being done discarded."
+msgstr ""
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
-msgid "The default width for the sidebar, in pixels."
-msgstr "サイドバーのデフォルトの幅です (ピクセル単位)"
+#: ../src/composer/mail-composer.error.xml.h:52
+#, fuzzy
+#| msgid "Are you sure you want to save the task without a summary?"
+msgid "Are you sure you want to convert the task into a message?"
+msgstr "本当にサマリのないタスクを保存してもよろしいですか?"
 
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
-msgid "Use only local spam tests."
-msgstr "ジャンクのテストはローカルのみにするかどうか"
+#: ../src/composer/mail-composer.error.xml.h:53
+msgid ""
+"By converting the task into the message the editing window will be closed "
+"and the changes being done discarded."
+msgstr ""
 
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
-msgid "Use only the local spam tests (no DNS)."
-msgstr "(DNS を使用せずに) ローカルの受信箱に対してのみジャンクメールのテストをするかどうかです。"
+#: ../src/composer/mail-composer.error.xml.h:54
+msgid "Something has gone wrong when editing the message"
+msgstr ""
 
-#: ../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] "添付ファイル"
+#: ../src/composer/mail-composer.error.xml.h:55
+msgid ""
+"A WebKitWebProcess crashed when editing the message. You can try again by "
+"closing the composer window and opening a new one. If the issue persists, "
+"please file a bug report in the GNOME bugzilla."
+msgstr ""
 
-#: ../em-format/e-mail-formatter-attachment.c:406
+#: ../src/em-format/e-mail-formatter-attachment.c:334
 msgid "Display as attachment"
 msgstr "添付ファイルとして表示"
 
-#: ../em-format/e-mail-formatter-audio.c:152
+#: ../src/em-format/e-mail-formatter-audio.c:150
 msgid "Audio Player"
 msgstr "音楽プレーヤー"
 
-#: ../em-format/e-mail-formatter-audio.c:153
+#: ../src/em-format/e-mail-formatter-audio.c:151
 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
+#: ../src/em-format/e-mail-formatter-headers.c:107
+#: ../src/em-format/e-mail-part-headers.c:46
+#: ../src/mail/e-mail-tag-editor.c:203 ../src/mail/message-list.etspec.h:5
+#: ../src/modules/mail/em-mailer-prefs.c:60
 msgid "From"
 msgstr "差出人"
 
-#: ../em-format/e-mail-formatter-headers.c:128
+#: ../src/em-format/e-mail-formatter-headers.c:132
 msgid "(no subject)"
 msgstr "(件名無し)"
 
-#: ../em-format/e-mail-formatter-headers.c:328
+#. Translators: This message suggests to the receipients
+#. * that the sender of the mail is different from the one
+#. * listed in From field.
+#: ../src/em-format/e-mail-formatter-headers.c:339
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "このメッセージは %s さんが %s さんに代わって送信したものです"
 
-#: ../em-format/e-mail-formatter-image.c:170
+#: ../src/em-format/e-mail-formatter-image.c:168
 msgid "Regular Image"
 msgstr "普通の画像"
 
-#: ../em-format/e-mail-formatter-image.c:171
+#: ../src/em-format/e-mail-formatter-image.c:169
 msgid "Display part as an image"
 msgstr "その部分を画像として表示"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:254
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:249
 msgid "RFC822 message"
 msgstr "RFC822 メッセージ"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:255
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:250
 msgid "Format part as an RFC822 message"
 msgstr "その部分を RFC822 メッセージとして整形"
 
-#: ../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
+#: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:92
+#: ../src/mail/e-mail-label-tree-view.c:96
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:64
 msgid "Name"
 msgstr "名前"
 
-#: ../em-format/e-mail-formatter-print.c:53
-#: ../e-util/e-attachment-tree-view.c:573 ../mail/message-list.etspec.h:10
+#: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/e-util/e-attachment-tree-view.c:193
+#: ../src/mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "サイズ"
 
-#: ../em-format/e-mail-formatter-print-headers.c:143
-msgid "GPG signed"
-msgstr "GPG 署名済み"
-
-#: ../em-format/e-mail-formatter-print-headers.c:149
-msgid "GPG encrpyted"
-msgstr "GPG 暗号化"
-
-#: ../em-format/e-mail-formatter-print-headers.c:155
-msgid "S/MIME signed"
-msgstr "S/MIME 署名済み"
-
-#: ../em-format/e-mail-formatter-print-headers.c:161
-msgid "S/MIME encrpyted"
-msgstr "S/MIME 暗号化"
-
-#: ../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: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
+#: ../src/em-format/e-mail-formatter-quote-headers.c:178
+#: ../src/em-format/e-mail-part-headers.c:51
+#: ../src/mail/e-mail-tag-editor.c:208 ../src/mail/filtertypes.xml.in.h:16
+#: ../src/mail/message-list.etspec.h:6 ../src/mail/searchtypes.xml.in.h:17
+#: ../src/mail/vfoldertypes.xml.in.h:17
+#: ../src/modules/mail/em-mailer-prefs.c:65
+#: ../src/smime/gui/certificate-manager.c:1643
 msgid "Subject"
 msgstr "件名"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:186
-#: ../em-format/e-mail-formatter-utils.c:342
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../src/em-format/e-mail-formatter-quote-headers.c:197
+#: ../src/em-format/e-mail-formatter-utils.c:341
+#: ../src/modules/mail/em-mailer-prefs.c:1488
 msgid "Mailer"
 msgstr "メーラー"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:94
-#: ../em-format/e-mail-formatter-text-enriched.c:98
+#: ../src/em-format/e-mail-formatter-quote-text-enriched.c:92
+#: ../src/em-format/e-mail-formatter-text-enriched.c:100
 msgid "Richtext"
 msgstr "リッチテキスト"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:95
-#: ../em-format/e-mail-formatter-text-enriched.c:99
+#: ../src/em-format/e-mail-formatter-quote-text-enriched.c:93
+#: ../src/em-format/e-mail-formatter-text-enriched.c:101
 msgid "Display part as enriched text"
 msgstr "表現力豊かなテキストの一部として表示"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:95
-#: ../em-format/e-mail-formatter-text-html.c:359
+#: ../src/em-format/e-mail-formatter-quote-text-html.c:93
+#: ../src/em-format/e-mail-formatter-text-html.c:385
 msgid "HTML"
 msgstr "HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:96
-#: ../em-format/e-mail-formatter-text-html.c:360
+#: ../src/em-format/e-mail-formatter-quote-text-html.c:94
+#: ../src/em-format/e-mail-formatter-text-html.c:386
 msgid "Format part as HTML"
 msgstr "その部分を HTML として整形"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:121
-#: ../em-format/e-mail-formatter-text-plain.c:197
+#: ../src/em-format/e-mail-formatter-quote-text-plain.c:121
+#: ../src/em-format/e-mail-formatter-text-plain.c:196
+#: ../src/e-util/e-html-editor-actions.c:1314
 msgid "Plain Text"
 msgstr "プレーンテキスト"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:122
-#: ../em-format/e-mail-formatter-text-plain.c:198
+#: ../src/em-format/e-mail-formatter-quote-text-plain.c:122
+#: ../src/em-format/e-mail-formatter-text-plain.c:197
 msgid "Format part as plain text"
 msgstr "その部分をプレーンテキストとして整形"
 
-#: ../em-format/e-mail-formatter-secure-button.c:51
+#: ../src/em-format/e-mail-formatter-secure-button.c:44
 msgid "Unsigned"
 msgstr "署名なし"
 
-#: ../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 "このメッセージは署名されていません。このメッセージの信頼性を保証できません。"
+#: ../src/em-format/e-mail-formatter-secure-button.c:44
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"このメッセージは署名されていません。このメッセージの信頼性を保証できません。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../src/em-format/e-mail-formatter-secure-button.c:45
 msgid "Valid signature"
 msgstr "妥当な署名"
 
-#: ../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 "このメッセージには署名が付与されています。このメッセージは非常に信頼できるものであることを意味します。"
+#: ../src/em-format/e-mail-formatter-secure-button.c:45
+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:53
+#: ../src/em-format/e-mail-formatter-secure-button.c:46
 msgid "Invalid signature"
 msgstr "無効な署名です"
 
-#: ../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."
+#: ../src/em-format/e-mail-formatter-secure-button.c:46
+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:54
+#: ../src/em-format/e-mail-formatter-secure-button.c:47
 msgid "Valid signature, but cannot verify sender"
 msgstr "署名は妥当ですが、差出人を検証できません"
 
-#: ../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 "このメッセージには妥当な署名が付与されていますが、メッセージの差出人を検証できません。"
+#: ../src/em-format/e-mail-formatter-secure-button.c:47
+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:55
-msgid "Signature exists, but need public key"
-msgstr "署名はありますが公開鍵が必要です"
+#: ../src/em-format/e-mail-formatter-secure-button.c:48
+#, fuzzy
+#| msgid ""
+#| "This message is signed with a signature, but there is no corresponding "
+#| "public key."
+msgid "This message is signed, but the public key is not in your keyring"
+msgstr ""
+"このメッセージは署名が付与されていますが、それに対応する公開鍵が付与されてい"
+"ません。"
 
-#: ../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 "このメッセージは署名が付与されていますが、それに対応する公開鍵が付与されていません。"
+#: ../src/em-format/e-mail-formatter-secure-button.c:48
+msgid ""
+"This message was digitally signed, but the corresponding public key is not "
+"present in your keyring. If you want to be able to verify the authenticity "
+"of messages from this person, you should obtain the public key through a "
+"trusted method and add it to your keyring. Until then, there is no guarantee "
+"that this message truly came from that person and that it arrived unaltered."
+msgstr ""
 
-#: ../em-format/e-mail-formatter-secure-button.c:62
+#: ../src/em-format/e-mail-formatter-secure-button.c:57
 msgid "Unencrypted"
 msgstr "暗号化なし"
 
-#: ../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 "このメッセージは暗号化されていません。その内容がインターネットを介して閲覧される可能性があります。"
+#: ../src/em-format/e-mail-formatter-secure-button.c:57
+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:63
+#: ../src/em-format/e-mail-formatter-secure-button.c:58
 msgid "Encrypted, weak"
 msgstr "暗号化済み (レベルは不十分)"
 
-#: ../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 "このメッセージは暗号化されていますが、その暗号化アルゴリズムのレベルが不十分です。(現実的には困難ですが)、このメッセージの内容を部外者が閲覧する可能性があります。"
+#: ../src/em-format/e-mail-formatter-secure-button.c:58
+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:64
+#: ../src/em-format/e-mail-formatter-secure-button.c:59
 msgid "Encrypted"
 msgstr "暗号化済み"
 
-#: ../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 "このメッセージは暗号化されています。このメッセージの内容を部外者が閲覧することは困難と思われます。"
+#: ../src/em-format/e-mail-formatter-secure-button.c:59
+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:65
+#: ../src/em-format/e-mail-formatter-secure-button.c:60
 msgid "Encrypted, strong"
 msgstr "暗号化済み (レベルは強力)"
 
-#: ../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:187
-#: ../smime/gui/smime-ui.ui.h:22
-msgid "_View Certificate"
-msgstr "証明書の表示(_V)"
-
-#: ../em-format/e-mail-formatter-secure-button.c:202
-msgid "This certificate is not viewable"
-msgstr "この証明書は表示可能な形式ではありません"
-
-#: ../em-format/e-mail-formatter-source.c:120
-msgid "Source"
-msgstr "ソース"
+#: ../src/em-format/e-mail-formatter-secure-button.c:60
+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-source.c:121
+#: ../src/em-format/e-mail-formatter-source.c:119
 msgid "Display source of a MIME part"
 msgstr "MIME 部分のソースを表示"
 
-#: ../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
+#: ../src/em-format/e-mail-formatter-utils.c:200
+#: ../src/em-format/e-mail-formatter-utils.c:217
+#: ../src/em-format/e-mail-part-headers.c:48
+#: ../src/mail/message-list.etspec.h:9 ../src/mail/searchtypes.xml.in.h:11
+#: ../src/mail/vfoldertypes.xml.in.h:11
+#: ../src/modules/mail/em-mailer-prefs.c:62
+msgid "To"
+msgstr "宛先"
+
+#: ../src/em-format/e-mail-formatter-utils.c:201
+#: ../src/em-format/e-mail-formatter-utils.c:218
+#: ../src/em-format/e-mail-part-headers.c:49
+#: ../src/modules/mail/em-mailer-prefs.c:63
 msgid "Cc"
 msgstr "Cc"
 
-#: ../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
+#: ../src/em-format/e-mail-formatter-utils.c:202
+#: ../src/em-format/e-mail-formatter-utils.c:219
+#: ../src/em-format/e-mail-part-headers.c:50
+#: ../src/modules/mail/em-mailer-prefs.c:64
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/e-mail-parser-application-mbox.c:87
+#: ../src/em-format/e-mail-formatter-utils.c:582
+msgid "GPG signed"
+msgstr "GPG 署名済み"
+
+#: ../src/em-format/e-mail-formatter-utils.c:588
+#, fuzzy
+#| msgid "GPG encrpyted"
+msgid "GPG encrypted"
+msgstr "GPG 暗号化"
+
+#: ../src/em-format/e-mail-formatter-utils.c:594
+msgid "S/MIME signed"
+msgstr "S/MIME 署名済み"
+
+#: ../src/em-format/e-mail-formatter-utils.c:600
+#, fuzzy
+#| msgid "S/MIME encrpyted"
+msgid "S/MIME encrypted"
+msgstr "S/MIME 暗号化"
+
+#: ../src/em-format/e-mail-formatter-utils.c:609
+#: ../src/mail/e-mail-config-security-page.c:716
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:272
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:215
+msgid "Security"
+msgstr "セキュリティ"
+
+#: ../src/em-format/e-mail-parser-application-mbox.c:85
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr "MBOX 部分の解析エラー: %s"
 
-#: ../em-format/e-mail-parser-application-smime.c:83
+#: ../src/em-format/e-mail-parser-application-smime.c:81
 #, c-format
 msgid "Could not parse S/MIME message: %s"
 msgstr "PGP/MIME メッセージを解析できませんでした: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:79
+#: ../src/em-format/e-mail-parser-inlinepgp-encrypted.c:75
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "PGP メッセージを解析できませんでした: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:82
-#: ../em-format/e-mail-parser-multipart-signed.c:135
+#: ../src/em-format/e-mail-parser-inlinepgp-signed.c:78
+#: ../src/em-format/e-mail-parser-multipart-signed.c:133
 #, c-format
 msgid "Error verifying signature: %s"
 msgstr "署名を検証する際にエラーが発生しました: %s"
 
-#: ../em-format/e-mail-parser-message-external.c:68
+#: ../src/em-format/e-mail-parser-message-external.c:66
 msgid "Malformed external-body part"
 msgstr "External-Body の部分が壊れています"
 
-#: ../em-format/e-mail-parser-message-external.c:101
+#: ../src/em-format/e-mail-parser-message-external.c:99
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP サイト (%s) を指しています"
 
-#: ../em-format/e-mail-parser-message-external.c:112
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
+#: ../src/em-format/e-mail-parser-message-external.c:110
+#, fuzzy, c-format
+#| msgid "Pointer to local file (%s) valid at site \"%s\""
+msgid "Pointer to local file (%s) valid at site “%s”"
 msgstr "ローカルファイル (%s) はサイト \"%s\" に正しくリンクしています"
 
-#: ../em-format/e-mail-parser-message-external.c:114
+#: ../src/em-format/e-mail-parser-message-external.c:112
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "ローカルファイル (%s) にリンクしています"
 
-#: ../em-format/e-mail-parser-message-external.c:133
+#: ../src/em-format/e-mail-parser-message-external.c:131
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "リモートデータ (%s) にリンクしています"
 
-#: ../em-format/e-mail-parser-message-external.c:151
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
+#: ../src/em-format/e-mail-parser-message-external.c:149
+#, fuzzy, c-format
+#| msgid "Pointer to unknown external data (\"%s\" type)"
+msgid "Pointer to unknown external data (“%s” type)"
 msgstr "不明な外部データ (\"%s\" タイプ) にリンクしています"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:66
-#: ../em-format/e-mail-parser-multipart-signed.c:83
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:64
+#: ../src/em-format/e-mail-parser-multipart-signed.c:81
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME メッセージを解析できませんでした。ソースを表示します。"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:82
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:79
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "サポートしていない S/MIME の暗号化の種類"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:101
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:98
 #, c-format
 msgid "Could not parse PGP/MIME message: %s"
 msgstr "PGP/MIME メッセージを解析できませんでした: %s"
 
-#: ../em-format/e-mail-parser-multipart-signed.c:121
+#: ../src/em-format/e-mail-parser-multipart-signed.c:119
 msgid "Unsupported signature format"
 msgstr "サポートしていない署名の書式"
 
-#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:64
+#: ../src/em-format/e-mail-part-headers.c:47
+#: ../src/modules/mail/em-mailer-prefs.c:61
 msgid "Reply-To"
 msgstr "返信先"
 
-#: ../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
+#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:550
+#: ../src/e-util/e-dateedit.c:573 ../src/mail/message-list.etspec.h:7
+#: ../src/modules/mail/em-mailer-prefs.c:66
 msgid "Date"
 msgstr "日付"
 
-#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:70
+#: ../src/em-format/e-mail-part-headers.c:53
+#: ../src/modules/mail/em-mailer-prefs.c:67
 msgid "Newsgroups"
 msgstr "ニュースグループ"
 
-#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#: ../src/em-format/e-mail-part-headers.c:54
+#: ../src/modules/mail/em-mailer-prefs.c:68
+#: ../src/plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "フェイス"
 
-#: ../em-format/e-mail-part-utils.c:508
+#: ../src/em-format/e-mail-part-secure-button.c:116
+#: ../src/shell/shell.error.xml.h:28 ../src/smime/gui/smime-ui.ui.h:16
+msgid "_View Certificate"
+msgstr "証明書の表示(_V)"
+
+#: ../src/em-format/e-mail-part-secure-button.c:131
+msgid "This certificate is not viewable"
+msgstr "この証明書は表示可能な形式ではありません"
+
+#: ../src/em-format/e-mail-part-utils.c:551
 #, c-format
 msgid "%s attachment"
 msgstr "添付ファイル: %s"
 
-#: ../e-util/e-send-options.ui.h:3
-msgid "Standard"
-msgstr "標準"
-
-#: ../e-util/e-send-options.ui.h:6
-msgid "Proprietary"
-msgstr "独占"
-
-#: ../e-util/e-send-options.ui.h:8
-msgid "Secret"
-msgstr "機密"
-
-#: ../e-util/e-send-options.ui.h:9
-msgid "Top Secret"
-msgstr "極秘"
-
-#: ../e-util/e-send-options.ui.h:10
-msgid "For Your Eyes Only"
-msgstr "親展"
-
-#. Translators: Used in send options dialog
-#: ../e-util/e-send-options.ui.h:12
-msgctxt "send-options"
-msgid "None"
-msgstr "送らない"
-
-#: ../e-util/e-send-options.ui.h:13
-msgid "Mail Receipt"
-msgstr "開封通知を送る"
-
-#: ../e-util/e-send-options.ui.h:15
-msgid "R_eply requested"
-msgstr "返信を要求する(_E)"
-
-#: ../e-util/e-send-options.ui.h:16
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "指定した日数以内(_T):"
-
-#: ../e-util/e-send-options.ui.h:17
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "日"
-
-#: ../e-util/e-send-options.ui.h:18
-msgid "_When convenient"
-msgstr "都合の良い時(_W)"
-
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:847
-msgid "Replies"
-msgstr "返信だけ"
-
-#: ../e-util/e-send-options.ui.h:20
-msgid "_Delay message delivery"
-msgstr "メッセージの配送を遅らせる(_D)"
-
-#: ../e-util/e-send-options.ui.h:21
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "次の日以降(_A):"
-
-#: ../e-util/e-send-options.ui.h:22
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "日"
-
-#: ../e-util/e-send-options.ui.h:23
-msgid "_Set expiration date"
-msgstr "廃棄する日数を設定(_S)"
-
-#: ../e-util/e-send-options.ui.h:24
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "以下の日数(_U)"
-
-#: ../e-util/e-send-options.ui.h:25
-msgid "Delivery Options"
-msgstr "配信オプション"
-
-#: ../e-util/e-send-options.ui.h:26
-msgid "_Priority:"
-msgstr "優先度(_P):"
-
-#: ../e-util/e-send-options.ui.h:27
-msgid "_Classification:"
-msgstr "分類(_C)"
-
-#: ../e-util/e-send-options.ui.h:28
-msgid "Gene_ral Options"
-msgstr "全般のオプション(_R)"
-
-#: ../e-util/e-send-options.ui.h:29
-msgid "Creat_e a sent item to track information"
-msgstr "追跡情報に対する送信アイテムを作成する(_E)"
-
-#: ../e-util/e-send-options.ui.h:30
-msgid "_Delivered"
-msgstr "配送したもの(_D)"
-
-#: ../e-util/e-send-options.ui.h:31
-msgid "Deli_vered and opened"
-msgstr "配送後とメールを開いた後(_V)"
-
-#: ../e-util/e-send-options.ui.h:32
-msgid "_All information"
-msgstr "すべての情報(_A)"
-
-#: ../e-util/e-send-options.ui.h:33
-msgid "A_uto-delete sent item"
-msgstr "送信アイテムを自動的に削除する(_U)"
-
-#: ../e-util/e-send-options.ui.h:34
-msgid "Status Tracking"
-msgstr "ステータスの追跡"
-
-#: ../e-util/e-send-options.ui.h:35
-msgid "_When opened:"
-msgstr "開いた時(_W):"
-
-#: ../e-util/e-send-options.ui.h:36
-msgid "When decli_ned:"
-msgstr "辞退した時(_N):"
-
-#: ../e-util/e-send-options.ui.h:37
-msgid "When co_mpleted:"
-msgstr "完了した時(_M):"
-
-#: ../e-util/e-send-options.ui.h:38
-msgid "When acce_pted:"
-msgstr "受諾した時(_P):"
-
-#: ../e-util/e-send-options.ui.h:39
-msgid "Return Notification"
-msgstr "開封通知"
-
-#: ../e-util/e-send-options.ui.h:40
-msgid "Sta_tus Tracking"
-msgstr "ステータスの追跡(_T)"
-
-#: ../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)..."
-
-#: ../e-util/e-table-config.ui.h:5
-msgid "_Group By..."
-msgstr "グループ化(_G)..."
-
-#: ../e-util/e-table-config.ui.h:6
-msgid "_Fields Shown..."
-msgstr "表示する項目(_F)..."
-
-#: ../e-util/e-table-config.ui.h:9
-msgid "Clear _All"
-msgstr "すべてクリア(_A)"
-
-#: ../e-util/e-table-config.ui.h:10
-msgid "_Show field in View"
-msgstr "ビューに表示する項目(_S)"
-
-#: ../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:12 ../e-util/e-table-header-item.c:1753
-msgid "Descending"
-msgstr "降順"
-
-#: ../e-util/e-table-config.ui.h:13
-msgid "Group Items By"
-msgstr "グループ化"
-
-#: ../e-util/e-table-config.ui.h:14
-msgid "Show _field in View"
-msgstr "ビューに表示する項目(_F)"
-
-#: ../e-util/e-table-config.ui.h:15
-msgid "Then By"
-msgstr "追加の条件"
-
-#: ../e-util/e-table-config.ui.h:16
-msgid "Show field i_n View"
-msgstr "ビューに表示する項目(_N)"
-
-#: ../e-util/e-table-config.ui.h:17
-msgid "Show field in _View"
-msgstr "ビューに表示する項目(_V)"
-
-#: ../e-util/e-table-config.ui.h:18
-msgid "Sort"
-msgstr "並べ替え"
-
-#: ../e-util/e-table-config.ui.h:19
-msgid "Clear All"
-msgstr "すべてクリア"
-
-#: ../e-util/e-table-config.ui.h:20
-msgid "Sort Items By"
-msgstr "次で並べ替え"
-
-#: ../e-util/e-timezone-dialog.ui.h:1
-msgid "Select a Time Zone"
-msgstr "タイムゾーンの選択"
-
-#: ../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."
-msgstr ""
-"地図の任意のエリアを拡大する場合はマウスの左ボタンを使い、タイムゾーンを選択してください。\n"
-"エリアを縮小する場合はマウスの右ボタンを使ってください。"
-
-#: ../e-util/e-timezone-dialog.ui.h:6
-msgid "Time Zones"
-msgstr "タイムゾーン"
-
-#: ../e-util/e-timezone-dialog.ui.h:7
-msgid "_Selection"
-msgstr "選択(_S)"
-
-#: ../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:1243
-#: ../mail/em-utils.c:229
-msgid "Incoming"
-msgstr "受信したメッセージ"
-
-#: ../e-util/filter.ui.h:2
-msgid "the current time"
-msgstr "現在時刻"
-
-#: ../e-util/filter.ui.h:3
-msgid "the time you specify"
-msgstr "指定した時間"
-
-#: ../e-util/filter.ui.h:4
-msgid "a time relative to the current time"
-msgstr "現在時刻との相対時間"
-
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:83
-msgid "seconds"
-msgstr "秒"
-
-#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "週"
-
-#: ../e-util/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-msgid "months"
-msgstr "月"
-
-#: ../e-util/filter.ui.h:11
-msgid "years"
-msgstr "年"
-
-#: ../e-util/filter.ui.h:12
-msgid "ago"
-msgstr "前"
-
-#: ../e-util/filter.ui.h:13
-msgid "in the future"
-msgstr "先"
-
-#: ../e-util/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr "フィルターの対象:"
-
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
-msgid "_Filter Rules"
-msgstr "フィルターのルール(_F)"
-
-#: ../e-util/filter.ui.h:23
-msgid "Compare against"
-msgstr "次の条件で比較する: "
-
-#: ../e-util/filter.ui.h:24
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"メッセージの日付を、フィルターが実行された時の\n"
-"現在の時刻と比較します。"
-
-#: ../e-util/filter.ui.h:26
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"メッセージの日付は\n"
-"指定した日付の 0:00 と比較されます。"
-
-#: ../e-util/filter.ui.h:28
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"メッセージの日付を、フィルターが実行された時の\n"
-"相対的な時間と比較します。"
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
-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:416
-#: ../mail/e-mail-config-identity-page.c:310
-#: ../mail/e-mail-config-summary-page.c:340
-msgid "_Name:"
-msgstr "名前(_N):"
+#: ../src/e-util/ea-calendar-item.c:312 ../src/e-util/ea-calendar-item.c:321
+msgid "%d %B %Y"
+msgstr "%Y年%B%e日"
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr "既存のビューと置き換え(_R)"
+#: ../src/e-util/ea-calendar-item.c:324
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "カレンダー: %s 〜 %s"
 
-#: ../e-util/e-activity-proxy.c:308
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
-msgid "Cancel"
-msgstr "キャンセル"
+#: ../src/e-util/ea-calendar-item.c:361
+msgid "evolution calendar item"
+msgstr "Evolution カレンダーのアイテム"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:258
+#: ../src/e-util/e-activity.c:256
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (キャンセルされた)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:261
+#: ../src/e-util/e-activity.c:259
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (完了)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:264
+#: ../src/e-util/e-activity.c:262
 #, 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:268
+#: ../src/e-util/e-activity.c:266
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (キャンセルされた)"
 
-#: ../e-util/e-activity.c:270
+#: ../src/e-util/e-activity.c:268
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:275
+#. Translators: This is a running activity whose
+#. *              percent complete is known.
+#. Translators: This is a running activity whose percent complete is known.
+#: ../src/e-util/e-activity.c:273
+#: ../src/modules/calendar/e-cal-base-shell-content.c:142
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完了)"
 
+#: ../src/e-util/e-activity-proxy.c:350
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1870
+msgid "Cancel"
+msgstr "キャンセル"
+
 #. Translators: Escape is a keyboard binding.
-#: ../e-util/e-alert-bar.c:118
+#: ../src/e-util/e-alert-bar.c:124
 msgid "Close this message (Escape)"
 msgstr "メッセージを閉じる (エスケープ)"
 
-#: ../e-util/e-attachment-bar.c:659 ../e-util/e-attachment-paned.c:702
-msgid "Icon View"
-msgstr "アイコンビュー"
+#: ../src/e-util/e-alert-sink.c:244
+#, fuzzy
+#| msgid "Failed to mark messages as read."
+msgid "Failed to create a thread: "
+msgstr "メッセージを既読にするのに失敗しました"
 
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:704
-msgid "List View"
-msgstr "一覧ビュー"
+#. To Translators: This text is set as a description of an attached
+#. * 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.
+#: ../src/e-util/e-attachment.c:1138
+msgid "Attached message"
+msgstr "添付メッセージ"
+
+#: ../src/e-util/e-attachment.c:2040 ../src/e-util/e-attachment.c:3093
+#, fuzzy
+#| msgid "Import cancelled."
+msgid "Operation was cancelled"
+msgstr "インポートをキャンセルしました。"
+
+#. Translators: Default attachment filename.
+#: ../src/e-util/e-attachment.c:2224 ../src/e-util/e-attachment.c:2940
+#: ../src/e-util/e-attachment.c:3383 ../src/e-util/e-attachment-store.c:886
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../src/e-util/e-attachment.c:2302 ../src/e-util/e-attachment.c:3443
+msgid "A load operation is already in progress"
+msgstr "読み込み操作が既に進行中"
+
+#: ../src/e-util/e-attachment.c:2310 ../src/e-util/e-attachment.c:3451
+msgid "A save operation is already in progress"
+msgstr "保存操作が既に進行中"
+
+#: ../src/e-util/e-attachment.c:2707
+#, fuzzy, c-format
+#| msgid "Could not open %s:"
+msgid "Could not open “%s”"
+msgstr "%s を開けませんでした:"
+
+#: ../src/e-util/e-attachment.c:2710
+#, c-format
+msgid "Could not open the attachment"
+msgstr "添付ファイルを開けませんでした"
+
+#: ../src/e-util/e-attachment.c:3460
+msgid "Attachment contents not loaded"
+msgstr "添付内容を読み込みませんでした"
+
+#: ../src/e-util/e-attachment.c:3551
+#, fuzzy, c-format
+#| msgid "Could not save '%s'"
+msgid "Could not save “%s”"
+msgstr "'%s' を保存できませんでした"
+
+#: ../src/e-util/e-attachment.c:3554
+#, c-format
+msgid "Could not save the attachment"
+msgstr "添付ファイルを保存できませんでした"
 
-#: ../e-util/e-attachment-dialog.c:317
+#: ../src/e-util/e-attachment-dialog.c:315
 msgid "Attachment Properties"
 msgstr "添付ファイルのプロパティ"
 
-#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:273
+#: ../src/e-util/e-attachment-dialog.c:337
+#: ../src/e-util/e-import-assistant.c:276
 msgid "F_ilename:"
 msgstr "ファイル名(_I):"
 
-#: ../e-util/e-attachment-dialog.c:374
+#: ../src/e-util/e-attachment-dialog.c:354
+#: ../src/e-util/e-html-editor-image-dialog.c:508
+#: ../src/e-util/e-html-editor-link-dialog.c:241
+msgid "_Description:"
+msgstr "説明(_D):"
+
+#: ../src/e-util/e-attachment-dialog.c:372
 msgid "MIME Type:"
 msgstr "MIME 型"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:482
+#: ../src/e-util/e-attachment-dialog.c:380
+#: ../src/e-util/e-attachment-store.c:694
 msgid "_Suggest automatic display of attachment"
 msgstr "添付ファイルを自動的に表示するか提示する(_S)"
 
-#: ../e-util/e-attachment-handler-image.c:96
+#: ../src/e-util/e-attachment-handler-image.c:96
 msgid "Could not set as background"
 msgstr "壁紙にセットできませんでした"
 
-#: ../e-util/e-attachment-handler-image.c:146
+#: ../src/e-util/e-attachment-handler-image.c:146
 msgid "Set as _Background"
 msgstr "壁紙にセットする(_B)"
 
-#: ../e-util/e-attachment-icon-view.c:165
-#: ../e-util/e-attachment-tree-view.c:548
+#: ../src/e-util/e-attachment-icon-view.c:168
+#: ../src/e-util/e-attachment-tree-view.c:168
 msgid "Loading"
 msgstr "読み込み中"
 
-#: ../e-util/e-attachment-icon-view.c:177
-#: ../e-util/e-attachment-tree-view.c:560
+#: ../src/e-util/e-attachment-icon-view.c:180
+#: ../src/e-util/e-attachment-tree-view.c:180
 msgid "Saving"
 msgstr "保存中"
 
-#: ../e-util/e-attachment-paned.c:103
+#: ../src/e-util/e-attachment-paned.c:103
 msgid "Hide Attachment _Bar"
 msgstr "添付ファイルバーを隠す(_B)"
 
-#: ../e-util/e-attachment-paned.c:105 ../e-util/e-attachment-paned.c:718
+#: ../src/e-util/e-attachment-paned.c:105
+#: ../src/e-util/e-attachment-paned.c:741
 msgid "Show Attachment _Bar"
 msgstr "添付ファイルバーを表示する(_B)"
 
-#: ../e-util/e-attachment-store.c:462
+#: ../src/e-util/e-attachment-store.c:659
 msgid "Add Attachment"
 msgstr "添付ファイルの追加"
 
-#: ../e-util/e-attachment-store.c:465
+#: ../src/e-util/e-attachment-store.c:666
+#: ../src/e-util/e-attachment-store.c:668
 msgid "A_ttach"
 msgstr "添付する(_T)"
 
-#: ../e-util/e-attachment-store.c:536
+#: ../src/e-util/e-attachment-store.c:715
+msgid "Archive selected directories using this format:"
+msgstr ""
+
+#: ../src/e-util/e-attachment-store.c:823
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "添付ファイルの保存"
 
-#. Translators: Default attachment filename.
-#: ../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"
+#: ../src/e-util/e-attachment-store.c:850
+#, fuzzy
+#| msgid "Could not load the attachment"
+msgid "Do _not extract files from the attachment"
+msgstr "添付ファイルを読み込めませんでした"
+
+#: ../src/e-util/e-attachment-store.c:855
+msgid "Save extracted files _only"
+msgstr ""
 
-#: ../e-util/e-attachment-view.c:377
+#: ../src/e-util/e-attachment-store.c:860
+msgid "Save extracted files and the original _archive"
+msgstr ""
+
+#: ../src/e-util/e-attachment-view.c:308
 msgid "Open With Other Application..."
 msgstr "他のアプリケーションで開く..."
 
-#: ../e-util/e-attachment-view.c:384
+#: ../src/e-util/e-attachment-view.c:315
 msgid "S_ave All"
 msgstr "すべて保存する(_A)"
 
-#: ../e-util/e-attachment-view.c:391
-#, fuzzy
-#| msgid "Sa_ve"
+#: ../src/e-util/e-attachment-view.c:322
 msgid "Sa_ve As"
-msgstr "保存(_V)"
+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..."
+#: ../src/e-util/e-attachment-view.c:331
+#: ../src/plugins/save-calendar/save-calendar.c:351
+#: ../src/plugins/save-calendar/save-calendar.c:382
+#: ../src/plugins/save-calendar/save-calendar.c:413
 msgid "Save _As"
-msgstr "名前を付けて保存(_A)..."
+msgstr "名前を付けて保存(_A)"
 
-#: ../e-util/e-attachment-view.c:410
+#: ../src/e-util/e-attachment-view.c:341
 msgid "A_dd Attachment..."
 msgstr "添付ファイルの追加(_D)..."
 
-#: ../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
+#: ../src/e-util/e-attachment-view.c:348
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1098
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1276
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:605
+#: ../src/modules/calendar/e-task-shell-view-actions.c:731
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1664
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1735
 msgid "_Properties"
 msgstr "プロパティ(_P)"
 
-#: ../e-util/e-attachment-view.c:434
-msgid "_Hide"
-msgstr "隠す(_H)"
-
-#: ../e-util/e-attachment-view.c:441
-msgid "Hid_e All"
-msgstr "すべて隠す(_E)"
-
-#: ../e-util/e-attachment-view.c:448
-msgid "_View Inline"
-msgstr "インライン表示(_V)"
-
-#: ../e-util/e-attachment-view.c:455
-msgid "Vie_w All Inline"
-msgstr "すべてインラインで表示(_W)"
-
-#: ../e-util/e-attachment-view.c:785
-#, c-format
-msgid "Open With \"%s\""
+#: ../src/e-util/e-attachment-view.c:658
+#, fuzzy, c-format
+#| msgid "Open With \"%s\""
+msgid "Open With “%s”"
 msgstr "\"%s\" で開く"
 
-#: ../e-util/e-attachment-view.c:788
+#: ../src/e-util/e-attachment-view.c:661
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "この添付ファイルを %s で開く"
 
-#. To Translators: This text is set as a description of an attached
-#. * 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:1108
-msgid "Attached message"
-msgstr "添付メッセージ"
-
-#: ../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:2147 ../e-util/e-attachment.c:3035
-msgid "A save operation is already in progress"
-msgstr "保存操作が既に進行中"
-
-#: ../e-util/e-attachment.c:2267
-#, c-format
-msgid "Could not load '%s'"
-msgstr "'%s' を読み込めませんでした"
-
-#: ../e-util/e-attachment.c:2270
-#, c-format
-msgid "Could not load the attachment"
-msgstr "添付ファイルを読み込めませんでした"
-
-#: ../e-util/e-attachment.c:2574
-#, c-format
-msgid "Could not open '%s'"
-msgstr "'%s' を開けませんでした"
-
-#: ../e-util/e-attachment.c:2577
-#, c-format
-msgid "Could not open the attachment"
-msgstr "添付ファイルを開けませんでした"
-
-#: ../e-util/e-attachment.c:3044
-msgid "Attachment contents not loaded"
-msgstr "添付内容を読み込みませんでした"
-
-#: ../e-util/e-attachment.c:3124
-#, c-format
-msgid "Could not save '%s'"
-msgstr "'%s' を保存できませんでした"
-
-#: ../e-util/e-attachment.c:3127
-#, c-format
-msgid "Could not save the attachment"
-msgstr "添付ファイルを保存できませんでした"
-
-#: ../e-util/e-book-source-config.c:97
+#: ../src/e-util/e-book-source-config.c:98
 msgid "Mark as default address book"
 msgstr "デフォルトのアドレス帳にする"
 
-#: ../e-util/e-book-source-config.c:102
+#: ../src/e-util/e-book-source-config.c:103
 msgid "Autocomplete with this address book"
 msgstr "このアドレス帳で自動補完"
 
-#: ../e-util/e-book-source-config.c:276
+#: ../src/e-util/e-book-source-config.c:277
 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:407
+#: ../src/e-util/e-buffer-tagger.c:410
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl を押しながらクリックするとリンクを開きます"
 
-#: ../e-util/e-cal-source-config.c:169
-msgid "Mark as default calendar"
-msgstr "デフォルトのカレンダーにする"
-
-#: ../e-util/e-cal-source-config.c:172
-msgid "Mark as default task list"
-msgstr "デフォルトのタスク一覧にする"
-
-#: ../e-util/e-cal-source-config.c:175
-msgid "Mark as default memo list"
-msgstr "デフォルトのメモ一覧にする"
+#: ../src/e-util/e-calendar.c:272
+msgid "Previous month"
+msgstr "前月へ"
 
-#: ../e-util/e-cal-source-config.c:200
-msgid "Color:"
-msgstr "色:"
+#: ../src/e-util/e-calendar.c:291
+msgid "Next month"
+msgstr "翌月へ"
 
-#: ../e-util/e-cal-source-config.c:405
-msgid "Copy calendar contents locally for offline operation"
-msgstr "オフライン用にカレンダーの内容をローカルへコピーする"
+#: ../src/e-util/e-calendar.c:311
+msgid "Previous year"
+msgstr "前年へ"
 
-#: ../e-util/e-cal-source-config.c:409
-msgid "Copy task list contents locally for offline operation"
-msgstr "オフライン用にタスク一覧の内容をローカルへコピーする"
+#: ../src/e-util/e-calendar.c:330
+msgid "Next year"
+msgstr "翌年へ"
 
-#: ../e-util/e-cal-source-config.c:413
-msgid "Copy memo list contents locally for offline operation"
-msgstr "オフライン用にメモ一覧の内容をローカルへコピーする"
+#: ../src/e-util/e-calendar.c:354
+msgid "Month Calendar"
+msgstr "月別カレンダー"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1326 ../e-util/e-calendar-item.c:2194
+#: ../src/e-util/e-calendar-item.c:1338 ../src/e-util/e-calendar-item.c:2218
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%m月"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1328
+#: ../src/e-util/e-calendar-item.c:1340
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y年"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1365
+#: ../src/e-util/e-calendar-item.c:1377
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%Y年%m月"
 
-#: ../e-util/e-calendar.c:189
-msgid "Previous month"
-msgstr "前月へ"
+#: ../src/e-util/e-cal-source-config.c:169
+msgid "Mark as default calendar"
+msgstr "デフォルトのカレンダーにする"
 
-#: ../e-util/e-calendar.c:214
-msgid "Next month"
-msgstr "翌月へ"
+#: ../src/e-util/e-cal-source-config.c:172
+msgid "Mark as default task list"
+msgstr "デフォルトのタスク一覧にする"
 
-#: ../e-util/e-calendar.c:240
-msgid "Previous year"
-msgstr "前年へ"
+#: ../src/e-util/e-cal-source-config.c:175
+msgid "Mark as default memo list"
+msgstr "デフォルトのメモ一覧にする"
 
-#: ../e-util/e-calendar.c:265
-msgid "Next year"
-msgstr "翌年へ"
+#: ../src/e-util/e-cal-source-config.c:200
+msgid "Color:"
+msgstr "色:"
 
-#: ../e-util/e-calendar.c:289
-msgid "Month Calendar"
-msgstr "月別カレンダー"
+#: ../src/e-util/e-cal-source-config.c:428
+msgid "Copy calendar contents locally for offline operation"
+msgstr "オフライン用にカレンダーの内容をローカルへコピーする"
 
-#: ../e-util/e-categories-editor.c:223
+#: ../src/e-util/e-cal-source-config.c:432
+msgid "Copy task list contents locally for offline operation"
+msgstr "オフライン用にタスク一覧の内容をローカルへコピーする"
+
+#: ../src/e-util/e-cal-source-config.c:436
+msgid "Copy memo list contents locally for offline operation"
+msgstr "オフライン用にメモ一覧の内容をローカルへコピーする"
+
+#: ../src/e-util/e-categories-editor.c:246
 msgid "Currently _used categories:"
 msgstr "現在利用しているカテゴリ(_U):"
 
-#: ../e-util/e-categories-editor.c:234
+#: ../src/e-util/e-categories-editor.c:257
 msgid "_Available Categories:"
 msgstr "利用可能な項目(_A)"
 
-#: ../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
+#: ../src/e-util/e-categories-editor.c:297
+#, fuzzy
+#| msgid "_New"
+msgctxt "category"
 msgid "_New"
 msgstr "新規(_N)"
 
-#: ../e-util/e-categories-selector.c:321
+#: ../src/e-util/e-categories-editor.c:301
+#, fuzzy
+#| msgid "_Edit"
+msgctxt "category"
+msgid "_Edit"
+msgstr "編集(_E)"
+
+#: ../src/e-util/e-categories-editor.c:305
+#, fuzzy
+#| msgid "_Delete"
+msgctxt "category"
+msgid "_Delete"
+msgstr "削除(_D)"
+
+#: ../src/e-util/e-categories-selector.c:323
 msgid "Icon"
 msgstr "アイコン"
 
-#: ../e-util/e-category-completion.c:299
-#, c-format
-msgid "Create category \"%s\""
+#: ../src/e-util/e-category-completion.c:304
+#, fuzzy, c-format
+#| msgid "Create category \"%s\""
+msgid "Create category “%s”"
 msgstr "カテゴリ \"%s\" を作成"
 
-#: ../e-util/e-category-editor.c:136
+#: ../src/e-util/e-category-editor.c:138
 msgid "Category Icon"
 msgstr "カテゴリアイコン"
 
-#: ../e-util/e-category-editor.c:140
+#: ../src/e-util/e-category-editor.c:142
 msgid "_No Image"
 msgstr "画像なし(_N)"
 
-#: ../e-util/e-category-editor.c:173
+#: ../src/e-util/e-category-editor.c:175
 msgid "Category _Name"
 msgstr "カテゴリ名(_N)"
 
-#: ../e-util/e-category-editor.c:185
+#: ../src/e-util/e-category-editor.c:188
 msgid "Category _Icon"
 msgstr "カテゴリアイコン(_I)"
 
-#: ../e-util/e-category-editor.c:211
+#: ../src/e-util/e-category-editor.c:214
 msgid "Category Properties"
 msgstr "カテゴリのプロパティ"
 
-#: ../e-util/e-category-editor.c:272
-#, c-format
-msgid "There is already a category '%s' in the configuration. Please use another name"
+#: ../src/e-util/e-category-editor.c:275
+#, fuzzy, c-format
+#| msgid ""
+#| "There is already a category '%s' in the configuration. Please use another "
+#| "name"
+msgid ""
+"There is already a category “%s” in the configuration. Please use another "
+"name"
 msgstr "設定には既にカテゴリ '%s' があります。別の名前を使ってください"
 
-#: ../e-util/e-cell-combo.c:185
+#: ../src/e-util/e-cell-combo.c:183
 msgid "popup list"
 msgstr "ポップアップの一覧"
 
-#: ../e-util/e-cell-date-edit.c:298
+#: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:137
+#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2066
+msgid "?"
+msgstr "?"
+
+#: ../src/e-util/e-cell-date-edit.c:320
 msgid "Now"
 msgstr "今"
 
 #. strftime format of a weekday and a date.
-#: ../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
+#: ../src/e-util/e-cell-date-edit.c:328 ../src/e-util/e-datetime-format.c:206
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1791
+#: ../src/modules/itip-formatter/itip-view.c:253
 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:316
+#: ../src/e-util/e-cell-date-edit.c:338
 msgctxt "table-date"
 msgid "None"
 msgstr "なし"
 
-#: ../e-util/e-cell-date-edit.c:324 ../mail/e-mail-label-dialog.c:200
+#: ../src/e-util/e-cell-date-edit.c:346 ../src/mail/e-mail-label-dialog.c:198
 msgid "OK"
 msgstr "OK"
 
-#: ../e-util/e-cell-date-edit.c:872
+#: ../src/e-util/e-cell-date-edit.c:897
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "時間はフォーマットに入れなければなりません: %s"
 
-#: ../e-util/e-cell-date.c:50 ../mail/message-list.c:1853
-msgid "?"
-msgstr "?"
-
-#: ../e-util/e-cell-percent.c:79
+#: ../src/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:99
-msgid "Character Encoding"
-msgstr "エンコーディング"
-
-#: ../e-util/e-charset-combo-box.c:122
-msgid "Enter the character set to use"
-msgstr "使用する文字集合を指定してください"
-
-#: ../e-util/e-charset-combo-box.c:368
-msgid "Other..."
-msgstr "その他..."
-
-#: ../e-util/e-charset.c:52
+#: ../src/e-util/e-charset.c:50
 msgid "Arabic"
 msgstr "アラビア語"
 
-#: ../e-util/e-charset.c:53
+#: ../src/e-util/e-charset.c:51
 msgid "Baltic"
 msgstr "バルト語"
 
-#: ../e-util/e-charset.c:54
+#: ../src/e-util/e-charset.c:52
 msgid "Central European"
 msgstr "中欧"
 
-#: ../e-util/e-charset.c:55
+#: ../src/e-util/e-charset.c:53
 msgid "Chinese"
 msgstr "中国語"
 
-#: ../e-util/e-charset.c:56
+#: ../src/e-util/e-charset.c:54
 msgid "Cyrillic"
 msgstr "キリル文字"
 
-#: ../e-util/e-charset.c:57
+#: ../src/e-util/e-charset.c:55
 msgid "Greek"
 msgstr "ギリシア語"
 
-#: ../e-util/e-charset.c:58
+#: ../src/e-util/e-charset.c:56
 msgid "Hebrew"
 msgstr "ヘブライ語"
 
-#: ../e-util/e-charset.c:59
+#: ../src/e-util/e-charset.c:57
 msgid "Japanese"
 msgstr "日本語"
 
-#: ../e-util/e-charset.c:60
+#: ../src/e-util/e-charset.c:58
 msgid "Korean"
 msgstr "韓国語"
 
-#: ../e-util/e-charset.c:61
+#: ../src/e-util/e-charset.c:59
 msgid "Thai"
 msgstr "タイ語"
 
-#: ../e-util/e-charset.c:62
+#: ../src/e-util/e-charset.c:60
 msgid "Turkish"
 msgstr "トルコ語"
 
-#: ../e-util/e-charset.c:63
+#: ../src/e-util/e-charset.c:61
 msgid "Unicode"
 msgstr "ユニコード"
 
-#: ../e-util/e-charset.c:64
+#: ../src/e-util/e-charset.c:62
 msgid "Western European"
 msgstr "西欧"
 
-#: ../e-util/e-charset.c:65
+#: ../src/e-util/e-charset.c:63
 msgid "Western European, New"
 msgstr "西欧 (New)"
 
 #. Translators: Character set "Chinese, Traditional"
-#: ../e-util/e-charset.c:84 ../e-util/e-charset.c:86 ../e-util/e-charset.c:88
+#: ../src/e-util/e-charset.c:82 ../src/e-util/e-charset.c:84
+#: ../src/e-util/e-charset.c:86
 msgid "Traditional"
 msgstr "繁体字中国語"
 
 #. Translators: Character set "Chinese, Simplified"
-#: ../e-util/e-charset.c:90 ../e-util/e-charset.c:92 ../e-util/e-charset.c:94
-#: ../e-util/e-charset.c:96
+#: ../src/e-util/e-charset.c:88 ../src/e-util/e-charset.c:90
+#: ../src/e-util/e-charset.c:92 ../src/e-util/e-charset.c:94
 msgid "Simplified"
 msgstr "簡体字中国語"
 
 #. Translators: Character set "Cyrillic, Ukrainian"
-#: ../e-util/e-charset.c:100
+#: ../src/e-util/e-charset.c:98
 msgid "Ukrainian"
 msgstr "ウクライナ語"
 
 #. Translators: Character set "Hebrew, Visual"
-#: ../e-util/e-charset.c:104
+#: ../src/e-util/e-charset.c:102
 msgid "Visual"
 msgstr "表示"
 
-#: ../e-util/e-client-cache.c:1189
-#, c-format
-msgid "Cannot create a client object from extension name '%s'"
+#: ../src/e-util/e-charset-combo-box.c:97
+msgid "Character Encoding"
+msgstr "エンコーディング"
+
+#: ../src/e-util/e-charset-combo-box.c:117
+msgid "Enter the character set to use"
+msgstr "使用する文字集合を指定してください"
+
+#: ../src/e-util/e-charset-combo-box.c:363
+msgid "Other..."
+msgstr "その他..."
+
+#: ../src/e-util/e-client-cache.c:1149 ../src/e-util/e-client-cache.c:1280
+#, fuzzy, c-format
+#| msgid "Cannot create a client object from extension name '%s'"
+msgid "Cannot create a client object from extension name “%s”"
 msgstr "拡張子 '%s' からクライアントオブジェクトを作成することができません"
 
-#: ../e-util/e-dateedit.c:523
+#: ../src/e-util/e-color-chooser-widget.c:122
+msgid "Choose custom color"
+msgstr "カスタムフォントの選択"
+
+#: ../src/e-util/e-color-combo.c:79
+msgid "black"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:80
+msgid "light brown"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:81
+msgid "brown gold"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:82
+msgid "dark green #2"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:83
+msgid "navy"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:84
+msgid "dark blue"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:85
+msgid "purple #2"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:86
+msgid "very dark gray"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:88
+#, fuzzy
+#| msgid "Mark as _Unread"
+msgid "dark red"
+msgstr "未読としてマーク(_U)"
+
+#: ../src/e-util/e-color-combo.c:89
+msgid "red-orange"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:90
+msgid "gold"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:91
+msgid "dark green"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:92
+msgid "dull blue"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:93
+msgid "blue"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:94
+msgid "dull purple"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:95
+msgid "dark grey"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:97
+#, fuzzy
+#| msgid "3rd"
+msgid "red"
+msgstr "3日"
+
+#: ../src/e-util/e-color-combo.c:98
+msgid "orange"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:99
+msgid "lime"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:100
+msgid "dull green"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:101
+msgid "dull blue #2"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:102
+msgid "sky blue #2"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:103
+msgid "purple"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:104
+msgid "gray"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:106
+#, fuzzy
+#| msgid "Image"
+msgid "magenta"
+msgstr "画像"
+
+#: ../src/e-util/e-color-combo.c:107
+msgid "bright orange"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:108
+msgid "yellow"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:109
+msgid "green"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:110
+msgid "cyan"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:111
+msgid "bright blue"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:112
+#, fuzzy
+#| msgid "_Required people"
+msgid "red purple"
+msgstr "必須な人達(_R)"
+
+#: ../src/e-util/e-color-combo.c:113
+msgid "light grey"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:115
+msgid "pink"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:116
+msgid "light orange"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:117
+msgid "light yellow"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:118
+msgid "light green"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:119
+msgid "light cyan"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:120
+msgid "light blue"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:121
+msgid "light purple"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:122
+msgid "white"
+msgstr ""
+
+#: ../src/e-util/e-color-combo.c:642 ../src/mail/e-mail-account-tree-view.c:135
+#: ../src/mail/e-mail-config-security-page.c:406
+#: ../src/mail/e-mail-config-security-page.c:570
+#: ../src/mail/e-mail-reader.c:4049 ../src/mail/mail-config.ui.h:75
+msgid "Default"
+msgstr "デフォルト"
+
+#: ../src/e-util/e-dateedit.c:524
 msgid "Date and Time"
 msgstr "日付と時刻"
 
-#: ../e-util/e-dateedit.c:548
+#: ../src/e-util/e-dateedit.c:549
 msgid "Text entry to input date"
 msgstr "日付を入力するためのエントリです"
 
-#: ../e-util/e-dateedit.c:571
+#: ../src/e-util/e-dateedit.c:572
 msgid "Click this button to show a calendar"
 msgstr "このボタンをクリックするとカレンダーを表示します"
 
-#: ../e-util/e-dateedit.c:625
+#: ../src/e-util/e-dateedit.c:626
 msgid "Drop-down combination box to select time"
 msgstr "時刻を選択するためのドロップダウン式のコンボボックスです"
 
-#: ../e-util/e-dateedit.c:626
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../src/e-util/e-dateedit.c:627
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "時刻"
 
-#: ../e-util/e-dateedit.c:700
+#: ../src/e-util/e-dateedit.c:701
 msgid "No_w"
 msgstr "今すぐ(_W)"
 
-#: ../e-util/e-dateedit.c:707
+#: ../src/e-util/e-dateedit.c:708
 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:716
+#: ../src/e-util/e-dateedit.c:717
 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:1838 ../e-util/e-dateedit.c:2086
+#: ../src/e-util/e-dateedit.c:1846 ../src/e-util/e-dateedit.c:2094
 msgctxt "date"
 msgid "None"
 msgstr "なし"
 
-#: ../e-util/e-dateedit.c:1978
+#: ../src/e-util/e-dateedit.c:1986
 msgid "Invalid Date Value"
 msgstr "不正な日付"
 
-#: ../e-util/e-dateedit.c:2023
+#: ../src/e-util/e-dateedit.c:2031
 msgid "Invalid Time Value"
 msgstr "不正な時刻"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:251
+#: ../src/e-util/e-datetime-format.c:217
+#: ../src/modules/itip-formatter/itip-view.c:281
 msgid "Tomorrow"
 msgstr "明日"
 
-#: ../e-util/e-datetime-format.c:221
+#: ../src/e-util/e-datetime-format.c:219
 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:229
+#: ../src/e-util/e-datetime-format.c:227
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "次の月曜"
@@ -10108,7 +13186,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:235
+#: ../src/e-util/e-datetime-format.c:233
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "次の火曜"
@@ -10116,7 +13194,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:241
+#: ../src/e-util/e-datetime-format.c:239
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "次の水曜"
@@ -10124,7 +13202,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:247
+#: ../src/e-util/e-datetime-format.c:245
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "次の木曜"
@@ -10132,7 +13210,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:253
+#: ../src/e-util/e-datetime-format.c:251
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "次の金曜"
@@ -10140,7 +13218,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:259
+#: ../src/e-util/e-datetime-format.c:257
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "次の土曜"
@@ -10148,162 +13226,306 @@ 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:265
+#: ../src/e-util/e-datetime-format.c:263
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "次の日曜"
 
-#: ../e-util/e-datetime-format.c:352 ../e-util/e-datetime-format.c:362
-#: ../e-util/e-datetime-format.c:371
+#: ../src/e-util/e-datetime-format.c:349 ../src/e-util/e-datetime-format.c:359
+#: ../src/e-util/e-datetime-format.c:368
 msgid "Use locale default"
 msgstr "システムのデフォルトを使用"
 
-#: ../e-util/e-datetime-format.c:576
+#: ../src/e-util/e-datetime-format.c:573
 msgid "Format:"
 msgstr "フォーマット:"
 
-#: ../e-util/e-file-utils.c:120
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ days ]"
+#: ../src/e-util/e-dialog-widgets.c:181
+#, fuzzy
+#| msgid "days"
+msgctxt "time-unit"
+msgid "days"
+msgstr "日"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ weeks ]"
+#: ../src/e-util/e-dialog-widgets.c:183
+#, fuzzy
+#| msgid "weeks"
+msgctxt "time-unit"
+msgid "weeks"
+msgstr "週"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ months ]"
+#: ../src/e-util/e-dialog-widgets.c:185
+#, fuzzy
+#| msgid "months"
+msgctxt "time-unit"
+msgid "months"
+msgstr "月"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ years ]"
+#: ../src/e-util/e-dialog-widgets.c:187
+#, fuzzy
+#| msgid "years"
+msgctxt "time-unit"
+msgid "years"
+msgstr "年"
+
+#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ days ]"
+#: ../src/e-util/e-dialog-widgets.c:245
+msgid "Do not synchronize locally mails older than"
+msgstr ""
+
+#. Translators: :-)
+#: ../src/e-util/e-emoticon-chooser.c:38
+msgid "_Smile"
+msgstr "スマイル(_S)"
+
+#. Translators: :-(
+#: ../src/e-util/e-emoticon-chooser.c:40
+msgid "S_ad"
+msgstr "悲しい(_A)"
+
+#. Translators: ;-)
+#: ../src/e-util/e-emoticon-chooser.c:42
+msgid "_Wink"
+msgstr "ウインク(_W)"
+
+#. Translators: :-P
+#: ../src/e-util/e-emoticon-chooser.c:44
+msgid "Ton_gue"
+msgstr "アッカンべー(_G)"
+
+#. Translators: :-))
+#: ../src/e-util/e-emoticon-chooser.c:46
+msgid "Laug_h"
+msgstr "笑顔(_H)"
+
+#. Translators: :-|
+#: ../src/e-util/e-emoticon-chooser.c:48
+msgid "_Plain"
+msgstr ""
+
+#. Translators: :-!
+#: ../src/e-util/e-emoticon-chooser.c:50
+msgid "Smi_rk"
+msgstr ""
+
+#. Translators: :"-)
+#: ../src/e-util/e-emoticon-chooser.c:52
+msgid "_Embarrassed"
+msgstr ""
+
+#. Translators: :-D
+#: ../src/e-util/e-emoticon-chooser.c:54
+msgid "_Big Smile"
+msgstr "大笑い(_B)"
+
+#. Translators: :-/
+#: ../src/e-util/e-emoticon-chooser.c:56
+msgid "Uncer_tain"
+msgstr "不確か(_T)"
+
+#. Translators: :-O
+#: ../src/e-util/e-emoticon-chooser.c:58
+msgid "S_urprise"
+msgstr "びっくり(_U)"
+
+#. Translators: :-S
+#: ../src/e-util/e-emoticon-chooser.c:60
+msgid "W_orried"
+msgstr "心配(_O)"
+
+#. Translators: :-*
+#: ../src/e-util/e-emoticon-chooser.c:62
+msgid "_Kiss"
+msgstr "キス(_K)"
+
+#. Translators: X-(
+#: ../src/e-util/e-emoticon-chooser.c:64
+msgid "A_ngry"
+msgstr "怒った(_N)"
+
+#. Translators: B-)
+#: ../src/e-util/e-emoticon-chooser.c:66
+msgid "_Cool"
+msgstr "クール(_C)"
+
+#. Translators: O:-)
+#: ../src/e-util/e-emoticon-chooser.c:68
+msgid "Ange_l"
+msgstr "天使(_L)"
+
+#. Translators: :'(
+#: ../src/e-util/e-emoticon-chooser.c:70
+msgid "Cr_ying"
+msgstr "泣いた(_Y)"
+
+#. Translators: :-Q
+#: ../src/e-util/e-emoticon-chooser.c:72
+msgid "S_ick"
+msgstr "気分悪い(_I)"
+
+#. Translators: |-)
+#: ../src/e-util/e-emoticon-chooser.c:74
+msgid "Tire_d"
+msgstr "つかれた(_D)"
+
+#. Translators: >:-)
+#: ../src/e-util/e-emoticon-chooser.c:76
+msgid "De_vilish"
+msgstr "悪魔(_V)"
+
+#. Translators: :-(|)
+#: ../src/e-util/e-emoticon-chooser.c:78
+msgid "_Monkey"
+msgstr "サル(_M)"
+
+#: ../src/e-util/e-file-utils.c:121
 msgid "(Unknown Filename)"
 msgstr "(ファイル名不明)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:124
-#, c-format
-msgid "Writing \"%s\""
+#: ../src/e-util/e-file-utils.c:125
+#, fuzzy, c-format
+#| msgid "Writing \"%s\""
+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:129
-#, c-format
-msgid "Writing \"%s\" to %s"
+#: ../src/e-util/e-file-utils.c:130
+#, fuzzy, c-format
+#| msgid "Writing \"%s\" to %s"
+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:66
+#: ../src/e-util/e-filter-datespec.c:64
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d秒前"
 
-#: ../e-util/e-filter-datespec.c:67
+#: ../src/e-util/e-filter-datespec.c:65
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "%d秒後"
 
-#: ../e-util/e-filter-datespec.c:68
+#: ../src/e-util/e-filter-datespec.c:66
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d分前"
 
-#: ../e-util/e-filter-datespec.c:69
+#: ../src/e-util/e-filter-datespec.c:67
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "%d分後"
 
-#: ../e-util/e-filter-datespec.c:70
+#: ../src/e-util/e-filter-datespec.c:68
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d時間前"
 
-#: ../e-util/e-filter-datespec.c:71
+#: ../src/e-util/e-filter-datespec.c:69
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "%d時間後"
 
-#: ../e-util/e-filter-datespec.c:72
+#: ../src/e-util/e-filter-datespec.c:70
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d日前"
 
-#: ../e-util/e-filter-datespec.c:73
+#: ../src/e-util/e-filter-datespec.c:71
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "%d日後"
 
-#: ../e-util/e-filter-datespec.c:74
+#: ../src/e-util/e-filter-datespec.c:72
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d週間前"
 
-#: ../e-util/e-filter-datespec.c:75
+#: ../src/e-util/e-filter-datespec.c:73
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "%d週間後"
 
-#: ../e-util/e-filter-datespec.c:76
+#: ../src/e-util/e-filter-datespec.c:74
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%dヶ月前"
 
-#: ../e-util/e-filter-datespec.c:77
+#: ../src/e-util/e-filter-datespec.c:75
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "%dヶ月後"
 
-#: ../e-util/e-filter-datespec.c:78
+#: ../src/e-util/e-filter-datespec.c:76
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d年前"
 
-#: ../e-util/e-filter-datespec.c:79
+#: ../src/e-util/e-filter-datespec.c:77
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "%d年後"
 
-#: ../e-util/e-filter-datespec.c:129
+#: ../src/e-util/e-filter-datespec.c:127
 msgid "<click here to select a date>"
 msgstr "<ここをクリックして日付を選択してください>"
 
-#: ../e-util/e-filter-datespec.c:132 ../e-util/e-filter-datespec.c:143
-#: ../e-util/e-filter-datespec.c:154
+#: ../src/e-util/e-filter-datespec.c:130 ../src/e-util/e-filter-datespec.c:141
+#: ../src/e-util/e-filter-datespec.c:152
 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:139
+#: ../src/e-util/e-filter-datespec.c:137
 msgid "%d-%b-%Y"
 msgstr "%Y-%m-%d"
 
-#: ../e-util/e-filter-datespec.c:288
+#: ../src/e-util/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "比較するもう1つの時間の選択"
 
-#: ../e-util/e-filter-file.c:186
+#: ../src/e-util/e-filter-file.c:184
 msgid "Choose a File"
 msgstr "ファイルの選択"
 
-#: ../e-util/e-filter-rule.c:750
+#: ../src/e-util/e-filter-rule.c:763
 msgid "R_ule name:"
 msgstr "ルール名(_U):"
 
-#: ../e-util/e-filter-rule.c:800
+#: ../src/e-util/e-filter-rule.c:813
 msgid "all the following conditions"
 msgstr "次の条件を全て満足したアイテムを検索します"
 
-#: ../e-util/e-filter-rule.c:801
+#: ../src/e-util/e-filter-rule.c:814
 msgid "any of the following conditions"
 msgstr "次の条件のどれかを満足したアイテムを検索します"
 
-#: ../e-util/e-filter-rule.c:807
+#: ../src/e-util/e-filter-rule.c:820
 msgid "_Find items which match:"
 msgstr "検索する条件(_F):"
 
-#: ../e-util/e-filter-rule.c:830
+#: ../src/e-util/e-filter-rule.c:843
 msgid "Find items that meet the following conditions"
 msgstr "次の条件を満足したアイテムを検索します"
 
@@ -10311,169 +13533,1248 @@ msgstr "次の条件を満足したアイテムを検索します"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../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
+#: ../src/e-util/e-filter-rule.c:858
+#: ../src/e-util/e-html-editor-page-dialog.c:59
+#: ../src/e-util/e-mail-identity-combo-box.c:597
+#: ../src/e-util/e-mail-signature-combo-box.c:422
+#: ../src/libemail-engine/camel-null-store.c:28
+#: ../src/mail/e-mail-config-summary-page.c:140
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:629
 msgid "None"
 msgstr "なし"
 
-#: ../e-util/e-filter-rule.c:846
+#: ../src/e-util/e-filter-rule.c:859
 msgid "All related"
 msgstr "関係するものすべて"
 
-#: ../e-util/e-filter-rule.c:848
+#: ../src/e-util/e-filter-rule.c:860 ../src/e-util/e-send-options.ui.h:24
+msgid "Replies"
+msgstr "返信だけ"
+
+#: ../src/e-util/e-filter-rule.c:861
 msgid "Replies and parents"
 msgstr "返信とその親"
 
-#: ../e-util/e-filter-rule.c:849
+#: ../src/e-util/e-filter-rule.c:862
 msgid "No reply or parent"
 msgstr "返信とその親以外"
 
-#: ../e-util/e-filter-rule.c:852
+#: ../src/e-util/e-filter-rule.c:865
 msgid "I_nclude threads:"
 msgstr " スレッドの種類(_N):"
 
-#: ../e-util/e-filter-rule.c:929
+#: ../src/e-util/e-filter-rule.c:944
 msgid "A_dd Condition"
 msgstr "条件の追加(_D)"
 
-#: ../e-util/e-filter-rule.c:1243 ../mail/em-utils.c:230
+#: ../src/e-util/e-filter-rule.c:1258 ../src/e-util/filter.ui.h:1
+#: ../src/mail/em-utils.c:166
+msgid "Incoming"
+msgstr "受信したメッセージ"
+
+#: ../src/e-util/e-filter-rule.c:1258 ../src/mail/em-utils.c:167
 msgid "Outgoing"
 msgstr "送信するメッセージ"
 
-#: ../e-util/e-import-assistant.c:256
-msgid "Choose the file that you want to import into Evolution, and select what type of file it is from the 
list."
-msgstr "Evolution に取り込むファイルを選択し、プルダウンリストからそのファイルの種類を選択してください。"
+#: ../src/e-util/e-html-editor-actions.c:80
+#, fuzzy
+#| msgid "Failed to open folder."
+msgid "Failed to insert HTML file."
+msgstr "フォルダーを開けませんでした"
+
+#: ../src/e-util/e-html-editor-actions.c:118
+#, fuzzy
+#| msgid "Failed to import certificate"
+msgid "Failed to insert text file."
+msgstr "証明書のインポートに失敗しました"
+
+#: ../src/e-util/e-html-editor-actions.c:319
+msgid "Insert HTML File"
+msgstr "HTML ファイルを挿入"
+
+#: ../src/e-util/e-html-editor-actions.c:325
+#, fuzzy
+#| msgid "HTML _Mode"
+msgid "HTML file"
+msgstr "HTML モード(_M)"
+
+#: ../src/e-util/e-html-editor-actions.c:355
+msgctxt "dialog-title"
+msgid "Insert Image"
+msgstr "画像の挿入"
+
+#: ../src/e-util/e-html-editor-actions.c:413
+msgid "Insert text file"
+msgstr "テキストファイルを挿入"
+
+#: ../src/e-util/e-html-editor-actions.c:419
+#, fuzzy
+#| msgid "Select a file"
+msgid "Text file"
+msgstr "ファイルの選択"
+
+#: ../src/e-util/e-html-editor-actions.c:880
+#, fuzzy
+#| msgid "Copy selected events to the clipboard"
+msgid "Copy selected text to the clipboard"
+msgstr "選択したイベントをクリップボードにコピーします"
+
+#: ../src/e-util/e-html-editor-actions.c:887
+#, fuzzy
+#| msgid "Cut selected events to the clipboard"
+msgid "Cut selected text to the clipboard"
+msgstr "選択したイベントを切り取ってクリップボードにコピーします"
+
+#. Widgets are treating Ctrl + v shortcut themselves
+#: ../src/e-util/e-html-editor-actions.c:894
+#, fuzzy
+#| msgid "Paste events from the clipboard"
+msgid "Paste text from the clipboard"
+msgstr "クリップボードからイベントを貼り付けます"
+
+#: ../src/e-util/e-html-editor-actions.c:901
+msgid "Redo the last undone action"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-actions.c:915
+#, fuzzy
+#| msgid "Copy the selection"
+msgid "Undo the last action"
+msgstr "選択した連絡先/予定をコピーします"
+
+#: ../src/e-util/e-html-editor-actions.c:936
+msgid "For_mat"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-actions.c:943
+#, fuzzy
+#| msgid "Tool_bar Style"
+msgid "_Paragraph Style"
+msgstr "ツールバーのスタイル(_B)"
+
+#: ../src/e-util/e-html-editor-actions.c:957
+#: ../src/e-util/e-html-editor-image-dialog.c:585
+msgid "_Alignment"
+msgstr "配置(_A)"
+
+#: ../src/e-util/e-html-editor-actions.c:964
+#, fuzzy
+#| msgid "_Languages"
+msgid "Current _Languages"
+msgstr "言語(_L)"
+
+#: ../src/e-util/e-html-editor-actions.c:981
+msgid "_Increase Indent"
+msgstr "インデントを増加(_I)"
+
+#: ../src/e-util/e-html-editor-actions.c:983
+msgid "Increase Indent"
+msgstr "インデントを増加"
+
+#: ../src/e-util/e-html-editor-actions.c:988
+msgid "_HTML File..."
+msgstr "HTML ファイル(_H)..."
+
+#: ../src/e-util/e-html-editor-actions.c:995
+msgid "Te_xt File..."
+msgstr "テキストファイル(_X)..."
+
+#: ../src/e-util/e-html-editor-actions.c:1002
+msgid "Paste _Quotation"
+msgstr "貼り付けて引用(_Q)"
+
+#: ../src/e-util/e-html-editor-actions.c:1009
+msgid "_Find..."
+msgstr "検索(_F)..."
+
+#: ../src/e-util/e-html-editor-actions.c:1011
+msgid "Search for text"
+msgstr "テキストの検索"
+
+#: ../src/e-util/e-html-editor-actions.c:1016
+msgid "Find A_gain"
+msgstr "再検索(_G)"
+
+#: ../src/e-util/e-html-editor-actions.c:1023
+msgid "Re_place..."
+msgstr "置き換え(_P)..."
+
+#: ../src/e-util/e-html-editor-actions.c:1025
+msgid "Search for and replace text"
+msgstr "文字列の検索と置換"
+
+#: ../src/e-util/e-html-editor-actions.c:1030
+#, fuzzy
+#| msgid "Canceling..."
+msgid "Check _Spelling..."
+msgstr "キャンセル中..."
+
+#: ../src/e-util/e-html-editor-actions.c:1037
+msgid "_Decrease Indent"
+msgstr "インデントを減少(_D)"
+
+#: ../src/e-util/e-html-editor-actions.c:1039
+msgid "Decrease Indent"
+msgstr "インデントを減少"
+
+#: ../src/e-util/e-html-editor-actions.c:1044
+msgid "_Wrap Lines"
+msgstr ""
+
+#. Center
+#: ../src/e-util/e-html-editor-actions.c:1054
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:108
+msgid "_Center"
+msgstr "中央(_C)"
+
+#: ../src/e-util/e-html-editor-actions.c:1056
+msgid "Center Alignment"
+msgstr "中央揃え"
+
+#. Left
+#: ../src/e-util/e-html-editor-actions.c:1061
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:99
+msgid "_Left"
+msgstr "左(_L)"
+
+#: ../src/e-util/e-html-editor-actions.c:1063
+msgid "Left Alignment"
+msgstr "左揃え"
+
+#. Right
+#: ../src/e-util/e-html-editor-actions.c:1068
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:117
+msgid "_Right"
+msgstr "右(_R)"
+
+#: ../src/e-util/e-html-editor-actions.c:1070
+msgid "Right Alignment"
+msgstr "右揃え"
+
+#: ../src/e-util/e-html-editor-actions.c:1078
+#: ../src/modules/text-highlight/languages.c:70
+msgid "_HTML"
+msgstr "_HTML"
+
+#: ../src/e-util/e-html-editor-actions.c:1080
+msgid "HTML editing mode"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-actions.c:1085
+msgid "Plain _Text"
+msgstr "プレーンテキスト(_T)"
+
+#: ../src/e-util/e-html-editor-actions.c:1087
+#, fuzzy
+#| msgid "Plain Text Mode"
+msgid "Plain text editing mode"
+msgstr "プレーンテキストモード"
+
+#: ../src/e-util/e-html-editor-actions.c:1095
+#, fuzzy
+#| msgid "Normal"
+msgid "_Normal"
+msgstr "普通"
+
+#: ../src/e-util/e-html-editor-actions.c:1102
+#, fuzzy
+#| msgid "Header _1"
+msgid "Heading _1"
+msgstr "見出し _1"
+
+#: ../src/e-util/e-html-editor-actions.c:1109
+#, fuzzy
+#| msgid "Header _2"
+msgid "Heading _2"
+msgstr "見出し _2"
+
+#: ../src/e-util/e-html-editor-actions.c:1116
+#, fuzzy
+#| msgid "Header _3"
+msgid "Heading _3"
+msgstr "見出し _3"
+
+#: ../src/e-util/e-html-editor-actions.c:1123
+#, fuzzy
+#| msgid "Header _4"
+msgid "Heading _4"
+msgstr "見出し _4"
+
+#: ../src/e-util/e-html-editor-actions.c:1130
+#, fuzzy
+#| msgid "Header _5"
+msgid "Heading _5"
+msgstr "見出し _5"
+
+#: ../src/e-util/e-html-editor-actions.c:1137
+#, fuzzy
+#| msgid "Header _6"
+msgid "Heading _6"
+msgstr "見出し _6"
+
+#: ../src/e-util/e-html-editor-actions.c:1144
+msgid "_Preformatted"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-actions.c:1151
+#, fuzzy
+#| msgid "Address"
+msgid "A_ddress"
+msgstr "住所"
+
+#: ../src/e-util/e-html-editor-actions.c:1158
+msgid "_Bulleted List"
+msgstr "箇条記号付きリスト(_B)"
+
+#: ../src/e-util/e-html-editor-actions.c:1165
+msgid "_Roman Numeral List"
+msgstr "ローマ数字のリスト(_R)"
 
-#: ../e-util/e-import-assistant.c:283
+#: ../src/e-util/e-html-editor-actions.c:1172
+msgid "Numbered _List"
+msgstr "数字付きリスト(_L)"
+
+#: ../src/e-util/e-html-editor-actions.c:1179
+msgid "_Alphabetical List"
+msgstr "アルファベットのリスト(_A)"
+
+#: ../src/e-util/e-html-editor-actions.c:1195
+#: ../src/e-util/e-html-editor-actions.c:1233
+#, fuzzy
+#| msgid "Save _Image..."
+msgid "_Image..."
+msgstr "画像を保存(_I)..."
+
+#. Translators: This is an action tooltip
+#: ../src/e-util/e-html-editor-actions.c:1198
+msgid "Insert Image"
+msgstr "画像を挿入"
+
+#: ../src/e-util/e-html-editor-actions.c:1203
+#: ../src/e-util/e-html-editor-actions.c:1240
+msgid "_Link..."
+msgstr "リンク(_L)..."
+
+#: ../src/e-util/e-html-editor-actions.c:1205
+msgid "Insert Link"
+msgstr "リンクを挿入"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../src/e-util/e-html-editor-actions.c:1211
+#: ../src/e-util/e-html-editor-actions.c:1255
+msgid "_Rule..."
+msgstr "水平線(_R)..."
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../src/e-util/e-html-editor-actions.c:1214
+msgid "Insert Rule"
+msgstr "水平線を挿入"
+
+#: ../src/e-util/e-html-editor-actions.c:1219
+#: ../src/e-util/e-html-editor-actions.c:1262
+msgid "_Table..."
+msgstr "テーブル(_T)..."
+
+#: ../src/e-util/e-html-editor-actions.c:1221
+msgid "Insert Table"
+msgstr "テーブルを挿入"
+
+#: ../src/e-util/e-html-editor-actions.c:1226
+msgid "_Cell..."
+msgstr "セル(_C)..."
+
+#: ../src/e-util/e-html-editor-actions.c:1247
+msgid "Pa_ge..."
+msgstr "ページ(_G)..."
+
+#: ../src/e-util/e-html-editor-actions.c:1271
+msgid "Font _Size"
+msgstr "フォントのサイズ(_S)"
+
+#: ../src/e-util/e-html-editor-actions.c:1278
+msgid "_Font Style"
+msgstr "フォントのスタイル(_F)"
+
+#: ../src/e-util/e-html-editor-actions.c:1285
+msgid "Paste As _Text"
+msgstr "テキストとして貼り付け(_T)"
+
+#: ../src/e-util/e-html-editor-actions.c:1296
+#: ../src/e-util/e-html-editor-text-dialog.c:201
+msgid "_Bold"
+msgstr "太字(_B)"
+
+#: ../src/e-util/e-html-editor-actions.c:1298
+msgid "Bold"
+msgstr "太字"
+
+#: ../src/e-util/e-html-editor-actions.c:1304
+#: ../src/e-util/e-html-editor-text-dialog.c:212
+msgid "_Italic"
+msgstr "斜体(_I)"
+
+#: ../src/e-util/e-html-editor-actions.c:1306
+msgid "Italic"
+msgstr "斜体"
+
+#: ../src/e-util/e-html-editor-actions.c:1312
+msgid "_Plain Text"
+msgstr "プレーンテキスト(_P)"
+
+#: ../src/e-util/e-html-editor-actions.c:1320
+#: ../src/e-util/e-html-editor-text-dialog.c:233
+msgid "_Strikethrough"
+msgstr "ストライク(_S)"
+
+#: ../src/e-util/e-html-editor-actions.c:1322
+msgid "Strikethrough"
+msgstr "ストライク"
+
+#: ../src/e-util/e-html-editor-actions.c:1328
+#: ../src/e-util/e-html-editor-text-dialog.c:223
+msgid "_Underline"
+msgstr "下線(_U)"
+
+#: ../src/e-util/e-html-editor-actions.c:1330
+msgid "Underline"
+msgstr "下線"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../src/e-util/e-html-editor-actions.c:1340
+msgid "-2"
+msgstr "-2"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../src/e-util/e-html-editor-actions.c:1348
+msgid "-1"
+msgstr "-1"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../src/e-util/e-html-editor-actions.c:1356
+msgid "+0"
+msgstr "+0"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../src/e-util/e-html-editor-actions.c:1364
+msgid "+1"
+msgstr "+1"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../src/e-util/e-html-editor-actions.c:1372
+msgid "+2"
+msgstr "+2"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../src/e-util/e-html-editor-actions.c:1380
+msgid "+3"
+msgstr "+3"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../src/e-util/e-html-editor-actions.c:1388
+msgid "+4"
+msgstr "+4"
+
+#: ../src/e-util/e-html-editor-actions.c:1407
+msgid "Cell Contents"
+msgstr "セルの内容"
+
+#: ../src/e-util/e-html-editor-actions.c:1414
+msgid "Column"
+msgstr "列"
+
+#: ../src/e-util/e-html-editor-actions.c:1421
+msgid "Row"
+msgstr "行"
+
+#: ../src/e-util/e-html-editor-actions.c:1428
+msgid "Table"
+msgstr "テーブル"
+
+#. Translators: Popup menu item caption, containing all the Delete options for a table
+#: ../src/e-util/e-html-editor-actions.c:1438
+msgid "Table Delete"
+msgstr "テーブルの削除"
+
+#. Translators: Popup menu item caption, containing all the Insert options for a table
+#: ../src/e-util/e-html-editor-actions.c:1446
+msgid "Table Insert"
+msgstr "テーブルの挿入"
+
+#: ../src/e-util/e-html-editor-actions.c:1453
+msgid "Properties"
+msgstr "プロパティ"
+
+#: ../src/e-util/e-html-editor-actions.c:1471
+msgid "Column After"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-actions.c:1478
+msgid "Column Before"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-actions.c:1485
+#, fuzzy
+#| msgid "_Insert"
+msgid "Insert _Link"
+msgstr "添付(_I)"
+
+#: ../src/e-util/e-html-editor-actions.c:1492
+msgid "Row Above"
+msgstr "行の上"
+
+#: ../src/e-util/e-html-editor-actions.c:1499
+msgid "Row Below"
+msgstr "行の下"
+
+#: ../src/e-util/e-html-editor-actions.c:1506
+msgid "Cell..."
+msgstr "セル..."
+
+#: ../src/e-util/e-html-editor-actions.c:1513
+msgid "Image..."
+msgstr "画像..."
+
+#: ../src/e-util/e-html-editor-actions.c:1520
+msgid "Link..."
+msgstr "リンク..."
+
+#: ../src/e-util/e-html-editor-actions.c:1527
+msgid "Page..."
+msgstr "ページ..."
+
+#: ../src/e-util/e-html-editor-actions.c:1534
+msgid "Paragraph..."
+msgstr "パラグラフ..."
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../src/e-util/e-html-editor-actions.c:1542
+msgid "Rule..."
+msgstr "水平線..."
+
+#: ../src/e-util/e-html-editor-actions.c:1549
+msgid "Table..."
+msgstr "テーブル..."
+
+#: ../src/e-util/e-html-editor-actions.c:1556
+msgid "Text..."
+msgstr "テキスト..."
+
+#: ../src/e-util/e-html-editor-actions.c:1563
+msgid "Remove Link"
+msgstr "リンクの削除"
+
+#: ../src/e-util/e-html-editor-actions.c:1580
+#, fuzzy
+#| msgid "Add \"%s\" to Dictionary"
+msgid "Add Word to Dictionary"
+msgstr "\"%s\" を辞書に追加"
+
+#: ../src/e-util/e-html-editor-actions.c:1587
+#, fuzzy
+#| msgid "Color for _misspelled words:"
+msgid "Ignore Misspelled Word"
+msgstr "スペルミスした文字の色(_M):"
+
+#: ../src/e-util/e-html-editor-actions.c:1594
+msgid "Add Word To"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-actions.c:1603
+#, fuzzy
+#| msgid "(no suggestions)"
+msgid "More Suggestions"
+msgstr "(提案無し)"
+
+#. Translators: %s will be replaced with the actual dictionary
+#. * name, where a user can add a word to. This is part of an
+#. * "Add Word To" submenu.
+#: ../src/e-util/e-html-editor-actions.c:1727
+#, fuzzy, c-format
+#| msgid "Add \"%s\" to Dictionary"
+msgid "%s Dictionary"
+msgstr "\"%s\" を辞書に追加"
+
+#: ../src/e-util/e-html-editor-actions.c:1806
+msgid "_Emoticon"
+msgstr "顔文字(_E)"
+
+#: ../src/e-util/e-html-editor-actions.c:1807
+msgid "Insert Emoticon"
+msgstr "顔文字の挿入"
+
+#: ../src/e-util/e-html-editor-actions.c:1875
+msgid "Re_place"
+msgstr "置き換え(_P)"
+
+#: ../src/e-util/e-html-editor-actions.c:1878
+msgid "_Image"
+msgstr "画像(_I)"
+
+#: ../src/e-util/e-html-editor-actions.c:1881
+msgid "_Link"
+msgstr "リンク(_L)"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../src/e-util/e-html-editor-actions.c:1885
+msgid "_Rule"
+msgstr "水平線(_R)"
+
+#: ../src/e-util/e-html-editor-actions.c:1888
+#: ../src/e-util/e-html-editor-cell-dialog.c:448
+msgid "_Table"
+msgstr "テーブル(_T)"
+
+#: ../src/e-util/e-html-editor.c:689
+msgid "Paragraph Style"
+msgstr "パラグラフのスタイル"
+
+#: ../src/e-util/e-html-editor.c:703
+msgid "Editing Mode"
+msgstr "編集モード"
+
+#: ../src/e-util/e-html-editor.c:715
+msgid "Font Color"
+msgstr "フォント色"
+
+#: ../src/e-util/e-html-editor.c:725
+msgid "Font Size"
+msgstr "フォントのサイズ"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:408
+msgid "<b>Scope</b>"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:422
+msgid "C_ell"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:435
+msgid "_Row"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:461
+msgid "Col_umn"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:471
+msgid "<b>Alignment &amp; Behavior</b>"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:484
+#: ../src/e-util/e-html-editor-hrule-dialog.c:328
+#: ../src/e-util/e-html-editor-table-dialog.c:649
+msgid "Left"
+msgstr "左"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:485
+#: ../src/e-util/e-html-editor-hrule-dialog.c:330
+#: ../src/e-util/e-html-editor-table-dialog.c:650
+msgid "Center"
+msgstr "中央"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:486
+#: ../src/e-util/e-html-editor-hrule-dialog.c:332
+#: ../src/e-util/e-html-editor-table-dialog.c:651
+msgid "Right"
+msgstr "右"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:494
+msgid "_Horizontal:"
+msgstr "水平位置(_H):"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:502
+#: ../src/e-util/e-html-editor-image-dialog.c:575
+msgid "Top"
+msgstr "上段"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:503
+#: ../src/e-util/e-html-editor-image-dialog.c:576
+msgid "Middle"
+msgstr "中段"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:504
+#: ../src/e-util/e-html-editor-image-dialog.c:577
+msgid "Bottom"
+msgstr "下段"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:512
+msgid "_Vertical:"
+msgstr "垂直位置(_V):"
+
+#. Wrap Text
+#: ../src/e-util/e-html-editor-cell-dialog.c:518
+#, fuzzy
+#| msgid "Plain Text"
+msgid "_Wrap Text"
+msgstr "プレーンテキスト"
+
+#. Header Style
+#: ../src/e-util/e-html-editor-cell-dialog.c:526
+#, fuzzy
+#| msgid "Header Value"
+msgid "_Header Style"
+msgstr "ヘッダーの値"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:540
+#: ../src/e-util/e-html-editor-image-dialog.c:515
+#: ../src/e-util/e-html-editor-table-dialog.c:561
+msgid "<b>Layout</b>"
+msgstr "<b>レイアウト</b>"
+
+#. Width
+#: ../src/e-util/e-html-editor-cell-dialog.c:551
+msgid "_Width"
+msgstr "幅(_W)"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:591
+msgid "Row S_pan:"
+msgstr "行スパン(_P):"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:605
+msgid "Co_lumn Span:"
+msgstr "列スパン(_L):"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:612
+#: ../src/e-util/e-html-editor-table-dialog.c:665
+msgid "<b>Background</b>"
+msgstr "<b>背景</b>"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:625
+#: ../src/e-util/e-html-editor-table-dialog.c:678
+msgid "Transparent"
+msgstr "透明"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:633
+#, fuzzy
+#| msgid "Color:"
+msgid "C_olor:"
+msgstr "色:"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:641
+#: ../src/e-util/e-html-editor-image-dialog.c:477
+#: ../src/e-util/e-html-editor-table-dialog.c:694
+#, fuzzy
+#| msgid "Could not set as background"
+msgid "Choose Background Image"
+msgstr "壁紙にセットできませんでした"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:646
+#: ../src/e-util/e-html-editor-image-dialog.c:483
+#: ../src/e-util/e-html-editor-table-dialog.c:699
+#, fuzzy
+#| msgid "Image"
+msgid "Images"
+msgstr "画像"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:659
+msgid "_Image:"
+msgstr "画像(_I):"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:666
+#: ../src/e-util/e-html-editor-page-dialog.c:495
+#: ../src/e-util/e-html-editor-table-dialog.c:719
+msgid "_Remove image"
+msgstr "画像を削除(_R)"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:686
+msgid "Cell Properties"
+msgstr "セルのプロパティ"
+
+#: ../src/e-util/e-html-editor-find-dialog.c:92
+#: ../src/e-util/e-html-editor-replace-dialog.c:68
+msgid "No match found"
+msgstr "見つかりませんでした"
+
+#: ../src/e-util/e-html-editor-find-dialog.c:215
+#: ../src/e-util/e-html-editor-replace-dialog.c:295
+msgid "Search _backwards"
+msgstr "先頭に向かって検索(_B)"
+
+#: ../src/e-util/e-html-editor-find-dialog.c:222
+msgid "Case _Sensitive"
+msgstr "大文字/小文字を区別(_S)"
+
+#: ../src/e-util/e-html-editor-find-dialog.c:229
+#, fuzzy
+#| msgid "_Search"
+msgid "_Wrap Search"
+msgstr "検索(_S)"
+
+#: ../src/e-util/e-html-editor-find-dialog.c:268
+#, fuzzy
+#| msgid "_Find Now"
+msgid "Find"
+msgstr "今すぐ検索(_F)"
+
+#: ../src/e-util/e-html-editor-hrule-dialog.c:263
+msgid "<b>Size</b>"
+msgstr "<b>サイズ</b>"
+
+#. Width
+#: ../src/e-util/e-html-editor-hrule-dialog.c:283
+#: ../src/e-util/e-html-editor-image-dialog.c:533
+#: ../src/e-util/e-html-editor-table-dialog.c:572
+msgid "_Width:"
+msgstr "幅(_W):"
+
+#: ../src/e-util/e-html-editor-hrule-dialog.c:308
+#, fuzzy
+#| msgid "Size"
+msgid "_Size:"
+msgstr "サイズ"
+
+#: ../src/e-util/e-html-editor-hrule-dialog.c:315
+msgid "<b>Style</b>"
+msgstr "<b>スタイル</b>"
+
+#: ../src/e-util/e-html-editor-hrule-dialog.c:340
+#: ../src/e-util/e-html-editor-table-dialog.c:658
+msgid "_Alignment:"
+msgstr "配置(_A):"
+
+#. Shaded
+#: ../src/e-util/e-html-editor-hrule-dialog.c:346
+msgid "S_haded"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-hrule-dialog.c:363
+#, fuzzy
+#| msgid "Folder Properties"
+msgid "Rule properties"
+msgstr "フォルダーのプロパティ"
+
+#: ../src/e-util/e-html-editor-image-dialog.c:465
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:64
+#: ../src/e-util/e-html-editor-table-dialog.c:515
+msgid "<b>General</b>"
+msgstr "<b>全般</b>"
+
+#: ../src/e-util/e-html-editor-image-dialog.c:494
+msgid "_Source:"
+msgstr "ソース(_S):"
+
+#: ../src/e-util/e-html-editor-image-dialog.c:557
+msgid "_Height:"
+msgstr "高さ(_H):"
+
+#: ../src/e-util/e-html-editor-image-dialog.c:598
+msgid "_X-Padding:"
+msgstr "左右の余白(_X):"
+
+#: ../src/e-util/e-html-editor-image-dialog.c:614
+msgid "_Y-Padding:"
+msgstr "上下の余白(_Y):"
+
+#: ../src/e-util/e-html-editor-image-dialog.c:630
+#: ../src/e-util/e-html-editor-table-dialog.c:639
+msgid "_Border:"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-image-dialog.c:640
+msgid "<b>Link</b>"
+msgstr "<b>リンク</b>"
+
+#: ../src/e-util/e-html-editor-image-dialog.c:658
+#: ../src/e-util/e-html-editor-link-dialog.c:219
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../src/e-util/e-html-editor-image-dialog.c:663
+#: ../src/e-util/e-html-editor-link-dialog.c:224
+msgid "_Test URL..."
+msgstr "URL テスト(_T)..."
+
+#: ../src/e-util/e-html-editor-image-dialog.c:680
+msgid "Image Properties"
+msgstr "画像のプロパティ"
+
+#: ../src/e-util/e-html-editor-link-dialog.c:248
+msgid "_Remove Link"
+msgstr "リンクを削除(_R)"
+
+#: ../src/e-util/e-html-editor-link-dialog.c:273
+msgid "Link Properties"
+msgstr "リンクのプロパティ"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:68
+msgid "Perforated Paper"
+msgstr "ルーズリーフ"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:77
+msgid "Blue Ink"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-page-dialog.c:86
+msgid "Paper"
+msgstr "紙"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:95
+msgid "Ribbon"
+msgstr "リボン"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:104
+msgid "Midnight"
+msgstr "夜中"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:122
+#: ../src/mail/filtertypes.xml.in.h:38 ../src/mail/searchtypes.xml.in.h:41
+#: ../src/mail/vfoldertypes.xml.in.h:41
+msgid "Draft"
+msgstr "下書き"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:131
+msgid "Graph Paper"
+msgstr "方眼紙"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:379
+msgid "<b>Colors</b>"
+msgstr "<b>色</b>"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:398
+msgid "_Text:"
+msgstr "テキスト(_T):"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:413
+msgid "_Link:"
+msgstr "リンク(_L):"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:428
+msgid "_Visited Link:"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-page-dialog.c:443
+msgid "_Background:"
+msgstr "背景(_B):"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:451
+msgid "<b>Background Image</b>"
+msgstr "<b>背景画像</b>"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:473
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
+msgid "_Template:"
+msgstr "テンプレート(_T):"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:481
+#: ../src/e-util/e-import-assistant.c:286
 msgid "Select a file"
 msgstr "ファイルの選択"
 
-#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
+#: ../src/e-util/e-html-editor-page-dialog.c:488
+msgid "_Custom:"
+msgstr "カスタム(_C):"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:515
+msgid "Page Properties"
+msgstr "ページのプロパティ"
+
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:81
+msgid "_Style:"
+msgstr "スタイル(_S):"
+
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:88
+msgid "<b>Alignment</b>"
+msgstr "<b>配置</b>"
+
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:153
+msgid "Paragraph Properties"
+msgstr "パラグラフのプロパティ"
+
+#: ../src/e-util/e-html-editor-replace-dialog.c:90
+#, fuzzy, c-format
+#| msgid "occurrences"
+msgid "%d occurrence replaced"
+msgid_plural "%d occurrences replaced"
+msgstr[0] "繰り返す"
+
+#: ../src/e-util/e-html-editor-replace-dialog.c:278
+msgid "R_eplace:"
+msgstr "置き換え(_E)"
+
+#: ../src/e-util/e-html-editor-replace-dialog.c:287
+msgid "_With:"
+msgstr "置き換え先(_W):"
+
+#: ../src/e-util/e-html-editor-replace-dialog.c:299
+msgid "_Case sensitive"
+msgstr "大文字と小文字を区別する(_C)\""
+
+#: ../src/e-util/e-html-editor-replace-dialog.c:303
+#, fuzzy
+#| msgid "_Search"
+msgid "Wra_p search"
+msgstr "検索(_S)"
+
+#: ../src/e-util/e-html-editor-replace-dialog.c:313
+msgid "_Skip"
+msgstr "スキップ(_S)"
+
+#: ../src/e-util/e-html-editor-replace-dialog.c:321
+#: ../src/e-util/e-system.error.xml.h:3
+msgid "_Replace"
+msgstr "置き換え(_R)"
+
+#: ../src/e-util/e-html-editor-replace-dialog.c:329
+msgid "Replace _All"
+msgstr "すべて置き換え(_A)"
+
+#: ../src/e-util/e-html-editor-replace-dialog.c:349
+msgctxt "dialog-title"
+msgid "Replace"
+msgstr "置き換え"
+
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:83
+#, c-format
+msgid "<b>Suggestions for “%s”</b>"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:388
+msgid "<b>Suggestions</b>"
+msgstr ""
+
+#. Replace
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:423
+#, fuzzy
+#| msgid "_Replace"
+msgid "Replace"
+msgstr "置き換え(_R)"
+
+#. Replace All
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:432
+#, fuzzy
+#| msgid "_Replace"
+msgid "Replace All"
+msgstr "置き換え(_R)"
+
+#. Ignore
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:441
+#: ../src/mail/mail.error.xml.h:116
+msgid "Ignore"
+msgstr "無視する"
+
+#. Skip
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:450
+msgid "Skip"
+msgstr ""
+
+#. Back
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:459
+#, fuzzy
+#| msgid "Go Back"
+msgid "Back"
+msgstr "前へ戻る"
+
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:468
+msgid "<b>Dictionary</b>"
+msgstr ""
+
+#. Add Word button
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:488
+#, fuzzy
+#| msgid "Add Folder"
+msgid "Add word"
+msgstr "フォルダーを追加"
+
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:505
+#: ../src/mail/mail-config.ui.h:39
+msgid "Spell Checking"
+msgstr "スペルチェック"
+
+#: ../src/e-util/e-html-editor-table-dialog.c:537
+msgid "_Rows:"
+msgstr "行の数(_R):"
+
+#: ../src/e-util/e-html-editor-table-dialog.c:554
+msgid "C_olumns:"
+msgstr "列の数(_O):"
+
+#: ../src/e-util/e-html-editor-table-dialog.c:605
+msgid "_Spacing:"
+msgstr "セル間隔幅(_S):"
+
+#: ../src/e-util/e-html-editor-table-dialog.c:622
+msgid "_Padding:"
+msgstr "余白幅(_P):"
+
+#: ../src/e-util/e-html-editor-table-dialog.c:686
+#: ../src/e-util/e-html-editor-text-dialog.c:248
+#, fuzzy
+#| msgid "Color:"
+msgid "_Color:"
+msgstr "色:"
+
+#: ../src/e-util/e-html-editor-table-dialog.c:712
+#, fuzzy
+#| msgid "Image"
+msgid "Image:"
+msgstr "画像"
+
+#: ../src/e-util/e-html-editor-table-dialog.c:739
+msgid "Table Properties"
+msgstr "テーブルのプロパティ"
+
+#: ../src/e-util/e-html-editor-text-dialog.c:268
+msgid "Si_ze:"
+msgstr "サイズ(_Z):"
+
+#: ../src/e-util/e-html-editor-text-dialog.c:283
+msgid "Text Properties"
+msgstr "テキストのプロパティ"
+
+#: ../src/e-util/e-import-assistant.c:259
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
+"Evolution に取り込むファイルを選択し、プルダウンリストからそのファイルの種類"
+"を選択してください。"
+
+#: ../src/e-util/e-import-assistant.c:300
+#: ../src/e-util/e-import-assistant.c:475
 msgid "File _type:"
 msgstr "ファイルの種類(_T):"
 
-#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:917
+#: ../src/e-util/e-import-assistant.c:343
+#: ../src/e-util/e-import-assistant.c:923
 msgid "Choose the destination for this import"
 msgstr "インポート先の選択"
 
-#: ../e-util/e-import-assistant.c:365
+#: ../src/e-util/e-import-assistant.c:368
 msgid "Choose the type of importer to run:"
 msgstr "インポートの種類を選択してください:"
 
-#: ../e-util/e-import-assistant.c:373
+#: ../src/e-util/e-import-assistant.c:376
 msgid "Import data and settings from _older programs"
 msgstr "以前のバージョンからデータとその設定をインポートする(_O)"
 
-#: ../e-util/e-import-assistant.c:381
+#: ../src/e-util/e-import-assistant.c:384
 msgid "Import a _single file"
 msgstr "一個のファイルをインポートする(_S)"
 
-#: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:201
+#: ../src/e-util/e-import-assistant.c:406
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:211
 msgid "Please select the information that you would like to import:"
 msgstr "インポートしたい情報を選択してください:"
 
-#: ../e-util/e-import-assistant.c:533
-msgid "Evolution checked for settings to import from the following applications: Pine, Netscape, Elm, 
iCalendar. No importable settings found. If you would like to try again, please click the \"Back\" button."
-msgstr "Evolution は Pine、Netscape、Elm、iCalendar 
からのインポートの設定をチェックしました。インポートできる設定は見つかりませんでした。再度チェックを実行する場合は、[戻る] をクリックしてください。"
+#: ../src/e-util/e-import-assistant.c:536
+#, fuzzy
+#| msgid ""
+#| "Evolution checked for settings to import from the following applications: "
+#| "Pine, Netscape, Elm, iCalendar. No importable settings found. If you "
+#| "would like to try again, please click the \"Back\" button."
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
+"would like to try again, please click the “Back” button."
+msgstr ""
+"Evolution は Pine、Netscape、Elm、iCalendar からのインポートの設定をチェック"
+"しました。インポートできる設定は見つかりませんでした。再度チェックを実行する"
+"場合は、[戻る] をクリックしてください。"
 
-#: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:230
+#: ../src/e-util/e-import-assistant.c:562
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:240
 #, c-format
 msgid "From %s:"
 msgstr "差出人 %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../e-util/e-import-assistant.c:775
+#: ../src/e-util/e-import-assistant.c:781
 msgid "_Cancel Import"
-msgstr "インポートをキャンセル(_C)"
+msgstr "元に戻す(_C)"
 
-#: ../e-util/e-import-assistant.c:916
+#: ../src/e-util/e-import-assistant.c:922
 msgid "Preview data to be imported"
 msgstr "インポートするデータのプレビューを表示します"
 
-#: ../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
+#: ../src/e-util/e-import-assistant.c:928
+#: ../src/e-util/e-import-assistant.c:941
+#: ../src/e-util/e-import-assistant.c:1294
+#: ../src/e-util/e-import-assistant.c:1370
+#: ../src/e-util/e-import-assistant.c:1379
 msgid "Import Data"
 msgstr "データのインポート"
 
-#: ../e-util/e-import-assistant.c:930
+#: ../src/e-util/e-import-assistant.c:936
 msgid "Select what type of file you want to import from the list."
 msgstr "一覧からどの種類のファイルをインポートしたいのか選択してください"
 
-#: ../e-util/e-import-assistant.c:1278 ../e-util/e-import-assistant.c:1313
+#: ../src/e-util/e-import-assistant.c:1284
+#: ../src/e-util/e-import-assistant.c:1319
 msgid "Evolution Import Assistant"
 msgstr "Evolution インポートアシスタント"
 
-#: ../e-util/e-import-assistant.c:1295 ../e-util/e-import-assistant.c:1351
+#: ../src/e-util/e-import-assistant.c:1301
+#: ../src/e-util/e-import-assistant.c:1357
 msgid "Import Location"
 msgstr "インポートする場所"
 
-#: ../e-util/e-import-assistant.c:1306
+#: ../src/e-util/e-import-assistant.c:1312
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing external files into Evolution."
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
 msgstr ""
 "Evolution インポートアシスタントへようこそ。\n"
-"このアシスタントを使って、外部のファイルを Evolution へインポートする手順をご案内します。"
+"このアシスタントを使って、外部のファイルを Evolution へインポートする手順をご"
+"案内します。"
 
-#: ../e-util/e-import-assistant.c:1323
+#: ../src/e-util/e-import-assistant.c:1329
 msgid "Importer Type"
 msgstr "インポートの種類"
 
-#: ../e-util/e-import-assistant.c:1333
+#: ../src/e-util/e-import-assistant.c:1339
 msgid "Select Information to Import"
 msgstr "インポートする情報の選択"
 
-#: ../e-util/e-import-assistant.c:1342
+#: ../src/e-util/e-import-assistant.c:1348
 msgid "Select a File"
 msgstr "ファイルの選択"
 
-#: ../e-util/e-import-assistant.c:1359
-msgid "Click \"Apply\" to begin importing the file into Evolution."
-msgstr "\"適用\" をクリックしてファイルの Evolution へのインポートを開始してください。"
+#: ../src/e-util/e-import-assistant.c:1365
+#, fuzzy
+#| msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgid "Click “Apply” to begin importing the file into Evolution."
+msgstr ""
+"\"適用\" をクリックしてファイルの Evolution へのインポートを開始してくださ"
+"い。"
 
-#: ../e-util/e-mail-signature-combo-box.c:377
+#: ../src/e-util/e-mail-signature-combo-box.c:431
 msgid "Autogenerated"
 msgstr "自動生成"
 
-#: ../e-util/e-mail-signature-editor.c:309
+#: ../src/e-util/e-mail-signature-editor.c:311 ../src/mail/e-mail-notes.c:933
 msgid "Close"
 msgstr "閉じる"
 
-#: ../e-util/e-mail-signature-editor.c:314
+#: ../src/e-util/e-mail-signature-editor.c:316 ../src/mail/e-mail-notes.c:938
 msgid "_Save and Close"
 msgstr "保存して閉じる(_S)"
 
-#: ../e-util/e-mail-signature-editor.c:528
+#: ../src/e-util/e-mail-signature-editor.c:559
 msgid "Edit Signature"
 msgstr "署名の編集"
 
-#: ../e-util/e-mail-signature-editor.c:548
+#: ../src/e-util/e-mail-signature-editor.c:592
 msgid "_Signature Name:"
 msgstr "署名の名称(_S):"
 
-#: ../e-util/e-mail-signature-editor.c:594
+#: ../src/e-util/e-mail-signature-editor.c:628
 msgid "Unnamed"
 msgstr "名前なし"
 
-#: ../e-util/e-mail-signature-manager.c:337
+#: ../src/e-util/e-mail-signature-manager.c:338
 msgid "Add _Script"
 msgstr "スクリプトの追加(_S)"
 
-#: ../e-util/e-mail-signature-manager.c:419
+#: ../src/e-util/e-mail-signature-manager.c:444
 msgid "Add Signature Script"
 msgstr "署名スクリプトの追加"
 
-#: ../e-util/e-mail-signature-manager.c:489
+#: ../src/e-util/e-mail-signature-manager.c:538
 msgid "Edit Signature Script"
 msgstr "署名スクリプトの編集"
 
-#: ../e-util/e-mail-signature-script-dialog.c:394
+#: ../src/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"
@@ -10483,495 +14784,852 @@ msgstr ""
 "使用されます。指定した \"名前\" は\n"
 "表示の目的でのみ使用されます。"
 
-#: ../e-util/e-mail-signature-script-dialog.c:445
+#: ../src/e-util/e-mail-signature-script-dialog.c:445
 msgid "S_cript:"
 msgstr "スクリプト(_C):"
 
-#: ../e-util/e-mail-signature-script-dialog.c:476
+#: ../src/e-util/e-mail-signature-script-dialog.c:476
 msgid "Script file must be executable."
 msgstr "スクリプトファイルは実行可能でなければなりません。"
 
-#: ../e-util/e-map.c:885
+#: ../src/e-util/e-map.c:886
 msgid "World Map"
 msgstr "世界地図"
 
-#: ../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 "マウスでタイムゾーンを選択するための地図ウィジェットです。キーボードをご利用の際は、この下にあるタイムゾーン選択用のドロップダウン式コンボボックスをご利用ください。"
+#: ../src/e-util/e-map.c:889
+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:246
+#: ../src/e-util/e-misc-utils.c:253
 msgid "Could not open the link."
 msgstr "リンクを開けませんでした"
 
-#: ../e-util/e-misc-utils.c:293
+#: ../src/e-util/e-misc-utils.c:336
 msgid "Could not display help for Evolution."
 msgstr "Evolution のヘルプを表示できませんでした。"
 
-#: ../e-util/e-name-selector-dialog.c:277
+#: ../src/e-util/e-misc-utils.c:2501
+#, fuzzy, c-format
+#| msgid "Opening calendar '%s'"
+msgid "Opening calendar “%s”"
+msgstr "カレンダー %s を開いています"
+
+#: ../src/e-util/e-misc-utils.c:2504
+#, fuzzy, c-format
+#| msgid "Opening memo list '%s'"
+msgid "Opening memo list “%s”"
+msgstr "メモ一覧 %s を開いています"
+
+#: ../src/e-util/e-misc-utils.c:2507
+#, fuzzy, c-format
+#| msgid "Opening task list '%s'"
+msgid "Opening task list “%s”"
+msgstr "タスク一覧 %s を開いています"
+
+#: ../src/e-util/e-misc-utils.c:2510
+#, fuzzy, c-format
+#| msgid "Opening calendar '%s'"
+msgid "Opening address book “%s”"
+msgstr "カレンダー %s を開いています"
+
+#: ../src/e-util/e-misc-utils.c:3290
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:146
+msgid "_Do not show this message again"
+msgstr "次回からこのメッセージを表示しない(_D)"
+
+#: ../src/e-util/e-name-selector-dialog.c:274
 msgid "Show Contacts"
 msgstr "連絡先を表示"
 
-#: ../e-util/e-name-selector-dialog.c:309
+#: ../src/e-util/e-name-selector-dialog.c:306
 msgid "Address B_ook:"
 msgstr "アドレス帳(_O):"
 
-#: ../e-util/e-name-selector-dialog.c:316
+#: ../src/e-util/e-name-selector-dialog.c:313
 msgid "Cat_egory:"
 msgstr "カテゴリ(_E):"
 
-#: ../e-util/e-name-selector-dialog.c:340
+#: ../src/e-util/e-name-selector-dialog.c:337
 msgid "_Search:"
 msgstr "検索(_S):"
 
-#: ../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
+#: ../src/e-util/e-name-selector-dialog.c:363
+#: ../src/e-util/e-name-selector-dialog.c:1330
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1184
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1624
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:758
+#: ../src/modules/calendar/e-task-shell-view-actions.c:931
 msgid "Any Category"
 msgstr "任意のカテゴリ"
 
-#: ../e-util/e-name-selector-dialog.c:368
+#: ../src/e-util/e-name-selector-dialog.c:365
 msgid "Co_ntacts"
 msgstr "連絡先(_N)"
 
-#: ../e-util/e-name-selector-dialog.c:445
+#: ../src/e-util/e-name-selector-dialog.c:442
 msgid "Search"
 msgstr "検索"
 
-#: ../e-util/e-name-selector-dialog.c:448
-#: ../mail/importers/pine-importer.c:427
+#: ../src/e-util/e-name-selector-dialog.c:445
+#: ../src/mail/importers/pine-importer.c:430
 msgid "Address Book"
 msgstr "アドレス帳"
 
-#: ../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:576
+#: ../src/e-util/e-name-selector-dialog.c:573
 msgid "Select Contacts from Address Book"
 msgstr "アドレス帳から連絡先を選択"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3038
+#: ../src/e-util/e-name-selector-entry.c:3207
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s をインラインに展開(_X)"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3054
+#: ../src/e-util/e-name-selector-entry.c:3223
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s をコピー(_Y)"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3065
+#: ../src/e-util/e-name-selector-entry.c:3234
 #, c-format
 msgid "C_ut %s"
 msgstr "%s を切り取り(_U)"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3083
+#: ../src/e-util/e-name-selector-entry.c:3252
 #, c-format
 msgid "_Edit %s"
 msgstr "%s を編集(_E)"
 
-#: ../e-util/e-name-selector-list.c:583
+#: ../src/e-util/e-name-selector-list.c:585
 #, c-format
 msgid "_Delete %s"
 msgstr "%s を削除(_D)"
 
-#: ../e-util/e-online-button.c:30
+#: ../src/e-util/e-online-button.c:30
 msgid "Evolution is currently online.  Click this button to work offline."
-msgstr "Evolution は現在オンラインです。このボタンをクリックしてオフライン動作させられます。"
+msgstr ""
+"Evolution は現在オンラインです。このボタンをクリックしてオフライン動作させら"
+"れます。"
 
-#: ../e-util/e-online-button.c:33
+#: ../src/e-util/e-online-button.c:33
 msgid "Evolution is currently offline.  Click this button to work online."
-msgstr "Evolution は現在オフラインです。このボタンをクリックしてオンラインで動作させることができます。"
+msgstr ""
+"Evolution は現在オフラインです。このボタンをクリックしてオンラインで動作させ"
+"ることができます。"
 
-#: ../e-util/e-online-button.c:36
+#: ../src/e-util/e-online-button.c:36
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "ネットワークに接続できないため、Evolution は現在オフラインです。"
 
-#: ../e-util/e-passwords.c:125
+#: ../src/e-util/e-passwords.c:125
 msgid "Keyring key is unusable: no user or host name"
 msgstr "キーリングのキーが使えません: ユーザーかホストの名前がありません"
 
-#: ../e-util/e-passwords.c:445
+#: ../src/e-util/e-passwords.c:445
 msgid "You have the Caps Lock key on."
 msgstr "Caps Lock キーがオンになっています。"
 
-#: ../e-util/e-passwords.c:576
+#: ../src/e-util/e-passwords.c:576
 msgid "_Remember this passphrase"
 msgstr "このパスフレーズを記憶する(_R)"
 
-#: ../e-util/e-passwords.c:577
+#: ../src/e-util/e-passwords.c:577
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "このセッションのリマインダー用にこのパスフレーズを記憶します(_R)"
 
-#: ../e-util/e-passwords.c:582
+#: ../src/e-util/e-passwords.c:582
 msgid "_Remember this password"
 msgstr "このパスワードを記憶する(_R)"
 
-#: ../e-util/e-passwords.c:583
+#: ../src/e-util/e-passwords.c:583
 msgid "_Remember this password for the remainder of this session"
 msgstr "このセッションのリマインダー用にこのパスワードを記憶します(_R)"
 
-#: ../e-util/e-preferences-window.c:318
+#: ../src/e-util/e-preferences-window.c:319
 msgid "Evolution Preferences"
 msgstr "Evolution の設定"
 
-#: ../e-util/e-print.c:160
+#: ../src/e-util/e-print.c:158
 msgid "An error occurred while printing"
 msgstr "印刷する際にエラーが発生しました"
 
-#: ../e-util/e-print.c:167
+#: ../src/e-util/e-print.c:165
 msgid "The printing system reported the following details about the error:"
 msgstr "エラーに関して印刷システムから次のような詳細情報が報告されました:"
 
-#: ../e-util/e-print.c:173
-msgid "The printing system did not report any additional details about the error."
+#: ../src/e-util/e-print.c:171
+msgid ""
+"The printing system did not report any additional details about the error."
 msgstr "印刷システムはエラーに関して何も詳細を報告してきませんでした。"
 
-#: ../e-util/e-proxy-editor.c:314
+#: ../src/e-util/e-proxy-editor.c:326
 msgid "_Method:"
 msgstr "メソッド(_M):"
 
-#: ../e-util/e-proxy-editor.c:336
+#: ../src/e-util/e-proxy-editor.c:348
 msgid "Defer to Desktop Settings"
 msgstr "デスクトップ設定に従う"
 
-#: ../e-util/e-proxy-editor.c:340
+#: ../src/e-util/e-proxy-editor.c:352
 msgid "_Open Desktop Settings"
 msgstr "デスクトップ設定を開く(_O)"
 
-#: ../e-util/e-proxy-editor.c:366
+#: ../src/e-util/e-proxy-editor.c:378
 msgid "Manual"
 msgstr "マニュアル"
 
-#: ../e-util/e-proxy-editor.c:385
+#: ../src/e-util/e-proxy-editor.c:397
 msgid "_HTTP Proxy:"
 msgstr "HTTP プロキシ(_H):"
 
-#: ../e-util/e-proxy-editor.c:416
+#: ../src/e-util/e-proxy-editor.c:428
 msgid "H_TTPS Proxy:"
 msgstr "HTTPS プロキシ(_T):"
 
-#: ../e-util/e-proxy-editor.c:447
+#: ../src/e-util/e-proxy-editor.c:459
 msgid "_Socks Proxy:"
 msgstr "Socks プロキシ(_S):"
 
-#: ../e-util/e-proxy-editor.c:478
+#: ../src/e-util/e-proxy-editor.c:490
 msgid "_Ignore Hosts:"
 msgstr "無視するホスト(_I):"
 
-#: ../e-util/e-proxy-editor.c:504
+#: ../src/e-util/e-proxy-editor.c:516
 msgid "Automatic"
 msgstr "自動設定"
 
-#: ../e-util/e-proxy-editor.c:523
+#: ../src/e-util/e-proxy-editor.c:535
 msgid "Configuration _URL:"
 msgstr "設定用URL(_U):"
 
-#: ../e-util/e-proxy-editor.c:552
+#: ../src/e-util/e-proxy-editor.c:561
+#, fuzzy
+#| msgid "No _Proxy for:"
+msgid "No proxy"
+msgstr "無視するホスト(_P):"
+
+#: ../src/e-util/e-proxy-editor.c:564
 msgid "Use a direct connection, no proxying required."
 msgstr "プロキシ不要で直接接続します。"
 
-#: ../e-util/e-proxy-preferences.c:177
+#: ../src/e-util/e-proxy-preferences.c:214
 msgid "Switch to Basic Proxy Preferences"
 msgstr "基礎的なプロキシ設定に切り替え"
 
-#: ../e-util/e-proxy-preferences.c:179
+#: ../src/e-util/e-proxy-preferences.c:216
 msgid "Switch to Advanced Proxy Preferences"
 msgstr "詳細なプロキシ設定に切り替え"
 
-#: ../e-util/e-proxy-preferences.c:463
+#: ../src/e-util/e-proxy-preferences.c:527
 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>ではネットワークの代替プロキシを定義して特定のアカウントに適用することができます。"
+#: ../src/e-util/e-proxy-preferences.c:562
+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
+#: ../src/e-util/e-proxy-selector.c:86
 msgid "Custom Proxy"
 msgstr "独自のプロキシ設定"
 
-#: ../e-util/e-proxy-selector.c:487
+#: ../src/e-util/e-proxy-selector.c:488
 msgid "Create a new proxy profile"
 msgstr "新しいプロキシのプロファイルを作成します"
 
-#: ../e-util/e-proxy-selector.c:492
+#: ../src/e-util/e-proxy-selector.c:493
 msgid "Delete the selected proxy profile"
 msgstr "選択したプロキシのプロファイルを削除します"
 
-#: ../e-util/e-rule-editor.c:184
+#: ../src/e-util/e-rule-editor.c:182
 msgid "Add Rule"
 msgstr "ルールの追加"
 
-#: ../e-util/e-rule-editor.c:286
+#: ../src/e-util/e-rule-editor.c:284
 msgid "Edit Rule"
 msgstr "ルールの編集"
 
-#: ../e-util/e-search-bar.c:82
+#: ../src/e-util/e-search-bar.c:82
 #, c-format
 msgid "Matches: %u"
 msgstr "検索結果: %u個"
 
-#: ../e-util/e-search-bar.c:566
+#: ../src/e-util/e-search-bar.c:609
 msgid "Close the find bar"
 msgstr "検索バーを閉じます"
 
-#: ../e-util/e-search-bar.c:574
+#: ../src/e-util/e-search-bar.c:617
 msgid "Fin_d:"
 msgstr "検索(_D):"
 
-#: ../e-util/e-search-bar.c:586
+#: ../src/e-util/e-search-bar.c:629
 msgid "Clear the search"
 msgstr "検索をクリア"
 
-#: ../e-util/e-search-bar.c:610
+#: ../src/e-util/e-search-bar.c:653
 msgid "_Previous"
 msgstr "前へ(_P)"
 
-#: ../e-util/e-search-bar.c:613
+#: ../src/e-util/e-search-bar.c:656
 msgid "Find the previous occurrence of the phrase"
 msgstr "フレーズの前の出現位置を検索"
 
-#: ../e-util/e-search-bar.c:622
+#: ../src/e-util/e-search-bar.c:665
 msgid "_Next"
 msgstr "次へ(_N)"
 
-#: ../e-util/e-search-bar.c:625
+#: ../src/e-util/e-search-bar.c:668
 msgid "Find the next occurrence of the phrase"
 msgstr "フレーズの次の出現位置を検索"
 
-#: ../e-util/e-search-bar.c:634
+#: ../src/e-util/e-search-bar.c:677
 msgid "Mat_ch case"
 msgstr "大文字小文字を区別して一致(_C)"
 
-#: ../e-util/e-search-bar.c:662
+#: ../src/e-util/e-search-bar.c:705
 msgid "Reached bottom of page, continued from top"
 msgstr "ページの末尾に到達しました。先頭から続行します"
 
-#: ../e-util/e-search-bar.c:684
+#: ../src/e-util/e-search-bar.c:727
 msgid "Reached top of page, continued from bottom"
 msgstr "ページの先頭に到達しました。末尾から続行します"
 
-#: ../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:569
+#: ../src/e-util/e-send-options.c:568
 msgid "When de_leted:"
 msgstr "削除した時(_L):"
 
-#: ../e-util/e-source-config.c:680 ../e-util/e-source-config.c:684
+#: ../src/e-util/e-send-options.ui.h:3
+msgid "Standard"
+msgstr "標準"
+
+#: ../src/e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr "独占"
+
+#: ../src/e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "機密"
+
+#: ../src/e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "極秘"
+
+#: ../src/e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+msgstr "親展"
+
+#. Translators: Used in send options dialog
+#: ../src/e-util/e-send-options.ui.h:12
+msgctxt "send-options"
+msgid "None"
+msgstr "送らない"
+
+#: ../src/e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr "開封通知を送る"
+
+#: ../src/e-util/e-send-options.ui.h:14
+msgid "Send Options"
+msgstr "送信オプション"
+
+#: ../src/e-util/e-send-options.ui.h:18
+msgid "R_eply requested"
+msgstr "返信を要求する(_E)"
+
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:20
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "指定した日数以内(_T):"
+
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "日"
+
+#: ../src/e-util/e-send-options.ui.h:23
+msgid "_When convenient"
+msgstr "都合の良い時(_W)"
+
+#. To translators: This means Delay the message delivery for some time
+#: ../src/e-util/e-send-options.ui.h:26
+msgid "_Delay message delivery"
+msgstr "メッセージの配送を遅らせる(_D)"
+
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:28
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "次の日以降(_A):"
+
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:30
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "日"
+
+#: ../src/e-util/e-send-options.ui.h:31
+msgid "_Set expiration date"
+msgstr "廃棄する日数を設定(_S)"
+
+#. Translators: This is part of
+#: ../src/e-util/e-send-options.ui.h:33
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "以下の日数(_U)"
+
+#: ../src/e-util/e-send-options.ui.h:34
+msgid "Delivery Options"
+msgstr "配信オプション"
+
+#: ../src/e-util/e-send-options.ui.h:35
+msgid "_Priority:"
+msgstr "優先度(_P):"
+
+#: ../src/e-util/e-send-options.ui.h:36
+msgid "_Classification:"
+msgstr "分類(_C)"
+
+#: ../src/e-util/e-send-options.ui.h:37
+msgid "Gene_ral Options"
+msgstr "全般のオプション(_R)"
+
+#: ../src/e-util/e-send-options.ui.h:38
+msgid "Creat_e a sent item to track information"
+msgstr "追跡情報に対する送信アイテムを作成する(_E)"
+
+#: ../src/e-util/e-send-options.ui.h:39
+msgid "_Delivered"
+msgstr "配送したもの(_D)"
+
+#: ../src/e-util/e-send-options.ui.h:40
+msgid "Deli_vered and opened"
+msgstr "配送後とメールを開いた後(_V)"
+
+#: ../src/e-util/e-send-options.ui.h:41
+msgid "_All information"
+msgstr "すべての情報(_A)"
+
+#: ../src/e-util/e-send-options.ui.h:42
+msgid "A_uto-delete sent item"
+msgstr "送信アイテムを自動的に削除する(_U)"
+
+#: ../src/e-util/e-send-options.ui.h:43
+msgid "Status Tracking"
+msgstr "ステータスの追跡"
+
+#: ../src/e-util/e-send-options.ui.h:44
+msgid "_When opened:"
+msgstr "開いた時(_W):"
+
+#: ../src/e-util/e-send-options.ui.h:45
+msgid "When decli_ned:"
+msgstr "辞退した時(_N):"
+
+#: ../src/e-util/e-send-options.ui.h:46
+msgid "When co_mpleted:"
+msgstr "完了した時(_M):"
+
+#: ../src/e-util/e-send-options.ui.h:47
+msgid "When acce_pted:"
+msgstr "受諾した時(_P):"
+
+#: ../src/e-util/e-send-options.ui.h:48
+msgid "Return Notification"
+msgstr "開封通知"
+
+#: ../src/e-util/e-send-options.ui.h:49
+msgid "Sta_tus Tracking"
+msgstr "ステータスの追跡(_T)"
+
+#: ../src/e-util/e-source-config.c:691 ../src/e-util/e-source-config.c:695
 msgid "Type:"
 msgstr "種類:"
 
-#: ../e-util/e-source-config.c:692 ../e-util/e-source-config.c:696
+#: ../src/e-util/e-source-config.c:703 ../src/e-util/e-source-config.c:707
 msgid "Name:"
 msgstr "名前:"
 
+#: ../src/e-util/e-source-config.c:814
+#, fuzzy
+#| msgid "The file cannot be read"
+msgid "Name cannot be empty"
+msgstr "そのアイテムは読めません"
+
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1301
+#: ../src/e-util/e-source-config.c:1314
 msgid "Refresh every"
 msgstr "更新間隔"
 
-#: ../e-util/e-source-config.c:1331 ../e-util/e-source-config.c:1401
+#: ../src/e-util/e-source-config.c:1344 ../src/e-util/e-source-config.c:1414
 msgid "Use a secure connection"
 msgstr "セキュアな接続の利用"
 
-#: ../e-util/e-source-config.c:1427
-msgid "Unset _trust for SSL certificate"
+#: ../src/e-util/e-source-config.c:1440
+#, fuzzy
+#| msgid "Unset _trust for SSL certificate"
+msgid "Unset _trust for SSL/TLS certificate"
 msgstr "証明書に対する信頼を解除(_T)"
 
-#: ../e-util/e-source-config.c:1463
+#: ../src/e-util/e-source-config.c:1476
 msgid "User"
 msgstr "ユーザー"
 
-#: ../e-util/e-source-selector-dialog.c:226
+#: ../src/e-util/e-source-selector.c:3212
+#, fuzzy
+#| msgid "Show %s"
+msgid "Show"
+msgstr "%s を表示"
+
+#: ../src/e-util/e-source-selector.c:3219
+#, fuzzy
+#| msgid "Group Reply"
+msgid "Group name"
+msgstr "グループに返信"
+
+#: ../src/e-util/e-source-selector.c:3374 ../src/mail/e-mail-display.c:796
+msgid "_Hide"
+msgstr "隠す(_H)"
+
+#: ../src/e-util/e-source-selector.c:3374
+#: ../src/e-util/e-source-selector.c:3473
+#, fuzzy
+#| msgid "Show %s"
+msgid "_Show"
+msgstr "%s を表示"
+
+#: ../src/e-util/e-source-selector.c:3426
+#, fuzzy
+#| msgid "Manager"
+msgid "Manage Groups"
+msgstr "マネージャー"
+
+#: ../src/e-util/e-source-selector.c:3438
+#, fuzzy
+#| msgid "_Available Categories:"
+msgid "Available Groups:"
+msgstr "利用可能な項目(_A)"
+
+#: ../src/e-util/e-source-selector-dialog.c:234
 msgid "_Destination"
 msgstr "インポート元(_D):"
 
-#: ../e-util/e-source-selector-dialog.c:339
+#: ../src/e-util/e-source-selector-dialog.c:362
 msgid "Select destination"
 msgstr "インポート元の選択"
 
+#. Translators: %s is the language ISO code.
+#: ../src/e-util/e-spell-dictionary.c:264
+#, fuzzy, c-format
+#| msgid "Unknown"
+msgctxt "language"
+msgid "Unknown (%s)"
+msgstr "不明"
+
+#. Translators: The first %s is the language name, and the
+#. * second is the country name. Example: "French (France)"
+#: ../src/e-util/e-spell-dictionary.c:279
+#: ../src/e-util/e-spell-dictionary.c:284
+#, fuzzy, c-format
+#| msgctxt "folder-display"
+#| msgid "%s (%u%s)"
+msgctxt "language"
+msgid "%s (%s)"
+msgstr "%s (%u%s)"
+
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:383
+#: ../src/e-util/e-spell-entry.c:479
 msgid "(no suggestions)"
 msgstr "(提案無し)"
 
-#: ../e-util/e-spell-entry.c:407
+#: ../src/e-util/e-spell-entry.c:503
 msgid "More..."
 msgstr "さらに..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:478
-#, c-format
-msgid "Add \"%s\" to Dictionary"
+#: ../src/e-util/e-spell-entry.c:588
+#, fuzzy, c-format
+#| msgid "Add \"%s\" to Dictionary"
+msgid "Add “%s” to Dictionary"
 msgstr "\"%s\" を辞書に追加"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:529
+#: ../src/e-util/e-spell-entry.c:637
 msgid "Ignore All"
 msgstr "全て無視する"
 
-#: ../e-util/e-spell-entry.c:557
+#: ../src/e-util/e-spell-entry.c:669
 msgid "Spelling Suggestions"
 msgstr "つづりの提案"
 
-#: ../e-util/e-system.error.xml.h:1
-msgid "A file named \"{0}\" already exists. Do you want to replace it?"
+#: ../src/e-util/e-system.error.xml.h:1
+#, fuzzy
+#| msgid "A file named \"{0}\" already exists. Do you want to replace it?"
+msgid "A file named “{0}” already exists. Do you want to replace it?"
 msgstr "既に \"{0}\" と同名のファイルが存在します。置き換えますか?"
 
-#: ../e-util/e-system.error.xml.h:2
-msgid "The file already exists in \"{0}\". Replacing it will overwrite its contents."
+#: ../src/e-util/e-system.error.xml.h:2
+#, fuzzy
+#| msgid ""
+#| "The file already exists in \"{0}\". Replacing it will overwrite its "
+#| "contents."
+msgid ""
+"The file already exists in “{0}”. Replacing it will overwrite its contents."
 msgstr "\"{0}\" にファイルが既に存在します。その内容を上書きして置き換えます。"
 
-#: ../e-util/e-system.error.xml.h:3
-msgid "_Replace"
-msgstr "置き換え(_R)"
-
-#: ../e-util/e-system.error.xml.h:4
-msgid "Cannot save file \"{0}\"."
+#: ../src/e-util/e-system.error.xml.h:4
+#, fuzzy
+#| msgid "Cannot save file \"{0}\"."
+msgid "Cannot save file “{0}”."
 msgstr "\"{0}\" というファイルを保存できません。"
 
-#: ../e-util/e-system.error.xml.h:5
-msgid "Because \"{1}\"."
-msgstr "原因は \"{1}\" です。"
-
-#: ../e-util/e-system.error.xml.h:6
-msgid "Cannot open file \"{0}\"."
+#: ../src/e-util/e-system.error.xml.h:6
+#, fuzzy
+#| msgid "Cannot open file \"{0}\"."
+msgid "Cannot open file “{0}”."
 msgstr "\"{0}\" というファイルを開けません。"
 
-#: ../e-util/e-system.error.xml.h:7
-msgid "Failed to remove data source &quot;{0}&quot;."
+#: ../src/e-util/e-system.error.xml.h:7
+#, fuzzy
+#| msgid "Failed to remove data source &quot;{0}&quot;."
+msgid "Failed to remove data source “{0}”."
 msgstr "データソース &quot;{0}&quot; の削除に失敗しました。"
 
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
-msgid "The reported error was &quot;{1}&quot;."
+#: ../src/e-util/e-system.error.xml.h:8 ../src/mail/mail.error.xml.h:64
+#, fuzzy
+#| msgid "The reported error was &quot;{1}&quot;."
+msgid "The reported error was “{1}”."
 msgstr "&quot;{0}&quot; というエラーが報告されました。"
 
-#: ../e-util/e-system.error.xml.h:9
-msgid "Failed to update data source &quot;{0}&quot;."
+#: ../src/e-util/e-system.error.xml.h:9
+#, fuzzy
+#| msgid "Failed to update data source &quot;{0}&quot;."
+msgid "Failed to update data source “{0}”."
 msgstr "データソース &quot;{0}&quot; の更新に失敗しました。"
 
-#: ../e-util/e-system.error.xml.h:10
-msgid "Failed to delete resource &quot;{0}&quot;."
+#: ../src/e-util/e-system.error.xml.h:10
+#, fuzzy
+#| msgid "Failed to delete resource &quot;{0}&quot;."
+msgid "Failed to delete resource “{0}”."
 msgstr "リソース &quot;{0}&quot; の削除に失敗しました。"
 
-#: ../e-util/e-system.error.xml.h:11
-msgid "The address book backend servicing &quot;{0}&quot; has quit unexpectedly."
+#: ../src/e-util/e-system.error.xml.h:11
+#, fuzzy
+#| msgid ""
+#| "The address book backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgid "The address book backend servicing “{0}” has quit unexpectedly."
 msgstr "アドレス帳バックエンドサービスの &quot;{0}&quot; が強制終了しました。"
 
-#: ../e-util/e-system.error.xml.h:12
-msgid "Some of your contacts may not be available until Evolution is restarted."
+#: ../src/e-util/e-system.error.xml.h:12
+msgid ""
+"Some of your contacts may not be available until Evolution is restarted."
 msgstr "Evolution を再起動するまで利用できない連絡先があるかもしれません。"
 
-#: ../e-util/e-system.error.xml.h:13
-msgid "The calendar backend servicing &quot;{0}&quot; has quit unexpectedly."
+#: ../src/e-util/e-system.error.xml.h:13
+#, fuzzy
+#| msgid ""
+#| "The calendar backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgid "The calendar backend servicing “{0}” has quit unexpectedly."
 msgstr "カレンダーバックエンドサービスの &quot;{0}&quot; が強制終了しました。"
 
-#: ../e-util/e-system.error.xml.h:14
-msgid "Some of your appointments may not be available until Evolution is restarted."
+#: ../src/e-util/e-system.error.xml.h:14
+msgid ""
+"Some of your appointments may not be available until Evolution is restarted."
 msgstr "Evolution を再起動するまで利用できない予定があるかもしれません。"
 
-#: ../e-util/e-system.error.xml.h:15
-msgid "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
+#: ../src/e-util/e-system.error.xml.h:15
+#, fuzzy
+#| msgid ""
+#| "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgid "The memo list backend servicing “{0}” has quit unexpectedly."
 msgstr "メモ一覧バックエンドサービスの &quot;{0}&quot; が強制終了しました。"
 
-#: ../e-util/e-system.error.xml.h:16
+#: ../src/e-util/e-system.error.xml.h:16
 msgid "Some of your memos may not be available until Evolution is restarted."
 msgstr "Evolution を再起動するまで利用できないメモがあるかもしれません。"
 
-#: ../e-util/e-system.error.xml.h:17
-msgid "The task list backend servicing &quot;{0}&quot; has quit unexpectedly."
+#: ../src/e-util/e-system.error.xml.h:17
+#, fuzzy
+#| msgid ""
+#| "The task list backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgid "The task list backend servicing “{0}” has quit unexpectedly."
 msgstr "タスク一覧バックエンドサービスの &quot;{0}&quot; が強制終了しました。"
 
-#: ../e-util/e-system.error.xml.h:18
+#: ../src/e-util/e-system.error.xml.h:18
 msgid "Some of your tasks may not be available until Evolution is restarted."
 msgstr "Evolution を再起動するまで利用できないタスクがあるかもしれません。"
 
-#: ../e-util/e-system.error.xml.h:19
-msgid "The address book backend servicing &quot;{0}&quot; encountered an error."
-msgstr "アドレス帳バックエンドサービスの &quot;{0}&quot; にエラーが起きました。"
+#: ../src/e-util/e-system.error.xml.h:19
+#, fuzzy
+#| msgid ""
+#| "The address book backend servicing &quot;{0}&quot; encountered an error."
+msgid "The address book backend servicing “{0}” encountered an error."
+msgstr ""
+"アドレス帳バックエンドサービスの &quot;{0}&quot; にエラーが起きました。"
 
-#: ../e-util/e-system.error.xml.h:20
-msgid "The calendar backend servicing &quot;{0}&quot; encountered an error."
-msgstr "カレンダーバックエンドサービスの &quot;{0}&quot; にエラーが起きました。"
+#: ../src/e-util/e-system.error.xml.h:20
+#, fuzzy
+#| msgid "The calendar backend servicing &quot;{0}&quot; encountered an error."
+msgid "The calendar backend servicing “{0}” encountered an error."
+msgstr ""
+"カレンダーバックエンドサービスの &quot;{0}&quot; にエラーが起きました。"
 
-#: ../e-util/e-system.error.xml.h:21
-msgid "The memo list backend servicing &quot;{0}&quot; encountered an error."
+#: ../src/e-util/e-system.error.xml.h:21
+#, fuzzy
+#| msgid ""
+#| "The memo list backend servicing &quot;{0}&quot; encountered an error."
+msgid "The memo list backend servicing “{0}” encountered an error."
 msgstr "メモ一覧バックエンドサービスの &quot;{0}&quot; にエラーが起きました。"
 
-#: ../e-util/e-system.error.xml.h:22
-msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
-msgstr "タスク一覧バックエンドサービスの &quot;{0}&quot; にエラーが起きました。"
+#: ../src/e-util/e-system.error.xml.h:22
+#, fuzzy
+#| msgid ""
+#| "The task list backend servicing &quot;{0}&quot; encountered an error."
+msgid "The task list backend servicing “{0}” encountered an error."
+msgstr ""
+"タスク一覧バックエンドサービスの &quot;{0}&quot; にエラーが起きました。"
+
+#: ../src/e-util/e-system.error.xml.h:23
+msgid "Something has gone wrong"
+msgstr ""
+
+#: ../src/e-util/e-system.error.xml.h:24
+msgid ""
+"A WebKitWebProcess crashed when displaying the content. You can try again by "
+"reopening the window. If the issue persists, please file a bug report in the "
+"GNOME bugzilla."
+msgstr ""
 
-#: ../e-util/e-table-click-to-add.c:680
-#: ../e-util/gal-a11y-e-table-click-to-add.c:61
-#: ../e-util/gal-a11y-e-table-click-to-add.c:142
+#: ../src/e-util/e-table-click-to-add.c:687
+#: ../src/e-util/gal-a11y-e-table-click-to-add.c:59
+#: ../src/e-util/gal-a11y-e-table-click-to-add.c:140
 msgid "click to add"
 msgstr "クリックして追加する"
 
-#: ../e-util/e-table-column-selector.c:265
+#: ../src/e-util/e-table-column-selector.c:264
 msgid "Move selected column names to top"
 msgstr "選択した行を最上部に移動"
 
-#: ../e-util/e-table-column-selector.c:270
+#: ../src/e-util/e-table-column-selector.c:269
 msgid "Move selected column names up one row"
 msgstr "選択した行を1つ上に移動"
 
-#: ../e-util/e-table-column-selector.c:275
+#: ../src/e-util/e-table-column-selector.c:274
 msgid "Move selected column names down one row"
 msgstr "選択した行を1つ下に移動"
 
-#: ../e-util/e-table-column-selector.c:280
+#: ../src/e-util/e-table-column-selector.c:279
 msgid "Move selected column names to bottom"
 msgstr "選択した行を最下部に移動"
 
-#: ../e-util/e-table-column-selector.c:285
+#: ../src/e-util/e-table-column-selector.c:284
 msgid "Select all column names"
 msgstr "行をすべて選択"
 
-#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
+#: ../src/e-util/e-table-config.c:388 ../src/e-util/e-table-config.c:434
 msgid "(Ascending)"
 msgstr "(昇順)"
 
-#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
+#: ../src/e-util/e-table-config.c:388 ../src/e-util/e-table-config.c:434
 msgid "(Descending)"
 msgstr "(降順)"
 
-#: ../e-util/e-table-config.c:395
+#: ../src/e-util/e-table-config.c:395
 msgid "Not sorted"
 msgstr "並べ替えなし"
 
-#: ../e-util/e-table-config.c:440
+#: ../src/e-util/e-table-config.c:440
 msgid "No grouping"
 msgstr "グループなし"
 
-#: ../e-util/e-table-config.c:545
+#: ../src/e-util/e-table-config.c:545
 msgid "Show Fields"
 msgstr "表示する項目"
 
-#: ../e-util/e-table-config.c:559
+#: ../src/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:226
-msgid "Add a Column"
-msgstr "項目の追加"
+#: ../src/e-util/e-table-config.ui.h:2
+msgid "Clear _All"
+msgstr "すべてクリア(_A)"
+
+#: ../src/e-util/e-table-config.ui.h:5
+msgid "_Show field in View"
+msgstr "ビューに表示する項目(_S)"
+
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1783
+msgid "Ascending"
+msgstr "昇順"
+
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1783
+msgid "Descending"
+msgstr "降順"
+
+#: ../src/e-util/e-table-config.ui.h:8
+msgid "Group Items By"
+msgstr "グループ化"
+
+#: ../src/e-util/e-table-config.ui.h:9
+msgid "Show _field in View"
+msgstr "ビューに表示する項目(_F)"
+
+#: ../src/e-util/e-table-config.ui.h:10
+msgid "Then By"
+msgstr "追加の条件"
+
+#: ../src/e-util/e-table-config.ui.h:11
+msgid "Show field i_n View"
+msgstr "ビューに表示する項目(_N)"
+
+#: ../src/e-util/e-table-config.ui.h:12
+msgid "Show field in _View"
+msgstr "ビューに表示する項目(_V)"
+
+#: ../src/e-util/e-table-config.ui.h:13
+msgid "Sort"
+msgstr "並べ替え"
+
+#: ../src/e-util/e-table-config.ui.h:14
+msgid "Clear All"
+msgstr "すべてクリア"
+
+#: ../src/e-util/e-table-config.ui.h:15
+msgid "Sort Items By"
+msgstr "次で並べ替え"
+
+#: ../src/e-util/e-table-config.ui.h:16
+#, fuzzy
+#| msgid "_Append"
+msgid "_Apply"
+msgstr "追加する(_A)"
+
+#: ../src/e-util/e-table-config.ui.h:17
+msgid "_Sort..."
+msgstr "並べ替え(_S)..."
+
+#: ../src/e-util/e-table-config.ui.h:18
+msgid "_Group By..."
+msgstr "グループ化(_G)..."
+
+#: ../src/e-util/e-table-config.ui.h:19
+msgid "_Fields Shown..."
+msgstr "表示する項目(_F)..."
 
-#: ../e-util/e-table-field-chooser.c:166
+#: ../src/e-util/e-table-field-chooser.c:164
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -10979,621 +15637,875 @@ msgstr ""
 "表へ追加したい項目を選択して、\n"
 "表示させたい場所にドラッグしてください。"
 
-#: ../e-util/e-table-group-container.c:368
+#: ../src/e-util/e-table-field-chooser-dialog.c:224
+msgid "Add a Column"
+msgstr "項目の追加"
+
+#. Translators: This text is used as a special row when an ETable
+#. * has turned on grouping on a column, which has set a title.
+#. * The first %s is replaced with a column title.
+#. * The second %s is replaced with an actual  group value.
+#. * Finally the %d is replaced with count of items in this group.
+#. * Example: "Family name: Smith (13 items)"
+#.
+#: ../src/e-util/e-table-group-container.c:366
 #, 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:382
+#. Translators: This text is used as a special row when an ETable
+#. * has turned on grouping on a column, which doesn't have set a title.
+#. * The %s is replaced with an actual group value.
+#. * The %d is replaced with count of items in this group.
+#. * Example: "Smith (13 items)"
+#.
+#: ../src/e-util/e-table-group-container.c:380
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d個のアイテム)"
 
-#: ../e-util/e-table-header-item.c:1576
+#: ../src/e-util/e-table-header-item.c:1606
 msgid "Customize Current View"
 msgstr "ビューのカスタマイズ"
 
-#: ../e-util/e-table-header-item.c:1599
+#: ../src/e-util/e-table-header-item.c:1629
 msgid "Sort _Ascending"
 msgstr "昇順で並べ替え(_A)"
 
-#: ../e-util/e-table-header-item.c:1602
+#: ../src/e-util/e-table-header-item.c:1632
 msgid "Sort _Descending"
 msgstr "降順で並べ替え(_D)"
 
-#: ../e-util/e-table-header-item.c:1605
-msgid "_Unsort"
-msgstr "並べ替えない(_U)"
+#: ../src/e-util/e-table-header-item.c:1635
+#, fuzzy
+#| msgid "_Reset Order"
+msgid "_Reset sort"
+msgstr "順番のリセット(_R)"
 
-#: ../e-util/e-table-header-item.c:1608
+#: ../src/e-util/e-table-header-item.c:1638
 msgid "Group By This _Field"
 msgstr "この項目でグループ化(_F)"
 
-#: ../e-util/e-table-header-item.c:1611
+#: ../src/e-util/e-table-header-item.c:1641
 msgid "Group By _Box"
 msgstr "ボックスでグループ化(_B)"
 
-#: ../e-util/e-table-header-item.c:1615
+#: ../src/e-util/e-table-header-item.c:1645
 msgid "Remove This _Column"
 msgstr "この項目の削除(_C)"
 
-#: ../e-util/e-table-header-item.c:1618
+#: ../src/e-util/e-table-header-item.c:1648
 msgid "Add a C_olumn..."
 msgstr "項目の追加(_O)..."
 
-#: ../e-util/e-table-header-item.c:1622
+#: ../src/e-util/e-table-header-item.c:1652
 msgid "A_lignment"
 msgstr "配置(_L)"
 
-#: ../e-util/e-table-header-item.c:1625
+#: ../src/e-util/e-table-header-item.c:1655
 msgid "B_est Fit"
 msgstr "最適な配置(_E)"
 
-#: ../e-util/e-table-header-item.c:1628
+#: ../src/e-util/e-table-header-item.c:1658
 msgid "Format Column_s..."
 msgstr "項目のフォーマット(_S)..."
 
-#: ../e-util/e-table-header-item.c:1632
+#: ../src/e-util/e-table-header-item.c:1662
 msgid "Custo_mize Current View..."
 msgstr "ビューのカスタマイズ(_M)..."
 
-#: ../e-util/e-table-header-item.c:1703
+#: ../src/e-util/e-table-header-item.c:1733
 msgid "_Sort By"
 msgstr "並べ替え(_S)"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1726
+#: ../src/e-util/e-table-header-item.c:1756
 msgid "_Custom"
 msgstr "カスタム(_C)"
 
-#: ../e-util/e-text.c:2110
+#: ../src/e-util/e-text.c:2135
 msgid "Select All"
 msgstr "すべて選択"
 
-#: ../e-util/e-text.c:2123
+#: ../src/e-util/e-text.c:2148
 msgid "Input Methods"
 msgstr "入力メソッド"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../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
+#: ../src/e-util/e-timezone-dialog.c:268 ../src/e-util/e-timezone-dialog.c:508
+#: ../src/e-util/e-timezone-dialog.c:512 ../src/e-util/e-timezone-dialog.c:516
+#: ../src/e-util/e-timezone-dialog.c:899
 msgid "UTC"
 msgstr "UTC"
 
-#: ../e-util/e-url-entry.c:108
+#: ../src/e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "タイムゾーンの選択"
+
+#: ../src/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."
+msgstr ""
+"地図の任意のエリアを拡大する場合はマウスの左ボタンを使い、タイムゾーンを選択"
+"してください。\n"
+"エリアを縮小する場合はマウスの右ボタンを使ってください。"
+
+#: ../src/e-util/e-timezone-dialog.ui.h:6
+msgid "Time Zones"
+msgstr "タイムゾーン"
+
+#: ../src/e-util/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "選択(_S)"
+
+#: ../src/e-util/e-timezone-dialog.ui.h:8
+msgid "Timezone drop-down combination box"
+msgstr "タイムゾーンを選択するためのドロップダウン式のコンボボックスです"
+
+#: ../src/e-util/e-url-entry.c:106
 msgid "Click here to open the URL"
 msgstr "ここをクリックすると URL を開きます"
 
-#: ../e-util/e-url-entry.c:110
+#: ../src/e-util/e-url-entry.c:108
 msgid "Enter a URL here"
 msgstr "ここで URL を入力してください"
 
-#: ../e-util/e-web-view-gtkhtml.c:405 ../e-util/e-web-view.c:282
+#: ../src/e-util/evolution-source-viewer.c:638
+msgid "Evolution Source Viewer"
+msgstr "Evolution ソースビューアー"
+
+#. Translators: The name that is displayed in the user interface
+#: ../src/e-util/evolution-source-viewer.c:668
+msgid "Display Name"
+msgstr "表示名"
+
+#: ../src/e-util/evolution-source-viewer.c:677
+msgid "Flags"
+msgstr "フラグ"
+
+#: ../src/e-util/evolution-source-viewer.c:729
+#: ../src/mail/e-mail-config-identity-page.c:1148
+msgid "Identity"
+msgstr "身元情報"
+
+#: ../src/e-util/e-web-view.c:346
 msgid "_Copy Link Location"
 msgstr "リンク先のコピー(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:407 ../e-util/e-web-view.c:284
+#: ../src/e-util/e-web-view.c:348
 msgid "Copy the link to the clipboard"
 msgstr "リンク先をクリップボードにコピーします。"
 
-#: ../e-util/e-web-view-gtkhtml.c:415 ../e-util/e-web-view.c:292
+#: ../src/e-util/e-web-view.c:356
 msgid "_Open Link in Browser"
 msgstr "リンクをブラウザーで開く(_O)"
 
-#: ../e-util/e-web-view-gtkhtml.c:417 ../e-util/e-web-view.c:294
+#: ../src/e-util/e-web-view.c:358
 msgid "Open the link in a web browser"
 msgstr "リンクをブラウザーで開きます"
 
-#: ../e-util/e-web-view-gtkhtml.c:425 ../e-util/e-web-view.c:302
+#: ../src/e-util/e-web-view.c:366
 msgid "_Copy Email Address"
 msgstr "メールアドレスのコピー(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:442 ../e-util/e-web-view.c:319
+#: ../src/e-util/e-web-view.c:373
+#, fuzzy
+#| msgid "Copy _Email Address"
+msgid "Copy _Raw Email Address"
+msgstr "メールアドレスのコピー(_E)"
+
+#: ../src/e-util/e-web-view.c:375
+#, fuzzy
+#| msgid "Copy the email address to the clipboard"
+msgid "Copy the raw email address to the clipboard"
+msgstr "メールアドレスをクリップボードにコピー"
+
+#: ../src/e-util/e-web-view.c:390
 msgid "_Copy Image"
 msgstr "画像をコピー(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:444 ../e-util/e-web-view.c:321
+#: ../src/e-util/e-web-view.c:392
 msgid "Copy the image to the clipboard"
 msgstr "画像をクリップボードにコピーします。"
 
-#: ../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
+#: ../src/e-util/e-web-view.c:397
+msgid "Save _Image..."
+msgstr "画像を保存(_I)..."
+
+#: ../src/e-util/e-web-view.c:399
+msgid "Save the image to a file"
+msgstr "画像をファイルに保存します"
+
+#: ../src/e-util/e-web-view.c:419 ../src/e-util/e-web-view.c:1964
 msgid "Select all text and images"
 msgstr "すべてのテキストと画像を選択します"
 
-#: ../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
+#: ../src/e-util/e-web-view.c:1322
 #, c-format
 msgid "Click to call %s"
 msgstr "クリックすると %s さんを呼び出します"
 
-#: ../e-util/e-web-view-gtkhtml.c:977 ../e-util/e-web-view.c:1000
+#: ../src/e-util/e-web-view.c:1324
 msgid "Click to hide/unhide addresses"
 msgstr "クリックするとメールアドレスの表示/非表示を切り替えます"
 
-#: ../e-util/e-web-view-gtkhtml.c:979 ../e-util/e-web-view.c:1002
+#: ../src/e-util/e-web-view.c:1335
+#, fuzzy, c-format
+#| msgid "Enter the recipients of the message"
+msgid "Go to the section %s of the message"
+msgstr "メッセージの宛先を入力します"
+
+#: ../src/e-util/e-web-view.c:1337
+#, fuzzy
+#| msgid "Enter the recipients of the message"
+msgid "Go to the beginning of the message"
+msgstr "メッセージの宛先を入力します"
+
+#: ../src/e-util/e-web-view.c:1341
 #, c-format
 msgid "Click to open %s"
 msgstr "クリックすると %s を開きます"
 
-#: ../e-util/e-web-view.c:326
-msgid "Save _Image..."
-msgstr "画像を保存(_I)..."
-
-#: ../e-util/e-web-view.c:328
-msgid "Save the image to a file"
-msgstr "画像をファイルに保存します"
-
-#: ../e-util/e-web-view.c:2902
+#: ../src/e-util/e-web-view.c:3875
 msgid "Copying image to clipboard"
 msgstr "画像をクリップボードにコピー中"
 
-#: ../e-util/e-web-view.c:3090
+#: ../src/e-util/e-web-view.c:4063
 msgid "Save Image"
 msgstr "画像の保存"
 
-#: ../e-util/e-web-view.c:3126
-#, c-format
-msgid "Saving image to '%s'"
+#: ../src/e-util/e-web-view.c:4104
+#, fuzzy, c-format
+#| msgid "Saving image to '%s'"
+msgid "Saving image to “%s”"
 msgstr "'%s' へ画像を保存中"
 
-#: ../e-util/e-widget-undo.c:429
-msgid "Undo 'Insert text'"
+#: ../src/e-util/e-web-view.c:4199
+#, c-format
+msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr ""
 
-#: ../e-util/e-widget-undo.c:431
-msgid "Redo 'Insert text'"
+#: ../src/e-util/e-widget-undo.c:428
+msgid "Undo “Insert text”"
 msgstr ""
 
-#: ../e-util/e-widget-undo.c:445
-msgid "Undo 'Delete text'"
+#: ../src/e-util/e-widget-undo.c:430
+msgid "Redo “Insert text”"
 msgstr ""
 
-#: ../e-util/e-widget-undo.c:447
-msgid "Redo 'Delete text'"
+#: ../src/e-util/e-widget-undo.c:444
+msgid "Undo “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:326
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "カレンダー: %s 〜 %s"
-
-#: ../e-util/ea-calendar-item.c:363
-msgid "evolution calendar item"
-msgstr "Evolution カレンダーのアイテム"
-
-#: ../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:666
-msgid "Display Name"
-msgstr "表示名"
-
-#: ../e-util/evolution-source-viewer.c:675
-msgid "Flags"
-msgstr "フラグ"
-
-#: ../e-util/evolution-source-viewer.c:727
-#: ../mail/e-mail-config-identity-page.c:677
-msgid "Identity"
-msgstr "身元情報"
+#: ../src/e-util/e-widget-undo.c:446
+msgid "Redo “Delete text”"
+msgstr ""
 
-#: ../e-util/filter.error.xml.h:1
+#: ../src/e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "日付がありません。"
 
-#: ../e-util/filter.error.xml.h:2
+#: ../src/e-util/filter.error.xml.h:2
 msgid "You must choose a date."
 msgstr "日付を指定してください。"
 
-#: ../e-util/filter.error.xml.h:3
+#: ../src/e-util/filter.error.xml.h:3
 msgid "Missing filename."
 msgstr "ファイル名がありません。"
 
-#: ../e-util/filter.error.xml.h:4
+#: ../src/e-util/filter.error.xml.h:4
 msgid "You must specify a filename."
 msgstr "ファイル名を指定してください。"
 
-#: ../e-util/filter.error.xml.h:5
-msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "&quot;{0}&quot; というファイルは存在していないか、または通常のファイルではありません。"
+#: ../src/e-util/filter.error.xml.h:5
+#, fuzzy
+#| msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgid "File “{0}” does not exist or is not a regular file."
+msgstr ""
+"&quot;{0}&quot; というファイルは存在していないか、または通常のファイルではあ"
+"りません。"
 
-#: ../e-util/filter.error.xml.h:6
-msgid "Bad regular expression &quot;{0}&quot;."
+#: ../src/e-util/filter.error.xml.h:6
+#, fuzzy
+#| msgid "Bad regular expression &quot;{0}&quot;."
+msgid "Bad regular expression “{0}”."
 msgstr "&quot;{0}&quot; という正規表現は正しくありません。"
 
-#: ../e-util/filter.error.xml.h:7
-msgid "Could not compile regular expression &quot;{1}&quot;."
+#: ../src/e-util/filter.error.xml.h:7
+#, fuzzy
+#| msgid "Could not compile regular expression &quot;{1}&quot;."
+msgid "Could not compile regular expression “{1}”."
 msgstr "&quot;{1}&quot; という正規表現をコンパイルできませんでした。"
 
-#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
+#: ../src/e-util/filter.error.xml.h:8 ../src/mail/mail.error.xml.h:107
 msgid "Missing name."
 msgstr "名前がありません。"
 
-#: ../e-util/filter.error.xml.h:9
+#: ../src/e-util/filter.error.xml.h:9
 msgid "You must name this filter."
 msgstr "このフィルターに名前を付けてください。"
 
-#: ../e-util/filter.error.xml.h:10
-msgid "Name &quot;{0}&quot; already used."
+#: ../src/e-util/filter.error.xml.h:10
+#, fuzzy
+#| msgid "Name &quot;{0}&quot; already used."
+msgid "Name “{0}” already used."
 msgstr "&quot;{0}&quot; という名前は既に使われています。"
 
-#: ../e-util/filter.error.xml.h:11
+#: ../src/e-util/filter.error.xml.h:11
 msgid "Please choose another name."
 msgstr "別の名前を指定してください。"
 
-#: ../e-util/filter.error.xml.h:12
+#: ../src/e-util/filter.error.xml.h:12
 #, fuzzy
 #| msgid "Missing date."
 msgid "Missing condition."
 msgstr "日付がありません。"
 
-#: ../e-util/filter.error.xml.h:13
+#: ../src/e-util/filter.error.xml.h:13
 msgid "Filter should have at least one condition."
 msgstr ""
 
-#: ../e-util/filter.error.xml.h:14
+#: ../src/e-util/filter.error.xml.h:14
 #, fuzzy
 #| msgid "Missing date."
 msgid "Missing value."
 msgstr "日付がありません。"
 
-#: ../e-util/filter.error.xml.h:15
+#: ../src/e-util/filter.error.xml.h:15
 msgid "One or more values cannot be empty."
 msgstr ""
 
+#: ../src/e-util/filter.error.xml.h:16
+#, fuzzy
+#| msgid "Are you sure you want to delete the '{0}' task?"
+msgid "Are you sure you want to remove rule “{0}”?"
+msgstr "本当に '{0}' というタスクを削除してもよろしいですか?"
+
+#: ../src/e-util/filter.error.xml.h:17
+msgid "_Keep"
+msgstr ""
+
+#: ../src/e-util/filter.ui.h:2
+msgid "the current time"
+msgstr "現在時刻"
+
+#: ../src/e-util/filter.ui.h:3
+msgid "the time you specify"
+msgstr "指定した時間"
+
+#: ../src/e-util/filter.ui.h:4
+msgid "a time relative to the current time"
+msgstr "現在時刻との相対時間"
+
+#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:92
+msgid "seconds"
+msgstr "秒"
+
+#: ../src/e-util/filter.ui.h:9
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "週"
+
+#: ../src/e-util/filter.ui.h:10
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "月"
+
+#: ../src/e-util/filter.ui.h:11
+msgid "years"
+msgstr "年"
+
+#: ../src/e-util/filter.ui.h:12
+msgid "ago"
+msgstr "前"
+
+#: ../src/e-util/filter.ui.h:13
+msgid "in the future"
+msgstr "先"
+
+#: ../src/e-util/filter.ui.h:14
+msgid "Compare against"
+msgstr "次の条件で比較する: "
+
+#: ../src/e-util/filter.ui.h:15
+#, fuzzy
+#| msgid ""
+#| "The message's date will be compared against\n"
+#| "the current time when filtering occurs."
+msgid ""
+"The message’s date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"メッセージの日付を、フィルターが実行された時の\n"
+"現在の時刻と比較します。"
+
+#: ../src/e-util/filter.ui.h:17
+#, fuzzy
+#| msgid ""
+#| "The message's date will be compared against\n"
+#| "12:00am of the date specified."
+msgid ""
+"The message’s date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"メッセージの日付は\n"
+"指定した日付の 0:00 と比較されます。"
+
+#: ../src/e-util/filter.ui.h:19
+#, fuzzy
+#| msgid ""
+#| "The message's date will be compared against\n"
+#| "a time relative to when filtering occurs."
+msgid ""
+"The message’s date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"メッセージの日付を、フィルターが実行された時の\n"
+"相対的な時間と比較します。"
+
+#: ../src/e-util/filter.ui.h:21
+msgid "Show filters for mail:"
+msgstr "フィルターの対象:"
+
+#: ../src/e-util/filter.ui.h:22 ../src/mail/em-filter-editor.c:163
+msgid "_Filter Rules"
+msgstr "フィルターのルール(_F)"
+
+#: ../src/e-util/gal-a11y-e-cell.c:128
+msgid "Table Cell"
+msgstr "テーブルのセル"
+
 #. Translators: description of a "popup" action
-#: ../e-util/gal-a11y-e-cell-popup.c:127
+#: ../src/e-util/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
 msgstr "子ウィジットをポップアップします"
 
+#. Translators: description of an "edit" action
+#: ../src/e-util/gal-a11y-e-cell-text.c:631
+msgid "begin editing this cell"
+msgstr ""
+
 #. Translators: description of a "toggle" action
-#: ../e-util/gal-a11y-e-cell-toggle.c:179
+#: ../src/e-util/gal-a11y-e-cell-toggle.c:183
 msgid "toggle the cell"
 msgstr "セルを切り替えます"
 
 #. Translators: description of an "expand" action
-#: ../e-util/gal-a11y-e-cell-tree.c:213
+#: ../src/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:221
+#: ../src/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:122
-msgid "Table Cell"
-msgstr "テーブルのセル"
-
-#: ../e-util/gal-a11y-e-table-click-to-add.c:71
+#: ../src/e-util/gal-a11y-e-table-click-to-add.c:69
 msgid "click"
 msgstr "クリック"
 
-#: ../e-util/gal-a11y-e-table-column-header.c:162
+#: ../src/e-util/gal-a11y-e-table-column-header.c:160
 msgid "sort"
 msgstr "並べ替え"
 
-#: ../e-util/gal-view-instance-save-as-dialog.c:295
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:293
 msgid "Save Current View"
 msgstr "このビューの保存"
 
-#: ../e-util/widgets.error.xml.h:1
+#: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "新しいビューの作成(_C)"
+
+#: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "既存のビューと置き換え(_R)"
+
+#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:201
 msgid "Do you wish to save your changes?"
 msgstr "変更点を保存しますか?"
 
-#: ../e-util/widgets.error.xml.h:2
+#: ../src/e-util/widgets.error.xml.h:2
 msgid "This signature has been changed, but has not been saved."
 msgstr "この署名は変更されていますが保存されていません。"
 
-#: ../e-util/widgets.error.xml.h:3
+#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:203
 msgid "_Discard changes"
 msgstr "破棄する(_D)"
 
-#: ../e-util/widgets.error.xml.h:4
+#: ../src/e-util/widgets.error.xml.h:4
 msgid "Blank Signature"
 msgstr "空の署名"
 
-#: ../e-util/widgets.error.xml.h:5
+#: ../src/e-util/widgets.error.xml.h:5
 msgid "Please provide an unique name to identify this signature."
 msgstr "この署名を一意に識別するために重複しない名前を指定してください。"
 
-#: ../e-util/widgets.error.xml.h:6
+#: ../src/e-util/widgets.error.xml.h:6
 msgid "Unable to copy image to clipboard."
 msgstr "画像をクリップボードにコピーできません。"
 
-#: ../e-util/widgets.error.xml.h:7
+#: ../src/e-util/widgets.error.xml.h:7
 msgid "Unable to save image."
 msgstr "画像を保存できません。"
 
-#: ../e-util/widgets.error.xml.h:8
+#: ../src/e-util/widgets.error.xml.h:8
 msgid "Could not load signature."
 msgstr "署名を読み込めませんでした。"
 
-#: ../e-util/widgets.error.xml.h:9
+#: ../src/e-util/widgets.error.xml.h:9
 msgid "Could not save signature."
 msgstr "署名を保存できませんでした。"
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:26
+#: ../src/libemail-engine/camel-sasl-oauth2-google.c:27
+#, fuzzy
+#| msgid "OAuth2"
+msgid "OAuth2 Google"
+msgstr "OAuth2"
+
+#: ../src/libemail-engine/camel-sasl-oauth2-google.c:28
+#, fuzzy
+#| msgid ""
+#| "This option will use an OAuth 2.0 access token to connect to the server"
+msgid ""
+"This option will use an OAuth 2.0 access token to connect to the Google "
+"server"
+msgstr ""
+"このオプションではサーバーへの接続に OAuth 2.0 アクセストークンを使います"
+
+#: ../src/libemail-engine/camel-sasl-xoauth2.c:27
 msgid "OAuth2"
 msgstr "OAuth2"
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:27
+#: ../src/libemail-engine/camel-sasl-xoauth2.c:28
 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:181
-#, c-format
-msgid "Invalid authentication result code (%d)"
-msgstr "無効な認証結果コード (%d)"
+msgstr ""
+"このオプションではサーバーへの接続に OAuth 2.0 アクセストークンを使います"
 
-#: ../libemail-engine/e-mail-folder-utils.c:113
-#, c-format
-msgid "Saving message to folder '%s'"
+#: ../src/libemail-engine/e-mail-folder-utils.c:106
+#, fuzzy, c-format
+#| msgid "Saving message to folder '%s'"
+msgid "Saving message to folder “%s”"
 msgstr "フォルダー '%s' へメッセージを保存中"
 
-#: ../libemail-engine/e-mail-folder-utils.c:571
+#: ../src/libemail-engine/e-mail-folder-utils.c:565
 msgid "Forwarded messages"
 msgstr "転送メッセージ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:681
-#: ../libemail-engine/e-mail-folder-utils.c:932
+#: ../src/libemail-engine/e-mail-folder-utils.c:675
+#: ../src/libemail-engine/e-mail-folder-utils.c:937
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d通のメッセージの受信中"
 
-#: ../libemail-engine/e-mail-folder-utils.c:775
+#: ../src/libemail-engine/e-mail-folder-utils.c:777
 msgid "Scanning messages for duplicates"
 msgstr "重複メッセージを検索"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1145
-#, c-format
-msgid "Removing folder '%s'"
+#: ../src/libemail-engine/e-mail-folder-utils.c:1150
+#, fuzzy, c-format
+#| msgid "Removing folder '%s'"
+msgid "Removing folder “%s”"
 msgstr "フォルダー '%s' の削除中"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1325
-#, c-format
-msgid "File \"%s\" has been removed."
+#: ../src/libemail-engine/e-mail-folder-utils.c:1331
+#, fuzzy, c-format
+#| msgid "File \"%s\" has been removed."
+msgid "File “%s” has been removed."
 msgstr "ファイル \"%s\" が削除されています。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1329
+#: ../src/libemail-engine/e-mail-folder-utils.c:1335
 msgid "File has been removed."
 msgstr "ファイルが削除されています。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1388
+#: ../src/libemail-engine/e-mail-folder-utils.c:1411
 msgid "Removing attachments"
 msgstr "添付ファイルを削除中"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1552
+#: ../src/libemail-engine/e-mail-folder-utils.c:1583
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d通のメッセージの保存中"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1930
-#, c-format
-msgid "Invalid folder URI '%s'"
+#: ../src/libemail-engine/e-mail-folder-utils.c:1961
+#, fuzzy, c-format
+#| msgid "Invalid folder URI '%s'"
+msgid "Invalid folder URI “%s”"
 msgstr "無効なフォルダー URI : '%s'"
 
-#: ../libemail-engine/e-mail-session-utils.c:539
-msgid "No mail transport service available"
-msgstr "利用できるメール転送サービスがありません"
-
-#: ../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:688
-#: ../libemail-engine/mail-ops.c:750
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"%s への追加に失敗しました: %s\n"
-"かわりにローカルの '送信箱' へ追加します。"
-
-#: ../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: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: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
+#. Some local folders
+#: ../src/libemail-engine/e-mail-session.c:125
+#: ../src/mail/em-folder-properties.c:1150
+#: ../src/mail/em-folder-tree-model.c:1236
+#: ../src/mail/importers/kmail-libs.c:139
+#: ../src/modules/mail/e-mail-shell-view-private.c:1026
+#: ../src/modules/mail/e-mail-shell-view-private.c:1037
 msgid "Inbox"
 msgstr "受信箱"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1153
-#: ../modules/mail/e-mail-shell-view-private.c:1058
+#: ../src/libemail-engine/e-mail-session.c:126
+#: ../src/mail/em-folder-tree-model.c:1229
+#: ../src/mail/importers/kmail-libs.c:145
+#: ../src/modules/mail/e-mail-shell-view-private.c:1024
 msgid "Drafts"
 msgstr "下書き"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1164
-#: ../modules/mail/e-mail-shell-view-private.c:1062
+#: ../src/libemail-engine/e-mail-session.c:127
+#: ../src/mail/em-folder-tree-model.c:1240
+#: ../src/mail/importers/kmail-libs.c:141
+#: ../src/modules/mail/e-mail-shell-view-private.c:1028
 msgid "Outbox"
 msgstr "送信トレイ"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1168
-#: ../modules/mail/e-mail-shell-view-private.c:1064
+#: ../src/libemail-engine/e-mail-session.c:128
+#: ../src/mail/em-folder-tree-model.c:1244
+#: ../src/mail/importers/kmail-libs.c:143
+#: ../src/modules/mail/e-mail-shell-view-private.c:1030
 msgid "Sent"
 msgstr "送信済み"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../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:1080 ../plugins/templates/templates.c:1379
-#: ../plugins/templates/templates.c:1389
+#: ../src/libemail-engine/e-mail-session.c:129
+#: ../src/mail/em-folder-tree-model.c:1232
+#: ../src/mail/importers/kmail-libs.c:147
+#: ../src/modules/mail/e-mail-shell-view-private.c:1032
+#: ../src/plugins/templates/e-templates-store.c:2212
+#: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "テンプレート"
 
-#: ../libemail-engine/e-mail-session.c:1245
+#: ../src/libemail-engine/e-mail-session.c:1332
 #, c-format
 msgid "User cancelled operation"
 msgstr "ユーザーによって操作がキャンセルされました"
 
-#: ../libemail-engine/e-mail-session.c:1373
-#, c-format
-msgid "%s authentication failed"
-msgstr "%s の認証が失敗しました"
-
-#: ../libemail-engine/e-mail-session.c:1423
+#: ../src/libemail-engine/e-mail-session.c:1389
 #, c-format
-msgid "No data source found for UID '%s'"
-msgstr "UID '%s' のデータソースが見つかりませんでした"
-
-#: ../libemail-engine/e-mail-session.c:1486
-#, c-format
-msgid "No destination address provided, forwarding of the message has been cancelled."
+msgid ""
+"No destination address provided, forwarding of the message has been "
+"cancelled."
 msgstr "宛先が指定されていないのでメッセージの転送をキャンセルしました。"
 
-#: ../libemail-engine/e-mail-session.c:1499
+#: ../src/libemail-engine/e-mail-session.c:1402
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "利用できる識別子がないのでメッセージの転送をキャンセルしました。"
 
-#: ../libemail-engine/e-mail-store-utils.c:189
+#: ../src/libemail-engine/e-mail-session.c:2444
+#, fuzzy, c-format
+#| msgid "Storing folder '%s'"
+msgid "Waiting for “%s”"
+msgstr "フォルダー '%s' の格納中"
+
+#: ../src/libemail-engine/e-mail-session-utils.c:524
+msgid "No mail transport service available"
+msgstr "利用できるメール転送サービスがありません"
+
+#: ../src/libemail-engine/e-mail-session-utils.c:614
+#: ../src/libemail-engine/mail-ops.c:706
+#, fuzzy, c-format
+#| msgid "Moving messages to '%s'"
+msgid "Posting message to “%s”"
+msgstr "'%s' へメッセージを移動中"
+
+#: ../src/libemail-engine/e-mail-session-utils.c:651
+#: ../src/libemail-engine/mail-ops.c:742
 #, c-format
-msgid "Disconnecting from '%s'"
+msgid "Failed to apply outgoing filters: %s"
+msgstr "出力フィルターの適用に失敗しました: %s"
+
+#: ../src/libemail-engine/e-mail-session-utils.c:681
+#: ../src/libemail-engine/e-mail-session-utils.c:716
+#: ../src/libemail-engine/mail-ops.c:766 ../src/libemail-engine/mail-ops.c:801
+#, fuzzy, c-format
+#| msgid "Moving messages to '%s'"
+msgid "Storing sent message to “%s”"
+msgstr "'%s' へメッセージを移動中"
+
+#: ../src/libemail-engine/e-mail-session-utils.c:705
+#: ../src/libemail-engine/mail-ops.c:790
+#, fuzzy, c-format
+#| msgid ""
+#| "Failed to append to %s: %s\n"
+#| "Appending to local 'Sent' folder instead."
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local “Sent” folder instead."
+msgstr ""
+"%s への追加に失敗しました: %s\n"
+"かわりにローカルの '送信箱' へ追加します。"
+
+#: ../src/libemail-engine/e-mail-session-utils.c:735
+#: ../src/libemail-engine/mail-ops.c:818
+#, fuzzy, c-format
+#| msgid "Failed to append to local 'Sent' folder: %s"
+msgid "Failed to append to local “Sent” folder: %s"
+msgstr "ローカルの '送信箱' フォルダーへの追加に失敗しました: %s"
+
+#: ../src/libemail-engine/e-mail-session-utils.c:923
+#: ../src/libemail-engine/mail-ops.c:978 ../src/libemail-engine/mail-ops.c:1080
+msgid "Sending message"
+msgstr "メッセージの送信中"
+
+#: ../src/libemail-engine/e-mail-store-utils.c:188
+#, fuzzy, c-format
+#| msgid "Disconnecting from '%s'"
+msgid "Disconnecting from “%s”"
 msgstr "'%s' から切断中"
 
-#: ../libemail-engine/e-mail-store-utils.c:265
-#, c-format
-msgid "Reconnecting to '%s'"
+#: ../src/libemail-engine/e-mail-store-utils.c:264
+#, fuzzy, c-format
+#| msgid "Reconnecting to '%s'"
+msgid "Reconnecting to “%s”"
 msgstr "'%s' へ再接続中"
 
-#: ../libemail-engine/e-mail-store-utils.c:350
-#, c-format
-msgid "Preparing account '%s' for offline"
+#: ../src/libemail-engine/e-mail-store-utils.c:349
+#, fuzzy, c-format
+#| msgid "Preparing account '%s' for offline"
+msgid "Preparing account “%s” for offline"
 msgstr "オフラインの準備中 (アカウント: '%s')"
 
-#: ../libemail-engine/mail-ops.c:90
+#: ../src/libemail-engine/mail-ops.c:88
 msgid "Filtering Selected Messages"
 msgstr "選択したメッセージのフィルタリング"
 
-#: ../libemail-engine/mail-ops.c:148
+#: ../src/libemail-engine/mail-ops.c:146
 #, 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"
+"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"
 "Original error was: %s"
 msgstr ""
-"選択したメッセージの振り分けに失敗しました。理由としてはフィルターでセットされているフォルダーの位置に不正なものがあることが考えられます。編集->フィルターの定義でフィルターをチェックしてください。\n"
+"選択したメッセージの振り分けに失敗しました。理由としてはフィルターでセットさ"
+"れているフォルダーの位置に不正なものがあることが考えられます。編集->フィル"
+"ターの定義でフィルターをチェックしてください。\n"
 "元のエラー: %s"
 
-#: ../libemail-engine/mail-ops.c:229
-#, c-format
-msgid "Fetching mail from '%s'"
+#: ../src/libemail-engine/mail-ops.c:226
+#, fuzzy, c-format
+#| msgid "Fetching mail from '%s'"
+msgid "Fetching mail from “%s”"
 msgstr "'%s' からメールを取得中"
 
-#: ../libemail-engine/mail-ops.c:701
+#: ../src/libemail-engine/mail-ops.c:736
 #, 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"
+"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"
 "Original error was: %s"
 msgstr ""
-"出力フィルターの適用に失敗しました。理由としてはフィルターでセットされているフォルダーの位置に不正なものがあることが考えられます。編集->フィルターの定義でフィルターをチェックしてください。\n"
+"出力フィルターの適用に失敗しました。理由としてはフィルターでセットされている"
+"フォルダーの位置に不正なものがあることが考えられます。編集->フィルターの定義"
+"でフィルターをチェックしてください。\n"
 "元のエラー: %s"
 
-#: ../libemail-engine/mail-ops.c:917
+#: ../src/libemail-engine/mail-ops.c:989
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d 通のメッセージの送信中"
 
-#: ../libemail-engine/mail-ops.c:969
+#. Translators: The string is distinguished by total
+#. * count of messages to be sent.  Failed messages is
+#. * always more than zero.
+#: ../src/libemail-engine/mail-ops.c:1041
 #, 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:975
-msgid "Canceled."
-msgstr "キャンセルしました"
+#: ../src/libemail-engine/mail-ops.c:1047
+#, fuzzy
+#| msgid "Cancelled"
+msgid "Cancelled."
+msgstr "キャンセルされた"
 
-#: ../libemail-engine/mail-ops.c:977
+#: ../src/libemail-engine/mail-ops.c:1049
 msgid "Complete."
 msgstr "完了しました"
 
-#: ../libemail-engine/mail-ops.c:1089
-#, c-format
-msgid "Moving messages to '%s'"
+#: ../src/libemail-engine/mail-ops.c:1164
+#, fuzzy, c-format
+#| msgid "Moving messages to '%s'"
+msgid "Moving messages to “%s”"
 msgstr "'%s' へメッセージを移動中"
 
-#: ../libemail-engine/mail-ops.c:1090
-#, c-format
-msgid "Copying messages to '%s'"
+#: ../src/libemail-engine/mail-ops.c:1165
+#, fuzzy, c-format
+#| msgid "Copying messages to '%s'"
+msgid "Copying messages to “%s”"
 msgstr "'%s' へメッセージをコピー中"
 
-#: ../libemail-engine/mail-ops.c:1209
-#, c-format
-msgid "Storing folder '%s'"
+#: ../src/libemail-engine/mail-ops.c:1284
+#, fuzzy, c-format
+#| msgid "Storing folder '%s'"
+msgid "Storing folder “%s”"
 msgstr "フォルダー '%s' の格納中"
 
-#: ../libemail-engine/mail-ops.c:1337
-#, c-format
-msgid "Expunging and storing account '%s'"
+#: ../src/libemail-engine/mail-ops.c:1412
+#, fuzzy, c-format
+#| msgid "Expunging and storing account '%s'"
+msgid "Expunging and storing account “%s”"
 msgstr "アカウント '%s' を削除し保存している最中"
 
-#: ../libemail-engine/mail-ops.c:1338
-#, c-format
-msgid "Storing account '%s'"
+#: ../src/libemail-engine/mail-ops.c:1413
+#, fuzzy, c-format
+#| msgid "Storing account '%s'"
+msgid "Storing account “%s”"
 msgstr "アカウント '%s' の格納中"
 
-#: ../libemail-engine/mail-ops.c:1413
-#, c-format
-msgid "Emptying trash in '%s'"
+#: ../src/libemail-engine/mail-ops.c:1488
+#, fuzzy, c-format
+#| msgid "Emptying trash in '%s'"
+msgid "Emptying trash in “%s”"
 msgstr "'%s' にあるゴミ箱のクリア中"
 
-#: ../libemail-engine/mail-tools.c:70
-#, c-format
-msgid "Could not create spool directory '%s': %s"
+#: ../src/libemail-engine/mail-ops.c:1580
+#, fuzzy, c-format
+#| msgid "Storing folder '%s'"
+msgid "Processing folder changes in “%s”"
+msgstr "フォルダー '%s' の格納中"
+
+#: ../src/libemail-engine/mail-tools.c:68
+#, fuzzy, c-format
+#| msgid "Could not create spool directory '%s': %s"
+msgid "Could not create spool directory “%s”: %s"
 msgstr "スプール用ディレクトリ '%s' を作成できませんでした: %s"
 
-#: ../libemail-engine/mail-tools.c:110
-#, c-format
-msgid "Trying to movemail a non-mbox source '%s'"
+#: ../src/libemail-engine/mail-tools.c:108
+#, fuzzy, c-format
+#| msgid "Trying to movemail a non-mbox source '%s'"
+msgid "Trying to movemail a non-mbox source “%s”"
 msgstr "mbox 形式ではないソース '%s' の移動を試みます"
 
-#: ../libemail-engine/mail-tools.c:236
-#, c-format
-msgid "Forwarded message - %s"
+#: ../src/libemail-engine/mail-tools.c:257
+#, fuzzy, c-format
+#| msgid "Forwarded message - %s"
+msgid "Forwarded message — %s"
 msgstr "転送するメッセージ - %s"
 
-#: ../libemail-engine/mail-tools.c:238
+#: ../src/libemail-engine/mail-tools.c:259
 msgid "Forwarded message"
 msgstr "転送するメッセージ"
 
-#: ../libemail-engine/mail-vfolder.c:151
+#: ../src/libemail-engine/mail-vfolder.c:149
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "仮想フォルダーの設定: %s"
 
-#: ../libemail-engine/mail-vfolder.c:304
-#, c-format
-msgid "Updating Search Folders for '%s' - %s"
+#: ../src/libemail-engine/mail-vfolder.c:302
+#, fuzzy, c-format
+#| msgid "Updating Search Folders for '%s' - %s"
+msgid "Updating Search Folders for “%s : %s”"
 msgstr "仮想フォルダー '%s' の更新中: %s"
 
 #. Translators: The first %s is name of the affected
@@ -11601,111 +16513,124 @@ 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:668
-#, c-format
+#: ../src/libemail-engine/mail-vfolder.c:666
+#, fuzzy, c-format
+#| msgid ""
+#| "The Search Folder \"%s\" has been modified to account for the deleted "
+#| "folder\n"
+#| "\"%s\"."
+#| msgid_plural ""
+#| "The following Search Folders\n"
+#| "%s have been modified to account for the deleted folder\n"
+#| "\"%s\"."
 msgid ""
-"The Search Folder \"%s\" has been modified to account for the deleted folder\n"
-"\"%s\"."
+"The Search Folder “%s” has been modified to account for the deleted folder\n"
+"“%s”."
 msgid_plural ""
 "The following Search Folders\n"
 "%s have been modified to account for the deleted folder\n"
-"\"%s\"."
+"“%s”."
 msgstr[0] ""
 "削除されたフォルダー \"%2$s\" のアカウントに関連する\n"
 "仮想フォルダー \"%1$s\" が更新されました。"
 
-#: ../mail/e-mail-account-manager.c:117 ../mail/e-mail-account-manager.c:204
+#: ../src/mail/e-mail-account-manager.c:118
+#: ../src/mail/e-mail-account-manager.c:205
 msgid "Open _Online Accounts"
 msgstr "オンラインアカウントを開く(_O)"
 
-#: ../mail/e-mail-account-manager.c:143 ../mail/e-mail-account-manager.c:230
+#: ../src/mail/e-mail-account-manager.c:144
+#: ../src/mail/e-mail-account-manager.c:231
 msgid "This account was created through the Online Accounts service."
 msgstr "この設定は GNOME オンラインアカウントサービス経由で作成されました。"
 
-#: ../mail/e-mail-account-manager.c:690
+#: ../src/mail/e-mail-account-manager.c:690
 msgid "_Reset Order"
-msgstr ""
+msgstr "順番のリセット(_R)"
 
-#: ../mail/e-mail-account-manager.c:703
+#: ../src/mail/e-mail-account-manager.c:703
 msgid "You can drag and drop account names to reorder them."
 msgstr "アカウント名をドラッグ&ドロップして並べかえることができます。"
 
-#: ../mail/e-mail-account-manager.c:746
+#: ../src/mail/e-mail-account-manager.c:746
 msgid "De_fault"
 msgstr "デフォルト(_F)"
 
-#: ../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
+#: ../src/mail/e-mail-account-tree-view.c:84
+#: ../src/modules/mail/em-composer-prefs.c:1299
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:355
+#: ../src/plugins/publish-calendar/publish-calendar.c:853
 msgid "Enabled"
 msgstr "有効"
 
-#: ../mail/e-mail-account-tree-view.c:108
+#: ../src/mail/e-mail-account-tree-view.c:108
 msgid "Account Name"
 msgstr "アカウント名"
 
-#: ../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:611
+#: ../src/mail/e-mail-autoconfig.c:620
 msgid "No email address provided"
 msgstr "メールアドレスが入力されていません"
 
-#: ../mail/e-mail-autoconfig.c:620
+#: ../src/mail/e-mail-autoconfig.c:629
 msgid "Missing domain in email address"
 msgstr "メールアドレスにドメインがありません"
 
-#: ../mail/e-mail-backend.c:841
-msgid "Unknown background operation"
-msgstr "バックグラウンドの操作が不明です"
-
-#: ../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
+#: ../src/mail/e-mail-browser.c:129 ../src/shell/e-shell-window-actions.c:782
+#: ../src/shell/e-shell-window-actions.c:789
+#: ../src/shell/e-shell-window-actions.c:796
 msgid "Close this window"
 msgstr "このウィンドウを閉じます"
 
-#: ../mail/e-mail-browser.c:285
+#: ../src/mail/e-mail-browser.c:287
 msgid "(No Subject)"
 msgstr "(件名無し)"
 
 #. GtkAssistant's back button label.
-#: ../mail/e-mail-config-assistant.c:46
+#: ../src/mail/e-mail-config-assistant.c:47
 #, fuzzy
 #| msgid "Go Back"
 msgid "Go _Back"
 msgstr "前へ戻る"
 
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:114
+#: ../src/mail/e-mail-config-assistant.c:116
 msgid "_Skip Lookup"
 msgstr "検索をスキップ(_S)"
 
-#: ../mail/e-mail-config-assistant.c:654
+#: ../src/mail/e-mail-config-assistant.c:661
 msgid "Evolution Account Assistant"
 msgstr "Evolution アカウントアシスタント"
 
-#: ../mail/e-mail-config-assistant.c:936
+#: ../src/mail/e-mail-config-assistant.c:955
 #, fuzzy
 #| msgid "_Restore Defaults"
 msgid "_Revise Details"
 msgstr "デフォルトに戻す(_R)"
 
-#: ../mail/e-mail-config-auth-check.c:350
+#: ../src/mail/e-mail-config-auth-check.c:178
+#, fuzzy
+#| msgid "%s authentication failed"
+msgid "Querying authentication types..."
+msgstr "%s の認証が失敗しました"
+
+#: ../src/mail/e-mail-config-auth-check.c:341
 msgid "Check for Supported Types"
 msgstr "サポートしているかチェック"
 
-#: ../mail/e-mail-config-confirm-page.c:156
+#: ../src/mail/e-mail-config-confirm-page.c:156
+#, fuzzy
+#| msgid ""
+#| "Congratulations, your mail configuration is complete.\n"
+#| "\n"
+#| "You are now ready to send and receive email using Evolution.\n"
+#| "\n"
+#| "Click \"Apply\" to save your settings."
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
 "You are now ready to send and receive email using Evolution.\n"
 "\n"
-"Click \"Apply\" to save your settings."
+"Click “Apply” to save your settings."
 msgstr ""
 "おめでとうございます。メールの設定が完了しました。\n"
 "\n"
@@ -11713,404 +16638,676 @@ msgstr ""
 "\n"
 "[適用] をクリックして設定を保存してください。"
 
-#: ../mail/e-mail-config-confirm-page.c:168
+#: ../src/mail/e-mail-config-confirm-page.c:168
 msgid "Done"
 msgstr "完了"
 
-#: ../mail/e-mail-config-defaults-page.c:549
+#: ../src/mail/e-mail-config-defaults-page.c:378
+msgid "Checking server settings..."
+msgstr ""
+
+#: ../src/mail/e-mail-config-defaults-page.c:496
+#, fuzzy
+#| msgid "Use locale default"
+msgctxt "ReplyForward"
+msgid "Use global setting"
+msgstr "システムのデフォルトを使用"
+
+#: ../src/mail/e-mail-config-defaults-page.c:498
+#: ../src/mail/mail-config.ui.h:26
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "添付ファイル"
+
+#: ../src/mail/e-mail-config-defaults-page.c:500
+#: ../src/mail/mail-config.ui.h:27
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "インラインにする (Outlook 形式)"
+
+#: ../src/mail/e-mail-config-defaults-page.c:502
+#: ../src/mail/mail-config.ui.h:28
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "引用する"
+
+#: ../src/mail/e-mail-config-defaults-page.c:504
+#: ../src/mail/mail-config.ui.h:29
+msgctxt "ReplyForward"
+msgid "Do Not Quote"
+msgstr "何も引用しない"
+
+#: ../src/mail/e-mail-config-defaults-page.c:830
 msgid "Special Folders"
 msgstr "特別なフォルダー"
 
-#: ../mail/e-mail-config-defaults-page.c:558
+#: ../src/mail/e-mail-config-defaults-page.c:839
 msgid "Draft Messages _Folder:"
 msgstr "下書きフォルダー(_F):"
 
-#: ../mail/e-mail-config-defaults-page.c:568
+#: ../src/mail/e-mail-config-defaults-page.c:849
 msgid "Choose a folder for saving draft messages."
 msgstr "下書きを保存するフォルダーを選択してください。"
 
-#: ../mail/e-mail-config-defaults-page.c:582
+#: ../src/mail/e-mail-config-defaults-page.c:863
 msgid "Sent _Messages Folder:"
 msgstr "送信済フォルダー(_M):"
 
-#: ../mail/e-mail-config-defaults-page.c:592
+#: ../src/mail/e-mail-config-defaults-page.c:873
 msgid "Choose a folder for saving sent messages."
 msgstr "送信済みメッセージを保存するフォルダーを選択してください。"
 
-#: ../mail/e-mail-config-defaults-page.c:611
+#: ../src/mail/e-mail-config-defaults-page.c:892
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr "返信を返信元メッセージのフォルダーに保存する(_A)"
 
-#: ../mail/e-mail-config-defaults-page.c:628
+# "検索フォルダ"は適訳ではない
+#: ../src/mail/e-mail-config-defaults-page.c:909
+#, fuzzy
+#| msgid "Search Folders"
+msgid "Archi_ve Folder:"
+msgstr "仮想フォルダー"
+
+#: ../src/mail/e-mail-config-defaults-page.c:919
+#: ../src/modules/mail/em-mailer-prefs.c:1401
+#, fuzzy
+#| msgid "Choose folders to post the message to."
+msgid "Choose a folder to archive messages to."
+msgstr "メッセージを投稿するフォルダーを選択してください。"
+
+#: ../src/mail/e-mail-config-defaults-page.c:933
+#, fuzzy
+#| msgid "_Template:"
+msgid "_Templates Folder:"
+msgstr "テンプレート(_T):"
+
+#: ../src/mail/e-mail-config-defaults-page.c:943
+#, fuzzy
+#| msgid "Choose a folder for deleted messages."
+msgid "Choose a folder to use for template messages."
+msgstr "削除したメッセージのフォルダーを選択してください。"
+
+#: ../src/mail/e-mail-config-defaults-page.c:965
 msgid "_Restore Defaults"
 msgstr "デフォルトに戻す(_R)"
 
-#: ../mail/e-mail-config-defaults-page.c:642
+#: ../src/mail/e-mail-config-defaults-page.c:982
+#, fuzzy
+#| msgid "Copy to Folder"
+msgid "_Lookup Folders"
+msgstr "フォルダーへコピーする"
+
+#: ../src/mail/e-mail-config-defaults-page.c:1000
 msgid "Use a Real Folder for _Trash:"
 msgstr "ゴミ箱として実フォルダーを使う(_T):"
 
-#: ../mail/e-mail-config-defaults-page.c:643
+#: ../src/mail/e-mail-config-defaults-page.c:1001
 msgid "Choose a folder for deleted messages."
 msgstr "削除したメッセージのフォルダーを選択してください。"
 
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../src/mail/e-mail-config-defaults-page.c:1010
 msgid "Use a Real Folder for _Junk:"
 msgstr "ジャンクとして実フォルダーを使う(_J):"
 
-#: ../mail/e-mail-config-defaults-page.c:653
+#: ../src/mail/e-mail-config-defaults-page.c:1011
 msgid "Choose a folder for junk messages."
 msgstr "ジャンクメッセージのフォルダーを選択してください。"
 
-#: ../mail/e-mail-config-defaults-page.c:670
+#: ../src/mail/e-mail-config-defaults-page.c:1028
 msgid "Composing Messages"
 msgstr "メッセージの作成"
 
-#: ../mail/e-mail-config-defaults-page.c:679
+#: ../src/mail/e-mail-config-defaults-page.c:1037
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "常に使用する CC 先(_S):"
 
-#: ../mail/e-mail-config-defaults-page.c:704
+#: ../src/mail/e-mail-config-defaults-page.c:1062
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "常に使用する Bcc 先(_B):"
 
-#: ../mail/e-mail-config-defaults-page.c:739
+#: ../src/mail/e-mail-config-defaults-page.c:1093
+#, fuzzy
+#| msgid "_Reply style:"
+msgid "Re_ply style:"
+msgstr "返信方法(_R):"
+
+#: ../src/mail/e-mail-config-defaults-page.c:1129
 msgid "Message Receipts"
 msgstr "メッセージの開封通知"
 
-#: ../mail/e-mail-config-defaults-page.c:748
+#: ../src/mail/e-mail-config-defaults-page.c:1138
 msgid "S_end message receipts:"
 msgstr "開封通知の送信(_E):"
 
-#: ../mail/e-mail-config-defaults-page.c:773
+#: ../src/mail/e-mail-config-defaults-page.c:1163
 msgid "Never"
 msgstr "しない"
 
-#: ../mail/e-mail-config-defaults-page.c:779
+#: ../src/mail/e-mail-config-defaults-page.c:1169
 msgid "Always"
 msgstr "常に"
 
-#: ../mail/e-mail-config-defaults-page.c:785
+#: ../src/mail/e-mail-config-defaults-page.c:1175
 msgid "Ask for each message"
 msgstr "送信する度に確認する"
 
-#: ../mail/e-mail-config-defaults-page.c:856
+#: ../src/mail/e-mail-config-defaults-page.c:1282
 msgid "Defaults"
 msgstr "デフォルト"
 
-#: ../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 "あなたのお名前とメールアドレスを入力してください。\"追加情報\" の欄は必須ではありませんが、自動的にメッセージの中に挿入させる場合は入力してください。"
+#: ../src/mail/e-mail-config-identity-page.c:516
+#, fuzzy
+#| 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."
+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:293
-#: ../mail/e-mail-config-summary-page.c:323
+#: ../src/mail/e-mail-config-identity-page.c:544
+#: ../src/mail/e-mail-config-summary-page.c:324
 msgid "Account Information"
 msgstr "アカウント情報"
 
-#: ../mail/e-mail-config-identity-page.c:302
-#: ../mail/e-mail-config-summary-page.c:332
+#: ../src/mail/e-mail-config-identity-page.c:582
+#: ../src/mail/e-mail-config-summary-page.c:354
+#, fuzzy
+#| msgid ""
+#| "Type the name by which you would like to refer to this account.\n"
+#| "For example, \"Work\" or \"Personal\"."
 msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example, \"Work\" or \"Personal\"."
+"The above name will be used to identify this account.\n"
+"Use for example, “Work” or “Personal”."
 msgstr ""
 "このアカウントにお好みの名前を付けてください。\n"
 "例えば、\"仕事\" や \"プライベート\"。"
 
-#: ../mail/e-mail-config-identity-page.c:347
+#: ../src/mail/e-mail-config-identity-page.c:599
 msgid "Required Information"
 msgstr "必須情報"
 
-#: ../mail/e-mail-config-identity-page.c:356
+#: ../src/mail/e-mail-config-identity-page.c:608
 msgid "Full Nam_e:"
 msgstr "氏名(_E):"
 
-#: ../mail/e-mail-config-identity-page.c:383
+#: ../src/mail/e-mail-config-identity-page.c:637
 msgid "Email _Address:"
 msgstr "メールアドレス(_A):"
 
-#: ../mail/e-mail-config-identity-page.c:430
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+#: ../src/mail/e-mail-config-identity-page.c:686
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "追加情報"
 
-#: ../mail/e-mail-config-identity-page.c:439
+#: ../src/mail/e-mail-config-identity-page.c:695
 msgid "Re_ply-To:"
 msgstr "返信先(_P):"
 
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../src/mail/e-mail-config-identity-page.c:724
 msgid "Or_ganization:"
 msgstr "組織(_G):"
 
-#: ../mail/e-mail-config-identity-page.c:521
+#: ../src/mail/e-mail-config-identity-page.c:779
 msgid "Add Ne_w Signature..."
 msgstr "新しい署名の追加(_W)..."
 
-#: ../mail/e-mail-config-lookup-page.c:67
+#: ../src/mail/e-mail-config-identity-page.c:793
+msgid "A_liases:"
+msgstr ""
+
+#: ../src/mail/e-mail-config-identity-page.c:855
+#: ../src/mail/mail-config.ui.h:113
+msgid "Add"
+msgstr "追加"
+
+#: ../src/mail/e-mail-config-identity-page.c:864
+msgid "Edit"
+msgstr "編集"
+
+#: ../src/mail/e-mail-config-identity-page.c:873
+#: ../src/mail/mail-config.ui.h:114
+msgid "Remove"
+msgstr "削除"
+
+#: ../src/mail/e-mail-config-identity-page.c:887
+msgid "_Look up mail server details based on the entered e-mail address"
+msgstr ""
+
+#. This is only a warning, not a blocker
+#. complete = complete && correct;
+#: ../src/mail/e-mail-config-identity-page.c:934
+#, fuzzy
+#| msgid "The file cannot be read"
+msgid "Full Name should not be empty"
+msgstr "そのアイテムは読めません"
+
+#: ../src/mail/e-mail-config-identity-page.c:941
+#, fuzzy
+#| msgid "Email Address"
+msgid "Email Address cannot be empty"
+msgstr "メールアドレス"
+
+#: ../src/mail/e-mail-config-identity-page.c:946
+msgid "Email Address is not a valid email"
+msgstr ""
+
+#: ../src/mail/e-mail-config-identity-page.c:958
+msgid "Reply To is not a valid email"
+msgstr ""
+
+#: ../src/mail/e-mail-config-identity-page.c:969
+#: ../src/mail/e-mail-config-summary-page.c:633
+#, fuzzy
+#| msgid "Account Name"
+msgid "Account Name cannot be empty"
+msgstr "アカウント名"
+
+#: ../src/mail/e-mail-config-lookup-page.c:69
 msgid "Looking up account details..."
 msgstr "アカウント詳細の検索中..."
 
-#: ../mail/e-mail-config-provider-page.c:484
+#: ../src/mail/e-mail-config-provider-page.c:529
 msgid "Checking for New Mail"
 msgstr "新着メールの確認"
 
-#: ../mail/e-mail-config-provider-page.c:500
+#: ../src/mail/e-mail-config-provider-page.c:545
 msgid "Check for _new messages every"
 msgstr "新着メールをチェックする周期(_N): "
 
-#: ../mail/e-mail-config-provider-page.c:699
+#: ../src/mail/e-mail-config-provider-page.c:753
 msgid "Receiving Options"
 msgstr "受信のオプション"
 
-#: ../mail/e-mail-config-receiving-page.c:49
+#: ../src/mail/e-mail-config-receiving-page.c:50
 msgid "Receiving Email"
 msgstr "メールの受信"
 
-#: ../mail/e-mail-config-security-page.c:260
-#: ../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:90
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+#. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
+#. The first '%s' is a key ID, the second '%s' is a display name of the key.
+#: ../src/mail/e-mail-config-security-page.c:231
+#, c-format
+msgctxt "PGPKeyDescription"
+msgid "%s — %s"
+msgstr ""
+
+#: ../src/mail/e-mail-config-security-page.c:320
+#: ../src/mail/em-folder-properties.c:1070 ../src/mail/mail-config.ui.h:31
+#: ../src/modules/addressbook/autocompletion-config.c:114
+#: ../src/modules/calendar/e-calendar-preferences.c:644
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:48
+#: ../src/modules/mail/e-mail-shell-backend.c:729
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "全般"
 
-#: ../mail/e-mail-config-security-page.c:269
+#: ../src/mail/e-mail-config-security-page.c:329
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "会議開催要求には署名しない (Outlook 互換用)(_D)"
 
-#: ../mail/e-mail-config-security-page.c:291
+#: ../src/mail/e-mail-config-security-page.c:351
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Pretty Good Privacy (OpenPGP)"
 
-#: ../mail/e-mail-config-security-page.c:300
+#: ../src/mail/e-mail-config-security-page.c:360
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP 鍵の ID(_K):"
 
-#: ../mail/e-mail-config-security-page.c:322
+#: ../src/mail/e-mail-config-security-page.c:393
 msgid "Si_gning algorithm:"
 msgstr "署名アルゴリズム(_G):"
 
-#: ../mail/e-mail-config-security-page.c:338
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:67
+#: ../src/mail/e-mail-config-security-page.c:409
+#: ../src/mail/e-mail-config-security-page.c:573
+#: ../src/mail/mail-config.ui.h:76
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:341
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:68
+#: ../src/mail/e-mail-config-security-page.c:412
+#: ../src/mail/e-mail-config-security-page.c:576
+#: ../src/mail/mail-config.ui.h:77
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:344
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:69
+#: ../src/mail/e-mail-config-security-page.c:415
+#: ../src/mail/e-mail-config-security-page.c:579
+#: ../src/mail/mail-config.ui.h:78
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:347
-#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:70
+#: ../src/mail/e-mail-config-security-page.c:418
+#: ../src/mail/e-mail-config-security-page.c:582
+#: ../src/mail/mail-config.ui.h:79
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:363
+#: ../src/mail/e-mail-config-security-page.c:434
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "このアカウントを使用する場合は常に送信メッセージに署名を付与する(_W)"
 
-#: ../mail/e-mail-config-security-page.c:375
+#: ../src/mail/e-mail-config-security-page.c:446
+#, fuzzy
+#| msgid "Always encrypt outgoing messages when using this account"
+msgid "Always enc_rypt outgoing messages when using this account"
+msgstr "このアカウントを使用する場合は常に送信メッセージを暗号化する"
+
+#: ../src/mail/e-mail-config-security-page.c:458
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "暗号化したメッセージを送信する場合は常にメール全体を暗号化する(_M)"
 
-#: ../mail/e-mail-config-security-page.c:387
+#: ../src/mail/e-mail-config-security-page.c:470
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "暗号解読時には常に信用キーを使用する(_T)"
 
-#: ../mail/e-mail-config-security-page.c:411
+#: ../src/mail/e-mail-config-security-page.c:482
+msgid "Prefer _inline sign/encrypt for plain text messages"
+msgstr ""
+
+#: ../src/mail/e-mail-config-security-page.c:506
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:420
+#: ../src/mail/e-mail-config-security-page.c:515
 msgid "Sig_ning certificate:"
 msgstr "署名する証明書(_N):"
 
-#: ../mail/e-mail-config-security-page.c:444
-#: ../mail/e-mail-config-security-page.c:550
+#: ../src/mail/e-mail-config-security-page.c:539
+#: ../src/mail/e-mail-config-security-page.c:637
 msgid "Select"
 msgstr "選択"
 
-#: ../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
+#: ../src/mail/e-mail-config-security-page.c:548
+#: ../src/mail/e-mail-config-security-page.c:646
+#: ../src/mail/mail-dialogs.ui.h:16 ../src/shell/e-shell-window-actions.c:885
 #, fuzzy
 #| msgid "_Clear Flag"
 msgid "_Clear"
 msgstr "フラグの解除(_C)"
 
-#: ../mail/e-mail-config-security-page.c:462
+#: ../src/mail/e-mail-config-security-page.c:557
 msgid "Signing _algorithm:"
 msgstr "署名アルゴリズム(_A)"
 
-#: ../mail/e-mail-config-security-page.c:503
+#: ../src/mail/e-mail-config-security-page.c:598
 msgid "Always sign outgoing messages when using this account"
 msgstr "このアカウントを使用する場合は常に送信メッセージに電子署名する"
 
-#: ../mail/e-mail-config-security-page.c:526
+#: ../src/mail/e-mail-config-security-page.c:613
 msgid "Encryption certificate:"
 msgstr "暗号化する証明書:"
 
-#: ../mail/e-mail-config-security-page.c:568
+#: ../src/mail/e-mail-config-security-page.c:655
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "このアカウントを使用する場合は常に送信メッセージを暗号化する"
 
-#: ../mail/e-mail-config-security-page.c:588
+#: ../src/mail/e-mail-config-security-page.c:667
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "暗号化したメッセージを送信する場合は常に自分宛にも暗号化する"
 
-#: ../mail/e-mail-config-sending-page.c:49
+#: ../src/mail/e-mail-config-sending-page.c:50
 msgid "Sending Email"
 msgstr "メールの送信"
 
-#: ../mail/e-mail-config-service-page.c:639
+#: ../src/mail/e-mail-config-service-page.c:639
 msgid "Server _Type:"
 msgstr "サーバー種別(_T):"
 
-#: ../mail/e-mail-config-summary-page.c:141
-msgid "SSL"
-msgstr "SSL"
-
-#: ../mail/e-mail-config-summary-page.c:144
+#: ../src/mail/e-mail-config-summary-page.c:143
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:306
-msgid "This is a summary of the settings which will be used to access your mail."
+#: ../src/mail/e-mail-config-summary-page.c:146
+msgid "STARTTLS"
+msgstr ""
+
+#: ../src/mail/e-mail-config-summary-page.c:307
+msgid ""
+"This is a summary of the settings which will be used to access your mail."
 msgstr "メールにアクセスするのに使われる設定の概要です。"
 
-#: ../mail/e-mail-config-summary-page.c:371
+#: ../src/mail/e-mail-config-summary-page.c:371
 msgid "Personal Details"
 msgstr "個人の詳細"
 
-#: ../mail/e-mail-config-summary-page.c:380
+#: ../src/mail/e-mail-config-summary-page.c:380
 msgid "Full Name:"
 msgstr "氏名:"
 
-#: ../mail/e-mail-config-summary-page.c:394
+#: ../src/mail/e-mail-config-summary-page.c:394
 msgid "Email Address:"
 msgstr "メールアドレス:"
 
-#: ../mail/e-mail-config-summary-page.c:408
+#: ../src/mail/e-mail-config-summary-page.c:408
 msgid "Receiving"
 msgstr "受信"
 
-#: ../mail/e-mail-config-summary-page.c:420
+#: ../src/mail/e-mail-config-summary-page.c:420
 msgid "Sending"
 msgstr "送信"
 
-#: ../mail/e-mail-config-summary-page.c:432
+#: ../src/mail/e-mail-config-summary-page.c:432
 msgid "Server Type:"
 msgstr "サーバー種別:"
 
-#: ../mail/e-mail-config-summary-page.c:453
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
+#: ../src/mail/e-mail-config-summary-page.c:453
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:606
 msgid "Server:"
 msgstr "サーバー:"
 
-#: ../mail/e-mail-config-summary-page.c:474
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
+#: ../src/mail/e-mail-config-summary-page.c:474
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:704
 msgid "Username:"
 msgstr "ユーザー名:"
 
-#: ../mail/e-mail-config-summary-page.c:495
+#: ../src/mail/e-mail-config-summary-page.c:495
 msgid "Security:"
 msgstr "セキュリティ:"
 
-#: ../mail/e-mail-config-summary-page.c:786
+#: ../src/mail/e-mail-config-summary-page.c:788
 msgid "Account Summary"
 msgstr "アカウントの概要"
 
-#: ../mail/e-mail-config-welcome-page.c:156
+#: ../src/mail/e-mail-config-welcome-page.c:157
+#, fuzzy
+#| msgid ""
+#| "Welcome to the Evolution Mail Configuration Assistant.\n"
+#| "\n"
+#| "Click \"Next\" to begin."
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Continue\" to begin."
+"Click “Next” to begin."
 msgstr ""
 "Evolution メール設定アシスタントへようこそ。\n"
 "\n"
-"[続ける] ボタンをクリックしてください。"
+"[進む] ボタンをクリックしてください。"
 
-#: ../mail/e-mail-config-welcome-page.c:166
-#: ../modules/startup-wizard/e-startup-assistant.c:151
+#: ../src/mail/e-mail-config-welcome-page.c:167
+#: ../src/modules/startup-wizard/e-startup-assistant.c:152
 msgid "Welcome"
 msgstr "ようこそ"
 
-#: ../mail/e-mail-config-window.c:326
+#: ../src/mail/e-mail-config-window.c:326
 msgid "Account Editor"
 msgstr "アカウントエディター"
 
-#: ../mail/e-mail-display.c:95
+#: ../src/mail/e-mail-display.c:128
 msgid "_Add to Address Book..."
 msgstr "アドレス帳に追加(_A)..."
 
-#: ../mail/e-mail-display.c:102
+#: ../src/mail/e-mail-display.c:135
 msgid "_To This Address"
 msgstr "このアドレスへ(_T)"
 
-#: ../mail/e-mail-display.c:109
+#: ../src/mail/e-mail-display.c:142
 msgid "_From This Address"
 msgstr "このアドレスら(_F)"
 
-#: ../mail/e-mail-display.c:116
+#: ../src/mail/e-mail-display.c:149
 msgid "Send _Reply To..."
 msgstr "返信する(_R)..."
 
-#: ../mail/e-mail-display.c:118
+#: ../src/mail/e-mail-display.c:151
 msgid "Send a reply message to this address"
 msgstr "このアドレスに返信"
 
-#: ../mail/e-mail-display.c:125
+#: ../src/mail/e-mail-display.c:158
 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:297
+#: ../src/mail/e-mail-display.c:803
+msgid "Hid_e All"
+msgstr "すべて隠す(_E)"
+
+#: ../src/mail/e-mail-display.c:810
+msgid "_View Inline"
+msgstr "インライン表示(_V)"
+
+#: ../src/mail/e-mail-display.c:817
+msgid "Vie_w All Inline"
+msgstr "すべてインラインで表示(_W)"
+
+#: ../src/mail/e-mail-display.c:824
+msgid "_Zoom to 100%"
+msgstr ""
+
+#: ../src/mail/e-mail-display.c:826
+#, fuzzy
+#| msgid "Reset the text to its original size"
+msgid "Zoom the image to its natural size"
+msgstr "文字のサイズを初期サイズに戻します"
+
+#: ../src/mail/e-mail-display.c:831
+#, fuzzy
+#| msgid "Close this window"
+msgid "_Zoom to window"
+msgstr "このウィンドウを閉じます"
+
+#: ../src/mail/e-mail-display.c:833
+msgid "Zoom large images to not be wider than the window width"
+msgstr ""
+
+#: ../src/mail/e-mail-folder-create-dialog.c:328
+msgid "Create Folder"
+msgstr "フォルダーの作成"
+
+#: ../src/mail/e-mail-folder-create-dialog.c:332
+msgid "Specify where to create the folder:"
+msgstr "フォルダーを作成する場所を指定してください:"
+
+#: ../src/mail/e-mail-folder-create-dialog.c:335
+msgid "C_reate"
+msgstr "作成(_R)"
+
+#: ../src/mail/e-mail-folder-create-dialog.c:352
+msgid "Folder _name:"
+msgstr "フォルダー名(_N):"
+
+#. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
+#. The translated value should not contain spaces.
+#: ../src/mail/e-mail-free-form-exp.c:234
+#, fuzzy
+#| msgid "Answered"
+msgctxt "ffe"
+msgid "Answered"
+msgstr "返答済み"
+
+#: ../src/mail/e-mail-free-form-exp.c:235
+#, fuzzy
+#| msgid "Deleted"
+msgctxt "ffe"
+msgid "Deleted"
+msgstr "削除済み"
+
+#: ../src/mail/e-mail-free-form-exp.c:236
+#, fuzzy
+#| msgid "Draft"
+msgctxt "ffe"
+msgid "Draft"
+msgstr "下書き"
+
+#: ../src/mail/e-mail-free-form-exp.c:237
+#, fuzzy
+#| msgid "Flagged"
+msgctxt "ffe"
+msgid "Flagged"
+msgstr "フラグ"
+
+#: ../src/mail/e-mail-free-form-exp.c:238
+#, fuzzy
+#| msgid "Seen"
+msgctxt "ffe"
+msgid "Seen"
+msgstr "既読"
+
+#: ../src/mail/e-mail-free-form-exp.c:239
+#, fuzzy
+#| msgid "Attachment"
+#| msgid_plural "Attachments"
+msgctxt "ffe"
+msgid "Attachment"
+msgstr "添付ファイル"
+
+#: ../src/mail/e-mail-free-form-exp.c:487
+#, fuzzy
+#| msgid "now"
+msgctxt "ffe"
+msgid "no"
+msgstr "現在"
+
+#: ../src/mail/e-mail-free-form-exp.c:488
+msgctxt "ffe"
+msgid "false"
+msgstr ""
+
+#: ../src/mail/e-mail-junk-options.c:296
 msgid "Junk filtering software:"
 msgstr "ジャンクフィルターのソフトウェア:"
 
-#: ../mail/e-mail-label-dialog.c:224
+#: ../src/mail/e-mail-label-dialog.c:222
 msgid "_Label name:"
 msgstr "ラベルの名前(_L):"
 
-#: ../mail/e-mail-label-list-store.c:56
+#: ../src/mail/e-mail-label-list-store.c:55
 msgid "I_mportant"
 msgstr "重要(_M)"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:57
+#: ../src/mail/e-mail-label-list-store.c:56
 msgid "_Work"
 msgstr "仕事(_W)"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:58
+#: ../src/mail/e-mail-label-list-store.c:57
 msgid "_Personal"
 msgstr "個人(_P)"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:59
+#: ../src/mail/e-mail-label-list-store.c:58
 msgid "_To Do"
 msgstr "ToDo(_T)"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:60
+#: ../src/mail/e-mail-label-list-store.c:59
 msgid "_Later"
 msgstr "保留(_L)"
 
-#: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1028
+#: ../src/mail/e-mail-label-manager.c:169
+#: ../src/mail/em-folder-properties.c:842
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1198
 msgid "Add Label"
 msgstr "ラベルの追加"
 
-#: ../mail/e-mail-label-manager.c:222
+#: ../src/mail/e-mail-label-manager.c:220
+#: ../src/mail/em-folder-properties.c:869
 msgid "Edit Label"
 msgstr "ラベルの編集"
 
-#: ../mail/e-mail-label-manager.c:354
+#: ../src/mail/e-mail-label-manager.c:352
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -12118,645 +17315,835 @@ msgstr ""
 "注記: ラベルの中にあるアンダースコア (下線) は\n"
 "メニューの中でニーモニックとして使用されます。"
 
-#: ../mail/e-mail-label-tree-view.c:88
+#: ../src/mail/e-mail-label-tree-view.c:86
 msgid "Color"
 msgstr "色"
 
-#: ../mail/e-mail-print-config-headers.c:166
+#: ../src/mail/e-mail-notes.c:319 ../src/mail/e-mail-notes.c:719
+#, fuzzy
+#| msgid "Messages Not Junk"
+msgid "Message Note"
+msgstr "ジャンクではないメッセージ"
+
+#: ../src/mail/e-mail-notes.c:639
+#, fuzzy
+#| msgid "Copying messages into folder %s"
+msgid "Cannot find message in its folder summary"
+msgstr "フォルダー %s へメッセージのコピー中"
+
+#: ../src/mail/e-mail-notes.c:842
+msgid "Storing changes..."
+msgstr ""
+
+#: ../src/mail/e-mail-notes.c:968
+#, fuzzy
+#| msgid "_Edit Message"
+msgid "Edit Message Note"
+msgstr "メッセージの編集(_E)"
+
+#: ../src/mail/e-mail-notes.c:1122
+#, fuzzy
+#| msgid "Retrieving message"
+msgid "Retrieving message..."
+msgstr "メッセージの受信中"
+
+#: ../src/mail/e-mail-print-config-headers.c:166
 msgid "Move selected headers to top"
 msgstr "選択したヘッダーを最上部へ移動します"
 
-#: ../mail/e-mail-print-config-headers.c:171
+#: ../src/mail/e-mail-print-config-headers.c:171
 msgid "Move selected headers up one row"
 msgstr "選択したヘッダーを1つ上へ移動します"
 
-#: ../mail/e-mail-print-config-headers.c:176
+#: ../src/mail/e-mail-print-config-headers.c:176
 msgid "Move selected headers down one row"
 msgstr "選択したヘッダーを1つ下へ移動します"
 
-#: ../mail/e-mail-print-config-headers.c:181
+#: ../src/mail/e-mail-print-config-headers.c:181
 msgid "Move selected headers to bottom"
 msgstr "選択したヘッダーを最下部へ移動します"
 
-#: ../mail/e-mail-print-config-headers.c:186
+#: ../src/mail/e-mail-print-config-headers.c:186
 msgid "Select all headers"
 msgstr "ヘッダーをすべて選択"
 
-#: ../mail/e-mail-print-config-headers.c:205
+#: ../src/mail/e-mail-print-config-headers.c:205
 msgid "Header Name"
 msgstr "ヘッダーの名前"
 
-#: ../mail/e-mail-print-config-headers.c:214
+#: ../src/mail/e-mail-print-config-headers.c:214
 msgid "Header Value"
 msgstr "ヘッダーの値"
 
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:106
+#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:125
 msgid "Headers"
 msgstr "ヘッダー"
 
-#: ../mail/e-mail-printer.c:166
+#: ../src/mail/e-mail-printer.c:142
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d / %d ページ"
 
-#: ../mail/e-mail-reader.c:348 ../mail/em-filter-i18n.h:11
+#: ../src/mail/e-mail-reader.c:349 ../src/mail/filtertypes.xml.in.h:65
+msgid "Move to Folder"
+msgstr "フォルダーへ移動する"
+
+#: ../src/mail/e-mail-reader.c:349 ../src/mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "フォルダーへコピーする"
 
-#: ../mail/e-mail-reader.c:348 ../mail/em-folder-utils.c:505
+#: ../src/mail/e-mail-reader.c:353 ../src/mail/em-folder-utils.c:501
+#: ../src/mail/mail.error.xml.h:152
+msgid "_Move"
+msgstr "移動(_M)"
+
+#: ../src/mail/e-mail-reader.c:353 ../src/mail/em-folder-utils.c:501
 msgid "C_opy"
 msgstr "コピー(_O)"
 
-#: ../mail/e-mail-reader.c:848 ../mail/em-filter-i18n.h:33
-msgid "Move to Folder"
-msgstr "フォルダーへ移動する"
-
-#: ../mail/e-mail-reader.c:848 ../mail/em-folder-utils.c:505
-msgid "_Move"
-msgstr "移動(_M)"
+#: ../src/mail/e-mail-reader.c:485
+#, fuzzy
+#| msgid "Generating message list"
+msgid "Deleting message note..."
+msgstr "メッセージの一覧の作成中"
 
-#: ../mail/e-mail-reader.c:1174 ../mail/e-mail-reader.c:1386
-#: ../mail/e-mail-reader.c:1426
+#: ../src/mail/e-mail-reader.c:1307 ../src/mail/e-mail-reader.c:1519
+#: ../src/mail/e-mail-reader.c:1559
 msgid "_Do not ask me again."
 msgstr "次回からこのメッセージを表示しない(_D)"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../src/mail/e-mail-reader.c:1565
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "メーリングリストで常に Reply-To: を無視する(_A)"
 
-#: ../mail/e-mail-reader.c:1634
+#: ../src/mail/e-mail-reader.c:1768
 msgid "Failed to retrieve message:"
 msgstr "メッセージの取得に失敗しました:"
 
-#: ../mail/e-mail-reader.c:1674 ../mail/e-mail-reader.c:2843
-#, c-format
-msgid "Retrieving message '%s'"
+#: ../src/mail/e-mail-reader.c:1813 ../src/mail/e-mail-reader.c:3172
+#, fuzzy, c-format
+#| msgid "Retrieving message '%s'"
+msgid "Retrieving message “%s”"
 msgstr "メッセージ '%s' を取得中"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../src/mail/e-mail-reader.c:2001
 msgid "A_dd Sender to Address Book"
 msgstr "差出人をアドレス帳へ追加(_D)"
 
-#: ../mail/e-mail-reader.c:1864
+#: ../src/mail/e-mail-reader.c:2003
 msgid "Add sender to address book"
 msgstr "差出人をアドレス帳に追加します"
 
-#: ../mail/e-mail-reader.c:1869
+#: ../src/mail/e-mail-reader.c:2008
+msgid "_Archive..."
+msgstr ""
+
+#: ../src/mail/e-mail-reader.c:2010
+#, fuzzy
+#| msgid "Move selected messages to another folder"
+msgid "Move selected messages to the Archive folder for the account"
+msgstr "選択したメッセージを別のフォルダーへ移動します"
+
+#: ../src/mail/e-mail-reader.c:2015
 msgid "Check for _Junk"
 msgstr "ジャンクかチェックする(_J)"
 
-#: ../mail/e-mail-reader.c:1871
+#: ../src/mail/e-mail-reader.c:2017
 msgid "Filter the selected messages for junk status"
 msgstr "選択したメッセージがジャンクであるかどうかを確認します"
 
-#: ../mail/e-mail-reader.c:1876
+#: ../src/mail/e-mail-reader.c:2022
 msgid "_Copy to Folder..."
 msgstr "フォルダーへコピー(_C)..."
 
-#: ../mail/e-mail-reader.c:1878
+#: ../src/mail/e-mail-reader.c:2024
 msgid "Copy selected messages to another folder"
 msgstr "選択したメッセージを別のフォルダーへコピーします"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../src/mail/e-mail-reader.c:2029
 msgid "_Delete Message"
 msgstr "削除マークの付与(_D)"
 
-#: ../mail/e-mail-reader.c:1885
+#: ../src/mail/e-mail-reader.c:2031
 msgid "Mark the selected messages for deletion"
 msgstr "選択したメッセージに削除マークを付けます"
 
-#: ../mail/e-mail-reader.c:1890
+#: ../src/mail/e-mail-reader.c:2036
+#, fuzzy
+#| msgid "_Add Attachment..."
+msgid "_Add note..."
+msgstr "添付ファイルの追加(_A)..."
+
+#: ../src/mail/e-mail-reader.c:2038
+#, fuzzy
+#| msgid "Create a new memo from the selected message"
+msgid "Add a note for the selected message"
+msgstr "選択したメッセージから新しいメモを作成します"
+
+#: ../src/mail/e-mail-reader.c:2043
+#, fuzzy
+#| msgid "Delete Memo"
+msgid "Delete no_te"
+msgstr "メモの削除"
+
+#: ../src/mail/e-mail-reader.c:2045
+#, fuzzy
+#| msgid "Create a new event from the selected message"
+msgid "Delete the note for the selected message"
+msgstr "選択したメッセージから新しいイベントを作成します"
+
+#: ../src/mail/e-mail-reader.c:2050
+msgid "_Edit note..."
+msgstr ""
+
+#: ../src/mail/e-mail-reader.c:2052
+#, fuzzy
+#| msgid "Create a new memo from the selected message"
+msgid "Edit a note for the selected message"
+msgstr "選択したメッセージから新しいメモを作成します"
+
+#: ../src/mail/e-mail-reader.c:2057
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "メーリングリストのフィルタールールを作成(_L)..."
 
-#: ../mail/e-mail-reader.c:1892
+#: ../src/mail/e-mail-reader.c:2059
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "このメーリングリストへのメッセージをフィルターするルールを作成します"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../src/mail/e-mail-reader.c:2064
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "宛先のフィルターを作成(_R)..."
 
-#: ../mail/e-mail-reader.c:1899
+#: ../src/mail/e-mail-reader.c:2066
 msgid "Create a rule to filter messages to these recipients"
 msgstr "これらの宛先へのメッセージをフィルターするルールを作成します"
 
-#: ../mail/e-mail-reader.c:1904
+#: ../src/mail/e-mail-reader.c:2071
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "差出人のフィルタールールを作成(_N)..."
 
-#: ../mail/e-mail-reader.c:1906
+#: ../src/mail/e-mail-reader.c:2073
 msgid "Create a rule to filter messages from this sender"
 msgstr "この差出人からのメッセージをフィルターするルールを作成します"
 
-#: ../mail/e-mail-reader.c:1911
+#: ../src/mail/e-mail-reader.c:2078
 msgid "Create a Filter Rule for _Subject..."
 msgstr "件名のフィルタールールを作成(_S)..."
 
-#: ../mail/e-mail-reader.c:1913
+#: ../src/mail/e-mail-reader.c:2080
 msgid "Create a rule to filter messages with this subject"
 msgstr "この件名のメッセージをフィルターするルールを作成します"
 
-#: ../mail/e-mail-reader.c:1918
+#: ../src/mail/e-mail-reader.c:2085
 msgid "A_pply Filters"
 msgstr "フィルターの適用(_P)"
 
-#: ../mail/e-mail-reader.c:1920
+#: ../src/mail/e-mail-reader.c:2087
 msgid "Apply filter rules to the selected messages"
 msgstr "選択したメッセージに対してフィルタールールを適用します"
 
-#: ../mail/e-mail-reader.c:1925
+#: ../src/mail/e-mail-reader.c:2092
 msgid "_Find in Message..."
 msgstr "メッセージから検索(_F)..."
 
-#: ../mail/e-mail-reader.c:1927
+#: ../src/mail/e-mail-reader.c:2094
 msgid "Search for text in the body of the displayed message"
 msgstr "表示したメッセージ本文に含まれる文字列を検索します"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../src/mail/e-mail-reader.c:2099
 msgid "_Clear Flag"
 msgstr "フラグの解除(_C)"
 
-#: ../mail/e-mail-reader.c:1934
+#: ../src/mail/e-mail-reader.c:2101
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "選択したメッセージからフォローアップマークを削除します"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../src/mail/e-mail-reader.c:2106
 msgid "_Flag Completed"
 msgstr "完了フラグ(_F)"
 
-#: ../mail/e-mail-reader.c:1941
+#: ../src/mail/e-mail-reader.c:2108
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "選択したメッセージのフォローアップマークを「完了した」にします"
 
-#: ../mail/e-mail-reader.c:1946
+#: ../src/mail/e-mail-reader.c:2113
 msgid "Follow _Up..."
 msgstr "フォローアップ(_U)..."
 
-#: ../mail/e-mail-reader.c:1948
+#: ../src/mail/e-mail-reader.c:2115
 msgid "Flag the selected messages for follow-up"
 msgstr "選択したメッセージにフォローアップマークを付けます"
 
-#: ../mail/e-mail-reader.c:1953
+#: ../src/mail/e-mail-reader.c:2120
+#: ../src/modules/mail/e-mail-attachment-handler.c:430
 msgid "_Attached"
 msgstr "添付する(_A)"
 
-#: ../mail/e-mail-reader.c:1955 ../mail/e-mail-reader.c:1962
+#: ../src/mail/e-mail-reader.c:2122 ../src/mail/e-mail-reader.c:2129
+#: ../src/modules/mail/e-mail-attachment-handler.c:432
 msgid "Forward the selected message to someone as an attachment"
 msgstr "選択したメッセージを添付して誰かに転送します"
 
-#: ../mail/e-mail-reader.c:1960
+#: ../src/mail/e-mail-reader.c:2127
 msgid "Forward As _Attached"
 msgstr "添付として転送(_A)"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../src/mail/e-mail-reader.c:2134
+#: ../src/modules/mail/e-mail-attachment-handler.c:437
 msgid "_Inline"
 msgstr "インライン(_I)"
 
-#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
+#: ../src/mail/e-mail-reader.c:2136 ../src/mail/e-mail-reader.c:2143
+#: ../src/modules/mail/e-mail-attachment-handler.c:439
 msgid "Forward the selected message in the body of a new message"
 msgstr "選択したメッセージを新しいメッセージの本文に挿入して転送します"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../src/mail/e-mail-reader.c:2141
 msgid "Forward As _Inline"
 msgstr "インラインで転送(_I)"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../src/mail/e-mail-reader.c:2148
+#: ../src/modules/mail/e-mail-attachment-handler.c:444
 msgid "_Quoted"
 msgstr "引用する(_Q)"
 
-#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
+#: ../src/mail/e-mail-reader.c:2150 ../src/mail/e-mail-reader.c:2157
+#: ../src/modules/mail/e-mail-attachment-handler.c:446
 msgid "Forward the selected message quoted like a reply"
 msgstr "選択したメッセージを返信のように引用して転送します"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../src/mail/e-mail-reader.c:2155
 msgid "Forward As _Quoted"
 msgstr "引用として転送(_Q)"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../src/mail/e-mail-reader.c:2162
 msgid "_Load Images"
 msgstr "画像の読み込み(_L)"
 
-#: ../mail/e-mail-reader.c:1997
+#: ../src/mail/e-mail-reader.c:2164
 msgid "Force images in HTML mail to be loaded"
 msgstr "HTML メールの画像を強制的に読み込みます"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../src/mail/e-mail-reader.c:2169 ../src/mail/e-mail-reader.c:2559
+msgid "_Ignore Subthread"
+msgstr ""
+
+#: ../src/mail/e-mail-reader.c:2171
+msgid "Mark new mails in a subthread as read automatically"
+msgstr ""
+
+#: ../src/mail/e-mail-reader.c:2176 ../src/mail/e-mail-reader.c:2563
+#, fuzzy
+#| msgid "Next _Thread"
+msgid "_Ignore Thread"
+msgstr "次のスレッドへ(_T)"
+
+#: ../src/mail/e-mail-reader.c:2178
+msgid "Mark new mails in this thread as read automatically"
+msgstr ""
+
+#: ../src/mail/e-mail-reader.c:2183
 msgid "_Important"
 msgstr "重要(_I)"
 
-#: ../mail/e-mail-reader.c:2004
+#: ../src/mail/e-mail-reader.c:2185
 msgid "Mark the selected messages as important"
 msgstr "選択したメッセージに重要マークを付けます"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../src/mail/e-mail-reader.c:2190
 msgid "_Junk"
 msgstr "ジャンク(_J)"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../src/mail/e-mail-reader.c:2192
 msgid "Mark the selected messages as junk"
 msgstr "選択したメッセージにジャンクマークを付けます"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../src/mail/e-mail-reader.c:2197
 msgid "_Not Junk"
 msgstr "ジャンクではない(_N)"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../src/mail/e-mail-reader.c:2199
 msgid "Mark the selected messages as not being junk"
 msgstr "選択したメッセージのジャンクマークを外します"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../src/mail/e-mail-reader.c:2204
 msgid "_Read"
 msgstr "既読(_R)"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../src/mail/e-mail-reader.c:2206
 msgid "Mark the selected messages as having been read"
 msgstr "選択したメッセージに既読マークを付けます"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../src/mail/e-mail-reader.c:2211 ../src/mail/e-mail-reader.c:2583
+#, fuzzy
+#| msgid "Could not create publish thread."
+msgid "Do not _Ignore Subthread"
+msgstr "公開のためのプログラムのスレッドを作成できませんでした。"
+
+#: ../src/mail/e-mail-reader.c:2213
+msgid "Do not mark new mails in a subthread as read automatically"
+msgstr ""
+
+#: ../src/mail/e-mail-reader.c:2218 ../src/mail/e-mail-reader.c:2587
+msgid "Do not _Ignore Thread"
+msgstr ""
+
+#: ../src/mail/e-mail-reader.c:2220
+msgid "Do not mark new mails in this thread as read automatically"
+msgstr ""
+
+#: ../src/mail/e-mail-reader.c:2225
 msgid "Uni_mportant"
 msgstr "重要ではない(_M)"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../src/mail/e-mail-reader.c:2227
 msgid "Mark the selected messages as unimportant"
 msgstr "選択したメッセージの重要マークを外します"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../src/mail/e-mail-reader.c:2232
 msgid "_Unread"
 msgstr "未読(_U)"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../src/mail/e-mail-reader.c:2234
 msgid "Mark the selected messages as not having been read"
 msgstr "選択したメッセージに未読マークを付けます"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../src/mail/e-mail-reader.c:2239
+#: ../src/modules/mail/e-mail-attachment-handler.c:416
 msgid "_Edit as New Message..."
 msgstr "新規のメッセージとして編集(_E)..."
 
-#: ../mail/e-mail-reader.c:2046
+#: ../src/mail/e-mail-reader.c:2241
+#: ../src/modules/mail/e-mail-attachment-handler.c:418
 msgid "Open the selected messages in the composer for editing"
 msgstr "選択したメッセージを開いて編集します"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../src/mail/e-mail-reader.c:2246
 msgid "Compose _New Message"
 msgstr "新しいメッセージの作成(_N)"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../src/mail/e-mail-reader.c:2248
 msgid "Open a window for composing a mail message"
 msgstr "メッセージを作成するためのウィンドウを開きます"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../src/mail/e-mail-reader.c:2253
 msgid "_Open in New Window"
 msgstr "新しいウィンドウで開く(_O)"
 
-#: ../mail/e-mail-reader.c:2060
+#: ../src/mail/e-mail-reader.c:2255
 msgid "Open the selected messages in a new window"
 msgstr "選択したメッセージを新しいウィンドウの中で開きます"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../src/mail/e-mail-reader.c:2260
 msgid "_Move to Folder..."
 msgstr "フォルダーへ移動(_M)..."
 
-#: ../mail/e-mail-reader.c:2067
+#: ../src/mail/e-mail-reader.c:2262
 msgid "Move selected messages to another folder"
 msgstr "選択したメッセージを別のフォルダーへ移動します"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../src/mail/e-mail-reader.c:2267
 msgid "_Next Message"
 msgstr "次のメッセージへ(_N)"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../src/mail/e-mail-reader.c:2269
 msgid "Display the next message"
 msgstr "次のメッセージを表示します"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../src/mail/e-mail-reader.c:2274
 msgid "Next _Important Message"
 msgstr "次の重要なメッセージへ(_I)"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../src/mail/e-mail-reader.c:2276
 msgid "Display the next important message"
 msgstr "次の重要なメッセージを表示します"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../src/mail/e-mail-reader.c:2281
 msgid "Next _Thread"
 msgstr "次のスレッドへ(_T)"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../src/mail/e-mail-reader.c:2283
 msgid "Display the next thread"
 msgstr "次のスレッドを表示します"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../src/mail/e-mail-reader.c:2288
 msgid "Next _Unread Message"
 msgstr "次の未読メッセージへ(_U)"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../src/mail/e-mail-reader.c:2290
 msgid "Display the next unread message"
 msgstr "次の未読メッセージを表示します"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../src/mail/e-mail-reader.c:2295
 msgid "_Previous Message"
 msgstr "前のメッセージへ(_P)"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../src/mail/e-mail-reader.c:2297
 msgid "Display the previous message"
 msgstr "前のメッセージを表示します"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../src/mail/e-mail-reader.c:2302
 msgid "Pr_evious Important Message"
 msgstr "前の重要なメッセージへ(_E)"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../src/mail/e-mail-reader.c:2304
 msgid "Display the previous important message"
 msgstr "前の重要なメッセージを表示します"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../src/mail/e-mail-reader.c:2309
 msgid "Previous T_hread"
 msgstr "前のスレッドへ(_H)"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../src/mail/e-mail-reader.c:2311
 msgid "Display the previous thread"
 msgstr "前のスレッドを表示します"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../src/mail/e-mail-reader.c:2316
 msgid "P_revious Unread Message"
 msgstr "前の未読メッセージへ(_R)"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../src/mail/e-mail-reader.c:2318
 msgid "Display the previous unread message"
 msgstr "前の未読メッセージを表示します"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../src/mail/e-mail-reader.c:2325
 msgid "Print this message"
 msgstr "メッセージを印刷します"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../src/mail/e-mail-reader.c:2332
 msgid "Preview the message to be printed"
 msgstr "印刷されるメッセージのプレビューを表示します"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../src/mail/e-mail-reader.c:2337
+#: ../src/modules/mail/e-mail-attachment-handler.c:451
 msgid "Re_direct"
 msgstr "リダイレクト(_D)"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../src/mail/e-mail-reader.c:2339
+#: ../src/modules/mail/e-mail-attachment-handler.c:453
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "選択したメッセージを誰かに転送します"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../src/mail/e-mail-reader.c:2344
 msgid "Remo_ve Attachments"
 msgstr "添付ファイルの削除(_V)"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../src/mail/e-mail-reader.c:2346
 msgid "Remove attachments"
 msgstr "添付ファイルを削除します"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../src/mail/e-mail-reader.c:2351
 msgid "Remove Du_plicate Messages"
 msgstr "重複したメッセージの削除(_P)"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../src/mail/e-mail-reader.c:2353
 msgid "Checks selected messages for duplicates"
 msgstr "選択したメッセージに削除マークを付けます"
 
-#: ../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
+#: ../src/mail/e-mail-reader.c:2358 ../src/mail/mail.error.xml.h:28
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../src/modules/mail/e-mail-attachment-handler.c:395
 msgid "Reply to _All"
 msgstr "全員へ返信(_A)"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../src/mail/e-mail-reader.c:2360
+#: ../src/modules/mail/e-mail-attachment-handler.c:397
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "選択したメッセージのすべての宛先へ返信します"
 
-#: ../mail/e-mail-reader.c:2170 ../mail/mail.error.xml.h:25
+#: ../src/mail/e-mail-reader.c:2365 ../src/mail/mail.error.xml.h:26
+#: ../src/modules/mail/e-mail-attachment-handler.c:402
 msgid "Reply to _List"
 msgstr "メーリングリストへ返信(_L)"
 
-#: ../mail/e-mail-reader.c:2172
+#: ../src/mail/e-mail-reader.c:2367
+#: ../src/modules/mail/e-mail-attachment-handler.c:404
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "選択したメッセージのメーリングリストへ返信します"
 
-#: ../mail/e-mail-reader.c:2177
-#: ../modules/mail/e-mail-attachment-handler.c:220
+#: ../src/mail/e-mail-reader.c:2372
+#: ../src/modules/mail/e-mail-attachment-handler.c:409
 msgid "_Reply to Sender"
 msgstr "差出人へ返信(_R)"
 
-#: ../mail/e-mail-reader.c:2179
+#: ../src/mail/e-mail-reader.c:2374
+#: ../src/modules/mail/e-mail-attachment-handler.c:411
 msgid "Compose a reply to the sender of the selected message"
 msgstr "選択したメッセージの差出人へ返信します"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../src/mail/e-mail-reader.c:2379
 msgid "_Save as mbox..."
 msgstr "mbox 形式で保存(_S)..."
 
-#: ../mail/e-mail-reader.c:2186
+#: ../src/mail/e-mail-reader.c:2381
 msgid "Save selected messages as an mbox file"
 msgstr "選択したメッセージ mbox 形式のファイルで保存します"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../src/mail/e-mail-reader.c:2386
 msgid "_Message Source"
 msgstr "メッセージのソース(_M)"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../src/mail/e-mail-reader.c:2388
 msgid "Show the raw email source of the message"
 msgstr "メッセージのソースを表示します"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../src/mail/e-mail-reader.c:2400
 msgid "_Undelete Message"
 msgstr "削除マークの解除(_U)"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../src/mail/e-mail-reader.c:2402
 msgid "Undelete the selected messages"
 msgstr "選択したメッセージの削除を取り消します"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../src/mail/e-mail-reader.c:2407
 msgid "_Normal Size"
 msgstr "通常のサイズ(_N)"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../src/mail/e-mail-reader.c:2409
 msgid "Reset the text to its original size"
 msgstr "文字のサイズを初期サイズに戻します"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../src/mail/e-mail-reader.c:2414
 msgid "_Zoom In"
 msgstr "拡大(_Z)"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../src/mail/e-mail-reader.c:2416
 msgid "Increase the text size"
 msgstr "文字のサイズを大きくします"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../src/mail/e-mail-reader.c:2423
 msgid "Decrease the text size"
 msgstr "文字のサイズを小さくします"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../src/mail/e-mail-reader.c:2430
 msgid "Cre_ate"
 msgstr "作成(_A)"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../src/mail/e-mail-reader.c:2437
 msgid "Ch_aracter Encoding"
 msgstr "エンコーディング(_A)"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../src/mail/e-mail-reader.c:2444
+#: ../src/modules/mail/e-mail-attachment-handler.c:423
 msgid "F_orward As"
 msgstr "別の形式で転送(_O)"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../src/mail/e-mail-reader.c:2451
 msgid "_Group Reply"
 msgstr "グループに返信(_G)"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../src/mail/e-mail-reader.c:2458
 msgid "_Go To"
 msgstr "ジャンプ(_G)"
 
-#: ../mail/e-mail-reader.c:2270
+#: ../src/mail/e-mail-reader.c:2465
 msgid "Mar_k As"
 msgstr "マークの付与(_K)"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../src/mail/e-mail-reader.c:2472
 msgid "_Message"
 msgstr "メッセージ(_M)"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../src/mail/e-mail-reader.c:2479
 msgid "_Zoom"
 msgstr "ズーム(_Z)"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../src/mail/e-mail-reader.c:2489
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "メーリングリストから仮想フォルダーを作成(_L)..."
 
-#: ../mail/e-mail-reader.c:2296
+#: ../src/mail/e-mail-reader.c:2491
 msgid "Create a search folder for this mailing list"
 msgstr "このメーリングリストに対する仮想フォルダーを作成します"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../src/mail/e-mail-reader.c:2496
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "宛先から仮想フォルダーを作成(_T)..."
 
-#: ../mail/e-mail-reader.c:2303
+#: ../src/mail/e-mail-reader.c:2498
 msgid "Create a search folder for these recipients"
 msgstr "これらの宛先に対する仮想フォルダーを作成します"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../src/mail/e-mail-reader.c:2503
 msgid "Create a Search Folder from Sen_der..."
 msgstr "差出人から仮想フォルダーを作成(_D)..."
 
-#: ../mail/e-mail-reader.c:2310
+#: ../src/mail/e-mail-reader.c:2505
 msgid "Create a search folder for this sender"
 msgstr "この差出人に対する仮想フォルダーを作成します"
 
-#: ../mail/e-mail-reader.c:2315
+#: ../src/mail/e-mail-reader.c:2510
 msgid "Create a Search Folder from S_ubject..."
 msgstr "件名から仮想フォルダーを作成(_U)..."
 
-#: ../mail/e-mail-reader.c:2317
+#: ../src/mail/e-mail-reader.c:2512
 msgid "Create a search folder for this subject"
 msgstr "この件名に対する仮想フォルダーを作成します"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../src/mail/e-mail-reader.c:2551
 msgid "Mark for Follo_w Up..."
 msgstr "フォローアップとしてマーク(_W)..."
 
-#: ../mail/e-mail-reader.c:2348
+#: ../src/mail/e-mail-reader.c:2567
 msgid "Mark as _Important"
 msgstr "重要としてマーク(_I)"
 
-#: ../mail/e-mail-reader.c:2352
+#: ../src/mail/e-mail-reader.c:2571
 msgid "Mark as _Junk"
 msgstr "ジャンクとしてマーク(_J)"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../src/mail/e-mail-reader.c:2575
 msgid "Mark as _Not Junk"
 msgstr "ジャンクではないとしてマーク(_N)"
 
-#: ../mail/e-mail-reader.c:2360
+#: ../src/mail/e-mail-reader.c:2579
 msgid "Mar_k as Read"
 msgstr "既読としてマーク(_K)"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../src/mail/e-mail-reader.c:2591
 msgid "Mark as Uni_mportant"
 msgstr "重要でないとしてマーク(_M)"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../src/mail/e-mail-reader.c:2595
 msgid "Mark as _Unread"
 msgstr "未読としてマーク(_U)"
 
-#: ../mail/e-mail-reader.c:2412
+#: ../src/mail/e-mail-reader.c:2639
 msgid "_Caret Mode"
 msgstr "カーソルモード(_C)"
 
-#: ../mail/e-mail-reader.c:2414
+#: ../src/mail/e-mail-reader.c:2641
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "表示したメッセージの本文に点滅するカーソルを表示します"
 
-#: ../mail/e-mail-reader.c:2420
+#: ../src/mail/e-mail-reader.c:2647
 msgid "All Message _Headers"
 msgstr "メッセージのヘッダー情報(_H)"
 
-#: ../mail/e-mail-reader.c:2422
+#: ../src/mail/e-mail-reader.c:2649
 msgid "Show messages with all email headers"
 msgstr "メールヘッダーも含めてメッセージをすべて表示します"
 
-#: ../mail/e-mail-reader.c:2849
+#: ../src/mail/e-mail-reader.c:3178
 msgid "Retrieving message"
 msgstr "メッセージの受信中"
 
-#: ../mail/e-mail-reader.c:3772
-#: ../modules/mail/e-mail-attachment-handler.c:206
+#: ../src/mail/e-mail-reader.c:4228
+#: ../src/modules/mail/e-mail-attachment-handler.c:388
 msgid "_Forward"
 msgstr "転送(_F)"
 
-#: ../mail/e-mail-reader.c:3773
+#: ../src/mail/e-mail-reader.c:4229
+#: ../src/modules/mail/e-mail-attachment-handler.c:390
 msgid "Forward the selected message to someone"
 msgstr "選択したメッセージを誰かに転送します"
 
-#: ../mail/e-mail-reader.c:3792
+#. For Translators: "Group Reply" will reply either to a mailing list
+#. * (if possible and if that configuration option is enabled), or else
+#. * it will reply to all. The word "Group" was chosen because it covers
+#. * either of those, without too strongly implying one or the other.
+#: ../src/mail/e-mail-reader.c:4248
 msgid "Group Reply"
 msgstr "グループに返信"
 
-#: ../mail/e-mail-reader.c:3793
+#: ../src/mail/e-mail-reader.c:4249
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "メーリングリスト、あるいはすべての宛先に返信します"
 
-#: ../mail/e-mail-reader.c:3859 ../mail/em-filter-i18n.h:14
+#: ../src/mail/e-mail-reader.c:4315 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "削除する"
 
-#: ../mail/e-mail-reader.c:3871
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#: ../src/mail/e-mail-reader.c:4327
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1241
 msgid "Next"
 msgstr "次へ"
 
-#: ../mail/e-mail-reader.c:3875
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../src/mail/e-mail-reader.c:4331
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1234
 msgid "Previous"
 msgstr "前へ"
 
-#: ../mail/e-mail-reader.c:3884 ../mail/mail-dialogs.ui.h:16
+#: ../src/mail/e-mail-reader.c:4340 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "返信"
 
-#: ../mail/e-mail-reader-utils.c:147
+#: ../src/mail/e-mail-reader.c:5413
+#, c-format
+msgid "Allow remote content for anyone from %s"
+msgstr ""
+
+#: ../src/mail/e-mail-reader.c:5415
+#, c-format
+msgid "Allow remote content for %s"
+msgstr ""
+
+#: ../src/mail/e-mail-reader.c:5432
+#, c-format
+msgid "Allow remote content from %s"
+msgstr "%s からのリモートコンテンツを許可する"
+
+#: ../src/mail/e-mail-reader.c:5449
+msgid "Do not show this message again"
+msgstr "次回からこのメッセージを表示しない"
+
+#: ../src/mail/e-mail-reader.c:5497
+msgid "Load remote content"
+msgstr "リモートコンテンツをロードする"
+
+#: ../src/mail/e-mail-reader-utils.c:144
 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 "原因不明のエラー"
+#: ../src/mail/e-mail-reader-utils.c:568
+#, fuzzy, c-format
+#| msgid "Removing folder '%s'"
+msgid "Refreshing folder “%s”"
+msgstr "フォルダー '%s' の削除中"
 
-#: ../mail/e-mail-reader-utils.c:976
+#: ../src/mail/e-mail-reader-utils.c:1175
+#, fuzzy
+#| msgid "Preview data to be imported"
+msgid "Marking thread to be ignored"
+msgstr "インポートするデータのプレビューを表示します"
+
+#: ../src/mail/e-mail-reader-utils.c:1179
+msgid "Unmarking thread from being ignored"
+msgstr ""
+
+#: ../src/mail/e-mail-reader-utils.c:1183
+msgid "Marking subthread to be ignored"
+msgstr ""
+
+#: ../src/mail/e-mail-reader-utils.c:1187
+msgid "Unmarking subthread from being ignored"
+msgstr ""
+
+#: ../src/mail/e-mail-reader-utils.c:1439
 msgid "Printing"
 msgstr "印刷"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1211
-#, c-format
-msgid "Folder '%s' contains %u duplicate message. Are you sure you want to delete it?"
-msgid_plural "Folder '%s' contains %u duplicate messages. Are you sure you want to delete them?"
-msgstr[0] "フォルダー '%s' には %u 通の重複したメッセージがあります。これを本当に削除しますか?"
+#: ../src/mail/e-mail-reader-utils.c:1676
+#, fuzzy, c-format
+#| msgid ""
+#| "Folder '%s' contains %u duplicate message. Are you sure you want to "
+#| "delete it?"
+#| msgid_plural ""
+#| "Folder '%s' contains %u duplicate messages. Are you sure you want to "
+#| "delete them?"
+msgid ""
+"Folder “%s” contains %u duplicate message. Are you sure you want to delete "
+"it?"
+msgid_plural ""
+"Folder “%s” contains %u duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] ""
+"フォルダー '%s' には %u 通の重複したメッセージがあります。これを本当に削除し"
+"ますか?"
 
-#: ../mail/e-mail-reader-utils.c:2026
+#: ../src/mail/e-mail-reader-utils.c:2694
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "メッセージの保存"
@@ -12766,515 +18153,422 @@ msgstr[0] "メッセージの保存"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:2047
+#: ../src/mail/e-mail-reader-utils.c:2715
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "メッセージ"
 
-#: ../mail/e-mail-reader-utils.c:2416
+#: ../src/mail/e-mail-reader-utils.c:3088
 msgid "Parsing message"
 msgstr "メッセージの解析中"
 
-#: ../mail/e-mail-request.c:199
+#: ../src/mail/e-mail-request.c:270
 msgid "The message has no text content."
 msgstr "このメッセージにはテキストの内容がありません。"
 
-#: ../mail/e-mail-tag-editor.c:237
+#: ../src/mail/e-mail-tag-editor.c:163
 msgid "Flag to Follow Up"
 msgstr "フォローアップするフラグ"
 
+#: ../src/mail/e-mail-ui-session.c:813
+#, c-format
+msgid "%s authentication failed"
+msgstr "%s の認証が失敗しました"
+
+#: ../src/mail/e-mail-ui-session.c:863
+#, fuzzy, c-format
+#| msgid "No data source found for UID '%s'"
+msgid "No data source found for UID “%s”"
+msgstr "UID '%s' のデータソースが見つかりませんでした"
+
+#. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
+#: ../src/mail/em-composer-utils.c:388
+#, fuzzy, c-format
+#| msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message with %d To and CC recipients?"
+msgid_plural ""
+"Are you sure you want to send a message with %d To and CC recipients?"
+msgstr[0] "Bcc のみ付与してメッセージを送信してもよろしいですか?"
+
+#. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
+#: ../src/mail/em-composer-utils.c:394
+#, c-format
+msgid ""
+"You are trying to send a message to %d recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgid_plural ""
+"You are trying to send a message to %d recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgstr[0] ""
+
+#. This message is never removed from the camel operation, otherwise the GtkInfoBar
+#. hides itself and the user sees no feedback.
+#: ../src/mail/em-composer-utils.c:790
+msgid "Waiting for attachments to load..."
+msgstr ""
+
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../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} 
さんは書きました:"
+#: ../src/mail/em-composer-utils.c:1745
+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:1460
+#: ../src/mail/em-composer-utils.c:1751
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 転送するメッセージ --------"
 
-#: ../mail/em-composer-utils.c:1465
+#: ../src/mail/em-composer-utils.c:1756
 msgid "-----Original Message-----"
 msgstr "-------- オリジナルのメッセージ --------"
 
-#: ../mail/em-composer-utils.c:2615
+#: ../src/mail/em-composer-utils.c:3074
 msgid "an unknown sender"
 msgstr "差出人が不明"
 
-#: ../mail/em-composer-utils.c:3040
+#. FIXME GTK_WINDOW (composer)
+#: ../src/mail/em-composer-utils.c:3550
 msgid "Posting destination"
 msgstr "送信先を指定します"
 
-#: ../mail/em-composer-utils.c:3041
+#: ../src/mail/em-composer-utils.c:3555
 msgid "Choose folders to post the message to."
 msgstr "メッセージを投稿するフォルダーを選択してください。"
 
-#: ../mail/em-filter-editor-folder-element.c:153
+#: ../src/mail/em-filter-editor-folder-element.c:154
 msgid "Select Folder"
 msgstr "フォルダーの選択"
 
-#. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
-msgid "Adjust Score"
-msgstr "スコアを調整する"
-
-#: ../mail/em-filter-i18n.h:3
-msgid "Any header"
-msgstr "任意のヘッダー"
-
-#: ../mail/em-filter-i18n.h:4
-msgid "Assign Color"
-msgstr "色を付ける"
-
-#: ../mail/em-filter-i18n.h:5
-msgid "Assign Score"
-msgstr "スコアを付ける"
-
-#: ../mail/em-filter-i18n.h:7
-msgid "BCC"
-msgstr "Bcc"
-
-#: ../mail/em-filter-i18n.h:8
-msgid "Beep"
-msgstr "ビープ音を鳴らす"
-
-#: ../mail/em-filter-i18n.h:9
-msgid "CC"
-msgstr "Cc"
-
-#: ../mail/em-filter-i18n.h:10
-msgid "Completed On"
-msgstr "完了日"
-
-#: ../mail/em-filter-i18n.h:12
-msgid "Date received"
-msgstr "受信日"
-
-#: ../mail/em-filter-i18n.h:13
-msgid "Date sent"
-msgstr "送信日"
-
-#: ../mail/em-filter-i18n.h:15
-msgid "Deleted"
-msgstr "削除済み"
-
-#: ../mail/em-filter-i18n.h:17
-msgid "Draft"
-msgstr "下書き"
-
-#: ../mail/em-filter-i18n.h:19
-msgid "Expression"
-msgstr "表現"
-
-#: ../mail/em-filter-i18n.h:20
-msgid "Follow Up"
-msgstr "フローアップ"
-
-#: ../mail/em-filter-i18n.h:21
-msgid "Forward to"
-msgstr "転送"
-
-#: ../mail/em-filter-i18n.h:22
-msgid "Important"
-msgstr "重要"
-
-#: ../mail/em-filter-i18n.h:23
-msgid "Junk Test"
-msgstr "ジャンクテストの結果"
-
-#: ../mail/em-filter-i18n.h:24 ../mail/mail-config.ui.h:113
-msgid "Junk"
-msgstr "ジャンク"
-
-#: ../mail/em-filter-i18n.h:25
-msgid "Label"
-msgstr "ラベル"
-
-#: ../mail/em-filter-i18n.h:26
-msgid "Mailing list"
-msgstr "メーリングリスト"
-
-#: ../mail/em-filter-i18n.h:27
-msgid "Match All"
-msgstr "すべてに一致する"
-
-#: ../mail/em-filter-i18n.h:28
-msgid "Message Body"
-msgstr "メッセージの本文"
-
-#: ../mail/em-filter-i18n.h:29
-msgid "Message Header"
-msgstr "メッセージのヘッダー"
-
-#: ../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:32
-msgid "Message is not Junk"
-msgstr "がジャンクではない"
-
-#: ../mail/em-filter-i18n.h:34
-msgid "Pipe to Program"
-msgstr "次のプログラムに渡す"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "Play Sound"
-msgstr "サウンドを演奏する"
-
-#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:36 ../mail/mail-dialogs.ui.h:15
-msgid "Read"
-msgstr "既読"
-
-#: ../mail/em-filter-i18n.h:37 ../mail/message-list.etspec.h:16
-msgid "Recipients"
-msgstr "宛先"
-
-#: ../mail/em-filter-i18n.h:38
-msgid "Regex Match"
-msgstr "次に対する正規表現"
-
-#: ../mail/em-filter-i18n.h:39
-msgid "Replied to"
-msgstr "返信済"
-
-#: ../mail/em-filter-i18n.h:40
-msgid "Run Program"
-msgstr "プログラムを実行する"
-
-#: ../mail/em-filter-i18n.h:41 ../mail/message-list.etspec.h:3
-msgid "Score"
-msgstr "スコア"
-
-#: ../mail/em-filter-i18n.h:42
-msgid "Sender or Recipients"
-msgstr "差出人または宛先"
-
-#: ../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:45
-msgid "Set Status"
-msgstr "ステータスをセットする"
-
-#: ../mail/em-filter-i18n.h:46
-msgid "Size (kB)"
-msgstr "サイズ (KB)"
-
-#: ../mail/em-filter-i18n.h:47
-msgid "Source Account"
-msgstr "ソースのアカウント"
-
-#: ../mail/em-filter-i18n.h:48
-msgid "Specific header"
-msgstr "指定したフォルダー"
-
-#: ../mail/em-filter-i18n.h:50
-msgid "Stop Processing"
-msgstr "読み込みを停止する"
-
-#: ../mail/em-filter-i18n.h:53
-msgid "Unset Color"
-msgstr "色の指定を解除"
-
-#: ../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:587
+#: ../src/mail/em-filter-rule.c:595
 msgid "Then"
 msgstr "条件を満足した時のアクション"
 
-#: ../mail/em-filter-rule.c:652
+#: ../src/mail/em-filter-rule.c:660
 msgid "Add Ac_tion"
 msgstr "アクションの追加(_T)"
 
-#: ../mail/em-folder-properties.c:177
+#: ../src/mail/em-folder-properties.c:240
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "未読のメッセージ数:"
 
-#: ../mail/em-folder-properties.c:188
+#: ../src/mail/em-folder-properties.c:251
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "メッセージの総数:"
 
-#: ../mail/em-folder-properties.c:209
+#: ../src/mail/em-folder-properties.c:272
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "クォータの使用量 (%s):"
 
-#: ../mail/em-folder-properties.c:211
+#: ../src/mail/em-folder-properties.c:274
 #, c-format
 msgid "Quota usage"
 msgstr "クォータの使用量"
 
 #. 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
+#: ../src/mail/em-folder-properties.c:398
 msgid "_Send Account Override:"
 msgstr "送信アカウントの優先(_S):"
 
-#: ../mail/em-folder-properties.c:415
+#: ../src/mail/em-folder-properties.c:605
+msgid "_Archive this folder using these settings:"
+msgstr ""
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../src/mail/em-folder-properties.c:614
+#, fuzzy
+#| msgid "Sent _Messages Folder:"
+msgctxt "autoarchive"
+msgid "_Cleanup messages older than"
+msgstr "送信済フォルダー(_M):"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../src/mail/em-folder-properties.c:630
+#, fuzzy
+#| msgid "days"
+msgctxt "autoarchive"
+msgid "days"
+msgstr "日"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../src/mail/em-folder-properties.c:632
+#, fuzzy
+#| msgid "weeks"
+msgctxt "autoarchive"
+msgid "weeks"
+msgstr "週"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../src/mail/em-folder-properties.c:634
+#, fuzzy
+#| msgid "months"
+msgctxt "autoarchive"
+msgid "months"
+msgstr "月"
+
+#: ../src/mail/em-folder-properties.c:640
+#, fuzzy
+#| msgid "Move selected messages to another folder"
+msgid "Move old messages to the default archive _folder"
+msgstr "選択したメッセージを別のフォルダーへ移動します"
+
+#: ../src/mail/em-folder-properties.c:651
+#, fuzzy
+#| msgid "Moving messages to '%s'"
+msgid "_Move old messages to:"
+msgstr "'%s' へメッセージを移動中"
+
+#: ../src/mail/em-folder-properties.c:655
+msgid "AutoArchive folder"
+msgstr ""
+
+#: ../src/mail/em-folder-properties.c:655
+#, fuzzy
+#| msgid "Select folder to import into"
+msgid "Select folder to use for AutoArchive"
+msgstr "インポート先フォルダーの選択"
+
+#: ../src/mail/em-folder-properties.c:661
+#, fuzzy
+#| msgid "_Delete junk messages"
+msgid "_Delete old messages"
+msgstr "ジャンクメールを削除する(_D)"
+
+#: ../src/mail/em-folder-properties.c:1018
+#, fuzzy
+#| msgid "Server Type:"
+msgid "Server Tag"
+msgstr "サーバー種別:"
+
+#: ../src/mail/em-folder-properties.c:1022 ../src/mail/filtertypes.xml.in.h:29
+#: ../src/mail/searchtypes.xml.in.h:31 ../src/mail/vfoldertypes.xml.in.h:31
+msgid "Label"
+msgstr "ラベル"
+
+#: ../src/mail/em-folder-properties.c:1073
+msgid "AutoArchive"
+msgstr ""
+
+#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:118
+#: ../src/mail/message-list.etspec.h:19
+msgid "Labels"
+msgstr "ラベル"
+
+#: ../src/mail/em-folder-properties.c:1155
 msgid "Folder Properties"
 msgstr "フォルダーのプロパティ"
 
-#: ../mail/em-folder-selection-button.c:76
+#: ../src/mail/em-folder-properties.c:1394
+#, fuzzy
+#| msgid "Category Properties"
+msgid "Gathering folder properties"
+msgstr "カテゴリのプロパティ"
+
+#: ../src/mail/em-folder-selection-button.c:77
 msgid "<click here to select a folder>"
 msgstr "<ここをクリックしてフォルダーを選択してください>"
 
-#: ../mail/em-folder-selector.c:387
-msgid "C_reate"
-msgstr "作成(_R)"
-
-#: ../mail/em-folder-selector.c:393
-msgid "Folder _name:"
-msgstr "フォルダー名(_N):"
+#: ../src/mail/em-folder-selector.c:399
+#, fuzzy
+#| msgid "Create a new mail folder"
+msgid "Create a new folder"
+msgstr "新しいメールフォルダーを作成します"
 
-#: ../mail/em-folder-tree.c:682
-msgid "Folder names cannot contain '/'"
+#: ../src/mail/em-folder-tree.c:683
+#, fuzzy
+#| msgid "Folder names cannot contain '/'"
+msgid "Folder names cannot contain “/”"
 msgstr "フォルダー名には '/' を含めることはできません。"
 
-#: ../mail/em-folder-tree.c:819
+#. Translators: This is the string used for displaying the
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
+#. *
+#. * Most languages should translate this as "%s (%u%s)". The
+#. * languages that use localized digits (like Persian) may
+#. * need to replace "%u" with "%Iu". Right-to-left languages
+#. * (like Arabic and Hebrew) may need to add bidirectional
+#. * formatting codes to take care of the cases the folder
+#. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
+#.
+#: ../src/mail/em-folder-tree.c:877
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1667
+#: ../src/mail/em-folder-tree.c:1742
 msgid "Mail Folder Tree"
 msgstr "メールフォルダーのツリー"
 
-#: ../mail/em-folder-tree.c:2215 ../mail/em-folder-utils.c:100
+#: ../src/mail/em-folder-tree.c:2290 ../src/mail/em-folder-utils.c:83
 #, c-format
 msgid "Moving folder %s"
 msgstr "フォルダー %s の移動中"
 
-#: ../mail/em-folder-tree.c:2218 ../mail/em-folder-utils.c:102
+#: ../src/mail/em-folder-tree.c:2293 ../src/mail/em-folder-utils.c:85
 #, c-format
 msgid "Copying folder %s"
 msgstr "フォルダー %s のコピー中"
 
-#: ../mail/em-folder-tree.c:2225 ../mail/message-list.c:2284
+#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2508
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "フォルダー %s へメッセージの移動中"
 
-#: ../mail/em-folder-tree.c:2229 ../mail/message-list.c:2286
+#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2510
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "フォルダー %s へメッセージのコピー中"
 
-#: ../mail/em-folder-tree.c:2248
+#: ../src/mail/em-folder-tree.c:2323
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "メッセージをトップレベルの中に移せません"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:430 ../mail/em-folder-tree-model.c:432
+#: ../src/mail/em-folder-tree-model.c:445
+#: ../src/mail/em-folder-tree-model.c:447
 msgid "UNMATCHED"
 msgstr "該当しないもの"
 
-#: ../mail/em-folder-tree-model.c:1244 ../mail/em-folder-tree-model.c:1621
+#: ../src/mail/em-folder-tree-model.c:1325
+#: ../src/mail/em-folder-tree-model.c:1701
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: ../mail/em-folder-utils.c:506
+#: ../src/mail/em-folder-utils.c:502
 msgid "Move Folder To"
 msgstr "フォルダーの移動"
 
-#: ../mail/em-folder-utils.c:506
+#: ../src/mail/em-folder-utils.c:502
 msgid "Copy Folder To"
 msgstr "フォルダーのコピー"
 
-#: ../mail/em-folder-utils.c:604
-msgid "Create Folder"
-msgstr "フォルダーの作成"
-
-#: ../mail/em-folder-utils.c:605
-msgid "Specify where to create the folder:"
-msgstr "フォルダーを作成する場所を指定してください:"
-
-#: ../mail/em-subscription-editor.c:855
+#: ../src/mail/em-subscription-editor.c:855
 msgid "_Subscribe"
 msgstr "購読(_S)"
 
-#: ../mail/em-subscription-editor.c:864
+#: ../src/mail/em-subscription-editor.c:864
 msgid "Su_bscribe To Shown"
 msgstr "表示したものを購読(_B)"
 
-#: ../mail/em-subscription-editor.c:872
+#: ../src/mail/em-subscription-editor.c:872
 msgid "Subscribe To _All"
 msgstr "すべてを購読(_A)"
 
-#: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../src/mail/em-subscription-editor.c:970
+#: ../src/mail/em-subscription-editor.c:1914 ../src/mail/mail.error.xml.h:73
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1770
 msgid "_Unsubscribe"
 msgstr "購読の停止(_U)"
 
-#: ../mail/em-subscription-editor.c:978
+#: ../src/mail/em-subscription-editor.c:979
 #, fuzzy
 msgid "Unsu_bscribe From Hidden"
 msgstr "メーリングリストの購読停止(_B)"
 
-#: ../mail/em-subscription-editor.c:986
+#: ../src/mail/em-subscription-editor.c:987
 msgid "Unsubscribe From _All"
 msgstr "すべての購読停止(_A)"
 
-#: ../mail/em-subscription-editor.c:1704
+#: ../src/mail/em-subscription-editor.c:1339
+#: ../src/modules/mail/e-mail-shell-view-private.c:1003
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "未読 %d通, "
+
+#: ../src/mail/em-subscription-editor.c:1343
+#: ../src/modules/mail/e-mail-shell-view-private.c:1013
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "合計 %d通"
+
+#: ../src/mail/em-subscription-editor.c:1755
 msgid "Folder Subscriptions"
 msgstr "フォルダーの購読"
 
-#: ../mail/em-subscription-editor.c:1743
+#: ../src/mail/em-subscription-editor.c:1790
 msgid "_Account:"
 msgstr "アカウント(_A):"
 
-#: ../mail/em-subscription-editor.c:1756
+#: ../src/mail/em-subscription-editor.c:1803
 msgid "Clear Search"
 msgstr "検索をクリア"
 
-#: ../mail/em-subscription-editor.c:1773
+#: ../src/mail/em-subscription-editor.c:1820
 msgid "Sho_w items that contain:"
 msgstr "以下を含むアイテムを表示(_W):"
 
-#: ../mail/em-subscription-editor.c:1820
+#: ../src/mail/em-subscription-editor.c:1867
 msgid "Subscribe to the selected folder"
 msgstr "選択したフォルダーを購読します"
 
-#: ../mail/em-subscription-editor.c:1821
+#: ../src/mail/em-subscription-editor.c:1868
 msgid "Su_bscribe"
 msgstr "購読(_B)"
 
-#: ../mail/em-subscription-editor.c:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../src/mail/em-subscription-editor.c:1913
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1772
 msgid "Unsubscribe from the selected folder"
 msgstr "選択したフォルダーの購読を停止します"
 
-#: ../mail/em-subscription-editor.c:1906
+#: ../src/mail/em-subscription-editor.c:1953
 msgid "Collapse all folders"
 msgstr "すべてのフォルダーを畳む"
 
-#: ../mail/em-subscription-editor.c:1907
+#: ../src/mail/em-subscription-editor.c:1954
 msgid "C_ollapse All"
 msgstr "すべて畳む(_O)"
 
-#: ../mail/em-subscription-editor.c:1917
+#: ../src/mail/em-subscription-editor.c:1964
 msgid "Expand all folders"
 msgstr "すべてのフォルダーを展開する"
 
-#: ../mail/em-subscription-editor.c:1918
+#: ../src/mail/em-subscription-editor.c:1965
 msgid "E_xpand All"
 msgstr "すべてを展開(_X)"
 
-#: ../mail/em-subscription-editor.c:1928
+#: ../src/mail/em-subscription-editor.c:1975
 msgid "Refresh the folder list"
 msgstr "フォルダーの一覧を更新します"
 
-#: ../mail/em-subscription-editor.c:1929
-#: ../modules/mail/e-mail-shell-view-actions.c:1533
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
+#: ../src/mail/em-subscription-editor.c:1976
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1742
 msgid "_Refresh"
 msgstr "更新(_R)"
 
-#: ../mail/em-subscription-editor.c:1940
+#: ../src/mail/em-subscription-editor.c:1987
 msgid "Stop the current operation"
 msgstr "現在の操作を取り消します"
 
-#: ../mail/em-subscription-editor.c:1941
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../src/mail/em-subscription-editor.c:1988
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1002
 msgid "_Stop"
 msgstr ""
 
@@ -13282,161 +18576,503 @@ msgstr ""
 #. * 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:75
+#: ../src/mail/em-utils.c:77
 #, 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:131
-#: ../modules/mailto-handler/evolution-mailto-handler.c:148
-msgid "_Do not show this message again"
-msgstr "次回からこのメッセージを表示しない(_D)"
-
-#: ../mail/em-utils.c:241
+#: ../src/mail/em-utils.c:178
 msgid "Message Filters"
 msgstr "フィルターの定義"
 
-#: ../mail/em-utils.c:970
+#: ../src/mail/em-utils.c:950
 #, c-format
 msgid "Messages from %s"
 msgstr "%s さんからのメッセージ"
 
-#: ../mail/em-vfolder-editor.c:104
+#: ../src/mail/em-utils.c:1764
+#, fuzzy
+#| msgid "_Delete junk messages"
+msgid "Deleting old messages"
+msgstr "ジャンクメールを削除する(_D)"
+
+#: ../src/mail/em-vfolder-editor.c:102
 msgid "Search _Folders"
 msgstr "仮想フォルダー(_F)"
 
-#: ../mail/em-vfolder-editor-rule.c:392
+#: ../src/mail/em-vfolder-editor-rule.c:393
 msgid "Add Folder"
 msgstr "フォルダーを追加"
 
-#: ../mail/em-vfolder-editor-rule.c:518
+#: ../src/mail/em-vfolder-editor-rule.c:522
 msgid "Search Folder Sources"
 msgstr "仮想フォルダーのソース"
 
-#: ../mail/em-vfolder-editor-rule.c:550
+#: ../src/mail/em-vfolder-editor-rule.c:554
 msgid "Automatically update on any _source folder change"
 msgstr "ソースフォルダーに何か変更があれば自動的に更新(_S)"
 
-#: ../mail/em-vfolder-editor-rule.c:562
+#: ../src/mail/em-vfolder-editor-rule.c:566
 msgid "All local folders"
 msgstr "ローカルフォルダーすべて"
 
-#: ../mail/em-vfolder-editor-rule.c:563
+#: ../src/mail/em-vfolder-editor-rule.c:567
 msgid "All active remote folders"
 msgstr "利用可能なリモートフォルダーのすべて"
 
-#: ../mail/em-vfolder-editor-rule.c:564
+#: ../src/mail/em-vfolder-editor-rule.c:568
 msgid "All local and active remote folders"
 msgstr "ローカルと利用可能なリモートフォルダーのすべて"
 
-#: ../mail/em-vfolder-editor-rule.c:565
+#: ../src/mail/em-vfolder-editor-rule.c:569
 msgid "Specific folders"
 msgstr "指定したフォルダーだけ"
 
 # "検索フォルダ"は適訳ではない
-#: ../mail/em-vfolder-editor-rule.c:603
+#: ../src/mail/em-vfolder-editor-rule.c:607
 msgid "include subfolders"
 msgstr "サブフォルダーを含める"
 
-#: ../mail/importers/elm-importer.c:173
+#: ../src/mail/filtertypes.xml.in.h:1 ../src/mail/message-list.etspec.h:15
+#: ../src/mail/searchtypes.xml.in.h:1 ../src/mail/vfoldertypes.xml.in.h:1
+msgid "Sender"
+msgstr "差出人"
+
+#: ../src/mail/filtertypes.xml.in.h:6 ../src/mail/searchtypes.xml.in.h:6
+#: ../src/mail/vfoldertypes.xml.in.h:6
+msgid "starts with"
+msgstr "が次で始まる"
+
+#: ../src/mail/filtertypes.xml.in.h:7 ../src/mail/searchtypes.xml.in.h:7
+#: ../src/mail/vfoldertypes.xml.in.h:7
+msgid "does not start with"
+msgstr "が次で始まらない"
+
+#: ../src/mail/filtertypes.xml.in.h:8 ../src/mail/searchtypes.xml.in.h:8
+#: ../src/mail/vfoldertypes.xml.in.h:8
+msgid "ends with"
+msgstr "が次で終わる"
+
+#: ../src/mail/filtertypes.xml.in.h:9 ../src/mail/searchtypes.xml.in.h:9
+#: ../src/mail/vfoldertypes.xml.in.h:9
+msgid "does not end with"
+msgstr "が次で終わらない"
+
+#: ../src/mail/filtertypes.xml.in.h:10 ../src/mail/searchtypes.xml.in.h:12
+#: ../src/mail/vfoldertypes.xml.in.h:12
+msgid "sounds like"
+msgstr "が次のようである"
+
+#: ../src/mail/filtertypes.xml.in.h:11 ../src/mail/searchtypes.xml.in.h:13
+#: ../src/mail/vfoldertypes.xml.in.h:13
+msgid "does not sound like"
+msgstr "が次のようではない"
+
+#: ../src/mail/filtertypes.xml.in.h:12 ../src/mail/message-list.etspec.h:16
+#: ../src/mail/searchtypes.xml.in.h:10 ../src/mail/vfoldertypes.xml.in.h:10
+msgid "Recipients"
+msgstr "宛先"
+
+#: ../src/mail/filtertypes.xml.in.h:13 ../src/mail/searchtypes.xml.in.h:14
+#: ../src/mail/vfoldertypes.xml.in.h:14
+msgid "CC"
+msgstr "Cc"
+
+#: ../src/mail/filtertypes.xml.in.h:14 ../src/mail/searchtypes.xml.in.h:15
+#: ../src/mail/vfoldertypes.xml.in.h:15
+msgid "BCC"
+msgstr "Bcc"
+
+#: ../src/mail/filtertypes.xml.in.h:15 ../src/mail/searchtypes.xml.in.h:16
+#: ../src/mail/vfoldertypes.xml.in.h:16
+msgid "Sender or Recipients"
+msgstr "差出人または宛先"
+
+#: ../src/mail/filtertypes.xml.in.h:17 ../src/mail/searchtypes.xml.in.h:18
+#: ../src/mail/vfoldertypes.xml.in.h:18
+msgid "has words"
+msgstr "が次の語を含む"
+
+#: ../src/mail/filtertypes.xml.in.h:18 ../src/mail/searchtypes.xml.in.h:19
+#: ../src/mail/vfoldertypes.xml.in.h:19
+msgid "does not have words"
+msgstr "という語を含まない"
+
+#: ../src/mail/filtertypes.xml.in.h:19 ../src/mail/searchtypes.xml.in.h:20
+#: ../src/mail/vfoldertypes.xml.in.h:20
+msgid "Specific header"
+msgstr "指定したフォルダー"
+
+#: ../src/mail/filtertypes.xml.in.h:20 ../src/mail/searchtypes.xml.in.h:21
+#: ../src/mail/vfoldertypes.xml.in.h:21
+msgid "exists"
+msgstr "が存在する"
+
+#: ../src/mail/filtertypes.xml.in.h:21 ../src/mail/searchtypes.xml.in.h:22
+#: ../src/mail/vfoldertypes.xml.in.h:22
+msgid "does not exist"
+msgstr "が存在しない"
+
+#: ../src/mail/filtertypes.xml.in.h:22 ../src/mail/searchtypes.xml.in.h:24
+#: ../src/mail/vfoldertypes.xml.in.h:24
+msgid "Message Body"
+msgstr "メッセージの本文"
+
+#: ../src/mail/filtertypes.xml.in.h:23 ../src/mail/searchtypes.xml.in.h:25
+#: ../src/mail/vfoldertypes.xml.in.h:25
+msgid "Expression"
+msgstr "表現"
+
+#: ../src/mail/filtertypes.xml.in.h:24 ../src/mail/searchtypes.xml.in.h:26
+#: ../src/mail/vfoldertypes.xml.in.h:26
+#, fuzzy
+#| msgid "Expression"
+msgid "Free Form Expression"
+msgstr "表現"
+
+#: ../src/mail/filtertypes.xml.in.h:25 ../src/mail/searchtypes.xml.in.h:27
+#: ../src/mail/vfoldertypes.xml.in.h:27
+msgid "Date sent"
+msgstr "送信日"
+
+#: ../src/mail/filtertypes.xml.in.h:26 ../src/mail/searchtypes.xml.in.h:28
+#: ../src/mail/vfoldertypes.xml.in.h:28
+msgid "is before"
+msgstr "が次の日より前にある"
+
+#: ../src/mail/filtertypes.xml.in.h:27 ../src/mail/searchtypes.xml.in.h:29
+#: ../src/mail/vfoldertypes.xml.in.h:29
+msgid "is after"
+msgstr "が次の日より後にある"
+
+#: ../src/mail/filtertypes.xml.in.h:28 ../src/mail/searchtypes.xml.in.h:30
+#: ../src/mail/vfoldertypes.xml.in.h:30
+msgid "Date received"
+msgstr "受信日"
+
+#: ../src/mail/filtertypes.xml.in.h:30 ../src/mail/message-list.etspec.h:3
+#: ../src/mail/searchtypes.xml.in.h:32 ../src/mail/vfoldertypes.xml.in.h:32
+msgid "Score"
+msgstr "スコア"
+
+#: ../src/mail/filtertypes.xml.in.h:33 ../src/mail/searchtypes.xml.in.h:35
+#: ../src/mail/vfoldertypes.xml.in.h:35
+msgid "Size (kB)"
+msgstr "サイズ (KB)"
+
+#: ../src/mail/filtertypes.xml.in.h:34 ../src/mail/searchtypes.xml.in.h:36
+#: ../src/mail/vfoldertypes.xml.in.h:36
+#, fuzzy
+#| msgid "is greater than"
+msgid "is greater than or equal to"
+msgstr "が次より大きい"
+
+#: ../src/mail/filtertypes.xml.in.h:35 ../src/mail/searchtypes.xml.in.h:37
+#: ../src/mail/vfoldertypes.xml.in.h:37
+#, fuzzy
+#| msgid "is less than"
+msgid "is less than or equal to"
+msgstr "が次より小さい"
+
+#: ../src/mail/filtertypes.xml.in.h:37 ../src/mail/searchtypes.xml.in.h:39
+#: ../src/mail/vfoldertypes.xml.in.h:39
+msgid "Replied to"
+msgstr "返信済"
+
+#: ../src/mail/filtertypes.xml.in.h:39 ../src/mail/searchtypes.xml.in.h:42
+#: ../src/mail/vfoldertypes.xml.in.h:42
+msgid "Important"
+msgstr "重要"
+
+#. Past tense, as in "has been read".
+#: ../src/mail/filtertypes.xml.in.h:40 ../src/mail/mail-dialogs.ui.h:8
+#: ../src/mail/searchtypes.xml.in.h:43 ../src/mail/vfoldertypes.xml.in.h:43
+msgid "Read"
+msgstr "既読"
+
+#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:132
+#: ../src/mail/vfoldertypes.xml.in.h:44
+msgid "Junk"
+msgstr "ジャンク"
+
+#: ../src/mail/filtertypes.xml.in.h:42 ../src/mail/searchtypes.xml.in.h:44
+#: ../src/mail/vfoldertypes.xml.in.h:45
+msgid "Follow Up"
+msgstr "フローアップ"
+
+#: ../src/mail/filtertypes.xml.in.h:43 ../src/mail/searchtypes.xml.in.h:45
+#: ../src/mail/vfoldertypes.xml.in.h:46
+msgid "is Flagged"
+msgstr "にフラグが付いている"
+
+#: ../src/mail/filtertypes.xml.in.h:44 ../src/mail/searchtypes.xml.in.h:46
+#: ../src/mail/vfoldertypes.xml.in.h:47
+msgid "is not Flagged"
+msgstr "にフラグが付いていない"
+
+#: ../src/mail/filtertypes.xml.in.h:45 ../src/mail/searchtypes.xml.in.h:47
+#: ../src/mail/vfoldertypes.xml.in.h:48
+#, fuzzy
+#| msgid "% Completed"
+msgid "is Completed"
+msgstr "進捗率"
+
+#: ../src/mail/filtertypes.xml.in.h:46 ../src/mail/searchtypes.xml.in.h:48
+#: ../src/mail/vfoldertypes.xml.in.h:49
+#, fuzzy
+#| msgid "% Completed"
+msgid "is not Completed"
+msgstr "進捗率"
+
+#: ../src/mail/filtertypes.xml.in.h:51 ../src/mail/searchtypes.xml.in.h:53
+#: ../src/mail/vfoldertypes.xml.in.h:54
+msgid "Mailing list"
+msgstr "メーリングリスト"
+
+#: ../src/mail/filtertypes.xml.in.h:52 ../src/mail/searchtypes.xml.in.h:54
+#: ../src/mail/vfoldertypes.xml.in.h:55
+msgid "Regex Match"
+msgstr "次に対する正規表現"
+
+#: ../src/mail/filtertypes.xml.in.h:53 ../src/mail/searchtypes.xml.in.h:55
+#: ../src/mail/vfoldertypes.xml.in.h:56
+msgid "Message Header"
+msgstr "メッセージのヘッダー"
+
+#: ../src/mail/filtertypes.xml.in.h:54
+msgid "Source Account"
+msgstr "ソースのアカウント"
+
+#: ../src/mail/filtertypes.xml.in.h:55
+msgid "Pipe to Program"
+msgstr "次のプログラムに渡す"
+
+#: ../src/mail/filtertypes.xml.in.h:56
+msgid "returns"
+msgstr "が次の値を返す"
+
+#: ../src/mail/filtertypes.xml.in.h:57
+msgid "does not return"
+msgstr "が次の値を返さない"
+
+#: ../src/mail/filtertypes.xml.in.h:58
+msgid "returns greater than"
+msgstr "が次より大きい値を返す"
+
+#: ../src/mail/filtertypes.xml.in.h:59
+msgid "returns less than"
+msgstr "が次より小さい値を返す"
+
+#: ../src/mail/filtertypes.xml.in.h:60
+msgid "Junk Test"
+msgstr "ジャンクテストの結果"
+
+#: ../src/mail/filtertypes.xml.in.h:61
+msgid "Message is Junk"
+msgstr "がジャンクである"
+
+#: ../src/mail/filtertypes.xml.in.h:62
+msgid "Message is not Junk"
+msgstr "がジャンクではない"
+
+#: ../src/mail/filtertypes.xml.in.h:63 ../src/mail/vfoldertypes.xml.in.h:57
+msgid "Message Location"
+msgstr "メールの場所"
+
+#: ../src/mail/filtertypes.xml.in.h:64 ../src/mail/searchtypes.xml.in.h:56
+#: ../src/mail/vfoldertypes.xml.in.h:58
+msgid "Match All"
+msgstr "すべてに一致する"
+
+#: ../src/mail/filtertypes.xml.in.h:68
+msgid "Stop Processing"
+msgstr "読み込みを停止する"
+
+#: ../src/mail/filtertypes.xml.in.h:69
+msgid "Set Label"
+msgstr "ラベルを付与する"
+
+#: ../src/mail/filtertypes.xml.in.h:70
+msgid "Assign Color"
+msgstr "色を付ける"
+
+#: ../src/mail/filtertypes.xml.in.h:71
+msgid "Unset Color"
+msgstr "色の指定を解除"
+
+#: ../src/mail/filtertypes.xml.in.h:72
+msgid "Assign Score"
+msgstr "スコアを付ける"
+
+#: ../src/mail/filtertypes.xml.in.h:73
+msgid "Adjust Score"
+msgstr "スコアを調整する"
+
+#: ../src/mail/filtertypes.xml.in.h:74
+msgid "Set Status"
+msgstr "ステータスをセットする"
+
+#: ../src/mail/filtertypes.xml.in.h:75 ../src/mail/searchtypes.xml.in.h:40
+#: ../src/mail/vfoldertypes.xml.in.h:40
+msgid "Deleted"
+msgstr "削除済み"
+
+#: ../src/mail/filtertypes.xml.in.h:76
+msgid "Unset Status"
+msgstr "ステータスを外す"
+
+#: ../src/mail/filtertypes.xml.in.h:77
+msgid "Beep"
+msgstr "ビープ音を鳴らす"
+
+#: ../src/mail/filtertypes.xml.in.h:78
+msgid "Play Sound"
+msgstr "サウンドを演奏する"
+
+#: ../src/mail/filtertypes.xml.in.h:79
+msgid "Run Program"
+msgstr "プログラムを実行する"
+
+#: ../src/mail/filtertypes.xml.in.h:80
+msgid "Forward to"
+msgstr "転送"
+
+#: ../src/mail/importers/elm-importer.c:174
 msgid "Importing Elm data"
 msgstr "Elm データのインポート"
 
-#: ../mail/importers/elm-importer.c:374
+#: ../src/mail/importers/elm-importer.c:377
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm インポーター"
 
-#: ../mail/importers/elm-importer.c:375
+#: ../src/mail/importers/elm-importer.c:378
 msgid "Import mail from Elm."
 msgstr "Elm からのメールのインポート"
 
-#: ../mail/importers/evolution-mbox-importer.c:134
-#: ../plugins/dbx-import/dbx-importer.c:246
+#: ../src/mail/importers/evolution-mbox-importer.c:135
+#: ../src/mail/importers/kmail-importer.c:208
+#: ../src/plugins/dbx-import/dbx-importer.c:242
 msgid "_Destination folder:"
 msgstr "インポート先フォルダー(_D):"
 
-#: ../mail/importers/evolution-mbox-importer.c:140
-#: ../plugins/dbx-import/dbx-importer.c:252
-#: ../plugins/pst-import/pst-importer.c:541
+#: ../src/mail/importers/evolution-mbox-importer.c:141
+#: ../src/mail/importers/kmail-importer.c:214
+#: ../src/plugins/dbx-import/dbx-importer.c:248
+#: ../src/plugins/pst-import/pst-importer.c:537
 msgid "Select folder"
 msgstr "フォルダーの選択"
 
-#: ../mail/importers/evolution-mbox-importer.c:141
-#: ../plugins/dbx-import/dbx-importer.c:253
-#: ../plugins/pst-import/pst-importer.c:542
+#: ../src/mail/importers/evolution-mbox-importer.c:142
+#: ../src/mail/importers/kmail-importer.c:215
+#: ../src/plugins/dbx-import/dbx-importer.c:249
+#: ../src/plugins/pst-import/pst-importer.c:538
 msgid "Select folder to import into"
 msgstr "インポート先フォルダーの選択"
 
-#: ../mail/importers/evolution-mbox-importer.c:435
+#. Translators: Column header for a message subject
+#: ../src/mail/importers/evolution-mbox-importer.c:510
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "件名"
 
-#: ../mail/importers/evolution-mbox-importer.c:440
+#. Translators: Column header for a message From address
+#: ../src/mail/importers/evolution-mbox-importer.c:515
 msgctxt "mboxImp"
 msgid "From"
 msgstr "差出人"
 
-#: ../mail/importers/evolution-mbox-importer.c:493
-#: ../shell/e-shell-utils.c:171
+#: ../src/mail/importers/evolution-mbox-importer.c:569
+#: ../src/shell/e-shell-utils.c:176
 msgid "Berkeley Mailbox (mbox)"
 msgstr "バークレー Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:494
+#: ../src/mail/importers/evolution-mbox-importer.c:570
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "バークレー Mailbox 形式のフォルダーをインポートします"
 
-#: ../mail/importers/mail-importer.c:54
+#: ../src/mail/importers/kmail-importer.c:261
+#, fuzzy, c-format
+#| msgid "Address"
+msgid "%d Address"
+msgid_plural "%d Addresses"
+msgstr[0] "住所"
+
+#: ../src/mail/importers/kmail-importer.c:352
+#, fuzzy
+#| msgid "Evolution Elm importer"
+msgid "Evolution KMail importer"
+msgstr "Evolution Elm インポーター"
+
+#: ../src/mail/importers/kmail-importer.c:353
+#, fuzzy
+#| msgid "Import mail from Elm."
+msgid "Import mail and contacts from KMail."
+msgstr "Elm からのメールのインポート"
+
+#: ../src/mail/importers/kmail-libs.c:150
+#: ../src/modules/mail/e-mail-shell-view-private.c:1034
+msgid "Trash"
+msgstr "ゴミ箱"
+
+#: ../src/mail/importers/mail-importer.c:55
 msgid "Importing mailbox"
 msgstr "mailbox のインポート"
 
+#: ../src/mail/importers/mail-importer.c:61
+#, fuzzy
+#| msgid "Import mail from Elm."
+msgid "Importing mail and contacts from KMail"
+msgstr "Elm からのメールのインポート"
+
 #. Destination folder, was set in our widget
-#: ../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'"
+#: ../src/mail/importers/mail-importer.c:187
+#: ../src/mail/importers/mail-importer.c:312
+#: ../src/plugins/dbx-import/dbx-importer.c:605
+#: ../src/plugins/pst-import/pst-importer.c:756
+#, fuzzy, c-format
+#| msgid "Importing '%s'"
+msgid "Importing “%s”"
 msgstr "'%s' をインポート中"
 
-#: ../mail/importers/mail-importer.c:309
+#: ../src/mail/importers/mail-importer.c:556
 #, c-format
 msgid "Scanning %s"
 msgstr "%s の解析"
 
-#: ../mail/importers/pine-importer.c:247
+#: ../src/mail/importers/pine-importer.c:248
 msgid "Importing Pine data"
 msgstr "Pine データのインポート"
 
-#: ../mail/importers/pine-importer.c:475
+#: ../src/mail/importers/pine-importer.c:478
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine インポーター"
 
-#: ../mail/importers/pine-importer.c:476
+#: ../src/mail/importers/pine-importer.c:479
 msgid "Import mail from Pine."
 msgstr "Pine からのメールのインポート"
 
-#: ../mail/mail-autofilter.c:63
+#: ../src/mail/mail-autofilter.c:64
 #, c-format
 msgid "Mail to %s"
 msgstr "宛先が %s のメール"
 
-#: ../mail/mail-autofilter.c:219 ../mail/mail-autofilter.c:262
+#: ../src/mail/mail-autofilter.c:220 ../src/mail/mail-autofilter.c:267
 #, c-format
 msgid "Mail from %s"
 msgstr "差出人が %s のメール"
 
-#: ../mail/mail-autofilter.c:245
+#: ../src/mail/mail-autofilter.c:250
 #, c-format
 msgid "Subject is %s"
 msgstr "件名が %s のメール"
 
-#: ../mail/mail-autofilter.c:286
+#: ../src/mail/mail-autofilter.c:290
 #, c-format
 msgid "%s mailing list"
 msgstr "メーリングリストが %s のメール"
 
-#: ../mail/mail-autofilter.c:396
+#: ../src/mail/mail-autofilter.c:400
 msgid "Add Filter Rule"
 msgstr "フィルタールールの追加"
 
@@ -13445,548 +19081,641 @@ 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:505
-#, c-format
+#: ../src/mail/mail-autofilter.c:509
+#, fuzzy, c-format
+#| msgid ""
+#| "The filter rule \"%s\" has been modified to account for the deleted "
+#| "folder\n"
+#| "\"%s\"."
+#| msgid_plural ""
+#| "The following filter rules\n"
+#| "%s have been modified to account for the deleted folder\n"
+#| "\"%s\"."
 msgid ""
-"The filter rule \"%s\" has been modified to account for the deleted folder\n"
-"\"%s\"."
+"The filter rule “%s” has been modified to account for the deleted folder\n"
+"“%s”."
 msgid_plural ""
 "The following filter rules\n"
 "%s have been modified to account for the deleted folder\n"
-"\"%s\"."
+"“%s”."
 msgstr[0] ""
 "フィルタールール \"%s\" が、そのルールを使用しているフォルダー\n"
 "\"%s\" が削除されたため、更新されました。"
 
-#: ../mail/mail-config.ui.h:1
+#: ../src/mail/mail-config.ui.h:1
 msgid "Set custom junk header"
 msgstr "独自のジャンクヘッダーを設定"
 
-#: ../mail/mail-config.ui.h:4
-msgid "All new emails with header that matches given content will be automatically filtered as junk"
-msgstr "ヘッダーが指定した内容と一致したすべての新しいメールは、ジャンクとして自動的にフィルターされます"
+#: ../src/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:5
+#: ../src/mail/mail-config.ui.h:5
 msgid "Header name"
 msgstr "ヘッダー名"
 
-#: ../mail/mail-config.ui.h:6
+#: ../src/mail/mail-config.ui.h:6
 msgid "Header content"
 msgstr "ヘッダーの内容"
 
-#: ../mail/mail-config.ui.h:7
+#: ../src/mail/mail-config.ui.h:7
 msgid "Default Behavior"
 msgstr "デフォルトの動作"
 
-#: ../mail/mail-config.ui.h:8
+#: ../src/mail/mail-config.ui.h:8
 msgid "For_mat messages in HTML"
 msgstr "HTML メッセージを整形する(_M)"
 
-#: ../mail/mail-config.ui.h:9
-msgid "Automatically insert _emoticon images"
+#: ../src/mail/mail-config.ui.h:10
+#, fuzzy
+#| msgid "Automatically insert _emoticon images"
+msgid "Automatically insert _emoticons"
 msgstr "自動的にスマイリーアイコンを挿入する(_E)"
 
-#: ../mail/mail-config.ui.h:10
+#: ../src/mail/mail-config.ui.h:11
+msgid "Use Un_icode characters for emoticons"
+msgstr ""
+
+#: ../src/mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "常に開封通知を要求する(_D)"
 
-#: ../mail/mail-config.ui.h:11
+#: ../src/mail/mail-config.ui.h:13
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "ファイル名を Outlook や GMail と同じ方法でエンコード(_O)"
 
-#: ../mail/mail-config.ui.h:12
+#: ../src/mail/mail-config.ui.h:14
+msgid "Send messages through Outbo_x folder"
+msgstr "送信したメッセージを送信トレイからどうするか(_X)"
+
+#: ../src/mail/mail-config.ui.h:15
+msgid "Number of characters for word w_rapping:"
+msgstr ""
+
+#: ../src/mail/mail-config.ui.h:16
 msgid "Ch_aracter encoding:"
 msgstr "文字コード(_A):"
 
-#: ../mail/mail-config.ui.h:13
+#: ../src/mail/mail-config.ui.h:17
 msgid "Replies and Forwards"
 msgstr "返信と転送"
 
-#: ../mail/mail-config.ui.h:14
+#: ../src/mail/mail-config.ui.h:18
 msgid "_Reply style:"
 msgstr "返信方法(_R):"
 
-#: ../mail/mail-config.ui.h:15
+#: ../src/mail/mail-config.ui.h:19
 msgid "_Forward style:"
 msgstr "転送方式(_F):"
 
-#: ../mail/mail-config.ui.h:16
+#: ../src/mail/mail-config.ui.h:20
 msgid "Start _typing at the bottom on replying"
 msgstr "返信時は最下部で入力を開始する(_T)"
 
-#: ../mail/mail-config.ui.h:17
+#: ../src/mail/mail-config.ui.h:21
 msgid "_Keep signature above the original message on replying"
 msgstr "返信時に署名をオリジナルのメッセージの上に保つ(_K)"
 
-#: ../mail/mail-config.ui.h:18
+#: ../src/mail/mail-config.ui.h:22
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "メーリングリストでは Reply-To: を無視する(_N)"
 
-#: ../mail/mail-config.ui.h:19
+#: ../src/mail/mail-config.ui.h:23
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "「グループに返信」は可能ならメーリングリストのみに送信(_U)"
 
-#: ../mail/mail-config.ui.h:20
+#: ../src/mail/mail-config.ui.h:24
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
-msgstr "元のメッセージが署名されていたら、メッセージをデジタル署名する(PGP または S/MIME)(_S)"
-
-#: ../mail/mail-config.ui.h:21
-msgctxt "ReplyForward"
-msgid "Attachment"
-msgstr "添付ファイル"
-
-#: ../mail/mail-config.ui.h:22
-msgctxt "ReplyForward"
-msgid "Inline (Outlook style)"
-msgstr "インラインにする (Outlook 形式)"
-
-#: ../mail/mail-config.ui.h:23
-msgctxt "ReplyForward"
-msgid "Quoted"
-msgstr "引用する"
+msgstr ""
+"元のメッセージが署名されていたら、メッセージをデジタル署名する(PGP または S/"
+"MIME)(_S)"
 
-#: ../mail/mail-config.ui.h:24
-msgctxt "ReplyForward"
-msgid "Do Not Quote"
-msgstr "何も引用しない"
+#: ../src/mail/mail-config.ui.h:25
+msgid "_Wrap quoted text in replies"
+msgstr ""
 
-#: ../mail/mail-config.ui.h:25
+#: ../src/mail/mail-config.ui.h:30
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "インラインにする"
 
-#: ../mail/mail-config.ui.h:27
+#: ../src/mail/mail-config.ui.h:32
 msgid "Sig_natures"
 msgstr "署名(_N)"
 
-#: ../mail/mail-config.ui.h:28
+#: ../src/mail/mail-config.ui.h:33
 msgid "Signatures"
 msgstr "署名"
 
-#: ../mail/mail-config.ui.h:29
+#: ../src/mail/mail-config.ui.h:34
 msgid "_Languages"
 msgstr "言語(_L)"
 
-#: ../mail/mail-config.ui.h:30
+#: ../src/mail/mail-config.ui.h:35
 msgid "Languages Table"
 msgstr "言語の一覧"
 
-#: ../mail/mail-config.ui.h:31
-msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
+#: ../src/mail/mail-config.ui.h:36
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr "お使いのシステムにインストールした辞書 (言語) だけ一覧に表示されます。"
 
-#: ../mail/mail-config.ui.h:33
+#: ../src/mail/mail-config.ui.h:38
 msgid "Check spelling while I _type"
 msgstr "入力時にスペルチェックする(_T)"
 
-#: ../mail/mail-config.ui.h:34
-msgid "Color for _misspelled words:"
-msgstr "スペルミスした文字の色(_M):"
-
-#: ../mail/mail-config.ui.h:35
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "Pick a color"
-msgstr "色の選択"
-
-#: ../mail/mail-config.ui.h:36
-msgid "Spell Checking"
-msgstr "スペルチェック"
-
-#: ../mail/mail-config.ui.h:37
-msgid "To help avoid email accidents and embarrassments, ask for confirmation before taking the following 
checkmarked actions:"
-msgstr "メールの事故や問題を回避するのに役立てるために、以下でチェックマークをつけたアクションの前には確認をします:"
+#: ../src/mail/mail-config.ui.h:40
+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:39
+#: ../src/mail/mail-config.ui.h:42
 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:41
+#: ../src/mail/mail-config.ui.h:44
 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:43
+#: ../src/mail/mail-config.ui.h:46
+#, fuzzy
+#| msgid "Sending a message with only _Bcc recipients defined"
+msgid "Sending a message to many _To and CC recipients"
+msgstr "Bcc 受信者のみ指定されているメッセージを送信(_B)"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../src/mail/mail-config.ui.h:48
 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:45
+#: ../src/mail/mail-config.ui.h:50
 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:47
+#: ../src/mail/mail-config.ui.h:52
 msgid "Allowing a _mailing list to redirect a private reply to the list"
-msgstr "メーリングリストが私信での返信をメーリングリスト宛に誘導するのを許可(_M)"
+msgstr ""
+"メーリングリストが私信での返信をメーリングリスト宛に誘導するのを許可(_M)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:49
+#: ../src/mail/mail-config.ui.h:54
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "メールアドレスが受信者に指定されてないメッセージを送信します(_R)"
 
-#: ../mail/mail-config.ui.h:50
+#. This is in the context of: Ask for confirmation before...
+#: ../src/mail/mail-config.ui.h:56
+#, fuzzy
+#| msgid "Sending a message with an _empty subject line"
+msgid "Sending a message using _key accelerator (Ctrl+Enter)"
+msgstr "件名が空のメッセージを送信(_E)"
+
+#. Translators:
+#: ../src/mail/mail-config.ui.h:58
+msgid "Before composer _format changes from HTML to Plain Text"
+msgstr ""
+
+#: ../src/mail/mail-config.ui.h:59
 msgid "Confirmations"
 msgstr "確認"
 
 # "検索フォルダ"は適訳ではない
 #. 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
+#: ../src/mail/mail-config.ui.h:63
 #, fuzzy
 #| msgid "Search Folders"
 msgid "Use for Folders"
 msgstr "仮想フォルダー"
 
-#: ../mail/mail-config.ui.h:55
-msgid "A_dd"
-msgstr "追加(_D)"
-
-#: ../mail/mail-config.ui.h:57
-#, 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
+#: ../src/mail/mail-config.ui.h:68
 #, fuzzy
 #| msgid " Use for Recipients "
 msgid "Use for Recipients"
 msgstr " 受け取り人にする "
 
 #. 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
+#: ../src/mail/mail-config.ui.h:70 ../src/modules/mail/em-composer-prefs.c:875
 msgid "Account"
 msgstr "アカウント"
 
-#: ../mail/mail-config.ui.h:62
+#: ../src/mail/mail-config.ui.h:71
 msgid "Send account overrides"
 msgstr "送信アカウントの優先"
 
-#: ../mail/mail-config.ui.h:63
-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 
"フォルダーや宛先それぞれの送信アカウントとして利用するアカウントを割り当て、通常の送信アカウント選択よりも優先します。宛先一覧にはアドレスや名前の一部を指定できます。名前とアドレス部は別々に比較されます。"
+#: ../src/mail/mail-config.ui.h:72
+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
+#: ../src/mail/mail-config.ui.h:73
 #, fuzzy
 #| msgid "Folder override has precedence over Recipient override"
 msgid "_Folder override has precedence over Recipient override"
 msgstr "フォルダーの優先は宛先の優先よりも優位となります"
 
-#: ../mail/mail-config.ui.h:65
+#: ../src/mail/mail-config.ui.h:74
 msgid "Send Account"
 msgstr "送信アカウント"
 
-#: ../mail/mail-config.ui.h:71 ../smime/gui/smime-ui.ui.h:1
+#: ../src/mail/mail-config.ui.h:80 ../src/smime/gui/smime-ui.ui.h:27
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:72 ../smime/gui/smime-ui.ui.h:2
+#: ../src/mail/mail-config.ui.h:81 ../src/smime/gui/smime-ui.ui.h:28
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:73
+#: ../src/mail/mail-config.ui.h:82
 msgid "Start up"
 msgstr "起動"
 
-#: ../mail/mail-config.ui.h:74
+#: ../src/mail/mail-config.ui.h:83
 msgid "Check for new _messages on start"
 msgstr "起動時に新着メッセージをチェック(_M)"
 
-#: ../mail/mail-config.ui.h:75
+#: ../src/mail/mail-config.ui.h:84
 msgid "Check for new messa_ges in all active accounts"
 msgstr "すべてのアカウントの新着メッセージをチェック(_G)"
 
-#: ../mail/mail-config.ui.h:76
+#: ../src/mail/mail-config.ui.h:85
 msgid "Message Display"
 msgstr "メッセージの表示"
 
-#: ../mail/mail-config.ui.h:77
+#: ../src/mail/mail-config.ui.h:86
 msgid "_Use the same fonts as other applications"
 msgstr "他のアプリと同じフォントを使う(_U)"
 
-#: ../mail/mail-config.ui.h:78
+#: ../src/mail/mail-config.ui.h:87
 msgid "S_tandard Font:"
 msgstr "標準フォント(_T):"
 
-#: ../mail/mail-config.ui.h:79
+#: ../src/mail/mail-config.ui.h:88
 msgid "Select HTML fixed width font"
 msgstr "固定幅フォントの選択 (HTML 表示)"
 
-#: ../mail/mail-config.ui.h:80
+#: ../src/mail/mail-config.ui.h:89
 msgid "Select HTML variable width font"
 msgstr "可変幅フォントの選択 (HTML 表示)"
 
-#: ../mail/mail-config.ui.h:81
+#: ../src/mail/mail-config.ui.h:90
 msgid "Fix_ed Width Font:"
 msgstr "固定幅のフォント(_E):"
 
-#: ../mail/mail-config.ui.h:82
+#: ../src/mail/mail-config.ui.h:91
 msgid "_Mark messages as read after"
 msgstr "指定時間経過後にメッセージを既読にする(_M)"
 
-#: ../mail/mail-config.ui.h:84
+#: ../src/mail/mail-config.ui.h:93
 msgid "Highlight _quotations with"
 msgstr "次の色で引用を強調表示する(_Q): "
 
-#: ../mail/mail-config.ui.h:85
+#: ../src/mail/mail-config.ui.h:94
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
+msgid "Pick a color"
+msgstr "色の選択"
+
+#: ../src/mail/mail-config.ui.h:95
 msgid "color"
 msgstr "色"
 
-#: ../mail/mail-config.ui.h:86
+#: ../src/mail/mail-config.ui.h:96
 msgid "Default character e_ncoding:"
 msgstr "デフォルトの文字エンコード(_N):"
 
-#: ../mail/mail-config.ui.h:87
+#: ../src/mail/mail-config.ui.h:97
 msgid "Apply the same _view settings to all folders"
 msgstr "同じ表示設定をすべてのフォルダーに適用する(_V)"
 
-#: ../mail/mail-config.ui.h:88
+#: ../src/mail/mail-config.ui.h:98
 msgid "F_all back to threading messages by subject"
 msgstr "件名によるスレッド表示に戻す(_A)"
 
-#: ../mail/mail-config.ui.h:89
+#: ../src/mail/mail-config.ui.h:99
 msgid "Delete Mail"
 msgstr "メールを削除"
 
-#: ../mail/mail-config.ui.h:90
+#: ../src/mail/mail-config.ui.h:100
 msgid "Empty _trash folders"
 msgstr "ゴミ箱フォルダーを空にする(_T)"
 
-#: ../mail/mail-config.ui.h:91
+#: ../src/mail/mail-config.ui.h:101
 msgid "Confirm _when expunging a folder"
 msgstr "フォルダーを抹消する前に確認する(_W)"
 
+#: ../src/mail/mail-config.ui.h:102
+msgid "Archive Mail"
+msgstr ""
+
+#: ../src/mail/mail-config.ui.h:103
+msgid "Archive folder to use for On This Computer messages"
+msgstr ""
+
+#: ../src/mail/mail-config.ui.h:104
+msgid "On This Computer A_rchive folder:"
+msgstr ""
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:93
+#: ../src/mail/mail-config.ui.h:106
 msgid "_Show animated images"
 msgstr "アニメーション画像を動かす(_S)"
 
-#: ../mail/mail-config.ui.h:94
+#: ../src/mail/mail-config.ui.h:107
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "HTML 形式を希望していない連絡先に送信する場合は確認する(_P)"
 
-#: ../mail/mail-config.ui.h:95
-msgid "Loading Images"
-msgstr "画像の読み込み"
+#: ../src/mail/mail-config.ui.h:108
+msgid "Loading Remote Content"
+msgstr "リモートコンテンツをロード"
+
+#: ../src/mail/mail-config.ui.h:109
+msgid "_Never load remote content from the Internet"
+msgstr "リモートコンテンツを読み込まない(_N)"
+
+#: ../src/mail/mail-config.ui.h:110
+msgid "_Load remote content only in messages from contacts"
+msgstr ""
+"連絡先に登録されている差出人のメッセージでのみリモートコンテンツを読み込む"
+"(_L)"
 
-#: ../mail/mail-config.ui.h:96
-msgid "_Never load images from the Internet"
-msgstr "画像を読み込まない(_N)"
+#: ../src/mail/mail-config.ui.h:111
+msgid "_Always load remote content from the Internet"
+msgstr "常にリモートコンテンツを読み込む(_A)"
 
-#: ../mail/mail-config.ui.h:97
-msgid "_Load images only in messages from contacts"
-msgstr "連絡先に登録されている差出人のメッセージでのみ画像を読み込む(_L)"
+#: ../src/mail/mail-config.ui.h:112
+#, fuzzy
+#| msgid "_Show the photograph of sender in the message preview"
+msgid "Notify about _missing remote content in the message preview"
+msgstr "プレビュー時に送信者の写真を表示する(_S)"
 
-#: ../mail/mail-config.ui.h:98
-msgid "_Always load images from the Internet"
-msgstr "常に画像を読み込む(_A)"
+#: ../src/mail/mail-config.ui.h:115
+msgid "Allow for sites:"
+msgstr ""
 
-#: ../mail/mail-config.ui.h:99
+#: ../src/mail/mail-config.ui.h:116
+#, fuzzy
+#| msgid "All local folders"
+msgid "Allow for senders:"
+msgstr "ローカルフォルダーすべて"
+
+#: ../src/mail/mail-config.ui.h:117
 msgid "HTML Messages"
 msgstr "HTML メッセージ"
 
-#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
-msgid "Labels"
-msgstr "ラベル"
-
-#: ../mail/mail-config.ui.h:101
+#: ../src/mail/mail-config.ui.h:119
 msgid "Sender Photograph"
 msgstr "送信者の写真"
 
-#: ../mail/mail-config.ui.h:102
+#: ../src/mail/mail-config.ui.h:120
 msgid "_Show the photograph of sender in the message preview"
 msgstr "プレビュー時に送信者の写真を表示する(_S)"
 
-#: ../mail/mail-config.ui.h:103
+#: ../src/mail/mail-config.ui.h:121
+msgid "Search gra_vatar.com for the photograph of sender"
+msgstr ""
+
+#: ../src/mail/mail-config.ui.h:122
 msgid "Displayed Message Headers"
 msgstr "表示されるメッセージのヘッダー"
 
-#: ../mail/mail-config.ui.h:104
+#: ../src/mail/mail-config.ui.h:123
 msgid "Mail Headers Table"
 msgstr "メールヘッダーの一覧"
 
-#: ../mail/mail-config.ui.h:105
-#: ../modules/addressbook/autocompletion-config.c:116
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../src/mail/mail-config.ui.h:124
+#: ../src/modules/addressbook/autocompletion-config.c:117
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "日付/時刻の形式"
 
-#: ../mail/mail-config.ui.h:107
+#: ../src/mail/mail-config.ui.h:126
 msgid "Check incoming _messages for junk"
 msgstr "受信したメールがジャンクかどうかチェックする(_M)"
 
-#: ../mail/mail-config.ui.h:108
+#: ../src/mail/mail-config.ui.h:127
 msgid "_Delete junk messages"
 msgstr "ジャンクメールを削除する(_D)"
 
-#: ../mail/mail-config.ui.h:109
-msgid "Check cu_stom headers for junk"
-msgstr "独自のヘッダーもチェックする(_S)"
+#: ../src/mail/mail-config.ui.h:128
+#, fuzzy
+#| msgid "Junk Test"
+msgid "Junk Test Options"
+msgstr "ジャンクテストの結果"
 
-#: ../mail/mail-config.ui.h:110
+#: ../src/mail/mail-config.ui.h:129
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "差出人がアドレス帳にある場合はジャンクメールにしない(_K)"
 
-#: ../mail/mail-config.ui.h:111
+#: ../src/mail/mail-config.ui.h:130
 msgid "_Lookup in local address book only"
 msgstr "ローカルにあるアドレス帳のみ検索する(_L)"
 
-#: ../mail/mail-config.ui.h:112
-msgid "Option is ignored if a match for custom junk headers is found."
-msgstr "ここで指定したヘッダーに一致するメールを検出した場合は次のオプションが無視されます:"
+#: ../src/mail/mail-config.ui.h:131
+msgid "Check cu_stom headers for junk"
+msgstr "独自のヘッダーもチェックする(_S)"
 
-#: ../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
+#: ../src/mail/mail-config.ui.h:133
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:302
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:245
 msgid "No encryption"
 msgstr "暗号化しない"
 
-#: ../mail/mail-config.ui.h:115
+#: ../src/mail/mail-config.ui.h:134
 msgid "TLS encryption"
 msgstr "TLS で暗号化する"
 
-#: ../mail/mail-config.ui.h:116
+#: ../src/mail/mail-config.ui.h:135
 msgid "SSL encryption"
 msgstr "SSL 暗号化"
 
-#: ../mail/mail-dialogs.ui.h:1
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"フォローアップとして指定したメッセージが下記に一覧化されています。\n"
-"\"フラグ\" メニューからフォローアップの内容を選択してください。"
-
-#: ../mail/mail-dialogs.ui.h:3
-msgid "_Flag:"
-msgstr "フラグ付き(_F):"
-
-#: ../mail/mail-dialogs.ui.h:4
-msgid "_Due By:"
-msgstr "期日(_D):"
-
-#. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:7
-msgid "Co_mpleted"
-msgstr "完了した(_M)"
-
-#: ../mail/mail-dialogs.ui.h:8
+#: ../src/mail/mail-dialogs.ui.h:1
 msgid "Call"
 msgstr "呼び出す"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../src/mail/mail-dialogs.ui.h:2
 msgid "Do Not Forward"
 msgstr "転送しない"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../src/mail/mail-dialogs.ui.h:3
 msgid "Follow-Up"
 msgstr "フォローアップ"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../src/mail/mail-dialogs.ui.h:4
 msgid "For Your Information"
 msgstr "F.Y.I"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../src/mail/mail-dialogs.ui.h:5
 msgid "Forward"
 msgstr "転送"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../src/mail/mail-dialogs.ui.h:6
 msgid "No Response Necessary"
 msgstr "返信の必要なし"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../src/mail/mail-dialogs.ui.h:10
 msgid "Reply to All"
 msgstr "全員へ返信"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../src/mail/mail-dialogs.ui.h:11
 msgid "Review"
 msgstr "レビュー"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../src/mail/mail-dialogs.ui.h:12
+#, fuzzy
+#| msgid ""
+#| "The messages you have selected for follow up are listed below.\n"
+#| "Please select a follow up action from the \"Flag\" menu."
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the “Flag” menu."
+msgstr ""
+"フォローアップとして指定したメッセージが下記に一覧化されています。\n"
+"\"フラグ\" メニューからフォローアップの内容を選択してください。"
+
+#: ../src/mail/mail-dialogs.ui.h:14
+msgid "_Flag:"
+msgstr "フラグ付き(_F):"
+
+#: ../src/mail/mail-dialogs.ui.h:15
+msgid "_Due By:"
+msgstr "期日(_D):"
+
+#. Translators: Flag Completed
+#: ../src/mail/mail-dialogs.ui.h:18
+msgid "Co_mpleted"
+msgstr "完了した(_M)"
+
+#: ../src/mail/mail-dialogs.ui.h:19
 msgid "License Agreement"
 msgstr "ライセンス同意書"
 
-#: ../mail/mail-dialogs.ui.h:20
-msgid "_Tick this to accept the license agreement"
-msgstr "ライセンス同意書を受諾する場合はここをチェックする(_T)"
-
-#: ../mail/mail-dialogs.ui.h:22
+#: ../src/mail/mail-dialogs.ui.h:21
 msgid "_Accept License"
 msgstr "ライセンスを受諾する(_A)"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../src/mail/mail-dialogs.ui.h:22
+msgid "_Tick this to accept the license agreement"
+msgstr "ライセンス同意書を受諾する場合はここをチェックする(_T)"
+
+#: ../src/mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "セキュリティ情報"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../src/mail/mail-dialogs.ui.h:25
 msgid "Digital Signature"
 msgstr "電子署名"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../src/mail/mail-dialogs.ui.h:26
 msgid "Encryption"
 msgstr "暗号化"
 
-#: ../mail/mail.error.xml.h:1
+#: ../src/mail/mail.error.xml.h:1
 msgid "Invalid authentication"
 msgstr "無効な認証"
 
-#: ../mail/mail.error.xml.h:2
-msgid "This server does not support this type of authentication and may not support authentication at all."
-msgstr "このサーバーではこの種類の認証をサポートしていないので、すべての認証をサポートしていないかもしれません。"
+#: ../src/mail/mail.error.xml.h:2
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+"このサーバーではこの種類の認証をサポートしていないので、すべての認証をサポー"
+"トしていないかもしれません。"
 
-#: ../mail/mail.error.xml.h:3
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "\"{0}\" というサーバーへ \"{0}\" でログインを試みましたが失敗しました。"
+#: ../src/mail/mail.error.xml.h:3
+#, fuzzy
+#| msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgid "Your login to your server “{0}” as “{0}” failed."
+msgstr ""
+"\"{0}\" というサーバーへ \"{0}\" でログインを試みましたが失敗しました。"
 
-#: ../mail/mail.error.xml.h:4
-msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case 
sensitive; your caps lock might be on."
-msgstr "パスワードの綴りが正しいか確認してください。パスワードは大/小文字を区別することに留意してください ([Caps Lock] キーが押下されているかもしれません)。"
+#: ../src/mail/mail.error.xml.h:4
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"パスワードの綴りが正しいか確認してください。パスワードは大/小文字を区別するこ"
+"とに留意してください ([Caps Lock] キーが押下されているかもしれません)。"
 
-#: ../mail/mail.error.xml.h:5
+#: ../src/mail/mail.error.xml.h:5
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "本当に HTML 形式でメッセージを送信してもよろしいですか?"
 
-#: ../mail/mail.error.xml.h:6
+#: ../src/mail/mail.error.xml.h:6
 msgid ""
-"Please make sure the following recipients are willing and able to receive HTML email:\n"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
 "{0}"
 msgstr ""
 "次の宛先が HTML 形式のメールを受信できるかどうかを確認してください:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:9
+#: ../src/mail/mail.error.xml.h:9
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "件名を付けずにメッセージを送信してもよろしいですか?"
 
-#: ../mail/mail.error.xml.h:10
-msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail 
is about."
-msgstr "メッセージに件名を追加しておくと、メッセージを受け取る人がメールの内容を理解しやすくなります。"
+#: ../src/mail/mail.error.xml.h:10
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+"メッセージに件名を追加しておくと、メッセージを受け取る人がメールの内容を理解"
+"しやすくなります。"
 
-#: ../mail/mail.error.xml.h:11
+#: ../src/mail/mail.error.xml.h:11
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Bcc のみ付与してメッセージを送信してもよろしいですか?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../src/mail/mail.error.xml.h:12
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if 
added, will list all of your recipients in your message. To avoid this, you should add at least one To: or 
CC: recipient. "
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
 "送信しようとする宛先を隠すように設定されます。\n"
 "\n"
-"一般的なメールシステムは、Bcc として宛先を指定した場合にのみヘッダー \"Apparently-To\" 
をメッセージに追加します。このヘッダーが追加されるとすべての宛先が記述されます。これを回避するために、少なくとも \"宛先:\" または \"Cc:\" に宛先を追加してください。"
+"一般的なメールシステムは、Bcc として宛先を指定した場合にのみヘッダー "
+"\"Apparently-To\" をメッセージに追加します。このヘッダーが追加されるとすべて"
+"の宛先が記述されます。これを回避するために、少なくとも \"宛先:\" または \"Cc:"
+"\" に宛先を追加してください。"
 
-#: ../mail/mail.error.xml.h:15
-msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This 
header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at 
least one To: or CC: recipient."
-msgstr "一般的なメールシステムでは、Bcc として宛先を指定した場合にのみヘッダー \"Apparently-To\" 
をメッセージに追加します。このヘッダーが追加されるとすべての宛先が記述されます。これを回避するために、少なくとも \"宛先\" または \"Cc:\" に宛先を追加してください。"
+#: ../src/mail/mail.error.xml.h:15
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+"一般的なメールシステムでは、Bcc として宛先を指定した場合にのみヘッダー "
+"\"Apparently-To\" をメッセージに追加します。このヘッダーが追加されるとすべて"
+"の宛先が記述されます。これを回避するために、少なくとも \"宛先\" または \"Cc:"
+"\" に宛先を追加してください。"
 
-#: ../mail/mail.error.xml.h:16
+#: ../src/mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "正しくないアドレスでメッセージを送信してもよろしいですか?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../src/mail/mail.error.xml.h:18
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13994,11 +19723,11 @@ msgstr ""
 "以下の受信者は正しいメールアドレスであるとは認識できませんでした:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:19
+#: ../src/mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "正しくないアドレスでメッセージを送信してもよろしいですか?"
 
-#: ../mail/mail.error.xml.h:20
+#: ../src/mail/mail.error.xml.h:21
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -14006,235 +19735,352 @@ msgstr ""
 "以下の受信者は正しいメールアドレスであるとは認識できませんでした:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:22
+#: ../src/mail/mail.error.xml.h:23
 msgid "Send private reply?"
 msgstr "プライベートな返信を送信しますか?"
 
-#: ../mail/mail.error.xml.h:23
-msgid "You are replying privately to a message which arrived via a mailing list, but the list is trying to 
redirect your reply to go back to the list. Are you sure you want to proceed?"
-msgstr "メーリングリスト経由で届いたメールにプライベートに返信しようとしています。しかし、メーリングリストは返信をメーリングリストに誘導しています。本当に処理を続けますか?"
+#: ../src/mail/mail.error.xml.h:24
+msgid ""
+"You are replying privately to a message which arrived via a mailing list, "
+"but the list is trying to redirect your reply to go back to the list. Are "
+"you sure you want to proceed?"
+msgstr ""
+"メーリングリスト経由で届いたメールにプライベートに返信しようとしています。し"
+"かし、メーリングリストは返信をメーリングリストに誘導しています。本当に処理を"
+"続けますか?"
 
-#: ../mail/mail.error.xml.h:24
+#: ../src/mail/mail.error.xml.h:25
 msgid "Reply _Privately"
 msgstr "プライベートに返信(_P)"
 
-#: ../mail/mail.error.xml.h:26
-msgid "You are replying to a message which arrived via a mailing list, but you are replying privately to the 
sender; not to the list. Are you sure you want to proceed?"
-msgstr "メーリングリスト経由で届いたメールに返信しようとしています。しかし、メーリングリストへではなく送信者にプライベートに返信しようとしています。本当に処理を続けますか?"
+#: ../src/mail/mail.error.xml.h:27
+msgid ""
+"You are replying to a message which arrived via a mailing list, but you are "
+"replying privately to the sender; not to the list. Are you sure you want to "
+"proceed?"
+msgstr ""
+"メーリングリスト経由で届いたメールに返信しようとしています。しかし、メーリン"
+"グリストへではなく送信者にプライベートに返信しようとしています。本当に処理を"
+"続けますか?"
 
-#: ../mail/mail.error.xml.h:28
+#: ../src/mail/mail.error.xml.h:29
 msgid "Send reply to all recipients?"
 msgstr "すべての宛先に返信を送りますか?"
 
-#: ../mail/mail.error.xml.h:29
-msgid "You are replying to a message which was sent to many recipients. Are you sure you want to reply to 
ALL of them?"
-msgstr "多くの宛先に送られたメッセージに返信しようとしています。それらの宛先すべてに返信しますか?"
+#: ../src/mail/mail.error.xml.h:30
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
+msgstr ""
+"多くの宛先に送られたメッセージに返信しようとしています。それらの宛先すべてに"
+"返信しますか?"
 
-#: ../mail/mail.error.xml.h:30
-msgid "This message cannot be sent because you have not specified any recipients"
+#: ../src/mail/mail.error.xml.h:31
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
 msgstr "宛先を指定していないので、このメッセージを送信することはできません"
 
-#: ../mail/mail.error.xml.h:31
-msgid "Please enter a valid email address in the To: field. You can search for email addresses by clicking 
on the To: button next to the entry box."
-msgstr "\"宛先\" のフィールドに正しいメールアドレスを入力してください。ボタン [宛先] をクリックして表示されるダイアログで、メールアドレスを検索できます。"
+#: ../src/mail/mail.error.xml.h:32
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+"\"宛先\" のフィールドに正しいメールアドレスを入力してください。ボタン [宛先] "
+"をクリックして表示されるダイアログで、メールアドレスを検索できます。"
 
-#: ../mail/mail.error.xml.h:32
+#: ../src/mail/mail.error.xml.h:33
 msgid "Use default drafts folder?"
 msgstr "デフォルトの下書きフォルダーを使用しますか?"
 
-#: ../mail/mail.error.xml.h:33
-msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
-msgstr "このアカウントの下書きフォルダーを開けません。代わりにシステムの下書きフォルダーを使用しますか?"
+#: ../src/mail/mail.error.xml.h:34
+#, fuzzy
+#| msgid ""
+#| "Unable to open the drafts folder for this account. Use the system drafts "
+#| "folder instead?"
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?\n"
+"\n"
+"The reported error was “{0}”."
+msgstr ""
+"このアカウントの下書きフォルダーを開けません。代わりにシステムの下書きフォル"
+"ダーを使用しますか?"
 
-#: ../mail/mail.error.xml.h:34
+#: ../src/mail/mail.error.xml.h:37
 msgid "Use _Default"
 msgstr "デフォルトを使用する(_D)"
 
-#: ../mail/mail.error.xml.h:35
-msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
-msgstr "フォルダー \"{0}\" にある削除マーク付きメッセージをすべて完全に抹消してもよろしいですか?"
+#: ../src/mail/mail.error.xml.h:38
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to permanently remove all the deleted messages in "
+#| "folder \"{0}\"?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder “{0}”?"
+msgstr ""
+"フォルダー \"{0}\" にある削除マーク付きメッセージをすべて完全に抹消してもよろ"
+"しいですか?"
 
-#: ../mail/mail.error.xml.h:36
+#: ../src/mail/mail.error.xml.h:39
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "続行すると、これらのメッセージを復旧することができなくなります。"
 
-#: ../mail/mail.error.xml.h:37
+#: ../src/mail/mail.error.xml.h:40
 msgid "_Expunge"
 msgstr "抹消する(_E)"
 
-#: ../mail/mail.error.xml.h:38
-msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
-msgstr "すべてのフォルダーにある削除マーク付きメッセージのすべてを完全に抹消してもよろしいですか?"
+#: ../src/mail/mail.error.xml.h:41
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+"すべてのフォルダーにある削除マーク付きメッセージのすべてを完全に抹消してもよ"
+"ろしいですか?"
 
-#: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../src/mail/mail.error.xml.h:42
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1657
 msgid "_Empty Trash"
 msgstr "ゴミ箱を空にする(_E)"
 
-#: ../mail/mail.error.xml.h:40
+#: ../src/mail/mail.error.xml.h:43
 msgid "Opening too many messages at once may take a long time."
 msgstr "一度にたくさんのメッセージを開くには時間がかかります。"
 
-#: ../mail/mail.error.xml.h:41
+#: ../src/mail/mail.error.xml.h:44
 msgid "_Open Messages"
 msgstr "メッセージを開く(_O)"
 
-#: ../mail/mail.error.xml.h:42
+#: ../src/mail/mail.error.xml.h:45
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "送信していないメッセージがあります。それでも終了しますか?"
 
-#: ../mail/mail.error.xml.h:43
-msgid "If you quit, these messages will not be sent until Evolution is started again."
-msgstr "終了すると、これらのメッセージは Evolution を再起動するまで送信されません。"
+#: ../src/mail/mail.error.xml.h:46
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+"終了すると、これらのメッセージは Evolution を再起動するまで送信されません。"
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:47
+#: ../src/mail/mail.error.xml.h:50
 msgid "Error while {0}."
 msgstr "{0}にエラーが発生しました"
 
-#: ../mail/mail.error.xml.h:48
+#: ../src/mail/mail.error.xml.h:51
 msgid "Error while performing operation."
 msgstr "操作を実行する際にエラーが発生しました。"
 
-#: ../mail/mail.error.xml.h:49
+#: ../src/mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "パスワードを入力してください。"
 
-#: ../mail/mail.error.xml.h:50
+#: ../src/mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "フィルター定義を読み込む際にエラーが発生しました。"
 
-#: ../mail/mail.error.xml.h:51
-msgid "Cannot save to directory \"{0}\"."
+#: ../src/mail/mail.error.xml.h:54
+#, fuzzy
+#| msgid "Cannot save to directory \"{0}\"."
+msgid "Cannot save to directory “{0}”."
 msgstr "\"{0}\" というフォルダーへ保存できません。"
 
-#: ../mail/mail.error.xml.h:52
-msgid "Cannot save to file \"{0}\"."
+#: ../src/mail/mail.error.xml.h:55
+#, fuzzy
+#| msgid "Cannot save to file \"{0}\"."
+msgid "Cannot save to file “{0}”."
 msgstr "\"{0}\" というファイルに保存できません。"
 
-#: ../mail/mail.error.xml.h:53
-msgid "Cannot create the save directory, because \"{1}\""
+#: ../src/mail/mail.error.xml.h:56
+#, fuzzy
+#| msgid "Cannot create the save directory, because \"{1}\""
+msgid "Cannot create the save directory, because “{1}”"
 msgstr "\"{1}\" のため保存フォルダーを作成できません。"
 
-#: ../mail/mail.error.xml.h:54
+#: ../src/mail/mail.error.xml.h:57
 msgid "Cannot create temporary save directory."
 msgstr "作業フォルダーを作成できません。"
 
-#: ../mail/mail.error.xml.h:55
+#: ../src/mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "ファイルが存在していますが、上書きできません。"
 
-#: ../mail/mail.error.xml.h:56
+#: ../src/mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "ファイルが存在していますが、通常のファイルではありません。"
 
-#: ../mail/mail.error.xml.h:57
-msgid "Cannot delete folder \"{0}\"."
+#: ../src/mail/mail.error.xml.h:60
+#, fuzzy
+#| msgid "Cannot delete folder \"{0}\"."
+msgid "Cannot delete folder “{0}”."
 msgstr "\"{0}\" というフォルダーを削除できません。"
 
-#: ../mail/mail.error.xml.h:58
-msgid "Cannot delete system folder \"{0}\"."
+#: ../src/mail/mail.error.xml.h:61
+#, fuzzy
+#| msgid "Cannot delete system folder \"{0}\"."
+msgid "Cannot delete system folder “{0}”."
 msgstr "\"{0}\" というシステムフォルダーを削除できません。"
 
-#: ../mail/mail.error.xml.h:59
-msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or 
deleted."
-msgstr "Evolution を正しく機能させるためにシステムフォルダーは必要なため、名前の変更や移動または削除することはできません。"
+#: ../src/mail/mail.error.xml.h:62
+msgid ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
+msgstr ""
+"Evolution を正しく機能させるためにシステムフォルダーは必要なため、名前の変更"
+"や移動または削除することはできません。"
 
-#: ../mail/mail.error.xml.h:60
-msgid "Failed to expunge folder &quot;{0}&quot;."
+#: ../src/mail/mail.error.xml.h:63
+#, fuzzy
+#| msgid "Failed to expunge folder &quot;{0}&quot;."
+msgid "Failed to expunge folder “{0}”."
 msgstr "フォルダー &quot;{0}&quot; の抹消に失敗しました。"
 
-#: ../mail/mail.error.xml.h:62
-msgid "Failed to refresh folder &quot;{0}&quot;."
+#: ../src/mail/mail.error.xml.h:65
+#, fuzzy
+#| msgid "Failed to refresh folder &quot;{0}&quot;."
+msgid "Failed to refresh folder “{0}”."
 msgstr "フォルダー &quot;{0}&quot; の更新に失敗しました。"
 
-#: ../mail/mail.error.xml.h:63
-msgid "Cannot rename or move system folder \"{0}\"."
+#: ../src/mail/mail.error.xml.h:66
+#, fuzzy
+#| msgid "Cannot rename or move system folder \"{0}\"."
+msgid "Cannot rename or move system folder “{0}”."
 msgstr "\"{0}\" というシステムフォルダーの名前の変更または移動はできません。"
 
-#: ../mail/mail.error.xml.h:64
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "本当に \"{0}\" というフォルダーとそのサブフォルダーのすべてを削除しますか?"
+#: ../src/mail/mail.error.xml.h:67
+#, fuzzy
+#| msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgid "Really delete folder “{0}” and all of its subfolders?"
+msgstr ""
+"本当に \"{0}\" というフォルダーとそのサブフォルダーのすべてを削除しますか?"
 
-#: ../mail/mail.error.xml.h:65
-msgid "If you delete the folder, all of its contents and its subfolders' contents will be deleted 
permanently."
-msgstr "このフォルダーを削除すると、そのフォルダーの内容とそのサブフォルダーの内容がすべて完全に削除されます。"
+#: ../src/mail/mail.error.xml.h:68
+#, fuzzy
+#| msgid ""
+#| "If you delete the folder, all of its contents and its subfolders' "
+#| "contents will be deleted permanently."
+msgid ""
+"If you delete the folder, all of its contents and its subfolders’ contents "
+"will be deleted permanently."
+msgstr ""
+"このフォルダーを削除すると、そのフォルダーの内容とそのサブフォルダーの内容が"
+"すべて完全に削除されます。"
 
-#: ../mail/mail.error.xml.h:67
-msgid "Really delete folder \"{0}\"?"
+#: ../src/mail/mail.error.xml.h:70
+#, fuzzy
+#| msgid "Really delete folder \"{0}\"?"
+msgid "Really unsubscribe folder “{0}”?"
 msgstr "\"{0}\" というフォルダーを本当に削除しますか?"
 
-#: ../mail/mail.error.xml.h:68
-msgid "If you delete the folder, all of its contents will be deleted permanently."
-msgstr "このフォルダーを削除すると、そのフォルダーの内容がすべて完全に削除されます。"
+#: ../src/mail/mail.error.xml.h:71
+msgid ""
+"If you unsubscribe the folder, it might not be visible in the Evolution, "
+"while still being available on the server. You can re-subscribe in "
+"Folder→Subscriptions... menu."
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:72
+#, fuzzy
+#| msgid "_Unsubscribe"
+msgid "Do _Not Unsubscribe"
+msgstr "購読の停止(_U)"
 
-#: ../mail/mail.error.xml.h:69
+#: ../src/mail/mail.error.xml.h:74
+#, fuzzy
+#| msgid "Really delete folder \"{0}\"?"
+msgid "Really delete folder “{0}”?"
+msgstr "\"{0}\" というフォルダーを本当に削除しますか?"
+
+#: ../src/mail/mail.error.xml.h:75
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
+msgstr ""
+"このフォルダーを削除すると、そのフォルダーの内容がすべて完全に削除されます。"
+
+#: ../src/mail/mail.error.xml.h:76
 msgid "These messages are not copies."
 msgstr "これらのメッセージはコピーではありません。"
 
-#: ../mail/mail.error.xml.h:70
-msgid "Messages shown in Search Folders are not copies. Deleting them from a Search Folder will delete the 
actual messages from the folder or folders in which they physically reside. Do you really want to delete 
these messages?"
-msgstr 
"検索フォルダーに表示されているメッセージはコピーではありません。検索フォルダーから削除を行うと実際のメッセージ、あるいは物理的に存在しているフォルダーが削除されます。本当にこれらのメッセージを削除しますか?"
+#: ../src/mail/mail.error.xml.h:77
+msgid ""
+"Messages shown in Search Folders are not copies. Deleting them from a Search "
+"Folder will delete the actual messages from the folder or folders in which "
+"they physically reside. Do you really want to delete these messages?"
+msgstr ""
+"検索フォルダーに表示されているメッセージはコピーではありません。検索フォル"
+"ダーから削除を行うと実際のメッセージ、あるいは物理的に存在しているフォルダー"
+"が削除されます。本当にこれらのメッセージを削除しますか?"
 
-#: ../mail/mail.error.xml.h:71
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#: ../src/mail/mail.error.xml.h:78
+#, fuzzy
+#| msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgid "Cannot rename “{0}” to “{1}”."
 msgstr "\"{0}\" から \"{1}\" に名前を変更できません。"
 
-#: ../mail/mail.error.xml.h:72
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "既に \"{1}\" と同名のフォルダーが存在します。別の名前を使用してください。"
+#: ../src/mail/mail.error.xml.h:79
+#, fuzzy
+#| msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgid "A folder named “{1}” already exists. Please use a different name."
+msgstr ""
+"既に \"{1}\" と同名のフォルダーが存在します。別の名前を使用してください。"
 
-#: ../mail/mail.error.xml.h:73
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
+#: ../src/mail/mail.error.xml.h:80
+#, fuzzy
+#| msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgid "Cannot move folder “{0}” to “{1}”."
 msgstr "\"{0}\" というフォルダーを \"{1}\" へ移動できません。"
 
-#: ../mail/mail.error.xml.h:74
+#: ../src/mail/mail.error.xml.h:81
 msgid "Cannot open source folder. Error: {2}"
 msgstr "ソースフォルダーを開けません。エラー: {2}"
 
-#: ../mail/mail.error.xml.h:75
+#: ../src/mail/mail.error.xml.h:82
 msgid "Cannot open target folder. Error: {2}"
 msgstr "ターゲットフォルダーを開けません。エラー: {2}"
 
-#: ../mail/mail.error.xml.h:76
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+#: ../src/mail/mail.error.xml.h:83
+#, fuzzy
+#| msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgid "Cannot copy folder “{0}” to “{1}”."
 msgstr "\"{0}\" というフォルダーを \"{1}\" へコピーできません。"
 
-#: ../mail/mail.error.xml.h:77
-msgid "Cannot create folder \"{0}\"."
+#: ../src/mail/mail.error.xml.h:84
+#, fuzzy
+#| msgid "Cannot create folder \"{0}\"."
+msgid "Cannot create folder “{0}”."
 msgstr "\"{0}\" というフォルダーを作成できません。"
 
-#: ../mail/mail.error.xml.h:78
+#: ../src/mail/mail.error.xml.h:85
 msgid "Cannot open folder. Error: {1}"
 msgstr "フォルダーを開けません。エラー: {1}"
 
-#: ../mail/mail.error.xml.h:79
+#: ../src/mail/mail.error.xml.h:86
 msgid "Cannot save changes to account."
 msgstr "変更したアカウント情報を保存できません。"
 
-#: ../mail/mail.error.xml.h:80
+#: ../src/mail/mail.error.xml.h:87
 msgid "You have not filled in all of the required information."
 msgstr "必要な情報のすべてを埋めていません。"
 
-#: ../mail/mail.error.xml.h:81
+#: ../src/mail/mail.error.xml.h:88
 msgid "You may not create two accounts with the same name."
 msgstr "同じ名前のアカウントを二つ作れません。"
 
-#: ../mail/mail.error.xml.h:82
+#: ../src/mail/mail.error.xml.h:89
 msgid "Are you sure you want to delete this account?"
 msgstr "このアカウントを削除してもよろしいですか?"
 
-#: ../mail/mail.error.xml.h:83
+#: ../src/mail/mail.error.xml.h:90
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "続行すると、アカウント情報が完全に削除されます。"
 
-#: ../mail/mail.error.xml.h:84
+#: ../src/mail/mail.error.xml.h:91
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "このアカウントとすべてのプロキシを削除してもよろしいですか?"
 
-#: ../mail/mail.error.xml.h:85
+#: ../src/mail/mail.error.xml.h:92
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14242,28 +20088,31 @@ msgstr ""
 "続行すると、アカウント情報と\n"
 "すべてのプロキシ情報が完全に削除されます。"
 
-#: ../mail/mail.error.xml.h:87
-msgid "Are you sure you want to disable this account and delete all its proxies?"
-msgstr "このアカウントを無効にしてそのプロキシの設定をすべて削除してもよろしいですか?"
+#: ../src/mail/mail.error.xml.h:94
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr ""
+"このアカウントを無効にしてそのプロキシの設定をすべて削除してもよろしいですか?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../src/mail/mail.error.xml.h:95
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "続行すると、すべてのプロキシアカウントが完全に削除されます。"
 
-#: ../mail/mail.error.xml.h:89
+#: ../src/mail/mail.error.xml.h:96
 msgid "Do _Not Disable"
 msgstr "無効にしない(_N)"
 
-#: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:655
+#: ../src/mail/mail.error.xml.h:97
 msgid "_Disable"
 msgstr "無効にする(_D)"
 
-#: ../mail/mail.error.xml.h:91
-msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+#: ../src/mail/mail.error.xml.h:98
+#, fuzzy
+#| msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgid "Cannot edit Search Folder “{0}” as it does not exist."
 msgstr "\"{0}\" という仮想フォルダーは存在していないので編集できません。"
 
-#: ../mail/mail.error.xml.h:92
+#: ../src/mail/mail.error.xml.h:99
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14271,832 +20120,1122 @@ msgstr ""
 "このフォルダーは自動的に追加されたかもしれません。\n"
 "必要であれば、仮想フォルダーのエディターを起動して明示的に追加してください。"
 
-#: ../mail/mail.error.xml.h:94
-msgid "Cannot add Search Folder \"{0}\"."
+#: ../src/mail/mail.error.xml.h:101
+#, fuzzy
+#| msgid "Cannot add Search Folder \"{0}\"."
+msgid "Cannot add Search Folder “{0}”."
 msgstr "仮想フォルダーの \"{0}\" を追加できません。"
 
-#: ../mail/mail.error.xml.h:95
-msgid "A folder named \"{0}\" already exists. Please use a different name."
-msgstr "既に \"{0}\" と同名のフォルダーが存在します。別の名前を使用してください。"
+#: ../src/mail/mail.error.xml.h:102
+#, fuzzy
+#| msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgid "A folder named “{0}” already exists. Please use a different name."
+msgstr ""
+"既に \"{0}\" と同名のフォルダーが存在します。別の名前を使用してください。"
 
 # Search Folder: 仮想フォルダ (検索フォルダではない)
-#: ../mail/mail.error.xml.h:96
+#: ../src/mail/mail.error.xml.h:103
 msgid "Search Folders automatically updated."
 msgstr "仮想フォルダーを自動的に更新しました。"
 
-#: ../mail/mail.error.xml.h:97
+#: ../src/mail/mail.error.xml.h:104
 msgid "Mail filters automatically updated."
 msgstr "メールのフィルターが自動的に更新されました。"
 
-#: ../mail/mail.error.xml.h:98
+#: ../src/mail/mail.error.xml.h:105
 msgid "Missing folder."
 msgstr "フォルダーがありません。"
 
-#: ../mail/mail.error.xml.h:99
+#: ../src/mail/mail.error.xml.h:106
 msgid "You must specify a folder."
 msgstr "フォルダーを指定してください。"
 
-#: ../mail/mail.error.xml.h:101
+#: ../src/mail/mail.error.xml.h:108
 msgid "You must name this Search Folder."
 msgstr "この仮想フォルダーに名前を付けてください。"
 
-#: ../mail/mail.error.xml.h:102
+#: ../src/mail/mail.error.xml.h:109
 msgid "No folder selected."
 msgstr "フォルダーが選択されていません。"
 
-#: ../mail/mail.error.xml.h:103
+#: ../src/mail/mail.error.xml.h:110
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or 
both."
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
 msgstr ""
 "ソースのフォルダーを少なくとも一つ指定してください。\n"
-"フォルダーをそれぞれ個々に選択する、かつ/またはすべてのローカルフォルダー、すべてのリモートフォルダー、またはその両方を選択してください。"
+"フォルダーをそれぞれ個々に選択する、かつ/またはすべてのローカルフォルダー、す"
+"べてのリモートフォルダー、またはその両方を選択してください。"
 
-#: ../mail/mail.error.xml.h:105
-msgid "Problem migrating old mail folder \"{0}\"."
+#: ../src/mail/mail.error.xml.h:112
+#, fuzzy
+#| msgid "Problem migrating old mail folder \"{0}\"."
+msgid "Problem migrating old mail folder “{0}”."
 msgstr "\"{0}\" という古いメールフォルダーを移行する際に問題が発生しました。"
 
-#: ../mail/mail.error.xml.h:106
+#: ../src/mail/mail.error.xml.h:113
+#, fuzzy
+#| msgid ""
+#| "A non-empty folder at \"{1}\" already exists.\n"
+#| "\n"
+#| "You can choose to ignore this folder, overwrite or append its contents, "
+#| "or quit."
 msgid ""
-"A non-empty folder at \"{1}\" already exists.\n"
+"A non-empty folder at “{1}” already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or quit."
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
 msgstr ""
 "\"{1}\" に空ではないフォルダーが存在します。\n"
 "\n"
-"このフォルダーを無視するか、上書きするか、そのフォルダーの内容に追加するか、あるいは終了するから選択できます"
+"このフォルダーを無視するか、上書きするか、そのフォルダーの内容に追加するか、"
+"あるいは終了するから選択できます"
 
-#: ../mail/mail.error.xml.h:109
-msgid "Ignore"
-msgstr "無視する"
-
-#: ../mail/mail.error.xml.h:110
+#: ../src/mail/mail.error.xml.h:117
 msgid "_Overwrite"
 msgstr "上書きする(_O)"
 
-#: ../mail/mail.error.xml.h:111
+#: ../src/mail/mail.error.xml.h:118
 msgid "_Append"
 msgstr "追加する(_A)"
 
-#: ../mail/mail.error.xml.h:112
-msgid "Evolution's local mail format has changed."
+#: ../src/mail/mail.error.xml.h:119
+#, fuzzy
+#| msgid "Evolution's local mail format has changed."
+msgid "Evolution’s local mail format has changed."
 msgstr "Evolution のローカルなメール形式が変更されました。"
 
-#: ../mail/mail.error.xml.h:113
+#: ../src/mail/mail.error.xml.h:120
+#, fuzzy
+#| msgid ""
+#| "Evolution's local mail format has changed from mbox to Maildir. Your "
+#| "local mail must be migrated to the new format before Evolution can "
+#| "proceed. Do you want to migrate now?\n"
+#| "\n"
+#| "An mbox account will be created to preserve the old mbox folders. You can "
+#| "delete the account after ensuring the data is safely migrated. Please "
+#| "make sure there is enough disk space if you choose to migrate now."
 msgid ""
-"Evolution's local mail format has changed from mbox to Maildir. Your local mail must be migrated to the new 
format before Evolution can proceed. Do you want to migrate now?\n"
+"Evolution’s local mail format has changed from mbox to Maildir. Your local "
+"mail must be migrated to the new format before Evolution can proceed. Do you "
+"want to migrate now?\n"
 "\n"
-"An mbox account will be created to preserve the old mbox folders. You can delete the account after ensuring 
the data is safely migrated. Please make sure there is enough disk space if you choose to migrate now."
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
 msgstr ""
-"Evolution のローカルなメール形式が mbox から Maildir に変わりました。Evolution が処理を続ける前に、ローカルのメールを新しい形式に移行しなくてはなりません。今変換しますか?\n"
+"Evolution のローカルなメール形式が mbox から Maildir に変わりました。"
+"Evolution が処理を続ける前に、ローカルのメールを新しい形式に移行しなくてはな"
+"りません。今変換しますか?\n"
 "\n"
-"古い mbox フォルダーを保存するため、mbox アカウントが作成されます。データが安全に移行されたことを確認したら、mbox 
アカウントは削除できます。今移行するなら、充分な空きディスク容量があることを確認してください。"
+"古い mbox フォルダーを保存するため、mbox アカウントが作成されます。データが安"
+"全に移行されたことを確認したら、mbox アカウントは削除できます。今移行するな"
+"ら、充分な空きディスク容量があることを確認してください。"
 
-#: ../mail/mail.error.xml.h:116
+#: ../src/mail/mail.error.xml.h:123
 msgid "_Exit Evolution"
 msgstr "Evolution を終了(_E)"
 
-#: ../mail/mail.error.xml.h:117
+#: ../src/mail/mail.error.xml.h:124
 msgid "_Migrate Now"
 msgstr "すぐに移行(_M)"
 
-#: ../mail/mail.error.xml.h:118
+#: ../src/mail/mail.error.xml.h:125
 msgid "Unable to read license file."
 msgstr "ライセンスファイルを読み込めません。"
 
-#: ../mail/mail.error.xml.h:119
-msgid "Cannot read the license file \"{0}\", due to an installation problem. You will not be able to use 
this provider until you can accept its license."
-msgstr "\"{0}\" というライセンスファイルを読み込めません。インストールに問題があるようです。そのライセンスを受諾しないかぎり、このプロバイダーを利用することはできません。"
+#: ../src/mail/mail.error.xml.h:126
+#, fuzzy
+#| msgid ""
+#| "Cannot read the license file \"{0}\", due to an installation problem. You "
+#| "will not be able to use this provider until you can accept its license."
+msgid ""
+"Cannot read the license file “{0}”, due to an installation problem. You will "
+"not be able to use this provider until you can accept its license."
+msgstr ""
+"\"{0}\" というライセンスファイルを読み込めません。インストールに問題があるよ"
+"うです。そのライセンスを受諾しないかぎり、このプロバイダーを利用することはで"
+"きません。"
 
-#: ../mail/mail.error.xml.h:120
+#: ../src/mail/mail.error.xml.h:127
 msgid "Please wait."
 msgstr "少々お待ちください。"
 
-#: ../mail/mail.error.xml.h:121
+#: ../src/mail/mail.error.xml.h:128
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "サポートしている認証メカニズムの一覧をサーバーに問い合わせています。"
 
-#: ../mail/mail.error.xml.h:122
-msgid "Failed to query server for a list of supported authentication mechanisms."
-msgstr "サポートしている認証メカニズムの一覧のサーバー問い合わせに失敗しました。"
+#: ../src/mail/mail.error.xml.h:129
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr ""
+"サポートしている認証メカニズムの一覧のサーバー問い合わせに失敗しました。"
+
+#: ../src/mail/mail.error.xml.h:130
+#, fuzzy
+#| msgid "Failed to retrieve messages."
+msgid "Failed to get server setup."
+msgstr "メッセージを取得できません。"
 
-#: ../mail/mail.error.xml.h:123
+#: ../src/mail/mail.error.xml.h:131
 msgid "Synchronize folders locally for offline usage?"
 msgstr "オフラインで参照するためにローカルのフォルダーと同期しますか?"
 
-#: ../mail/mail.error.xml.h:124
-msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
-msgstr "オフライン時にメールを閲覧するためにローカルのフォルダーと同期しておきますか?"
+#: ../src/mail/mail.error.xml.h:132
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+"オフライン時にメールを閲覧するためにローカルのフォルダーと同期しておきますか?"
 
-#: ../mail/mail.error.xml.h:125
+#: ../src/mail/mail.error.xml.h:133
 msgid "Do _Not Synchronize"
 msgstr "同期しない(_N)"
 
-#: ../mail/mail.error.xml.h:126
+#: ../src/mail/mail.error.xml.h:134
 msgid "_Synchronize"
 msgstr "同期(_S)"
 
-#: ../mail/mail.error.xml.h:127
+#: ../src/mail/mail.error.xml.h:135
 msgid "Do you want to mark all messages as read?"
 msgstr "すべてのメッセージに既読マークを付与しますか?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../src/mail/mail.error.xml.h:136
 msgid "This will mark all messages as read in the selected folder."
 msgstr "選択したフォルダー中のすべてのメッセージを既読としてマークします。"
 
-#: ../mail/mail.error.xml.h:129
+#: ../src/mail/mail.error.xml.h:137
 msgid "Also mark messages in subfolders?"
 msgstr "同様にサブフォルダーのメッセージにも付与しますか?"
 
-#: ../mail/mail.error.xml.h:130
-msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as 
all subfolders?"
-msgstr "このフォルダーにあるメッセージだけ既読マークを付与するか、サブフォルダーの中のメッセージも同様に既読マークを付与しますか?"
+#: ../src/mail/mail.error.xml.h:138
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr ""
+"このフォルダーにあるメッセージだけ既読マークを付与するか、サブフォルダーの中"
+"のメッセージも同様に既読マークを付与しますか?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../src/mail/mail.error.xml.h:139
 msgid "In Current Folder and _Subfolders"
 msgstr "このフォルダーとサブフォルダー(_S)"
 
-#: ../mail/mail.error.xml.h:132
+#: ../src/mail/mail.error.xml.h:140
 msgid "In Current _Folder Only"
 msgstr "このフォルダーだけ(_F)"
 
-#: ../mail/mail.error.xml.h:133
+#: ../src/mail/mail.error.xml.h:141
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr "返信や転送の際、Evolution にこのウィンドウを閉じさせますか?"
 
-#: ../mail/mail.error.xml.h:134
+#: ../src/mail/mail.error.xml.h:142
 msgid "_Yes, Always"
 msgstr "はい、常に(_Y)"
 
-#: ../mail/mail.error.xml.h:135
+#: ../src/mail/mail.error.xml.h:143
 msgid "_No, Never"
 msgstr "いいえ、しない(_N)"
 
-#: ../mail/mail.error.xml.h:136
+#: ../src/mail/mail.error.xml.h:144
 msgid "Copy folder in folder tree."
 msgstr "フォルダーツリー中のフォルダーをコピー"
 
-#: ../mail/mail.error.xml.h:137
-msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
-msgstr "本当にフォルダー '{0}' をフォルダー '{1}' にコピーしてもよろしいですか?"
+#: ../src/mail/mail.error.xml.h:145
+#, fuzzy
+#| msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
+msgid "Are you sure you want to copy folder “{0}” to folder “{1}”?"
+msgstr ""
+"本当にフォルダー '{0}' をフォルダー '{1}' にコピーしてもよろしいですか?"
+
+#: ../src/mail/mail.error.xml.h:147
+#, fuzzy
+#| msgid "Do _not Send"
+msgid "Do _not copy"
+msgstr "送信しない(_N)"
 
-#: ../mail/mail.error.xml.h:140
-msgid "_Always"
+#: ../src/mail/mail.error.xml.h:148
+#, fuzzy
+#| msgid "_Always"
+msgid "_Always copy"
 msgstr "常に(_A)"
 
-#: ../mail/mail.error.xml.h:141
-msgid "N_ever"
+#: ../src/mail/mail.error.xml.h:149
+#, fuzzy
+#| msgid "N_ever"
+msgid "N_ever copy"
 msgstr "しない(_E)"
 
-#: ../mail/mail.error.xml.h:142
+#: ../src/mail/mail.error.xml.h:150
 msgid "Move folder in folder tree."
 msgstr "フォルダーツリー中のフォルダーを移動"
 
-#: ../mail/mail.error.xml.h:143
-msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
+#: ../src/mail/mail.error.xml.h:151
+#, fuzzy
+#| msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
+msgid "Are you sure you want to to move folder “{0}” to folder “{1}”?"
 msgstr "本当にフォルダー '{0}' をフォルダー '{1}' に移動してもよろしいですか?"
 
-#: ../mail/mail.error.xml.h:144
-msgid "This message cannot be sent because the account you chose to send with is not enabled"
-msgstr "選択したアカウントが有効ではないので、このメッセージを送信することはできません"
+#: ../src/mail/mail.error.xml.h:153
+msgid "Do _not move"
+msgstr "移動しない(_N)"
+
+#: ../src/mail/mail.error.xml.h:154
+msgid "_Always move"
+msgstr "常に移動(_A)"
+
+#: ../src/mail/mail.error.xml.h:155
+msgid "N_ever move"
+msgstr "今後とも移動しない(_E)"
+
+#: ../src/mail/mail.error.xml.h:156
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr ""
+"選択したアカウントが有効ではないので、このメッセージを送信することはできませ"
+"ん"
 
-#: ../mail/mail.error.xml.h:145
+#: ../src/mail/mail.error.xml.h:157
 msgid "Please enable the account or send using another account."
 msgstr "アカウントを有効にするか、または別のアカウントで送信してみてください。"
 
-#: ../mail/mail.error.xml.h:146
+#: ../src/mail/mail.error.xml.h:158
 msgid "Mail Deletion Failed"
 msgstr "メールの削除に失敗しました"
 
-#: ../mail/mail.error.xml.h:147
+#: ../src/mail/mail.error.xml.h:159
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "このメールを削除するために必要な権限がありません。"
 
-#: ../mail/mail.error.xml.h:148
-msgid "\"Check Junk\" Failed"
+#: ../src/mail/mail.error.xml.h:160
+#, fuzzy
+#| msgid "\"Check Junk\" Failed"
+msgid "“Check Junk” Failed"
 msgstr "「ジャンクのチェック」に失敗しました"
 
 # FIXME: 意味不明
-#: ../mail/mail.error.xml.h:149
-msgid "\"Report Junk\" Failed"
+#: ../src/mail/mail.error.xml.h:161
+#, fuzzy
+#| msgid "\"Report Junk\" Failed"
+msgid "“Report Junk” Failed"
 msgstr "「ジャンクの報告」に失敗しました"
 
 # FIXME: 意味不明
-#: ../mail/mail.error.xml.h:150
-msgid "\"Report Not Junk\" Failed"
+#: ../src/mail/mail.error.xml.h:162
+#, fuzzy
+#| msgid "\"Report Not Junk\" Failed"
+msgid "“Report Not Junk” Failed"
 msgstr "「ジャンクではないとの報告」に失敗しました"
 
-#: ../mail/mail.error.xml.h:151
+#: ../src/mail/mail.error.xml.h:163
 msgid "Remove duplicate messages?"
 msgstr "重複したメッセージを削除しますか?"
 
-#: ../mail/mail.error.xml.h:152
+#: ../src/mail/mail.error.xml.h:164
 msgid "No duplicate messages found."
 msgstr "重複したメッセージが見つかりませんでした。"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:154
-msgid "Folder '{0}' doesn't contain any duplicate message."
+#: ../src/mail/mail.error.xml.h:166
+#, fuzzy
+#| msgid "Folder '{0}' doesn't contain any duplicate message."
+msgid "Folder “{0}” doesn’t contain any duplicate message."
 msgstr "フォルダー '{0}' には重複したメッセージが含まれていませんでした。"
 
-#: ../mail/mail.error.xml.h:155
-msgid "Failed to disconnect account &quot;{0}&quot;."
+#: ../src/mail/mail.error.xml.h:167
+#, fuzzy
+#| msgid "Failed to disconnect account &quot;{0}&quot;."
+msgid "Failed to connect account “{0}”."
+msgstr "アカウント &quot;{0}&quot; の切断に失敗しました。"
+
+#: ../src/mail/mail.error.xml.h:168
+#, fuzzy
+#| msgid "Failed to disconnect account &quot;{0}&quot;."
+msgid "Failed to disconnect account “{0}”."
 msgstr "アカウント &quot;{0}&quot; の切断に失敗しました。"
 
-#: ../mail/mail.error.xml.h:157
-msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
+#: ../src/mail/mail.error.xml.h:169
+#, fuzzy
+#| msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
+msgid "Failed to unsubscribe from folder “{0}”."
 msgstr "フォルダー &quot;{0}&quot; の購読停止に失敗しました。"
 
-#: ../mail/mail.error.xml.h:158
+#: ../src/mail/mail.error.xml.h:170
 msgid "Unable to retrieve message."
 msgstr "メッセージを取得できません。"
 
-#: ../mail/mail.error.xml.h:159
+#: ../src/mail/mail.error.xml.h:171
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:160
+#: ../src/mail/mail.error.xml.h:172
+#, fuzzy
+#| msgid "Send mail also when in offline _mode"
+msgid "Message is not available in offline mode."
+msgstr "オフラインモードでもメールを送る(_M)"
+
+#: ../src/mail/mail.error.xml.h:173
+msgid ""
+"This can be due to the message not being downloaded yet. The folder, or the "
+"account, can be marked for offline synchronization. Then, once the account "
+"is online again, use File→Download Messages for Offline Usage, when this "
+"folder is selected, to make sure that all the messages in the folder will be "
+"available in offline mode."
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:174
 msgid "Failed to open folder."
 msgstr "フォルダーを開けませんでした"
 
-#: ../mail/mail.error.xml.h:161
+#: ../src/mail/mail.error.xml.h:176
 msgid "Failed to find duplicate messages."
 msgstr "重複したメッセージの検索に失敗しました。"
 
-#: ../mail/mail.error.xml.h:162
+#: ../src/mail/mail.error.xml.h:177
 msgid "Failed to retrieve messages."
 msgstr "メッセージを取得できません。"
 
-#: ../mail/mail.error.xml.h:163
+#: ../src/mail/mail.error.xml.h:178
 msgid "Failed to mark messages as read."
 msgstr "メッセージを既読にするのに失敗しました"
 
-#: ../mail/mail.error.xml.h:164
+#: ../src/mail/mail.error.xml.h:179
 msgid "Failed to remove attachments from messages."
 msgstr "メッセージから添付ファイルの削除に失敗しました。"
 
-#: ../mail/mail.error.xml.h:165
+#: ../src/mail/mail.error.xml.h:180
 msgid "Failed to download messages for offline viewing."
 msgstr "オフライン表示用のメッセージのダウンロードに失敗しました。"
 
-#: ../mail/mail.error.xml.h:166
+#: ../src/mail/mail.error.xml.h:181
 msgid "Failed to save messages to disk."
 msgstr "ディスクへのメッセージ保存に失敗しました"
 
-#: ../mail/mail.error.xml.h:167
+#: ../src/mail/mail.error.xml.h:182
 msgid "Hidden file is attached."
 msgstr "隠しファイルが添付されました。"
 
-#: ../mail/mail.error.xml.h:168
-msgid "The attachment named {0} is a hidden file and may contain sensitive data. Please review it before 
sending."
-msgstr "添付ファイル {0} は、隠しファイルなので機密データを含んでいるかもしれません。送信前に確認をしてください。"
+#: ../src/mail/mail.error.xml.h:183
+msgid ""
+"The attachment named {0} is a hidden file and may contain sensitive data. "
+"Please review it before sending."
+msgstr ""
+"添付ファイル {0} は、隠しファイルなので機密データを含んでいるかもしれません。"
+"送信前に確認をしてください。"
 
-#: ../mail/mail.error.xml.h:169
+#: ../src/mail/mail.error.xml.h:184
 msgid "Printing failed."
 msgstr "印刷に失敗しました。"
 
-#: ../mail/mail.error.xml.h:170
-msgid "The printer replied &quot;{0}&quot;."
+#: ../src/mail/mail.error.xml.h:185
+#, fuzzy
+#| msgid "The printer replied &quot;{0}&quot;."
+msgid "The printer replied “{0}”."
 msgstr "プリンターは &quot;{0}&quot; を返しました。"
 
-#: ../mail/mail.error.xml.h:171
+#: ../src/mail/mail.error.xml.h:186
 msgid "Could not perform this operation on {0}."
 msgstr "この操作を {0} で実行できませんでした。"
 
-#: ../mail/mail.error.xml.h:172
+#: ../src/mail/mail.error.xml.h:187
 msgid "You must be working online to complete this operation."
 msgstr "この操作を完了させるにはオンラインでの作業が必要です。"
 
-#: ../mail/mail.error.xml.h:173
-msgid "Message from &quot;{0}&quot; account:"
+#: ../src/mail/mail.error.xml.h:188
+msgid "Message from “{0}” account:"
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:189
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to mark thread to be ignored in folder “{0}”"
+msgstr "カレンダー '{0}' へのイベントの移動に失敗しました"
+
+#: ../src/mail/mail.error.xml.h:190
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to unmark thread from being ignored in folder “{0}”"
+msgstr "カレンダー '{0}' へのイベントの移動に失敗しました"
+
+#: ../src/mail/mail.error.xml.h:191
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to mark subthread to be ignored in folder “{0}”"
+msgstr "カレンダー '{0}' へのイベントの移動に失敗しました"
+
+#: ../src/mail/mail.error.xml.h:192
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to unmark subthread from being ignored in folder “{0}”"
+msgstr "カレンダー '{0}' へのイベントの移動に失敗しました"
+
+#: ../src/mail/mail.error.xml.h:193
+msgid "Remote content download had been blocked for this message."
+msgstr "このメッセージのリモートコンテンツのダウンロードがブロックされました。"
+
+#: ../src/mail/mail.error.xml.h:194
+msgid ""
+"You can download remote content manually, or set to remember to download "
+"remote content for this sender or used sites."
+msgstr ""
+"手動でリモートコンテンツできます。あるいは、この送信者または使用サイトのリ"
+"モートコンテンツをダウンロードするように記憶を設定できます。"
+
+#. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
+#: ../src/mail/mail.error.xml.h:196
+#, fuzzy
+#| msgid " (Completed "
+msgid "{0}, Completed on {1}"
+msgstr " (完了 "
+
+#. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
+#: ../src/mail/mail.error.xml.h:198
+msgid "{0} by {1}"
+msgstr ""
+
+#. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
+#: ../src/mail/mail.error.xml.h:200
+msgid "Overdue: {0} by {1}"
+msgstr "期限切れ: {0} by {1}"
+
+#: ../src/mail/mail.error.xml.h:202
+#, fuzzy
+#| msgid "This signature has been changed, but has not been saved."
+msgid "This message note has been changed, but has not been saved."
+msgstr "この署名は変更されていますが保存されていません。"
+
+#. Translators: {0} is the name of the folder where the delete of the message note failed.
+#: ../src/mail/mail.error.xml.h:205
+#, fuzzy
+#| msgid "Copy selected messages to another folder"
+msgid "Failed to delete message note in folder “{0}”"
+msgstr "選択したメッセージを別のフォルダーへコピーします"
+
+#. Translators: {0} is the name of the folder where the store of the message note failed.
+#: ../src/mail/mail.error.xml.h:207
+#, fuzzy
+#| msgid "Failed to stream mail message content to Bogofilter: "
+msgid "Failed to store message note in folder “{0}”"
+msgstr "Bogofilter へのメッセージ内容の受け渡しに失敗しました: "
+
+#: ../src/mail/mail.error.xml.h:208
+#, fuzzy
+#| msgid "Search for text in the body of the displayed message"
+msgid "Something has gone wrong when displaying the message"
+msgstr "表示したメッセージ本文に含まれる文字列を検索します"
+
+#: ../src/mail/mail.error.xml.h:209
+msgid ""
+"A WebKitWebProcess crashed when displaying the message. You can try again by "
+"moving to another message and back. If the issue persists, please file a bug "
+"report in the GNOME bugzilla."
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:210
+msgid "Something has gone wrong when displaying the signature"
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:211
+msgid ""
+"A WebKitWebProcess crashed when displaying the signature. You can try again "
+"by moving to another signature and back. If the issue persists, please file "
+"a bug report in the GNOME bugzilla."
 msgstr ""
 
-#: ../mail/mail-send-recv.c:188
+#: ../src/mail/mail-send-recv.c:192
 msgid "Canceling..."
 msgstr "キャンセル中..."
 
-#: ../mail/mail-send-recv.c:526
+#: ../src/mail/mail-send-recv.c:640
 msgid "Send & Receive Mail"
 msgstr "メールの送信と受信"
 
-#: ../mail/mail-send-recv.c:542
+#: ../src/mail/mail-send-recv.c:654
 msgid "Cancel _All"
 msgstr "すべてキャンセル(_A)"
 
-#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:1024
+#: ../src/mail/mail-send-recv.c:744 ../src/mail/mail-send-recv.c:1262
 msgid "Updating..."
 msgstr "更新中..."
 
-#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:714
+#: ../src/mail/mail-send-recv.c:744 ../src/mail/mail-send-recv.c:826
 msgid "Waiting..."
 msgstr "待機中..."
 
-#: ../mail/mail-send-recv.c:997
-#, c-format
-msgid "Checking for new mail at '%s'"
+#: ../src/mail/mail-send-recv.c:1228
+#, fuzzy, c-format
+#| msgid "Checking for new mail at '%s'"
+msgid "Checking for new mail at “%s”"
 msgstr "'%s' で新着メールの確認中"
 
+#: ../src/mail/mail-send-recv.c:1455
+#, c-format
+msgid "Deleting junk and expunging trash at “%s”"
+msgstr ""
+
+#: ../src/mail/mail-send-recv.c:1457
+#, fuzzy, c-format
+#| msgid "Reconnecting to '%s'"
+msgid "Deleting junk at “%s”"
+msgstr "'%s' へ再接続中"
+
+#: ../src/mail/mail-send-recv.c:1459
+#, fuzzy, c-format
+#| msgid "Emptying trash in '%s'"
+msgid "Expunging trash at “%s”"
+msgstr "'%s' にあるゴミ箱のクリア中"
+
 # "検索フォルダ"は適訳ではない
-#: ../mail/mail-vfolder-ui.c:66
+#: ../src/mail/mail-vfolder-ui.c:67
 msgid "Search Folders"
 msgstr "仮想フォルダー"
 
-#: ../mail/mail-vfolder-ui.c:146
+#: ../src/mail/mail-vfolder-ui.c:147
 msgid "Edit Search Folder"
 msgstr "フォルダーの編集"
 
-#: ../mail/mail-vfolder-ui.c:267
+#: ../src/mail/mail-vfolder-ui.c:268
 msgid "New Search Folder"
 msgstr "新しい仮想フォルダー"
 
-#: ../mail/message-list.c:287
+#: ../src/mail/message-list.c:300
 msgid "Unseen"
 msgstr "未読"
 
-#: ../mail/message-list.c:288
+#: ../src/mail/message-list.c:301
 msgid "Seen"
 msgstr "既読"
 
-#: ../mail/message-list.c:289
+#: ../src/mail/message-list.c:302
 msgid "Answered"
 msgstr "返答済み"
 
-#: ../mail/message-list.c:290
+#: ../src/mail/message-list.c:303
 msgid "Forwarded"
 msgstr "転送済み"
 
-#: ../mail/message-list.c:291
+#: ../src/mail/message-list.c:304
 msgid "Multiple Unseen Messages"
 msgstr "複数の未読メッセージ"
 
-#: ../mail/message-list.c:292
+#: ../src/mail/message-list.c:305
 msgid "Multiple Messages"
 msgstr "複数のメッセージ"
 
-#: ../mail/message-list.c:305
+#: ../src/mail/message-list.c:318
 msgid "Lowest"
 msgstr "最も低い"
 
-#: ../mail/message-list.c:306
+#: ../src/mail/message-list.c:319
 msgid "Lower"
 msgstr "低い"
 
-#: ../mail/message-list.c:310
+#: ../src/mail/message-list.c:323
 msgid "Higher"
 msgstr "高い"
 
-#: ../mail/message-list.c:311
+#: ../src/mail/message-list.c:324
 msgid "Highest"
 msgstr "最も高い"
 
-#: ../mail/message-list.c:455 ../mail/message-list.c:5749
+#: ../src/mail/message-list.c:470 ../src/mail/message-list.c:6286
 msgid "Generating message list"
 msgstr "メッセージの一覧の作成中"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1860 ../modules/itip-formatter/itip-view.c:237
+#: ../src/mail/message-list.c:2074
+#: ../src/modules/itip-formatter/itip-view.c:267
 msgid "Today %l:%M %p"
 msgstr "今日の%p%l:%M"
 
-#: ../mail/message-list.c:1869
+#: ../src/mail/message-list.c:2083
 msgid "Yesterday %l:%M %p"
 msgstr "昨日の%p%l:%M"
 
-#: ../mail/message-list.c:1881
+#: ../src/mail/message-list.c:2095
 msgid "%a %l:%M %p"
 msgstr "%p%l:%M (%a)"
 
-#: ../mail/message-list.c:1889
+#: ../src/mail/message-list.c:2103
 msgid "%b %d %l:%M %p"
 msgstr "%B%e日 %p%l:%M"
 
-#: ../mail/message-list.c:1891
+#: ../src/mail/message-list.c:2105
 msgid "%b %d %Y"
 msgstr "%Y年%B%e日"
 
-#: ../mail/message-list.c:2771
+#: ../src/mail/message-list.c:3062
 msgid "Select all visible messages"
 msgstr "すべてのメッセージを選択します"
 
-#: ../mail/message-list.c:3399 ../mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:3781 ../src/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:4706
+#: ../src/mail/message-list.c:5213
 msgid "Follow-up"
 msgstr "フォローアップ"
 
-#: ../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 
"検索基準を満たすメッセージがありませんでした。上記のドロップダウンリストから新しいメッセージ表示フィルターを選択して検索基準を変更するか、メニュー項目の検索->クリアでクリアするか上記の条件を変更して、新たに検索を実行してください。"
+#: ../src/mail/message-list.c:6225
+#, fuzzy
+#| 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."
+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:5695
+#: ../src/mail/message-list.c:6233
 msgid "There are no messages in this folder."
 msgstr "このフォルダーにメッセージはありません。"
 
-#: ../mail/message-list.etspec.h:2
+#: ../src/mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "フラグ"
 
-#: ../mail/message-list.etspec.h:8
+#: ../src/mail/message-list.etspec.h:8
 msgid "Received"
 msgstr "受信済み"
 
-#: ../mail/message-list.etspec.h:11
+#: ../src/mail/message-list.etspec.h:11
 msgid "Flag Status"
 msgstr "フラグの状態"
 
-#: ../mail/message-list.etspec.h:12
+#: ../src/mail/message-list.etspec.h:12
 msgid "Follow Up Flag"
 msgstr "フラグのフォローアップ"
 
-#: ../mail/message-list.etspec.h:13
+#: ../src/mail/message-list.etspec.h:13
 msgid "Due By"
 msgstr "期日"
 
-#: ../mail/message-list.etspec.h:18
+#: ../src/mail/message-list.etspec.h:18
 msgid "Messages To"
 msgstr ""
 
-#: ../mail/message-list.etspec.h:20
-msgid "Subject - Trimmed"
+#: ../src/mail/message-list.etspec.h:20
+#, fuzzy
+#| msgid "Subject - Trimmed"
+msgid "Subject — Trimmed"
 msgstr "件名 - Trimmed"
 
-#: ../mail/searchtypes.xml.h:1
+#: ../src/mail/message-list.etspec.h:21
+#: ../src/plugins/save-calendar/csv-format.c:372
+msgid "UID"
+msgstr "UID"
+
+#: ../src/mail/searchtypes.xml.in.h:23 ../src/mail/vfoldertypes.xml.in.h:23
+msgid "Any header"
+msgstr "任意のヘッダー"
+
+#: ../src/mail/searchtypes.xml.in.h:57
 msgid "Subject or Addresses contains"
 msgstr "以下を含む件名あるいはアドレス"
 
-#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:2002
+#: ../src/mail/searchtypes.xml.in.h:58
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2186
 msgid "Recipients contain"
 msgstr "宛先"
 
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1995
+#: ../src/mail/searchtypes.xml.in.h:59
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2179
 msgid "Message contains"
 msgstr "メール全体"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:2016
+#: ../src/mail/searchtypes.xml.in.h:60
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2200
 msgid "Subject contains"
 msgstr "件名"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:2009
+#: ../src/mail/searchtypes.xml.in.h:61
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2193
 msgid "Sender contains"
 msgstr "差出人"
 
-#: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1988
+#: ../src/mail/searchtypes.xml.in.h:62
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2165
 msgid "Body contains"
 msgstr "メッセージの本文"
 
+#: ../src/mail/searchtypes.xml.in.h:63
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2172
+#, fuzzy
+#| msgid "Expression"
+msgid "Free form expression"
+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:122
-#: ../modules/mail/em-mailer-prefs.c:1212
+#: ../src/modules/addressbook/autocompletion-config.c:123
+#: ../src/modules/mail/em-mailer-prefs.c:1556
 msgid "_Table column:"
 msgstr "表の項目(_T):"
 
-#: ../modules/addressbook/autocompletion-config.c:125
+#: ../src/modules/addressbook/autocompletion-config.c:126
 msgid "Address formatting"
 msgstr "アドレスの整形"
 
-#: ../modules/addressbook/autocompletion-config.c:128
+#: ../src/modules/addressbook/autocompletion-config.c:129
 msgid "_Format address according to standard of its destination country"
 msgstr "アドレスを送信先の国の標準に合わせた形式に整形(_F)"
 
-#: ../modules/addressbook/autocompletion-config.c:136
+#: ../src/modules/addressbook/autocompletion-config.c:137
 msgid "Autocompletion"
 msgstr "自動補完"
 
-#: ../modules/addressbook/autocompletion-config.c:139
+#: ../src/modules/addressbook/autocompletion-config.c:140
 msgid "Always _show address of the autocompleted contact"
 msgstr "自動補完した連絡先にメールアドレスを表示する(_S)"
 
-#: ../modules/addressbook/eab-composer-util.c:147
+#: ../src/modules/addressbook/eab-composer-util.c:98
 msgid "Multiple vCards"
 msgstr "複数の vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:155
+#: ../src/modules/addressbook/eab-composer-util.c:106
 #, c-format
 msgid "vCard for %s"
 msgstr "%s の vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:167
-#: ../modules/addressbook/eab-composer-util.c:194
+#: ../src/modules/addressbook/eab-composer-util.c:117
+#: ../src/modules/addressbook/eab-composer-util.c:144
 #, c-format
 msgid "Contact information"
 msgstr "連絡先の情報"
 
-#: ../modules/addressbook/eab-composer-util.c:196
+#: ../src/modules/addressbook/eab-composer-util.c:146
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s の連絡先の情報"
 
-#: ../modules/addressbook/e-book-shell-backend.c:258
-#: ../modules/addressbook/e-book-shell-view-actions.c:124
+#: ../src/modules/addressbook/e-book-shell-backend.c:258
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:137
 msgid "New Address Book"
 msgstr "新しいアドレス帳"
 
-#: ../modules/addressbook/e-book-shell-backend.c:267
+#: ../src/modules/addressbook/e-book-shell-backend.c:267
 msgctxt "New"
 msgid "_Contact"
 msgstr "連絡先(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
+#: ../src/modules/addressbook/e-book-shell-backend.c:269
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1046
 msgid "Create a new contact"
 msgstr "新しい連絡先を作成します"
 
-#: ../modules/addressbook/e-book-shell-backend.c:274
+#: ../src/modules/addressbook/e-book-shell-backend.c:274
 msgctxt "New"
 msgid "Contact _List"
 msgstr "連絡先の一覧(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:985
+#: ../src/modules/addressbook/e-book-shell-backend.c:276
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1053
 msgid "Create a new contact list"
 msgstr "新しい連絡先の一覧を作成します"
 
-#: ../modules/addressbook/e-book-shell-backend.c:284
+#: ../src/modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
 msgid "Address _Book"
 msgstr "アドレス帳(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../src/modules/addressbook/e-book-shell-backend.c:286
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:969
 msgid "Create a new address book"
 msgstr "新しいアドレス帳を作成します"
 
-#: ../modules/addressbook/e-book-shell-backend.c:314
-msgid "Certificates"
-msgstr "証明書"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:197
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:210
 msgid "Address Book Properties"
 msgstr "アドレス帳のプロパティ"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:475
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:534
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:832
 msgid "Save as vCard"
 msgstr "vCard 形式で保存"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:878
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:939
 msgid "Co_py All Contacts To..."
 msgstr "すべての連絡先のコピー(_P)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:941
 msgid "Copy the contacts of the selected address book to another"
 msgstr "選択したアドレス帳の連絡先を別へコピーします"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:885
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:946
 msgid "D_elete Address Book"
 msgstr "アドレス帳の削除(_E)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:948
 msgid "Delete the selected address book"
 msgstr "選択したアドレス帳を削除します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:892
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:953
+#, fuzzy
+#| msgid "_Add to Address Book..."
+msgid "_Manage Address Book groups..."
+msgstr "アドレス帳に追加(_A)..."
+
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:955
+#: ../src/modules/calendar/e-task-shell-view-actions.c:719
+msgid "Manage task list groups order and visibility"
+msgstr ""
+
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:960
 msgid "Mo_ve All Contacts To..."
 msgstr "すべての連絡先の移動(_V)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:962
 msgid "Move the contacts of the selected address book to another"
 msgstr "選択したアドレス帳の連絡先を別へ移動します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:899
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:967
 msgid "_New Address Book"
 msgstr "新しいアドレス帳(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:906
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:974
 msgid "Address _Book Properties"
 msgstr "アドレス帳のプロパティ(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:976
 msgid "Show properties of the selected address book"
 msgstr "選択したアドレス帳のプロパティを表示します"
 
-#: ../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
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:981
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:612
+#: ../src/modules/calendar/e-task-shell-view-actions.c:738
 msgid "Re_fresh"
 msgstr "更新(_F)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:983
 msgid "Refresh the selected address book"
 msgstr "選択したアドレス帳を更新します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:988
 msgid "Address Book _Map"
 msgstr "アドレス帳地図(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:922
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:990
 msgid "Show map with all contacts from selected address book"
 msgstr "選択したアドレス帳の全連絡先の地図を表示します"
 
-#: ../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
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:995
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:619
+#: ../src/modules/calendar/e-task-shell-view-actions.c:745
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1749
 msgid "_Rename..."
 msgstr "名前の変更(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:929
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:997
 msgid "Rename the selected address book"
 msgstr "選択したアドレス帳の名前を変更します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:936
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1004
 msgid "Stop loading"
 msgstr "読み込みを停止します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1009
 msgid "_Copy Contact To..."
 msgstr "連絡先のコピー(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:943
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1011
 msgid "Copy selected contacts to another address book"
 msgstr "選択したアドレス帳の連絡先を別のアドレス帳コピーします"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1016
 msgid "_Delete Contact"
 msgstr "連絡先の削除(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:955
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1023
 msgid "_Find in Contact..."
 msgstr "連絡先の検索(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1025
 msgid "Search for text in the displayed contact"
 msgstr "表示されている連絡先中の文字列を検索します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:962
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1030
 msgid "_Forward Contact..."
 msgstr "連絡先の転送(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:964
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1032
 msgid "Send selected contacts to another person"
 msgstr "選択した連絡先を別の人に送信します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:969
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1037
 msgid "_Move Contact To..."
 msgstr "連絡先の移動(_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:971
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1039
 msgid "Move selected contacts to another address book"
 msgstr "選択した連絡先を別のアドレス帳へ移動します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1044
 msgid "_New Contact..."
 msgstr "新しい連絡先(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:983
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1051
 msgid "New Contact _List..."
 msgstr "新しい連絡先の一覧(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1058
 msgid "_Open Contact"
 msgstr "連絡先を開く(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:992
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1060
 msgid "View the current contact"
 msgstr "この連絡先を表示します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1065
 msgid "_Send Message to Contact..."
 msgstr "連絡先へメールの送信(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:999
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1067
 msgid "Send a message to the selected contacts"
 msgstr "選択した連絡先へメールを送信します"
 
-#: ../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
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1074
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1460
+#: ../src/modules/calendar/e-task-shell-view-actions.c:810
 msgid "_Actions"
 msgstr "アクション(_A)"
 
-#: ../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
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1081
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:663
+#: ../src/modules/calendar/e-task-shell-view-actions.c:817
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1921
 msgid "_Preview"
 msgstr "プレビュー(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1034
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1094
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1489
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:680
+#: ../src/modules/calendar/e-task-shell-view-actions.c:834
+#, fuzzy
+#| msgid "_Manager:"
+msgid "_Manage groups..."
+msgstr "マネージャー(_M):"
+
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1106
 msgid "Address Book Map"
 msgstr "アドレス帳の地図"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1138
 msgid "Contact _Preview"
 msgstr "連絡先のプレビュー(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1068
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1140
 msgid "Show contact preview window"
 msgstr "連絡先プレビューウィンドウの表示/非表示を切り替えます"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1074
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1146
 msgid "Show _Maps"
 msgstr "地図を表示(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1076
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1148
 msgid "Show maps in contact preview window"
 msgstr "連絡先プレビューウィンドウに地図を表示する"
 
-#: ../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
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1167
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:741
+#: ../src/modules/calendar/e-task-shell-view-actions.c:907
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2067
 msgid "_Classic View"
 msgstr "クラッシックな表示(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1169
 msgid "Show contact preview below the contact list"
 msgstr "連絡先の一覧の下に連絡先のプレビューを表示します"
 
-#: ../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
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1174
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:748
+#: ../src/modules/calendar/e-task-shell-view-actions.c:914
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2074
 msgid "_Vertical View"
 msgstr "縦型の表示(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1104
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1176
 msgid "Show contact preview alongside the contact list"
 msgstr "連絡先の一覧の横に連絡先のプレビューを表示します"
 
-#: ../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
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1191
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1645
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:765
+#: ../src/modules/calendar/e-task-shell-view-actions.c:966
 msgid "Unmatched"
 msgstr "該当しないもの"
 
-#: ../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
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1201
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1655
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:775
+#: ../src/modules/calendar/e-task-shell-view-actions.c:976
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2158
+#: ../src/shell/e-shell-content.c:655
 msgid "Advanced Search"
 msgstr "拡張検索"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1162
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1234
 msgid "Print all shown contacts"
 msgstr "表示されている連絡先すべてを印刷します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1169
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1241
 msgid "Preview the contacts to be printed"
 msgstr "印刷する連絡先のプレビューを表示します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1176
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1248
 msgid "Print selected contacts"
 msgstr "選択した連絡先を印刷します"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1191
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1263
 msgid "S_ave Address Book as vCard"
 msgstr "アドレス帳を vCard 形式で保存(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1193
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1265
 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:1199
-#: ../modules/addressbook/e-book-shell-view-actions.c:1209
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1271
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1281
 msgid "_Save as vCard..."
 msgstr "vCard 形式で保存(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1201
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1273
 msgid "Save selected contacts as a vCard"
 msgstr "選択した連絡先を vCard 形式で保存します"
 
-#: ../modules/addressbook/e-book-shell-view.c:311
+#: ../src/modules/addressbook/e-book-shell-view.c:311
 msgid "_Forward Contacts"
 msgstr "複数の連絡先の転送(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:313
+#: ../src/modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contact"
 msgstr "連絡先の転送(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:344
+#: ../src/modules/addressbook/e-book-shell-view.c:344
 msgid "_Send Message to Contacts"
 msgstr "複数の連絡先へメッセージを送信(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../src/modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to List"
 msgstr "一覧へメッセージの送信(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../src/modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to Contact"
 msgstr "連絡先へメッセージの送信(_S)"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:164
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:164
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -15106,443 +21245,517 @@ msgstr ""
 "\n"
 "個人の設定やメールフィルターなども一緒にリストアします。"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:179
+#: ../src/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:190
+#: ../src/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:310
-#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../src/modules/backup-restore/e-mail-config-restore-ready-page.c:57
 msgid "Restore from Backup"
 msgstr "バックアップからのリストア"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:216
+#: ../src/modules/backup-restore/evolution-backup-restore.c:233
 msgid "Select name of the Evolution backup file"
 msgstr "Evolution のバックアップファイルの名前の選択"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:249
+#: ../src/modules/backup-restore/evolution-backup-restore.c:266
 msgid "_Restart Evolution after backup"
 msgstr "バックアップの後で Evolution を再起動(_R)"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:276
+#: ../src/modules/backup-restore/evolution-backup-restore.c:301
+msgid "Re_start Evolution after restore"
+msgstr "リストアした後に Evolution を再起動(_S)"
+
+#: ../src/modules/backup-restore/evolution-backup-restore.c:343
 msgid "Select name of the Evolution backup file to restore"
 msgstr "リストアする Evolution バックアップファイルの名前の選択"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:289
-msgid "_Restart Evolution after restore"
-msgstr "リストアした後に Evolution を再起動(_R)"
+#: ../src/modules/backup-restore/evolution-backup-restore.c:352
+#, c-format
+msgid "Checking content of backup file “%s”, please wait..."
+msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:307
+#: ../src/modules/backup-restore/evolution-backup-restore.c:373
 msgid "_Back up Evolution Data..."
 msgstr "Evolution データのバックアップ(_B)..."
 
-#: ../modules/backup-restore/evolution-backup-restore.c:309
+#: ../src/modules/backup-restore/evolution-backup-restore.c:375
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Evolution のデータと設定をアーカイブファイルにバックアップします"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:314
+#: ../src/modules/backup-restore/evolution-backup-restore.c:380
 msgid "R_estore Evolution Data..."
 msgstr "Evolution データのリストア(_E)..."
 
-#: ../modules/backup-restore/evolution-backup-restore.c:316
+#: ../src/modules/backup-restore/evolution-backup-restore.c:382
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Evolution のデータと設定をアーカイブファイルからリストアします"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../src/modules/backup-restore/evolution-backup-tool.c:73
 msgid "Back up Evolution directory"
 msgstr "Evolution フォルダーのバックアップ"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:85
+#: ../src/modules/backup-restore/evolution-backup-tool.c:75
 msgid "Restore Evolution directory"
 msgstr "Evolution フォルダーのリストア"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../src/modules/backup-restore/evolution-backup-tool.c:77
 msgid "Check Evolution Back up"
 msgstr "Evolution のバックアップの確認"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:89
+#: ../src/modules/backup-restore/evolution-backup-tool.c:79
 msgid "Restart Evolution"
 msgstr "Evolution の再起動"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:91
+#: ../src/modules/backup-restore/evolution-backup-tool.c:81
 msgid "With Graphical User Interface"
 msgstr "GUI を表示する"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:321
-#: ../modules/backup-restore/evolution-backup-tool.c:515
+#: ../src/modules/backup-restore/evolution-backup-tool.c:294
+#: ../src/modules/backup-restore/evolution-backup-tool.c:498
 msgid "Shutting down Evolution"
 msgstr "Evolution のシャットダウン中"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../src/modules/backup-restore/evolution-backup-tool.c:303
 msgid "Backing Evolution accounts and settings"
 msgstr "Evolution アカウントと設定のバックアップ中"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:347
+#: ../src/modules/backup-restore/evolution-backup-tool.c:320
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr "Evolution のデータ (メール、連絡先、カレンダー、タスク、メモ) をバックアップしています"
+msgstr ""
+"Evolution のデータ (メール、連絡先、カレンダー、タスク、メモ) をバックアップ"
+"しています"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:363
+#: ../src/modules/backup-restore/evolution-backup-tool.c:336
 msgid "Back up complete"
 msgstr "バックアップが完了しました"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:370
-#: ../modules/backup-restore/evolution-backup-tool.c:702
+#: ../src/modules/backup-restore/evolution-backup-tool.c:343
+#: ../src/modules/backup-restore/evolution-backup-tool.c:705
 msgid "Restarting Evolution"
 msgstr "Evolution のリストア中"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:521
+#: ../src/modules/backup-restore/evolution-backup-tool.c:504
 msgid "Back up current Evolution data"
 msgstr "現在の Evolution データをバックアップする"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:528
+#: ../src/modules/backup-restore/evolution-backup-tool.c:511
 msgid "Extracting files from back up"
 msgstr "バックアップからファイルを展開しています"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:610
+#: ../src/modules/backup-restore/evolution-backup-tool.c:606
 msgid "Loading Evolution settings"
 msgstr "Evolution の設定を読み込んでいます"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:676
+#: ../src/modules/backup-restore/evolution-backup-tool.c:676
 msgid "Removing temporary back up files"
 msgstr "作業用のバックアップファイルを削除しています"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:687
+#: ../src/modules/backup-restore/evolution-backup-tool.c:690
 msgid "Reloading registry service"
 msgstr "レジストリサービスのリロード中"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:916
+#: ../src/modules/backup-restore/evolution-backup-tool.c:899
 msgid "Evolution Back Up"
 msgstr "Evolution のバックアップ"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:917
-#, c-format
-msgid "Backing up to the folder %s"
+#: ../src/modules/backup-restore/evolution-backup-tool.c:900
+#, fuzzy, c-format
+#| msgid "Backing up to the folder %s"
+msgid "Backing up to the file %s"
 msgstr "%s にバックアップしています"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:921
+#: ../src/modules/backup-restore/evolution-backup-tool.c:904
 msgid "Evolution Restore"
 msgstr "Evolution のリストア"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:922
-#, c-format
-msgid "Restoring from the folder %s"
+#: ../src/modules/backup-restore/evolution-backup-tool.c:905
+#, fuzzy, c-format
+#| msgid "Restoring from the folder %s"
+msgid "Restoring from the file %s"
 msgstr "%s からリストアしています"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:991
+#: ../src/modules/backup-restore/evolution-backup-tool.c:974
 msgid "Backing up Evolution Data"
 msgstr "Evolution データのバックアップ中"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:992
+#: ../src/modules/backup-restore/evolution-backup-tool.c:975
 msgid "Please wait while Evolution is backing up your data."
 msgstr "データのバックアップが完了するまで少々お待ちください。"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:994
+#: ../src/modules/backup-restore/evolution-backup-tool.c:977
 msgid "Restoring Evolution Data"
 msgstr "Evolution データのリストア中"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:995
+#: ../src/modules/backup-restore/evolution-backup-tool.c:978
 msgid "Please wait while Evolution is restoring your data."
 msgstr "データのリストアが完了するまで少々お待ちください。"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:1017
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1000
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "アカウントのデータ量に応じて時間がかかるかもしれません。"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Invalid Evolution backup file"
 msgstr "バックアップファイルが壊れています"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Please select a valid backup file to restore."
-msgstr "リストアする妥当なバックアップファイルを選択してください。"
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
+#, fuzzy
+#| msgid "Invalid Evolution backup file"
+msgid "File “{0}” is not a valid Evolution backup file."
+msgstr "バックアップファイルが壊れています"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid "Are you sure you want to close Evolution?"
 msgstr "本当に Evolution を閉じてもよろしいですか?"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
-msgid "To back up your data and settings, you must first close Evolution. Please make sure that you save any 
unsaved data before proceeding."
-msgstr "データや設定をバックアップするには、まず Evolution を閉じる必要があります。先に進むには、まず保存してないデータを保存したか確認してください。"
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid ""
+"To back up your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
+msgstr ""
+"データや設定をバックアップするには、まず Evolution を閉じる必要があります。先"
+"に進むには、まず保存してないデータを保存したか確認してください。"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Close and Back up Evolution"
-msgstr "Evolution を閉じてバックアップ"
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Close and _Back up Evolution"
+msgstr "Evolution を閉じてバックアップ(_B)"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid "Are you sure you want to restore Evolution from the selected backup file?"
-msgstr "選択したバックアップファイルから、本当に Evolution の構成をリストアしてもよろしいですか?"
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr ""
+"選択したバックアップファイルから、本当に Evolution の構成をリストアしてもよろ"
+"しいですか?"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "To restore your data and settings, you must first close Evolution. Please make sure that you save any 
unsaved data before proceeding. This will delete all your current Evolution data and settings and restore 
them from your backup."
-msgstr "データや設定をリストアするには、まず Evolution を閉じる必要があります。先に進むには、まず保存していないデータを保存したか確認してください。この操作で現在の Evolution 
のデータと設定はすべて削除され、バックアップからリストアされます。"
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:7
+msgid ""
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"all your current Evolution data and settings and restore them from your "
+"backup."
+msgstr ""
+"データや設定をリストアするには、まず Evolution を閉じる必要があります。先に進"
+"むには、まず保存していないデータを保存したか確認してください。この操作で現在"
+"の Evolution のデータと設定はすべて削除され、バックアップからリストアされま"
+"す。"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "Close and Restore Evolution"
-msgstr "Evolution を閉じてリストア"
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid "Close and _Restore Evolution"
+msgstr "Evolution を閉じてリストア(_R)"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid "Insufficient Permissions"
 msgstr "権限が適当ではありません"
 
-#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:10
+#: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:10
 msgid "The selected folder is not writable."
 msgstr "選択したフォルダーは書き込み可能ではありません。"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:144
+#: ../src/modules/bogofilter/evolution-bogofilter.c:158
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Bogofilter の起動に失敗しました (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:162
+#: ../src/modules/bogofilter/evolution-bogofilter.c:176
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "Bogofilter へのメッセージ内容の受け渡しに失敗しました: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:211
+#: ../src/modules/bogofilter/evolution-bogofilter.c:225
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Bogofilter がクラッシュしたか、メールメッセージの処理に失敗しました"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:307
+#: ../src/modules/bogofilter/evolution-bogofilter.c:370
 msgid "Bogofilter Options"
 msgstr "Bogofilter のオプション"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:316
+#: ../src/modules/bogofilter/evolution-bogofilter.c:379
 msgid "Convert message text to _Unicode"
 msgstr "メッセージを Unicode に変換する(_U)"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:473
+#: ../src/modules/bogofilter/evolution-bogofilter.c:537
+#: ../src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
+#: ../src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+#, fuzzy
+#| msgid "Junk filtering software:"
+msgid "Junk filter using Bogofilter"
+msgstr "ジャンクフィルターのソフトウェア:"
+
+#: ../src/modules/book-config-google/evolution-book-config-google.c:93
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:994
+#: ../src/modules/cal-config-google/e-cal-config-google.c:190
+#: ../src/modules/cal-config-google/e-cal-config-gtasks.c:115
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:434
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:469
+#, fuzzy
+#| msgid "The file cannot be read"
+msgid "User name cannot be empty"
+msgstr "そのアイテムは読めません"
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:443
 msgid "Standard LDAP Port"
 msgstr "標準のLDAPポート番号"
 
-#: ../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)"
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:449
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:632
+#, fuzzy
+#| msgid "LDAP over SSL (deprecated)"
+msgid "LDAP over SSL/TLS (deprecated)"
 msgstr "LDAP over SSL (非推奨)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:455
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft Global Catalog"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:464
-msgid "Microsoft Global Catalog over SSL"
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:461
+#, fuzzy
+#| msgid "Microsoft Global Catalog over SSL"
+msgid "Microsoft Global Catalog over SSL/TLS"
 msgstr "SSL 越しの Microsoft Global Catalog"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:569
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:568
 msgid "Connecting to LDAP"
 msgstr "LDAP へ接続中"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:586
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:585
 msgid "Server Information"
 msgstr "サーバーの情報"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:613
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:612
 msgid "Port:"
 msgstr "ポート番号:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:620
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:246
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:201
+msgid "Port number is not valid"
+msgstr ""
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:635
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (推奨)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:629
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:637
 msgid "Encryption:"
 msgstr "暗号化:"
 
-#: ../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
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:323
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:266
 msgid "Authentication"
 msgstr "認証"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
 msgid "Using email address"
 msgstr "メールアドレスを使う"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:690
 msgid "Using distinguished name (DN)"
 msgstr "識別名 (DN) を使用"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:692
 msgid "Method:"
 msgstr "メソッド:"
 
-#: ../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 サーバーへは匿名アクセスになります"
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:697
+#, fuzzy
+#| 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."
+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:704
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:712
 msgid "Using LDAP"
 msgstr "LDAP を使用"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:721
-#: ../modules/mail/e-mail-shell-view.c:115
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:729
+#: ../src/modules/mail/e-mail-shell-view.c:118
 msgid "Searching"
 msgstr "検索"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:751
 msgid "Search Base:"
 msgstr "検索ベース:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:747
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
 msgid "Find Possible Search Bases"
 msgstr "利用可能な検索ベースを探す"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:769
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:777
 msgid "One Level"
 msgstr "指定ベースのみ"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:771
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
 msgid "Subtree"
 msgstr "サブツリー"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:781
 msgid "Search Scope:"
 msgstr "検索範囲:"
 
-#: ../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番目のエントリだけが含まれるようになります。"
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:786
+#, fuzzy
+#| 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."
+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:787
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:795
 msgid "Search Filter:"
 msgstr "検索フィルター:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:799
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:807
 msgid "Downloading"
 msgstr "ダウンロード"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:820
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:828
 msgid "Limit:"
 msgstr "上限:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:839
 msgid "contacts"
 msgstr "連絡先"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:844
 msgid "Browse until limit is reached"
 msgstr "ダウンロードの上限に到達するまでアドレス帳を閲覧する"
 
-#: ../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
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:979
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:415
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:451
+msgid "Server address cannot be empty"
+msgstr ""
+
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:93
+#, fuzzy
+#| msgid "New Address Book"
+msgid "Choose an Address Book"
+msgstr "新しいアドレス帳"
+
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:241
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:297
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:145
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:250
+#, fuzzy
+#| msgid "Address Book"
+msgid "Find Address Books"
+msgstr "アドレス帳"
+
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:260
 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:441
-#, c-format
-msgid "HTTP Error: %s"
-msgstr "HTTP のエラー: %s"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
-msgid "Could not parse response"
-msgstr "応答を解析できませんでした: "
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:478
-msgid "Empty response"
-msgstr "応答を空にする"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:486
-msgid "Unexpected reply from server"
-msgstr "サーバーから予期しない応答が返りました"
-
-#: ../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:1342
-msgid "Path"
-msgstr "パス"
+#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:309
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:413
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:185
+msgid "URL is not a valid http:// nor https:// URL"
+msgstr ""
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:263
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:199
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:110
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:225
 msgid "Choose a Calendar"
 msgstr "カレンダーを選択してください"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:266
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:114
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:229
 msgid "Choose a Memo List"
 msgstr "メモ一覧を選択してください"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:269
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:118
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:233
 msgid "Choose a Task List"
 msgstr "タスク一覧を選択してください"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:218
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:311
 msgid "Find Calendars"
 msgstr "カレンダーを検索"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:221
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:314
 msgid "Find Memo Lists"
 msgstr "メモ一覧を検索"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:224
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:317
 msgid "Find Task Lists"
 msgstr "タスク一覧を検索"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:242
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:335
 msgid "Email:"
 msgstr "メール:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:247
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:340
 msgid "Server handles meeting invitations"
 msgstr "サーバーが会議の招待を処理"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:70
+#: ../src/modules/cal-config-contacts/evolution-cal-config-contacts.c:71
 msgid "Choose which address books to use."
 msgstr "どのアドレス帳を使うのか選択する。"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:200
+#: ../src/modules/cal-config-contacts/evolution-cal-config-contacts.c:204
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "誕生日と記念日のカレンダーで使用"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:126
+#: ../src/modules/cal-config-google/e-cal-config-google.c:101
+msgid "Enable Calendars to synchronize"
+msgstr ""
+
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:144
 msgid "Default User Calendar"
 msgstr "デフォルトのユーザーカレンダー"
 
-#: ../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:531
-msgid "User declined to provide a password"
-msgstr "ユーザーがパスワードの提供を拒否しました"
-
-#: ../modules/cal-config-local/evolution-cal-config-local.c:159
+#: ../src/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:184
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:184
 msgid "iCalendar File"
 msgstr "iCalendar ファイル"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:196
+#: ../src/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:199
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:199
 msgid "File:"
 msgstr "ファイル:"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:214
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:214
 msgid "Allow Evolution to update the file"
 msgstr "Evolution がファイルを更新するのを許可"
 
@@ -15552,7 +21765,7 @@ msgstr "Evolution がファイルを更新するのを許可"
 #. *
 #. * 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
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:187
 #, fuzzy
 #| msgid "Default"
 msgctxt "locale-metric"
@@ -15561,704 +21774,916 @@ 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
+#: ../src/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
+#: ../src/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
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:268
 msgid "Kelvin (K)"
 msgstr ""
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
+#: ../src/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
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:322
+msgid "Location cannot be empty"
+msgstr ""
+
+#: ../src/modules/calendar/e-cal-attachment-handler.c:285
+#: ../src/smime/gui/smime-ui.ui.h:7
 msgid "I_mport"
 msgstr "インポート(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:405
+#: ../src/modules/calendar/e-cal-attachment-handler.c:335
+#, fuzzy
+#| msgid "Importing Pine data"
+msgid "Importing an event"
+msgstr "Pine データのインポート"
+
+#: ../src/modules/calendar/e-cal-attachment-handler.c:339
+#, fuzzy
+#| msgid "Importing mailbox"
+msgid "Importing a memo"
+msgstr "mailbox のインポート"
+
+#: ../src/modules/calendar/e-cal-attachment-handler.c:343
+#, fuzzy
+#| msgid "Importing Elm data"
+msgid "Importing a task"
+msgstr "Elm データのインポート"
+
+#: ../src/modules/calendar/e-cal-attachment-handler.c:401
 msgid "Select a Calendar"
 msgstr "カレンダーの選択"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:432
+#: ../src/modules/calendar/e-cal-attachment-handler.c:408
+#, fuzzy
+#| msgid "D_elete Memo List"
+msgid "Select a Memo List"
+msgstr "メモの一覧の削除(_E)"
+
+#: ../src/modules/calendar/e-cal-attachment-handler.c:415
 msgid "Select a Task List"
 msgstr "タスクの一覧の選択"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:442
+#: ../src/modules/calendar/e-cal-attachment-handler.c:422
 msgid "I_mport to Calendar"
 msgstr "カレンダーへのインポート(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:449
-msgid "I_mport to Tasks"
+#: ../src/modules/calendar/e-cal-attachment-handler.c:429
+#, fuzzy
+#| msgid "I_mport to Tasks"
+msgid "I_mport to Memo List"
+msgstr "タスクへのインポート(_M)"
+
+#: ../src/modules/calendar/e-cal-attachment-handler.c:436
+#, fuzzy
+#| msgid "I_mport to Tasks"
+msgid "I_mport to Task List"
 msgstr "タスクへのインポート(_M)"
 
-#: ../modules/calendar/e-calendar-preferences.c:516
-msgid "Selected Calendars for Alarms"
-msgstr "アラーム用に選択したカレンダー"
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:185
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:178
+msgid "New Memo List"
+msgstr "新しいメモの一覧"
+
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:563
+#, fuzzy, c-format
+#| msgid "Copying an event into the calendar '{0}'"
+msgid "Copying an event into the calendar “%s”"
+msgstr "カレンダー '{0}' にイベントをコピーしています"
+
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:564
+#, fuzzy, c-format
+#| msgid "Moving an event into the calendar '{0}'"
+msgid "Moving an event into the calendar “%s”"
+msgstr "カレンダー '{0}' にイベントを移動しています"
+
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:569
+#, fuzzy, c-format
+#| msgid "Copying a memo into the memo list '{0}'"
+msgid "Copying a memo into the memo list “%s”"
+msgstr "メモ一覧 '{0}' にメモをコピーしています"
+
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:570
+#, fuzzy, c-format
+#| msgid "Moving a memo into the memo list '{0}'"
+msgid "Moving a memo into the memo list “%s”"
+msgstr "メモ一覧 '{0}' にメモを移動しています"
 
-#: ../modules/calendar/e-calendar-preferences.c:924
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:575
+#, fuzzy, c-format
+#| msgid "Copying a task into the task list '{0}'"
+msgid "Copying a task into the task list “%s”"
+msgstr "タスク一覧 '{0}' にタスクをコピーしています"
+
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:576
+#, fuzzy, c-format
+#| msgid "Moving a task into the task list '{0}'"
+msgid "Moving a task into the task list “%s”"
+msgstr "タスク一覧 '{0}' にタスクを移動しています"
+
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:693
+msgid "Calendar Selector"
+msgstr "カレンダーの選択"
+
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:699
+msgid "Memo List Selector"
+msgstr "メモの一覧の選択"
+
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:704
+msgid "Task List Selector"
+msgstr "タスクの一覧の選択"
+
+#: ../src/modules/calendar/e-calendar-preferences.c:525
+#, fuzzy
+#| msgid "Select the calendars for reminder notification"
+msgid "Selected Calendars for Notifications of Reminders"
+msgstr "リマインダーで通知するカレンダーを選択してください"
+
+#: ../src/modules/calendar/e-calendar-preferences.c:532
+msgid "Selected Memo Lists for Notifications of Reminders"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.c:539
+msgid "Selected Task Lists for Notifications of Reminders"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.c:635
+msgid "Meeting Invitations"
+msgstr "会議への招待"
+
+#: ../src/modules/calendar/e-calendar-preferences.c:661
+msgid "_Delete message after acting"
+msgstr "会議開催後にメッセージを削除する(_D)"
+
+#: ../src/modules/calendar/e-calendar-preferences.c:675
+#: ../src/modules/calendar/e-calendar-preferences.c:706
+msgid "Conflict Search"
+msgstr "重複するイベントの検索"
+
+#. Source selector
+#: ../src/modules/calendar/e-calendar-preferences.c:690
+msgid "Select the calendars to search for meeting conflicts"
+msgstr "重複する会議を検索するカレンダーを選択してください:"
+
+#: ../src/modules/calendar/e-calendar-preferences.c:1102
 msgid "Ti_me and date:"
 msgstr "時刻と日付(_M):"
 
-#: ../modules/calendar/e-calendar-preferences.c:925
+#: ../src/modules/calendar/e-calendar-preferences.c:1103
 msgid "_Date only:"
 msgstr "日付のみ(_D):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:1
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Minutes"
 msgstr "分"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Hours"
 msgstr "時間"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Days"
 msgstr "日"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:4
 msgid "60 minutes"
 msgstr "60分"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:5
 msgid "30 minutes"
 msgstr "30分"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:6
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:6
 msgid "15 minutes"
 msgstr "15分"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:7
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:7
 msgid "10 minutes"
 msgstr "10分"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:8
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:8
 msgid "05 minutes"
 msgstr "05分"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Se_cond zone:"
 msgstr "別のタイムゾーン(_C):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:12
 msgid "(Shown in a Day View)"
 msgstr "(日間ビューに表示されます)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Time _zone:"
+msgstr "タイムゾーン(_Z):"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Use s_ystem time zone"
 msgstr "システムのタイムゾーンを使用する(_Y)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:15
 msgid "Time format:"
 msgstr "時刻の書式:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:16
 msgid "_12 hour (AM/PM)"
 msgstr "12 時間制 (午前/午後)(_1)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:17
 msgid "_24 hour"
 msgstr "24 時間制(_2)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1715
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:18
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1607
 msgid "Work Week"
 msgstr "平日"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Wee_k starts on:"
 msgstr "週の開始(_K):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Work days:"
 msgstr "平日:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:22
 msgid "_Day begins:"
 msgstr "一日の開始(_D):"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:24
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:24
 msgid "_Mon"
 msgstr "月(_M)"
 
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:25
+msgid "Monday"
+msgstr "月曜日"
+
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:27
 msgid "_Tue"
 msgstr "火(_T)"
 
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Tuesday"
+msgstr "火曜日"
+
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:30
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Wed"
 msgstr "水(_W)"
 
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Wednesday"
+msgstr "水曜日"
+
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
 msgstr "木(_H)"
 
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Thursday"
+msgstr "木曜日"
+
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Fri"
 msgstr "金(_F)"
 
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:37
+msgid "Friday"
+msgstr "金曜日"
+
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:39
 msgid "_Sat"
 msgstr "土(_S)"
 
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Saturday"
+msgstr "土曜日"
+
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:42
 msgid "S_un"
 msgstr "日(_U)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:43
+msgid "Sunday"
+msgstr "日曜日"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:44
 msgid "Day _ends:"
 msgstr "一日の終了(_E):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-msgid "Alerts"
-msgstr "警告"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:47
+msgid "Create events, memos and tasks as _Private by default"
+msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "_Ask for confirmation when deleting items"
-msgstr "アイテムを削除する時に確認する(_A)"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:49
+msgid "View Options"
+msgstr "表示のオプション"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:50
 msgid "_Time divisions:"
 msgstr "時間を分割する単位(_T):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:49
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:51
 msgid "_Show appointment end times in week and month view"
 msgstr "週間と月間ビューの中に予定の期日を表示する(_S)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:52
+#, fuzzy
+#| msgid "Show appointment end times in week and month views"
+msgid "Show appointment _icons in the month view"
+msgstr "週間と月間ビューの中に予定の期日を表示するかどうか"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:53
 msgid "_Compress weekends in month view"
 msgstr "月間ビューで週末を省略して表示する(_C)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Show week _numbers"
 msgstr "週番号を表示する(_N)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:55
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr "繰り返しのイベントをカレンダーの左下にイタリック体で表示(_E)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Sc_roll Month View by a week"
 msgstr "月間ビューを週単位でスクロールする(_R)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:57
+msgid "Alerts"
+msgstr "警告"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
+msgid "_Ask for confirmation when deleting items"
+msgstr "アイテムを削除する時に確認する(_A)"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Display"
 msgstr "表示"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Task List"
 msgstr "タスクの一覧"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
 msgid "Highlight t_asks due today"
 msgstr "今日が期限のタスクの色(_A)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Highlight _overdue tasks"
 msgstr "期限を過ぎたタスクの色(_O)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Hide completed tasks after"
 msgstr "完了したタスクを隠す期間(_H)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
 msgid "Display reminders in _notification area only"
 msgstr "リマインダーを通知領域のみに表示する(_N)"
 
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
-msgid "Sh_ow a reminder"
-msgstr "リマインダーを予定の(_O)"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#, fuzzy
+#| msgid "Display reminders in _notification area only"
+msgid "Keep reminder notification _window always on top"
+msgstr "リマインダーを通知領域のみに表示する(_N)"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
+#, fuzzy
+#| msgid "Delete completed tasks"
+msgid "Display reminders for completed _tasks"
+msgstr "完了したタスクを削除します"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
+#, fuzzy
+#| msgid "Delete completed tasks"
+msgid "Display reminders for _past events"
+msgstr "完了したタスクを削除します"
+
+#. This is the first half of a user preference. "Set default reminder [time-period] before every new 
appointment"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+#, fuzzy
+#| msgid "Default reminder value"
+msgid "Set _default reminder"
+msgstr "リマインダーのデフォルトの値"
 
-#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
-msgid "before every appointment"
+#. This is the last half of a user preference. "Set default reminder [time-period] before every new 
appointment"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
+#, fuzzy
+#| msgid "before every appointment"
+msgid "before every new appointment"
 msgstr "前に表示する"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
 msgid "Show a _reminder"
 msgstr "リマインダーを記念日や誕生日の(_R)"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:78
 msgid "before every anniversary/birthday"
 msgstr "前に表示する"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
-msgid "Select the calendars for reminder notification"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
+msgid "Default _snooze time (in minutes)"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:80
+#, fuzzy
+#| msgid "Select the calendars for reminder notification"
+msgid "Select the sources for reminder notification:"
 msgstr "リマインダーで通知するカレンダーを選択してください"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
+#, fuzzy
+#| msgid "Calendar"
+msgid "Calendars"
+msgstr "カレンダー"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
+#, fuzzy
+#| msgctxt "New"
+#| msgid "Memo Li_st"
+msgid "Memo Lists"
+msgstr "メモの一覧(_S)"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
+#, fuzzy
+#| msgid "Task List"
+msgid "Task Lists"
+msgstr "タスクの一覧"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
 msgid "Default Free/Busy Server"
 msgstr "デフォルトのスケジュールサーバー"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
-msgid "Template:"
-msgstr "テンプレート:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr "%u と %d を指定すると、メールアドレスのユーザー名とドメイン名で置き換えられます。"
+msgstr ""
+"%u と %d を指定すると、メールアドレスのユーザー名とドメイン名で置き換えられま"
+"す。"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
 msgid "Publishing Information"
 msgstr "公開する情報"
 
-#: ../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:321
+#: ../src/modules/calendar/e-cal-shell-backend.c:112
 msgctxt "New"
 msgid "_Appointment"
 msgstr "予定(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:323
-#: ../modules/calendar/e-cal-shell-view-actions.c:1520
+#: ../src/modules/calendar/e-cal-shell-backend.c:114
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Create a new appointment"
 msgstr "新しい予定を作成します"
 
-#: ../modules/calendar/e-cal-shell-backend.c:328
+#: ../src/modules/calendar/e-cal-shell-backend.c:119
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "終日の予定(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:330
+#: ../src/modules/calendar/e-cal-shell-backend.c:121
 msgid "Create a new all-day appointment"
 msgstr "新しい終日の予定を作成します"
 
-#: ../modules/calendar/e-cal-shell-backend.c:335
+#: ../src/modules/calendar/e-cal-shell-backend.c:126
 msgctxt "New"
 msgid "M_eeting"
 msgstr "会議(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:337
+#: ../src/modules/calendar/e-cal-shell-backend.c:128
 msgid "Create a new meeting request"
 msgstr "新しい会議を召集します"
 
-#: ../modules/calendar/e-cal-shell-backend.c:345
+#: ../src/modules/calendar/e-cal-shell-backend.c:136
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "カレンダー(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:347
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../src/modules/calendar/e-cal-shell-backend.c:138
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1271
 msgid "Create a new calendar"
 msgstr "新しいカレンダーを作成します"
 
-#: ../modules/calendar/e-cal-shell-backend.c:702
+#: ../src/modules/calendar/e-cal-shell-backend.c:255
 msgid "Calendar and Tasks"
 msgstr "カレンダーとタスク"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:118
-#, c-format
-msgid "Opening calendar '%s'"
-msgstr "カレンダー %s を開いています"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:589
-msgid "Calendar Selector"
-msgstr "カレンダーの選択"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:215
-#: ../modules/calendar/e-cal-shell-view-actions.c:244
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
 msgid "Print"
 msgstr "印刷"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:290
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:283
 msgid "Calendar Properties"
 msgstr "カレンダーのプロパティ"
 
-#: ../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 "この操作は選択したイベントより古いイベントをすべて完全に削除します。続行すると、これらのイベントを復旧できなくなります。"
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:312
+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:338
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:329
 msgid "Purge events older than"
 msgstr "次より古いイベントを抹消する: "
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:584
-msgid "Copying Items"
-msgstr "アイテムのコピー中"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:877
-msgid "Moving Items"
-msgstr "アイテムの移動中"
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:924
+#, fuzzy
+#| msgid "Make this Occurrence _Movable"
+msgid "Making an occurrence movable"
+msgstr "このイベントを移動可能にする(_M)"
 
 #. 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:1210
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1084
 msgid "event"
 msgstr "イベント"
 
-#: ../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
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1086
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:496
+#: ../src/modules/calendar/e-task-shell-view-actions.c:615
 msgid "Save as iCalendar"
 msgstr "iCalendar 形式で保存"
 
-#: ../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
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1220
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:577
+#: ../src/modules/calendar/e-task-shell-view-actions.c:703
 msgid "_Copy..."
 msgstr "コピー(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1227
 msgid "D_elete Calendar"
 msgstr "カレンダーの削除(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1229
 msgid "Delete the selected calendar"
 msgstr "選択したカレンダーを削除"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1236
 msgid "Go Back"
 msgstr "前へ戻る"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1373
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1243
 msgid "Go Forward"
 msgstr "次へ進む"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1250
 msgid "Select today"
 msgstr "今日に移動します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1255
 msgid "Select _Date"
 msgstr "日付の選択(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "Select a specific date"
 msgstr "指定した日に移動します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1262
+#, fuzzy
+#| msgid "_Save as iCalendar..."
+msgid "_Manage Calendar groups..."
+msgstr "iCalendar 形式で保存(_S)..."
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1264
+msgid "Manage Calendar groups order and visibility"
+msgstr ""
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1269
 msgid "_New Calendar"
 msgstr "新しいカレンダー(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
-#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1283
+#: ../src/modules/calendar/e-task-shell-view-actions.c:801
 msgid "Purg_e"
 msgstr "抹消(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1285
 msgid "Purge old appointments and meetings"
 msgstr "古い予定と会議を完全に削除します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1292
 msgid "Refresh the selected calendar"
 msgstr "選択したカレンダーを更新"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1299
 msgid "Rename the selected calendar"
 msgstr "選択したカレンダーの名前を変更します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1427
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1304
 msgid "Find _Next"
 msgstr "次を検索(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1429
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1306
 msgid "Find next occurrence of the current search string"
 msgstr "現在検索中の文字列の次の出現位置を検索"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
 msgid "Find _Previous"
 msgstr "前を検索(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1313
 msgid "Find previous occurrence of the current search string"
 msgstr "現在検索中の文字列の前の出現位置を検索"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1318
 msgid "Stop _Running Search"
 msgstr "実行中の検索を中止(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1320
 msgid "Stop currently running search"
 msgstr "現在実行中の検索を中止する"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1325
+#, fuzzy
+#| msgid "Show _Only This Calendar"
+msgid "Sho_w All Calendars"
+msgstr "このカレンダーだけ表示する(_O)"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1332
 msgid "Show _Only This Calendar"
 msgstr "このカレンダーだけ表示する(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1339
 msgid "Cop_y to Calendar..."
 msgstr "カレンダーへコピー(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1346
 msgid "_Delegate Meeting..."
 msgstr "会議の委任(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1469
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
 msgid "_Delete Appointment"
 msgstr "予定を削除(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "Delete selected appointments"
 msgstr "選択した予定を削除します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1476
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Delete This _Occurrence"
 msgstr "このイベントの削除(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1478
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete this occurrence"
 msgstr "このイベントを削除します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1483
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1367
 msgid "Delete All Occ_urrences"
 msgstr "すべてのイベントの削除(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1485
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Delete all occurrences"
 msgstr "すべてのイベントを削除します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1490
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1374
 msgid "New All Day _Event..."
 msgstr "新しい終日のイベント(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1492
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "Create a new all day event"
 msgstr "新しい終日の予定を作成します"
 
-#: ../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
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:241
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:315
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:570
+#: ../src/modules/calendar/e-task-shell-view-actions.c:696
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar 形式で転送(_F)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1388
 msgid "New _Meeting..."
 msgstr "新しい会議(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "Create a new meeting"
 msgstr "新しい会議を作成します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1395
 msgid "Mo_ve to Calendar..."
 msgstr "カレンダーへ移動(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1402
 msgid "New _Appointment..."
 msgstr "新しい予定(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Make this Occurrence _Movable"
 msgstr "このイベントを移動可能にする(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1532
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1416
 msgid "_Open Appointment"
 msgstr "予定を開く(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1534
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "View the current appointment"
 msgstr "現在の予定の表示"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "_Reply"
 msgstr "返信(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1553
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "_Schedule Meeting..."
 msgstr "会議のスケジュール(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1555
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "Converts an appointment to a meeting"
 msgstr "約束を会議に変更します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1560
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1444
 msgid "Conv_ert to Appointment..."
 msgstr "約束へ変更(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1562
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Converts a meeting to an appointment"
 msgstr "会議を約束へ変更します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1567
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "Quit"
 msgstr "終了"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Day"
 msgstr "日"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1581
 msgid "Show one day"
 msgstr "1日を表示します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "List"
 msgstr "一覧"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1588
 msgid "Show as list"
 msgstr "一覧形式で表示します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Month"
 msgstr "月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1595
 msgid "Show one month"
 msgstr "1ヶ月を表示します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1708
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Week"
 msgstr "週"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1602
 msgid "Show one week"
 msgstr "1週間を表示します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Show one work week"
 msgstr "平日1週間を表示します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1725
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1617
 msgid "Active Appointments"
 msgstr "実行中の予定"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1739
-msgid "Next 7 Days' Appointments"
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1631
+#, fuzzy
+#| msgid "Next 7 Days' Appointments"
+msgid "Next 7 Days’ Appointments"
 msgstr "次の7日間の予定"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1746
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1638
 msgid "Occurs Less Than 5 Times"
 msgstr "5回未満"
 
-#: ../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
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1669
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:789
+#: ../src/modules/calendar/e-task-shell-view-actions.c:990
 msgid "Description contains"
 msgstr "説明が次のものを含む"
 
-#: ../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
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1676
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:796
+#: ../src/modules/calendar/e-task-shell-view-actions.c:997
 msgid "Summary contains"
 msgstr "サマリが次のものを含む"
 
-#: ../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..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1686
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1700
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:272
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:360
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:806
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:820
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1007
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1021
 msgid "Print..."
-msgstr "印刷(_P)..."
+msgstr "印刷..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1796
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1688
 msgid "Print this calendar"
 msgstr "このカレンダーを印刷します"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1803
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1695
 msgid "Preview the calendar to be printed"
 msgstr "印刷されるカレンダーのプレビューを表示します"
 
-#: ../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
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:282
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:370
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:837
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1038
 msgid "_Save as iCalendar..."
 msgstr "iCalendar 形式で保存(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1902
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1794
 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:228
-#: ../modules/calendar/e-memo-shell-view-actions.c:524
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:205
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:494
 msgid "memo"
 msgstr "メモ"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:248
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:640
 msgid "New _Memo"
 msgstr "新しいメモ(_M)"
 
-#: ../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
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../src/modules/calendar/e-memo-shell-backend.c:79
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Create a new memo"
 msgstr "新しいメモを作成します"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:255
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:647
 msgid "_Open Memo"
 msgstr "メモを開く(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:280
-#: ../modules/calendar/e-memo-shell-view-actions.c:665
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:649
 msgid "View the selected memo"
 msgstr "選択したメモを表示します"
 
-#: ../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
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:262
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:350
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:654
+#: ../src/modules/calendar/e-task-shell-view-actions.c:794
 msgid "Open _Web Page"
 msgstr "ウェブページを開く(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:830
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:822
 msgid "Print the selected memo"
 msgstr "選択したメモを印刷します"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1561
+#: ../src/modules/calendar/e-cal-shell-view-private.c:811
 msgid "Searching next matching event"
 msgstr "一致する次のイベントを検索"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1562
+#: ../src/modules/calendar/e-cal-shell-view-private.c:812
 msgid "Searching previous matching event"
 msgstr "一致する前のイベントを検索"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1583
+#: ../src/modules/calendar/e-cal-shell-view-private.c:833
 #, 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:1587
+#: ../src/modules/calendar/e-cal-shell-view-private.c:837
 #, 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:1612
+#: ../src/modules/calendar/e-cal-shell-view-private.c:860
 msgid "Cannot search with no active calendar"
 msgstr "アクティブなカレンダーが1つもない場合は検索できません"
 
@@ -16266,2534 +22691,2866 @@ 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:295
-#: ../modules/calendar/e-task-shell-view-actions.c:641
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:273
+#: ../src/modules/calendar/e-task-shell-view-actions.c:613
 msgid "task"
 msgstr "タスク"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:308
+#: ../src/modules/calendar/e-task-shell-view-actions.c:675
 msgid "_Assign Task"
 msgstr "タスクの割当て(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:322
+#: ../src/modules/calendar/e-task-shell-view-actions.c:766
 msgid "_Mark as Complete"
 msgstr "完了としてマーク(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-view-actions.c:782
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../src/modules/calendar/e-task-shell-view-actions.c:768
 msgid "Mark selected tasks as complete"
 msgstr "選択したタスクに完了マークを付与します"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:329
 msgid "_Mark as Incomplete"
 msgstr "未完了としてマーク(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:789
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../src/modules/calendar/e-task-shell-view-actions.c:775
 msgid "Mark selected tasks as incomplete"
 msgstr "選択したタスクに未完とのマークを付与します"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-task-shell-view-actions.c:794
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:336
+#: ../src/modules/calendar/e-task-shell-view-actions.c:780
 msgid "New _Task"
 msgstr "新しいタスク(_T)"
 
-#: ../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
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../src/modules/calendar/e-task-shell-backend.c:77
+#: ../src/modules/calendar/e-task-shell-view-actions.c:782
 msgid "Create a new task"
 msgstr "新しいタスクを作成します"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:343
+#: ../src/modules/calendar/e-task-shell-view-actions.c:787
 msgid "_Open Task"
 msgstr "タスクを開く(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:367
-#: ../modules/calendar/e-task-shell-view-actions.c:803
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../src/modules/calendar/e-task-shell-view-actions.c:789
 msgid "View the selected task"
 msgstr "選択したタスクを表示します"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
-#: ../modules/calendar/e-task-shell-view-actions.c:1029
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:362
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1023
 msgid "Print the selected task"
 msgstr "選択したタスクを印刷します"
 
-#: ../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:216
+#: ../src/modules/calendar/e-memo-shell-backend.c:77
 msgctxt "New"
 msgid "Mem_o"
 msgstr "メモ(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:223
+#: ../src/modules/calendar/e-memo-shell-backend.c:84
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "メモの共有(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:225
+#: ../src/modules/calendar/e-memo-shell-backend.c:86
 msgid "Create a new shared memo"
 msgstr "新しい共有メモを作成します"
 
-#: ../modules/calendar/e-memo-shell-backend.c:233
+#: ../src/modules/calendar/e-memo-shell-backend.c:94
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "メモの一覧(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:235
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../src/modules/calendar/e-memo-shell-backend.c:96
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Create a new memo list"
 msgstr "新しいメモの一覧を作成します"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:116
-#, c-format
-msgid "Opening memo list '%s'"
-msgstr "メモ一覧 %s を開いています"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:545
-msgid "Memo List Selector"
-msgstr "メモの一覧の選択"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:211
-#: ../modules/calendar/e-memo-shell-view-actions.c:226
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:194
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:209
 msgid "Print Memos"
 msgstr "メモの印刷"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:267
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:250
 msgid "Memo List Properties"
 msgstr "タスクの一覧のプロパティ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:586
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:556
 msgid "_Delete Memo"
 msgstr "メモの削除(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:563
 msgid "_Find in Memo..."
 msgstr "メモから検索(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:595
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:565
 msgid "Search for text in the displayed memo"
 msgstr "表示したメモに含まれる文字列を検索します"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:584
 msgid "D_elete Memo List"
 msgstr "メモの一覧の削除(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:586
 msgid "Delete the selected memo list"
 msgstr "選択したメモの一覧を削除します"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:591
+msgid "_Manage Memo List groups..."
+msgstr ""
+
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:593
+msgid "Manage Memo List groups order and visibility"
+msgstr ""
+
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:598
 msgid "_New Memo List"
 msgstr "新しいメモの一覧(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Refresh the selected memo list"
 msgstr "選択したメモの一覧を更新"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Rename the selected memo list"
 msgstr "選択したメモの一覧の名前を変更"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:626
 msgid "Show _Only This Memo List"
 msgstr "このメモの一覧だけ表示(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:633
+#, fuzzy
+#| msgid "Show _Only This Memo List"
+msgid "Sho_w All Memo Lists"
+msgstr "このメモの一覧だけ表示(_O)"
+
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:720
 msgid "Memo _Preview"
 msgstr "メモのプレビュー(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:730
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:722
 msgid "Show memo preview pane"
 msgstr "メモのプレビューペインを表示するかどうか"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:743
 msgid "Show memo preview below the memo list"
 msgstr "メモの一覧の下にメモのプレビューを表示します"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:750
 msgid "Show memo preview alongside the memo list"
 msgstr "メモの一覧の横にメモのプレビューを表示します"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:816
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Print the list of memos"
 msgstr "メモの一覧を印刷します"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:815
 msgid "Preview the list of memos to be printed"
 msgstr "印刷するメモの一覧のプレビューを表示します"
 
-#: ../modules/calendar/e-memo-shell-view.c:238
+#: ../src/modules/calendar/e-memo-shell-view.c:217
 msgid "Delete Memos"
 msgstr "複数のメモの削除"
 
-#: ../modules/calendar/e-memo-shell-view.c:240
+#: ../src/modules/calendar/e-memo-shell-view.c:219
 msgid "Delete Memo"
 msgstr "メモの削除"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:537
+#: ../src/modules/calendar/e-memo-shell-view-private.c:367
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d個のメモ"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:541
-#: ../modules/calendar/e-task-shell-view-private.c:747
+#: ../src/modules/calendar/e-memo-shell-view-private.c:371
+#: ../src/modules/calendar/e-task-shell-view-private.c:548
 #, c-format
 msgid "%d selected"
 msgstr "%d個 選択済"
 
-#: ../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:213
+#: ../src/modules/calendar/e-task-shell-backend.c:75
 msgctxt "New"
 msgid "_Task"
 msgstr "タスク(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:220
+#: ../src/modules/calendar/e-task-shell-backend.c:82
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "タスクの割当て(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:222
+#: ../src/modules/calendar/e-task-shell-backend.c:84
 msgid "Create a new assigned task"
 msgstr "新しいタスクの割り当てを作成します"
 
-#: ../modules/calendar/e-task-shell-backend.c:230
+#: ../src/modules/calendar/e-task-shell-backend.c:92
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "タスクの一覧(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:232
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../src/modules/calendar/e-task-shell-backend.c:94
+#: ../src/modules/calendar/e-task-shell-view-actions.c:726
 msgid "Create a new task list"
 msgstr "新しいタスクの一覧を作成します"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:116
-#, c-format
-msgid "Opening task list '%s'"
-msgstr "タスク一覧 %s を開いています"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:545
-msgid "Task List Selector"
-msgstr "タスクの一覧の選択"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:234
-#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../src/modules/calendar/e-task-shell-view-actions.c:218
+#: ../src/modules/calendar/e-task-shell-view-actions.c:233
 msgid "Print Tasks"
 msgstr "タスクの印刷"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:290
+#: ../src/modules/calendar/e-task-shell-view-actions.c:274
 msgid "Task List Properties"
 msgstr "タスクの一覧のプロパティ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:585
+#: ../src/modules/calendar/e-task-shell-view-actions.c:557
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able 
to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"この操作は完了マーク付きのタスクをすべて完全に削除します。続行すると、これらのタスクを復旧できなくなります。\n"
+"この操作は完了マーク付きのタスクをすべて完全に削除します。続行すると、これら"
+"のタスクを復旧できなくなります。\n"
 "\n"
 "本当にこれらのタスクを削除しますか?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:592
+#: ../src/modules/calendar/e-task-shell-view-actions.c:564
 msgid "Do not ask me again"
 msgstr "次回からこのメッセージを表示しない"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../src/modules/calendar/e-task-shell-view-actions.c:682
 msgid "_Delete Task"
 msgstr "タスク削除(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../src/modules/calendar/e-task-shell-view-actions.c:689
 msgid "_Find in Task..."
 msgstr "タスクから検索(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:719
+#: ../src/modules/calendar/e-task-shell-view-actions.c:691
 msgid "Search for text in the displayed task"
 msgstr "表示されているタスクから文字列を検索します"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../src/modules/calendar/e-task-shell-view-actions.c:710
 msgid "D_elete Task List"
 msgstr "タスクの一覧の削除(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../src/modules/calendar/e-task-shell-view-actions.c:712
 msgid "Delete the selected task list"
 msgstr "選択したタスクの一覧を削除します"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../src/modules/calendar/e-task-shell-view-actions.c:717
+msgid "_Manage Task List groups..."
+msgstr ""
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:724
 msgid "_New Task List"
 msgstr "新しいタスクの一覧(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../src/modules/calendar/e-task-shell-view-actions.c:740
 msgid "Refresh the selected task list"
 msgstr "選択したタスクの一覧を更新"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../src/modules/calendar/e-task-shell-view-actions.c:747
 msgid "Rename the selected task list"
 msgstr "選択したタスクの一覧の名前を変更"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../src/modules/calendar/e-task-shell-view-actions.c:752
+#, fuzzy
+#| msgid "Show _Only This Task List"
+msgid "Sho_w All Task Lists"
+msgstr "このタスクの一覧だけ表示(_O)"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:759
 msgid "Show _Only This Task List"
 msgstr "このタスクの一覧だけ表示(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../src/modules/calendar/e-task-shell-view-actions.c:773
 msgid "Mar_k as Incomplete"
 msgstr "未完了としてマーク(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:817
+#: ../src/modules/calendar/e-task-shell-view-actions.c:803
 msgid "Delete completed tasks"
 msgstr "完了したタスクを削除します"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:892
+#: ../src/modules/calendar/e-task-shell-view-actions.c:886
 msgid "Task _Preview"
 msgstr "タスクのプレビュー(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:894
+#: ../src/modules/calendar/e-task-shell-view-actions.c:888
 msgid "Show task preview pane"
 msgstr "タスクのプレビューペインを表示する"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../src/modules/calendar/e-task-shell-view-actions.c:909
 msgid "Show task preview below the task list"
 msgstr "タスクの一覧の下にタスクのプレビューを表示します"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../src/modules/calendar/e-task-shell-view-actions.c:916
 msgid "Show task preview alongside the task list"
 msgstr "タスクの一覧の横にタスクのプレビューを表示します"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:930
+#: ../src/modules/calendar/e-task-shell-view-actions.c:924
 msgid "Active Tasks"
 msgstr "実行中のタスク"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:944
+#: ../src/modules/calendar/e-task-shell-view-actions.c:938
 msgid "Completed Tasks"
 msgstr "完了したタスク"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:951
-msgid "Next 7 Days' Tasks"
+#: ../src/modules/calendar/e-task-shell-view-actions.c:945
+#, fuzzy
+#| msgid "Next 7 Days' Tasks"
+msgid "Next 7 Days’ Tasks"
 msgstr "次の7日間のタスク"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:958
+#: ../src/modules/calendar/e-task-shell-view-actions.c:952
 msgid "Overdue Tasks"
 msgstr "期限を過ぎたタスク"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:965
+#: ../src/modules/calendar/e-task-shell-view-actions.c:959
 msgid "Tasks with Attachments"
 msgstr "添付ありのタスク"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1015
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1009
 msgid "Print the list of tasks"
 msgstr "タスクの一覧を印刷します"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1022
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1016
 msgid "Preview the list of tasks to be printed"
 msgstr "タスクの一覧の印刷プレビューを表示します"
 
-#: ../modules/calendar/e-task-shell-view.c:373
+#: ../src/modules/calendar/e-task-shell-view.c:321
 msgid "Delete Tasks"
 msgstr "タスクを削除"
 
-#: ../modules/calendar/e-task-shell-view.c:375
+#: ../src/modules/calendar/e-task-shell-view.c:323
 msgid "Delete Task"
 msgstr "タスクを委任"
 
-#: ../modules/calendar/e-task-shell-view-private.c:632
-msgid "Expunging"
-msgstr "抹消"
-
-#: ../modules/calendar/e-task-shell-view-private.c:743
+#: ../src/modules/calendar/e-task-shell-view-private.c:544
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d個のタスク"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:149
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:319
+#, fuzzy
+#| msgid "Create a _Meeting"
+msgid "Convert to M_eeting"
+msgstr "会議の作成(_M)"
+
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:321
+#, fuzzy
+#| msgid "Create a new meeting request"
+msgid "Convert the message to a meeting request"
+msgstr "新しい会議を召集します"
+
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:357
+#, fuzzy
+#| msgid "Important Messages"
+msgid "Convert to M_essage"
+msgstr "重要なメッセージ"
+
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:359
+#, fuzzy
+#| msgid "Compose a new mail message"
+msgid "Convert to the mail message"
+msgstr "新しいメッセージを作成します"
+
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:162
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:150
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:163
 msgid "Display part as an invitation"
 msgstr "招待状として表示"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:228
+#: ../src/modules/itip-formatter/itip-view.c:258
 msgid "Today %H:%M"
 msgstr "今日の%k:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:232
+#: ../src/modules/itip-formatter/itip-view.c:262
 msgid "Today %H:%M:%S"
 msgstr "今日の%k:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:241
+#: ../src/modules/itip-formatter/itip-view.c:271
 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:256
+#: ../src/modules/itip-formatter/itip-view.c:286
 msgid "Tomorrow %H:%M"
 msgstr "明日の%k:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:260
+#: ../src/modules/itip-formatter/itip-view.c:290
 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:265
+#: ../src/modules/itip-formatter/itip-view.c:295
 msgid "Tomorrow %l:%M %p"
 msgstr "明日の%p%l:%M"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:269
+#: ../src/modules/itip-formatter/itip-view.c:299
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明日の%p%l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:288
+#: ../src/modules/itip-formatter/itip-view.c:318
 #, 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:293
+#: ../src/modules/itip-formatter/itip-view.c:323
 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:297
+#: ../src/modules/itip-formatter/itip-view.c:327
 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:302
+#: ../src/modules/itip-formatter/itip-view.c:332
 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:306
+#: ../src/modules/itip-formatter/itip-view.c:336
 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:315
+#: ../src/modules/itip-formatter/itip-view.c:345
 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:321
+#: ../src/modules/itip-formatter/itip-view.c:351
 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:325
+#: ../src/modules/itip-formatter/itip-view.c:355
 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:330
+#: ../src/modules/itip-formatter/itip-view.c:360
 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:334
+#: ../src/modules/itip-formatter/itip-view.c:364
 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:340
+#: ../src/modules/itip-formatter/itip-view.c:370
 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:345
+#: ../src/modules/itip-formatter/itip-view.c:375
 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:349
+#: ../src/modules/itip-formatter/itip-view.c:379
 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:354
+#: ../src/modules/itip-formatter/itip-view.c:384
 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:358
+#: ../src/modules/itip-formatter/itip-view.c:388
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y年%B%e日 %A %p%l:%M:%S"
 
-#: ../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
+#: ../src/modules/itip-formatter/itip-view.c:426
+#: ../src/modules/itip-formatter/itip-view.c:427
+#: ../src/modules/itip-formatter/itip-view.c:516
+#: ../src/modules/itip-formatter/itip-view.c:517
+#: ../src/modules/itip-formatter/itip-view.c:606
 msgid "An unknown person"
 msgstr "身元が不明な人"
 
-#: ../modules/itip-formatter/itip-view.c:401
-#: ../modules/itip-formatter/itip-view.c:491
-#: ../modules/itip-formatter/itip-view.c:580
+#: ../src/modules/itip-formatter/itip-view.c:431
+#: ../src/modules/itip-formatter/itip-view.c:521
+#: ../src/modules/itip-formatter/itip-view.c:610
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "%s さんに代わって返信してください"
 
-#: ../modules/itip-formatter/itip-view.c:403
-#: ../modules/itip-formatter/itip-view.c:493
-#: ../modules/itip-formatter/itip-view.c:582
+#: ../src/modules/itip-formatter/itip-view.c:433
+#: ../src/modules/itip-formatter/itip-view.c:523
+#: ../src/modules/itip-formatter/itip-view.c:612
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "%s に代わって受信しました"
 
-#: ../modules/itip-formatter/itip-view.c:408
+#: ../src/modules/itip-formatter/itip-view.c:438
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s さんは %s さんをとおして次の会議召集通知を公開しました:"
 
-#: ../modules/itip-formatter/itip-view.c:410
+#: ../src/modules/itip-formatter/itip-view.c:440
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s さんが次の会議召集通知を公開しました:"
 
-#: ../modules/itip-formatter/itip-view.c:415
+#: ../src/modules/itip-formatter/itip-view.c:445
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s さんが次の会議をあなたに委任しました:"
 
-#: ../modules/itip-formatter/itip-view.c:418
+#: ../src/modules/itip-formatter/itip-view.c:448
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s さんは %s さんをとおして次の会議への出席を要求してきました:"
 
-#: ../modules/itip-formatter/itip-view.c:420
+#: ../src/modules/itip-formatter/itip-view.c:450
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s さんが会議への出席を要求しています:"
 
-#: ../modules/itip-formatter/itip-view.c:426
+#: ../src/modules/itip-formatter/itip-view.c:456
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s さんは %s さんをとおして既存の会議への参加を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:428
+#: ../src/modules/itip-formatter/itip-view.c:458
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s さんは既存の会議への参加を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:432
+#: ../src/modules/itip-formatter/itip-view.c:462
 #, c-format
-msgid "%s through %s wishes to receive the latest information for the following meeting:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
 msgstr "%s さんは %s さんを通して次の会議の最新情報を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:434
+#: ../src/modules/itip-formatter/itip-view.c:464
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s さんは次の会議の最新情報を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:438
+#: ../src/modules/itip-formatter/itip-view.c:468
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s さんがは %s さんを通して次の会議の返事を返してきました:"
 
-#: ../modules/itip-formatter/itip-view.c:440
+#: ../src/modules/itip-formatter/itip-view.c:470
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s さんが次の会議の返事を返してきました:"
 
-#: ../modules/itip-formatter/itip-view.c:444
-#, c-format
-msgid "%s through %s has canceled the following meeting:"
+#: ../src/modules/itip-formatter/itip-view.c:474
+#, fuzzy, c-format
+#| msgid "%s through %s has canceled the following meeting:"
+msgid "%s through %s has cancelled the following meeting:"
 msgstr "%s さんは %s さんをとおして次の会議をキャンセルしました:"
 
-#: ../modules/itip-formatter/itip-view.c:446
-#, c-format
-msgid "%s has canceled the following meeting:"
+#: ../src/modules/itip-formatter/itip-view.c:476
+#, fuzzy, c-format
+#| msgid "%s has canceled the following meeting:"
+msgid "%s has cancelled the following meeting:"
 msgstr "%s さんが次の会議をキャンセルしました:"
 
-#: ../modules/itip-formatter/itip-view.c:450
+#: ../src/modules/itip-formatter/itip-view.c:480
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s さんは %s さんを通して会議の変更を提案してきました:"
 
-#: ../modules/itip-formatter/itip-view.c:452
+#: ../src/modules/itip-formatter/itip-view.c:482
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s さんが会議の変更を提案してきました:"
 
-#: ../modules/itip-formatter/itip-view.c:456
+#: ../src/modules/itip-formatter/itip-view.c:486
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s さんは %s さんをとおして会議の変更を断ってきました:"
 
-#: ../modules/itip-formatter/itip-view.c:458
+#: ../src/modules/itip-formatter/itip-view.c:488
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s さんが会議の変更を断ってきました:"
 
-#: ../modules/itip-formatter/itip-view.c:498
+#: ../src/modules/itip-formatter/itip-view.c:528
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s さんは %s さんが次のタスクを公開したと考えています:"
 
-#: ../modules/itip-formatter/itip-view.c:500
+#: ../src/modules/itip-formatter/itip-view.c:530
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s さんが次のタスク情報を公開しました:"
 
-#: ../modules/itip-formatter/itip-view.c:505
+#: ../src/modules/itip-formatter/itip-view.c:535
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s さんが次のタスクに対する %s の割り当てを要求しています:"
 
-#: ../modules/itip-formatter/itip-view.c:508
+#: ../src/modules/itip-formatter/itip-view.c:538
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s さんは %s さんをとおしてあなたにタスクを割り当てました:"
 
-#: ../modules/itip-formatter/itip-view.c:510
+#: ../src/modules/itip-formatter/itip-view.c:540
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s さんはタスクをあなたに割り当てました:"
 
-#: ../modules/itip-formatter/itip-view.c:516
+#: ../src/modules/itip-formatter/itip-view.c:546
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s さんは %s さんをとおして既存のタスクへの追加を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:518
+#: ../src/modules/itip-formatter/itip-view.c:548
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s さんは既存のタスクへの追加を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:522
+#: ../src/modules/itip-formatter/itip-view.c:552
 #, c-format
-msgid "%s through %s wishes to receive the latest information for the following assigned task:"
-msgstr "%s さんは %s さんを通して次のタスク割り当てに関する最新情報を希望しています:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+"%s さんは %s さんを通して次のタスク割り当てに関する最新情報を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:524
+#: ../src/modules/itip-formatter/itip-view.c:554
 #, c-format
-msgid "%s wishes to receive the latest information for the following assigned task:"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s さんは次のタスク割り当てに関する最新情報を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:528
+#: ../src/modules/itip-formatter/itip-view.c:558
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
-msgstr "%s さんは %s さんを通して次のタスク割り当てに対する回答を返してきました:"
+msgstr ""
+"%s さんは %s さんを通して次のタスク割り当てに対する回答を返してきました:"
 
-#: ../modules/itip-formatter/itip-view.c:530
+#: ../src/modules/itip-formatter/itip-view.c:560
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s さんは次のタスク割り当てに対する回答を返してきました:"
 
-#: ../modules/itip-formatter/itip-view.c:534
-#, c-format
-msgid "%s through %s has canceled the following assigned task:"
+#: ../src/modules/itip-formatter/itip-view.c:564
+#, fuzzy, c-format
+#| msgid "%s through %s has canceled the following assigned task:"
+msgid "%s through %s has cancelled the following assigned task:"
 msgstr "%s さんは %s さんを通して次のタスクをキャンセルしました:"
 
-#: ../modules/itip-formatter/itip-view.c:536
-#, c-format
-msgid "%s has canceled the following assigned task:"
+#: ../src/modules/itip-formatter/itip-view.c:566
+#, fuzzy, c-format
+#| msgid "%s has canceled the following assigned task:"
+msgid "%s has cancelled the following assigned task:"
 msgstr "%s さんは次のタスクをキャンセルしました:"
 
-#: ../modules/itip-formatter/itip-view.c:540
+#: ../src/modules/itip-formatter/itip-view.c:570
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s さんは %s さんを通してタスク割り当ての変更を提案してきました:"
 
-#: ../modules/itip-formatter/itip-view.c:542
+#: ../src/modules/itip-formatter/itip-view.c:572
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s さんがタスク割り当ての変更を提案してきました:"
 
-#: ../modules/itip-formatter/itip-view.c:546
+#: ../src/modules/itip-formatter/itip-view.c:576
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s さんは %s さんを通して次のタスクを辞退しました:"
 
-#: ../modules/itip-formatter/itip-view.c:548
+#: ../src/modules/itip-formatter/itip-view.c:578
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s さんは次のタスクを辞退しました:"
 
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../src/modules/itip-formatter/itip-view.c:617
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s さんは %s さんを通して次のメモを公開しました:"
 
-#: ../modules/itip-formatter/itip-view.c:589
+#: ../src/modules/itip-formatter/itip-view.c:619
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s さんが次のメモ情報を公開しました:"
 
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../src/modules/itip-formatter/itip-view.c:624
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s さんは %s さんを通して既存のメモへの追加を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:596
+#: ../src/modules/itip-formatter/itip-view.c:626
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s さんは既存のメモへの追加を希望しています:"
 
-#: ../modules/itip-formatter/itip-view.c:600
-#, c-format
-msgid "%s through %s has canceled the following shared memo:"
+#: ../src/modules/itip-formatter/itip-view.c:630
+#, fuzzy, c-format
+#| msgid "%s through %s has canceled the following shared memo:"
+msgid "%s through %s has cancelled the following shared memo:"
 msgstr "%s さんは %s さんを通して次の共有メモをキャンセルしました:"
 
-#: ../modules/itip-formatter/itip-view.c:602
-#, c-format
-msgid "%s has canceled the following shared memo:"
+#: ../src/modules/itip-formatter/itip-view.c:632
+#, fuzzy, c-format
+#| msgid "%s has canceled the following shared memo:"
+msgid "%s has cancelled the following shared memo:"
 msgstr "%s さんは次の共有メモをキャンセルしました:"
 
-#: ../modules/itip-formatter/itip-view.c:675
+#: ../src/modules/itip-formatter/itip-view.c:857
 msgid "All day:"
 msgstr "終日:"
 
-#: ../modules/itip-formatter/itip-view.c:681
+#: ../src/modules/itip-formatter/itip-view.c:863
 msgid "Start day:"
 msgstr "開始日:"
 
-#: ../modules/itip-formatter/itip-view.c:681
-#: ../modules/itip-formatter/itip-view.c:1504
+#: ../src/modules/itip-formatter/itip-view.c:863
+#: ../src/modules/itip-formatter/itip-view.c:1679
 msgid "Start time:"
 msgstr "開始時刻:"
 
-#: ../modules/itip-formatter/itip-view.c:690
+#: ../src/modules/itip-formatter/itip-view.c:872
 msgid "End day:"
 msgstr "終了日:"
 
-#: ../modules/itip-formatter/itip-view.c:690
-#: ../modules/itip-formatter/itip-view.c:1505
+#: ../src/modules/itip-formatter/itip-view.c:872
+#: ../src/modules/itip-formatter/itip-view.c:1680
 msgid "End time:"
 msgstr "終了時刻:"
 
-#: ../modules/itip-formatter/itip-view.c:1030
+#: ../src/modules/itip-formatter/itip-view.c:1210
 msgid "Ope_n Calendar"
 msgstr "カレンダーを開く(_N)"
 
-#: ../modules/itip-formatter/itip-view.c:1033
+#: ../src/modules/itip-formatter/itip-view.c:1213
 msgid "_Decline all"
 msgstr "すべて辞退する(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1036
+#: ../src/modules/itip-formatter/itip-view.c:1216
 msgid "_Decline"
 msgstr "辞退する(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1039
+#: ../src/modules/itip-formatter/itip-view.c:1219
 msgid "_Tentative all"
 msgstr "すべて仮承認する(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1042
+#: ../src/modules/itip-formatter/itip-view.c:1222
 msgid "_Tentative"
 msgstr "仮承認する(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1045
+#: ../src/modules/itip-formatter/itip-view.c:1225
 msgid "Acce_pt all"
 msgstr "すべて受諾する(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1048
+#: ../src/modules/itip-formatter/itip-view.c:1228
 msgid "Acce_pt"
 msgstr "受諾する(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1051
+#: ../src/modules/itip-formatter/itip-view.c:1231
 msgid "Send _Information"
 msgstr "情報を送信する(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1054
+#: ../src/modules/itip-formatter/itip-view.c:1234
 msgid "_Update Attendee Status"
 msgstr "出席者の状態を更新する(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1057
+#: ../src/modules/itip-formatter/itip-view.c:1237
+#: ../src/smime/gui/certificate-manager.c:1677
 msgid "_Update"
 msgstr "更新する(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1507
-#: ../modules/itip-formatter/itip-view.c:1555
-#: ../modules/itip-formatter/itip-view.c:1626
+#: ../src/modules/itip-formatter/itip-view.c:1682
+#: ../src/modules/itip-formatter/itip-view.c:1730
+#: ../src/modules/itip-formatter/itip-view.c:1801
 msgid "Comment:"
 msgstr "コメント:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1543
+#: ../src/modules/itip-formatter/itip-view.c:1718
 msgid "Send reply to sender"
 msgstr "差出人に返信する"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1558
+#: ../src/modules/itip-formatter/itip-view.c:1733
 msgid "Send _updates to attendees"
 msgstr "更新情報を出席者へ送信する(_U)"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1561
+#: ../src/modules/itip-formatter/itip-view.c:1736
 msgid "_Apply to all instances"
 msgstr "すべてのインスタンスに適用する(_A)"
 
-#: ../modules/itip-formatter/itip-view.c:1562
+#: ../src/modules/itip-formatter/itip-view.c:1737
 msgid "Show time as _free"
 msgstr "予定なしの時間を表示する(_F)"
 
-#: ../modules/itip-formatter/itip-view.c:1563
+#: ../src/modules/itip-formatter/itip-view.c:1738
 msgid "_Preserve my reminder"
 msgstr "リマインダーを保存しておく(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1564
+#: ../src/modules/itip-formatter/itip-view.c:1739
 msgid "_Inherit reminder"
 msgstr "リマインダーを継承する(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1894
+#: ../src/modules/itip-formatter/itip-view.c:2048
 msgid "_Tasks:"
 msgstr "タスク(_T):"
 
-#: ../modules/itip-formatter/itip-view.c:1897
+#: ../src/modules/itip-formatter/itip-view.c:2051
 msgid "_Memos:"
 msgstr "メモ(_M):"
 
-#: ../modules/itip-formatter/itip-view.c:3125
+#: ../src/modules/itip-formatter/itip-view.c:2964
 msgid "Sa_ve"
 msgstr "保存(_V)"
 
-#: ../modules/itip-formatter/itip-view.c:3585
-#: ../modules/itip-formatter/itip-view.c:5032
+#: ../src/modules/itip-formatter/itip-view.c:3486
+#: ../src/modules/itip-formatter/itip-view.c:5015
 msgid "Attendee status updated"
 msgstr "出席状況を更新しました"
 
-#: ../modules/itip-formatter/itip-view.c:3764
-#, c-format
-msgid "An appointment in the calendar '%s' conflicts with this meeting"
+#: ../src/modules/itip-formatter/itip-view.c:3701
+#, fuzzy, c-format
+#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
 msgstr "カレンダー '%s' の予定がこの会議の時間と重なっています"
 
-#: ../modules/itip-formatter/itip-view.c:3793
-#, c-format
-msgid "Found the appointment in the calendar '%s'"
+#: ../src/modules/itip-formatter/itip-view.c:3707
+#, fuzzy, c-format
+#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgid ""
+"The calendar “%s” contains an appointment which conflicts with this meeting"
+msgid_plural ""
+"The calendar “%s” contains %d appointments which conflict with this meeting"
+msgstr[0] "カレンダー '%s' の予定がこの会議の時間と重なっています"
+
+#: ../src/modules/itip-formatter/itip-view.c:3740
+#, fuzzy, c-format
+#| msgid "Found the appointment in the calendar '%s'"
+msgid "Found the appointment in the calendar “%s”"
 msgstr "カレンダー '%s' の中に予定がありました"
 
-#: ../modules/itip-formatter/itip-view.c:3906
+#: ../src/modules/itip-formatter/itip-view.c:3749
+#, fuzzy
+#| msgid "The meeting is invalid and cannot be updated"
+msgid "This meeting invitation is obsolete. It had been updated."
+msgstr "この会議は不正で更新できません"
+
+#: ../src/modules/itip-formatter/itip-view.c:3891
 msgid "Unable to find any calendars"
 msgstr "カレンダーが見つかりませんでした"
 
-#: ../modules/itip-formatter/itip-view.c:3914
+#: ../src/modules/itip-formatter/itip-view.c:3899
 msgid "Unable to find this meeting in any calendar"
 msgstr "この会議の予定を記録したカレンダーが見つかりませんでした"
 
-#: ../modules/itip-formatter/itip-view.c:3919
+#: ../src/modules/itip-formatter/itip-view.c:3904
 msgid "Unable to find this task in any task list"
 msgstr "このタスクを記録したタスクの一覧が見つかりませんでした"
 
-#: ../modules/itip-formatter/itip-view.c:3924
+#: ../src/modules/itip-formatter/itip-view.c:3909
 msgid "Unable to find this memo in any memo list"
 msgstr "このタスクを記録したタスクの一覧が見つかりませんでした"
 
-#: ../modules/itip-formatter/itip-view.c:4268
+#: ../src/modules/itip-formatter/itip-view.c:4250
 msgid "Opening the calendar. Please wait..."
 msgstr "カレンダーを開いています。お待ちください..."
 
 # 要再考
-#: ../modules/itip-formatter/itip-view.c:4273
+#: ../src/modules/itip-formatter/itip-view.c:4255
 msgid "Searching for an existing version of this appointment"
 msgstr "この予定の既存バージョンの検索"
 
-#: ../modules/itip-formatter/itip-view.c:4668
-#, c-format
-msgid "Unable to send item to calendar '%s'.  %s"
+#: ../src/modules/itip-formatter/itip-view.c:4654
+#, fuzzy, c-format
+#| msgid "Unable to send item to calendar '%s'.  %s"
+msgid "Unable to send item to calendar “%s”.  %s"
 msgstr "アイテムをカレンダー '%s' に保存できません (%s)"
 
-#: ../modules/itip-formatter/itip-view.c:4683
-#, c-format
-msgid "Sent to calendar '%s' as accepted"
+#: ../src/modules/itip-formatter/itip-view.c:4669
+#, fuzzy, c-format
+#| msgid "Sent to calendar '%s' as accepted"
+msgid "Sent to calendar “%s” as accepted"
 msgstr "承認したものとしてカレンダー '%s' に保存しました"
 
-#: ../modules/itip-formatter/itip-view.c:4688
-#, c-format
-msgid "Sent to calendar '%s' as tentative"
+#: ../src/modules/itip-formatter/itip-view.c:4674
+#, fuzzy, c-format
+#| msgid "Sent to calendar '%s' as tentative"
+msgid "Sent to calendar “%s” as tentative"
 msgstr "仮承認したものとしてカレンダー '%s' に保存しました"
 
-#: ../modules/itip-formatter/itip-view.c:4694
-#, c-format
-msgid "Sent to calendar '%s' as declined"
+#: ../src/modules/itip-formatter/itip-view.c:4680
+#, fuzzy, c-format
+#| msgid "Sent to calendar '%s' as declined"
+msgid "Sent to calendar “%s” as declined"
 msgstr "辞退したものとしてカレンダー '%s' に保存しました"
 
-#: ../modules/itip-formatter/itip-view.c:4700
-#, c-format
-msgid "Sent to calendar '%s' as canceled"
+#: ../src/modules/itip-formatter/itip-view.c:4686
+#, fuzzy, c-format
+#| msgid "Sent to calendar '%s' as canceled"
+msgid "Sent to calendar “%s” as cancelled"
 msgstr "キャンセルしたものとしてカレンダー '%s' に保存しました"
 
-#: ../modules/itip-formatter/itip-view.c:4721
-#: ../modules/itip-formatter/itip-view.c:5178
-#: ../modules/itip-formatter/itip-view.c:5284
+#: ../src/modules/itip-formatter/itip-view.c:4706
+#: ../src/modules/itip-formatter/itip-view.c:5152
+#: ../src/modules/itip-formatter/itip-view.c:5255
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "カレンダーの変更を保存しています。お待ちください..."
 
-#: ../modules/itip-formatter/itip-view.c:4762
+#: ../src/modules/itip-formatter/itip-view.c:4747
 msgid "Unable to parse item"
 msgstr "アイテムを解析できません"
 
-#: ../modules/itip-formatter/itip-view.c:4955
+#: ../src/modules/itip-formatter/itip-view.c:4939
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizer が %s への委譲を削除しました "
 
-#: ../modules/itip-formatter/itip-view.c:4972
+#: ../src/modules/itip-formatter/itip-view.c:4956
 msgid "Sent a cancelation notice to the delegate"
 msgstr "DeleGate へキャンセル通知を送信しました"
 
-#: ../modules/itip-formatter/itip-view.c:4976
+#: ../src/modules/itip-formatter/itip-view.c:4960
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "DeleGate へキャンセル通知を送信できませんでした"
 
-#: ../modules/itip-formatter/itip-view.c:5024
+#: ../src/modules/itip-formatter/itip-view.c:5007
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "出席者 %s を更新できません"
 
-#: ../modules/itip-formatter/itip-view.c:5067
+#: ../src/modules/itip-formatter/itip-view.c:5042
 msgid "The meeting is invalid and cannot be updated"
 msgstr "この会議は不正で更新できません"
 
-#: ../modules/itip-formatter/itip-view.c:5143
+#: ../src/modules/itip-formatter/itip-view.c:5117
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "不正なステータスのため出席状況が更新できませんでした"
 
-#: ../modules/itip-formatter/itip-view.c:5215
-#: ../modules/itip-formatter/itip-view.c:5254
+#: ../src/modules/itip-formatter/itip-view.c:5188
+#: ../src/modules/itip-formatter/itip-view.c:5226
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "アイテムがまだ存在していないので出席状況を更新できませんでした"
 
-#: ../modules/itip-formatter/itip-view.c:5317
+#: ../src/modules/itip-formatter/itip-view.c:5287
 msgid "Meeting information sent"
 msgstr "会議の情報の送信"
 
-#: ../modules/itip-formatter/itip-view.c:5322
+#: ../src/modules/itip-formatter/itip-view.c:5292
 msgid "Task information sent"
 msgstr "タスク情報の送信"
 
-#: ../modules/itip-formatter/itip-view.c:5327
+#: ../src/modules/itip-formatter/itip-view.c:5297
 msgid "Memo information sent"
 msgstr "メモ情報の送信"
 
-#: ../modules/itip-formatter/itip-view.c:5338
+#: ../src/modules/itip-formatter/itip-view.c:5308
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "会議が存在しないので、その会議の情報を送信できません"
 
-#: ../modules/itip-formatter/itip-view.c:5343
+#: ../src/modules/itip-formatter/itip-view.c:5313
 msgid "Unable to send task information, the task does not exist"
 msgstr "タスクが存在しないので、そのタスクの情報を送信できません"
 
-#: ../modules/itip-formatter/itip-view.c:5348
+#: ../src/modules/itip-formatter/itip-view.c:5318
 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:5413
+#: ../src/modules/itip-formatter/itip-view.c:5383
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5418
+#: ../src/modules/itip-formatter/itip-view.c:5388
 msgid "Save Calendar"
 msgstr "カレンダーを保存"
 
-#: ../modules/itip-formatter/itip-view.c:5467
-#: ../modules/itip-formatter/itip-view.c:5480
+#: ../src/modules/itip-formatter/itip-view.c:5436
+#: ../src/modules/itip-formatter/itip-view.c:5449
 msgid "The calendar attached is not valid"
 msgstr "添付されたカレンダーが不正です"
 
-#: ../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 形式ではありません。"
+#: ../src/modules/itip-formatter/itip-view.c:5437
+#: ../src/modules/itip-formatter/itip-view.c:5450
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
+msgstr ""
+"メッセージにカレンダーが添付されていますが、そのカレンダーは妥当な iCalendar "
+"形式ではありません。"
 
-#: ../modules/itip-formatter/itip-view.c:5523
-#: ../modules/itip-formatter/itip-view.c:5553
-#: ../modules/itip-formatter/itip-view.c:5654
+#: ../src/modules/itip-formatter/itip-view.c:5492
+#: ../src/modules/itip-formatter/itip-view.c:5522
+#: ../src/modules/itip-formatter/itip-view.c:5625
 msgid "The item in the calendar is not valid"
 msgstr "カレンダーのアイテムが不正です"
 
-#: ../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 "メッセージにカレンダーが添付されていますが、そのカレンダーにはイベントまたタスク、スケジュールが含まれていません。"
+#: ../src/modules/itip-formatter/itip-view.c:5493
+#: ../src/modules/itip-formatter/itip-view.c:5523
+#: ../src/modules/itip-formatter/itip-view.c:5626
+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:5569
+#: ../src/modules/itip-formatter/itip-view.c:5538
 msgid "The calendar attached contains multiple items"
 msgstr "添付されたカレンダーには複数のアイテムが含まれています"
 
-#: ../modules/itip-formatter/itip-view.c:5570
-msgid "To process all of these items, the file should be saved and the calendar imported"
-msgstr "これらのアイテムのすべてを処理するには、ファイルを保存してカレンダーをインポートしてください"
+#: ../src/modules/itip-formatter/itip-view.c:5539
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr ""
+"これらのアイテムのすべてを処理するには、ファイルを保存してカレンダーをイン"
+"ポートしてください"
 
-#: ../modules/itip-formatter/itip-view.c:6072
+#: ../src/modules/itip-formatter/itip-view.c:6057
 msgctxt "cal-itip"
 msgid "None"
 msgstr "なし"
 
-#: ../modules/itip-formatter/itip-view.c:6088
+#: ../src/modules/itip-formatter/itip-view.c:6073
 msgid "Tentatively Accepted"
 msgstr "仮承認済"
 
-#: ../modules/itip-formatter/itip-view.c:6248
+#: ../src/modules/itip-formatter/itip-view.c:6239
 msgid "This meeting recurs"
 msgstr "この会議を繰り返す"
 
-#: ../modules/itip-formatter/itip-view.c:6251
+#: ../src/modules/itip-formatter/itip-view.c:6242
 msgid "This task recurs"
 msgstr "このタスクを繰り返す"
 
-#: ../modules/itip-formatter/itip-view.c:6254
+#: ../src/modules/itip-formatter/itip-view.c:6245
 msgid "This memo recurs"
 msgstr "このメモを繰り返す"
 
-#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid "This response is not from a current attendee. Add the sender as an attendee?"
-msgstr "これは現在の出席者からの応答ではありません。この送信者を出席者として追加しますか?"
+#: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr ""
+"これは現在の出席者からの応答ではありません。この送信者を出席者として追加しま"
+"すか?"
 
-#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+#: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "この会議は委任されました"
 
-#: ../modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+#: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#, fuzzy
+#| msgid ""
+#| "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgid "“{0}” has delegated the meeting. Do you want to add the delegate “{1}”?"
 msgstr "'{0}' さんが会議を委任しました。委任された '{1}' さんを追加しますか?"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:81
-msgid "Meeting Invitations"
-msgstr "会議への招待"
-
-#: ../modules/itip-formatter/plugin/config-ui.c:107
-msgid "_Delete message after acting"
-msgstr "会議開催後にメッセージを削除する(_D)"
-
-#: ../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:136
-msgid "Select the calendars to search for meeting conflicts"
-msgstr "重複する会議を検索するカレンダーを選択してください:"
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Itip Formatter"
-msgstr "Itip フォーマッタ"
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "メールメッセージの中の MIMEの \"text/calendar\" 形式のパーツを表示します"
-
-#: ../modules/mail-config/e-mail-config-google-summary.c:251
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:283
 msgid "Google Features"
 msgstr "Google Features"
 
 # 訳注: 「Google Calendar」は固有名詞なので、その表記に従い、
 # 「カレンダ」ではなく、「カレンダー」とします
-#: ../modules/mail-config/e-mail-config-google-summary.c:260
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:292
 msgid "Add Google Ca_lendar to this account"
 msgstr "Google カレンダーをこのアカウントに追加(_L)"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:268
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:301
 msgid "Add Google Con_tacts to this account"
 msgstr "Google コンタクトをこのアカウントに追加(_T)"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:276
-msgid "You may need to enable IMAP access"
+#. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
+#. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:312
+msgctxt "GoggleSummary"
+msgid "IMAP access"
+msgstr ""
+
+#. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
+#. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:315
+#, fuzzy
+#| msgid "Do _Not Synchronize"
+msgctxt "GoggleSummary"
+msgid "Calendars to synchronize"
+msgstr "同期しない(_N)"
+
+#. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
+#. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:318
+#, fuzzy, c-format
+#| msgid "You may need to enable IMAP access"
+msgctxt "GoggleSummary"
+msgid "You may need to enable %s and %s"
 msgstr "IMAP アクセスを有効にする必要があるかもしれません"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:245
-#: ../modules/mail-config/e-mail-config-local-accounts.c:291
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:268
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:316
 msgid "Mail _Directory:"
 msgstr "保存先のフォルダー(_D):"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:246
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:269
 msgid "Choose a MH mail directory"
 msgstr "MH メールディレクトリを選択してください"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:268
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:271
+msgid "MH mail directory cannot be empty"
+msgstr ""
+
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:292
 msgid "Local Delivery _File:"
 msgstr "ローカル配送ファイル(_F):"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:293
 msgid "Choose a local delivery file"
 msgstr "ローカル配送ファイルを選択してください"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:295
+#, fuzzy
+#| msgid "The file cannot be read"
+msgid "Local delivery file cannot be empty"
+msgstr "そのアイテムは読めません"
+
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:317
 msgid "Choose a Maildir mail directory"
 msgstr "Maildir メールディレクトリを選択してください"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:314
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:319
+#, fuzzy
+#| msgid "Choose a Maildir mail directory"
+msgid "Maildir mail directory cannot be empty"
+msgstr "Maildir メールディレクトリを選択してください"
+
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:340
 msgid "Spool _File:"
 msgstr "スプールファイル(_F):"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:341
 msgid "Choose a mbox spool file"
 msgstr "mbox スプールファイルを選択してください"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:337
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:343
+#, fuzzy
+#| msgid "The file cannot be read"
+msgid "Mbox spool file cannot be empty"
+msgstr "そのアイテムは読めません"
+
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:364
 msgid "Spool _Directory:"
 msgstr "スプール用ディレクトリ(_D):"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:365
 msgid "Choose a mbox spool directory"
 msgstr "mbox スプール用ディレクトリを選択してください"
 
-#: ../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
+#: ../src/modules/mail-config/e-mail-config-local-accounts.c:367
+msgid "Mbox spool directory cannot be empty"
+msgstr ""
+
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:198
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:59
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:154
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:156
 msgid "Configuration"
 msgstr "設定"
 
-#: ../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
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:216
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:172
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "サーバー(_S):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:168
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:230
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:185
 msgid "_Port:"
 msgstr "ポート番号(_P):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:180
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:226
+#. do not reference
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:251
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:313
 msgid "User_name:"
 msgstr "ユーザー名(_N):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:213
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:147
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:265
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:327
+#, fuzzy
+#| msgid "Enter password"
+msgid "_Forget password"
+msgstr "パスワードの入力"
+
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:291
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:234
 msgid "Encryption _method:"
 msgstr "暗号化方法(_M):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:228
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:162
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:306
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:249
 msgid "STARTTLS after connecting"
 msgstr "接続後に STARTTLS"
 
-#: ../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"
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:310
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:253
+msgid "TLS on a dedicated port"
+msgstr "専用のポートで TLS"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
-msgid "_Use custom binary, instead of 'sendmail'"
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:75
+#, fuzzy
+#| msgid "_Use custom binary, instead of 'sendmail'"
+msgid "_Use custom binary, instead of “sendmail”"
 msgstr "sendmail の代わりに独自バイナリーを利用する(_U)"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:79
 msgid "_Custom binary:"
 msgstr "独自バイナリー(_C):"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:98
 msgid "U_se custom arguments"
 msgstr "独自の引数を使用する(_S)"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:102
 msgid "Cus_tom arguments:"
 msgstr "独自の引数(_T):"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:120
+#, fuzzy
+#| msgid ""
+#| "Default arguments are '-i -f %F -- %R', where\n"
+#| "   %F - stands for the From address\n"
+#| "   %R - stands for the recipient addresses"
 msgid ""
-"Default arguments are '-i -f %F -- %R', where\n"
-"   %F - stands for the From address\n"
-"   %R - stands for the recipient addresses"
+"Default arguments are “-i -f %F -- %R”, where\n"
+"   %F — stands for the From address\n"
+"   %R — stands for the recipient addresses"
 msgstr ""
 "デフォルトの引数は '-i -f %F -- %R' で、\n"
 "   %F には From アドレス、\n"
 "   %R には受信者アドレスが入ります"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:127
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:135
 msgid "Send mail also when in offline _mode"
 msgstr "オフラインモードでもメールを送る(_M)"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:122
+#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:208
+msgid "Custom binary cannot be empty"
+msgstr ""
+
+#. do not reference
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:206
 msgid "Ser_ver requires authentication"
 msgstr "サーバー認証を行う(_V)"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:208
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:295
 msgid "T_ype:"
 msgstr "種別(_Y):"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:246
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:252
 msgid "Yahoo! Features"
 msgstr "Yahoo! Features"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:255
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:261
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Yahoo!カレンダーとタスクをアカウントに追加する(_L)"
 
-#: ../modules/mail/e-mail-attachment-handler.c:424
+#: ../src/modules/mail/e-mail-attachment-handler.c:671
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d 個の添付メッセージ"
 
-#: ../modules/mail/e-mail-shell-backend.c:314
+#: ../src/modules/mail/e-mail-shell-backend.c:375
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "メッセージ(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:316
+#: ../src/modules/mail/e-mail-shell-backend.c:377
 msgid "Compose a new mail message"
 msgstr "新しいメッセージを作成します"
 
-#: ../modules/mail/e-mail-shell-backend.c:324
+#: ../src/modules/mail/e-mail-shell-backend.c:385
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "メールのアカウント(_U)"
 
-#: ../modules/mail/e-mail-shell-backend.c:326
+#: ../src/modules/mail/e-mail-shell-backend.c:387
 msgid "Create a new mail account"
 msgstr "新しいメールアカウントを作成します"
 
-#: ../modules/mail/e-mail-shell-backend.c:331
+#: ../src/modules/mail/e-mail-shell-backend.c:392
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "メールのフォルダー(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:333
+#: ../src/modules/mail/e-mail-shell-backend.c:394
 msgid "Create a new mail folder"
 msgstr "新しいメールフォルダーを作成します"
 
-#: ../modules/mail/e-mail-shell-backend.c:644
+#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
+#. it to some user-frienly form, or keep it as is.
+#: ../src/modules/mail/e-mail-shell-backend.c:709
+msgctxt "NetworkMonitor"
+msgid "base"
+msgstr ""
+
+#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
+#. it to some user-frienly form, or keep it as is.
+#: ../src/modules/mail/e-mail-shell-backend.c:712
+msgctxt "NetworkMonitor"
+msgid "netlink"
+msgstr ""
+
+#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
+#. it to some user-frienly form, or keep it as is.
+#: ../src/modules/mail/e-mail-shell-backend.c:715
+msgctxt "NetworkMonitor"
+msgid "networkmanager"
+msgstr ""
+
+#: ../src/modules/mail/e-mail-shell-backend.c:749
+msgctxt "NetworkMonitor"
+msgid "Method to detect _online state:"
+msgstr ""
+
+#. Always as the first
+#: ../src/modules/mail/e-mail-shell-backend.c:758
+#, fuzzy
+#| msgid "Default"
+msgctxt "NetworkMonitor"
+msgid "Default"
+msgstr "デフォルト"
+
+#. Always as the last
+#: ../src/modules/mail/e-mail-shell-backend.c:772
+#, fuzzy
+#| msgid "_Always move"
+msgctxt "NetworkMonitor"
+msgid "Always Online"
+msgstr "常に移動(_A)"
+
+#: ../src/modules/mail/e-mail-shell-backend.c:832
 msgid "Mail Accounts"
 msgstr "メールのアカウント"
 
-#: ../modules/mail/e-mail-shell-backend.c:653
+#: ../src/modules/mail/e-mail-shell-backend.c:841
 msgid "Mail Preferences"
 msgstr "メールの設定"
 
-#: ../modules/mail/e-mail-shell-backend.c:662
+#: ../src/modules/mail/e-mail-shell-backend.c:850
 msgid "Composer Preferences"
 msgstr "コンポーザーの設定"
 
-#: ../modules/mail/e-mail-shell-backend.c:672
+#: ../src/modules/mail/e-mail-shell-backend.c:859
 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:964
+#: ../src/modules/mail/e-mail-shell-backend.c:1151
 msgctxt "label"
 msgid "None"
 msgstr "なし"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:670
+#: ../src/modules/mail/e-mail-shell-view-actions.c:734
 msgid "Marking messages as read..."
 msgstr "メッセージを既読にする..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1093
+msgid "Go to Folder"
+msgstr "フォルダーへ移動する"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1097
+msgid "_Select"
+msgstr "選択(_S)"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1650
 msgid "_Disable Account"
 msgstr "アカウントの無効化(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
 msgid "Disable this account"
 msgstr "このアカウントの無効にする"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1659
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "すべてのフォルダーで削除マークが付いたメッセージを完全に削除します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1528
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Edit properties of this account"
 msgstr "このアカウントのプロパティを編集"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Refresh list of folders of this account"
 msgstr "このアカウントのフォルダー一覧を更新します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1540
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
 msgid "_Download Messages for Offline Usage"
 msgstr "メッセージのダウンロード(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1542
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
 msgid "Download messages of accounts and folders marked for offline usage"
-msgstr "オフラインで参照するために指定したアカウントやフォルダーにあるメッセージをダウンロードします"
+msgstr ""
+"オフラインで参照するために指定したアカウントやフォルダーにあるメッセージをダ"
+"ウンロードします"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1547
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
 msgid "Fl_ush Outbox"
 msgstr "送信トレイのフラッシュ(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
 msgid "_Copy Folder To..."
 msgstr "フォルダーのコピー(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1556
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
 msgid "Copy the selected folder into another folder"
 msgstr "選択したフォルダーを別のフォルダーへコピーします"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1563
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
 msgid "Permanently remove this folder"
 msgstr "このフォルダーを完全に削除します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1568
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1706
 msgid "E_xpunge"
 msgstr "抹消(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1570
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1708
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "このフォルダーで削除マークが付いたメッセージを完全に削除します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1575
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1713
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1821
 msgid "Mar_k All Messages as Read"
 msgstr "すべて既読にする(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1577
-#: ../modules/mail/e-mail-shell-view-actions.c:1677
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1715
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1823
 msgid "Mark all messages in the folder as read"
 msgstr "フォルダーにあるすべてのメッセージに既読マークを付与します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1582
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1720
 msgid "_Move Folder To..."
 msgstr "フォルダーの移動(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1584
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1722
 msgid "Move the selected folder into another folder"
 msgstr "選択したフォルダーを別のフォルダーへ移動します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1589
+#. Translators: An action caption to create a new mail folder
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1728
 msgid "_New..."
 msgstr "新規(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1591
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1730
 msgid "Create a new folder for storing mail"
 msgstr "メールを格納するための新しいフォルダーを生成します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1598
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Change the properties of this folder"
 msgstr "このフォルダーの設定を変更します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1605
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Refresh the folder"
 msgstr "フォルダーの中身を更新します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1612
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
 msgid "Change the name of this folder"
 msgstr "このフォルダーの名前を変更します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1617
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1756
 msgid "Select Message _Thread"
 msgstr "スレッドグループの選択(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1619
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Select all messages in the same thread as the selected message"
 msgstr "選択したメッセージと同じスレッドのメッセージをすべて選択します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1624
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1763
 msgid "Select Message S_ubthread"
 msgstr "サブスレッドの選択(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
 msgid "Select all replies to the currently selected message"
 msgstr "選択したメッセージに対する返信をすべて選択します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1777
 msgid "Empty _Trash"
 msgstr "ゴミ箱を空にする(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1640
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1779
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "すべてのアカウントで削除マークが付いたメッセージを完全に削除します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1784
+msgid "Go to _Folder"
+msgstr "フォルダーへ移動する(_F)"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1786
+msgid "Opens a dialog to select a folder to go to"
+msgstr "ダイアログを開いて選択したフォルダーに移動します"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1791
 msgid "_New Label"
 msgstr "新しいラベル(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
+#. Translators: "None" is used in the message label context menu.
+#. *              It removes all labels from the selected messages.
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1800
 msgid "N_one"
 msgstr "なし(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1668
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1814
 msgid "_Manage Subscriptions"
 msgstr "購読を管理(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1670
-#: ../modules/mail/e-mail-shell-view-actions.c:1754
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1816
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1900
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "リモートサーバーにあるフォルダーの購読の開始/停止を切り替えます"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1828
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1849
 msgid "Send / _Receive"
 msgstr "送受信(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1830
 msgid "Send queued items and retrieve new items"
 msgstr "キューにあるメッセージを送信して新着メッセージを受信します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1835
 msgid "R_eceive All"
 msgstr "すべて受信(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1691
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1837
 msgid "Receive new items from all accounts"
 msgstr "すべてのアカウントの新しいアイテムを受信します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1842
 msgid "_Send All"
 msgstr "すべて送信(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1844
 msgid "Send queued items in all accounts"
 msgstr "すべてのアカウントのキューにあるメッセージを送信します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1726
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1872
 msgid "Cancel the current mail operation"
 msgstr "現在のメール操作を取り消します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1877
 msgid "Collapse All _Threads"
 msgstr "すべてのスレッドを折り畳む(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1879
 msgid "Collapse all message threads"
 msgstr "メッセージの全スレッドを折り畳んで表示します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1884
 msgid "E_xpand All Threads"
 msgstr "すべてのスレッドを展開する(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1740
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1886
 msgid "Expand all message threads"
 msgstr "メッセージの全スレッドを展開して表示します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1745
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1891
 msgid "_Message Filters"
 msgstr "フィルターの定義(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1747
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1893
 msgid "Create or edit rules for filtering new mail"
 msgstr "新着メールをフィルターするルールを作成したり編集します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1752
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1898
 msgid "_Subscriptions..."
 msgstr "購読(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1907
 msgid "F_older"
 msgstr "フォルダー(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1914
 msgid "_Label"
 msgstr "ラベル(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1785
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1931
 msgid "C_reate Search Folder From Search..."
 msgstr "検索結果から仮想フォルダーの作成(_R)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1792
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1938
 msgid "Search F_olders"
 msgstr "仮想フォルダーの編集(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1794
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
 msgid "Create or edit search folder definitions"
 msgstr "仮想フォルダーの定義を作成したり編集します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1833
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1979
 msgid "_New Folder..."
 msgstr "新しいフォルダー(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1861
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2007
 msgid "Show Message _Preview"
 msgstr "メッセージのプレビュー表示(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1863
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2009
 msgid "Show message preview pane"
 msgstr "メッセージのプレビューウィンドウを表示します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1869
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2015
+#, fuzzy
+#| msgid "Show Attachment _Bar"
+msgid "Show _Attachment Bar"
+msgstr "添付ファイルバーを表示する(_B)"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2017
+#, fuzzy
+#| msgid "Show message preview below the message list"
+msgid ""
+"Show Attachment Bar below the message preview pane when the message has "
+"attachments"
+msgstr "メッセージの一覧の下にメッセージのプレビューを表示します"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2023
 msgid "Show _Deleted Messages"
 msgstr "削除したメッセージを表示(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1871
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2025
 msgid "Show deleted messages with a line through them"
 msgstr "削除したメッセージを打ち消し線を付けて表示する"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1877
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2031
+msgid "Show _Junk Messages"
+msgstr "ジャンクメッセージを表示(_J)"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2033
+msgid "Show junk messages with a red line through them"
+msgstr "ジャンクメッセージを赤い打ち消し線を付けて表示する"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2039
 msgid "_Group By Threads"
 msgstr "スレッドでグループ化(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1879
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2041
 msgid "Threaded message list"
 msgstr "メッセージの一覧をスレッド表示"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1885
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2047
 msgid "_Unmatched Folder Enabled"
 msgstr "一致していないフォルダーの有効化(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1887
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2049
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "一致していない仮想フォルダーの有効/無効を切り替えます"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1907
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2069
 msgid "Show message preview below the message list"
 msgstr "メッセージの一覧の下にメッセージのプレビューを表示します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1914
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2076
 msgid "Show message preview alongside the message list"
 msgstr "メッセージの一覧の横にメッセージのプレビューを表示します"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1922
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2084
 msgid "All Messages"
 msgstr "すべてのメッセージ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1929
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2091
 msgid "Important Messages"
 msgstr "重要なメッセージ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1936
-msgid "Last 5 Days' Messages"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2098
+#, fuzzy
+#| msgid "Last 5 Days' Messages"
+msgid "Last 5 Days’ Messages"
 msgstr "この5日間のメッセージ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1943
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2105
 msgid "Messages Not Junk"
 msgstr "ジャンクではないメッセージ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1950
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2112
 msgid "Messages with Attachments"
 msgstr "添付ありのメッセージ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1957
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2119
+#, fuzzy
+#| msgid "Messages with Attachments"
+msgid "Messages with Notes"
+msgstr "添付ありのメッセージ"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2126
 msgid "No Label"
 msgstr "ラベルなしのメッセージ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1964
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2133
 msgid "Read Messages"
 msgstr "既読のメッセージ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1971
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2140
 msgid "Unread Messages"
 msgstr "未読のメッセージ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2023
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2147
+#, fuzzy
+#| msgid "Message Header"
+msgid "Message Thread"
+msgstr "メッセージのヘッダー"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2207
 msgid "Subject or Addresses contain"
 msgstr "件名またはアドレス"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2033
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2217
 msgid "All Accounts"
 msgstr "すべてのアカウント"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2040
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2224
 msgid "Current Account"
 msgstr "現在のアカウント"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2047
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2231
 msgid "Current Folder"
 msgstr "現在のフォルダー"
 
-#: ../modules/mail/e-mail-shell-view.c:636
+#: ../src/modules/mail/e-mail-shell-view.c:777
 msgid "All Account Search"
 msgstr "すべてのアカウントの検索"
 
-#: ../modules/mail/e-mail-shell-view.c:744
+#: ../src/modules/mail/e-mail-shell-view.c:885
 msgid "Account Search"
 msgstr "アカウントの検索"
 
-#: ../modules/mail/e-mail-shell-view-private.c:972
+#: ../src/modules/mail/e-mail-shell-view-private.c:931
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] " 選択済 %d通、"
 
-#: ../modules/mail/e-mail-shell-view-private.c:981
-#: ../modules/mail/e-mail-shell-view-private.c:998
+#: ../src/modules/mail/e-mail-shell-view-private.c:940
+#: ../src/modules/mail/e-mail-shell-view-private.c:957
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "削除済 %d通"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1007
-#: ../modules/mail/e-mail-shell-view-private.c:1013
+#: ../src/modules/mail/e-mail-shell-view-private.c:966
+#: ../src/modules/mail/e-mail-shell-view-private.c:972
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "ジャンク %d通"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1020
+#: ../src/modules/mail/e-mail-shell-view-private.c:979
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "下書き %d通"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../src/modules/mail/e-mail-shell-view-private.c:985
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "未送信 %d通"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../src/modules/mail/e-mail-shell-view-private.c:991
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "送信済 %d通"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1044
-#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
+#: ../src/modules/mail/e-mail-shell-view-private.c:1008
+#, fuzzy, c-format
+#| msgid "%d unread, "
+#| msgid_plural "%d unread, "
+msgid "%d unread"
+msgid_plural "%d unread"
 msgstr[0] "未読 %d通, "
 
-#: ../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:1068
-msgid "Trash"
-msgstr "ゴミ箱"
-
-#: ../modules/mail/e-mail-shell-view-private.c:1505
+#: ../src/modules/mail/e-mail-shell-view-private.c:1526
 msgid "Send / Receive"
 msgstr "送信 / 受信"
 
-#: ../modules/mail/em-composer-prefs.c:443
+#: ../src/modules/mail/em-composer-prefs.c:419
 msgid "Select Folder to Add"
 msgstr "追加するフォルダーの選択"
 
-#: ../modules/mail/em-composer-prefs.c:888
+#: ../src/modules/mail/em-composer-prefs.c:895
 msgid "Folder"
 msgstr "フォルダー"
 
-#: ../modules/mail/em-composer-prefs.c:924
+#: ../src/modules/mail/em-composer-prefs.c:931
 msgid "Recipient"
 msgstr "宛先"
 
-#: ../modules/mail/em-composer-prefs.c:1195
+#: ../src/modules/mail/em-composer-prefs.c:1222
+msgid "Keep in Outbox"
+msgstr "送信トレイに保管したまま"
+
+#: ../src/modules/mail/em-composer-prefs.c:1223
+msgid "Send immediately"
+msgstr "ただちに送信する"
+
+#: ../src/modules/mail/em-composer-prefs.c:1224
+msgid "Send after 5 minutes"
+msgstr "5分後に送信する"
+
+#: ../src/modules/mail/em-composer-prefs.c:1303
 msgid "Language(s)"
 msgstr "言語"
 
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../src/modules/mail/em-mailer-prefs.c:77
 msgid "On exit, every time"
 msgstr "終了時、毎回"
 
-#: ../modules/mail/em-mailer-prefs.c:81
-msgid "On exit, once per day"
+#: ../src/modules/mail/em-mailer-prefs.c:78
+#, fuzzy
+#| msgid "On exit, once per day"
+msgid "Once per day"
 msgstr "終了時、日に一度"
 
-#: ../modules/mail/em-mailer-prefs.c:82
-msgid "On exit, once per week"
+#: ../src/modules/mail/em-mailer-prefs.c:79
+#, fuzzy
+#| msgid "On exit, once per week"
+msgid "Once per week"
 msgstr "終了時、週に一度"
 
-#: ../modules/mail/em-mailer-prefs.c:83
-msgid "On exit, once per month"
+#: ../src/modules/mail/em-mailer-prefs.c:80
+#, fuzzy
+#| msgid "On exit, once per month"
+msgid "Once per month"
 msgstr "終了時、月に一度"
 
-#: ../modules/mail/em-mailer-prefs.c:84
+#: ../src/modules/mail/em-mailer-prefs.c:81
 msgid "Immediately, on folder leave"
 msgstr "フォルダーから離れるとき、直ちに"
 
-#: ../modules/mail/em-mailer-prefs.c:355
+#: ../src/modules/mail/em-mailer-prefs.c:418
 msgid "Header"
 msgstr "ヘッダー"
 
-#: ../modules/mail/em-mailer-prefs.c:359
+#: ../src/modules/mail/em-mailer-prefs.c:422
 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:1214
+#: ../src/modules/mail/em-mailer-prefs.c:1558
 msgid "_Date header:"
 msgstr "日付のヘッダー(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1215
+#: ../src/modules/mail/em-mailer-prefs.c:1559
 msgid "Show _original header value"
 msgstr "元のヘッダーの値を表示(_O):"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:140
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:138
 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:307
-#, c-format
-msgid "Your message to %s about \"%s\" on %s has been read."
+#: ../src/modules/mdn/evolution-mdn.c:308
+#, fuzzy, c-format
+#| msgid "Your message to %s about \"%s\" on %s has been read."
+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:374
-#, c-format
-msgid "Delivery Notification for \"%s\""
+#: ../src/modules/mdn/evolution-mdn.c:374
+#, fuzzy, c-format
+#| msgid "Delivery Notification for \"%s\""
+msgid "Delivery Notification for “%s”"
 msgstr "メール配送通知: \"%s\""
 
-#: ../modules/mdn/evolution-mdn.c:539
-#, c-format
-msgid "Send a read receipt to '%s'"
+#: ../src/modules/mdn/evolution-mdn.c:540
+#, fuzzy, c-format
+#| msgid "Send a read receipt to '%s'"
+msgid "Send a read receipt to “%s”"
 msgstr "'%s' に開封通知を送信する"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:544
+#: ../src/modules/mdn/evolution-mdn.c:545
 msgid "_Notify Sender"
 msgstr "送信者に通知(_N)"
 
-#: ../modules/mdn/evolution-mdn.error.xml.h:1
+#: ../src/modules/mdn/evolution-mdn.error.xml.h:1
 msgid "Sender wants to be notified when you have read this message."
 msgstr "送信者はこのメッセージを読んだことについての通知を希望しています。"
 
-#: ../modules/mdn/evolution-mdn.error.xml.h:2
+#: ../src/modules/mdn/evolution-mdn.error.xml.h:2
 msgid "Sender has been notified that you have read this message."
 msgstr "このメッセージを読んだことについて送信者に通知されました。"
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+#: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:1
 msgid "Evolution is currently offline."
 msgstr "Evolution は現在オフラインです。"
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
-msgid "Click 'Work Online' to return to online mode."
+#: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:2
+#, fuzzy
+#| msgid "Click 'Work Online' to return to online mode."
+msgid "Click “Work Online” to return to online mode."
 msgstr "「オンラインで動作」をクリックしてオンラインモードに復帰してください。"
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
+#: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:3
 msgid "Evolution is currently offline due to a network outage."
 msgstr "ネットワークの問題のため、Evolution は現在オフラインです。"
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
-msgid "Evolution will return to online mode once a network connection is established."
-msgstr "ネットワークの接続が確立すると、Evolution はオンラインモードに復帰します。"
+#: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:4
+msgid ""
+"Evolution will return to online mode once a network connection is "
+"established."
+msgstr ""
+"ネットワークの接続が確立すると、Evolution はオンラインモードに復帰します。"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:65
 msgid "Author(s)"
 msgstr "作者"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:253
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:251
 msgid "Plugin Manager"
 msgstr "プラグインマネージャー"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:268
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:266
 msgid "Note: Some changes will not take effect until restart"
-msgstr "注記: プラグインに対するいくつかの変更は再起動するまで有効になりません。"
+msgstr ""
+"注記: プラグインに対するいくつかの変更は再起動するまで有効になりません。"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:297
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:294
 msgid "Overview"
 msgstr "概要"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:366
-#: ../modules/plugin-manager/evolution-plugin-manager.c:449
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:363
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:446
 msgid "Plugin"
 msgstr "プラグイン"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:484
 msgid "_Plugins"
 msgstr "プラグイン(_P)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:485
 msgid "Enable and disable plugins"
 msgstr "プラグインの有効/無効を管理します"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:137
 msgid "Display plain text version"
 msgstr "プレーンテキスト版を表示"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:141
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
 msgid "Display plain text version of multipart/alternative message"
 msgstr "multipart/alternative メッセージのプレーンテキスト版を表示します"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:145
 msgid "Display HTML version"
 msgstr "HTML 版を表示"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:149
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
 msgid "Display HTML version of multipart/alternative message"
 msgstr "multipart/alternative メッセージの HTML 版を表示します"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:77
-#: ../modules/prefer-plain/plugin/config-ui.c:43
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../src/modules/prefer-plain/plugin/config-ui.c:35
 msgid "Show HTML if present"
 msgstr "可能ならば HTML を表示する"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
-#: ../modules/prefer-plain/plugin/config-ui.c:44
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../src/modules/prefer-plain/plugin/config-ui.c:36
 msgid "Let Evolution choose the best part to show."
 msgstr "Evolution に表示するのに最適なパートを選択させます。"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:81
-#: ../modules/prefer-plain/plugin/config-ui.c:47
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../src/modules/prefer-plain/plugin/config-ui.c:39
 msgid "Show plain text if present"
 msgstr "存在するならプレーンテキストを表示する"
 
-#: ../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 に選択させます。"
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../src/modules/prefer-plain/plugin/config-ui.c:40
+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:86
-#: ../modules/prefer-plain/plugin/config-ui.c:52
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../src/modules/prefer-plain/plugin/config-ui.c:44
+#, fuzzy
+#| msgid "Show plain text if present"
+msgid "Show plain text if present, or HTML source"
+msgstr "存在するならプレーンテキストを表示する"
+
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../src/modules/prefer-plain/plugin/config-ui.c:45
+#, fuzzy
+#| msgid ""
+#| "Show plain text part, if present, otherwise let Evolution choose the best "
+#| "part to show."
+msgid "Show plain text part, if present, otherwise the HTML part source."
+msgstr ""
+"存在しているなら、プレーンテキストのパートを表示する。そうでない場合、表示す"
+"るのに適したパートを Evolution に選択させます。"
+
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:91
+#: ../src/modules/prefer-plain/plugin/config-ui.c:49
 msgid "Only ever show plain text"
 msgstr "プレーンテキストのみを常に表示"
 
-#: ../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 "常にプレーンテキストのみ表示し、要求があれば他のパートは添付ファイルにします。"
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:92
+#: ../src/modules/prefer-plain/plugin/config-ui.c:50
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
+"常にプレーンテキストのみ表示し、要求があれば他のパートは添付ファイルにしま"
+"す。"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:104
+#: ../src/modules/prefer-plain/plugin/config-ui.c:101
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "表示されなかった HTML パートを添付として表示(_U)"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:126
+#: ../src/modules/prefer-plain/plugin/config-ui.c:123
 msgid "HTML _Mode"
 msgstr "HTML モード(_M)"
 
-#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
+#: ../src/modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:1
 msgid "Prefer Plain Text"
 msgstr "プレーンテキストを優先"
 
 #. but then we also need to create our own section frame
-#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:3
+#: ../src/modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:3
 msgid "Plain Text Mode"
 msgstr "プレーンテキストモード"
 
-#: ../modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:4
+#: ../src/modules/prefer-plain/plugin/org-gnome-prefer-plain.eplug.xml.h:4
 msgid "View mail messages as plain text, even if they contain HTML content."
-msgstr "HTML の内容を含んでいても、メールメッセージをプレーンテキストとして表示します。"
+msgstr ""
+"HTML の内容を含んでいても、メールメッセージをプレーンテキストとして表示しま"
+"す。"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:150
+#: ../src/modules/spamassassin/evolution-spamassassin.c:188
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "SpamAssassin の起動に失敗しました (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:173
+#: ../src/modules/spamassassin/evolution-spamassassin.c:211
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "SpamAssassin にメッセージの内容を受け渡すのに失敗しました:"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:192
-#, c-format
-msgid "Failed to write '%s' to SpamAssassin: "
+#: ../src/modules/spamassassin/evolution-spamassassin.c:230
+#, fuzzy, c-format
+#| msgid "Failed to write '%s' to SpamAssassin: "
+msgid "Failed to write “%s” to SpamAssassin: "
 msgstr "'%s' の SpamAssassin への書き出しに失敗しました"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:220
+#: ../src/modules/spamassassin/evolution-spamassassin.c:258
 msgid "Failed to read output from SpamAssassin: "
 msgstr "SpamAssassin から出力を読み取るのに失敗しました: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:275
+#: ../src/modules/spamassassin/evolution-spamassassin.c:313
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "SpamAssassin がクラッシュしたか、メールメッセージの処理に失敗しました"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:355
+#: ../src/modules/spamassassin/evolution-spamassassin.c:536
 msgid "SpamAssassin Options"
 msgstr "SpamAssassin のオプション"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:370
+#: ../src/modules/spamassassin/evolution-spamassassin.c:551
 msgid "I_nclude remote tests"
 msgstr "リモートサーバーもテストする(_N)"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:384
+#: ../src/modules/spamassassin/evolution-spamassassin.c:565
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "これは SpamAssassin の信頼性を上げますが低速になります"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:558
+#: ../src/modules/spamassassin/evolution-spamassassin.c:740
+#: ../src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
+#: ../src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+#, fuzzy
+#| msgid "Junk filtering software:"
+msgid "Junk filter using SpamAssassin"
+msgstr "ジャンクフィルターのソフトウェア:"
+
 #. 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:261
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:340
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:271
+#: ../src/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:259
+#: ../src/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:276
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:276
 msgid "Import complete."
 msgstr "インポート完了。"
 
-#: ../modules/startup-wizard/e-startup-assistant.c:155
+#: ../src/modules/startup-wizard/e-startup-assistant.c:156
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
-"The next few screens will allow Evolution to connect to your email accounts, and to import files from other 
applications."
+"The next few screens will allow Evolution to connect to your email accounts, "
+"and to import files from other applications."
 msgstr ""
 "Evolution へようこそ。\n"
 "\n"
-"これ以降のステップでは Evolution をお使いのメールアカウントへ接続して、他のアプリケーションからファイルをインポートできるようにします。"
+"これ以降のステップでは Evolution をお使いのメールアカウントへ接続して、他のア"
+"プリケーションからファイルをインポートできるようにします。"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:228
+#: ../src/modules/startup-wizard/evolution-startup-wizard.c:226
 msgid "Loading accounts..."
 msgstr "アカウントの読み込み中..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:94
+#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:93
 msgid "_Format as..."
 msgstr "言語を指定して整形(_F)..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:102
+#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:101
 msgid "_Other languages"
 msgstr "他の言語(_O)"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:481
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:436
 msgid "Text Highlight"
 msgstr "テキストの強調表示"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:482
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:437
 msgid "Syntax highlighting of mail parts"
 msgstr "メール中の構文を強調表示します"
 
-#: ../modules/text-highlight/languages.c:31
+#: ../src/modules/text-highlight/languages.c:29
 msgid "_Plain text"
 msgstr "プレーンテキスト(_P)"
 
-#: ../modules/text-highlight/languages.c:37
+#: ../src/modules/text-highlight/languages.c:35
 msgid "_Assembler"
 msgstr "アセンブラ(_A)"
 
-#: ../modules/text-highlight/languages.c:42
+#: ../src/modules/text-highlight/languages.c:40
 msgid "_Bash"
 msgstr "_Bash"
 
-#: ../modules/text-highlight/languages.c:53
+#: ../src/modules/text-highlight/languages.c:51
 msgid "_C/C++"
 msgstr "_C/C++"
 
-#: ../modules/text-highlight/languages.c:62
+#: ../src/modules/text-highlight/languages.c:60
 msgid "_C#"
 msgstr "_C#"
 
-#: ../modules/text-highlight/languages.c:67
+#: ../src/modules/text-highlight/languages.c:65
 msgid "_Cascade Style Sheet"
 msgstr "カスケードスタイルシート(_CSS)"
 
-#: ../modules/text-highlight/languages.c:72
-msgid "_HTML"
-msgstr "_HTML"
-
-#: ../modules/text-highlight/languages.c:80
+#: ../src/modules/text-highlight/languages.c:78
 msgid "_Java"
 msgstr "_Java"
 
-#: ../modules/text-highlight/languages.c:86
+#: ../src/modules/text-highlight/languages.c:84
 msgid "_JavaScript"
 msgstr "_JavaScript"
 
-#: ../modules/text-highlight/languages.c:92
+#: ../src/modules/text-highlight/languages.c:90
 msgid "_Patch/diff"
 msgstr "パッチ/diff(_P)"
 
-#: ../modules/text-highlight/languages.c:98
+#: ../src/modules/text-highlight/languages.c:96
 msgid "_Perl"
 msgstr "_Perl"
 
-#: ../modules/text-highlight/languages.c:109
+#: ../src/modules/text-highlight/languages.c:107
 msgid "_PHP"
 msgstr "_PHP"
 
-#: ../modules/text-highlight/languages.c:122
+#: ../src/modules/text-highlight/languages.c:120
 msgid "_Python"
 msgstr "_Python"
 
-#: ../modules/text-highlight/languages.c:127
+#: ../src/modules/text-highlight/languages.c:125
 msgid "_Ruby"
 msgstr "_Ruby"
 
-#: ../modules/text-highlight/languages.c:134
+#: ../src/modules/text-highlight/languages.c:132
 msgid "_Tcl/Tk"
 msgstr "_Tcl/Tk"
 
-#: ../modules/text-highlight/languages.c:140
+#: ../src/modules/text-highlight/languages.c:138
 msgid "_TeX/LaTeX"
 msgstr "_TeX/LaTeX"
 
-#: ../modules/text-highlight/languages.c:146
+#: ../src/modules/text-highlight/languages.c:144
 msgid "_Vala"
 msgstr "_Vala"
 
-#: ../modules/text-highlight/languages.c:151
+#: ../src/modules/text-highlight/languages.c:149
 msgid "_Visual Basic"
 msgstr "_Visual Basic"
 
-#: ../modules/text-highlight/languages.c:158
+#: ../src/modules/text-highlight/languages.c:156
 msgid "_XML"
 msgstr "_XML"
 
-#: ../modules/text-highlight/languages.c:176
+#: ../src/modules/text-highlight/languages.c:174
 msgid "_ActionScript"
 msgstr "_ActionScript"
 
-#: ../modules/text-highlight/languages.c:181
+#: ../src/modules/text-highlight/languages.c:179
 msgid "_ADA95"
 msgstr "_ADA95"
 
-#: ../modules/text-highlight/languages.c:188
+#: ../src/modules/text-highlight/languages.c:186
 msgid "_ALGOL 68"
 msgstr "_ALGOL 68"
 
-#: ../modules/text-highlight/languages.c:193
+#: ../src/modules/text-highlight/languages.c:191
 msgid "(_G)AWK"
 msgstr "(_G)AWK"
 
-#: ../modules/text-highlight/languages.c:198
+#: ../src/modules/text-highlight/languages.c:196
 msgid "_COBOL"
 msgstr "_COBOL"
 
-#: ../modules/text-highlight/languages.c:203
+#: ../src/modules/text-highlight/languages.c:201
 msgid "_DOS Batch"
 msgstr "_DOS バッチ"
 
-#: ../modules/text-highlight/languages.c:208
+#: ../src/modules/text-highlight/languages.c:206
 msgid "_D"
 msgstr "_D"
 
-#: ../modules/text-highlight/languages.c:213
+#: ../src/modules/text-highlight/languages.c:211
 msgid "_Erlang"
 msgstr "_Erlang"
 
-#: ../modules/text-highlight/languages.c:218
+#: ../src/modules/text-highlight/languages.c:216
 msgid "_FORTRAN 77"
 msgstr "_FORTRAN 77"
 
-#: ../modules/text-highlight/languages.c:224
+#: ../src/modules/text-highlight/languages.c:222
 msgid "_FORTRAN 90"
 msgstr "_FORTRAN 90"
 
-#: ../modules/text-highlight/languages.c:229
+#: ../src/modules/text-highlight/languages.c:227
 msgid "_F#"
 msgstr "_F#"
 
-#: ../modules/text-highlight/languages.c:234
+#: ../src/modules/text-highlight/languages.c:232
 msgid "_Go"
 msgstr "_Go"
 
-#: ../modules/text-highlight/languages.c:239
+#: ../src/modules/text-highlight/languages.c:237
 msgid "_Haskell"
 msgstr "_Haskell"
 
-#: ../modules/text-highlight/languages.c:244
+#: ../src/modules/text-highlight/languages.c:242
 msgid "_JSP"
 msgstr "_JSP"
 
-#: ../modules/text-highlight/languages.c:249
+#: ../src/modules/text-highlight/languages.c:247
 msgid "_Lisp"
 msgstr "_Lisp"
 
-#: ../modules/text-highlight/languages.c:257
+#: ../src/modules/text-highlight/languages.c:255
 msgid "_Lotus"
 msgstr "_Lotus"
 
-#: ../modules/text-highlight/languages.c:262
+#: ../src/modules/text-highlight/languages.c:260
 msgid "_Lua"
 msgstr "_Lua"
 
-#: ../modules/text-highlight/languages.c:267
+#: ../src/modules/text-highlight/languages.c:265
 msgid "_Maple"
 msgstr "_Maple"
 
-#: ../modules/text-highlight/languages.c:272
+#: ../src/modules/text-highlight/languages.c:270
 msgid "_Matlab"
 msgstr "_Matlab"
 
-#: ../modules/text-highlight/languages.c:277
+#: ../src/modules/text-highlight/languages.c:275
 msgid "_Maya"
 msgstr "_Maya"
 
-#: ../modules/text-highlight/languages.c:282
+#: ../src/modules/text-highlight/languages.c:280
 msgid "_Oberon"
 msgstr "_Oberon"
 
-#: ../modules/text-highlight/languages.c:287
+#: ../src/modules/text-highlight/languages.c:285
 msgid "_Objective C"
 msgstr "_Objective C"
 
-#: ../modules/text-highlight/languages.c:293
+#: ../src/modules/text-highlight/languages.c:291
 msgid "_OCaml"
 msgstr "_OCaml"
 
-#: ../modules/text-highlight/languages.c:298
+#: ../src/modules/text-highlight/languages.c:296
 msgid "_Octave"
 msgstr "_Octave"
 
-#: ../modules/text-highlight/languages.c:303
+#: ../src/modules/text-highlight/languages.c:301
 msgid "_Object Script"
 msgstr "_Object Script"
 
-#: ../modules/text-highlight/languages.c:308
+#: ../src/modules/text-highlight/languages.c:306
 msgid "_Pascal"
 msgstr "_Pascal"
 
-#: ../modules/text-highlight/languages.c:313
+#: ../src/modules/text-highlight/languages.c:311
 msgid "_POV-Ray"
 msgstr "_POV-Ray"
 
-#: ../modules/text-highlight/languages.c:318
+#: ../src/modules/text-highlight/languages.c:316
 msgid "_Prolog"
 msgstr "_Prolog"
 
-#: ../modules/text-highlight/languages.c:323
-msgid "_PostScript"
-msgstr "_PostScript"
-
-#: ../modules/text-highlight/languages.c:328
+#: ../src/modules/text-highlight/languages.c:321
 msgid "_R"
 msgstr "_R"
 
-#: ../modules/text-highlight/languages.c:333
+#: ../src/modules/text-highlight/languages.c:326
 msgid "_RPM Spec"
 msgstr "_RPM Spec"
 
-#: ../modules/text-highlight/languages.c:338
+#: ../src/modules/text-highlight/languages.c:331
 msgid "_Scala"
 msgstr "_Scala"
 
-#: ../modules/text-highlight/languages.c:343
+#: ../src/modules/text-highlight/languages.c:336
 msgid "_Smalltalk"
 msgstr "_Smalltalk"
 
-#: ../modules/text-highlight/languages.c:349
+#: ../src/modules/text-highlight/languages.c:342
 msgid "_TCSH"
 msgstr "_TCSH"
 
-#: ../modules/text-highlight/languages.c:354
+#: ../src/modules/text-highlight/languages.c:347
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:131
-#: ../modules/vcard-inline/e-mail-part-vcard.c:151
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:129
+#: ../src/modules/vcard-inline/e-mail-part-vcard.c:188
 msgid "Show F_ull vCard"
 msgstr "すべての vCard の表示(_U)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:134
-#: ../modules/vcard-inline/e-mail-part-vcard.c:169
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:132
+#: ../src/modules/vcard-inline/e-mail-part-vcard.c:193
 msgid "Show Com_pact vCard"
 msgstr "vCard の表示 (簡易)(_P)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:162
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:163
 msgid "Save _To Addressbook"
 msgstr "アドレス帳に保存(_T)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:187
 msgid "There is one other contact."
 msgstr "他に 1個の連絡先があります。"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
+#. Translators: This will always be two or more.
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:192
 #, 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:215
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:218
 msgid "Addressbook Contact"
 msgstr "アドレス帳の連絡先"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:216
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:219
 msgid "Display the part as an addressbook contact"
 msgstr "アドレス帳の連絡先として表示"
 
-#: ../modules/web-inspector/evolution-web-inspector.c:95
-msgid "Evolution Web Inspector"
-msgstr "Evolution ウェブインスペクター"
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:122
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:169
 msgid "_Do not show this message again."
 msgstr "次回からこのメッセージを表示しない(_D)"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:584
-#: ../plugins/templates/templates.c:478
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:570
+#: ../src/plugins/templates/templates.c:488
 msgid "Keywords"
 msgstr "キーワード"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
 msgid "Message has no attachments"
 msgstr "メッセージにはファイルが添付されていません"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
-msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but 
cannot find one."
-msgstr "メッセージの内容から、このメールには何かファイルが添付されているはずなのですが、実際には何も添付されていないようです。"
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr ""
+"メッセージの内容から、このメールには何かファイルが添付されているはずなのです"
+"が、実際には何も添付されていないようです。"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add Attachment..."
 msgstr "添付ファイルの追加(_A)..."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
 msgstr "メッセージの編集(_E)"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#: ../src/plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 msgid "Attachment Reminder"
 msgstr "添付し忘れの防止"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+#: ../src/plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "メールのメッセージに添付し忘れた時に通知します。"
 
-#: ../plugins/bbdb/bbdb.c:636 ../plugins/bbdb/bbdb.c:645
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+#: ../src/plugins/bbdb/bbdb.c:735 ../src/plugins/bbdb/bbdb.c:846
+#: ../src/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "連絡先の自動生成"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:660
+#: ../src/plugins/bbdb/bbdb.c:750
 msgid "Create _address book entries when sending mails"
 msgstr "メッセージを送ったらアドレス帳に登録する(_A)"
 
-#: ../plugins/bbdb/bbdb.c:667
+#: ../src/plugins/bbdb/bbdb.c:760
 msgid "Select Address book for Automatic Contacts"
 msgstr "連絡先の自動登録に使用するアドレス帳を選択してください:"
 
-#: ../plugins/bbdb/bbdb.c:684
+#: ../src/plugins/bbdb/bbdb.c:780
 msgid "Instant Messaging Contacts"
 msgstr "インスタントメッセンジャーの連絡先"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:699
+#: ../src/plugins/bbdb/bbdb.c:795
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "Pidgin の仲間リストから連絡先とその画像を同期(_S)"
 
-#: ../plugins/bbdb/bbdb.c:706
+#: ../src/plugins/bbdb/bbdb.c:805
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Pidgin の仲間リストとして使用するアドレス帳を選択してください:"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:719
+#: ../src/plugins/bbdb/bbdb.c:821
 msgid "Synchronize with _buddy list now"
 msgstr "今すぐ仲間リストを同期する(_B)"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+#: ../src/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid "BBDB"
 msgstr "BBDB"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+#: ../src/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid ""
 "Takes the gruntwork out of managing your address book.\n"
 "\n"
-"Automatically fills your address book with names and email addresses as you reply to messages.  Also fills 
in IM contact information from your buddy lists."
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
 msgstr ""
 "アドレス帳の管理の仕事のうち、面倒くさい仕事を代行します。\n"
 "\n"
-"メッセージに返信した際に氏名とメールアドレスを自動的にアドレス帳に追加します。また、仲間リストから自動的にインスタントメッセンジャーの連絡先情報を追加します。"
+"メッセージに返信した際に氏名とメールアドレスを自動的にアドレス帳に追加しま"
+"す。また、仲間リストから自動的にインスタントメッセンジャーの連絡先情報を追加"
+"します。"
 
-#: ../plugins/dbx-import/dbx-importer.c:278
+#: ../src/plugins/dbx-import/dbx-importer.c:274
 msgid "Importing Outlook Express data"
 msgstr "Outlook Express のデータのインポート中"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+#: ../src/plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
 msgid "Outlook DBX import"
 msgstr "Outlook DBX のインポート"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+#: ../src/plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "Outlook Express 5/6 の個人のフォルダー (.dbx)"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#: ../src/plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
 msgid "Import Outlook Express messages from DBX file"
 msgstr "DBX ファイルから Outlook Express のメッセージをインポートする"
 
-#: ../plugins/email-custom-header/email-custom-header.c:293
+#: ../src/plugins/email-custom-header/email-custom-header.c:291
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "セキュリティ:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:297
+#: ../src/plugins/email-custom-header/email-custom-header.c:295
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "個人的"
 
-#: ../plugins/email-custom-header/email-custom-header.c:298
+#: ../src/plugins/email-custom-header/email-custom-header.c:296
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "未分類"
 
-#: ../plugins/email-custom-header/email-custom-header.c:299
+#: ../src/plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "保護済"
 
-#: ../plugins/email-custom-header/email-custom-header.c:300
+#: ../src/plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "部外秘"
 
-#: ../plugins/email-custom-header/email-custom-header.c:301
+#: ../src/plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "機密"
 
-#: ../plugins/email-custom-header/email-custom-header.c:302
+#: ../src/plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "極秘"
 
-#: ../plugins/email-custom-header/email-custom-header.c:362
+#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from 
Composer,
+#. * indicating the header will not be added to a mail message
+#: ../src/plugins/email-custom-header/email-custom-header.c:360
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "なし"
 
-#: ../plugins/email-custom-header/email-custom-header.c:538
+#: ../src/plugins/email-custom-header/email-custom-header.c:537
 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:808
+#: ../src/plugins/email-custom-header/email-custom-header.c:807
+#, fuzzy
+#| msgid ""
+#| "The format for specifying a Custom Header key value is:\n"
+#| "Name of the Custom Header key values separated by \";\"."
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
-"Name of the Custom Header key values separated by \";\"."
+"Name of the Custom Header key values separated by “;”."
 msgstr ""
 "独自ヘッダーを構成する情報をキーとその値で指定してください:\n"
 "キーの値は \";\" 文字で区切ってください。"
 
-#: ../plugins/email-custom-header/email-custom-header.c:861
+#: ../src/plugins/email-custom-header/email-custom-header.c:860
 msgid "Key"
 msgstr "キー"
 
-#: ../plugins/email-custom-header/email-custom-header.c:878
-#: ../plugins/templates/templates.c:487
+#: ../src/plugins/email-custom-header/email-custom-header.c:877
+#: ../src/plugins/templates/templates.c:497
 msgid "Values"
 msgstr "値"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
 msgid "Custom Header"
 msgstr "独自のヘッダー"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to 
specify what value for the message header would be added
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Add custom headers to outgoing mail messages."
 msgstr "送信するメールのメッセージに独自のヘッダーを付加します。"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
 msgid "Email Custom Header"
 msgstr "メールの独自ヘッダー"
 
-#: ../plugins/external-editor/external-editor.c:113
+#: ../src/plugins/external-editor/external-editor.c:111
 msgid "Command to be executed to launch the editor: "
 msgstr "起動するエディターのコマンド: "
 
-#: ../plugins/external-editor/external-editor.c:114
+#: ../src/plugins/external-editor/external-editor.c:112
+#, fuzzy
+#| msgid ""
+#| "For XEmacs use \"xemacs\"\n"
+#| "For Vim use \"gvim -f\""
 msgid ""
-"For XEmacs use \"xemacs\"\n"
-"For Vim use \"gvim -f\""
+"For XEmacs use “xemacs”\n"
+"For Vim use “gvim -f”"
 msgstr ""
 "XEmacs ならば \"xemacs\"\n"
 "Vim ならば \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:124
+#: ../src/plugins/external-editor/external-editor.c:122
 msgid "_Automatically launch when a new mail is edited"
 msgstr "新規メールの作成時に自動的に起動(_A)"
 
-#: ../plugins/external-editor/external-editor.c:417
-#: ../plugins/external-editor/external-editor.c:419
+#: ../src/plugins/external-editor/external-editor.c:453
+#: ../src/plugins/external-editor/external-editor.c:455
 msgid "Compose in External Editor"
 msgstr "外部エディターで文章を作成"
 
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+#: ../src/plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid "External Editor"
 msgstr "外部エディター"
 
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+#: ../src/plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
 msgid "Use an external editor to compose plain-text mail messages."
-msgstr "プレーンテキストのメールの作成で外部エディターを利用するプラグインです。"
+msgstr ""
+"プレーンテキストのメールの作成で外部エディターを利用するプラグインです。"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Editor not launchable"
 msgstr "エディターを起動できません"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
-msgid "The external editor set in your plugin preferences cannot be launched. Try setting a different 
editor."
-msgstr "プラグインの設定で指定した外部エディターを起動できません。別のエディターを指定してみてください。"
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"プラグインの設定で指定した外部エディターを起動できません。別のエディターを指"
+"定してみてください。"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid "Cannot create Temporary File"
 msgstr "作業用のファイルを作成できません。"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
-msgid "Evolution is unable to create a temporary file to save your mail. Retry later."
-msgstr "メールを保存するための作業ファイルを生成できませんでした (あとでもう一度実行してみてください)。"
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr ""
+"メールを保存するための作業ファイルを生成できませんでした (あとでもう一度実行"
+"してみてください)。"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:5
 msgid "External editor still running"
 msgstr "外部エディターがまだ動作中です"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid "The external editor is still running. The mail composer window cannot be closed as long as the editor 
is active."
-msgstr "外部エディターがまだ動作中です。外部エディターが動作中の間はメール作成ウィンドウを閉じることができません。"
+#: ../src/plugins/external-editor/org-gnome-external-editor.error.xml.h:6
+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:288
+#: ../src/plugins/face/face.c:292
 msgid "Select a Face Picture"
 msgstr "顔写真の選択"
 
-#: ../plugins/face/face.c:298
+#: ../src/plugins/face/face.c:302
 msgid "Image files"
 msgstr "画像ファイル"
 
-#: ../plugins/face/face.c:357
+#: ../src/plugins/face/face.c:390
 msgid "_Insert Face picture by default"
 msgstr "顔写真をデフォルトで添付(_I)"
 
-#: ../plugins/face/face.c:370
+#: ../src/plugins/face/face.c:403
 msgid "Load new _Face picture"
 msgstr "新しい顔写真を読み込み(_F)"
 
-#: ../plugins/face/face.c:431
+#: ../src/plugins/face/face.c:447
+msgid "Change Face Image"
+msgstr ""
+
+#: ../src/plugins/face/face.c:535
 msgid "Include _Face"
 msgstr "顔を挿入(_F)"
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../src/plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Attach a small picture of your face to outgoing messages."
 msgstr "送信するメッセージに小さなあなたの顔画像を添付する"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:1
+#: ../src/plugins/face/org-gnome-face.error.xml.h:1
 msgid "Failed Read"
 msgstr "読み込みに失敗"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:2
+#: ../src/plugins/face/org-gnome-face.error.xml.h:2
 msgid "The file cannot be read"
 msgstr "そのアイテムは読めません"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:3
+#: ../src/plugins/face/org-gnome-face.error.xml.h:3
 msgid "Invalid Image Size"
 msgstr "不正な画像サイズ"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:4
-msgid "Please select an image of size 48 * 48"
-msgstr "48x48 の大きさの画像を選択してください"
+#: ../src/plugins/face/org-gnome-face.error.xml.h:4
+msgid ""
+"Please select a PNG image of size 48 × 48 pixels, whose file size doesn’t "
+"exceed 723 bytes."
+msgstr ""
+
+#: ../src/plugins/face/org-gnome-face.error.xml.h:5
+msgid "Incorrect Face Image Byte Size"
+msgstr ""
 
-#: ../plugins/face/org-gnome-face.error.xml.h:5
+#: ../src/plugins/face/org-gnome-face.error.xml.h:6
+msgid ""
+"The Face image size is {0} bytes, while it should not be more than 723 "
+"bytes. Please select a PNG image of size 48 × 48 pixels, whose file size "
+"doesn’t exceed 723 bytes."
+msgstr ""
+
+#: ../src/plugins/face/org-gnome-face.error.xml.h:7
 msgid "Not an image"
 msgstr "画像ではありません"
 
-#: ../plugins/face/org-gnome-face.error.xml.h:6
-msgid "The file you selected does not look like a valid .png image. Error: {0}"
+#: ../src/plugins/face/org-gnome-face.error.xml.h:8
+#, fuzzy
+#| msgid ""
+#| "The file you selected does not look like a valid .png image. Error: {0}"
+msgid "The file you selected does not look like a valid PNG image. Error: {0}"
 msgstr "選択したファイルは正しい .png 画像ではないようです。エラー: {0}"
 
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-msgid "Inline Image"
-msgstr "インライン画像"
-
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-msgid "View image attachments directly in mail messages."
-msgstr "添付画像を直接メール中に表示します。"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:413
 msgid "Get List _Archive"
 msgstr "アーカイブの取得(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:415
 msgid "Get an archive of the list this message belongs to"
 msgstr "このメーリングリストの過去メールをまとめたアーカイブを取得します"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:371
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:420
+#, fuzzy
+#| msgid "_Message Source"
+msgid "Copy _Message Archive URL"
+msgstr "メッセージのソース(_M)"
+
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:422
+#, fuzzy
+#| msgid "Redirect (bounce) the selected message to someone"
+msgid "Copy direct URL for the selected message in its archive"
+msgstr "選択したメッセージを誰かに転送します"
+
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:427
 msgid "Get List _Usage Information"
 msgstr "使用方法の取得(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:429
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "このメーリングリストの使い方について情報を取得します"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:378
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:434
 msgid "Contact List _Owner"
 msgstr "管理者に連絡する(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:436
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "このメーリングリストの管理者へメールを送信します"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:385
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:441
 msgid "_Post Message to List"
 msgstr "メーリングリストへ投稿(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:443
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "このメーリングリストへメッセージを投稿します"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:392
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:448
 msgid "_Subscribe to List"
 msgstr "メーリングリストの購読(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:450
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "このメーリングリストを購読します"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:399
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:455
 msgid "_Unsubscribe from List"
 msgstr "メーリングリストの購読停止(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:457
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "このメッセージが送られてきたメーリングリストの購読を停止します"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:464
 msgid "Mailing _List"
 msgstr "メーリングリスト(_L)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Mailing List Actions"
 msgstr "メーリングリストの操作"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr "メーリングリストに共通なコマンド (購読とか購読解除など) を実行します。"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
 msgstr "その操作は利用できません"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
-msgid "This message does not contain the header information required for this action."
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
+msgid ""
+"This message does not contain the header information required for this "
+"action."
 msgstr "このメッセージには、その操作に必要なヘッダー情報が含まれていません。"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
 msgid "Posting not allowed"
 msgstr "投稿できません"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:4
-msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the 
list owner for details."
-msgstr "このメーリングリストへ投稿できません。おそらく閲覧専用のメーリングリストのようです。詳細はメーリングリストの管理者に問い合わせてください。"
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:4
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+"このメーリングリストへ投稿できません。おそらく閲覧専用のメーリングリストのよ"
+"うです。詳細はメーリングリストの管理者に問い合わせてください。"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Send e-mail message to mailing list?"
 msgstr "メーリングリストへメッセージを送信しますか?"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+#, fuzzy
+#| msgid ""
+#| "An e-mail message will be sent to the URL \"{0}\". You can either send "
+#| "the message automatically, or see and change it first.\n"
+#| "\n"
+#| "You should receive an answer from the mailing list shortly after the "
+#| "message has been sent."
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see 
and change it first.\n"
+"An e-mail message will be sent to the URL “{0}”. You can either send the "
+"message automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message has been sent."
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 msgstr ""
-"メッセージを URL \"{0}\" へ送信します。そのまま自動的に送信するか、あるいは最初に内容を確認できます。\n"
+"メッセージを URL \"{0}\" へ送信します。そのまま自動的に送信するか、あるいは最"
+"初に内容を確認できます。\n"
 "\n"
-"メッセージを送信したら、なるべく早めにメーリングリストからの応答を受け取ってください。"
+"メッセージを送信したら、なるべく早めにメーリングリストからの応答を受け取って"
+"ください。"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "_Send message"
 msgstr "送信する(_S)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid "_Edit message"
 msgstr "編集する(_E)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:11
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:11
 msgid "Malformed header"
 msgstr "おかしなヘッダーです"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:12
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:12
 msgid ""
 "The {0} header of this message is malformed and could not be processed.\n"
 "\n"
@@ -18803,22 +25560,25 @@ msgstr ""
 "\n"
 "ヘッダー: {1}"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
 msgid "No e-mail action"
 msgstr "実行できません"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+#: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
 msgid ""
-"The action could not be performed. The header for this action did not contain any action that could be 
processed.\n"
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"その操作を実行できませんでした。ヘッダーの中に実行できる操作が含まれていないようです。\n"
+"その操作を実行できませんでした。ヘッダーの中に実行できる操作が含まれていない"
+"ようです。\n"
 "\n"
 "ヘッダー: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:382
-#: ../plugins/mail-notification/mail-notification.c:418
+#. Translators: '%d' is the count of mails received.
+#: ../src/plugins/mail-notification/mail-notification.c:398
+#: ../src/plugins/mail-notification/mail-notification.c:434
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18826,459 +25586,530 @@ msgstr[0] "%d通の新しいメッセージが届いています"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:393
+#: ../src/plugins/mail-notification/mail-notification.c:409
 #, 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:407
+#: ../src/plugins/mail-notification/mail-notification.c:423
 #, c-format
 msgid "Subject: %s"
 msgstr "件名: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:424
+#: ../src/plugins/mail-notification/mail-notification.c:440
 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:459
+#: ../src/plugins/mail-notification/mail-notification.c:481
 #, c-format
 msgid "Show %s"
 msgstr "%s を表示"
 
-#: ../plugins/mail-notification/mail-notification.c:661
+#: ../src/plugins/mail-notification/mail-notification.c:685
 msgid "_Play sound when a new message arrives"
 msgstr "新しいメッセージが届いたら演奏する(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:693
+#: ../src/plugins/mail-notification/mail-notification.c:717
 msgid "_Beep"
 msgstr "ビープ音を鳴らす(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:706
+#: ../src/plugins/mail-notification/mail-notification.c:730
 msgid "Use sound _theme"
 msgstr "サウンドテーマを使用(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../src/plugins/mail-notification/mail-notification.c:749
 msgid "Play _file:"
 msgstr "ファイルを再生(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../src/plugins/mail-notification/mail-notification.c:758
 msgid "Select sound file"
 msgstr "音声ファイルの選択"
 
-#: ../plugins/mail-notification/mail-notification.c:790
+#: ../src/plugins/mail-notification/mail-notification.c:835
 msgid "Notify new messages for _Inbox only"
 msgstr "受信箱の新着メッセージだけ通知する(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:800
+#: ../src/plugins/mail-notification/mail-notification.c:851
 msgid "Show _notification when a new message arrives"
-msgstr "新しいメッセージが届いたらパネルの通知領域にアイコンを表示して通知する(_N)"
+msgstr ""
+"新しいメッセージが届いたらパネルの通知領域にアイコンを表示して通知する(_N)"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+#: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
 msgstr "新着メールの通知"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 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:229
+#: ../src/plugins/mail-to-task/mail-to-task.c:194
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "%s からのメールにより作成"
 
-#: ../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' が既に登録されています。古いイベントを編集しますか?"
+#. Translators: Dialog button to Cancel edit of an existing event/memo/task
+#: ../src/plugins/mail-to-task/mail-to-task.c:576
+#, fuzzy
+#| msgid "Cancel"
+msgctxt "mail-to-task"
+msgid "_Cancel"
+msgstr "キャンセル"
 
-#: ../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' が既に登録されています。古いタスクを編集しますか?"
+#. Translators: Dialog button to Edit an existing event/memo/task
+#: ../src/plugins/mail-to-task/mail-to-task.c:578
+#, fuzzy
+#| msgid "_Edit"
+msgctxt "mail-to-task"
+msgid "_Edit"
+msgstr "編集(_E)"
 
-#: ../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' が既に登録されています。古いメモを編集しますか?"
+#. Translators: Dialog button to create a New event/memo/task
+#: ../src/plugins/mail-to-task/mail-to-task.c:580
+#, fuzzy
+#| msgid "_New"
+msgctxt "mail-to-task"
+msgid "_New"
+msgstr "新規(_N)"
+
+#: ../src/plugins/mail-to-task/mail-to-task.c:598
+#, fuzzy, c-format
+#| msgid ""
+#| "Selected calendar contains event '%s' already. Would you like to edit the "
+#| "old event?"
+msgid ""
+"Selected calendar contains event “%s” already. Would you like to edit the "
+"old event?"
+msgstr ""
+"選択したカレンダーにはイベント '%s' が既に登録されています。古いイベントを編"
+"集しますか?"
+
+#: ../src/plugins/mail-to-task/mail-to-task.c:601
+#, fuzzy, c-format
+#| msgid ""
+#| "Selected task list contains task '%s' already. Would you like to edit the "
+#| "old task?"
+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:639
+#: ../src/plugins/mail-to-task/mail-to-task.c:604
+#, fuzzy, c-format
+#| msgid ""
+#| "Selected memo list contains memo '%s' already. Would you like to edit the "
+#| "old memo?"
+msgid ""
+"Selected memo list contains memo “%s” already. Would you like to edit the "
+"old memo?"
+msgstr ""
+"選択したメモの一覧にはメモ '%s' が既に登録されています。古いメモを編集します"
+"か?"
+
+#. Translators: Note there are always more than 10 mails selected
+#: ../src/plugins/mail-to-task/mail-to-task.c:624
 #, 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通のメールをイベントに変換するよう選択しました。これらすべてを本当に追加しますか?"
+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:646
+#. Translators: Note there are always more than 10 mails selected
+#: ../src/plugins/mail-to-task/mail-to-task.c:631
 #, 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通のメールをタスクに変換するよう選択しました。これらすべてを本当に追加しますか?"
+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:653
+#. Translators: Note there are always more than 10 mails selected
+#: ../src/plugins/mail-to-task/mail-to-task.c:638
 #, 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通のメールをメモに変換するよう選択しました。これらすべてを本当に追加しますか?"
+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:674
+#: ../src/plugins/mail-to-task/mail-to-task.c:659
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "残りのメールの変換を続けてよろしいですか?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:750
+#: ../src/plugins/mail-to-task/mail-to-task.c:735
 msgid "[No Summary]"
 msgstr "[サマリ無し]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:763
+#: ../src/plugins/mail-to-task/mail-to-task.c:748
 msgid "Invalid object returned from a server"
 msgstr "サーバーから正しくないオブジェクトが返ってきました"
 
-#: ../plugins/mail-to-task/mail-to-task.c:818
+#: ../src/plugins/mail-to-task/mail-to-task.c:802
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "処理中にエラーが発生しました: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:852
+#: ../src/plugins/mail-to-task/mail-to-task.c:838
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "カレンダーを開けません: %s"
 
-#: ../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 "選択したカレンダーは読み込み専用のためイベントを生成できません。他のカレンダーを選択してください。"
+#: ../src/plugins/mail-to-task/mail-to-task.c:842
+msgid ""
+"Selected calendar is read only, thus cannot create event there. Select other "
+"calendar, please."
+msgstr ""
+"選択したカレンダーは読み込み専用のためイベントを生成できません。他のカレン"
+"ダーを選択してください。"
 
-#: ../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 "選択したタスク一覧は読み込み専用のためタスクを生成できません。他のタスク一覧を選択してください。"
+#: ../src/plugins/mail-to-task/mail-to-task.c:845
+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:862
-msgid "Selected memo list is read only, thus cannot create memo there. Select other memo list, please."
-msgstr "選択したメモ一覧は読み込み専用のためメモを生成できません。他のメモ一覧を選択してください。"
+#: ../src/plugins/mail-to-task/mail-to-task.c:848
+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:1261
+#: ../src/plugins/mail-to-task/mail-to-task.c:1252
 msgid "Create an _Appointment"
 msgstr "新しい予定の作成(_A)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1263
+#: ../src/plugins/mail-to-task/mail-to-task.c:1254
 msgid "Create a new event from the selected message"
 msgstr "選択したメッセージから新しいイベントを作成します"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1268
+#: ../src/plugins/mail-to-task/mail-to-task.c:1259
 msgid "Create a Mem_o"
 msgstr "メモの作成(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
+#: ../src/plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create a new memo from the selected message"
 msgstr "選択したメッセージから新しいメモを作成します"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1275
+#: ../src/plugins/mail-to-task/mail-to-task.c:1266
 msgid "Create a _Task"
 msgstr "タスクの作成(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../src/plugins/mail-to-task/mail-to-task.c:1268
 msgid "Create a new task from the selected message"
 msgstr "選択したメッセージから新しいタスクを作成します"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../src/plugins/mail-to-task/mail-to-task.c:1276
 msgid "Create a _Meeting"
 msgstr "会議の作成(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../src/plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a new meeting from the selected message"
 msgstr "選択したメッセージから新しい会議を作成します"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../src/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid "Convert a mail message to a task."
 msgstr "メールメッセージからタスクに変換します。"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
+#: ../src/plugins/pst-import/evolution-pst.metainfo.xml.in.h:1
+#: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Outlook PST のインポート"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
-msgid "Outlook personal folders (.pst)"
-msgstr "Outlook の個人のフォルダー (.pst)"
-
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+#: ../src/plugins/pst-import/evolution-pst.metainfo.xml.in.h:2
+#: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
 msgid "Import Outlook messages from PST file"
 msgstr "PST ファイルから Outlook のメッセージをインポートするプラグインです。"
 
-#: ../plugins/pst-import/pst-importer.c:526
+#: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook personal folders (.pst)"
+msgstr "Outlook の個人のフォルダー (.pst)"
+
+#: ../src/plugins/pst-import/pst-importer.c:522
 msgid "_Mail"
 msgstr "メール(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:555
+#: ../src/plugins/pst-import/pst-importer.c:551
 msgid "Destination folder:"
 msgstr "転送先フォルダー:"
 
-#: ../plugins/pst-import/pst-importer.c:565
+#: ../src/plugins/pst-import/pst-importer.c:561
 msgid "_Address Book"
 msgstr "アドレス帳(_A)"
 
-#: ../plugins/pst-import/pst-importer.c:570
+#: ../src/plugins/pst-import/pst-importer.c:566
 msgid "A_ppointments"
 msgstr "予定(_P)"
 
-#: ../plugins/pst-import/pst-importer.c:575 ../views/tasks/galview.xml.h:1
-msgid "_Tasks"
-msgstr "タスク(_T)"
-
-#: ../plugins/pst-import/pst-importer.c:580
+#: ../src/plugins/pst-import/pst-importer.c:576
 msgid "_Journal entries"
 msgstr "ジャーナルのエントリ(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:697
+#: ../src/plugins/pst-import/pst-importer.c:693
 msgid "Importing Outlook data"
 msgstr "Outlook データのインポート中"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:140
-#: ../plugins/publish-calendar/publish-calendar.c:147
+#: ../src/plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../src/plugins/publish-calendar/publish-calendar.c:138
+#: ../src/plugins/publish-calendar/publish-calendar.c:145
 msgid "Calendar Publishing"
 msgstr "カレンダーの公開"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+#: ../src/plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "公開する場所"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../src/plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
 msgid "Publish calendars to the web."
 msgstr "カレンダーをウェブ上に公開します。"
 
-#: ../plugins/publish-calendar/publish-calendar.c:217
-#: ../plugins/publish-calendar/publish-calendar.c:484
+#: ../src/plugins/publish-calendar/publish-calendar.c:215
+#: ../src/plugins/publish-calendar/publish-calendar.c:482
 #, c-format
 msgid "Could not open %s:"
 msgstr "%s を開けませんでした:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:236
+#: ../src/plugins/publish-calendar/publish-calendar.c:234
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "%s に公開中にエラーが発生しました:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:242
+#: ../src/plugins/publish-calendar/publish-calendar.c:240
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "%s への公開が正常に終了しました"
 
-#: ../plugins/publish-calendar/publish-calendar.c:290
+#: ../src/plugins/publish-calendar/publish-calendar.c:288
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "%s のマウントに失敗しました。"
 
-#: ../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:805
+#: ../src/plugins/publish-calendar/publish-calendar.c:787
 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:1142
+#: ../src/plugins/publish-calendar/publish-calendar.c:1097
 msgid "Could not create publish thread."
 msgstr "公開のためのプログラムのスレッドを作成できませんでした。"
 
-#: ../plugins/publish-calendar/publish-calendar.c:1152
+#: ../src/plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "カレンダー情報を公開する(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:1
 msgid "iCal"
 msgstr "iCal"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:3
 msgid "Daily"
 msgstr "毎日"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "Weekly"
 msgstr "毎週"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:5
 msgid "Manual (via Actions menu)"
 msgstr "手動 (メニューから)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:9
 msgid "Secure FTP (SFTP)"
 msgstr "セキュア FTP (SFTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Public FTP"
 msgstr "公開 FTP"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:11
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "FTP (with login)"
 msgstr "FTP (ログインが必要)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:12
 msgid "Windows share"
 msgstr "Windows共有"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:13
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "WebDAV (HTTP)"
 msgstr "WebDAV (HTTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:14
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Secure WebDAV (HTTPS)"
 msgstr "セキュア WebDAV (HTTPS)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:15
 msgid "Custom Location"
 msgstr "場所をカスタマイズ"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:17
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "_Publish as:"
 msgstr "公開方法(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:18
 msgid "Publishing _Frequency:"
 msgstr "公開する頻度(_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:19
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr "期間(_D):"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:20
 msgid "Sources"
 msgstr "ソース"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
 msgid "Service _type:"
 msgstr "サービスの種類(_T):"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:25
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_File:"
 msgstr "ファイル(_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "P_ort:"
 msgstr "ポート番号(_O):"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Username:"
 msgstr "ユーザー名(_U):"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../src/smime/gui/certificate-manager.c:785
 msgid "_Password:"
 msgstr "パスワード(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "_Remember password"
 msgstr "このパスワードを記憶する(_R)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "Publishing Location"
 msgstr "公開する場所"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:99
-#: ../plugins/publish-calendar/publish-format-ical.c:102
-#, c-format
-msgid "Invalid source UID '%s'"
+#: ../src/plugins/publish-calendar/publish-format-fb.c:82
+#: ../src/plugins/publish-calendar/publish-format-ical.c:102
+#, fuzzy, c-format
+#| msgid "Invalid source UID '%s'"
+msgid "Invalid source UID “%s”"
 msgstr "無効なソース UID: '%s'"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:544
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:542
 msgid "New Location"
 msgstr "新しい場所"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:546
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:544
 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:160
+#: ../src/plugins/save-calendar/csv-format.c:158
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:374
-msgid "UID"
-msgstr "UID"
-
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../src/plugins/save-calendar/csv-format.c:374
 msgid "Description List"
 msgstr "説明の一覧"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../src/plugins/save-calendar/csv-format.c:375
 msgid "Categories List"
 msgstr "カテゴリの一覧"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../src/plugins/save-calendar/csv-format.c:376
 msgid "Comment List"
 msgstr "コメントの一覧"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../src/plugins/save-calendar/csv-format.c:379
 msgid "Contact List"
 msgstr "連絡先の一覧"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../src/plugins/save-calendar/csv-format.c:380
 msgid "Start"
 msgstr "開始"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../src/plugins/save-calendar/csv-format.c:381
 msgid "End"
 msgstr "終了"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../src/plugins/save-calendar/csv-format.c:382
 msgid "Due"
 msgstr "期日"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../src/plugins/save-calendar/csv-format.c:383
 msgid "percent Done"
 msgstr "%% 完了"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../src/plugins/save-calendar/csv-format.c:385
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../src/plugins/save-calendar/csv-format.c:386
 msgid "Attendees List"
 msgstr "出席者の一覧"
 
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../src/plugins/save-calendar/csv-format.c:388
 msgid "Modified"
 msgstr "変更済"
 
-#: ../plugins/save-calendar/csv-format.c:563
+#: ../src/plugins/save-calendar/csv-format.c:561
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV 形式の拡張オプション(_D)"
 
-#: ../plugins/save-calendar/csv-format.c:571
+#: ../src/plugins/save-calendar/csv-format.c:569
 msgid "Prepend a _header"
 msgstr "ヘッダーを付与する(_H)"
 
-#: ../plugins/save-calendar/csv-format.c:580
+#: ../src/plugins/save-calendar/csv-format.c:578
 msgid "_Value delimiter:"
 msgstr "数値の区切り(_V):"
 
-#: ../plugins/save-calendar/csv-format.c:591
+#: ../src/plugins/save-calendar/csv-format.c:589
 msgid "_Record delimiter:"
 msgstr "レコードの区切り(_R):"
 
-#: ../plugins/save-calendar/csv-format.c:602
+#: ../src/plugins/save-calendar/csv-format.c:600
 msgid "_Encapsulate values with:"
 msgstr "数値のカプセル化(_E):"
 
-#: ../plugins/save-calendar/csv-format.c:628
+#: ../src/plugins/save-calendar/csv-format.c:626
 msgid "Comma separated values (.csv)"
 msgstr "CSV (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:183 ../shell/e-shell-utils.c:177
+#: ../src/plugins/save-calendar/ical-format.c:181
+#: ../src/shell/e-shell-utils.c:182
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+#: ../src/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "選択したアイテムの保存"
 
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+#: ../src/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 msgid "Save a calendar or task list to disk."
 msgstr "カレンダーやタスクの一覧をディスクに保存します。"
 
@@ -19287,77 +26118,115 @@ msgstr "カレンダーやタスクの一覧をディスクに保存します。
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:147
+#: ../src/plugins/save-calendar/rdf-format.c:145
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:385
+#: ../src/plugins/save-calendar/rdf-format.c:383
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../src/plugins/save-calendar/save-calendar.c:117
 msgid "_Format:"
 msgstr "形式(_F):"
 
-#: ../plugins/save-calendar/save-calendar.c:186
+#: ../src/plugins/save-calendar/save-calendar.c:182
 msgid "Select destination file"
 msgstr "保存先の選択"
 
-#: ../plugins/save-calendar/save-calendar.c:190
+#: ../src/plugins/save-calendar/save-calendar.c:186
 #, fuzzy
 #| msgid "_Save"
 msgid "_Save As"
 msgstr "保存(_S)"
 
-#: ../plugins/save-calendar/save-calendar.c:347
+#: ../src/plugins/save-calendar/save-calendar.c:349
 msgid "Save the selected calendar to disk"
 msgstr "選択したカレンダーをディスクに保存します"
 
-#: ../plugins/save-calendar/save-calendar.c:378
+#: ../src/plugins/save-calendar/save-calendar.c:380
 msgid "Save the selected memo list to disk"
 msgstr "選択したメモの一覧をディスクに保存します"
 
-#: ../plugins/save-calendar/save-calendar.c:409
+#: ../src/plugins/save-calendar/save-calendar.c:411
 msgid "Save the selected task list to disk"
 msgstr "選択したタスクの一覧をディスクに保存します"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-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:1146
+#: ../src/plugins/templates/e-templates-store.c:115
 msgid "No Title"
 msgstr "タイトルなし"
 
-#: ../plugins/templates/templates.c:1255
+#: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:2
+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] の様な変数が使えま"
+"す。これは返信するメールの値に置き換えられます。"
+
+#: ../src/plugins/templates/templates.c:1299
+#, fuzzy
+#| msgid "Saving message to Outbox."
+msgid "Saving message template"
+msgstr "メッセージを送信トレイに保存中。"
+
+#: ../src/plugins/templates/templates.c:1320
 msgid "Save as _Template"
 msgstr "テンプレートとして保存(_T)"
 
-#: ../plugins/templates/templates.c:1257
+#: ../src/plugins/templates/templates.c:1322
 msgid "Save as Template"
 msgstr "テンプレートとして保存します"
 
-#: ../shell/e-shell.c:302
+#: ../src/shell/e-shell.c:379
 msgid "Preparing to go offline..."
 msgstr "オフラインの準備中..."
 
-#: ../shell/e-shell.c:355
+#: ../src/shell/e-shell.c:408
 msgid "Preparing to go online..."
 msgstr "オンラインの準備中..."
 
-#: ../shell/e-shell.c:436
+#: ../src/shell/e-shell.c:519
 msgid "Preparing to quit"
 msgstr "終了の準備中"
 
-#: ../shell/e-shell.c:442
+#: ../src/shell/e-shell.c:525
 msgid "Preparing to quit..."
 msgstr "終了の準備中..."
 
-#: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
+#: ../src/shell/e-shell.c:926
+#, fuzzy
+#| msgid "_Open Desktop Settings"
+msgid "Open _Settings"
+msgstr "デスクトップ設定を開く(_O)"
+
+#: ../src/shell/e-shell.c:1127
+msgid "Credentials are required to connect to the destination host."
+msgstr ""
+
+#: ../src/shell/e-shell.c:1297 ../src/shell/e-shell-window-actions.c:836
+msgid "New _Window"
+msgstr "新しいウィンドウ(_W)"
+
+#: ../src/shell/e-shell.c:1308
+msgid "Quick _Reference"
+msgstr "クィックリファレンス(_R)"
+
+#: ../src/shell/e-shell.c:1310 ../src/shell/e-shell-window-actions.c:773
+msgid "_About"
+msgstr "このアプリケーションについて(_A)"
+
+#: ../src/shell/e-shell.c:1311 ../src/shell/e-shell-window-actions.c:871
+msgid "_Quit"
+msgstr "終了(_Q)"
+
+#: ../src/shell/e-shell-content.c:718 ../src/shell/e-shell-content.c:719
 msgid "Searches"
 msgstr "検索"
 
-#: ../shell/e-shell-content.c:764
+#: ../src/shell/e-shell-content.c:762
 msgid "Save Search"
 msgstr "検索結果の保存"
 
@@ -19365,38 +26234,34 @@ 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:937
+#: ../src/shell/e-shell-searchbar.c:925
 msgid "Sho_w:"
 msgstr "表示(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:962
+#: ../src/shell/e-shell-searchbar.c:950
 msgid "Sear_ch:"
 msgstr "検索(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1030
+#: ../src/shell/e-shell-searchbar.c:1018
 msgid "i_n"
 msgstr "検索対象(_N):"
 
-#: ../shell/e-shell-utils.c:174
+#: ../src/shell/e-shell-utils.c:179
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:198
+#: ../src/shell/e-shell-utils.c:205
 msgid "All Files (*)"
 msgstr "すべてのファイル (*)"
 
-#: ../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:73
+#: ../src/shell/e-shell-utils.c:419
 msgid "translator-credits"
 msgstr ""
 "相花 毅 <takeshi aihana gmail com>\n"
@@ -19409,291 +26274,305 @@ msgstr ""
 "やまねひでき <henrich debian org>\n"
 "日本GNOMEユーザー会 <http://www.gnome.gr.jp/>"
 
-#: ../shell/e-shell-window-actions.c:84
+#: ../src/shell/e-shell-utils.c:430
 msgid "Evolution Website"
 msgstr "Evolution のウェブサイト"
 
-#: ../shell/e-shell-window-actions.c:340
+#: ../src/shell/e-shell-view.c:290
+msgid "Saving user interface state"
+msgstr "ユーザーインターフェースの状態を保存中"
+
+#: ../src/shell/e-shell-window-actions.c:275
 msgid "Categories Editor"
 msgstr "カテゴリエディター"
 
-#: ../shell/e-shell-window-actions.c:716
+#: ../src/shell/e-shell-window-actions.c:594
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy がインストールされていません。"
 
-#: ../shell/e-shell-window-actions.c:717
+#: ../src/shell/e-shell-window-actions.c:595
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy を実行できませんでした"
 
-#: ../shell/e-shell-window-actions.c:895
-msgid "_About"
-msgstr ""
-
-#: ../shell/e-shell-window-actions.c:897
+#: ../src/shell/e-shell-window-actions.c:775
 msgid "Show information about Evolution"
 msgstr "Evolution についての情報を表示します"
 
-#: ../shell/e-shell-window-actions.c:902 ../shell/e-shell-window-actions.c:916
+#: ../src/shell/e-shell-window-actions.c:780
+#: ../src/shell/e-shell-window-actions.c:794
 msgid "_Close Window"
 msgstr "ウィンドウを閉じる(_C)"
 
-#: ../shell/e-shell-window-actions.c:923
+#: ../src/shell/e-shell-window-actions.c:801
 msgid "_Contents"
 msgstr "目次(_C)"
 
-#: ../shell/e-shell-window-actions.c:925
+#: ../src/shell/e-shell-window-actions.c:803
 msgid "Open the Evolution User Guide"
 msgstr "Evolution ユーザーガイドを開く"
 
-#: ../shell/e-shell-window-actions.c:951
+#: ../src/shell/e-shell-window-actions.c:829
 msgid "I_mport..."
 msgstr "インポート(_M)..."
 
-#: ../shell/e-shell-window-actions.c:953
+#: ../src/shell/e-shell-window-actions.c:831
 msgid "Import data from other programs"
 msgstr "他のプログラムからデータを取り込みます"
 
-#: ../shell/e-shell-window-actions.c:958
-msgid "New _Window"
-msgstr "新しいウィンドウ(_W)"
-
-#: ../shell/e-shell-window-actions.c:960
+#: ../src/shell/e-shell-window-actions.c:838
 msgid "Create a new window displaying this view"
 msgstr "このビューを表示する新しいウィンドウを作成します"
 
-#: ../shell/e-shell-window-actions.c:972
+#: ../src/shell/e-shell-window-actions.c:850
 msgid "Available Cate_gories"
 msgstr "利用可能な項目(_G)"
 
-#: ../shell/e-shell-window-actions.c:974
+#: ../src/shell/e-shell-window-actions.c:852
 msgid "Manage available categories"
 msgstr "利用可能なカテゴリを管理する"
 
-#: ../shell/e-shell-window-actions.c:986
+#: ../src/shell/e-shell-window-actions.c:864
 msgid "_Quick Reference"
 msgstr "クィックリファレンス(_Q)"
 
-#: ../shell/e-shell-window-actions.c:988
-msgid "Show Evolution's shortcut keys"
-msgstr "Evolution のショートカットキーを表示"
-
-#: ../shell/e-shell-window-actions.c:993
+#: ../src/shell/e-shell-window-actions.c:866
 #, fuzzy
-#| msgid "Quit"
-msgid "_Quit"
-msgstr "終了"
+#| msgid "Show Evolution's shortcut keys"
+msgid "Show Evolution’s shortcut keys"
+msgstr "Evolution のショートカットキーを表示"
 
-#: ../shell/e-shell-window-actions.c:995
+#: ../src/shell/e-shell-window-actions.c:873
 msgid "Exit the program"
 msgstr "プログラムを終了します"
 
-#: ../shell/e-shell-window-actions.c:1000
+#: ../src/shell/e-shell-window-actions.c:878
 msgid "_Advanced Search..."
 msgstr "高度な検索(_A)..."
 
-#: ../shell/e-shell-window-actions.c:1002
+#: ../src/shell/e-shell-window-actions.c:880
 msgid "Construct a more advanced search"
 msgstr "より高度な検索を設定"
 
-#: ../shell/e-shell-window-actions.c:1009
+#: ../src/shell/e-shell-window-actions.c:887
 msgid "Clear the current search parameters"
 msgstr "この検索条件を消去します"
 
-#: ../shell/e-shell-window-actions.c:1014
+#: ../src/shell/e-shell-window-actions.c:892
 msgid "_Edit Saved Searches..."
 msgstr "保存した検索結果の編集(_E)..."
 
-#: ../shell/e-shell-window-actions.c:1016
+#: ../src/shell/e-shell-window-actions.c:894
 msgid "Manage your saved searches"
 msgstr "保存した検索条件を管理"
 
-#: ../shell/e-shell-window-actions.c:1023
+#: ../src/shell/e-shell-window-actions.c:901
 msgid "Click here to change the search type"
 msgstr "ここをクリックして検索の種類を変更してください"
 
-#: ../shell/e-shell-window-actions.c:1028
+#: ../src/shell/e-shell-window-actions.c:906
 msgid "_Find Now"
 msgstr "今すぐ検索(_F)"
 
-#: ../shell/e-shell-window-actions.c:1030
+#: ../src/shell/e-shell-window-actions.c:908
 msgid "Execute the current search parameters"
 msgstr "現在の検索条件を保存します"
 
-#: ../shell/e-shell-window-actions.c:1035
+#: ../src/shell/e-shell-window-actions.c:913
 msgid "_Save Search..."
 msgstr "検索条件の保存(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1037
+#: ../src/shell/e-shell-window-actions.c:915
 msgid "Save the current search parameters"
 msgstr "現在の検索条件を保存します"
 
-#: ../shell/e-shell-window-actions.c:1049
+#: ../src/shell/e-shell-window-actions.c:927
 msgid "Submit _Bug Report..."
 msgstr "バグ報告の提出(_B)..."
 
-#: ../shell/e-shell-window-actions.c:1051
+#: ../src/shell/e-shell-window-actions.c:929
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy を使ってバグを報告します"
 
-#: ../shell/e-shell-window-actions.c:1056
+#: ../src/shell/e-shell-window-actions.c:934
 msgid "_Work Offline"
 msgstr "オフラインで動作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1058
+#: ../src/shell/e-shell-window-actions.c:936
 msgid "Put Evolution into offline mode"
 msgstr "Evolution をオフラインモードにする"
 
-#: ../shell/e-shell-window-actions.c:1063
+#: ../src/shell/e-shell-window-actions.c:941
 msgid "_Work Online"
 msgstr "オンラインで動作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1065
+#: ../src/shell/e-shell-window-actions.c:943
 msgid "Put Evolution into online mode"
 msgstr "Evolution をオンラインモードにする"
 
-#: ../shell/e-shell-window-actions.c:1093
+#: ../src/shell/e-shell-window-actions.c:971
 msgid "Lay_out"
 msgstr "配置(_O)"
 
-#: ../shell/e-shell-window-actions.c:1107
+#. Translators: This is a New menu item caption, under File->New
+#: ../src/shell/e-shell-window-actions.c:979
+msgid "_New"
+msgstr "新規(_N)"
+
+#: ../src/shell/e-shell-window-actions.c:986
 msgid "_Search"
 msgstr "検索(_S)"
 
-#: ../shell/e-shell-window-actions.c:1114
+#: ../src/shell/e-shell-window-actions.c:993
 msgid "_Switcher Appearance"
 msgstr "ボタンのスタイル(_S)"
 
-#: ../shell/e-shell-window-actions.c:1128
+#: ../src/shell/e-shell-window-actions.c:1007
 msgid "_Window"
 msgstr "ウィンドウ(_W)"
 
-#: ../shell/e-shell-window-actions.c:1157
+#: ../src/shell/e-shell-window-actions.c:1036
+#, fuzzy
+#| msgid "Show _Status Bar"
+msgid "Show _Menu Bar"
+msgstr "ステータスバーを表示する(_S)"
+
+#: ../src/shell/e-shell-window-actions.c:1038
+#, fuzzy
+#| msgid "Show the side bar"
+msgid "Show the menu bar"
+msgstr "サイドバーを表示する"
+
+#: ../src/shell/e-shell-window-actions.c:1044
 msgid "Show Side _Bar"
 msgstr "サイドバーを表示する(_B)"
 
-#: ../shell/e-shell-window-actions.c:1159
+#: ../src/shell/e-shell-window-actions.c:1046
 msgid "Show the side bar"
 msgstr "サイドバーを表示する"
 
-#: ../shell/e-shell-window-actions.c:1165
+#: ../src/shell/e-shell-window-actions.c:1052
 msgid "Show _Buttons"
 msgstr "ボタンを表示(_B)"
 
-#: ../shell/e-shell-window-actions.c:1167
+#: ../src/shell/e-shell-window-actions.c:1054
 msgid "Show the switcher buttons"
 msgstr "切替ボタンを表示"
 
-#: ../shell/e-shell-window-actions.c:1173
+#: ../src/shell/e-shell-window-actions.c:1060
 msgid "Show _Status Bar"
 msgstr "ステータスバーを表示する(_S)"
 
-#: ../shell/e-shell-window-actions.c:1175
+#: ../src/shell/e-shell-window-actions.c:1062
 msgid "Show the status bar"
 msgstr "ステータスバーを表示する"
 
-#: ../shell/e-shell-window-actions.c:1181
+#: ../src/shell/e-shell-window-actions.c:1068
 msgid "Show _Tool Bar"
 msgstr "ツールバーを表示(_T)"
 
-#: ../shell/e-shell-window-actions.c:1183
+#: ../src/shell/e-shell-window-actions.c:1070
 msgid "Show the tool bar"
 msgstr "ツールバーを表示する"
 
-#: ../shell/e-shell-window-actions.c:1205
+#: ../src/shell/e-shell-window-actions.c:1092
 msgid "_Icons Only"
 msgstr "アイコンのみ(_I)"
 
-#: ../shell/e-shell-window-actions.c:1207
+#: ../src/shell/e-shell-window-actions.c:1094
 msgid "Display window buttons with icons only"
 msgstr "アイコンのみ付けてウィンドウボタンを表示します"
 
-#: ../shell/e-shell-window-actions.c:1212
+#: ../src/shell/e-shell-window-actions.c:1099
 msgid "_Text Only"
 msgstr "ラベルのみ(_T)"
 
-#: ../shell/e-shell-window-actions.c:1214
+#: ../src/shell/e-shell-window-actions.c:1101
 msgid "Display window buttons with text only"
 msgstr "ラベルのみ付けてウィンドウボタンを表示します"
 
-#: ../shell/e-shell-window-actions.c:1219
+#: ../src/shell/e-shell-window-actions.c:1106
 msgid "Icons _and Text"
 msgstr "アイコンとラベル(_A)"
 
-#: ../shell/e-shell-window-actions.c:1221
+#: ../src/shell/e-shell-window-actions.c:1108
 msgid "Display window buttons with icons and text"
 msgstr "アイコンとラベルを付けてウィンドウボタンを表示します"
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../src/shell/e-shell-window-actions.c:1113
 msgid "Tool_bar Style"
 msgstr "ツールバーのスタイル(_B)"
 
-#: ../shell/e-shell-window-actions.c:1228
+#: ../src/shell/e-shell-window-actions.c:1115
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "デスクトップの設定に従ってウィンドウボタンを表示します"
 
-#: ../shell/e-shell-window-actions.c:1236
+#: ../src/shell/e-shell-window-actions.c:1123
 msgid "Delete Current View"
 msgstr "このビューの削除"
 
-#: ../shell/e-shell-window-actions.c:1243
+#: ../src/shell/e-shell-window-actions.c:1130
 msgid "Save Custom View..."
 msgstr "カスタム表示の保存..."
 
-#: ../shell/e-shell-window-actions.c:1245
+#: ../src/shell/e-shell-window-actions.c:1132
 msgid "Save current custom view"
 msgstr "現在のビューを保存します"
 
-#: ../shell/e-shell-window-actions.c:1252
+#: ../src/shell/e-shell-window-actions.c:1139
 msgid "C_urrent View"
 msgstr "現在のビュー(_U)"
 
-#: ../shell/e-shell-window-actions.c:1262
+#: ../src/shell/e-shell-window-actions.c:1149
 msgid "Custom View"
 msgstr "ビューのカスタマイズ"
 
-#: ../shell/e-shell-window-actions.c:1264
+#: ../src/shell/e-shell-window-actions.c:1151
 msgid "Current view is a customized view"
 msgstr "現在のビューはカスタマイズしたビューです"
 
-#: ../shell/e-shell-window-actions.c:1272
+#: ../src/shell/e-shell-window-actions.c:1159
 msgid "Page Set_up..."
-msgstr ""
+msgstr "ページの設定(_U)..."
 
-#: ../shell/e-shell-window-actions.c:1274
+#: ../src/shell/e-shell-window-actions.c:1161
 msgid "Change the page settings for your current printer"
 msgstr "現在のプリンターのページ設定を変更する"
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../src/shell/e-shell-window-actions.c:1530
 #, c-format
 msgid "Switch to %s"
 msgstr "%sに切り替えます"
 
-#: ../shell/e-shell-window-actions.c:1758
+#: ../src/shell/e-shell-window-actions.c:1653
 #, c-format
 msgid "Select view: %s"
 msgstr "ビューの選択: %s"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../src/shell/e-shell-window-actions.c:1670
 #, c-format
 msgid "Delete view: %s"
 msgstr "ビューの削除: %s"
 
-#: ../shell/e-shell-window-actions.c:1869
+#: ../src/shell/e-shell-window-actions.c:1771
 msgid "Execute these search parameters"
 msgstr "この検索条件で検索を実行"
 
-#: ../shell/e-shell-window.c:503
+#. Translators: a 'New' toolbar button caption which is context sensitive and
+#. runs one of the actions under File->New menu
+#: ../src/shell/e-shell-window.c:563
+msgctxt "toolbar-button"
 msgid "New"
 msgstr "新規"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:579
-#, c-format
-msgid "%s - Evolution"
+#: ../src/shell/e-shell-window-private.c:720
+#, fuzzy, c-format
+#| msgid "%s - Evolution"
+msgid "%s — Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:182
+#: ../src/shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19730,7 +26609,7 @@ msgstr ""
 "私たちの激務の成果に満足してくれることを願い、\n"
 "そしてあなたの貢献を熱心に待つことにします!\n"
 
-#: ../shell/main.c:206
+#: ../src/shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19738,109 +26617,255 @@ msgstr ""
 "感謝します\n"
 "Evolution 開発チーム\n"
 
-#: ../shell/main.c:212
+#: ../src/shell/main.c:225
 msgid "Do not tell me again"
 msgstr "次回からこのメッセージを表示しない"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../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' です。"
+#: ../src/shell/main.c:314
+#, fuzzy
+#| msgid ""
+#| "Start Evolution showing the specified component. Available options are "
+#| "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+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:305
+#: ../src/shell/main.c:318
 msgid "Apply the given geometry to the main window"
 msgstr "指定した座標をメインウィンドウに適用する"
 
-#: ../shell/main.c:309
+#: ../src/shell/main.c:322
 msgid "Start in online mode"
 msgstr "オンラインモードで起動する"
 
-#: ../shell/main.c:311
+#: ../src/shell/main.c:324
 msgid "Ignore network availability"
 msgstr "ネットワークが利用可能かどうか無視する"
 
-#: ../shell/main.c:314
+#: ../src/shell/main.c:327
 msgid "Forcibly shut down Evolution"
 msgstr "Evolution を強制的に終了する"
 
-#: ../shell/main.c:317
+#: ../src/shell/main.c:330
 msgid "Disable loading of any plugins."
 msgstr "プラグインを読み込まない"
 
-#: ../shell/main.c:319
+#: ../src/shell/main.c:332
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "メール/連絡先/タスクのプレビューペインを無効にして起動する"
 
-#: ../shell/main.c:323
+#: ../src/shell/main.c:336
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "残りの引数で指定した URI やファイルをインポートする。"
 
-#: ../shell/main.c:325
+#: ../src/shell/main.c:338
 msgid "Request a running Evolution process to quit"
 msgstr "実行中の Evolution のプロセスを終了するよう要求する"
 
-#: ../shell/main.c:402
+#: ../src/shell/main.c:415
 #, c-format
-msgid "Cannot start Evolution.  Another Evolution instance may be unresponsive. System error: %s"
-msgstr "Evolution を起動できません。他の Evolution が反応しなくなっているかもしれません。システムエラー: %s"
+msgid ""
+"Cannot start Evolution.  Another Evolution instance may be unresponsive. "
+"System error: %s"
+msgstr ""
+"Evolution を起動できません。他の Evolution が反応しなくなっているかもしれませ"
+"ん。システムエラー: %s"
 
-#: ../shell/main.c:496 ../shell/main.c:501
-msgid "- The Evolution PIM and Email Client"
+#: ../src/shell/main.c:466 ../src/shell/main.c:471
+#, fuzzy
+#| msgid "- The Evolution PIM and Email Client"
+msgid "— The Evolution PIM and Email Client"
 msgstr "- Evolution PIM とメールクライアント"
 
-#: ../shell/main.c:568
-#, c-format
+#: ../src/shell/main.c:533
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: --online and --offline cannot be used together.\n"
+#| "  Run '%s --help' for more information.\n"
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
-"  Run '%s --help' for more information.\n"
+"  Run “%s --help” for more information.\n"
 msgstr ""
 "%s: --online と --offline は同時には使用できません。\n"
 "  詳細は '%s --help' をご覧ください。\n"
 
-#: ../shell/main.c:574
-#, c-format
+#: ../src/shell/main.c:539
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: --force-online and --offline cannot be used together.\n"
+#| "  Run '%s --help' for more information.\n"
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
-"  Run '%s --help' for more information.\n"
+"  Run “%s --help” for more information.\n"
 msgstr ""
 "%s: --force-online と --offline は同時には使用できません。\n"
 "  詳細は '%s --help' をご覧ください。\n"
 
-#: ../shell/shell.error.xml.h:2
+#: ../src/shell/shell.error.xml.h:2
 msgid "Upgrade from previous version failed:"
 msgstr "前のバージョンからのアップグレードに失敗しました:"
 
-#: ../shell/shell.error.xml.h:3
+#: ../src/shell/shell.error.xml.h:3
 msgid ""
 "{0}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old data.\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
 msgstr ""
 "{0}\n"
 "\n"
 "続行すると、いくつかの古いデータへアクセスできなくなるかもしれません。\n"
 
-#: ../shell/shell.error.xml.h:7
+#: ../src/shell/shell.error.xml.h:7
 msgid "Continue Anyway"
 msgstr "ともかく続行する"
 
-#: ../shell/shell.error.xml.h:8
+#: ../src/shell/shell.error.xml.h:8
 msgid "Quit Now"
 msgstr "すぐに終了"
 
-#: ../shell/shell.error.xml.h:9
+#: ../src/shell/shell.error.xml.h:9
 msgid "Cannot upgrade directly from version {0}"
 msgstr "バージョン {0} から直接アップグレードできません"
 
-#: ../shell/shell.error.xml.h:10
-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 へアップグレードするのを試みてください。"
+#: ../src/shell/shell.error.xml.h:10
+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:108
-#, c-format
+#: ../src/shell/shell.error.xml.h:11
+#, fuzzy
+#| msgid "Unknown background operation"
+msgid "Close Evolution with pending background operations?"
+msgstr "バックグラウンドの操作が不明です"
+
+#: ../src/shell/shell.error.xml.h:12
 msgid ""
-"Certificate '%s' is a CA certificate.\n"
+"Evolution is taking a long time to shut down, possibly due to network "
+"connectivity issues. Would you like to cancel all pending operations and "
+"close immediately, or keep waiting?"
+msgstr ""
+
+#: ../src/shell/shell.error.xml.h:13
+msgid "_Close Immediately"
+msgstr ""
+
+#: ../src/shell/shell.error.xml.h:14
+#, fuzzy
+#| msgid "Waiting..."
+msgid "Keep _Waiting"
+msgstr "待機中..."
+
+#: ../src/shell/shell.error.xml.h:15
+#, fuzzy
+#| msgid "Unable to open address book '{0}'"
+msgid "Failed to get values from “{0}”"
+msgstr "アドレス帳 '{0}' を開けません"
+
+#: ../src/shell/shell.error.xml.h:16
+#, fuzzy
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to invoke authenticate for “{0}”"
+msgstr "カレンダー '{0}' へのイベントの移動に失敗しました"
+
+#: ../src/shell/shell.error.xml.h:17
+#, fuzzy
+#| msgid "Failed to open client '%s': %s"
+msgid "Failed to connect “{0}”"
+msgstr "クライアント '%s' を開けません: %s"
+
+#: ../src/shell/shell.error.xml.h:18
+#, fuzzy
+#| msgid "_Recover"
+msgid "_Reconnect"
+msgstr "復旧する(_R)"
+
+#: ../src/shell/shell.error.xml.h:19
+#, fuzzy
+#| msgid "Unable to open address book '{0}'"
+msgid "Failed to connect address book “{0}”"
+msgstr "アドレス帳 '{0}' を開けません"
+
+#: ../src/shell/shell.error.xml.h:20
+#, fuzzy
+#| msgid "Failed to copy an event into the calendar '{0}'"
+msgid "Failed to connect calendar “{0}”"
+msgstr "カレンダー '{0}' へのイベントのコピーに失敗しました"
+
+#: ../src/shell/shell.error.xml.h:21
+#, fuzzy
+#| msgid "Failed to disconnect account &quot;{0}&quot;."
+msgid "Failed to connect mail account “{0}”"
+msgstr "アカウント &quot;{0}&quot; の切断に失敗しました。"
+
+#: ../src/shell/shell.error.xml.h:22
+#, fuzzy
+#| msgid "Failed to copy a memo into the memo list '{0}'"
+msgid "Failed to connect memo list “{0}”"
+msgstr "メモ一覧 '{0}' へのメモのコピーに失敗しました"
+
+#: ../src/shell/shell.error.xml.h:23
+#, fuzzy
+#| msgid "Failed to copy a task into the task list '{0}'"
+msgid "Failed to connect task list “{0}”"
+msgstr "タスク一覧 '{0}' へのタスクのコピーに失敗しました"
+
+#: ../src/shell/shell.error.xml.h:24
+#, fuzzy
+#| msgid "Failed to copy an event into the calendar '{0}'"
+msgid "Failed to prompt for credentials for “{0}”"
+msgstr "カレンダー '{0}' へのイベントのコピーに失敗しました"
+
+#: ../src/shell/shell.error.xml.h:25
+msgid "Failed to finish trust prompt for “{0}”"
+msgstr ""
+
+#: ../src/shell/shell.error.xml.h:26
+msgid "SSL certificate for “{0}” is not trusted."
+msgstr ""
+
+#: ../src/shell/shell.error.xml.h:27
+msgid "Reason: {1}"
+msgstr ""
+
+#: ../src/shell/shell.error.xml.h:29
+msgid "SSL certificate for address book “{0}” is not trusted."
+msgstr ""
+
+#: ../src/shell/shell.error.xml.h:30
+msgid "SSL certificate for calendar “{0}” is not trusted."
+msgstr ""
+
+#: ../src/shell/shell.error.xml.h:31
+msgid "SSL certificate for mail account “{0}” is not trusted."
+msgstr ""
+
+#: ../src/shell/shell.error.xml.h:32
+msgid "SSL certificate for memo list “{0}” is not trusted."
+msgstr ""
+
+#: ../src/shell/shell.error.xml.h:33
+msgid "SSL certificate for task list “{0}” is not trusted."
+msgstr ""
+
+#: ../src/smime/gui/ca-trust-dialog.c:104
+#, fuzzy, c-format
+#| msgid ""
+#| "Certificate '%s' is a CA certificate.\n"
+#| "\n"
+#| "Edit trust settings:"
+msgid ""
+"Certificate “%s” is a CA certificate.\n"
 "\n"
 "Edit trust settings:"
 msgstr ""
@@ -19848,335 +26873,955 @@ msgstr ""
 "\n"
 "信用度を設定してください:"
 
-#: ../smime/gui/certificate-manager.c:80 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:119
+#: ../src/smime/gui/certificate-manager.c:82
+#: ../src/smime/gui/certificate-manager.c:101
+#: ../src/smime/gui/certificate-manager.c:121
 msgid "Certificate Name"
 msgstr "証明書の名前"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
+#: ../src/smime/gui/certificate-manager.c:83
+#: ../src/smime/gui/certificate-manager.c:103
 msgid "Issued To Organization"
 msgstr "発行先の組織"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
+#: ../src/smime/gui/certificate-manager.c:84
+#: ../src/smime/gui/certificate-manager.c:104
 msgid "Issued To Organizational Unit"
 msgstr "発行先の部署 (OU)"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
+#: ../src/smime/gui/certificate-manager.c:85
+#: ../src/smime/gui/certificate-manager.c:105
+#: ../src/smime/gui/certificate-manager.c:123
 msgid "Serial Number"
 msgstr "シリアル番号"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
+#: ../src/smime/gui/certificate-manager.c:86
+#: ../src/smime/gui/certificate-manager.c:106
+#: ../src/smime/gui/certificate-manager.c:124
 msgid "Purposes"
 msgstr "利用の目的"
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
-#: ../smime/gui/certificate-manager.c:123
+#: ../src/smime/gui/certificate-manager.c:87
+#: ../src/smime/gui/certificate-manager.c:107
+#: ../src/smime/gui/certificate-manager.c:125
 msgid "Issued By"
 msgstr "発行元"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
-#: ../smime/gui/certificate-manager.c:124
+#: ../src/smime/gui/certificate-manager.c:88
+#: ../src/smime/gui/certificate-manager.c:108
+#: ../src/smime/gui/certificate-manager.c:126
 msgid "Issued By Organization"
 msgstr "発行した組織"
 
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
-#: ../smime/gui/certificate-manager.c:125
+#: ../src/smime/gui/certificate-manager.c:89
+#: ../src/smime/gui/certificate-manager.c:109
+#: ../src/smime/gui/certificate-manager.c:127
 msgid "Issued By Organizational Unit"
 msgstr "発行した部署 (OU)"
 
-#: ../smime/gui/certificate-manager.c:88
-#: ../smime/gui/certificate-manager.c:108
-#: ../smime/gui/certificate-manager.c:126
+#: ../src/smime/gui/certificate-manager.c:90
+#: ../src/smime/gui/certificate-manager.c:110
+#: ../src/smime/gui/certificate-manager.c:128
 msgid "Issued"
 msgstr "発行対象"
 
-#: ../smime/gui/certificate-manager.c:89
-#: ../smime/gui/certificate-manager.c:109
-#: ../smime/gui/certificate-manager.c:127
+#: ../src/smime/gui/certificate-manager.c:91
+#: ../src/smime/gui/certificate-manager.c:111
+#: ../src/smime/gui/certificate-manager.c:129
 msgid "Expires"
 msgstr "有効期限"
 
-#: ../smime/gui/certificate-manager.c:90
-#: ../smime/gui/certificate-manager.c:110
-#: ../smime/gui/certificate-manager.c:128
+#: ../src/smime/gui/certificate-manager.c:92
+#: ../src/smime/gui/certificate-manager.c:112
+#: ../src/smime/gui/certificate-manager.c:130
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 指紋"
 
-#: ../smime/gui/certificate-manager.c:91
-#: ../smime/gui/certificate-manager.c:111
-#: ../smime/gui/certificate-manager.c:129
+#: ../src/smime/gui/certificate-manager.c:93
+#: ../src/smime/gui/certificate-manager.c:113
+#: ../src/smime/gui/certificate-manager.c:131
 msgid "MD5 Fingerprint"
 msgstr "MD5 指紋"
 
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:120
+#: ../src/smime/gui/certificate-manager.c:102
+#: ../src/smime/gui/certificate-manager.c:122
 msgid "Email Address"
 msgstr "メールアドレス"
 
-#: ../smime/gui/certificate-manager.c:621
+#: ../src/smime/gui/certificate-manager.c:663
+msgid "Select a file to backup your key and certificate..."
+msgstr ""
+
+#. To Translators:
+#. * %s-backup.p12 is the default file name suggested by the file selection dialog,
+#. * when a user wants to backup one of her/his private keys/certificates.
+#. * For example: gnomedev-backup.p12
+#.
+#: ../src/smime/gui/certificate-manager.c:675
+#, c-format
+msgid "%s-backup.p12"
+msgstr ""
+
+#: ../src/smime/gui/certificate-manager.c:741
+#, fuzzy
+#| msgid "Certificate"
+msgid "Backup Certificate"
+msgstr "証明書"
+
+#. filename selection
+#: ../src/smime/gui/certificate-manager.c:755
+#, fuzzy
+#| msgid "F_ilename:"
+msgid "_File name:"
+msgstr "ファイル名(_I):"
+
+#. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
+#: ../src/smime/gui/certificate-manager.c:760
+#, fuzzy
+#| msgid "Select a file"
+msgid "Please select a file..."
+msgstr "ファイルの選択"
+
+#: ../src/smime/gui/certificate-manager.c:774
+msgid "_Include certificate chain in the backup"
+msgstr ""
+
+#. To Translators: this text was copied from Firefox
+#: ../src/smime/gui/certificate-manager.c:780
+msgid ""
+"The certificate backup password you set here protects the backup file that "
+"you are about to create.\n"
+"You must set this password to proceed with the backup."
+msgstr ""
+
+#: ../src/smime/gui/certificate-manager.c:799
+#, fuzzy
+#| msgid "_Password:"
+msgid "_Repeat Password:"
+msgstr "パスワード(_P):"
+
+#: ../src/smime/gui/certificate-manager.c:818
+msgid "Passwords do not match"
+msgstr ""
+
+#. To Translators: this text was copied from Firefox
+#: ../src/smime/gui/certificate-manager.c:826
+msgid ""
+"Important:\n"
+"If you forget your certificate backup password, you will not be able to "
+"restore this backup later.\n"
+"Please record it in a safe location."
+msgstr ""
+
+#: ../src/smime/gui/certificate-manager.c:871
+#, fuzzy
+#| msgid "No email address provided"
+msgid "No file name provided"
+msgstr "メールアドレスが入力されていません"
+
+#: ../src/smime/gui/certificate-manager.c:875
+#, fuzzy
+#| msgid "Failed to import certificate"
+msgid "Failed to backup key and certificate"
+msgstr "証明書のインポートに失敗しました"
+
+#: ../src/smime/gui/certificate-manager.c:964
 msgid "Select a certificate to import..."
 msgstr "インポートする証明書の選択..."
 
-#: ../smime/gui/certificate-manager.c:635
-msgid "All files"
-msgstr "すべてのファイル"
-
-#: ../smime/gui/certificate-manager.c:671
+#: ../src/smime/gui/certificate-manager.c:1014
 msgid "Failed to import certificate"
 msgstr "証明書のインポートに失敗しました"
 
-#: ../smime/gui/certificate-manager.c:1053
+#: ../src/smime/gui/certificate-manager.c:1130
+msgctxt "CamelTrust"
+msgid "Ask when used"
+msgstr ""
+
+#: ../src/smime/gui/certificate-manager.c:1132
+#, fuzzy
+#| msgid "Never"
+msgctxt "CamelTrust"
+msgid "Never"
+msgstr "しない"
+
+#: ../src/smime/gui/certificate-manager.c:1134
+msgctxt "CamelTrust"
+msgid "Marginally"
+msgstr ""
+
+#: ../src/smime/gui/certificate-manager.c:1136
+msgctxt "CamelTrust"
+msgid "Fully"
+msgstr ""
+
+#: ../src/smime/gui/certificate-manager.c:1138
+msgctxt "CamelTrust"
+msgid "Ultimately"
+msgstr ""
+
+#: ../src/smime/gui/certificate-manager.c:1140
+msgctxt "CamelTrust"
+msgid "Temporarily"
+msgstr ""
+
+#: ../src/smime/gui/certificate-manager.c:1346
+#, fuzzy
+#| msgid "Certificate Authority Trust"
+msgid "Change certificate trust"
+msgstr "認証局の信頼性"
+
+#: ../src/smime/gui/certificate-manager.c:1358
+#, c-format
+msgid "Change trust for the host “%s”:"
+msgstr ""
+
+#: ../src/smime/gui/certificate-manager.c:1382
+msgctxt "CamelTrust"
+msgid "_Ask when used"
+msgstr ""
+
+#: ../src/smime/gui/certificate-manager.c:1383
+#, fuzzy
+#| msgid "Unset _trust for SSL certificate"
+msgctxt "CamelTrust"
+msgid "_Never trust this certificate"
+msgstr "証明書に対する信頼を解除(_T)"
+
+#: ../src/smime/gui/certificate-manager.c:1384
+msgctxt "CamelTrust"
+msgid "_Temporarily trusted (this session only)"
+msgstr ""
+
+#: ../src/smime/gui/certificate-manager.c:1385
+msgctxt "CamelTrust"
+msgid "_Marginally trusted"
+msgstr ""
+
+#: ../src/smime/gui/certificate-manager.c:1386
+#, fuzzy
+#| msgid "R_eply requested"
+msgctxt "CamelTrust"
+msgid "_Fully trusted"
+msgstr "返信を要求する(_E)"
+
+#: ../src/smime/gui/certificate-manager.c:1387
+#, fuzzy
+#| msgid "R_eply requested"
+msgctxt "CamelTrust"
+msgid "_Ultimately trusted"
+msgstr "返信を要求する(_E)"
+
+#: ../src/smime/gui/certificate-manager.c:1391
+#, fuzzy
+#| msgid ""
+#| "Before trusting this CA for any purpose, you should examine its "
+#| "certificate and its policy and procedures (if available)."
+msgid ""
+"Before trusting this site, you should examine its certificate and its policy "
+"and procedures (if available)."
+msgstr ""
+"認証局 (CA) を信用する前に、(可能であれば) その証明書やポリシー、そして手続き"
+"をよく調べる必要があります。"
+
+#: ../src/smime/gui/certificate-manager.c:1406
+#, fuzzy
+#| msgid "_View Certificate"
+msgid "_Display certificate"
+msgstr "証明書の表示(_V)"
+
+#: ../src/smime/gui/certificate-manager.c:1611
+#, fuzzy
+#| msgid "You have certificates on file that identify these people:"
+msgid "You have certificates on file that identify these mail servers:"
+msgstr "次の人達の身元を確認できる証明書 (ファイル) があります:"
+
+#: ../src/smime/gui/certificate-manager.c:1642
+#, fuzzy
+#| msgid "_List name:"
+msgid "Host name"
+msgstr "一覧の名前(_L):"
+
+#: ../src/smime/gui/certificate-manager.c:1644
+msgid "Issuer"
+msgstr "発行者"
+
+#: ../src/smime/gui/certificate-manager.c:1645
+#, fuzzy
+#| msgid "Fingerprints"
+msgid "Fingerprint"
+msgstr "指紋"
+
+#: ../src/smime/gui/certificate-manager.c:1646
+msgid "Trust"
+msgstr ""
+
+#: ../src/smime/gui/certificate-manager.c:1667
+#, fuzzy
+#| msgid "_Edit CA Trust"
+msgid "_Edit Trust"
+msgstr "CA トラストの編集(_E)"
+
+#: ../src/smime/gui/certificate-manager.c:2121
 msgid "All PKCS12 files"
 msgstr "すべての PKCS12 ファイル"
 
-#: ../smime/gui/certificate-manager.c:1070
+#: ../src/smime/gui/certificate-manager.c:2138
 msgid "All email certificate files"
 msgstr "すべてのメール認証ファイル"
 
-#: ../smime/gui/certificate-manager.c:1087
+#: ../src/smime/gui/certificate-manager.c:2155
 msgid "All CA certificate files"
 msgstr "すべての CA 認証ファイル"
 
-#: ../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 "この証明書を発行した認証局を信用したので、ここで表示された他のものを除いて、この証明書の信憑性を信用することになります。"
+#: ../src/smime/gui/cert-trust-dialog.c:150
+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: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 "この証明書を発行した認証局を信用しなかったので、ここで表示された他のものを除いて、この証明書の信憑性を信用しないことになります。"
+#: ../src/smime/gui/cert-trust-dialog.c:155
+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:55
-#, c-format
-msgid "Enter the password for '%s', token '%s'"
+#: ../src/smime/gui/component.c:53
+#, fuzzy, c-format
+#| msgid "Enter the password for '%s', token '%s'"
+msgid "Enter the password for “%s”, token “%s”"
 msgstr "'%s' のパスワードと '%s' のトークンを入力してください"
 
-#: ../smime/gui/component.c:57
-#, c-format
-msgid "Enter the password for '%s'"
+#: ../src/smime/gui/component.c:55
+#, fuzzy, c-format
+#| msgid "Enter the password for '%s'"
+msgid "Enter the password for “%s”"
 msgstr "'%s' のパスワードを入力してください"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:85
+#: ../src/smime/gui/component.c:83
 msgid "Enter new password for certificate database"
 msgstr "データベースを証明する新しいパスワードを入力してください"
 
-#: ../smime/gui/component.c:88
+#: ../src/smime/gui/component.c:86
 msgid "Enter new password"
 msgstr "新しいパスワードの入力"
 
-#. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
-#, c-format
-msgid ""
-"Issued to:\n"
-"  Subject: %s\n"
-msgstr ""
-"発行先:\n"
-"  件名: %s\n"
-
-#: ../smime/gui/e-cert-selector.c:122
-#, c-format
-msgid ""
-"Issued by:\n"
-"  Subject: %s\n"
-msgstr ""
-"発行元:\n"
-"  件名: %s\n"
-
-#: ../smime/gui/e-cert-selector.c:175
+#: ../src/smime/gui/e-cert-selector.c:178
 msgid "Select certificate"
 msgstr "証明書の選択"
 
-#: ../smime/gui/smime-ui.ui.h:3
+#: ../src/smime/gui/smime-ui.ui.h:1
 msgid "You have certificates from these organizations that identify you:"
 msgstr "次の組織からあなたの身元を確認できる証明書があります:"
 
-#: ../smime/gui/smime-ui.ui.h:4
+#: ../src/smime/gui/smime-ui.ui.h:2
 msgid "Certificates Table"
 msgstr "証明書の一覧"
 
 #. This is a verb, as in "make a backup".
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../src/smime/gui/smime-ui.ui.h:5
 msgid "_Backup"
 msgstr "バックアップ(_B)"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../src/smime/gui/smime-ui.ui.h:6
 msgid "Backup _All"
 msgstr "すべてバックアップ(_A)"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../src/smime/gui/smime-ui.ui.h:9
 msgid "Your Certificates"
 msgstr "ユーザーの証明書"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../src/smime/gui/smime-ui.ui.h:10
 msgid "You have certificates on file that identify these people:"
 msgstr "次の人達の身元を確認できる証明書 (ファイル) があります:"
 
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../src/smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "連絡先の証明書"
 
-#: ../smime/gui/smime-ui.ui.h:15
-msgid "You have certificates on file that identify these certificate authorities:"
+#: ../src/smime/gui/smime-ui.ui.h:13
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "次の認証局を確認できる証明書 (ファイル) があります:"
 
-#: ../smime/gui/smime-ui.ui.h:16
+#: ../src/smime/gui/smime-ui.ui.h:14
 msgid "Authorities"
 msgstr "認証局"
 
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../src/smime/gui/smime-ui.ui.h:15
 msgid "Certificate Authority Trust"
 msgstr "認証局の信頼性"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../src/smime/gui/smime-ui.ui.h:19
 msgid "Trust this CA to identify _websites."
 msgstr "この認証局をウェブサイトを識別するために信用します。(_W)"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../src/smime/gui/smime-ui.ui.h:20
 msgid "Trust this CA to identify _email users."
 msgstr "この認証局をメールのユーザーを識別するために信用します。(_E)"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../src/smime/gui/smime-ui.ui.h:21
 msgid "Trust this CA to identify _software developers."
 msgstr "この認証局をソフトウェア開発者を識別するために信用します。(_S)"
 
-#: ../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:25
-msgid "Certificate"
-msgstr "証明書"
-
-#: ../smime/gui/smime-ui.ui.h:26
-msgid "Certificate details"
-msgstr "証明書の詳細"
+#: ../src/smime/gui/smime-ui.ui.h:22
+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:27
+#: ../src/smime/gui/smime-ui.ui.h:23
 msgid "Email Certificate Trust Settings"
 msgstr "メール証明書の信憑性の設定"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../src/smime/gui/smime-ui.ui.h:24
+msgid "_Edit CA Trust"
+msgstr "CA トラストの編集(_E)"
+
+#: ../src/smime/gui/smime-ui.ui.h:25
 msgid "Trust the authenticity of this certificate"
 msgstr "この証明書を信用する"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../src/smime/gui/smime-ui.ui.h:26
 msgid "Do not trust the authenticity of this certificate"
 msgstr "この証明書の信憑性を問わない"
 
-#: ../smime/gui/smime-ui.ui.h:30
-msgid "_Edit CA Trust"
-msgstr "CA トラストの編集(_E)"
+#: ../src/smime/gui/smime-ui.ui.h:29
+#, fuzzy
+#| msgid "Certificate"
+msgid "C_ertificate:"
+msgstr "証明書"
 
-#: ../smime/lib/e-cert.c:236 ../smime/lib/e-cert.c:248
+#: ../src/smime/lib/e-cert.c:235 ../src/smime/lib/e-cert.c:247
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:404
+#: ../src/smime/lib/e-cert.c:403
 msgid "Sign"
 msgstr "署名"
 
-#: ../smime/lib/e-cert.c:405
+#: ../src/smime/lib/e-cert.c:404
 msgid "Encrypt"
 msgstr "暗号化"
 
-#: ../smime/lib/e-cert-db.c:718
+#: ../src/smime/lib/e-cert-db.c:786
 msgid "Certificate already exists"
 msgstr "既に証明書があります"
 
-#: ../smime/lib/e-pkcs12.c:199
+#: ../src/smime/lib/e-pkcs12.c:200
 msgid "PKCS12 File Password"
 msgstr "PKCS12 ファイルのパスワード"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../src/smime/lib/e-pkcs12.c:201
 msgid "Enter password for PKCS12 file:"
 msgstr "PKCS12 ファイルのパスワードを入力してください:"
 
-#: ../smime/lib/e-pkcs12.c:307
+#: ../src/smime/lib/e-pkcs12.c:327
+#, fuzzy, c-format
+#| msgid "Unable to book a resource, error: %s"
+msgid "Unable to create export context, err_code: %i"
+msgstr "リソースを予約できません。エラー: %s"
+
+#: ../src/smime/lib/e-pkcs12.c:334
+#, c-format
+msgid "Unable to setup password integrity, err_code: %i"
+msgstr ""
+
+#: ../src/smime/lib/e-pkcs12.c:344
+#, fuzzy, c-format
+#| msgid "Unable to book a resource, error: %s"
+msgid "Unable to create safe bag, err_code: %i"
+msgstr "リソースを予約できません。エラー: %s"
+
+#: ../src/smime/lib/e-pkcs12.c:362
+#, fuzzy, c-format
+#| msgid "Unable to book a resource, error: %s"
+msgid "Unable to add key/cert to the store, err_code: %i"
+msgstr "リソースを予約できません。エラー: %s"
+
+#: ../src/smime/lib/e-pkcs12.c:380
+#, fuzzy, c-format
+#| msgid "Unable to book a resource, error: %s"
+msgid "Unable to write store to disk, err_code: %i"
+msgstr "リソースを予約できません。エラー: %s"
+
+#: ../src/smime/lib/e-pkcs12.c:407
 msgid "Imported Certificate"
 msgstr "インポートした証明書"
 
-#: ../views/addressbook/galview.xml.h:1
-msgid "_Address Cards"
-msgstr "アドレスカード(_A)"
+#~ msgid "Specify the output file instead of standard output"
+#~ msgstr "標準出力のかわりに出力するファイルを指定する"
 
-#: ../views/addressbook/galview.xml.h:2 ../views/calendar/galview.xml.h:5
-msgid "_List View"
-msgstr "一覧ビュー(_L)"
+#~ msgid "OUTPUTFILE"
+#~ msgstr "OUTPUTFILE"
 
-#: ../views/addressbook/galview.xml.h:3
-msgid "By _Company"
-msgstr "会社の一覧(_C)"
+#~ msgid "List local address book folders"
+#~ msgstr "ローカルにあるアドレス帳フォルダーの一覧を出力する"
 
-#: ../views/calendar/galview.xml.h:1
-msgid "_Day View"
-msgstr "日間ビュー(_D)"
+#~ msgid "Show cards as vcard or csv file"
+#~ msgstr "表示するカードの種類を指定する (vCard または CSV 形式)"
 
-#: ../views/calendar/galview.xml.h:2
-msgid "_Work Week View"
-msgstr "平日ビュー(_W)"
+#~ msgid "[vcard|csv]"
+#~ msgstr "[vcard|csv]"
 
-#: ../views/calendar/galview.xml.h:3
-msgid "W_eek View"
-msgstr "週間ビュー(_E)"
+#~ msgid ""
+#~ "Command line arguments error, please use --help option to see the usage."
+#~ msgstr ""
+#~ "コマンドラインの引数エラーです (`--help` を指定してオプションを確認してく"
+#~ "ださい)"
 
-#: ../views/calendar/galview.xml.h:4
-msgid "_Month View"
-msgstr "月間ビュー(_M)"
+#~ msgid "Only support csv or vcard format."
+#~ msgstr "CSV または vCard のフォーマットのみサポートしています"
 
-#: ../views/mail/galview.xml.h:1
-msgid "_Messages"
-msgstr "メッセージ表示(_M)"
+#~ msgid "Unhandled error"
+#~ msgstr "処理できないエラー"
 
-#: ../views/mail/galview.xml.h:2
-msgid "As _Sent Folder"
-msgstr "送信済フォルダー表示(_S)"
+#~ msgid "Can not open file"
+#~ msgstr "ファイルを開けません"
 
-#: ../views/mail/galview.xml.h:3
-msgid "By Su_bject"
-msgstr "件名順(_B)"
+#~ msgid "Failed to open client '%s': %s"
+#~ msgstr "クライアント '%s' を開けません: %s"
 
-#: ../views/mail/galview.xml.h:4
-msgid "By Se_nder"
-msgstr "差出人順(_N)"
+#~ msgid "Canceled"
+#~ msgstr "キャンセル済み"
 
-#: ../views/mail/galview.xml.h:5
-msgid "By S_tatus"
-msgstr "ステータス順(_T)"
+#~ msgctxt "ECompEditor"
+#~ msgid "Canceled"
+#~ msgstr "キャンセル済み"
 
-#: ../views/mail/galview.xml.h:6
-msgid "By _Follow Up Flag"
-msgstr "フォローアップフラグ順(_F)"
+#~ msgid "Because &quot;{1}&quot;."
+#~ msgstr "原因は &quot;{1}&quot; です。"
 
-#: ../views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "ワイドビュー向け(_W)"
+#, fuzzy
+#~| msgid "Enable express mode"
+#~ msgid "Enable developer mode"
+#~ msgstr "エクスプレスモードを有効にする"
 
-#: ../views/mail/galview.xml.h:8
-msgid "As Sent Folder for Wi_de View"
-msgstr "ワイド表示の送信済フォルダー表示(_D)"
+#~ msgid "Signature exists, but need public key"
+#~ msgstr "署名はありますが公開鍵が必要です"
 
-#: ../views/memos/galview.xml.h:1
-msgid "_Memos"
-msgstr "メモ(_M)"
+#~ msgid "Could not open '%s'"
+#~ msgstr "'%s' を開けませんでした"
 
-#: ../views/tasks/galview.xml.h:2
-msgid "With _Due Date"
-msgstr "期日(_D)"
+#, fuzzy
+#~| msgid "Calendar Properties"
+#~ msgid "Changed property"
+#~ msgstr "カレンダーのプロパティ"
 
-#: ../views/tasks/galview.xml.h:3
-msgid "With _Status"
-msgstr "ステータス(_S)"
+#, fuzzy
+#~| msgid "Whether to emit a beep."
+#~ msgid "Whether editor changed"
+#~ msgstr "ビープ音を鳴らすかどうか"
+
+#~ msgid "_Unsort"
+#~ msgstr "並べ替えない(_U)"
+
+#~ msgid "Canceled."
+#~ msgstr "キャンセルしました"
+
+#, fuzzy
+#~| msgid "Task - %s"
+#~ msgctxt "PGPKeyDescription"
+#~ msgid "%s - %s"
+#~ msgstr "タスク - %s"
+
+#~ msgid "Failed to connect account &quot;{0}&quot;."
+#~ msgstr "アカウント &quot;{0}&quot; の接続に失敗しました。"
+
+#~ msgid "Selected Calendars for Alarms"
+#~ msgstr "アラーム用に選択したカレンダー"
+
+#~ msgid "Sh_ow a reminder"
+#~ msgstr "リマインダーを予定の(_O)"
+
+#~ msgid "Evolution Web Inspector"
+#~ msgstr "Evolution ウェブインスペクター"
+
+#~ msgid "Web addresses"
+#~ msgstr "ウェブのアドレス"
+
+#~ msgid "start of appointment"
+#~ msgstr "予定開始"
+
+#~ msgid "end of appointment"
+#~ msgstr "予定終了"
+
+#~ msgid "Add Reminder"
+#~ msgstr "リマインダーを追加する"
+
+#~ msgid "Reminder"
+#~ msgstr "リマインダー"
+
+#~ msgid "Repeat"
+#~ msgstr "繰り返し"
+
+#~ msgid "Mes_sage:"
+#~ msgstr "メッセージ(_S):"
+
+#~ msgid "_Sound:"
+#~ msgstr "サウンド(_S):"
+
+#~ msgid "Select A File"
+#~ msgstr "ファイルの選択"
+
+#~ msgid "Action/Trigger"
+#~ msgstr "アクション"
+
+#~ msgid "This event has been deleted."
+#~ msgstr "このイベントは削除されました。"
+
+#~ msgid "This task has been deleted."
+#~ msgstr "このタスクは削除されました。"
+
+#~ msgid "This memo has been deleted."
+#~ msgstr "このメモは削除されました。"
+
+#~ msgid ""
+#~ "%s  You have made changes. Forget those changes and close the editor?"
+#~ msgstr "%s  変更しました。これらの変更を無視してエディターを閉じますか?"
+
+#~ msgid "%s  You have made no changes, close the editor?"
+#~ msgstr "%s  何も変更していませんが、エディターを閉じますか?"
+
+#~ msgid "This event has been changed."
+#~ msgstr "このイベントは変更されました。"
+
+#~ msgid "This task has been changed."
+#~ msgstr "このタスクは変更されました。"
+
+#~ msgid "This memo has been changed."
+#~ msgstr "このメモは変更されました。"
+
+#~ msgid ""
+#~ "%s  You have made changes. Forget those changes and update the editor?"
+#~ msgstr "%s  変更しました。この変更を無視してエディターを更新しますか?"
+
+#~ msgid "%s  You have made no changes, update the editor?"
+#~ msgstr "%s  何も変更していませんが、エディターを更新しますか?"
+
+#~ msgid "Could not update object"
+#~ msgstr "オブジェクトを更新できませんでした"
+
+#~ msgid "Edit Appointment"
+#~ msgstr "予定の編集"
+
+#~ msgid "Keep original item?"
+#~ msgstr "アイテムをそのままにしておきますか?"
+
+#~ msgid "Unable to synchronize with the server"
+#~ msgstr "サーバーと同期できません"
+
+#~ msgid "Changes made to this item may be discarded if an update arrives"
+#~ msgstr "更新が届いたらこのアイテムに対する変更を破棄する"
+
+#~ msgid "Unable to use current version!"
+#~ msgstr "現在のバージョンを使用できません!"
+
+#~ msgid "Validation error: %s"
+#~ msgstr "整合性のエラー: %s"
+
+#~ msgid "Could not open destination"
+#~ msgstr "転送先ソースを開けませんでした"
+
+#~ msgid "Cannot create object"
+#~ msgstr "オブジェクトを作成できません"
+
+#~ msgid "Could not open source"
+#~ msgstr "送信元ソースを開けませんでした"
+
+#~ msgid "The event could not be deleted due to a dbus error: %s"
+#~ msgstr "D-Bus のエラーのためイベントを削除できませんでした: %s"
+
+#~ msgid "The task could not be deleted due to a dbus error: %s"
+#~ msgstr "D-Bus のエラーのためタスクを削除できませんでした: %s"
+
+#~ msgid "The memo could not be deleted due to a dbus error: %s"
+#~ msgstr "D-Bus のエラーのためメモを削除できませんでした: %s"
+
+#~ msgid "The item could not be deleted due to a dbus error: %s"
+#~ msgstr "D-Bus のエラーのためアイテムを削除できませんでした: %s"
+
+#~ msgid "The event could not be deleted because permission was denied"
+#~ msgstr "権限がないのでイベントを削除できませんでした"
+
+#~ msgid "The task could not be deleted because permission was denied"
+#~ msgstr "権限がないのでタスクを削除できませんでした"
+
+#~ msgid "The memo could not be deleted because permission was denied"
+#~ msgstr "権限がないのでメモを削除できませんでした"
+
+#~ msgid "The item could not be deleted because permission was denied"
+#~ msgstr "権限がないのでアイテムを削除できませんでした"
+
+#~ msgid "The event could not be deleted due to an error: %s"
+#~ msgstr "エラーのためイベントを削除できませんでした: %s"
+
+#~ msgid "The task could not be deleted due to an error: %s"
+#~ msgstr "エラーのためタスクを削除できませんでした: %s"
+
+#~ msgid "The memo could not be deleted due to an error: %s"
+#~ msgstr "エラーのためメモを削除できませんでした: %s"
+
+#~ msgid "The item could not be deleted due to an error: %s"
+#~ msgstr "エラーのためアイテムを削除できませんでした: %s"
+
+#~ msgid "Enter Delegate"
+#~ msgstr "委任先の入力"
+
+#~ msgid "Delegate To:"
+#~ msgstr "委任先:"
+
+#~ msgid "Contacts..."
+#~ msgstr "連絡先..."
+
+#~ msgid "_Recurrence"
+#~ msgstr "繰り返す(_R)"
+
+#~ msgid "Make this a recurring event"
+#~ msgstr "このイベントを繰り返します"
+
+#~ msgid "Insert advanced send options"
+#~ msgstr "送信用の拡張オプションを挿入します"
+
+#~ msgid "_Free/Busy"
+#~ msgstr "予定の有無(_F)"
+
+#~ msgid "This event has reminders"
+#~ msgstr "このイベントにはリマインダーがあります"
+
+#~ msgid "Event with no start date"
+#~ msgstr "開始日のないイベント"
+
+#~ msgid "Event with no end date"
+#~ msgstr "終了日のないイベント"
+
+#~ msgid "End date is wrong"
+#~ msgstr "終了日が間違っています"
+
+#~ msgid "End time is wrong"
+#~ msgstr "終了時刻が間違っています"
+
+#~ msgid "_Delegatees"
+#~ msgstr "委任者(_D)"
+
+#~ msgid "Atte_ndees"
+#~ msgstr "出席者(_N)"
+
+#~ msgid "Customize"
+#~ msgstr "その他"
+
+#~ msgctxt "eventpage"
+#~ msgid "15 minutes before appointment"
+#~ msgstr "予定の 15分前"
+
+#~ msgctxt "eventpage"
+#~ msgid "1 hour before appointment"
+#~ msgstr "予定の 1時間前"
+
+#~ msgctxt "eventpage"
+#~ msgid "1 day before appointment"
+#~ msgstr "予定の 1日前"
+
+#~ msgid "_Time:"
+#~ msgstr "時刻(_T):"
+
+#~ msgid "Event Description"
+#~ msgstr "イベントの内容"
+
+#~ msgid "Custom Reminder:"
+#~ msgstr "独自のリマインダー:"
+
+#~ msgid "Memo's start date is in the past"
+#~ msgstr "メモの開始日が過去です"
+
+#~ msgid "Organi_zer:"
+#~ msgstr "主催者(_Z):"
+
+#~ msgid "T_o:"
+#~ msgstr "共有先(_O):"
+
+#~ msgid "Su_mmary:"
+#~ msgstr "サマリ(_M):"
+
+#~ msgid "Could not get a selection to modify."
+#~ msgstr "変更する内容を取得できませんでした"
+
+#~ msgid "Could not get a selection to delete."
+#~ msgstr "削除する内容を取得できませんでした"
+
+#~ msgid "Date/Time"
+#~ msgstr "日付/時刻"
+
+#~ msgctxt "recurrpage"
+#~ msgid "day(s)"
+#~ msgstr "日"
+
+#~ msgctxt "recurrpage"
+#~ msgid "for"
+#~ msgstr "以下の回数:"
+
+#~ msgctxt "recurrpage"
+#~ msgid "until"
+#~ msgstr "以下の時まで:"
+
+#~ msgid "_Send Options"
+#~ msgstr "送信オプション(_S)"
+
+#~ msgid ""
+#~ "Task cannot be edited, because the selected task list does not support "
+#~ "assigned tasks"
+#~ msgstr ""
+#~ "タスクを編集できません。選択したタスク一覧はタスク割り当てをサポートしてい"
+#~ "ません。"
+
+#~ msgid "Due date is wrong"
+#~ msgstr "期日が間違っています"
+
+#~ msgid "Time zone:"
+#~ msgstr "タイムゾーン:"
+
+#~ msgid "Gnome Calendar"
+#~ msgstr "GNOME カレンダー"
+
+#~ msgid "%s at the start of the appointment"
+#~ msgstr "予定を開始した時点で%s"
+
+#~ msgid "%s at the end of the appointment"
+#~ msgstr "予定を終了した時点で%s"
+
+#~ msgid "Deleting selected objects"
+#~ msgstr "指定したオブジェクトを削除します"
+
+#~ msgid "Untitled Message"
+#~ msgstr "タイトルなしのメッセージ"
+
+#~ msgid "Download in progress. Do you want to send the mail?"
+#~ msgstr "ダウンロード中です。メッセージを送信しますか?"
+
+#~ msgid ""
+#~ " There are few attachments getting downloaded. Sending the mail will "
+#~ "cause the mail to be sent without those pending attachments "
+#~ msgstr ""
+#~ " ダウンロードした添付ファイルはほとんどありません。このままメッセージを送"
+#~ "信すると \"添付ファイルなし\" として送信されることになります。 "
+
+#~ msgid "Spell checking color"
+#~ msgstr "スペルチェック結果に付与する色"
+
+#~ msgid "Underline color for misspelled words when using inline spelling."
+#~ msgstr ""
+#~ "インラインのスペルチェックを行っている時につづりが間違っている時に付与する"
+#~ "下線の色です。"
+
+#~ msgid ""
+#~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
+#~ "\" lines in the \"Messages\" column in vertical view"
+#~ msgstr ""
+#~ "縦型の表示の際に \"メッセージ\" の項目の \"差出人\" と \"件名\" に同じフォ"
+#~ "ントを使用するかどうか"
+
+#~ msgid ""
+#~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
+#~ "\" lines in the \"Messages\" column in vertical view."
+#~ msgstr ""
+#~ "縦型の表示の際に \"メッセージ\" の項目の \"差出人\" と \"件名\" に同じフォ"
+#~ "ントを使用するかどうか"
+
+#~ msgid "Invalid authentication result code (%d)"
+#~ msgstr "無効な認証結果コード (%d)"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Completed On"
+#~ msgstr "完了日"
+
+#~ msgid "is not set"
+#~ msgstr "が付与されていない"
+
+#~ msgid "is set"
+#~ msgstr "が付与されている"
+
+#~ msgid "Loading Images"
+#~ msgstr "画像の読み込み"
+
+#~ msgid "Option is ignored if a match for custom junk headers is found."
+#~ msgstr ""
+#~ "ここで指定したヘッダーに一致するメールを検出した場合は次のオプションが無視"
+#~ "されます:"
+
+#~ msgid "Please select a valid backup file to restore."
+#~ msgstr "リストアする妥当なバックアップファイルを選択してください。"
+
+#~ msgid "HTTP Error: %s"
+#~ msgstr "HTTP のエラー: %s"
+
+#~ msgid "Could not parse response"
+#~ msgstr "応答を解析できませんでした: "
+
+#~ msgid "Empty response"
+#~ msgstr "応答を空にする"
+
+#~ msgid "Unexpected reply from server"
+#~ msgstr "サーバーから予期しない応答が返りました"
+
+#~ msgid "Could not locate user's calendars"
+#~ msgstr "ユーザーのカレンダーを見つけられませんでした。"
+
+#~ msgid "Path"
+#~ msgstr "パス"
+
+#~ msgid "Enter Google password for user '%s'."
+#~ msgstr "ユーザー '%s' の Google のパスワードを入力してください。"
+
+#~ msgid "User declined to provide a password"
+#~ msgstr "ユーザーがパスワードの提供を拒否しました"
+
+#~ msgid "Expunging"
+#~ msgstr "抹消"
+
+#~ msgid "Itip Formatter"
+#~ msgstr "Itip フォーマッタ"
+
+#~ msgid "Display \"text/calendar\" MIME parts in mail messages."
+#~ msgstr ""
+#~ "メールメッセージの中の MIMEの \"text/calendar\" 形式のパーツを表示します"
+
+#~ msgid "_PostScript"
+#~ msgstr "_PostScript"
+
+#~ msgid "Please select an image of size 48 * 48"
+#~ msgstr "48x48 の大きさの画像を選択してください"
+
+#~ msgid "View image attachments directly in mail messages."
+#~ msgstr "添付画像を直接メール中に表示します。"
+
+#~ msgid ""
+#~ "Issued to:\n"
+#~ "  Subject: %s\n"
+#~ msgstr ""
+#~ "発行先:\n"
+#~ "  件名: %s\n"
+
+#~ msgid ""
+#~ "Issued by:\n"
+#~ "  Subject: %s\n"
+#~ msgstr ""
+#~ "発行元:\n"
+#~ "  件名: %s\n"
+
+#~ msgid "Certificate details"
+#~ msgstr "証明書の詳細"
 
 #~ msgid "Original Contact:"
 #~ msgstr "元の連絡先:"
@@ -20190,12 +27835,6 @@ msgstr "ステータス(_S)"
 #~ msgid "_Restore Default"
 #~ msgstr "デフォルトに戻す(_R)"
 
-#~ msgid "Add"
-#~ msgstr "追加"
-
-#~ msgid "Edit"
-#~ msgstr "編集"
-
 #~ msgid " Account "
 #~ msgstr " アカウント "
 
@@ -20220,9 +27859,6 @@ msgstr "ステータス(_S)"
 #~ msgid "_Secure HTTP Proxy:"
 #~ msgstr "セキュア HTTP プロキシ(_S):"
 
-#~ msgid "No _Proxy for:"
-#~ msgstr "無視するホスト(_P):"
-
 #~ msgid "Use Authe_ntication"
 #~ msgstr "認証する(_N)"
 
@@ -20271,9 +27907,6 @@ msgstr "ステータス(_S)"
 #~ msgid "Expires On"
 #~ msgstr "有効期限"
 
-#~ msgid "Fingerprints"
-#~ msgstr "指紋"
-
 #~ msgid "Certificate Hierarchy"
 #~ msgstr "証明書の階層"
 
@@ -20394,9 +28027,6 @@ msgstr "ステータス(_S)"
 #~ msgid "Certificate Signature Algorithm"
 #~ msgstr "証明書の署名アルゴリズム"
 
-#~ msgid "Issuer"
-#~ msgstr "発行者"
-
 #~ msgid "Issuer Unique ID"
 #~ msgstr "重複しない発行者の ID"