Updated Japanese translation.

* ja.po: Updated Japanese translation.

svn path=/trunk/; revision=6903

1 files changed, 1919 insertions, 2072 deletions

diff --git a/po/ja.po b/po/ja.po
index bbad79c9e4..7db27095de 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,20 +4,20 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution CVS-20001108\n"
-"POT-Creation-Date: 2000-11-08 19:55+0900\n"
-"PO-Revision-Date: 2000-11-08 20:42+0900\n"
+"Project-Id-Version: evolution CVS-20001211\n"
+"POT-Creation-Date: 2000-12-11 18:33+0900\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3044
+#: addressbook/backend/ebook/e-card.c:3046
 msgid "Card: "
 msgstr "名刺: "
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: addressbook/backend/ebook/e-card.c:3048
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +25,7 @@ msgstr ""
 "\n"
 "名前: "
 
-#: addressbook/backend/ebook/e-card.c:3047
+#: addressbook/backend/ebook/e-card.c:3049
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,25 +33,25 @@ msgstr ""
 "\n"
 "  敬称(前つけ):     "
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3050
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Suffix:     "
@@ -59,7 +59,7 @@ msgstr ""
 "\n"
 "  敬称(後つけ):     "
 
-#: addressbook/backend/ebook/e-card.c:3065
+#: addressbook/backend/ebook/e-card.c:3067
 msgid ""
 "\n"
 "Birth Date: "
@@ -67,7 +67,7 @@ msgstr ""
 "\n"
 "誕生日: "
 
-#: addressbook/backend/ebook/e-card.c:3076
+#: addressbook/backend/ebook/e-card.c:3078
 msgid ""
 "\n"
 "Address:"
@@ -75,13 +75,13 @@ msgstr ""
 "\n"
 "住所:"
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3080
 msgid ""
 "\n"
 "  Postal Box:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3079
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "  Ext:         "
@@ -89,7 +89,7 @@ msgstr ""
 "\n"
 "  "
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3082
 msgid ""
 "\n"
 "  Street:      "
@@ -97,7 +97,7 @@ msgstr ""
 "\n"
 "  町:       "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  City:        "
@@ -105,7 +105,7 @@ msgstr ""
 "\n"
 "  都市:     "
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Region:      "
@@ -113,7 +113,7 @@ msgstr ""
 "\n"
 "  都道府県: "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Postal Code: "
@@ -121,7 +121,7 @@ msgstr ""
 "\n"
 "  郵便番号: "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  Country:     "
@@ -129,13 +129,13 @@ msgstr ""
 "\n"
 "  国:       "
 
-#: addressbook/backend/ebook/e-card.c:3097
+#: addressbook/backend/ebook/e-card.c:3099
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3109
+#: addressbook/backend/ebook/e-card.c:3111
 msgid ""
 "\n"
 "Telephones:\n"
@@ -143,7 +143,7 @@ msgstr ""
 "\n"
 "電話番号:\n"
 
-#: addressbook/backend/ebook/e-card.c:3112
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephone:"
@@ -151,7 +151,7 @@ msgstr ""
 "\n"
 "電話番号:"
 
-#: addressbook/backend/ebook/e-card.c:3136
+#: addressbook/backend/ebook/e-card.c:3138
 msgid ""
 "\n"
 "E-mail:\n"
@@ -159,7 +159,7 @@ msgstr ""
 "\n"
 "E メール:\n"
 
-#: addressbook/backend/ebook/e-card.c:3139
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:"
@@ -167,13 +167,15 @@ msgstr ""
 "\n"
 "E メール:"
 
-#: addressbook/backend/ebook/e-card.c:3158
+#: addressbook/backend/ebook/e-card.c:3160
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
+"\n"
+"メーラ: "
 
-#: addressbook/backend/ebook/e-card.c:3164
+#: addressbook/backend/ebook/e-card.c:3166
 msgid ""
 "\n"
 "Time Zone: "
@@ -181,7 +183,7 @@ msgstr ""
 "\n"
 "時間帯: "
 
-#: addressbook/backend/ebook/e-card.c:3172
+#: addressbook/backend/ebook/e-card.c:3174
 msgid ""
 "\n"
 "Geo Location: "
@@ -189,7 +191,7 @@ msgstr ""
 "\n"
 "経緯: "
 
-#: addressbook/backend/ebook/e-card.c:3176
+#: addressbook/backend/ebook/e-card.c:3178
 msgid ""
 "\n"
 "Business Role: "
@@ -197,7 +199,7 @@ msgstr ""
 "\n"
 "仕事の職務: "
 
-#: addressbook/backend/ebook/e-card.c:3188
+#: addressbook/backend/ebook/e-card.c:3190
 msgid ""
 "\n"
 "Org: "
@@ -205,7 +207,7 @@ msgstr ""
 "\n"
 "組織: "
 
-#: addressbook/backend/ebook/e-card.c:3189
+#: addressbook/backend/ebook/e-card.c:3191
 msgid ""
 "\n"
 "  Name:  "
@@ -213,7 +215,7 @@ msgstr ""
 "\n"
 "  社名:  "
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3192
 msgid ""
 "\n"
 "  Unit:  "
@@ -221,7 +223,7 @@ msgstr ""
 "\n"
 "  部署:  "
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "  Unit2: "
@@ -229,7 +231,7 @@ msgstr ""
 "\n"
 "  部署2: "
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Unit3: "
@@ -237,7 +239,7 @@ msgstr ""
 "\n"
 "  部署3: "
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit4: "
@@ -245,7 +247,7 @@ msgstr ""
 "\n"
 "  部署4: "
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3199
 msgid ""
 "\n"
 "Categories: "
@@ -253,7 +255,7 @@ msgstr ""
 "\n"
 "業務分野: "
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3200
 msgid ""
 "\n"
 "Comment: "
@@ -271,13 +273,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Public Key: "
@@ -289,10 +291,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:910
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1091
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo の初期化が出来ませんでした"
 
@@ -415,28 +417,28 @@ msgstr ""
 "gnome-pilot デーモンからパイロットリストを\n"
 "取得しようとした時にエラーが発生しました"
 
-#: addressbook/conduit/address-conduit.c:193
+#: addressbook/conduit/address-conduit.c:197
 msgid "Cursor could not be loaded\n"
 msgstr "カーソルは読み込まれることが出来ませんでした\n"
 
-#: addressbook/conduit/address-conduit.c:206
+#: addressbook/conduit/address-conduit.c:210
 msgid "EBook not loaded\n"
 msgstr "EBook はロードされていません\n"
 
-#: addressbook/conduit/address-conduit.c:490
-#: calendar/conduits/calendar/calendar-conduit.c:651
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr "wombat サーバを開始することが出来ませんでした"
 
-#: addressbook/conduit/address-conduit.c:491
-#: calendar/conduits/calendar/calendar-conduit.c:652
-#: calendar/conduits/todo/todo-conduit.c:525
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat"
 msgstr "wombat を開始することが出来ませんでした"
 
-#: addressbook/conduit/address-conduit.c:517
-#: addressbook/conduit/address-conduit.c:520
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr ""
 "パイロットのアドレスアプリケーションブロックを読み込むことが出来ませんでした"
@@ -458,114 +460,104 @@ msgstr "アイテムはこれらのカテゴリに属しています:"
 msgid "Available Categories:"
 msgstr "利用できるカテゴリ:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/contact-editor/e-contact-editor.c:1266
 msgid "Assistant"
 msgstr "アシスタント"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
-#: addressbook/contact-editor/e-contact-editor.c:1339
+#: 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:1236
+#: addressbook/contact-editor/e-contact-editor.c:1268
 msgid "Business 2"
 msgstr "仕事 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/contact-editor/e-contact-editor.c:1269
 msgid "Business Fax"
 msgstr "仕事の FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
+#: addressbook/contact-editor/e-contact-editor.c:1270
 msgid "Callback"
 msgstr "呼び戻し"
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Car"
 msgstr "車"
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
+#: addressbook/contact-editor/e-contact-editor.c:1272
 msgid "Company"
 msgstr "会社"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/contact-editor/e-contact-editor.c:1340
+#: 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:1242
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Home 2"
 msgstr "家 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1275
 msgid "Home Fax"
 msgstr "家の FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Mobile"
 msgstr "モバイル"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
-#: addressbook/contact-editor/e-contact-editor.c:1341
-#: mail/mail-config.glade.h:28 mail/mail-config.glade.h:40
+#: 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:1247
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Other Fax"
 msgstr "その他の FAX"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Pager"
 msgstr "ポケベル"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1281
 msgid "Primary"
 msgstr "プライマリ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Radio"
 msgstr "ラジオ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Telex"
 msgstr "テレックス"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
+#: 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:1296
+#: addressbook/contact-editor/e-contact-editor.c:1328
 msgid "Primary Email"
 msgstr "主要な E メール"
 
-#: addressbook/contact-editor/e-contact-editor.c:1297
+#: addressbook/contact-editor/e-contact-editor.c:1329
 msgid "Email 2"
 msgstr "E メール2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1298
+#: addressbook/contact-editor/e-contact-editor.c:1330
 msgid "Email 3"
 msgstr "E メール3"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"このコンタクトを削除\n"
-"してもいいですか?"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:10
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "コンタクトを削除?"
 
@@ -579,7 +571,7 @@ msgid "_Add"
 msgstr "追加(_A)"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-mail.xml.h:47
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "削除(_D)"
 
@@ -592,13 +584,13 @@ msgstr "電話タイプ"
 msgid "New phone type"
 msgstr "新規電話タイプ"
 
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/event-editor-dialog.glade.h:62 filter/filter.glade.h:12
-#: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
-#: filter/filter.glade.h:26 mail/mail-config-druid.glade.h:22
-#: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:22 mail/mail-config.glade.h:29
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "追加"
 
@@ -651,8 +643,7 @@ msgid "C_ontacts..."
 msgstr "コンタクト(_o)..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:34
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "カテゴリ(_t)..."
 
@@ -669,8 +660,7 @@ msgid "_Address..."
 msgstr "住所(_A)..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:69
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr "一般"
 
@@ -715,68 +705,58 @@ msgid "No_tes:"
 msgstr "ノート(_t):"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:36
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "詳細"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:7
-#: addressbook/contact-editor/fulladdr.glade.h:19
+#: po/tmp/fulladdr.glade.h:6
+msgid "Address _2:"
+msgstr "住所 2(_2):"
+
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr "カナダ"
+
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "住所をチェック"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
-#: addressbook/contact-editor/fulladdr.glade.h:21
+#: po/tmp/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr "国(_y):"
+
+#: po/tmp/fulladdr.glade.h:10
+msgid "Finland"
+msgstr "フィンランド"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr "USA"
+
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "住所(_A):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
-#: addressbook/contact-editor/fulladdr.glade.h:22
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "市町村(_C):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
-#: addressbook/contact-editor/fulladdr.glade.h:23
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-#: addressbook/contact-editor/fulladdr.glade.h:18
-msgid "Address _2:"
-msgstr "住所 2(_2):"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
-#: addressbook/contact-editor/fulladdr.glade.h:24
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "区/州(_S):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "USA"
-msgstr "USA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "Canada"
-msgstr "カナダ"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "Finland"
-msgstr "フィンランド"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
-#: addressbook/contact-editor/fulladdr.glade.h:25
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "郵便番号(_Z):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:17
-#: addressbook/contact-editor/fulladdr.glade.h:20
-msgid "Countr_y:"
-msgstr "国(_y):"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -836,17 +816,16 @@ msgstr "姓(_L):"
 msgid "_Suffix:"
 msgstr "敬称(後つけ)(_S):"
 
-#: addressbook/gui/component/addressbook.c:265
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr "ミニカード"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:271
-#: ui/evolution-addressbook.xml.h:7
+#: addressbook/gui/component/addressbook.c:269
+#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "テーブル(_T)"
 
@@ -863,22 +842,23 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
-msgstr ""
-"我々はこの住所録を開くことが出来ません. これはあなたが\n"
-"間違った URI を入力したか, LDAP サーバにアクセスして\n"
-"LDAP サポートを作り上げないようにしたことを意味します.\n"
-"もし URI を入力したなら誤りがないか URI をチェックして\n"
-"再入力して下さい. そうでなければ, たぶん LDAP サーバに\n"
-"アクセスするのを試みました．LDAP を使うことを望むなら\n"
-"OpenLDAP のダウンロードとインストール, そして evolution\n"
-"をインストールする必要があるでしょう\n"
-
-#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:152
+"OpenLDAP and recompile and install Evolution.\n"
+msgstr ""
+"このアドレス帳を開くことが出来ません. これはあなたが\n"
+"間違った URI を入力したか, LDAP サポートを無効にして\n"
+"コンパイルし, LDAPサーバへアクセスしようとしているこ\n"
+"とを意味します．もし URI を入力したなら, 正確な URI \n"
+"をチェックして再度入力してください. そうでなければ, \n"
+"たぶん LDAP サーバにアクセスを試みるでしょう. あなた\n"
+"が LDAP を使うことが出来ることを望むなら, OpenLDAP を\n"
+"ダウンロード，そしてインストールして, コンパイル仕直し\n"
+"て Evolution をインストールする必要がありでしょう.\n"
+
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
 msgid "Show All"
 msgstr "すべて表示"
 
-#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:154
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
 msgid "Advanced..."
 msgstr "詳細..."
 
@@ -903,184 +883,163 @@ msgid "External Directories"
 msgstr "外部ディレクトリ"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: addressbook/gui/component/ldap-server-dialog.glade.h:12
-#: composer/e-msg-composer-attachment.glade.h:9
-#: composer/e-msg-composer-attachment.glade.h:12
+#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: po/tmp/ldap-server-dialog.glade.h:6
 msgid "Description:"
 msgstr "説明:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
-#: addressbook/gui/component/ldap-server-dialog.glade.h:13
+#: po/tmp/ldap-server-dialog.glade.h:7
 msgid "LDAP Server:"
 msgstr "LDAP サーバ:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
-#: addressbook/gui/component/ldap-server-dialog.glade.h:15
+#: po/tmp/ldap-server-dialog.glade.h:8
+msgid "Name:"
+msgstr "名前:"
+
+#: po/tmp/ldap-server-dialog.glade.h:9
 msgid "Port Number:"
 msgstr "ポート番号:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
-#: addressbook/gui/component/ldap-server-dialog.glade.h:16
+#: po/tmp/ldap-server-dialog.glade.h:10
 msgid "Root DN:"
 msgstr "Root DN:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-#: addressbook/gui/component/ldap-server-dialog.glade.h:14
-#: mail/mail-config-druid.glade.h:49
-msgid "Name:"
-msgstr "名前:"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-#: addressbook/gui/component/select-names/select-names.glade.h:13
-msgid "Select Names"
-msgstr "名前を選択"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-#: addressbook/gui/component/select-names/select-names.glade.h:11
+#: po/tmp/select-names.glade.h:6
 msgid "Find..."
 msgstr "検索..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-#: addressbook/gui/component/select-names/select-names.glade.h:14
-msgid "Select name from List:"
-msgstr "リストから名前を選択:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:10
-#: addressbook/gui/component/select-names/select-names.glade.h:12
+#: po/tmp/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "受信者のメッセージ"
 
+#: po/tmp/select-names.glade.h:8
+msgid "Select Names"
+msgstr "名前を選択"
+
+#: po/tmp/select-names.glade.h:9
+msgid "Select name from List:"
+msgstr "リストから名前を選択:"
+
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:7
-#: addressbook/gui/widgets/alphabet.glade.h:36
-msgid "window2"
-msgstr "window2"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-#: addressbook/gui/widgets/alphabet.glade.h:35
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
+#: po/tmp/alphabet.glade.h:7
 msgid "a"
 msgstr "a"
 
-#: addressbook/gui/widgets/alphabet.glade.h:10
+#: po/tmp/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: addressbook/gui/widgets/alphabet.glade.h:11
+#: po/tmp/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: addressbook/gui/widgets/alphabet.glade.h:12
+#: po/tmp/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: addressbook/gui/widgets/alphabet.glade.h:13
+#: po/tmp/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: addressbook/gui/widgets/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: addressbook/gui/widgets/alphabet.glade.h:15
+#: po/tmp/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: addressbook/gui/widgets/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:100
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
+#: po/tmp/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: addressbook/gui/widgets/alphabet.glade.h:18
+#: po/tmp/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
+#: po/tmp/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
+#: po/tmp/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: po/tmp/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
+#: po/tmp/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
+#: po/tmp/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
+#: po/tmp/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
+#: po/tmp/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
+#: po/tmp/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
+#: po/tmp/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
+#: po/tmp/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
+#: po/tmp/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
+#: po/tmp/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
+#: po/tmp/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
+#: po/tmp/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: addressbook/gui/widgets/alphabet.glade.h:33
+#: po/tmp/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: addressbook/gui/widgets/alphabet.glade.h:34
+#: po/tmp/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:415
+#: addressbook/gui/widgets/e-addressbook-view.c:417
 #: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "VCard で保存"
@@ -1103,240 +1062,192 @@ msgstr ""
 "\n"
 "ダブルクリックをして新規コンタクトを作成して下さい"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr "検索"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
-#: addressbook/printing/e-contact-print.glade.h:82
-msgid "Page Setup:"
-msgstr "ページ設定:"
-
-#: addressbook/printing/e-contact-print.glade.h:8
-#: addressbook/printing/e-contact-print.glade.h:94
-msgid "Style name:"
-msgstr "スタイル名:"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-#: addressbook/printing/e-contact-print.glade.h:86
-msgid "Preview:"
-msgstr "プレビュー:"
+#: po/tmp/e-contact-print.glade.h:6
+msgid "10 pt. Tahoma"
+msgstr "10 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:10
-#: addressbook/printing/e-contact-print.glade.h:79
-msgid "Options"
-msgstr "オプション"
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
+msgstr "8 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:11
-#: addressbook/printing/e-contact-print.glade.h:73
-msgid "Include:"
-msgstr "含む:"
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
+msgstr "最後の空白形式:"
 
-#: addressbook/printing/e-contact-print.glade.h:12
-#: addressbook/printing/e-contact-print.glade.h:90
-msgid "Sections:"
-msgstr "セクション:"
+#: po/tmp/e-contact-print.glade.h:9
+msgid "Body"
+msgstr "本体"
 
-#: addressbook/printing/e-contact-print.glade.h:13
-#: addressbook/printing/e-contact-print.glade.h:72
-msgid "Immediately follow each other"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
+msgstr "下:"
 
-#: addressbook/printing/e-contact-print.glade.h:14
-#: addressbook/printing/e-contact-print.glade.h:76
-msgid "Letter tabs on side"
-msgstr "サイドの文字タブ"
+#: po/tmp/e-contact-print.glade.h:11
+msgid "Dimensions:"
+msgstr "寸法:"
 
