I like monkeys - Federico

svn path=/trunk/; revision=6981

1 files changed, 614 insertions, 696 deletions

diff --git a/po/ja.po b/po/ja.po
index 7db27095de..4a33180de5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS-20001211\n"
-"POT-Creation-Date: 2000-12-11 18:33+0900\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\n"
 "PO-Revision-Date: 2000-12-11 21:58+0900\n"
 "Last-Translator: Akira TAGOH <tagoh@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -460,99 +460,6 @@ msgstr "アイテムはこれらのカテゴリに属しています:"
 msgid "Available Categories:"
 msgstr "利用できるカテゴリ:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
-msgid "Assistant"
-msgstr "アシスタント"
-
-#: addressbook/contact-editor/e-contact-editor.c:1267
-#: addressbook/contact-editor/e-contact-editor.c:1371
-msgid "Business"
-msgstr "仕事"
-
-#: addressbook/contact-editor/e-contact-editor.c:1268
-msgid "Business 2"
-msgstr "仕事 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1269
-msgid "Business Fax"
-msgstr "仕事の FAX"
-
-#: addressbook/contact-editor/e-contact-editor.c:1270
-msgid "Callback"
-msgstr "呼び戻し"
-
-#: addressbook/contact-editor/e-contact-editor.c:1271
-msgid "Car"
-msgstr "車"
-
-#: addressbook/contact-editor/e-contact-editor.c:1272
-msgid "Company"
-msgstr "会社"
-
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/contact-editor/e-contact-editor.c:1372
-msgid "Home"
-msgstr "家"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-msgid "Home 2"
-msgstr "家 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-msgid "Home Fax"
-msgstr "家の FAX"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-msgid "Mobile"
-msgstr "モバイル"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1373
-#: po/tmp/mail-config.glade.h:17
-msgid "Other"
-msgstr "その他"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-msgid "Other Fax"
-msgstr "その他の FAX"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Pager"
-msgstr "ポケベル"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Primary"
-msgstr "プライマリ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Radio"
-msgstr "ラジオ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Telex"
-msgstr "テレックス"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1328
-msgid "Primary Email"
-msgstr "主要な E メール"
-
-#: addressbook/contact-editor/e-contact-editor.c:1329
-msgid "Email 2"
-msgstr "E メール2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1330
-msgid "Email 3"
-msgstr "E メール3"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -630,6 +537,11 @@ msgstr "仕事の FAX(_F)"
 msgid "_Mobile"
 msgstr "モバイル(_M)"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "主要な E メール"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "仕事(_u)"
@@ -709,6 +621,94 @@ msgstr "ノート(_t):"
 msgid "Details"
 msgstr "詳細"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "アシスタント"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "仕事"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "仕事 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "仕事の FAX"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr "呼び戻し"
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "車"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "会社"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "家"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "家 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "家の FAX"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+msgid "Mobile"
+msgstr "モバイル"
+
+#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1373
+#: po/tmp/mail-config.glade.h:17
+msgid "Other"
+msgstr "その他"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "その他の FAX"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "ポケベル"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "プライマリ"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "ラジオ"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "テレックス"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "E メール2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "E メール3"
+
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -927,6 +927,11 @@ msgstr "名前を選択"
 msgid "Select name from List:"
 msgstr "リストから名前を選択:"
 
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "検索"
+
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -1062,11 +1067,6 @@ msgstr ""
 "\n"
 "ダブルクリックをして新規コンタクトを作成して下さい"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "検索"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -1240,13 +1240,13 @@ msgid "label26"
 msgstr "label26"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:539
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
 #: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr "午前"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:542
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
 #: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
 msgid "pm"
 msgstr "午後"
@@ -1475,7 +1475,7 @@ msgstr "利用できる要約はありません"
 #.
 #: po/tmp/alarm-notify.glade.h:6 po/tmp/evolution-contact-editor.xml.h:6
 #: po/tmp/evolution-event-editor.xml.h:13
-#: po/tmp/evolution-message-composer.xml.h:9
+#: po/tmp/evolution-message-composer.xml.h:8
 #: po/tmp/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr "閉じる"
@@ -1584,7 +1584,7 @@ msgstr "週のはじめ:"
 msgid "Fri"
 msgstr "金"
 
-#: calendar/gui/event-editor.c:422 po/tmp/cal-prefs-dialog.glade.h:28
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
 msgid "Friday"
 msgstr "金曜日"
 
@@ -1612,7 +1612,7 @@ msgstr "まだ期限が来ていないアイテム:"
 msgid "Mon"
 msgstr "月"
 
-#: calendar/gui/event-editor.c:418 po/tmp/cal-prefs-dialog.glade.h:35
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
 msgid "Monday"
 msgstr "月曜日"
 
@@ -1644,7 +1644,7 @@ msgstr "催促"
 msgid "Sat"
 msgstr "土"
 
-#: calendar/gui/event-editor.c:423 po/tmp/cal-prefs-dialog.glade.h:43
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
 msgid "Saturday"
 msgstr "土曜日"
 
@@ -1669,7 +1669,7 @@ msgstr "開始日:"
 msgid "Sun"
 msgstr "日"
 
-#: calendar/gui/event-editor.c:424 po/tmp/cal-prefs-dialog.glade.h:49
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
 msgid "Sunday"
 msgstr "日曜日"
 
@@ -1681,7 +1681,7 @@ msgstr "作業"
 msgid "Thu"
 msgstr "木"
 
-#: calendar/gui/event-editor.c:421 po/tmp/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
 msgid "Thursday"
 msgstr "木曜日"
 
@@ -1701,7 +1701,7 @@ msgstr "時間のフォーマット:"
 msgid "Tue"
 msgstr "火"
 