-#: addressbook/printing/e-contact-print.glade.h:15
-#: addressbook/printing/e-contact-print.glade.h:70
-msgid "Headings for each letter"
-msgstr "各文書のための見出し"
+#: po/tmp/e-contact-print.glade.h:12
+msgid "Font..."
+msgstr "フォント..."
 
-#: addressbook/printing/e-contact-print.glade.h:16
-#: addressbook/printing/e-contact-print.glade.h:93
-msgid "Start on a new page"
-msgstr "新規ページから開始"
+#: po/tmp/e-contact-print.glade.h:13
+msgid "Fonts"
+msgstr "フォント"
 
-#: addressbook/printing/e-contact-print.glade.h:17
-#: addressbook/printing/e-contact-print.glade.h:78
-msgid "Number of columns:"
-msgstr "列数:"
+#: po/tmp/e-contact-print.glade.h:14
+msgid "Footer:"
+msgstr "フッタ:"
 
-#: addressbook/printing/e-contact-print.glade.h:18
-#: addressbook/printing/e-contact-print.glade.h:59
-msgid "Blank forms at end:"
-msgstr "最後の空白形式:"
+#: po/tmp/e-contact-print.glade.h:15
+msgid "Format"
+msgstr "フォーマット"
 
-#: addressbook/printing/e-contact-print.glade.h:19
-#: addressbook/printing/e-contact-print.glade.h:64
-msgid "Fonts"
-msgstr "フォント"
+#: po/tmp/e-contact-print.glade.h:16
+msgid "Header"
+msgstr "ヘッダ"
 
-#: addressbook/printing/e-contact-print.glade.h:20
-#: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-#: addressbook/printing/e-contact-print.glade.h:63
-msgid "Font..."
-msgstr "フォント..."
+#: po/tmp/e-contact-print.glade.h:17
+msgid "Header/Footer"
+msgstr "ヘッダ/フッタ"
 
-#: addressbook/printing/e-contact-print.glade.h:22
-#: addressbook/printing/e-contact-print.glade.h:69
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "見出し"
 
-#: addressbook/printing/e-contact-print.glade.h:23
-#: addressbook/printing/e-contact-print.glade.h:57
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:19
+msgid "Headings for each letter"
+msgstr "各文書のための見出し"
 
-#: addressbook/printing/e-contact-print.glade.h:24
-#: addressbook/printing/e-contact-print.glade.h:60
-msgid "Body"
-msgstr "本体"
+#: po/tmp/e-contact-print.glade.h:20
+msgid "Height:"
+msgstr "高さ:"
 
-#: addressbook/printing/e-contact-print.glade.h:25
-#: addressbook/printing/e-contact-print.glade.h:58
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:26
-#: addressbook/printing/e-contact-print.glade.h:91
-msgid "Shading"
-msgstr "シェーディング"
+#: po/tmp/e-contact-print.glade.h:22
+msgid "Include:"
+msgstr "含む:"
 
-#: addressbook/printing/e-contact-print.glade.h:27
-#: addressbook/printing/e-contact-print.glade.h:87
-msgid "Print using gray shading"
-msgstr "グレイシェーディングを使って印刷"
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
+msgstr "横長"
 
-#: addressbook/printing/e-contact-print.glade.h:28
-#: addressbook/printing/e-contact-print.glade.h:66
-msgid "Format"
-msgstr "フォーマット"
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
+msgstr "左:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
-#: addressbook/printing/e-contact-print.glade.h:83
-msgid "Paper"
-msgstr "用紙"
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
+msgstr "サイドの文字タブ"
 
-#: addressbook/printing/e-contact-print.glade.h:30
-#: addressbook/printing/e-contact-print.glade.h:96
-#: mail/mail-config-druid.glade.h:78
-msgid "Type:"
-msgstr "種別:"
+#: po/tmp/e-contact-print.glade.h:26
+msgid "Margins"
+msgstr "余白"
 
-#: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-#: addressbook/printing/e-contact-print.glade.h:98
-msgid "label26"
-msgstr "label26"
+#: po/tmp/e-contact-print.glade.h:27
+msgid "Number of columns:"
+msgstr "列数:"
 
-#: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-#: addressbook/printing/e-contact-print.glade.h:62
-msgid "Dimensions:"
-msgstr "寸法:"
+#: po/tmp/e-contact-print.glade.h:28
+msgid "Options"
+msgstr "オプション"
 
-#: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-#: addressbook/printing/e-contact-print.glade.h:97
-msgid "Width:"
-msgstr "幅:"
+#: po/tmp/e-contact-print.glade.h:29
+msgid "Orientation"
+msgstr "方向"
 
-#: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-#: addressbook/printing/e-contact-print.glade.h:71
-msgid "Height:"
-msgstr "高さ:"
+#: po/tmp/e-contact-print.glade.h:30
+msgid "Page"
+msgstr "ページ"
 
-#: addressbook/printing/e-contact-print.glade.h:35
-#: addressbook/printing/e-contact-print.glade.h:84
+#: po/tmp/e-contact-print.glade.h:31
+msgid "Page Setup:"
+msgstr "ページ設定:"
+
+#: po/tmp/e-contact-print.glade.h:32
+msgid "Paper"
+msgstr "用紙"
+
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "用紙の起点:"
 
-#: addressbook/printing/e-contact-print.glade.h:36
-#: addressbook/printing/e-contact-print.glade.h:77
-msgid "Margins"
-msgstr "余白"
+#: po/tmp/e-contact-print.glade.h:34
+msgid "Portrait"
+msgstr "縦長"
 
-#: addressbook/printing/e-contact-print.glade.h:37
-#: addressbook/printing/e-contact-print.glade.h:95
-msgid "Top:"
-msgstr "上:"
+#: po/tmp/e-contact-print.glade.h:35
+msgid "Preview:"
+msgstr "プレビュー:"
 
-#: addressbook/printing/e-contact-print.glade.h:38
-#: addressbook/printing/e-contact-print.glade.h:61
-msgid "Bottom:"
-msgstr "下:"
+#: po/tmp/e-contact-print.glade.h:36
+msgid "Print using gray shading"
+msgstr "グレイシェーディングを使って印刷"
 
-#: addressbook/printing/e-contact-print.glade.h:39
-#: addressbook/printing/e-contact-print.glade.h:75
-msgid "Left:"
-msgstr "左:"
+#: po/tmp/e-contact-print.glade.h:37
+msgid "Reverse on even pages"
+msgstr "偶数ページを反転"
 
-#: addressbook/printing/e-contact-print.glade.h:40
-#: addressbook/printing/e-contact-print.glade.h:89
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "右:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
-#: addressbook/printing/e-contact-print.glade.h:81
-msgid "Page"
-msgstr "ページ"
+#: po/tmp/e-contact-print.glade.h:39
+msgid "Sections:"
+msgstr "セクション:"
+
+#: po/tmp/e-contact-print.glade.h:40
+msgid "Shading"
+msgstr "シェーディング"
 
-#: addressbook/printing/e-contact-print.glade.h:42
-#: addressbook/printing/e-contact-print.glade.h:92
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "サイズ:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
-#: addressbook/printing/e-contact-print.glade.h:80
-msgid "Orientation"
-msgstr "方向"
-
-#: addressbook/printing/e-contact-print.glade.h:48
-#: addressbook/printing/e-contact-print.glade.h:85
-msgid "Portrait"
-msgstr "縦長"
+#: po/tmp/e-contact-print.glade.h:42
+msgid "Start on a new page"
+msgstr "新規ページから開始"
 
-#: addressbook/printing/e-contact-print.glade.h:49
-#: addressbook/printing/e-contact-print.glade.h:74
-msgid "Landscape"
-msgstr "横長"
+#: po/tmp/e-contact-print.glade.h:43
+msgid "Style name:"
+msgstr "スタイル名:"
 
-#: addressbook/printing/e-contact-print.glade.h:52
-#: addressbook/printing/e-contact-print.glade.h:67
-msgid "Header"
-msgstr "ヘッダ"
+#: po/tmp/e-contact-print.glade.h:44
+msgid "Top:"
+msgstr "上:"
 
-#: addressbook/printing/e-contact-print.glade.h:53
-#: addressbook/printing/e-contact-print.glade.h:65
-msgid "Footer:"
-msgstr "フッタ:"
+#: po/tmp/e-contact-print.glade.h:45
+msgid "Type:"
+msgstr "種別:"
 
-#: addressbook/printing/e-contact-print.glade.h:55
-#: addressbook/printing/e-contact-print.glade.h:88
-msgid "Reverse on even pages"
-msgstr "偶数ページを反転"
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
+msgstr "幅:"
 
-#: addressbook/printing/e-contact-print.glade.h:56
-#: addressbook/printing/e-contact-print.glade.h:68
-msgid "Header/Footer"
-msgstr "ヘッダ/フッタ"
+#: po/tmp/e-contact-print.glade.h:47
+msgid "label26"
+msgstr "label26"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
+#. 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/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr "午前"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#. 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/gui/e-week-view.c:291 calendar/gui/print.c:604
 msgid "pm"
 msgstr "午後"
 
@@ -1348,13 +1259,13 @@ msgstr "Evolution カレンダコンジット"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Evolution カレンダコンジットのための設定ユーティリティです\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:607
-#: calendar/conduits/todo/todo-conduit.c:480
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr "カレンダサーバで通信中にエラーが発生しました"
 
-#: calendar/conduits/calendar/calendar-conduit.c:706
-#: calendar/conduits/calendar/calendar-conduit.c:709
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "パイロットのカレンダアプリケーションブロックを読み込むことが出来ませんでした"
@@ -1367,8 +1278,8 @@ msgstr "Evolution ToDo コンジット"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Evolutiuon ToDo コンジットのための設定ユーティリティです\n"
 
-#: calendar/conduits/todo/todo-conduit.c:579
-#: calendar/conduits/todo/todo-conduit.c:582
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 "パイロットの ToDo アプリケーションブロックを読み込むことが出来ませんでした"
@@ -1413,49 +1324,46 @@ msgstr "今日期限の ToDo アイテム:"
 msgid "To-Do item that is overdue:"
 msgstr "期限の過ぎた ToDo アイテム:"
 
-#: calendar/gui/calendar-commands.c:382
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr "ファイルが見つかりません"
 
-#: calendar/gui/calendar-commands.c:406
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr "カレンダを開く"
 
-#: calendar/gui/calendar-commands.c:445
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr "カレンダを保存"
 
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:726
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %I:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:729
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: calendar/gui/calendar-model.c:344
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "公的"
 
-#: calendar/gui/calendar-model.c:347
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "私的"
 
-#: calendar/gui/calendar-model.c:350
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "機密"
 
@@ -1487,7 +1395,7 @@ msgstr "透明"
 msgid "Opaque"
 msgstr "不透明"
 
-#: calendar/gui/calendar-model.c:734
+#: calendar/gui/calendar-model.c:744
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1499,36 +1407,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:228 widgets/misc/e-dateedit.c:514
-#: widgets/misc/e-dateedit.c:545 widgets/misc/e-dateedit.c:701
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:853
+#: calendar/gui/calendar-model.c:863
 msgid "%I:%M:%S %p%n"
 msgstr "%H:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:856
+#: calendar/gui/calendar-model.c:866
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:860
+#: calendar/gui/calendar-model.c:870
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:863
+#: calendar/gui/calendar-model.c:873
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:983
+#: calendar/gui/calendar-model.c:993
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1538,15 +1445,15 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1033
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "パーセント値は 0 と 100 の間で含んでいなければなりません"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1073
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "優先順位は 1 と 9 の間で含んでいなければなりません"
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "カレンダが表示する URI"
 
@@ -1563,540 +1470,455 @@ msgid "No summary available."
 msgstr "利用できる要約はありません"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: calendar/gui/dialogs/alarm-notify.glade.h:11
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:14
-#: ui/evolution-subscribe.xml.h:8
+#: 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-subscribe.xml.h:7
 msgid "Close"
 msgstr "閉じる"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8
-#: calendar/gui/dialogs/alarm-notify.glade.h:13 calendar/gui/gnome-cal.c:1458
-msgid "Snooze"
-msgstr "居眠り"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-#: calendar/gui/dialogs/alarm-notify.glade.h:12
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "予約の編集"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
-#: calendar/gui/dialogs/alarm-notify.glade.h:14
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "居眠り"
+
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "居眠り時間 (分)"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
-msgid "Calendar Preferences"
-msgstr "カレンダの設定"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:111
-msgid "Work week"
-msgstr "仕事をする週"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:90
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "月"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:108
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "火"
+#: po/tmp/cal-prefs-dialog.glade.h:6
+msgid "05 minutes"
+msgstr "05 分"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:110
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "水"
+#: po/tmp/cal-prefs-dialog.glade.h:7
+msgid "10 minutes"
+msgstr "10 分"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:104
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "木"
+#: po/tmp/cal-prefs-dialog.glade.h:8
+msgid "12 hour (am/pm)"
+msgstr "12 時間制 (午前/午後)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:84
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "金"
+#: po/tmp/cal-prefs-dialog.glade.h:9
+msgid "15 minutes"
+msgstr "15 分"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:97
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "土"
+#: po/tmp/cal-prefs-dialog.glade.h:10
+msgid "24 hour"
+msgstr "24 時間制"
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:102
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "日"
+#: po/tmp/cal-prefs-dialog.glade.h:11
+msgid "30 minutes"
+msgstr "30 分"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
-msgid "First day of week:"
-msgstr "週のはじめ:"
+#: po/tmp/cal-prefs-dialog.glade.h:12
+msgid "60 minutes"
+msgstr "60 分"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/event-editor.c:368 calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "月曜日"
+#: po/tmp/cal-prefs-dialog.glade.h:13
+msgid "Alarms timeout after"
+msgstr "アラームを終了させる秒数:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/event-editor.c:369
-msgid "Tuesday"
-msgstr "火曜日"
+#: po/tmp/cal-prefs-dialog.glade.h:14
+msgid "Audio Alarms"
+msgstr "オーディオアラーム"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/event-editor.c:370
-msgid "Wednesday"
-msgstr "水曜日"
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
+msgstr "アラームウィンドウが表示される時にビープ音を鳴らす"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/event-editor.c:371
-msgid "Thursday"
-msgstr "木曜日"
+#: po/tmp/cal-prefs-dialog.glade.h:16
+msgid "Calendar"
+msgstr "カレンダ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/event-editor.c:372
-msgid "Friday"
-msgstr "金曜日"
+#: po/tmp/cal-prefs-dialog.glade.h:17
+msgid "Calendar Preferences"
+msgstr "カレンダの設定"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/event-editor.c:373
-msgid "Saturday"
-msgstr "土曜日"
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
+msgstr "色"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:374 calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "日曜日"
+#: po/tmp/cal-prefs-dialog.glade.h:19
+msgid "Compress weekends"
+msgstr "週末を押し込む"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:101
-msgid "Start of day:"
-msgstr "開始日:"
+#: po/tmp/cal-prefs-dialog.glade.h:20
+msgid "Date navigator options"
+msgstr "日付オプション"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:82
-msgid "End of day:"
-msgstr "終了日:"
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
+msgstr "デフォルト"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
+#: po/tmp/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "表示オプション"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:106
-msgid "Time divisions:"
-msgstr "時間の分割:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:107
-msgid "Time format:"
-msgstr "時間のフォーマット:"
+#: po/tmp/cal-prefs-dialog.glade.h:23
+msgid "Due Date"
+msgstr "期日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:99
-msgid "Show appointment end times"
-msgstr "予約終了時間を表示"
+#: po/tmp/cal-prefs-dialog.glade.h:24
+msgid "Enable snoozing for"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
-msgid "Compress weekends"
-msgstr "週末を押し込む"
+#: po/tmp/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
+msgstr "終了日:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
-msgid "12 hour (am/pm)"
-msgstr "12 時間制 (午前/午後)"
+#: po/tmp/cal-prefs-dialog.glade.h:26
+msgid "First day of week:"
+msgstr "週のはじめ:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
-msgid "24 hour"
-msgstr "24 時間制"
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+msgid "Fri"
+msgstr "金"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "60 minutes"
-msgstr "60 分"
+#: calendar/gui/event-editor.c:422 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr "金曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "30 minutes"
-msgstr "30 分"
+#: po/tmp/cal-prefs-dialog.glade.h:29
+msgid "Highlight"
+msgstr "強調"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "15 minutes"
-msgstr "15 分"
+#: po/tmp/cal-prefs-dialog.glade.h:30
+msgid "Items Due Today"
+msgstr "今日期限のアイテム"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "10 minutes"
-msgstr "10 分"
+#: po/tmp/cal-prefs-dialog.glade.h:31
+msgid "Items Due Today:"
+msgstr "今日期限のアイテム:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "05 minutes"
-msgstr "05 分"
+#: po/tmp/cal-prefs-dialog.glade.h:32
+msgid "Items Not Yet Due"
+msgstr "まだ期限が来ていないアイテム"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
-msgid "Date navigator options"
-msgstr "日付オプション"
+#: po/tmp/cal-prefs-dialog.glade.h:33
+msgid "Items Not Yet Due:"
+msgstr "まだ期限が来ていないアイテム:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:100
-msgid "Show week numbers"
-msgstr "週番号を表示"
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+msgid "Mon"
+msgstr "月"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
-msgid "Calendar"
-msgstr "カレンダ"
+#: calendar/gui/event-editor.c:418 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "月曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:98
-msgid "Show"
-msgstr "表示"
+#: po/tmp/cal-prefs-dialog.glade.h:36
+msgid "Overdue Items"
+msgstr "期限が過ぎたアイテム"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:80 calendar/gui/prop.c:610
-msgid "Due Date"
-msgstr "期日"
+#: po/tmp/cal-prefs-dialog.glade.h:37
+msgid "Overdue Items:"
+msgstr "期限が過ぎたアイテム:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:105 calendar/gui/prop.c:612
-msgid "Time Until Due"
-msgstr "期限までの時間"
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
+msgstr "色を選択します"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:94 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "優先度"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
-msgid "Highlight"
-msgstr "強調"
+#: po/tmp/cal-prefs-dialog.glade.h:40
+msgid "Remind me of all appointments"
+msgstr "すべての予約を期日前に催促する:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:91
-msgid "Overdue Items"
-msgstr "期限が過ぎたアイテム"
+#: po/tmp/cal-prefs-dialog.glade.h:41
+msgid "Reminders"
+msgstr "催促"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:86
-msgid "Items Due Today"
-msgstr "今日期限のアイテム"
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
+msgstr "土"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:88
-msgid "Items Not Yet Due"
-msgstr "まだ期限が来ていないアイテム"
+#: calendar/gui/event-editor.c:423 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
+msgstr "土曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:75 calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "色"
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
+msgstr "表示"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:93
-msgid "Pick a color"
-msgstr "色を選択します"
+#: po/tmp/cal-prefs-dialog.glade.h:45
+msgid "Show appointment end times"
+msgstr "予約終了時間を表示"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:89
-msgid "Items Not Yet Due:"
-msgstr "まだ期限が来ていないアイテム:"
+#: po/tmp/cal-prefs-dialog.glade.h:46
+msgid "Show week numbers"
+msgstr "週番号を表示"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:87
-msgid "Items Due Today:"
-msgstr "今日期限のアイテム:"
+#: po/tmp/cal-prefs-dialog.glade.h:47
+msgid "Start of day:"
+msgstr "開始日:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:92
-msgid "Overdue Items:"
-msgstr "期限が過ぎたアイテム:"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
+msgid "Sun"
+msgstr "日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:103
+#: calendar/gui/event-editor.c:424 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "日曜日"
+
+#: po/tmp/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "作業"
 
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:78 calendar/gui/prop.c:842
-msgid "Defaults"
-msgstr "デフォルト"
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+msgid "Thu"
+msgstr "木"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:95
-msgid "Remind me of all appointments"
-msgstr "すべての予約を期日前に催促する:"
+#: calendar/gui/event-editor.c:421 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr "木曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:112
-msgid "minutes before they occur."
-msgstr "分前"
+#: po/tmp/cal-prefs-dialog.glade.h:53
+msgid "Time Until Due"
+msgstr "期限までの時間"
+
+#: po/tmp/cal-prefs-dialog.glade.h:54
+msgid "Time divisions:"
+msgstr "時間の分割:"
+
+#: po/tmp/cal-prefs-dialog.glade.h:55
+msgid "Time format:"
+msgstr "時間のフォーマット:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:109
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+msgid "Tue"
+msgstr "火"
+
+#: calendar/gui/event-editor.c:419 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr "火曜日"
+
+#: po/tmp/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "視覚的なアラーム"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
-msgid "Beep when alarm windows appear."
-msgstr "アラームウィンドウが表示される時にビープ音を鳴らす"
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+msgid "Wed"
+msgstr "水"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
-msgid "Audio Alarms"
-msgstr "オーディオアラーム"
+#: calendar/gui/event-editor.c:420 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr "水曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
-msgid "Alarms timeout after"
-msgstr "アラームを終了させる秒数:"
+#: po/tmp/cal-prefs-dialog.glade.h:61
+msgid "Work week"
+msgstr "仕事をする週"
+
+#: po/tmp/cal-prefs-dialog.glade.h:62
+msgid "minutes before they occur."
+msgstr "分前"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:113
+#: po/tmp/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr " 秒"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
-msgid "Enable snoozing for"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:96
-msgid "Reminders"
-msgstr "催促"
-
-#: calendar/gui/dialogs/task-editor.c:655
+#: calendar/gui/dialogs/task-editor.c:656
 msgid "Edit Task"
 msgstr "作業の編集"
 