-#: calendar/gui/event-editor.c:419 po/tmp/cal-prefs-dialog.glade.h:57
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
 msgid "Tuesday"
 msgstr "火曜日"
 
@@ -1713,7 +1713,7 @@ msgstr "視覚的なアラーム"
 msgid "Wed"
 msgstr "水"
 
-#: calendar/gui/event-editor.c:420 po/tmp/cal-prefs-dialog.glade.h:60
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
 msgid "Wednesday"
 msgstr "水曜日"
 
@@ -1729,29 +1729,6 @@ msgstr "分前"
 msgid "seconds."
 msgstr " 秒"
 
-#: calendar/gui/dialogs/task-editor.c:656
-msgid "Edit Task"
-msgstr "作業の編集"
-
-#: calendar/gui/dialogs/task-editor.c:662 calendar/gui/event-editor.c:321
-msgid "No summary"
-msgstr "要約なし"
-
-#: calendar/gui/dialogs/task-editor.c:668 calendar/gui/event-editor.c:327
-#, c-format
-msgid "Appointment - %s"
-msgstr "予約 - %s"
-
-#: calendar/gui/dialogs/task-editor.c:671 calendar/gui/event-editor.c:330
-#, c-format
-msgid "Task - %s"
-msgstr "作業 - %s"
-
-#: calendar/gui/dialogs/task-editor.c:674 calendar/gui/event-editor.c:333
-#, c-format
-msgid "Journal entry - %s"
-msgstr "仕訳記入 - %s"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -1840,6 +1817,33 @@ msgstr "状況(_S):"
 msgid "task-editor-dialog"
 msgstr "作業エディタダイアログ"
 
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "作業の編集"
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr "要約なし"
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "予約 - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "作業 - %s"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr "仕訳記入 - %s"
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
+
 #: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "開く..."
@@ -1875,50 +1879,50 @@ msgstr "%02i 分分割"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1197
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%B %d %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1211
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%b/%d (%a)"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1224
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%b/%d"
 
-#: calendar/gui/e-day-view.c:2932 calendar/gui/e-day-view.c:2939
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-week-view.c:3165
+#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
+#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
 #: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
 msgid "New appointment..."
 msgstr "新規予約..."
 
-#: calendar/gui/e-day-view.c:2936 calendar/gui/e-day-view.c:2943
+#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
 #: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
 msgid "Edit this appointment..."
 msgstr "この予約を編集..."
 
-#: calendar/gui/e-day-view.c:2937 calendar/gui/e-week-view.c:3170
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
 #: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "この予約を削除"
 
-#: calendar/gui/e-day-view.c:2944 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr "この予約を可動にする"
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr "この出来事を削除"
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr "すべての出来事を削除"
 
@@ -1929,40 +1933,6 @@ msgstr "すべての出来事を削除"
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/event-editor.c:315
-msgid "Edit Appointment"
-msgstr "予約の編集"
-
-#: calendar/gui/event-editor.c:392
-msgid "on"
-msgstr ""
-
-#: calendar/gui/event-editor.c:417 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
-msgid "day"
-msgstr "日"
-
-#: calendar/gui/event-editor.c:542
-msgid "on the"
-msgstr ""
-
-#: calendar/gui/event-editor.c:549
-msgid "th"
-msgstr ""
-
-#: calendar/gui/event-editor.c:703
-msgid "occurrences"
-msgstr "出来事"
-
-#: calendar/gui/event-editor.c:820
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "この予約は Evolution が編集出来ない再発を含んでいます"
-
-#: calendar/gui/event-editor.c:2951 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr "%Y/%b/%d (%a)"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -2123,6 +2093,40 @@ msgstr "週"
 msgid "year(s)"
 msgstr "年"
 
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "予約の編集"
+
+#: calendar/gui/event-editor.c:407
+msgid "on"
+msgstr ""
+
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "日"
+
+#: calendar/gui/event-editor.c:559
+msgid "on the"
+msgstr ""
+
+#: calendar/gui/event-editor.c:566
+msgid "th"
+msgstr ""
+
+#: calendar/gui/event-editor.c:722
+msgid "occurrences"
+msgstr "出来事"
+
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "この予約は Evolution が編集出来ない再発を含んでいます"
+
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
+msgstr "%Y/%b/%d (%a)"
+
 #: calendar/gui/getdate.y:391
 msgid "january"
 msgstr "1月"
@@ -2570,7 +2574,7 @@ msgstr "今年 (%Y)"
 msgid "Print Calendar"
 msgstr "カレンダの印刷"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:957
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "印刷プレビュー"
 
@@ -2748,6 +2752,19 @@ msgstr "URL 文字列 `%s' は無効なプロトコルを含んでいます"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "URL `%s' のポート番号は数字ではありません"
 
+#: camel/providers/imap/camel-imap-auth.c:127
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Kerberos チケットを取得することが出来ませんでした:\n"
+"%s"
+
+#: camel/providers/imap/camel-imap-auth.c:198
+msgid "Bad authentication response from server."
+msgstr "サーバから間違った認証応答がありました"
+
 #: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -2781,7 +2798,7 @@ msgstr "IMAP サーバから予期しない OK 応答がありました: %s"
 msgid "Could not load summary for %s"
 msgstr "%s の要約をロード出来ませんでした"
 
-#: camel/providers/imap/camel-imap-folder.c:585
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH 応答にメッセージ本体を見付けることが出来ませんでした"
 
@@ -2834,55 +2851,194 @@ msgstr ""
 msgid "Could not create directory %s: %s"
 msgstr "ディレクトリ %s を作成出来ませんでした: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:223
-msgid "Could not create summary"
-msgstr "要約を作成出来ませんでした"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr "UNIX MH 形式のメールディレクトリ (CamelLocal バージョン)"
+
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr "UNIX mbox 形式のメールファイル (CamelLocal バージョン)"
+
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:122
+#, c-format
+msgid "Store root %s is not an absolute path"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:129
+#, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "保存されたルート %s は通常のディレクトリではありません"
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "フォルダを取得出来ません: %s: %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr "ローカルフォルダはネストすることが出来ません"
+
+#: camel/providers/local/camel-local-store.c:200
+#, c-format
+msgid "Local mail file %s"
+msgstr "ローカルメールファイル %s"
+
+#: camel/providers/local/camel-local-store.c:256
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "フォルダを %s から %s へリネームすることが出来ませんでした: %s"
 
-#: camel/providers/mbox/camel-mbox-folder.c:378
-#: camel/providers/mbox/camel-mbox-folder.c:381
+#: camel/providers/local/camel-local-store.c:297
 #, c-format
-msgid "Cannot append message to mbox file: %s"
-msgstr "mbox ファイルにメッセージを追加出来ません: %s"
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "フォルダからサマリーファイル `%s' を削除することが出来ませんでした: %s"
 
-#: camel/providers/mbox/camel-mbox-folder.c:485
+#: camel/providers/local/camel-local-store.c:306
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "メッセージを取得出来ません: %s"
+msgid "Could not delete folder index file `%s': %s"
+msgstr ""
+"フォルダからインデックスファイル `%s' を削除することが出来ませんでした: %s"
 
-#: camel/providers/local/camel-mbox-provider.c:34
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr "UNIX mbox 形式のメールファイル"
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, c-format
+msgid "Cannot append message to maildir folder: %s: %s"
+msgstr "maildir 形式のフォルダへメッセージを追加出来ません: %s: %s"
 
-#: camel/providers/local/camel-mbox-provider.c:36
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-maildir-folder.c:204
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
 msgstr ""
+"メッセージを取得出来ません: %s\n"
+"  %s"
 
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/mbox/camel-mbox-store.c:118
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+msgid "No such message"
+msgstr "そのようなメッセージはありません"
+
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:198
+msgid "Invalid message contents"
+msgstr "メッセージの内容は無効です"
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"ファイル `%s' を開くことが出来ませんでした:\n"
+"フォルダ `%s' を開くことが出来ませんでした:\n"
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mbox-store.c:108
 #: camel/providers/local/camel-mh-store.c:103
-#: camel/providers/mbox/camel-mbox-store.c:125
-#: camel/providers/mh/camel-mh-store.c:119
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "フォルダ `%s' は存在しません"
 
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"フォルダ `%s' を作成出来ませんでした:\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' は maildir 形式のディレクトリではありません"
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "フォルダ `%s' を削除することが出来ませんでした: %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+msgid "not a maildir directory"
+msgstr "maildir 形式のディレクトリではありません"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr "mailboxを開くことが出来ません: %s: %s\n"
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, c-format
+msgid "Cannot append message to mbox file: %s: %s"
+msgstr "mbox ファイルにメッセージを追加出来ません: %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:327
+#: camel/providers/local/camel-mbox-folder.c:357
+#: camel/providers/local/camel-mbox-folder.c:368
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"メッセージ %s をフォルダ %s から取得出来ません\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"ファイル `%s' を開くことが出来ませんでした:\n"
+"%s"
+
 #: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/mbox/camel-mbox-store.c:134
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -2893,16 +3049,12 @@ msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:126
 #: camel/providers/local/camel-mbox-store.c:153
-#: camel/providers/mbox/camel-mbox-store.c:143
-#: camel/providers/mbox/camel-mbox-store.c:177
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' は通常のファイルではありません"
 
 #: camel/providers/local/camel-mbox-store.c:145
 #: camel/providers/local/camel-mbox-store.c:168
-#: camel/providers/mbox/camel-mbox-store.c:169
-#: camel/providers/mbox/camel-mbox-store.c:205
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -2912,175 +3064,88 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:160
-#: camel/providers/mbox/camel-mbox-store.c:184
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "フォルダ `%s' は空ではありません. 削除しません"
 
-#: camel/providers/mbox/camel-mbox-store.c:222
-#, c-format
-msgid "Could not rename folder %s to %s: destination exists"
-msgstr "フォルダを %s から %s へリネーム出来ませんでした: 宛先が存在します"
-
-#: camel/providers/mbox/camel-mbox-store.c:260
-msgid "Mbox folders may not be nested."
-msgstr "Mbox フォルダはネストすることが出来ません"
+#: camel/providers/local/camel-mbox-summary.c:234
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr "フォルダを開けませんでした: メッセージリストは未完成です"
 
-#: camel/providers/local/camel-local-store.c:200
-#: camel/providers/mbox/camel-mbox-store.c:274
+#: camel/providers/local/camel-mbox-summary.c:268
 #, c-format
-msgid "Local mail file %s"
-msgstr "ローカルメールファイル %s"
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:667
-#, c-format
-msgid "Could not open summary %s"
-msgstr "要約 %s を開くことが出来ませんでした"
+#: camel/providers/local/camel-mbox-summary.c:341
+#, fuzzy, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "%s を fork 出来ません: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
+#, fuzzy, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr ""
+"フォルダ `%s' を開くことが出来ませんでした:\n"
+"%s"
 
 #: camel/providers/local/camel-mbox-summary.c:491
-#: camel/providers/mbox/camel-mbox-summary.c:688
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "テンポラリ mailbox を開くことが出来ません: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:734
-msgid "Summary mismatch, aborting sync"
+#: camel/providers/local/camel-mbox-summary.c:512
+#: camel/providers/local/camel-mbox-summary.c:520
+#: camel/providers/local/camel-mbox-summary.c:691
+#: camel/providers/local/camel-mbox-summary.c:699
+#, fuzzy
+msgid "Summary and folder mismatch, even after a sync"
 msgstr "要約が不一致, 同期が中断しました"
 