-#: calendar/gui/dialogs/task-editor.c:661 calendar/gui/event-editor.c:307
+#: calendar/gui/dialogs/task-editor.c:662 calendar/gui/event-editor.c:321
 msgid "No summary"
 msgstr "要約なし"
 
-#: calendar/gui/dialogs/task-editor.c:667 calendar/gui/event-editor.c:313
+#: 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:670 calendar/gui/event-editor.c:316
+#: 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:673 calendar/gui/event-editor.c:319
+#: 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 Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:45
-msgid "task-editor-dialog"
-msgstr "作業エディタダイアログ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:37
-msgid "S_ummary"
-msgstr "要約(_u)"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:38
-msgid "Sta_rt Date:"
-msgstr "開始日時(_r):"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:42
-msgid "_Due Date:"
-msgstr "期日(_D):"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:32
+#: po/tmp/task-editor-dialog.glade.h:6
 msgid "% Comp_lete:"
 msgstr "% 完了(_l):"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:44
-msgid "_Status:"
-msgstr "状況(_S):"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Not Started"
-msgstr "開始していない"
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
+msgstr "分類(_l)"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "In Progress"
-msgstr "進行中"
+#: po/tmp/task-editor-dialog.glade.h:9
+msgid "Cancelled"
+msgstr "キャンセル"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: po/tmp/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "完了"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Cancelled"
-msgstr "キャンセル"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:43
-msgid "_Priority:"
-msgstr "優先順位(_P):"
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
+msgstr "完了日:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: po/tmp/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "高い"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Normal"
-msgstr "普通"
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr "進行中"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: po/tmp/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "低い"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:33
-msgid "C_lassification:"
-msgstr "分類(_l)"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: shell/e-shell-view.c:1017 widgets/misc/e-dateedit.c:212
-#: widgets/misc/e-dateedit.c:371 widgets/misc/e-dateedit.c:1171
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1073
+#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
+#: widgets/misc/e-dateedit.c:1446
 msgid "None"
 msgstr "ノート"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:41
-msgid "_Contacts..."
-msgstr "コンタクト(_C)..."
+#: po/tmp/task-editor-dialog.glade.h:18
+msgid "Normal"
+msgstr "普通"
+
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
+msgstr "開始していない"
+
+#: po/tmp/task-editor-dialog.glade.h:22
+msgid "S_ummary"
+msgstr "要約(_u)"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:39
+#: po/tmp/task-editor-dialog.glade.h:23
+msgid "Sta_rt Date:"
+msgstr "開始日時(_r):"
+
+#: po/tmp/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "作業"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:35
-msgid "Date Completed:"
-msgstr "完了日:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:40
+#: po/tmp/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:294
+#: po/tmp/task-editor-dialog.glade.h:26
+msgid "_Contacts..."
+msgstr "コンタクト(_C)..."
+
+#: po/tmp/task-editor-dialog.glade.h:27
+msgid "_Due Date:"
+msgstr "期日(_D):"
+
+#: po/tmp/task-editor-dialog.glade.h:28
+msgid "_Priority:"
+msgstr "優先順位(_P):"
+
+#: po/tmp/task-editor-dialog.glade.h:29
+msgid "_Status:"
+msgstr "状況(_S):"
+
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "task-editor-dialog"
+msgstr "作業エディタダイアログ"
+
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "開く..."
 
-#: calendar/gui/e-calendar-table.c:295
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr "作業を開く"
 
-#: calendar/gui/e-calendar-table.c:297
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr "完了をマーク"
 
-#: calendar/gui/e-calendar-table.c:298
+#: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
 msgstr "完了した作業をマークします"
 
-#: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:55
-#: calendar/gui/event-editor-dialog.glade.h:66 filter/filter.glade.h:14
-#: filter/filter.glade.h:19 filter/filter.glade.h:27 filter/libfilter-i18n.h:8
-#: mail/folder-browser.c:476 mail/mail-config-druid.glade.h:35
-#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24 mail/mail-config.glade.h:31
-#: mail/mail-view.c:165 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-mail.xml.h:12
+#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:479 mail/mail-view.c:165
+#: po/tmp/event-editor-dialog.glade.h:12 po/tmp/evolution-addressbook.xml.h:8
+#: po/tmp/evolution-event-editor.xml.h:19 po/tmp/evolution-mail.xml.h:11
+#: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:8
 msgid "Delete"
 msgstr "削除"
 
-#: calendar/gui/e-calendar-table.c:301
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "作業を削除する"
 
-#: calendar/gui/e-day-view-time-item.c:406
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 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:1172
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1197
 #: 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:1186
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1211
 #: 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:1199
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1224
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%b/%d"
 
-#: calendar/gui/e-day-view.c:2634 calendar/gui/e-day-view.c:2641
-#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
-#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
+#: 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-week-view.c:3172 calendar/gui/e-week-view.c:3181
 msgid "New appointment..."
 msgstr "新規予約..."
 
-#: calendar/gui/e-day-view.c:2638 calendar/gui/e-day-view.c:2645
-#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
+#: calendar/gui/e-day-view.c:2936 calendar/gui/e-day-view.c:2943
+#: 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:2639 calendar/gui/e-week-view.c:2937
-#: ui/evolution-event-editor.xml.h:21
+#: calendar/gui/e-day-view.c:2937 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:2646 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2944 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr "この予約を可動にする"
 
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2945
+#: calendar/gui/e-day-view.c:2945 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr "この出来事を削除"
 
-#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr "すべての出来事を削除"
 
@@ -2107,262 +1929,199 @@ msgstr "すべての出来事を削除"
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/event-editor.c:301
+#: calendar/gui/event-editor.c:315
 msgid "Edit Appointment"
 msgstr "予約の編集"
 
-#: calendar/gui/event-editor.c:346
+#: calendar/gui/event-editor.c:392
 msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor.c:367 calendar/gui/getdate.y:424
+#: calendar/gui/event-editor.c:417 calendar/gui/getdate.y:424
 #: filter/filter-datespec.c:65
 msgid "day"
 msgstr "日"
 
-#: calendar/gui/event-editor.c:417
+#: calendar/gui/event-editor.c:542
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:424
+#: calendar/gui/event-editor.c:549
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:547
-msgid "ocurrences"
-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:2481 calendar/gui/print.c:1085
+#: 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)"
 
-#. todo
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
 #.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/event-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:93
-msgid "event-editor-dialog"
-msgstr "イベントエディタダイアログ"
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:38
-#: calendar/gui/event-editor-dialog.glade.h:79
-msgid "Su_mmary:"
-msgstr "要約(_m):"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-#: calendar/gui/event-editor-dialog.glade.h:83
-msgid "Time"
-msgstr "時間"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-#: calendar/gui/event-editor-dialog.glade.h:91
-msgid "_Start time:"
-msgstr "開始時間(_S):"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-#: calendar/gui/event-editor-dialog.glade.h:87
-msgid "_End time:"
-msgstr "終了時間(_E):"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-#: calendar/gui/event-editor-dialog.glade.h:61
+#: po/tmp/event-editor-dialog.glade.h:6
 msgid "A_ll day event"
 msgstr "毎日のイベント(_l)"
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-#: calendar/gui/event-editor-dialog.glade.h:64
+#: po/tmp/event-editor-dialog.glade.h:8
+msgid "Appointment Basics"
+msgstr "基本的な予約"
+
+#: po/tmp/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "分類"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor-dialog.glade.h:74
-msgid "Pu_blic"
-msgstr "公的(_b)"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:73
-msgid "Pri_vate"
-msgstr "私的(_v)"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-#: calendar/gui/event-editor-dialog.glade.h:85
-msgid "_Confidential"
-msgstr "機密(_C)"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Minutes"
-msgstr "分"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "Hours"
-msgstr "時"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
+msgstr "再発のカスタマイズ"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:29
+#: po/tmp/event-editor-dialog.glade.h:11
 msgid "Days"
 msgstr "日"
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-#: calendar/gui/event-editor-dialog.glade.h:86
-msgid "_Display"
-msgstr "表示(_D)"
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr "常に"
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-#: calendar/gui/event-editor-dialog.glade.h:89
-msgid "_Program"
-msgstr "プログラム(_P)"
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
+msgstr "例外"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-#: calendar/gui/event-editor-dialog.glade.h:88
-msgid "_Mail"
-msgstr "メール(_M)"
+#: po/tmp/event-editor-dialog.glade.h:16
+msgid "Hours"
+msgstr "時"
 
-#: calendar/gui/event-editor-dialog.glade.h:33
-#: calendar/gui/event-editor-dialog.glade.h:70
+#: po/tmp/event-editor-dialog.glade.h:17
 msgid "Mail _to:"
 msgstr "メールの送り先(_t):"
 
-#: calendar/gui/event-editor-dialog.glade.h:34
-#: calendar/gui/event-editor-dialog.glade.h:90
-msgid "_Run program:"
-msgstr "プログラムを実行(_R):"
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
+msgstr "分"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-#: calendar/gui/event-editor-dialog.glade.h:84
-msgid "_Audio"
-msgstr "オーディオ(_A)"
+#: po/tmp/event-editor-dialog.glade.h:19
+msgid "Modify"
+msgstr "修正"
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:77
-msgid "Reminder"
-msgstr "催促"
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
+msgstr "再発なし"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-#: calendar/gui/event-editor-dialog.glade.h:63
-msgid "Appointment Basics"
-msgstr "基本的な予約"
+#: po/tmp/event-editor-dialog.glade.h:21
+msgid "Preview"
+msgstr "プレビュー"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-#: calendar/gui/event-editor-dialog.glade.h:92
-msgid "_Starting date:"
-msgstr "開始日(_S):"
+#: po/tmp/event-editor-dialog.glade.h:22
+msgid "Pri_vate"
+msgstr "私的(_v)"
+
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
+msgstr "公的(_b)"
+
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
+msgstr "再発"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-#: calendar/gui/event-editor-dialog.glade.h:76
+#: po/tmp/event-editor-dialog.glade.h:25
 msgid "Recurrence Rule"
 msgstr "再発ルール"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-#: calendar/gui/event-editor-dialog.glade.h:72
-msgid "No recurrence"
-msgstr "再発なし"
+#: po/tmp/event-editor-dialog.glade.h:26
+msgid "Reminder"
+msgstr "催促"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-#: calendar/gui/event-editor-dialog.glade.h:78
+#: po/tmp/event-editor-dialog.glade.h:27
 msgid "Simple recurrence"
 msgstr "単純な再発"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-#: calendar/gui/event-editor-dialog.glade.h:65
-msgid "Custom recurrence"
-msgstr "再発のカスタマイズ"
+#: po/tmp/event-editor-dialog.glade.h:28
+msgid "Su_mmary:"
+msgstr "要約(_m):"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-#: calendar/gui/event-editor-dialog.glade.h:67
-msgid "Every"
-msgstr "常に"
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Time"
+msgstr "時間"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "day(s)"
-msgstr "日"
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
+msgstr "オーディオ(_A)"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "週"
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Confidential"
+msgstr "機密(_C)"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "month(s)"
-msgstr "月"
+#: po/tmp/event-editor-dialog.glade.h:32
+msgid "_Display"
+msgstr "表示(_D)"
 
-#: calendar/gui/event-editor-dialog.glade.h:48
-msgid "year(s)"
-msgstr "年"
+#: po/tmp/event-editor-dialog.glade.h:33
+msgid "_End time:"
+msgstr "終了時間(_E):"
+
+#: po/tmp/event-editor-dialog.glade.h:34
+msgid "_Mail"
+msgstr "メール(_M)"
+
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr "プログラム(_P)"
 
-#: calendar/gui/event-editor-dialog.glade.h:49
+#: po/tmp/event-editor-dialog.glade.h:36
+msgid "_Run program:"
+msgstr "プログラムを実行(_R):"
+
+#: po/tmp/event-editor-dialog.glade.h:37
+msgid "_Start time:"
+msgstr "開始時間(_S):"
+
+#: po/tmp/event-editor-dialog.glade.h:38
+msgid "_Starting date:"
+msgstr "開始日(_S):"
+
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
+msgstr "日"
+
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
+msgstr "イベントエディタダイアログ"
+
+#: po/tmp/event-editor-dialog.glade.h:41
 msgid "for"
 msgstr "毎に指定回数繰り返す:"
 
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "until"
-msgstr "毎に指定日まで繰り返す:"
-
-#: calendar/gui/event-editor-dialog.glade.h:51
+#: po/tmp/event-editor-dialog.glade.h:42
 msgid "forever"
 msgstr "毎に永久に繰り返す"
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-#: calendar/gui/event-editor-dialog.glade.h:68
-msgid "Exceptions"
-msgstr "例外"
-
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/event-editor-dialog.glade.h:71
-msgid "Modify"
-msgstr "修正"
-
-#: calendar/gui/event-editor-dialog.glade.h:56
-#: calendar/gui/event-editor-dialog.glade.h:94
+#: po/tmp/event-editor-dialog.glade.h:43
 msgid "label21"
 msgstr "label21"
 
-#: calendar/gui/event-editor-dialog.glade.h:57
-msgid ""
-"This appointment has custom recurrence rules that cannot be edited by "
-"Evolution.\n"
-"\n"
-"However, the appointment will recur at the appropriate time and will be "
-"displayed properly in the calendar views."
-msgstr ""
-"この予約は Evolution "
-"を使って編集されることが出来ないカスタマイズされた再発ルールを持っています\n"
-"しかし, 予約は適切な時間に再発し, カレンダビューへ適切に表示されるでしょう"
+#: po/tmp/event-editor-dialog.glade.h:44
+msgid "month(s)"
+msgstr "月"
 
-#: calendar/gui/event-editor-dialog.glade.h:60
-#: calendar/gui/event-editor-dialog.glade.h:75
-msgid "Recurrence"
-msgstr "再発"
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
+msgstr "毎に指定日まで繰り返す:"
 
-#: calendar/gui/event-editor-dialog.glade.h:80
-msgid ""
-"This appointment has custom recurrence rules that cannot be edited by "
-"Evolution."
-msgstr ""
-"この予約は Evolution "
-"を使って編集されることが出来ないカスタマイズされた再発ルールを持っています"
+#: po/tmp/event-editor-dialog.glade.h:46
+msgid "week(s)"
+msgstr "週"
+
+#: po/tmp/event-editor-dialog.glade.h:47
+msgid "year(s)"
+msgstr "年"
 
 #: calendar/gui/getdate.y:391
 msgid "january"
@@ -2574,52 +2333,28 @@ msgstr "12番目"
 msgid "ago"
 msgstr "前"
 
-#: calendar/gui/gncal-todo.c:139
-msgid "Create to-do item"
-msgstr "ToDo アイテムを作成"
-
-#: calendar/gui/gncal-todo.c:139
-msgid "Edit to-do item"
-msgstr "ToDo アイテムを編集"
-
-#: calendar/gui/gncal-todo.c:175
-msgid "Summary:"
-msgstr "要約:"
-
-#: calendar/gui/gncal-todo.c:186
-msgid "Due Date:"
-msgstr "期日:"
-
-#: calendar/gui/gncal-todo.c:201
-msgid "Priority:"
-msgstr "優先度:"
-
-#: calendar/gui/gncal-todo.c:219
-msgid "Item Comments:"
-msgstr "アイテムのコメント:"
-
-#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
-#: calendar/gui/gnome-cal.c:1522
+#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
+#: calendar/gui/gnome-cal.c:1530
 msgid "Reminder of your appointment at "
 msgstr "あなたの予約の催促 "
 
-#: calendar/gui/gnome-cal.c:1144
+#: calendar/gui/gnome-cal.c:1152
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr "'%s' のカレンダを読み込むことが出来ませんでした"
 
-#: calendar/gui/gnome-cal.c:1155
+#: calendar/gui/gnome-cal.c:1163
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "'%s' のカレンダを作成することが出来ませんでした"
 