-#: camel/providers/mbox/camel-mbox-summary.c:754
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr "要約が不一致, X-Evolution ヘッダが見付かりません"
-
 #: camel/providers/local/camel-mbox-summary.c:562
-#: camel/providers/mbox/camel-mbox-summary.c:776
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "作業 mailbox へ書き出し中にエラー: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:789
-#: camel/providers/mbox/camel-mbox-summary.c:807
+#: camel/providers/local/camel-mbox-summary.c:579
 #, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr "出力ファイルへデータをコピー出来ません: %s"
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "作業 mailbox へ書き出し中にエラー: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:595
 #: camel/providers/local/camel-mbox-summary.c:748
-#: camel/providers/mbox/camel-mbox-summary.c:832
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "元のフォルダ %s を閉じることが出来ませんでした: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:604
-#: camel/providers/mbox/camel-mbox-summary.c:841
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "作業フォルダを閉じることが出来ませんでした: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:615
-#: camel/providers/mbox/camel-mbox-summary.c:849
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "フォルダをリネーム出来ませんでした: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:817
-#: camel/providers/mbox/camel-mbox-summary.c:861
 #, c-format
 msgid "Unknown error: %s"
 msgstr "未知のエラー: %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:213
-msgid "Could not load or create summary"
-msgstr "要約を作成またはロードすることが出来ませんでした"
-
-#: camel/providers/mh/camel-mh-folder.c:336
-#: camel/providers/mh/camel-mh-folder.c:339
-#, c-format
-msgid "Cannot append message to mh folder: %s"
-msgstr "mh フォルダへメッセージを追加出来ません: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
-#: camel/providers/mh/camel-mh-folder.c:405
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"メッセージを取得出来ません: %s\n"
-"  %s"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr "UNIX MH 形式のメールディレクトリ"
-
-#: camel/providers/local/camel-local-provider.c:37
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#: camel/providers/mh/camel-mh-store.c:112
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"フォルダ `%s' を開くことが出来ませんでした:\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#: camel/providers/mh/camel-mh-store.c:127
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
 #, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"フォルダ `%s' を作成出来ませんでした:\n"
-"%s"
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr "mh フォルダへメッセージを追加出来ません: %s: %s"
 
 #: camel/providers/local/camel-mh-store.c:116
-#: camel/providers/mh/camel-mh-store.c:136
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' はディレクトリではありません"
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#: camel/providers/mh/camel-mh-store.c:155
-#: camel/providers/mh/camel-mh-store.c:168
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "フォルダ `%s' を削除することが出来ませんでした: %s"
-
-#: camel/providers/mh/camel-mh-store.c:186
-#: camel/providers/mh/camel-mh-store.c:190
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "フォルダ `%s' をリネーム出来ませんでした: %s"
-
-#: camel/providers/mh/camel-mh-store.c:194
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "フォルダ `%s' をリネーム出来ませんでした: %s は存在します"
-
-#: camel/providers/mh/camel-mh-store.c:202
-msgid "MH folders may not be nested."
-msgstr "MH フォルダはネストすることが出来ません"
-
-#: camel/providers/mh/camel-mh-store.c:214
-#, c-format
-msgid "Local mail directory %s"
-msgstr "ローカルメールディレクトリ %s"
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -3428,7 +3493,7 @@ msgstr "Subject:"
 msgid "Enter the subject of the mail"
 msgstr "メールの表題を入力します"
 
-#: composer/e-msg-composer.c:428
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3437,38 +3502,38 @@ msgstr ""
 "署名ファイル %s を開くことが出来ませんでした:\n"
 "%s"
 
-#: composer/e-msg-composer.c:598
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "別名で保存..."
 
-#: composer/e-msg-composer.c:609
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "ファイルの保存中にエラー: %s"
 
-#: composer/e-msg-composer.c:629
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "ファイルのロード中にエラー: %s"
 
-#: composer/e-msg-composer.c:651
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "メッセージの変更を保存中..."
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "メッセージの変更を保存..."
 
-#: composer/e-msg-composer.c:694
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "'草案箱' へ草案を保存中にエラーが発生しました: %s"
 
-#: composer/e-msg-composer.c:738 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:744
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3478,27 +3543,27 @@ msgstr ""
 "\n"
 "変更を保存しますか?"
 
-#: composer/e-msg-composer.c:766
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "ファイルを開く"
 
-#: composer/e-msg-composer.c:892
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "そのファイルは存在しません"
 
-#: composer/e-msg-composer.c:902
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "それは通常のファイルではありません"
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "そのファイルは存在しますが，読み取り可能ではありません"
 
-#: composer/e-msg-composer.c:922
+#: composer/e-msg-composer.c:923
 msgid "That file appeared accesible but open(2) failed."
 msgstr "そのファイルはアクセス可能のように見えますが，open(2) は失敗しました"
 
-#: composer/e-msg-composer.c:944
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3506,15 +3571,15 @@ msgstr ""
 "ファイルはとても大きい (100K 以上) です\n"
 "それを挿入することを望むのは確かですか?"
 
-#: composer/e-msg-composer.c:965
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "ファイル読込中の間にエラーは発生しました"
 
-#: composer/e-msg-composer.c:1342
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "メッセージを作成します"
 
-#: composer/e-msg-composer.c:1419
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr "メール作成ウィンドウを作成出来ませんでした"
 
@@ -3522,7 +3587,7 @@ msgstr "メール作成ウィンドウを作成出来ませんでした"
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution メール作成の初期化が出来ません"
 
-#: filter/e-search-bar.c:175
+#: filter/e-search-bar.c:176
 msgid "Sear_ch"
 msgstr "検索(_c)"
 
@@ -3655,15 +3720,15 @@ msgstr ""
 "フォルダの選択を忘れています\n"
 "戻ってメールを配送する有効なフォルダを指定してください"
 
-#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "フォルダを選択"
 
-#: filter/filter-folder.c:235
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "フォルダ URI の入力"
 
-#: filter/filter-folder.c:281
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<フォルダを選択するためにここをクリックしてください>"
 
@@ -3931,16 +3996,16 @@ msgstr "仮想フォルダルールの追加"
 msgid "Edit VFolder Rule"
 msgstr "仮想フォルダルールの編集"
 
-#: mail/component-factory.c:203
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution メールコンポーネントの初期化が出来ません"
 
-#: mail/component-factory.c:242
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr ""
 
 #: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:17
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Save"
 msgstr "保存"
 
@@ -3992,7 +4057,7 @@ msgstr "受信者のフィルタ"
 msgid "Filter on Mailing List"
 msgstr "メーリングリストのフィルタ"
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
 msgid "Open"
 msgstr "開く"
 
@@ -4131,15 +4196,15 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:543
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "メッセージを移動します: "
 
-#: mail/mail-callbacks.c:545
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr "メッセージをコピーします: "
 
-#: mail/mail-callbacks.c:660
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4147,11 +4212,11 @@ msgstr ""
 "ドラフトフォルダ内に保存された\n"
 "メッセージだけを編集することが出来ます"
 
-#: mail/mail-callbacks.c:694 mail/mail-display.c:72
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
 msgid "Overwrite file?"
 msgstr "ファイルを上書きしますか?"
 
-#: mail/mail-callbacks.c:698 mail/mail-display.c:76
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4159,15 +4224,15 @@ msgstr ""
 "その名前のファイルはすでに存在します\n"
 "上書きしますか?"
 
-#: mail/mail-callbacks.c:743
+#: mail/mail-callbacks.c:748
 msgid "Save Message As..."
 msgstr "メッセージを別名で保存..."
 
-#: mail/mail-callbacks.c:745
+#: mail/mail-callbacks.c:750
 msgid "Save Messages As..."
 msgstr "メッセージを別名で保存..."
 
-#: mail/mail-callbacks.c:872
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4176,14 +4241,46 @@ msgstr ""
 "フィルタ情報のロード中にエラー:\n"
 "%s"
 
-#: mail/mail-callbacks.c:917
+#: mail/mail-callbacks.c:922
 msgid "Print Message"
 msgstr "メッセージを印刷"
 
-#: mail/mail-callbacks.c:964
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr "メッセージの印刷に失敗しました"
 
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/mail-config-druid.glade.h:6
+msgid "Identity"
+msgstr "身元"
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "メール設定"
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr "メールソース"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "メールの配送"
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr "ようこそ Evolution メール設定ウィザードへ!\n"
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+"あなたの電子メールの設定は完了しました\n"
+"\"完了\" をクリックして新しい設定を保存してください"
+
 #: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
@@ -4331,50 +4428,6 @@ msgstr ""
 msgid "Query authorization at \"%s\""
 msgstr ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/mail-config-druid.glade.h:6
-msgid "Identity"
-msgstr "身元"
-
-#: po/tmp/mail-config-druid.glade.h:7
-msgid "Mail Configuration"
-msgstr "メール設定"
-
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "メールソース"
-
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "メールの配送"
-
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
-msgstr "ようこそ Evolution メール設定ウィザードへ!\n"
-
-#: po/tmp/mail-config-druid.glade.h:11
-msgid "By filling in some information about your email\n"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:12
-msgid "settings, you can start sending and receiving email\n"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:13
-msgid "right away. Click Next to continue."
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:14
-msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
-msgstr ""
-"あなたの電子メールの設定は完了しました\n"
-"\"完了\" をクリックして新しい設定を保存してください"
-
 #: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "アドレス"
@@ -4411,35 +4464,20 @@ msgstr "HTML 形式でメッセージを送信"
 msgid "Sources"
 msgstr "ソース"
 
-#: mail/mail-crypto.c:136
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "%s へのパイプが作成できませんでした: %s"
-
-#: mail/mail-crypto.c:163
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "%s を実行出来ませんでした: %s\n"
-
-#: mail/mail-crypto.c:167
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr "%s を fork 出来ません: %s"
-
-#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "あなたの PGP/GPG パスフレーズを入力してください"
 
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "提供されたパスワードはありません"
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP へのパイプが作成できませんでした: %s"
 
-#: mail/mail-crypto.c:599
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "GPG/PGP プログラムは利用できません"
 
@@ -4517,79 +4555,79 @@ msgstr "暗号化されたメッセージ"
 msgid "Click icon to decrypt."
 msgstr "アイコンをクリックして復号化してください"
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1470
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1478
+#: mail/mail-format.c:1482
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1486
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1516
+#: mail/mail-format.c:1520
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1521
+#: mail/mail-format.c:1525
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1691
+#: mail/mail-format.c:1695
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "On %s, %s wrote:\n"
 
-#: mail/mail-local.c:194
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "フォルダ \"%s\" を \"%s\" 形式へ変更しています"
 
-#: mail/mail-local.c:198
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "フォルダ \"%s\" を \"%s\" 形式へ変更します"
 
-#: mail/mail-local.c:254
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr "現在のフォルダをクローズ中"
 
-#: mail/mail-local.c:286
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr "古いフォルダをリネームしてオープン中"
 
-#: mail/mail-local.c:307
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "新規フォルダを作成中"
 
-#: mail/mail-local.c:322
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "メッセージをコピー中"
 