-#: calendar/gui/gnome-cal.c:1166
+#: calendar/gui/gnome-cal.c:1174
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' を読み込むことを要求される方法はサポートしていません"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1471 calendar/gui/gnome-cal.c:1526
+#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
 #: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr "Ok"
@@ -2835,190 +2570,94 @@ msgstr "今年 (%Y)"
 msgid "Print Calendar"
 msgstr "カレンダの印刷"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:864
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:957
 msgid "Print Preview"
 msgstr "印刷プレビュー"
 
-#: calendar/gui/prop.c:336
-msgid "Time display"
-msgstr "時間の表示"
-
-#. Time format
-#: calendar/gui/prop.c:340
-msgid "Time format"
-msgstr "時間のフォーマット"
-
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
-msgstr "12 時間制 (午前/午後)"
-
-#: calendar/gui/prop.c:342
-msgid "24-hour"
-msgstr "24 時間制"
-
-#. Weeks start on
-#: calendar/gui/prop.c:352
-msgid "Weeks start on"
-msgstr "週の始め"
-
-#. Day range
-#: calendar/gui/prop.c:364
-msgid "Day range"
-msgstr "日にちの幅"
-
-#: calendar/gui/prop.c:375
-msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
-msgstr ""
-"日表示と週表示で表示したい開始と終了時間を選択\n"
-"して下さい\n"
-"この範囲外の時間はデフォルトでは表示されない\n"
-"でしょう"
-
-#: calendar/gui/prop.c:391
-msgid "Day start:"
-msgstr "開始日:"
-
-#: calendar/gui/prop.c:402
-msgid "Day end:"
-msgstr "終了日:"
-
-#: calendar/gui/prop.c:525
-msgid "Colors for display"
-msgstr "表示色"
-
-#: calendar/gui/prop.c:605
-msgid "Show on TODO List:"
-msgstr "TODO リストに表示:"
-
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
-msgstr "ToDo リストスタイルのオプション:"
-
-#: calendar/gui/prop.c:648
-msgid "Highlight overdue items"
-msgstr "期限が過ぎたアイテムを強調"
-
-#: calendar/gui/prop.c:651
-msgid "Highlight not yet due items"
-msgstr "まだ期限が来ていないアイテムを強調"
-
-#: calendar/gui/prop.c:654
-msgid "Highlight items due today"
-msgstr "今日期限のアイテムを強調"
-
-#: calendar/gui/prop.c:684
-msgid "To Do List Properties"
-msgstr "ToDo リストのプロパティ"
-
-#: calendar/gui/prop.c:687
-msgid "To Do List"
-msgstr "ToDo リスト"
-
-#: calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "設定"
-
-#: calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr "アラーム"
-
-#. build miscellaneous box
-#: calendar/gui/prop.c:789
-msgid "Alarm Properties"
-msgstr "アラームのプロパティ"
-
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
-msgstr "表示アラームを BEEP 音で鳴らす"
-
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
-msgstr "オーディオアラームのタイムアウトまで後"
-
-#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
-msgid " seconds"
-msgstr " 秒"
-
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
-msgstr "居眠りを有効 "
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:345 widgets/misc/e-calendar-item.c:416
+#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
-#: calendar/gui/weekday-picker.c:347 calendar/gui/weekday-picker.c:437
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
-#: camel/camel-movemail.c:96
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "メールファイル %s をチェックすることが出来ませんでした: %s"
-
-#: camel/camel-movemail.c:133 camel/camel-movemail.c:180
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "%s のロックファイルを作成できませんでした: %s"
 
-#: camel/camel-movemail.c:143
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+"%s のロックファイルを取得中にタイムアウトしました. 後でやり直してください"
+
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr ""
+
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
+
+#: camel/camel-movemail.c:99
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "メールファイル %s をチェックすることが出来ませんでした: %s"
+
+#: camel/camel-movemail.c:146
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "メールファイル %s を開くことが出来ませんでした: %s"
 
-#: camel/camel-movemail.c:153
+#: camel/camel-movemail.c:156
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "メールファイル %s のテンポラリを開くことが出来ませんでした: %s"
 
-#: camel/camel-movemail.c:194
+#: camel/camel-movemail.c:197
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr "%s のロックファイルをテスト出来ませんでした: %s"
 
-#: camel/camel-movemail.c:214
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"%s のロックファイルを取得中にタイムアウトしました. 後でやり直してください"
-
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:243
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "メールファイルの読み込み中にエラー: %s"
 
-#: camel/camel-movemail.c:251
+#: camel/camel-movemail.c:254
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "メール作業ファイルの書き込み中にエラー: %s"
 
-#: camel/camel-movemail.c:269
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "作業ファイル %s へメールの保存に失敗しました: %s"
 
-#: camel/camel-movemail.c:301
+#: camel/camel-movemail.c:304
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "パイプが作成できませんでした: %s"
 
-#: camel/camel-movemail.c:313
+#: camel/camel-movemail.c:316
 #, c-format
 msgid "Could not fork: %s"
 msgstr "fork 出来ませんでした: %s"
 
-#: camel/camel-movemail.c:351
+#: camel/camel-movemail.c:354
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail プログラムは失敗しました: %s"
 
-#: camel/camel-movemail.c:352
+#: camel/camel-movemail.c:355
 msgid "(Unknown error)"
 msgstr "(未知のエラー)"
 
@@ -3051,6 +2690,10 @@ msgstr "%s (ポート %d) へ接続出来ませんでした: %s"
 msgid "(unknown host)"
 msgstr "(未知のホスト)"
 
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr "サーバとの接続は切断されました"
+
 #: camel/camel-service.c:120
 #, c-format
 msgid "URL '%s' needs a username component"
@@ -3066,22 +2709,22 @@ msgstr "URL '%s' はホストコンポーネントが必要です"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' はパスコンポーネントが必要です"
 
-#: camel/camel-service.c:486
+#: camel/camel-service.c:488
 #, c-format
 msgid "No such host %s."
 msgstr "そのようなホスト %s はありません"
 
-#: camel/camel-service.c:489
+#: camel/camel-service.c:491
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:271
+#: camel/camel-session.c:272
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "プロトコル `%s' を利用できるプロバイダはありません"
 
-#: camel/camel-session.c:359
+#: camel/camel-session.c:360
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3115,16 +2758,20 @@ msgstr "IMAP サーバから予期しない応答がありました: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP コマンドは失敗しました: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:349
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "未知のエラー"
 
-#: camel/providers/imap/camel-imap-command.c:366
+#: camel/providers/imap/camel-imap-command.c:271
+msgid "Server response ended too soon."
+msgstr "サーバレスポンスはあっけなく終わりました"
+
+#: camel/providers/imap/camel-imap-command.c:407
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP サーバの応答は %s 情報を含んでいません"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:443
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP サーバから予期しない OK 応答がありました: %s"
@@ -3134,7 +2781,7 @@ msgstr "IMAP サーバから予期しない OK 応答がありました: %s"
 msgid "Could not load summary for %s"
 msgstr "%s の要約をロード出来ませんでした"
 
-#: camel/providers/imap/camel-imap-folder.c:581
+#: camel/providers/imap/camel-imap-folder.c:585
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH 応答にメッセージ本体を見付けることが出来ませんでした"
 
@@ -3203,16 +2850,19 @@ msgstr "mbox ファイルにメッセージを追加出来ません: %s"
 msgid "Cannot get message: %s"
 msgstr "メッセージを取得出来ません: %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-mbox-provider.c:36
 #: camel/providers/mbox/camel-mbox-provider.c:36
 msgid ""
 "For reading mail delivered by the local system, and for storing mail on "
 "local disk."
 msgstr ""
 
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/mbox/camel-mbox-store.c:118
 #, c-format
 msgid ""
@@ -3222,12 +2872,16 @@ msgstr ""
 "ファイル `%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-mbox-store.c:117
 #: camel/providers/mbox/camel-mbox-store.c:134
 #, c-format
 msgid ""
@@ -3237,12 +2891,16 @@ msgstr ""
 "ファイル `%s' を作成することが出来ませんでした:\n"
 "%s"
 
+#: 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
@@ -3253,6 +2911,7 @@ msgstr ""
 "フォルダ `%s' を削除することが出来ませんでした:\n"
 "%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."
@@ -3267,6 +2926,7 @@ msgstr "フォルダを %s から %s へリネーム出来ませんでした: 宛先が存在します"
 msgid "Mbox folders may not be nested."
 msgstr "Mbox フォルダはネストすることが出来ません"
 
+#: camel/providers/local/camel-local-store.c:200
 #: camel/providers/mbox/camel-mbox-store.c:274
 #, c-format
 msgid "Local mail file %s"
@@ -3277,6 +2937,7 @@ msgstr "ローカルメールファイル %s"
 msgid "Could not open summary %s"
 msgstr "要約 %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"
@@ -3290,6 +2951,7 @@ msgstr "要約が不一致, 同期が中断しました"
 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"
@@ -3301,21 +2963,26 @@ msgstr "作業 mailbox へ書き出し中にエラー: %s"
 msgid "Cannot copy data to output file: %s"
 msgstr "出力ファイルへデータをコピー出来ません: %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"
@@ -3332,6 +2999,13 @@ msgstr "要約を作成またはロードすることが出来ませんでした"
 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 ""
@@ -3345,10 +3019,13 @@ msgstr ""
 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 ""
@@ -3358,6 +3035,8 @@ 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
 #, c-format
 msgid ""
@@ -3367,11 +3046,15 @@ msgstr ""
 "フォルダ `%s' を作成出来ませんでした:\n"
 "%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
@@ -3415,7 +3098,7 @@ msgstr "サーバへユーザ名の送信に失敗しました"
 msgid "Server rejected username/password"
 msgstr "サーバはユーザ名/パスワードを拒否しました"
 
-#: camel/providers/nntp/camel-nntp-folder.c:140
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, c-format
 msgid "Message %s not found."
 msgstr "メッセージ %s は見付かりません"
@@ -3466,16 +3149,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "%s の .newsrc ファイルを作成または開くことが出来ません: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:177
+#: camel/providers/pop3/camel-pop3-folder.c:179
 msgid "Could not open folder: message listing was incomplete."
 msgstr "フォルダを開けませんでした: メッセージリストは未完成です"
 
-#: camel/providers/pop3/camel-pop3-folder.c:271
+#: camel/providers/pop3/camel-pop3-folder.c:273
 #, c-format
 msgid "No message with uid %s"
 msgstr "uid %s のメッセージはありません"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "POP サーバ %s からメッセージを取得出来ませんでした: %s"
@@ -3562,7 +3245,7 @@ msgstr ""
 "POP サーバへ接続できません\n"
 "パスワードの送信中にエラー: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid "No such folder `%s'."
 msgstr "そのようなフォルダ `%s' はありません"
@@ -3654,54 +3337,50 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:301 mail/mail-display.c:117
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "添付"
 
-#: composer/e-msg-composer-attachment-bar.c:397
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "ファイルを添付します"
 
-#: composer/e-msg-composer-attachment-bar.c:444 filter/filter.glade.h:22
-#: filter/filter.glade.h:25 filter/filter.glade.h:32
+#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/filter.glade.h:14
 #: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "削除"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:465
 msgid "Remove selected items from the attachment list"
 msgstr "添付物リストから選択したアイテムを削除します"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "添付の追加..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 msgstr "メッセージへファイルを添付します"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:11
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "添付のプロパティ"
 
-#: composer/e-msg-composer-attachment.glade.h:8
-#: composer/e-msg-composer-attachment.glade.h:14
-msgid "MIME type:"
-msgstr "MIME 種別:"
-
-#: composer/e-msg-composer-attachment.glade.h:10
-#: composer/e-msg-composer-attachment.glade.h:13
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "ファイル名:"
 
+#: po/tmp/e-msg-composer-attachment.glade.h:9
+msgid "MIME type:"
+msgstr "MIME 種別:"
+
 #: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:599
+#: mail/mail-format.c:621
 msgid "From:"
 msgstr "From:"
 
@@ -3713,7 +3392,7 @@ msgstr "アドレス帳のためにここでクリック"
 msgid "Enter the identity you wish to send this message from"
 msgstr "このメッセージを送信したい身元を入力します"
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:603
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "To:"
 
@@ -3721,7 +3400,7 @@ msgstr "To:"
 msgid "Enter the recipients of the message"
 msgstr "メッセージの受取人を入力します"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:605
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -3741,7 +3420,7 @@ msgstr ""
 "メッセージの受取人リストの中に現れないで, "
 "メッセージのカーボンコピーを受信するアドレスを入力します"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:607
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Subject:"
 
@@ -3749,7 +3428,7 @@ msgstr "Subject:"
 msgid "Enter the subject of the mail"
 msgstr "メールの表題を入力します"
 
-#: composer/e-msg-composer.c:332
+#: composer/e-msg-composer.c:428
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3758,38 +3437,38 @@ msgstr ""
 "署名ファイル %s を開くことが出来ませんでした:\n"
 "%s"
 
-#: composer/e-msg-composer.c:488
+#: composer/e-msg-composer.c:598
 msgid "Save as..."
 msgstr "別名で保存..."
 
-#: composer/e-msg-composer.c:499
+#: composer/e-msg-composer.c:609
 #, c-format
 msgid "Error saving file: %s"
 msgstr "ファイルの保存中にエラー: %s"
 
-#: composer/e-msg-composer.c:519
+#: composer/e-msg-composer.c:629
 #, c-format
 msgid "Error loading file: %s"
 msgstr "ファイルのロード中にエラー: %s"
 
-#: composer/e-msg-composer.c:541
+#: composer/e-msg-composer.c:651
 msgid "Saving changes to message..."
 msgstr "メッセージの変更を保存中..."
 
-#: composer/e-msg-composer.c:543
+#: composer/e-msg-composer.c:653
 msgid "Save changes to message..."
 msgstr "メッセージの変更を保存..."
 
-#: composer/e-msg-composer.c:584
+#: composer/e-msg-composer.c:694
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "'草案箱' へ草案を保存中にエラーが発生しました: %s"
 
-#: composer/e-msg-composer.c:628 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:738 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:634
+#: composer/e-msg-composer.c:744
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3799,27 +3478,27 @@ msgstr ""
 "\n"
 "変更を保存しますか?"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:766
 msgid "Open file"
 msgstr "ファイルを開く"
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:892
 msgid "That file does not exist."
 msgstr "そのファイルは存在しません"
 
-#: composer/e-msg-composer.c:792
+#: composer/e-msg-composer.c:902
 msgid "That is not a regular file."
 msgstr "それは通常のファイルではありません"
 
-#: composer/e-msg-composer.c:802
+#: composer/e-msg-composer.c:912
 msgid "That file exists but is not readable."
 msgstr "そのファイルは存在しますが，読み取り可能ではありません"
 
-#: composer/e-msg-composer.c:812
+#: composer/e-msg-composer.c:922
 msgid "That file appeared accesible but open(2) failed."
 msgstr "そのファイルはアクセス可能のように見えますが，open(2) は失敗しました"
 
-#: composer/e-msg-composer.c:834
+#: composer/e-msg-composer.c:944
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3827,15 +3506,15 @@ msgstr ""
 "ファイルはとても大きい (100K 以上) です\n"
 "それを挿入することを望むのは確かですか?"
 
-#: composer/e-msg-composer.c:855
+#: composer/e-msg-composer.c:965
 msgid "An error occurred while reading the file."
 msgstr "ファイル読込中の間にエラーは発生しました"
 
-#: composer/e-msg-composer.c:1239
+#: composer/e-msg-composer.c:1342
 msgid "Compose a message"
 msgstr "メッセージを作成します"
 
-#: composer/e-msg-composer.c:1313
+#: composer/e-msg-composer.c:1419
 msgid "Could not create composer window."
 msgstr "メール作成ウィンドウを作成出来ませんでした"
 
@@ -3843,6 +3522,10 @@ msgstr "メール作成ウィンドウを作成出来ませんでした"
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution メール作成の初期化が出来ません"
 
+#: filter/e-search-bar.c:175
+msgid "Sear_ch"
+msgstr "検索(_c)"
+
 #: filter/filter-datespec.c:62
 msgid "years"
 msgstr "年"
@@ -3873,11 +3556,11 @@ msgstr " 秒"
 
 #: filter/filter-datespec.c:183
 msgid "Oops. You have forgotten to choose a date."
-msgstr ""
+msgstr "日付の選択を忘れています"
 
 #: filter/filter-datespec.c:185
 msgid "Oops. You have chosen an invalid date."
-msgstr ""
+msgstr "無効な日付を選択しています"
 
 #: filter/filter-datespec.c:259
 msgid ""
@@ -3929,8 +3612,8 @@ msgstr "逆比較"
 msgid "<click here to select a date>"
 msgstr "<日付を選択するためにここをクリックしてください>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:284
-#: mail/mail-autofilter.c:333
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 msgid "Add Filter Rule"
 msgstr "フィルタルールを追加"
 
@@ -3938,12 +3621,16 @@ msgstr "フィルタルールを追加"
 msgid "Edit Filter Rule"
 msgstr "フィルタルールを編集"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: filter/filter-editor.c:456 filter/filter.glade.h:7 filter/filter.glade.h:29
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr "入力"
+
+#. "demand",
+#: filter/filter-editor.c:435
+msgid "outgoing"
+msgstr "出力"
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "フィルタを編集"
 
@@ -3965,6 +3652,8 @@ msgid ""
 "Oops, you forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
+"フォルダの選択を忘れています\n"
+"戻ってメールを配送する有効なフォルダを指定してください"
 
 #: filter/filter-folder.c:212 filter/vfolder-rule.c:271
 msgid "Select Folder"
@@ -3978,7 +3667,7 @@ msgstr "フォルダ URI の入力"
 msgid "<click here to select a folder>"
 msgstr "<フォルダを選択するためにここをクリックしてください>"
 
-#: filter/filter-input.c:188
+#: filter/filter-input.c:184
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3987,7 +3676,12 @@ msgstr ""
 "正規表現 '%s' でエラーです:\n"
 "%s"
 
-#: filter/filter-part.c:458
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
 msgid "Test"
 msgstr "テスト"
 
@@ -3999,239 +3693,221 @@ msgstr "ルール名: "
 msgid "Untitled"
 msgstr "タイトルなし"
 
-#: filter/filter-rule.c:538
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr "もし"
 
-#: filter/filter-rule.c:555
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr "次の条件で動作を実行:"
 
-#: filter/filter-rule.c:559
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr "すべての基準が会った時"
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr "いくつかの基準が会った時"
 
-#: filter/filter-rule.c:575
+#: filter/filter-rule.c:577
 msgid "Add criterion"
 msgstr "基準を追加"
 