-#: mail/mail-local.c:334
+#: mail/mail-local.c:341
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:370
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:668
+#: mail/mail-local.c:781
 msgid "Registering local folder"
 msgstr "ローカルフォルダを登録中"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:783
 msgid "Register local folder"
 msgstr "ローカルフォルダを登録します"
 
@@ -4709,165 +4747,165 @@ msgstr "フォルダ \"%s\" の中のメッセージをマークします"
 msgid "Marking message %d of %d"
 msgstr "メッセージ %d / %d をマーク中"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" の中のフォルダを走査中"
 
-#: mail/mail-ops.c:1300
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "\"%s\" の中のフォルダを走査します"
 
-#: mail/mail-ops.c:1369 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(説明なし)"
 
-#: mail/mail-ops.c:1430
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "フォルダ \"%s\" からメッセージを添付中"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "\"%s\" からメッセージを添付します"
 
-#: mail/mail-ops.c:1533
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "メッセージ \"%s\" を転送中"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr "表題なしのメッセージを転送中"
 
-#: mail/mail-ops.c:1540
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "メッセージ \"%s\" を転送します"
 
-#: mail/mail-ops.c:1544
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr "表題なしのメッセージを転送します"
 
-#: mail/mail-ops.c:1591
+#: mail/mail-ops.c:1593
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "メッセージ番号を取得しています %d / %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1610
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 "転送されるメッセージを生成中にメッセージから MIME パートの生成で失敗しました"
 
-#: mail/mail-ops.c:1663
+#: mail/mail-ops.c:1665
 msgid "Forwarded messages"
 msgstr "メッセージを転送"
 
-#: mail/mail-ops.c:1677
+#: mail/mail-ops.c:1679
 msgid "Forwarded message:\n"
 msgstr "メッセージを転送:\n"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Loading \"%s\""
 msgstr "\"%s\" をロード中"
 
-#: mail/mail-ops.c:1748
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr "\"%s\" をロードします"
 
-#: mail/mail-ops.c:1851
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "\"%s\" を作成中"
 
-#: mail/mail-ops.c:1853
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "\"%s\" を作成します"
 
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr "シェルコンポーネントリスナーへ結果を報告する間に例外が発生しました"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "\"%s\" を同期中"
 
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "\"%s\" を同期します"
 
-#: mail/mail-ops.c:2013
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "メッセージ UID \"%s\" を表示中"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr "メッセージディスプレイをクリア中"
 
-#: mail/mail-ops.c:2019
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "メッセージ UID \"%s\" を表示します"
 
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr "メッセージディスプレイをクリアします"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "フォルダ \"%s\" からメッセージを開いています"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "\"%s\" からメッセージを開きます"
 
-#: mail/mail-ops.c:2242
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr "%s フォルダをロード中"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr "%s フォルダを読み込みます"
 
-#: mail/mail-ops.c:2308
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "フォルダ \"%s\" からメッセージを表示中"
 
-#: mail/mail-ops.c:2311
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "\"%s\" からメッセージを表示します"
 
-#: mail/mail-ops.c:2337
+#: mail/mail-ops.c:2339
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "メッセージを取得しています %d / %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2426
+#: mail/mail-ops.c:2428
 #, c-format
 msgid "Saving messages from folder \"%s\""
 msgstr "フォルダ \"%s\" からメッセージを保存中"
 
-#: mail/mail-ops.c:2429
+#: mail/mail-ops.c:2431
 #, c-format
 msgid "Save messages from folder \"%s\""
 msgstr "フォルダ \"%s\" からメッセージを保存します"
 
-#: mail/mail-ops.c:2472
+#: mail/mail-ops.c:2474
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "メッセージを保存しています %d / %d (uid \"%s\")"
@@ -4876,7 +4914,7 @@ msgstr "メッセージを保存しています %d / %d (uid \"%s\")"
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: mail/mail-summary.c:104 mail/mail-threads.c:728
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr "パイプ上に不完全なメッセージが書かれました!"
 
@@ -5011,38 +5049,38 @@ msgstr "選択されたメッセージを印刷します"
 msgid "Delete this message"
 msgstr "このメッセージを削除します"
 
-#: mail/message-list.c:574
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr "未読"
 
-#: mail/message-list.c:577
+#: mail/message-list.c:575
 msgid "Seen"
 msgstr "既読"
 
-#: mail/message-list.c:580
+#: mail/message-list.c:578
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:848
+#: mail/message-list.c:846
 #, c-format
 msgid "[ %s ]"
 msgstr "[ %s ]"
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:858 mail/message-list.c:873
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:862 mail/message-list.c:877
+#: mail/message-list.c:860 mail/message-list.c:875
 msgid "<unknown>"
 msgstr "<未知>"
 
-#: mail/message-list.c:2159
+#: mail/message-list.c:2068
 msgid "Rebuilding message view"
 msgstr "メッセージビューを再構築中"
 
-#: mail/message-list.c:2161
+#: mail/message-list.c:2070
 msgid "Rebuild message view"
 msgstr "メッセージビューを再構築"
 
@@ -5314,6 +5352,16 @@ msgstr "ショートカットバーからこのショートカットを削除します"
 msgid "Error saving shortcuts."
 msgstr "ショートカットの保存中にエラーが発生しました"
 
+#: po/tmp/evolution-event-editor.xml.h:125
+#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:34
+#: shell/e-storage-set-view.c:235
+msgid "_View"
+msgstr "表示(_V)"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "選択されたフォルダを表示します"
+
 #: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(名前なし)"
@@ -5362,16 +5410,6 @@ msgstr "操作はサポートされていません"
 msgid "The specified type is not supported in this storage"
 msgstr "指定された種別はこの記憶装置ではサポートされていません"
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:45 po/tmp/evolution.xml.h:34
-#: shell/e-storage-set-view.c:235
-msgid "_View"
-msgstr "表示(_V)"
-
-#: shell/e-storage-set-view.c:235
-msgid "View the selected folder"
-msgstr "選択されたフォルダを表示します"
-
 #: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -5644,7 +5682,7 @@ msgstr "印刷..."
 
 #: po/tmp/evolution-contact-editor.xml.h:13
 #: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:19
+#: po/tmp/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "別名で保存(_A)..."
 
@@ -5673,7 +5711,7 @@ msgstr "表題なしのメッセージを送信します"
 
 #: po/tmp/evolution-contact-editor.xml.h:19
 #: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:40
+#: po/tmp/evolution-message-composer.xml.h:38
 #: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
 msgid "_File"
 msgstr "ファイル(_F)"
@@ -5684,7 +5722,7 @@ msgstr "印刷(_P)..."
 
 #: po/tmp/evolution-contact-editor.xml.h:21
 #: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:44
+#: po/tmp/evolution-message-composer.xml.h:42
 msgid "_Save"
 msgstr "保存(_S)"
 
@@ -5921,7 +5959,7 @@ msgid "FIXME: what goes here?"
 msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:11
+#: po/tmp/evolution-message-composer.xml.h:10
 msgid "F_ormat"
 msgstr "フォーマット(_o)"
 
@@ -5998,7 +6036,7 @@ msgid "Save the appointment and close the dialog box"
 msgstr "添付を保存してダイアログボックスを閉じます"
 
 #: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:22
+#: po/tmp/evolution-message-composer.xml.h:21
 msgid "Save the current file"
 msgstr "現在のファイルを保存"
 
@@ -6043,12 +6081,12 @@ msgid "Undo the last action"
 msgstr "最後の動作をやり直す"
 
 #: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:36
+#: po/tmp/evolution-message-composer.xml.h:34
 msgid "_About..."
 msgstr "情報(_A)..."
 
 #: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:37
+#: po/tmp/evolution-message-composer.xml.h:35
 msgid "_Close"
 msgstr "閉じる(_C)"
 
@@ -6057,12 +6095,12 @@ msgid "_Copy"
 msgstr "コピー(_C)"
 
 #: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-message-composer.xml.h:36
 msgid "_Debug"
 msgstr "デバッグ(_D)"
 
 #: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:39
+#: po/tmp/evolution-message-composer.xml.h:37
 #: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
 msgid "_Edit"
 msgstr "編集(_E)"
@@ -6076,7 +6114,7 @@ msgid "_Forms"
 msgstr "フォーム(_F)"
 
 #: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:41 po/tmp/evolution.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
@@ -6308,99 +6346,91 @@ msgstr "仮想フォルダエディタ(_V)"
 msgid "Attach"
 msgstr "貼附"
 
-#: po/tmp/evolution-message-composer.xml.h:8
-msgid "Bold"
-msgstr "太字"
-
-#: po/tmp/evolution-message-composer.xml.h:10
+#: po/tmp/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "現在のファイルを閉じる"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: po/tmp/evolution-message-composer.xml.h:11
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:12
 msgid "Insert a file as text into the message"
 msgstr "メッセージへテキストファイルを挿入"
 
-#: po/tmp/evolution-message-composer.xml.h:14
+#: po/tmp/evolution-message-composer.xml.h:13
 msgid "Insert text file..."
 msgstr "テキストファイルを挿入..."
 
-#: po/tmp/evolution-message-composer.xml.h:16
+#: po/tmp/evolution-message-composer.xml.h:15
 msgid "Open a file"
 msgstr "ファイルを開く"
 
-#: po/tmp/evolution-message-composer.xml.h:18
+#: po/tmp/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "別名で保存"
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: po/tmp/evolution-message-composer.xml.h:19
 msgid "Save in _folder... (FIXME)"
 msgstr "フォルダへ保存(_f)... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:21
+#: po/tmp/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "フォルダへ保存..."
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: po/tmp/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "別名で現在のファイルを保存"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: po/tmp/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "指定のフォルダへメッセージを保存"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: po/tmp/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "送信"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: po/tmp/evolution-message-composer.xml.h:25
 msgid "Send _Later"
 msgstr "後で送信(_L)"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: po/tmp/evolution-message-composer.xml.h:26
 msgid "Send _later"
 msgstr "後で送信(_l)"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:27
 msgid "Send the mail in HTML format"
 msgstr "HTML 形式でメールを送信"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: po/tmp/evolution-message-composer.xml.h:28
 msgid "Send the message later"
 msgstr "メッセージを後で送信します"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: po/tmp/evolution-message-composer.xml.h:29
 msgid "Send the message now"
 msgstr "メッセージを今送信します"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: po/tmp/evolution-message-composer.xml.h:30
 msgid "Send this message now"
 msgstr "このメッセージを今送信します"
 
-#: po/tmp/evolution-message-composer.xml.h:32
-msgid "Sets something as bold"
-msgstr ""
-
-#: po/tmp/evolution-message-composer.xml.h:33
+#: po/tmp/evolution-message-composer.xml.h:31
 msgid "Show / hide attachments"
 msgstr "添付の表示 / 非表示"
 
-#: po/tmp/evolution-message-composer.xml.h:34
+#: po/tmp/evolution-message-composer.xml.h:32
 msgid "Show _attachments"
 msgstr "添付を表示(_a)"
 
-#: po/tmp/evolution-message-composer.xml.h:35
+#: po/tmp/evolution-message-composer.xml.h:33
 msgid "Show attachments"
 msgstr "添付を表示"
 