-#: filter/filter-rule.c:581
+#: filter/filter-rule.c:583
 msgid "Remove criterion"
 msgstr "基準を削除"
 
-#: filter/filter.glade.h:8
-msgid ""
-"Incoming\n"
-"Outgoing\n"
-msgstr ""
-"入\n"
-"出\n"
-
-#: filter/filter.glade.h:11 filter/filter.glade.h:31
-msgid "Filter Rules"
-msgstr "フィルタルール"
-
-#: filter/filter.glade.h:13 filter/filter.glade.h:18 filter/filter.glade.h:28
-#: mail/folder-browser.c:463 mail/mail-config-druid.glade.h:38
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23 mail/mail-config.glade.h:32
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "編集"
 
-#: filter/filter.glade.h:15 filter/filter.glade.h:30
+#: po/tmp/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "仮想フォルダの編集"
 
-#: filter/filter.glade.h:16 filter/filter.glade.h:33
+#: po/tmp/filter.glade.h:11
+msgid "Filter Rules"
+msgstr "フィルタルール"
+
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr "入力"
+
+#: po/tmp/filter.glade.h:13
+msgid "Outgoing"
+msgstr "出力"
+
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "仮想フォルダ"
 
-#: filter/filter.glade.h:20 filter/filter.glade.h:23 filter/filter.glade.h:34
+#: po/tmp/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "仮想フォルダソース"
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2 mail/message-list.c:511
-msgid "Answered"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "フォルダへコピー"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "受信日"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "送信日"
 
-#: filter/libfilter-i18n.h:9
-msgid "Deleted"
-msgstr "削除"
-
-#: filter/libfilter-i18n.h:10
-msgid "Draft"
-msgstr "草案"
-
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:8
 msgid "Expression"
 msgstr "表現"
 
-#: filter/libfilter-i18n.h:12
-msgid "Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:9
 msgid "Forward to Address"
 msgstr "アドレスへ転送"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:10
 msgid "Message Body"
 msgstr "メッセージ本体"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:11
+msgid "Message Header"
+msgstr "メッセージヘッダ"
+
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr "受信したメッセージ"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "送信したメッセージ"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "フォルダへ移動"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "受信者"
 
-#: filter/libfilter-i18n.h:20 mail/message-list.c:508
-msgid "Seen"
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "送信者"
 
-#: filter/libfilter-i18n.h:22
-msgid "Set Flag"
-msgstr ""
+#: filter/libfilter-i18n.h:19
+msgid "Set Status"
+msgstr "ステータス設定"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr "ソース"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr "指定のヘッダ"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:22
+msgid "Status"
+msgstr "ステータス"
+
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
-msgstr ""
+msgstr "処理停止"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:24
 msgid "Subject"
 msgstr "表題"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:25
 msgid "after"
 msgstr "後"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr "前"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "が次のものを含む"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr "が次のものを含まない"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:29
 msgid "does not end with"
 msgstr "が次のもので終らない"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:30
 msgid "does not exist"
 msgstr "が存在しない"
 
-#: filter/libfilter-i18n.h:33
-msgid "does not match regex"
-msgstr "が次の正規表現にマッチしない"
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:31
 msgid "does not sound like"
 msgstr "が次のもののようでない"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:32
 msgid "does not start with"
 msgstr "が次のもので始まらない"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:33
 msgid "ends with"
 msgstr "が次のもので終わる"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:34
 msgid "exists"
 msgstr "が存在する"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr "が次のものより大きい"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr "が次のものより小さい"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr "が次のものではない"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr "が次のものと一致する"
 
-#: filter/libfilter-i18n.h:42
-msgid "matches regex"
-msgstr "が次の正規表現とマッチする"
-
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:39
 msgid "on or after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr "が次のもののように見える"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:42
 msgid "starts with"
 msgstr "が次のもので開始する"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:43
 msgid "was after"
 msgstr "が次のものより後"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr "が次のものより前"
 
@@ -4255,127 +3931,130 @@ msgstr "仮想フォルダルールの追加"
 msgid "Edit VFolder Rule"
 msgstr "仮想フォルダルールの編集"
 
-#: mail/component-factory.c:230
+#: mail/component-factory.c:203
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution メールコンポーネントの初期化が出来ません"
 
-#: mail/component-factory.c:236
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr "Evolution メール要約コンポーネントの初期化が出来ません"
-
-#: mail/component-factory.c:241
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr "Evolution メール記憶ハッシュの初期化が出来ません"
-
-#: mail/component-factory.c:279
+#: mail/component-factory.c:242
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:156 ui/evolution-event-editor.xml.h:89
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:17
 msgid "Save"
 msgstr "保存"
 
-#: mail/folder-browser.c:169
+#: mail/folder-browser.c:153
 msgid "Body or subject contains"
 msgstr "本体または表題が次のものを含む"
 
-#: mail/folder-browser.c:170
+#: mail/folder-browser.c:154
 msgid "Body contains"
 msgstr "本体が次のものを含む"
 
-#: mail/folder-browser.c:171
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "表題が次のものを含む"
 
-#: mail/folder-browser.c:172
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr "本体が次のものを含まない"
 
-#: mail/folder-browser.c:173
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "表題が次のものを含まない"
 
-#: mail/folder-browser.c:451
+#: mail/folder-browser.c:453
 msgid "VFolder on Subject"
 msgstr "表題の仮想フォルダ"
 
-#: mail/folder-browser.c:452
+#: mail/folder-browser.c:454
 msgid "VFolder on Sender"
 msgstr "送信者の仮想フォルダ"
 
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:455
 msgid "VFolder on Recipients"
 msgstr "受信者の仮想フォルダ"
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:457
 msgid "Filter on Subject"
 msgstr "表題のフィルタ"
 
-#: mail/folder-browser.c:456
+#: mail/folder-browser.c:458
 msgid "Filter on Sender"
 msgstr "送信者のフィルタ"
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:459
 msgid "Filter on Recipients"
 msgstr "受信者のフィルタ"
 
-#: mail/folder-browser.c:458 mail/folder-browser.c:541
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
 msgid "Filter on Mailing List"
 msgstr "メーリングリストのフィルタ"
 
-#: mail/folder-browser.c:462
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:15
 msgid "Open"
 msgstr "開く"
 
-#: mail/folder-browser.c:464 mail/mail-view.c:163
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:28
+#: mail/folder-browser.c:466
+msgid "Save As..."
+msgstr "別名で保存..."
+
+#: mail/folder-browser.c:467 mail/mail-view.c:163
+#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
+#: po/tmp/evolution-mail.xml.h:28
 msgid "Print"
 msgstr "印刷"
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:469
 msgid "Reply to Sender"
 msgstr "送信者へ返信"
 
-#: mail/folder-browser.c:467 mail/mail-view.c:156 ui/evolution-mail.xml.h:34
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
 msgid "Reply to All"
 msgstr "全員へ返信"
 
-#: mail/folder-browser.c:468 mail/mail-view.c:159 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "転送"
 
-#: mail/folder-browser.c:471
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+msgid "Forward inline"
+msgstr ""
+
+#: mail/folder-browser.c:474
 msgid "Mark as Read"
 msgstr "既読としてマーク"
 
-#: mail/folder-browser.c:472
+#: mail/folder-browser.c:475
 msgid "Mark as Unread"
 msgstr "未読としてマーク"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:477
 msgid "Move to Folder..."
 msgstr "フォルダへ移動..."
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:478
 msgid "Copy to Folder..."
 msgstr "フォルダへコピー..."
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:480
 msgid "Undelete"
 msgstr "削除取消"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:481
+#: mail/folder-browser.c:484
 msgid "Apply Filters"
 msgstr "フィルタ適用"
 
-#: mail/folder-browser.c:483 ui/evolution-mail.xml.h:11
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "メッセージからルールを作成"
 
-#: mail/folder-browser.c:543
+#: mail/folder-browser.c:546
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "メーリングリストのフィルタ (%s)"
@@ -4395,7 +4074,7 @@ msgstr "表題は %s です"
 msgid "Mail from %s"
 msgstr "%s からメール"
 
-#: mail/mail-autofilter.c:329
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr "%s メーリングリスト"
@@ -4452,15 +4131,15 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:533
+#: mail/mail-callbacks.c:543
 msgid "Move message(s) to"
 msgstr "メッセージを移動します: "
 
-#: mail/mail-callbacks.c:535
+#: mail/mail-callbacks.c:545
 msgid "Copy message(s) to"
 msgstr "メッセージをコピーします: "
 
-#: mail/mail-callbacks.c:650
+#: mail/mail-callbacks.c:660
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4468,7 +4147,27 @@ msgstr ""
 "ドラフトフォルダ内に保存された\n"
 "メッセージだけを編集することが出来ます"
 
-#: mail/mail-callbacks.c:779
+#: mail/mail-callbacks.c:694 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr "ファイルを上書きしますか?"
+
+#: mail/mail-callbacks.c:698 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"その名前のファイルはすでに存在します\n"
+"上書きしますか?"
+
+#: mail/mail-callbacks.c:743
+msgid "Save Message As..."
+msgstr "メッセージを別名で保存..."
+
+#: mail/mail-callbacks.c:745
+msgid "Save Messages As..."
+msgstr "メッセージを別名で保存..."
+
+#: mail/mail-callbacks.c:872
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4477,15 +4176,15 @@ msgstr ""
 "フィルタ情報のロード中にエラー:\n"
 "%s"
 
-#: mail/mail-callbacks.c:824
+#: mail/mail-callbacks.c:917
 msgid "Print Message"
 msgstr "メッセージを印刷"
 
-#: mail/mail-callbacks.c:871
+#: mail/mail-callbacks.c:964
 msgid "Printing of message failed"
 msgstr "メッセージの印刷に失敗しました"
 
-#: mail/mail-config-gui.c:432
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
@@ -4494,60 +4193,63 @@ msgstr ""
 "メールの送信で使われるあなたの名前と email アドレスを入力してください. また, "
 "任意にあなたの組織やシグネチャを読むファイル名を入力することが出来ます"
 
-#: mail/mail-config-gui.c:445
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "フルネーム:"
 
-#: mail/mail-config-gui.c:469
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "Email アドレス:"
 
-#: mail/mail-config-druid.glade.h:53 mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "組織:"
 
-#: mail/mail-config-druid.glade.h:75 mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "署名ファイル:"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
-#: mail/mail-config.glade.h:42
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "署名ファイル"
 
-#: mail/mail-config-druid.glade.h:74 mail/mail-config-gui.c:906
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "サーバ:"
 
-#: mail/mail-config-druid.glade.h:79 mail/mail-config-gui.c:912
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "ユーザ名:"
 
-#: mail/mail-config-druid.glade.h:55 mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "パス:"
 
-#: mail/mail-config-druid.glade.h:26 mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "認証方式:"
 
-#: mail/mail-config-gui.c:940
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "サポートされた種別を検出..."
 
-#: mail/mail-config-druid.glade.h:36 mail/mail-config-gui.c:967
+#: mail/mail-config-gui.c:968
+msgid "Remember this password"
+msgstr "このパスワードを記憶"
+
+#: mail/mail-config-gui.c:991
 msgid "Don't delete messages from server"
 msgstr "サーバからメッセージを削除しない"
 
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:979
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr "設定をテスト"
 
-#: mail/mail-config-gui.c:1106
+#: mail/mail-config-gui.c:1130
 msgid "Mail source type:"
 msgstr "メールソース種別:"
 
-#: mail/mail-config-gui.c:1111 mail/mail-config-gui.c:1159
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -4560,11 +4262,11 @@ msgstr ""
 "サーバが認証を必要とするなら，\"サポートされた種別を検出...\" ボタンを\n"
 "クリックした後に他の情報を入力することが出来ます"
 
-#: mail/mail-config-gui.c:1130
+#: mail/mail-config-gui.c:1154
 msgid "News source type:"
 msgstr "ニュースソース種別:"
 
-#: mail/mail-config-gui.c:1135
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -4577,311 +4279,137 @@ msgstr ""
 "サーバが認証を必要とするなら，\"サポートされた種別を検出...\" ボタンを\n"
 "クリックした後に他の情報を入力することが出来ます"
 
-#: mail/mail-config-gui.c:1154
+#: mail/mail-config-gui.c:1178
 msgid "Mail transport type:"
 msgstr "メール配送種別:"
 
-#: mail/mail-config-gui.c:1209
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "身元の追加"
 
-#: mail/mail-config-gui.c:1211
+#: mail/mail-config-gui.c:1235
 msgid "Edit Identity"
 msgstr "身元の編集"
 
-#: mail/mail-config-gui.c:1309
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "ソースの追加"
 
-#: mail/mail-config-gui.c:1311
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr "ソースの編集"
 
-#: mail/mail-config-gui.c:1406
+#: mail/mail-config-gui.c:1430
 msgid "Add News Server"
 msgstr "ニュースサーバの追加"
 
-#: mail/mail-config-gui.c:1408
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr "ニュースサーバの編集"
 
-#: mail/mail-config-gui.c:2232
+#: mail/mail-config-gui.c:2253
 #, c-format
 msgid "Testing \"%s\""
 msgstr "\"%s\" をテスト中"
 
-#: mail/mail-config-gui.c:2234
+#: mail/mail-config-gui.c:2255
 #, c-format
 msgid "Test connection to \"%s\""
 msgstr "\"%s\" へ接続テスト"
 
-#: mail/mail-config-gui.c:2275
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 msgstr "接続は成功しました!"
 
-#: mail/mail-config-gui.c:2325
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr ""
 
-#: mail/mail-config-gui.c:2327
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr ""
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16 mail/mail-config-druid.glade.h:46
-msgid "Mail Configuration"
-msgstr "メール設定"
-
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-"ようこそ，Evolution メール設定ウィザードへ!\n"
-"あなたの電子メール設定についていくつかの情報を入力\n"
-"することによって，すぐに電子メールを送受信し始める\n"
-"ことが出来ます．次をクリックして続けてください．"
-
-#: mail/mail-config-druid.glade.h:13 mail/mail-config-druid.glade.h:44
+#: po/tmp/mail-config-druid.glade.h:6
 msgid "Identity"
 msgstr "身元"
 
-#: mail/mail-config-druid.glade.h:14
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "メール設定"
+
+#: po/tmp/mail-config-druid.glade.h:8
 msgid "Mail Source"
 msgstr "メールソース"
 
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-#: mail/mail-config.glade.h:35
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
 msgid "Mail Transport"
 msgstr "メールの配送"
 
-#: mail/mail-config-druid.glade.h:17
-msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
-msgstr ""
-"あなたの電子メールの設定は完了しました\n"
-"\"完了\" をクリックして新しい設定を保存してください"
-
-#: mail/mail-config-druid.glade.h:19
-msgid "Account Information"
-msgstr "アカウント情報"
-
-#: mail/mail-config-druid.glade.h:20
-msgid "Account Management"
-msgstr "アカウント管理"
-
-#: mail/mail-config-druid.glade.h:21
-msgid "Accounts"
-msgstr "アカウント"
-
-#: mail/mail-config-druid.glade.h:23
-msgid "Add Optional Fields..."
-msgstr "任意のフィールドを追加..."
-
-#: mail/mail-config-druid.glade.h:24
-msgid "Additional Identity Fields"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:25
-msgid "Authentication"
-msgstr "認証方式"
-
-#: mail/mail-config-druid.glade.h:27
-msgid "Browse..."
-msgstr "閲覧..."
-
-#: mail/mail-config-druid.glade.h:28
-msgid "Congratulations, your mail configuration is complete."
-msgstr "おめでとうございます, あなたのメール設定は完了しました"
-
-#: mail/mail-config-druid.glade.h:34
-msgid "Default"
-msgstr "デフォルト"
-
-#: mail/mail-config-druid.glade.h:37
-msgid "Done"
-msgstr "完了"
-
-#: mail/mail-config-druid.glade.h:39
-msgid "Edit Mail Configuration Settings"
-msgstr "メール設定の編集"
-
-#: mail/mail-config-druid.glade.h:40
-msgid "Email Address:"
-msgstr "E メールアドレス:"
-
-#: mail/mail-config-druid.glade.h:41
-msgid "Evolution Mail Configuration"
-msgstr "Evolution メール設定"
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Full Name:"
-msgstr "フルネーム:"
-
-#: mail/mail-config-druid.glade.h:43
-msgid "IMAP"
-msgstr "IMAP"
-
-#: mail/mail-config-druid.glade.h:45
-msgid "Mail"
-msgstr "メール"
-
-#: mail/mail-config-druid.glade.h:47
-msgid "Mail Configuration Druid"
-msgstr "メール設定ドルイド"
-
-#: mail/mail-config-druid.glade.h:48
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:50
-msgid "News"
-msgstr "ニュース"
-
-#: mail/mail-config-druid.glade.h:51
-msgid "Optional"
-msgstr "任意"
-
-#: mail/mail-config-druid.glade.h:52
-msgid "Optional Information"
-msgstr "任意情報"
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Password:"
-msgstr "パスワード:"
-
-#: mail/mail-config-druid.glade.h:56
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:58
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know "
-msgstr ""
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr "ようこそ Evolution メール設定ウィザードへ!\n"
 
-#: mail/mail-config-druid.glade.h:60
-msgid ""
-"Please enter your name and email address below. The &quot;optional&quot; "
-"fields below do not "
+#: po/tmp/mail-config-druid.glade.h:11
+msgid "By filling in some information about your email\n"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:62
-msgid "Preferred type: "
+#: po/tmp/mail-config-druid.glade.h:12
+msgid "settings, you can start sending and receiving email\n"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:63
-msgid "Receiving Email"
-msgstr "メールを受信中"
-
-#: mail/mail-config-druid.glade.h:64
-msgid "Receiving Mail"
-msgstr "メールを受信中"
-
-#: mail/mail-config-druid.glade.h:65
-msgid "Remember my password"
-msgstr "パスワードを記憶する"
-
-#: mail/mail-config-druid.glade.h:66
-msgid "Reply-to:"
-msgstr "Reply-to:"
-
-#: mail/mail-config-druid.glade.h:67
-msgid "Required"
+#: po/tmp/mail-config-druid.glade.h:13
+msgid "right away. Click Next to continue."
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:68
-msgid "SMTP"
-msgstr "SMTP"
-
-#: mail/mail-config-druid.glade.h:69
-msgid "SMTP server requires authentication"
-msgstr "SMTP サーバは認証が必要です"
-
-#: mail/mail-config-druid.glade.h:70
-msgid "Sending Email"
-msgstr "E メールを送信中"
-
-#: mail/mail-config-druid.glade.h:71
-msgid "Sending Mail"
-msgstr "メールを送信中"
-
-#: mail/mail-config-druid.glade.h:72
-msgid "Server Configuration"
-msgstr "サーバ設定"
-
-#: mail/mail-config-druid.glade.h:73
-msgid "Server Type: "
-msgstr "サーバ種別: "
-
-#: mail/mail-config-druid.glade.h:76 mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:43
-msgid "Sources"
-msgstr "ソース"
-
-#: mail/mail-config-druid.glade.h:80
-msgid "Welcome to the Evolution Mail Configuration Druid! "
-msgstr "ようこそ Evolution メール設定ドルイドへ! "
-
-#: mail/mail-config-druid.glade.h:86
+#: po/tmp/mail-config-druid.glade.h:14
 msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:90