-#: po/tmp/evolution-message-composer.xml.h:42
+#: po/tmp/evolution-message-composer.xml.h:40
 msgid "_Insert text file... (FIXME)"
 msgstr "テキストファイルを挿入... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:43
+#: po/tmp/evolution-message-composer.xml.h:41
 msgid "_Open..."
 msgstr "開く(_O)..."
 
@@ -6532,6 +6562,13 @@ msgstr "設定(_S)"
 msgid "_Task (FIXME)"
 msgstr "作業(_T) (FIXME)"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+msgid "%A, %B %d, %Y"
+msgstr "%Y/%B/%d %A"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "試案"
@@ -6608,13 +6645,6 @@ msgstr "会議終了時間(_e):"
 msgid "All Attendees"
 msgstr "すべての付き添い"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
-msgid "%A, %B %d, %Y"
-msgstr "%Y/%B/%d %A"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
@@ -6645,177 +6675,65 @@ msgstr "%p %I:%M"
 msgid "Group %i"
 msgstr "グループ %i"
 
-#: camel/providers/imap/camel-imap-auth.c:124
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kerberos チケットを取得することが出来ませんでした:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:195
-msgid "Bad authentication response from server."
-msgstr "サーバから間違った認証応答がありました"
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
-msgstr "UNIX MH 形式のメールディレクトリ (CamelLocal バージョン)"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "UNIX mbox-format mail files (CamelLocal version)"
-msgstr "UNIX mbox 形式のメールファイル (CamelLocal バージョン)"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:129
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "保存されたルート %s は通常のディレクトリではありません"
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "フォルダを取得出来ません: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr "ローカルフォルダはネストすることが出来ません"
+#~ msgid "Could not create summary"
+#~ msgstr "要約を作成出来ませんでした"
 
-#: camel/providers/local/camel-local-store.c:256
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "フォルダを %s から %s へリネームすることが出来ませんでした: %s"
+#~ msgid "Cannot append message to mbox file: %s"
+#~ msgstr "mbox ファイルにメッセージを追加出来ません: %s"
 
-#: camel/providers/local/camel-local-store.c:297
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "フォルダからサマリーファイル `%s' を削除することが出来ませんでした: %s"
+#~ msgid "Cannot get message: %s"
+#~ msgstr "メッセージを取得出来ません: %s"
 
-#: camel/providers/local/camel-local-store.c:306
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr ""
-"フォルダからインデックスファイル `%s' を削除することが出来ませんでした: %s"
+#~ msgid "UNIX mbox-format mail files"
+#~ msgstr "UNIX mbox 形式のメールファイル"
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "maildir 形式のフォルダへメッセージを追加出来ません: %s: %s"
+#~ msgid "Could not rename folder %s to %s: destination exists"
+#~ msgstr "フォルダを %s から %s へリネーム出来ませんでした: 宛先が存在します"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "そのようなメッセージはありません"
+#~ msgid "Mbox folders may not be nested."
+#~ msgstr "Mbox フォルダはネストすることが出来ません"
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
-msgid "Invalid message contents"
-msgstr "メッセージの内容は無効です"
+#~ msgid "Could not open summary %s"
+#~ msgstr "要約 %s を開くことが出来ませんでした"
 
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' は maildir 形式のディレクトリではありません"
+#~ msgid "Summary mismatch, aborting sync"
+#~ msgstr "要約が不一致, 同期が中断しました"
 
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr "maildir 形式のディレクトリではありません"
+#~ msgid "Summary mismatch, X-Evolution header missing"
+#~ msgstr "要約が不一致, X-Evolution ヘッダが見付かりません"
 
-#: camel/providers/local/camel-mbox-folder.c:195
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "mailboxを開くことが出来ません: %s: %s\n"
+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr "出力ファイルへデータをコピー出来ません: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:251
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "mbox ファイルにメッセージを追加出来ません: %s: %s"
+#~ msgid "Could not load or create summary"
+#~ msgstr "要約を作成またはロードすることが出来ませんでした"
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"メッセージ %s をフォルダ %s から取得出来ません\n"
-"  %s"
+#~ msgid "Cannot append message to mh folder: %s"
+#~ msgstr "mh フォルダへメッセージを追加出来ません: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:358
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr ""
+#~ msgid "UNIX MH-format mail directories"
+#~ msgstr "UNIX MH 形式のメールディレクトリ"
 
-#: camel/providers/local/camel-mbox-folder.c:369
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
+#~ msgid "Could not rename folder `%s': %s"
+#~ msgstr "フォルダ `%s' をリネーム出来ませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:234
-#, fuzzy, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "フォルダを開けませんでした: メッセージリストは未完成です"
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "フォルダ `%s' をリネーム出来ませんでした: %s は存在します"
 
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
+#~ msgid "MH folders may not be nested."
+#~ msgstr "MH フォルダはネストすることが出来ません"
 
-#: camel/providers/local/camel-mbox-summary.c:341
-#, fuzzy, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "%s を fork 出来ません: %s"
+#~ msgid "Local mail directory %s"
+#~ msgstr "ローカルメールディレクトリ %s"
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
-#, fuzzy, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr ""
-"フォルダ `%s' を開くことが出来ませんでした:\n"
-"%s"
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "%s へのパイプが作成できませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
-#, fuzzy
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "要約が不一致, 同期が中断しました"
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "%s を実行出来ませんでした: %s\n"
 
-#: camel/providers/local/camel-mbox-summary.c:579
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "作業 mailbox へ書き出し中にエラー: %s: %s"
+#~ msgid "Cannot fork %s: %s"
+#~ msgstr "%s を fork 出来ません: %s"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "mh フォルダへメッセージを追加出来ません: %s: %s"
+#~ msgid "Bold"
+#~ msgstr "太字"