-msgid "Your mail server supports the following types of authentication. Please"
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
 msgstr ""
+"あなたの電子メールの設定は完了しました\n"
+"\"完了\" をクリックして新しい設定を保存してください"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
-#: mail/mail-config.glade.h:33
-msgid "Identities"
-msgstr "身元"
-
-#: mail/mail-config.glade.h:8 mail/mail-config.glade.h:30
+#: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "アドレス"
 
-#: mail/mail-config.glade.h:9 mail/mail-config.glade.h:39
-msgid "Organization"
-msgstr "組織"
+#: po/tmp/mail-config.glade.h:10
+msgid "Identities"
+msgstr "身元"
 
-#: mail/mail-config.glade.h:19 mail/mail-config.glade.h:34
+#: po/tmp/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "メールソース"
 
-#: mail/mail-config.glade.h:21 mail/mail-config.glade.h:37
+#: po/tmp/mail-config.glade.h:13
+msgid "Mark message as seen [ms]: "
+msgstr ""
+
+#: po/tmp/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "ニュースサーバ"
 
-#: mail/mail-config.glade.h:25 mail/mail-config.glade.h:38
+#: po/tmp/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "ニュースソース"
 
-#: mail/mail-config.glade.h:26 mail/mail-config.glade.h:41
+#: po/tmp/mail-config.glade.h:16
+msgid "Organization"
+msgstr "組織"
+
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "HTML 形式でメッセージを送信"
 
-#: mail/mail-config.glade.h:27 mail/mail-config.glade.h:36
-msgid "Mark message as seen [ms]: "
-msgstr ""
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
+msgstr "ソース"
 
 #: mail/mail-crypto.c:136
 #, c-format
@@ -4915,19 +4443,7 @@ msgstr "GPG/PGP へのパイプが作成できませんでした: %s"
 msgid "No GPG/PGP program available."
 msgstr "GPG/PGP プログラムは利用できません"
 
-#: mail/mail-display.c:67
-msgid "Overwrite file?"
-msgstr "ファイルを上書きしますか?"
-
-#: mail/mail-display.c:71
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"その名前のファイルはすでに存在します\n"
-"上書きしますか?"
-
-#: mail/mail-display.c:85
+#: mail/mail-display.c:90
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4936,95 +4452,100 @@ msgstr ""
 "ファイル %s を開くことが出来ませんでした:\n"
 "%s"
 
-#: mail/mail-display.c:97
+#: mail/mail-display.c:113
 #, c-format
 msgid "Could not write data: %s"
 msgstr "データを書き出すことが出来ませんでした: %s"
 
-#: mail/mail-display.c:193
+#: mail/mail-display.c:218
 msgid "Save Attachment"
 msgstr "添付の保存"
 
-#: mail/mail-display.c:233
+#: mail/mail-display.c:258
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "作業ディレクトリを作成出来ませんでした: %s"
 
-#: mail/mail-display.c:275
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr "ディスクへ保存..."
 
-#: mail/mail-display.c:277
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr "%s に開く..."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:304
 msgid "View Inline"
-msgstr ""
+msgstr "インライン表示"
 
-#: mail/mail-display.c:303
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr "外部ビューア"
 
-#: mail/mail-display.c:326
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
-msgstr ""
+msgstr "インライン表示 (%s経由)"
 
-#: mail/mail-display.c:330
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr "隠す"
 
-#: mail/mail-format.c:478
+#: mail/mail-format.c:500
 #, c-format
 msgid "%s attachment"
 msgstr "%s を添付"
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:623
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
-#: mail/mail-format.c:823
+#: mail/mail-format.c:845
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "この Evolution のコピーでは GPG/PGP サポートは利用出来ません"
 
-#: mail/mail-format.c:835
+#: mail/mail-format.c:857
 msgid "Encrypted message not displayed"
 msgstr "暗号化されたメッセージは表示しません"
 
-#: mail/mail-format.c:841
+#: mail/mail-format.c:863
 msgid "Encrypted message"
 msgstr "暗号化されたメッセージ"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:864
 msgid "Click icon to decrypt."
 msgstr "アイコンをクリックして復号化してください"
 
-#: mail/mail-format.c:1444
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1456
+#: mail/mail-format.c:1478
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1460
+#: mail/mail-format.c:1482
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1494
+#: mail/mail-format.c:1516
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1499
+#: mail/mail-format.c:1521
 msgid "Malformed external-body part."
 msgstr ""
 
+#: mail/mail-format.c:1691
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr "On %s, %s wrote:\n"
+
 #: mail/mail-local.c:194
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
@@ -5064,282 +4585,301 @@ msgid ""
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:659
+#: mail/mail-local.c:668
 msgid "Registering local folder"
 msgstr "ローカルフォルダを登録中"
 
-#: mail/mail-local.c:661
+#: mail/mail-local.c:670
 msgid "Register local folder"
 msgstr "ローカルフォルダを登録します"
 
-#: mail/mail-ops.c:69
+#: mail/mail-ops.c:79
 #, c-format
 msgid "Fetching email from %s"
 msgstr "%s からメールを取得中"
 
-#: mail/mail-ops.c:71
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr "%s からメールを取得します"
 
-#: mail/mail-ops.c:311
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "新規メールは %s にはありません"
 
-#: mail/mail-ops.c:366
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr "要求されたメールをフィルタ中"
 
-#: mail/mail-ops.c:368
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr "要求されたメールをフィルタします"
 
-#: mail/mail-ops.c:500
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" を送信中"
 
-#: mail/mail-ops.c:505
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr "表題なしのメッセージを送信しています"
 
-#: mail/mail-ops.c:508
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "\"%s\" を送信します"
 
-#: mail/mail-ops.c:511
+#: mail/mail-ops.c:549
 msgid "Send a message without a subject"
 msgstr "表題なしのメッセージを送信します"
 
-#: mail/mail-ops.c:682
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr "キューを送信中"
 
-#: mail/mail-ops.c:684
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr "キューを送信します"
 
-#: mail/mail-ops.c:820 mail/mail-ops.c:827
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr "\"%s\" を追加中"
 
-#: mail/mail-ops.c:824 mail/mail-ops.c:830
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr "表題なしのメッセージを付加しています"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "\"%s\" を抹消中"
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "\"%s\" を抹消します"
 
-#: mail/mail-ops.c:963
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "\"%s\" から \"%s\" の中へメッセージを移動しています"
 
-#: mail/mail-ops.c:965
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "\"%s\" から \"%s\" の中へメッセージをコピーしています"
 
-#: mail/mail-ops.c:968
+#: mail/mail-ops.c:1006
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "\"%s\" から \"%s\" の中へメッセージを移動します"
 
-#: mail/mail-ops.c:970
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "\"%s\" から \"%s\" の中へメッセージをコピーします"
 
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "移動中"
 
-#: mail/mail-ops.c:1004
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "コピー中"
 
-#: mail/mail-ops.c:1024
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "メッセージを %s %d / %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1103
+#: mail/mail-ops.c:1141
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "フォルダ \"%s\" の中のメッセージをマークしています"
 
-#: mail/mail-ops.c:1106
+#: mail/mail-ops.c:1144
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "フォルダ \"%s\" の中のメッセージをマークします"
 
-#: mail/mail-ops.c:1137
+#: mail/mail-ops.c:1175
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "メッセージ %d / %d をマーク中"
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1298
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" の中のフォルダを走査中"
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1300
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "\"%s\" の中のフォルダを走査します"
 
-#: mail/mail-ops.c:1331 mail/subscribe-dialog.c:324
+#: mail/mail-ops.c:1369 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(説明なし)"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1430
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "フォルダ \"%s\" からメッセージを添付中"
 
-#: mail/mail-ops.c:1395
+#: mail/mail-ops.c:1433
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "\"%s\" からメッセージを添付します"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1533
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "メッセージ \"%s\" を転送中"
 
-#: mail/mail-ops.c:1503
+#: mail/mail-ops.c:1537
 msgid "Forwarding a message without a subject"
 msgstr "表題なしのメッセージを転送中"
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1540
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "メッセージ \"%s\" を転送します"
 
-#: mail/mail-ops.c:1511
+#: mail/mail-ops.c:1544
 msgid "Forward a message without a subject"
 msgstr "表題なしのメッセージを転送します"
 
-#: mail/mail-ops.c:1548
+#: mail/mail-ops.c:1591
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "メッセージ番号を取得しています %d / %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1608
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 "転送されるメッセージを生成中にメッセージから MIME パートの生成で失敗しました"
 
-#: mail/mail-ops.c:1651
+#: mail/mail-ops.c:1663
+msgid "Forwarded messages"
+msgstr "メッセージを転送"
+
+#: mail/mail-ops.c:1677
+msgid "Forwarded message:\n"
+msgstr "メッセージを転送:\n"
+
+#: mail/mail-ops.c:1746
 #, c-format
 msgid "Loading \"%s\""
 msgstr "\"%s\" をロード中"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Load \"%s\""
 msgstr "\"%s\" をロードします"
 
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1851
 #, c-format
 msgid "Creating \"%s\""
 msgstr "\"%s\" を作成中"
 
-#: mail/mail-ops.c:1757
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Create \"%s\""
 msgstr "\"%s\" を作成します"
 
-#: mail/mail-ops.c:1805
+#: mail/mail-ops.c:1901
 msgid "Exception while reporting result to shell component listener."
 msgstr "シェルコンポーネントリスナーへ結果を報告する間に例外が発生しました"
 
-#: mail/mail-ops.c:1851
+#: mail/mail-ops.c:1947
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "\"%s\" を同期中"
 
-#: mail/mail-ops.c:1853
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "\"%s\" を同期します"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:2013
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "メッセージ UID \"%s\" を表示中"
 
-#: mail/mail-ops.c:1920
+#: mail/mail-ops.c:2016
 msgid "Clearing message display"
 msgstr "メッセージディスプレイをクリア中"
 
-#: mail/mail-ops.c:1923
+#: mail/mail-ops.c:2019
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "メッセージ UID \"%s\" を表示します"
 
-#: mail/mail-ops.c:1926
+#: mail/mail-ops.c:2022
 msgid "Clear message display"
 msgstr "メッセージディスプレイをクリアします"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2135
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "フォルダ \"%s\" からメッセージを開いています"
 
-#: mail/mail-ops.c:2042
+#: mail/mail-ops.c:2138
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "\"%s\" からメッセージを開きます"
 
-#: mail/mail-ops.c:2146
+#: mail/mail-ops.c:2242
 #, c-format
 msgid "Loading %s Folder"
 msgstr "%s フォルダをロード中"
 
-#: mail/mail-ops.c:2148
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Load %s Folder"
 msgstr "%s フォルダを読み込みます"
 
-#: mail/mail-ops.c:2215
+#: mail/mail-ops.c:2308
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "フォルダ \"%s\" からメッセージを表示中"
 
-#: mail/mail-ops.c:2218
+#: mail/mail-ops.c:2311
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "\"%s\" からメッセージを表示します"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2337
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "メッセージを取得しています %d / %d (uid \"%s\")"
 
+#: mail/mail-ops.c:2426
+#, c-format
+msgid "Saving messages from folder \"%s\""
+msgstr "フォルダ \"%s\" からメッセージを保存中"
+
+#: mail/mail-ops.c:2429
+#, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "フォルダ \"%s\" からメッセージを保存します"
+
+#: mail/mail-ops.c:2472
+#, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr "メッセージを保存しています %d / %d (uid \"%s\")"
+
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: mail/mail-summary.c:95 mail/mail-threads.c:703
+#: mail/mail-summary.c:104 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr "パイプ上に不完全なメッセージが書かれました!"
 
-#: mail/mail-summary.c:368
-msgid "Mailbox summary"
-msgstr "メールボックスの要約"
-
 #: mail/mail-threads.c:301
 #, c-format
 msgid ""
@@ -5349,7 +4889,7 @@ msgstr ""
 "%s へ準備している間にエラーが発生しました:\n"
 "%s"
 
-#: mail/mail-threads.c:650
+#: mail/mail-threads.c:675
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -5358,34 +4898,34 @@ msgstr ""
 "'%s' の際にエラーが発生しました:\n"
 "%s"
 
-#: mail/mail-threads.c:707
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr "派遣されたスレッドからコマンド読み込み中にエラーが発生しました"
 
-#: mail/mail-threads.c:772
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr "派遣されたスレッドから不正なメッセージ?"
 
-#: mail/mail-threads.c:891
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr "ダイアログボックスを作成することが出来ませんでした"
 
-#: mail/mail-threads.c:902
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr "ユーザはクエリをキャンセルしました"
 
-#: mail/mail-tools.c:187
+#: mail/mail-tools.c:189
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "テンポラリ mbox '%s' を作成できませんでした: %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:237
+#: mail/mail-tools.c:239
 #, c-format
 msgid "Examining %s"
 msgstr "%s を調査中"
 
-#: mail/mail-tools.c:267
+#: mail/mail-tools.c:269
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -5394,41 +4934,41 @@ msgstr ""
 "重複したメッセージを取得するかもしれません"
 
 #. Info
-#: mail/mail-tools.c:288
+#: mail/mail-tools.c:290
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "メッセージを取得しています %d / %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:301
+#: mail/mail-tools.c:303
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "メッセージを書き出しています %d / %d"
 
-#: mail/mail-tools.c:330
+#: mail/mail-tools.c:332
 #, c-format
 msgid "Saving changes to %s"
 msgstr "%s へ変更を保存中"
 
-#: mail/mail-tools.c:367
+#: mail/mail-tools.c:369
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (メッセージを転送)"
 
-#: mail/mail-tools.c:377
+#: mail/mail-tools.c:379
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (表題なし)"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:418
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "メッセージを転送しました - %s"
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:420
 msgid "Forwarded message (no subject)"
 msgstr "メッセージを転送しました (表題なし)"
 
-#: mail/mail-tools.c:521
+#: mail/mail-tools.c:523
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5441,56 +4981,71 @@ msgstr ""
 msgid "VFolders"
 msgstr "仮想フォルダ"
 
-#: mail/mail-vfolder.c:292
+#: mail/mail-vfolder.c:296
 msgid "New VFolder"
 msgstr "新規仮想フォルダ"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 ui/evolution-mail.xml.h:33
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "返信"
 
-#: mail/mail-view.c:153 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr "メッセージの差出人へ返信します"
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr "このメッセージの受取人全員へ返信します"
 
-#: mail/mail-view.c:159 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "このメッセージを転送します"
 
-#: mail/mail-view.c:163 ui/evolution-mail.xml.h:32
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "選択されたメッセージを印刷します"
 
-#: mail/mail-view.c:165 ui/evolution-mail.xml.h:13
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "このメッセージを削除します"
 
-#: mail/message-list.c:505
+#: mail/message-list.c:574
 msgid "Unseen"
+msgstr "未読"
+
+#: mail/message-list.c:577
+msgid "Seen"
+msgstr "既読"
+
+#: mail/message-list.c:580
+msgid "Answered"
+msgstr ""
+
+#: mail/message-list.c:848
+#, 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
+#, c-format
+msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:2043
+#: mail/message-list.c:862 mail/message-list.c:877
+msgid "<unknown>"
+msgstr "<未知>"
+
+#: mail/message-list.c:2159
 msgid "Rebuilding message view"
 msgstr "メッセージビューを再構築中"
 
-#: mail/message-list.c:2045
+#: mail/message-list.c:2161
 msgid "Rebuild message view"
 msgstr "メッセージビューを再構築"
 
-#: mail/message-thread.c:583
-msgid "Threading message list"
-msgstr "メッセージリストをスレッド化中"
-
-#: mail/message-thread.c:585
-msgid "Thread message list"
-msgstr "メッセージリストをスレッド化します"
-
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
 msgstr ""
@@ -5505,31 +5060,31 @@ msgstr ""
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:280
+#: mail/subscribe-dialog.c:282
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr ""
+#: mail/subscribe-dialog.c:286
+#, fuzzy, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr "フォルダ \"%s\" からメッセージを開いています"
 
-#: mail/subscribe-dialog.c:387
+#: mail/subscribe-dialog.c:290
 #, c-format
-msgid "Unsubscribing to folder \"%s\""
+msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:390
-#, c-format
-msgid "Unsubscribe to folder \"%s\""
-msgstr ""
+#: mail/subscribe-dialog.c:293
+#, fuzzy, c-format
+msgid "Unsubscribe from folder \"%s\""
+msgstr "フォルダ \"%s\" からメッセージを開いています"
 
-#: shell/e-setup.c:110 shell/e-setup.c:179
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr "Evolution のインストール"
 
-#: shell/e-setup.c:114
+#: shell/e-setup.c:116
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -5537,28 +5092,28 @@ msgstr ""
 "この Evolution の新しいバージョンはあなたのパーソナル Evolution\n"
 "ディレクトリの中に付加ファイルをインストールする必要があります"
 
-#: shell/e-setup.c:115
+#: shell/e-setup.c:117
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "\"OK\" でファイルをインストール, または \"キャンセル\" で終了します"
 
-#: shell/e-setup.c:156
+#: shell/e-setup.c:155
 msgid "Could not update files correctly"
 msgstr "正しくファイルを更新出来ませんでした"
 
-#: shell/e-setup.c:160 shell/e-setup.c:220
+#: shell/e-setup.c:158 shell/e-setup.c:224
 msgid "Evolution files successfully installed."
 msgstr "Evolution のファイルは正しくインストールされました"
 
-#: shell/e-setup.c:183
+#: shell/e-setup.c:187
 msgid "This seems to be the first time you run Evolution."
 msgstr "あなたは Evolution を初めて実行したように思えます"
 
-#: shell/e-setup.c:184
+#: shell/e-setup.c:188
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Evolution ユーザファイルをインストールしますので \"OK\" をクリックして下さい"
 
-#: shell/e-setup.c:201
+#: shell/e-setup.c:205
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5569,7 +5124,7 @@ msgstr ""
 "\n"
 "エラー: %s"
 
-#: shell/e-setup.c:216
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5578,7 +5133,7 @@ msgstr ""
 "'%s' の中にファイルを\n"
 "コピー出来ません"
 
-#: shell/e-setup.c:241
+#: shell/e-setup.c:245
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5589,7 +5144,7 @@ msgstr ""
 "Evolution ユーザファイルのインストールを\n"
 "許容するために移動して下さい"
 
-#: shell/e-setup.c:253
+#: shell/e-setup.c:257
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5645,11 +5200,11 @@ msgstr "Bug buddy はあなたの $PATH には見つかりません"
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy は実行できませんでした"
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5661,29 +5216,29 @@ msgstr ""
 "グループウェアアプリケーションの\n"
 "パッケージソフトです"
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:335
 msgid "Go to folder..."
 msgstr "フォルダへ移動..."
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr "(表示したフォルダはありません)"
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "フォルダ"
 
-#: shell/e-shell-view.c:1021
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:339
+#: shell/e-shell.c:372
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "局部記憶装置のセットアップが出来ません -- %s"
 
-#: shell/e-shell.c:1157
+#: shell/e-shell.c:1208
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5759,56 +5314,57 @@ msgstr "ショートカットバーからこのショートカットを削除します"
 msgid "Error saving shortcuts."
 msgstr "ショートカットの保存中にエラーが発生しました"
 
-#: shell/e-storage.c:128
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(名前なし)"
 
-#: shell/e-storage.c:327
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "エラーはありません"
 
-#: shell/e-storage.c:329
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr "一般的なエラー"
 
-#: shell/e-storage.c:331
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr "同じ名前のフォルダがすでに存在しています"
 
-#: shell/e-storage.c:333
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr "指定されたフォルダ種別は有効ではありません"
 
-#: shell/e-storage.c:335
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "I/O エラー"
 
-#: shell/e-storage.c:337
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "フォルダを作成する十分な空きがありません"
 
-#: shell/e-storage.c:339
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "指定されたフォルダは見付かりませんでした"
 
-#: shell/e-storage.c:341
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr "機能はこの記憶装置では実装されていません"
 
-#: shell/e-storage.c:343
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr "許可がありません"
 
-#: shell/e-storage.c:345
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr "操作はサポートされていません"
 
-#: shell/e-storage.c:347
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr "指定された種別はこの記憶装置ではサポートされていません"
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:126
-#: ui/evolution.xml.h:37
+#: 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)"
 
@@ -5816,7 +5372,7 @@ msgstr "表示(_V)"
 msgid "View the selected folder"
 msgstr "選択されたフォルダを表示します"
 
-#: shell/main.c:70
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -5858,7 +5414,7 @@ msgstr ""
 "我々はあなたが我々の成果を楽しむことを望んでいます．そして我々は\n"
 "熱心にあなたの貢献を待ち受けています!\n"
 
-#: shell/main.c:97
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -5866,995 +5422,1113 @@ msgstr ""
 "ありがとう\n"
 "Evolution チーム\n"
 
-#: shell/main.c:122
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "Evolution シェルの初期化が出来ません"
 
-#: shell/main.c:144
+#: shell/main.c:178
 msgid "Disable."
 msgstr "無効"
 
-#: shell/main.c:166
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo コンポーネントシステムを初期化出来ません"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.xml.h:7
+#: po/tmp/evolution-addressbook-ldap.xml.h:6
 msgid "N_ew Directory Server"
 msgstr "新規ディレクトリサーバ(_e)"
 
-#: ui/evolution-addressbook-ldap.xml.h:8
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
 msgid "_Actions"
 msgstr "動作(_A)"
 
-#: ui/evolution-addressbook.xml.h:8
+#: po/tmp/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "新規コンタクトを作成します"
 
-#: ui/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "コンタクトを削除します"
 
-#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:68
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "検索"
 
-#: ui/evolution-addressbook.xml.h:12
+#: po/tmp/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "コンタクトを検索します"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:19
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "新規"
 
-#: ui/evolution-addressbook.xml.h:15
+#: po/tmp/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "コンタクトを印刷します"
 
-#: ui/evolution-addressbook.xml.h:16
+#: po/tmp/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "停止"
 
-#: ui/evolution-addressbook.xml.h:17
+#: po/tmp/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "ロードを停止します"
 
-#: ui/evolution-addressbook.xml.h:18
+#: po/tmp/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "すべて表示"
 
-#: ui/evolution-addressbook.xml.h:19
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "すべてのコンタクトを表示します"
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "_New Contact"
-msgstr "新規コンタクト(_N)"
-
-#: ui/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-addressbook.xml.h:19
 msgid "_Print Contacts..."
 msgstr "コンタクトを印刷(_P)..."
 
-#: ui/evolution-addressbook.xml.h:22
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Search for contacts"
 msgstr "コンタクトの検索(_S)"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-event-editor.xml.h:124
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "ツール(_T)"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.xml.h:7
+#: po/tmp/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 日"
 
-#: ui/evolution-calendar.xml.h:8
+#: po/tmp/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9
+#: po/tmp/evolution-calendar.xml.h:8
+msgid "Ca_lendar"
+msgstr "カレンダ(_l)"
+
+#: po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "カレンダの設定..."
 
-#: ui/evolution-calendar.xml.h:10
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "新規予約を作成します"
 
-#: ui/evolution-calendar.xml.h:11
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "新規カレンダを作成します"
 
-#: ui/evolution-calendar.xml.h:12
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "日"
 
-#: ui/evolution-calendar.xml.h:13
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "時間を戻します"
 
-#: ui/evolution-calendar.xml.h:14
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "時間を進みます"
 
-#: ui/evolution-calendar.xml.h:15
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "移動"
 
-#: ui/evolution-calendar.xml.h:16
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "指定日へ移動します"
 
-#: ui/evolution-calendar.xml.h:17
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "現在の時間へ移動します"
 
-#: ui/evolution-calendar.xml.h:18
+#: po/tmp/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "月"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "New Ca_lendar"
-msgstr "新規カレンダ(_l)"
-
-#: ui/evolution-calendar.xml.h:21 ui/evolution-event-editor.xml.h:75
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "次"
 
-#: ui/evolution-calendar.xml.h:22
+#: po/tmp/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "カレンダを開きます"
 
-#: ui/evolution-calendar.xml.h:23
+#: po/tmp/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "前"
 
-#: ui/evolution-calendar.xml.h:25
+#: po/tmp/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "このカレンダを印刷します"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Save calendar As something else"
-msgstr "カレンダを別名で保存します"
+#: po/tmp/evolution-calendar.xml.h:25
+msgid "Save calendar as something else"
+msgstr "別のカレンダを保存"
 
-#: ui/evolution-calendar.xml.h:27
+#: po/tmp/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "1 日分を表示します"
 
-#: ui/evolution-calendar.xml.h:28
+#: po/tmp/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "1 ヵ月分を表示します"
 
-#: ui/evolution-calendar.xml.h:29
+#: po/tmp/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "1 週間分を表示します"
 
-#: ui/evolution-calendar.xml.h:30
+#: po/tmp/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "仕事中の週を表示します"
 
-#: ui/evolution-calendar.xml.h:31 widgets/misc/e-dateedit.c:365
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
 msgid "Today"
 msgstr "今日"
 
-#: ui/evolution-calendar.xml.h:32
+#: po/tmp/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "週"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution.xml.h:33
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
 msgid "_New"
 msgstr "新規(_N)"
 
-#: ui/evolution-calendar.xml.h:34
-msgid "_New appointment..."
-msgstr "新規予約(_N)..."
-
-#: ui/evolution-calendar.xml.h:35
-msgid "_Open"
-msgstr "開く(_O)"
-
-#: ui/evolution-calendar.xml.h:36
+#: po/tmp/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "カレンダを開く(_O)"
 
-#: ui/evolution-calendar.xml.h:37
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "このカレンダを印刷(_P)"
 
-#: ui/evolution-calendar.xml.h:38
+#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Save Calendar As"
 msgstr "カレンダを別名で保存(_S)"
 
-#: ui/evolution-contact-editor.xml.h:8
+#: po/tmp/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "このアイテムを削除します"
 
-#: ui/evolution-contact-editor.xml.h:9
+#: po/tmp/evolution-contact-editor.xml.h:8
 msgid "Delete..."
 msgstr "削除..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: po/tmp/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ui/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-contact-editor.xml.h:10
 msgid "Print En_velope..."
 msgstr "エンベロープを印刷(_v)..."
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
+#: po/tmp/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:81
 msgid "Print this item"
 msgstr "このアイテムを印刷します"
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:83
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:82
 msgid "Print..."
 msgstr "印刷..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
+#: po/tmp/evolution-contact-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:89
+#: po/tmp/evolution-message-composer.xml.h:19
 msgid "Save _As..."
 msgstr "別名で保存(_A)..."
 
-#: ui/evolution-contact-editor.xml.h:15 ui/evolution-event-editor.xml.h:91
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
 msgid "Save and Close"
 msgstr "保存と閉じる"
 
-#: ui/evolution-contact-editor.xml.h:16
+#: po/tmp/evolution-contact-editor.xml.h:15
 msgid "Save the contact and close the dialog box"
 msgstr "コンタクトを保存してダイアログボックスを閉じます"
 
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:99
+#: po/tmp/evolution-contact-editor.xml.h:16
+msgid "Se_nd contact to other..."
+msgstr ""
+
+#: po/tmp/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:98
 msgid "See online help"
 msgstr "オンラインヘルプを参照"
 
-#: ui/evolution-contact-editor.xml.h:18 ui/evolution-event-editor.xml.h:111
-#: ui/evolution-subscribe.xml.h:17 ui/evolution.xml.h:27
+#: po/tmp/evolution-contact-editor.xml.h:18
+#, fuzzy
+msgid "Send _message to contact..."
+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-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: ui/evolution-contact-editor.xml.h:19
+#: po/tmp/evolution-contact-editor.xml.h:20
 msgid "_Print..."
 msgstr "印刷(_P)..."
 
-#: ui/evolution-contact-editor.xml.h:20 ui/evolution-event-editor.xml.h:122
+#: po/tmp/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-message-composer.xml.h:44
 msgid "_Save"
 msgstr "保存(_S)"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-event-editor.xml.h:7
+#: po/tmp/evolution-event-editor.xml.h:6
 msgid "About this application"
 msgstr "このアプリケーションについて"
 
-#: ui/evolution-event-editor.xml.h:8
+#: po/tmp/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "情報..."
 
-#: ui/evolution-event-editor.xml.h:9
+#: po/tmp/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "動作(_n)"
 
-#: ui/evolution-event-editor.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "クリア(_l)"
 
-#: ui/evolution-event-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "切取り(_u)"
 
-#: ui/evolution-event-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "クリア"
 
-#: ui/evolution-event-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "選択を解除する"
 
-#: ui/evolution-event-editor.xml.h:15
+#: po/tmp/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "この予約を閉じる"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-mail.xml.h:9
+#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
 msgid "Copy"
 msgstr "コピー"
 
-#: ui/evolution-event-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "選択をコピーする"
 
-#: ui/evolution-event-editor.xml.h:18
+#: po/tmp/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "切取り"
 
-#: ui/evolution-event-editor.xml.h:19
+#: po/tmp/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "選択を切り取る"
 
-#: ui/evolution-event-editor.xml.h:22
+#: po/tmp/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr "XML をダンプ"
 
-#: ui/evolution-event-editor.xml.h:23
+#: po/tmp/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "UI XML の記述をダンプする"
 
-#: ui/evolution-event-editor.xml.h:24
+#: po/tmp/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: アドレス帳(_B)..."
 
-#: ui/evolution-event-editor.xml.h:25
+#: po/tmp/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: フォームを選択(_o)..."
 
-#: ui/evolution-event-editor.xml.h:26
+#: po/tmp/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: 名前をチェック(_k)"
 
-#: ui/evolution-event-editor.xml.h:27
+#: po/tmp/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: フォルダへコピー(_y)..."
 
-#: ui/evolution-event-editor.xml.h:28
+#: po/tmp/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: フォームのデザイン(_e)..."
 
-#: ui/evolution-event-editor.xml.h:29
+#: po/tmp/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: 印刷スタイルを定義(_S)"
 
-#: ui/evolution-event-editor.xml.h:30
+#: po/tmp/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: このフォームをデザイン(_g)"
 
-#: ui/evolution-event-editor.xml.h:31
+#: po/tmp/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: フォルダの最初のアイテム(_r)"
 
-#: ui/evolution-event-editor.xml.h:32
+#: po/tmp/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "FIXME: 転送(_w)"
 
-#: ui/evolution-event-editor.xml.h:33
+#: po/tmp/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: 仮想カレンダで転送(_C)"
 
-#: ui/evolution-event-editor.xml.h:34
+#: po/tmp/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "FIXME: ヘルプ"
 
-#: ui/evolution-event-editor.xml.h:35
+#: po/tmp/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: 未作業"
 
-#: ui/evolution-event-editor.xml.h:36
+#: po/tmp/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr "FIXME: ファイルを挿入"
 
-#: ui/evolution-event-editor.xml.h:37
+#: po/tmp/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "FIXME: アイテム(_e)..."
 
-#: ui/evolution-event-editor.xml.h:38
+#: po/tmp/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: 特別な貼付け(_S)..."
 
-#: ui/evolution-event-editor.xml.h:39
+#: po/tmp/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: 印刷プレビュー(_v)"
 
-#: ui/evolution-event-editor.xml.h:40
+#: po/tmp/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: 別名でフォームを発行(_b)..."
 
-#: ui/evolution-event-editor.xml.h:41
+#: po/tmp/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: フォームを発行(_F)..."
 
-#: ui/evolution-event-editor.xml.h:42
+#: po/tmp/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr "FIXME: 再発(_u)..."
 
-#: ui/evolution-event-editor.xml.h:43
+#: po/tmp/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "FIXME: 送信(_e)"
 
-#: ui/evolution-event-editor.xml.h:44
+#: po/tmp/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: 添付の保存(_h)..."
 
-#: ui/evolution-event-editor.xml.h:45
+#: po/tmp/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: スクリプトデバッガ"
 
-#: ui/evolution-event-editor.xml.h:46
+#: po/tmp/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: 作業要求(_R)"
 
-#: ui/evolution-event-editor.xml.h:47
+#: po/tmp/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "FIXME: コンタクト(_C)"
 
-#: ui/evolution-event-editor.xml.h:48
+#: po/tmp/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "FIXME: カスタマイズ(_C)..."
 
-#: ui/evolution-event-editor.xml.h:49
+#: po/tmp/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "FIXME: ファイル(_F)..."
 
-#: ui/evolution-event-editor.xml.h:50
+#: po/tmp/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "FIXME: フォント(_F)..."
 
-#: ui/evolution-event-editor.xml.h:51
+#: po/tmp/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr "FIXME: フォーマット(_F)"
 
-#: ui/evolution-event-editor.xml.h:52
+#: po/tmp/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: アイテム(_I)"
 
-#: ui/evolution-event-editor.xml.h:53
+#: po/tmp/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: 仕訳記入(_J)"
 
-#: ui/evolution-event-editor.xml.h:54
+#: po/tmp/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: フォルダの最後のアイテム(_L)"
 
-#: ui/evolution-event-editor.xml.h:55
+#: po/tmp/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: メッセージをメール(_M)"
 
-#: ui/evolution-event-editor.xml.h:56
+#: po/tmp/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: メモスタイル"
 
-#: ui/evolution-event-editor.xml.h:57
+#: po/tmp/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: フォルダへ移動(_M)..."
 
-#: ui/evolution-event-editor.xml.h:58
+#: po/tmp/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: 新規予約(_N)"
 
-#: ui/evolution-event-editor.xml.h:59
+#: po/tmp/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "FIXME: ノート(_N)"
 
-#: ui/evolution-event-editor.xml.h:60
+#: po/tmp/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "FIXME: オブジェクト(_O)..."
 
-#: ui/evolution-event-editor.xml.h:61
+#: po/tmp/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: 段落(_P)..."
 
-#: ui/evolution-event-editor.xml.h:62
+#: po/tmp/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: スペルチェック(_S)..."
 
-#: ui/evolution-event-editor.xml.h:63
+#: po/tmp/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: 標準(_S)"
 
-#: ui/evolution-event-editor.xml.h:64
+#: po/tmp/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "FIXME: 作業(_T)"
 
-#: ui/evolution-event-editor.xml.h:65
+#: po/tmp/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: 未読アイテム(_U)"
 
-#: ui/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:67
+#: po/tmp/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "フォーマット(_o)"
 
-#: ui/evolution-event-editor.xml.h:69
+#: po/tmp/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "もう一度探す"
 
-#: ui/evolution-event-editor.xml.h:70
+#: po/tmp/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "もう一度探す(_A)"
 
-#: ui/evolution-event-editor.xml.h:71
+#: po/tmp/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "次のアイテムへ移動します"
 
-#: ui/evolution-event-editor.xml.h:72
+#: po/tmp/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "前のアイテムへ移動します"
 
-#: ui/evolution-event-editor.xml.h:73
+#: po/tmp/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "ファイルのプロパティを編集します"
 
-#: ui/evolution-event-editor.xml.h:74
+#: po/tmp/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "次(_e)"
 
-#: ui/evolution-event-editor.xml.h:76
+#: po/tmp/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "貼付け"
 
-#: ui/evolution-event-editor.xml.h:77
+#: po/tmp/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "クリップボードから貼り付ける"
 
-#: ui/evolution-event-editor.xml.h:78
+#: po/tmp/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "前(_v)"
 
-#: ui/evolution-event-editor.xml.h:79
+#: po/tmp/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "前"
 
-#: ui/evolution-event-editor.xml.h:80
+#: po/tmp/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "印刷設定(_e)..."
 
-#: ui/evolution-event-editor.xml.h:81
+#: po/tmp/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "印刷設定"
 
-#: ui/evolution-event-editor.xml.h:84
+#: po/tmp/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "プロパティ"
 
-#: ui/evolution-event-editor.xml.h:85
+#: po/tmp/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "繰り返し"
 
-#: ui/evolution-event-editor.xml.h:86
+#: po/tmp/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "未完了動作を繰り返す"
 
-#: ui/evolution-event-editor.xml.h:87
+#: po/tmp/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "元に戻す"
 
-#: ui/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "文字を元に戻す"
 
-#: ui/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-event-editor.xml.h:91
 msgid "Save the appointment and close the dialog box"
 msgstr "添付を保存してダイアログボックスを閉じます"
 
-#: ui/evolution-event-editor.xml.h:93
+#: po/tmp/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-message-composer.xml.h:22
 msgid "Save the current file"
 msgstr "現在のファイルを保存"
 
-#: ui/evolution-event-editor.xml.h:94
+#: po/tmp/evolution-event-editor.xml.h:93
 msgid "Schedule Meeting"
 msgstr "ミーティングの予定"
 
-#: ui/evolution-event-editor.xml.h:95
+#: po/tmp/evolution-event-editor.xml.h:94
 msgid "Schedule _Meeting"
 msgstr "ミーティングの予定(_M)"
 
-#: ui/evolution-event-editor.xml.h:96
+#: po/tmp/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:97
+#: po/tmp/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "同じ文字で再度検索する"
 
-#: ui/evolution-event-editor.xml.h:98
+#: po/tmp/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "文字を検索"
 
-#: ui/evolution-event-editor.xml.h:100
+#: po/tmp/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "すべて選択"
 
-#: ui/evolution-event-editor.xml.h:101
+#: po/tmp/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "すべて選択"
 
-#: ui/evolution-event-editor.xml.h:102
+#: po/tmp/evolution-event-editor.xml.h:101
 msgid "Setup the page settings for your current printer"
 msgstr "現在のプリンタのためのページ設定をする"
 
-#: ui/evolution-event-editor.xml.h:103
+#: po/tmp/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "やり直し"
 
-#: ui/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "最後の動作をやり直す"
 
-#: ui/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-message-composer.xml.h:36
 msgid "_About..."
 msgstr "情報(_A)..."
 
-#: ui/evolution-event-editor.xml.h:106
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:37
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: ui/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "コピー(_C)"
 
-#: ui/evolution-event-editor.xml.h:108
+#: po/tmp/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-message-composer.xml.h:38
 msgid "_Debug"
 msgstr "デバッグ(_D)"
 
-#: ui/evolution-event-editor.xml.h:110 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:26
+#: po/tmp/evolution-event-editor.xml.h:109
+#: po/tmp/evolution-message-composer.xml.h:39
+#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ui/evolution-event-editor.xml.h:112
+#: po/tmp/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "検索(_F)..."
 
-#: ui/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "フォーム(_F)"
 
-#: ui/evolution-event-editor.xml.h:114 ui/evolution.xml.h:30
+#: po/tmp/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-message-composer.xml.h:41 po/tmp/evolution.xml.h:28
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ui/evolution-event-editor.xml.h:115
+#: po/tmp/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "挿入(_I)"
 
-#: ui/evolution-event-editor.xml.h:116
+#: po/tmp/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "オブジェクト(_O)"
 
-#: ui/evolution-event-editor.xml.h:117
+#: po/tmp/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "貼付け(_P)"
 
-#: ui/evolution-event-editor.xml.h:118
+#: po/tmp/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "印刷(_P)"
 
-#: ui/evolution-event-editor.xml.h:119
+#: po/tmp/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "プロパティ(P)..."
 
-#: ui/evolution-event-editor.xml.h:120
+#: po/tmp/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "繰り返し(_R)"
 
-#: ui/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "元に戻す(_R)..."
 
-#: ui/evolution-event-editor.xml.h:123
+#: po/tmp/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "ツールバー(_T)"
 
-#: ui/evolution-event-editor.xml.h:125
+#: po/tmp/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "やり直し(_U)"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-mail.xml.h:7
+#: po/tmp/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr "作成"
 
-#: ui/evolution-mail.xml.h:8
+#: po/tmp/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "新規メッセージを作成します"
 
-#: ui/evolution-mail.xml.h:10
+#: po/tmp/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "新規フォルダへメッセージをコピーします"
 
-#: ui/evolution-mail.xml.h:14 ui/evolution-subscribe.xml.h:9
+#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "フォルダ(_o)"
 
-#: ui/evolution-mail.xml.h:15
+#: po/tmp/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "送信者のフィルタ(_l)"
 
-#: ui/evolution-mail.xml.h:16
+#: po/tmp/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "受信者のフィルタ(_i)"
 
-#: ui/evolution-mail.xml.h:17
+#: po/tmp/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "パスワード紛失(_P)"
 
-#: ui/evolution-mail.xml.h:20
+#: po/tmp/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "メールの取得"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Mail _Filters..."
-msgstr "メールフィルタ(_F) ..."
+#: po/tmp/evolution-mail.xml.h:21
+msgid "Mail _Filters"
+msgstr "メールフィルタ(_F)"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Manage Subscriptions..."
-msgstr "予約管理..."
+#: po/tmp/evolution-mail.xml.h:22
+msgid "Manage Subscriptions"
+msgstr "購読管理"
 
-#: ui/evolution-mail.xml.h:23
+#: po/tmp/evolution-mail.xml.h:23
 msgid "Mar_k As Read"
 msgstr "既読としてマーク(_k)"
 
-#: ui/evolution-mail.xml.h:24
+#: po/tmp/evolution-mail.xml.h:24
 msgid "Mark As U_nread"
 msgstr "未読としてマーク(_n)"
 
-#: ui/evolution-mail.xml.h:25
+#: po/tmp/evolution-mail.xml.h:25
 msgid "Move"
 msgstr "移動"
 
-#: ui/evolution-mail.xml.h:26
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Move message to a new folder"
 msgstr "新規フォルダへメッセージを移動します"
 
-#: ui/evolution-mail.xml.h:27
+#: po/tmp/evolution-mail.xml.h:27
 msgid "Previews the message to be printed"
 msgstr "印刷するメッセージを表示します"
 
-#: ui/evolution-mail.xml.h:29
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Print Preview of message..."
 msgstr "メッセージの印刷プレビュー..."
 
-#: ui/evolution-mail.xml.h:30
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Print message to the printer"
 msgstr "プリンタへメッセージを印刷します"
 
-#: ui/evolution-mail.xml.h:31
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Print message..."
 msgstr "メッセージを印刷..."
 
-#: ui/evolution-mail.xml.h:35
+#: po/tmp/evolution-mail.xml.h:35
 msgid "Reply to _All"
 msgstr "全員へ返信(_A)"
 
-#: ui/evolution-mail.xml.h:36
+#: po/tmp/evolution-mail.xml.h:36
 msgid "Reply to _Sender"
 msgstr "送信者へ返信(_S)"
 
-#: ui/evolution-mail.xml.h:39 ui/evolution-subscribe.xml.h:13
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "すべて選択(_A)"
 
-#: ui/evolution-mail.xml.h:40
+#: po/tmp/evolution-mail.xml.h:40
 msgid "Send queued mail and retrieve new mail"
 msgstr "キューに入れられたメールを送信して新しいメールを取得します"
 
-#: ui/evolution-mail.xml.h:41
+#: po/tmp/evolution-mail.xml.h:41
 msgid "Threaded Message list"
 msgstr "メッセージリストをスレッドで表示します"
 
-#: ui/evolution-mail.xml.h:42
+#: po/tmp/evolution-mail.xml.h:42
 msgid "VFolder on Se_nder"
 msgstr "送信者の仮想フォルダ(_n)"
 
-#: ui/evolution-mail.xml.h:43
+#: po/tmp/evolution-mail.xml.h:43
 msgid "VFolder on _Recipients"
 msgstr "受信者の仮想フォルダ(_R)"
 
-#: ui/evolution-mail.xml.h:44
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:45
 msgid "_Apply Filters"
 msgstr "フィルタを適用(_A)"
 
-#: ui/evolution-mail.xml.h:45
+#: po/tmp/evolution-mail.xml.h:46
 msgid "_Configure Folder"
 msgstr "フォルダ構成(_C)"
 
-#: ui/evolution-mail.xml.h:46
+#: po/tmp/evolution-mail.xml.h:47
 msgid "_Copy to Folder..."
 msgstr "フォルダへコピー(_C)..."
 
-#: ui/evolution-mail.xml.h:48
+#: po/tmp/evolution-mail.xml.h:49
 msgid "_Edit Message"
 msgstr "メッセージを編集(_E)"
 
-#: ui/evolution-mail.xml.h:49
+#: po/tmp/evolution-mail.xml.h:50
 msgid "_Expunge"
 msgstr "抹消(_E)"
 
-#: ui/evolution-mail.xml.h:50
+#: po/tmp/evolution-mail.xml.h:51
 msgid "_Filter on Subject"
 msgstr "表題のフィルタ(_F)"
 
-#: ui/evolution-mail.xml.h:51
+#: po/tmp/evolution-mail.xml.h:52
 msgid "_Forward"
 msgstr "転送(_F)"
 
-#: ui/evolution-mail.xml.h:52 ui/evolution-subscribe.xml.h:18
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "選択を反転(_I)"
 
-#: ui/evolution-mail.xml.h:53
-msgid "_Mail Configuration..."
-msgstr "メール設定(_M)..."
+#: po/tmp/evolution-mail.xml.h:54
+msgid "_Mail Configuration"
+msgstr "メール設定(_M)"
 
-#: ui/evolution-mail.xml.h:54
+#: po/tmp/evolution-mail.xml.h:55
 msgid "_Message"
 msgstr "メッセージ(_M)"
 
-#: ui/evolution-mail.xml.h:55
+#: po/tmp/evolution-mail.xml.h:56
 msgid "_Move to Folder..."
 msgstr "フォルダへ移動(_M)..."
 
-#: ui/evolution-mail.xml.h:56
+#: po/tmp/evolution-mail.xml.h:57
 msgid "_Open in New Window"
 msgstr "新規ウィンドウを開く(_O)"
 
-#: ui/evolution-mail.xml.h:57
+#: po/tmp/evolution-mail.xml.h:58
 msgid "_Print Message"
 msgstr "メッセージを印刷(_P)"
 
-#: ui/evolution-mail.xml.h:58
+#: po/tmp/evolution-mail.xml.h:59
+msgid "_Save Message As..."
+msgstr "メッセージを別名で保存(_S)..."
+
+#: po/tmp/evolution-mail.xml.h:60
+msgid "_Source"
+msgstr "ソース(_S)"
+
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Threaded"
 msgstr "スレッド(_T)"
 
-#: ui/evolution-mail.xml.h:59
+#: po/tmp/evolution-mail.xml.h:62
 msgid "_Undelete"
 msgstr "削除取消(_U)"
 
-#: ui/evolution-mail.xml.h:60
+#: po/tmp/evolution-mail.xml.h:63
 msgid "_VFolder on Subject"
 msgstr "表題の仮想フォルダ(_V)"
 
-#: ui/evolution-mail.xml.h:61
-msgid "_Virtual Folder Editor..."
-msgstr "仮想フォルダエディタ(_V)..."
+#: po/tmp/evolution-mail.xml.h:64
+msgid "_Virtual Folder Editor"
+msgstr "仮想フォルダエディタ(_V)"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-subscribe.xml.h:7
+#: po/tmp/evolution-message-composer.xml.h:6
+msgid "Attach"
+msgstr "貼附"
+
+#: po/tmp/evolution-message-composer.xml.h:8
+msgid "Bold"
+msgstr "太字"
+
+#: po/tmp/evolution-message-composer.xml.h:10
+msgid "Close the current file"
+msgstr "現在のファイルを閉じる"
+
+#: po/tmp/evolution-message-composer.xml.h:12
+msgid "HTML"
+msgstr "HTML"
+
+#: po/tmp/evolution-message-composer.xml.h:13
+msgid "Insert a file as text into the message"
+msgstr "メッセージへテキストファイルを挿入"
+
+#: po/tmp/evolution-message-composer.xml.h:14
+msgid "Insert text file..."
+msgstr "テキストファイルを挿入..."
+
+#: po/tmp/evolution-message-composer.xml.h:16
+msgid "Open a file"
+msgstr "ファイルを開く"
+
+#: po/tmp/evolution-message-composer.xml.h:18
+msgid "Save As"
+msgstr "別名で保存"
+
+#: po/tmp/evolution-message-composer.xml.h:20
+msgid "Save in _folder... (FIXME)"
+msgstr "フォルダへ保存(_f)... (FIXME)"
+
+#: po/tmp/evolution-message-composer.xml.h:21
+msgid "Save in folder..."
+msgstr "フォルダへ保存..."
+
+#: po/tmp/evolution-message-composer.xml.h:23
+msgid "Save the current file with a different name"
+msgstr "別名で現在のファイルを保存"
+
+#: po/tmp/evolution-message-composer.xml.h:24
+msgid "Save the message in a specified folder"
+msgstr "指定のフォルダへメッセージを保存"
+
+#: po/tmp/evolution-message-composer.xml.h:25
+msgid "Send"
+msgstr "送信"
+
+#: po/tmp/evolution-message-composer.xml.h:26
+msgid "Send _Later"
+msgstr "後で送信(_L)"
+
+#: po/tmp/evolution-message-composer.xml.h:27
+msgid "Send _later"
+msgstr "後で送信(_l)"
+
+#: po/tmp/evolution-message-composer.xml.h:28
+msgid "Send the mail in HTML format"
+msgstr "HTML 形式でメールを送信"
+
+#: po/tmp/evolution-message-composer.xml.h:29
+msgid "Send the message later"
+msgstr "メッセージを後で送信します"
+
+#: po/tmp/evolution-message-composer.xml.h:30
+msgid "Send the message now"
+msgstr "メッセージを今送信します"
+
+#: po/tmp/evolution-message-composer.xml.h:31
+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
+msgid "Show / hide attachments"
+msgstr "添付の表示 / 非表示"
+
+#: po/tmp/evolution-message-composer.xml.h:34
+msgid "Show _attachments"
+msgstr "添付を表示(_a)"
+
+#: po/tmp/evolution-message-composer.xml.h:35
+msgid "Show attachments"
+msgstr "添付を表示"
+
+#: po/tmp/evolution-message-composer.xml.h:42
+msgid "_Insert text file... (FIXME)"
+msgstr "テキストファイルを挿入... (FIXME)"
+
+#: po/tmp/evolution-message-composer.xml.h:43
+msgid "_Open..."
+msgstr "開く(_O)..."
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:10
+#: po/tmp/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "リストを更新"
 
-#: ui/evolution-subscribe.xml.h:11
+#: po/tmp/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "フォルダリストを更新します"
 
-#: ui/evolution-subscribe.xml.h:12
+#: po/tmp/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:14
+#: po/tmp/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "購読"
 
-#: ui/evolution-subscribe.xml.h:15
+#: po/tmp/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "購読解除"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.xml.h:7
-msgid "Create a new folder"
-msgstr "新規フォルダを作成します"
-
-#: ui/evolution.xml.h:8
+#: po/tmp/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr "別のフォルダを表示します"
 
-#: ui/evolution.xml.h:9
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr "終了(_x)"
 
-#: ui/evolution.xml.h:10
+#: po/tmp/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Evolution バーショートカット(_s)"
 
-#: ui/evolution.xml.h:11
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "プログラムを終了します"
 
-#: ui/evolution.xml.h:12
+#: po/tmp/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "始め(_S)"
 
-#: ui/evolution.xml.h:13
+#: po/tmp/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Evolution についての情報を表示します"
 
-#: ui/evolution.xml.h:14
+#: po/tmp/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "フォルダバーを表示(_F)"
 
-#: ui/evolution.xml.h:15
+#: po/tmp/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "ショートカットバーを表示(_S)"
 
-#: ui/evolution.xml.h:16
-msgid "Submit bug report using Bug Buddy"
+#: po/tmp/evolution.xml.h:14
+msgid "Submit _Bug Report"
+msgstr "不具合報告提出(_B)"
+
+#: po/tmp/evolution.xml.h:15
+msgid "Submit bug report using Bug Buddy."
 msgstr "Bug Buddy 使って不具合報告を提出します"
 
-#: ui/evolution.xml.h:17
+#: po/tmp/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "フォルダバーの表示を切替えます"
 
-#: ui/evolution.xml.h:18
+#: po/tmp/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "ショートカットバーの表示を切替えます"
 
-#: ui/evolution.xml.h:19
+#: po/tmp/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "コンタクトマネージャの使い方(_o)"
 
-#: ui/evolution.xml.h:20
+#: po/tmp/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "カレンダの使い方(_C)"
 
-#: ui/evolution.xml.h:21
+#: po/tmp/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "メーラの使い方(_M)"
 
-#: ui/evolution.xml.h:22
+#: po/tmp/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "Evolution について(_A)..."
 
-#: ui/evolution.xml.h:23
+#: po/tmp/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "約束(_A) (FIXME)"
 
-#: ui/evolution.xml.h:24
+#: po/tmp/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "コンタクト(_C) (FIXME)"
 
-#: ui/evolution.xml.h:25
-msgid "_Create New Folder..."
-msgstr "新規フォルダの作成(_C)..."
-
-#: ui/evolution.xml.h:28
+#: po/tmp/evolution.xml.h:26
 msgid "_Folder"
 msgstr "フォルダ(_F)"
 
-#: ui/evolution.xml.h:29
+#: po/tmp/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "フォルダへ移動(_G)..."
 
-#: ui/evolution.xml.h:31
+#: po/tmp/evolution.xml.h:29
 msgid "_Index"
 msgstr "インデックス(_I)"
 
-#: ui/evolution.xml.h:32
+#: po/tmp/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "メールメッセージ(_M) (FIXME)"
 
-#: ui/evolution.xml.h:34
+#: po/tmp/evolution.xml.h:32
 msgid "_Settings"
 msgstr "設定(_S)"
 
-#: ui/evolution.xml.h:35
-msgid "_Submit Bug Report"
-msgstr "不具合報告提出(_S)"
-
-#: ui/evolution.xml.h:36
+#: po/tmp/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "作業(_T) (FIXME)"
 
@@ -6937,7 +6611,7 @@ 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:2468
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
 msgid "%A, %B %d, %Y"
 msgstr "%Y/%B/%d %A"
 
@@ -6950,25 +6624,198 @@ msgstr "%Y %B"
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-dateedit.c:408
+msgid "Now"
+msgstr "今"
+
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:234 widgets/misc/e-dateedit.c:673
-#: widgets/misc/e-dateedit.c:766 widgets/misc/e-dateedit.c:811
-#: widgets/misc/e-dateedit.c:1127
+#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
+#: widgets/misc/e-dateedit.c:1487
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:237 widgets/misc/e-dateedit.c:676
-#: widgets/misc/e-dateedit.c:769 widgets/misc/e-dateedit.c:814
-#: widgets/misc/e-dateedit.c:1130
+#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
+#: widgets/misc/e-dateedit.c:1490
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
-#: widgets/misc/e-dateedit.c:359
-msgid "Now"
-msgstr "今"
-
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 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 "ローカルフォルダはネストすることが出来ません"
+
+#: 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/local/camel-local-store.c:297
+#, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "フォルダからサマリーファイル `%s' を削除することが出来ませんでした: %s"
+
+#: camel/providers/local/camel-local-store.c:306
+#, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr ""
+"フォルダからインデックスファイル `%s' を削除することが出来ませんでした: %s"
+
+#: 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-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:128
+#, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' は maildir 形式のディレクトリではありません"
+
+#: 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-summary.c:234
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr "フォルダを開けませんでした: メッセージリストは未完成です"
+
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr ""
+
+#: 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: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/local/camel-mbox-summary.c:579
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "作業 mailbox へ書き出し中にエラー: %s: %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"