svn path=/trunk/; revision=25337

2004-04-06 Updated ja.po. T.Aihana <aihana@gnome.gr.jp>

svn path=/trunk/; revision=25337

2 files changed, 396 insertions, 673 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index bb2011e184..0fa118d253 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-06  Takeshi AIHANA <aihana@gnome.gr.jp>
+
+	* ja.po: Updated Japanese translation.
+
 2004-04-05  Iñaki Larrañaga  <dooteo@euskalgnu.org>
 
 	* eu.po: Update Basque translation.
diff --git a/po/ja.po b/po/ja.po
index 57fa9faf33..6278f8566f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,55 +8,48 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
-"POT-Creation-Date: 2004-04-02 11:14-0500\n"
-"PO-Revision-Date: 2004-03-23 11:36+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-07 00:23+0900\n"
+"PO-Revision-Date: 2004-04-07 00:22+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
 #: a11y/addressbook/ea-addressbook-view.c:103
 #: a11y/addressbook/ea-minicard-view.c:119
-#, fuzzy
 msgid "evolution addressbook"
-msgstr "Evolution アドレス帳"
+msgstr "evolution アドレス帳"
 
 #: a11y/addressbook/ea-minicard-view.c:101
-#, fuzzy
 msgid "current addressbook folder "
-msgstr "ローカルのアドレス帳フォルダの一覧"
+msgstr "現在のアドレス帳フォルダには"
 
 #: a11y/addressbook/ea-minicard-view.c:102
-#, fuzzy
 msgid "have "
-msgstr "別名で保存"
+msgstr "いくつかの"
 
 #: a11y/addressbook/ea-minicard-view.c:102
 msgid "has "
-msgstr ""
+msgstr "一つの"
 
 #: a11y/addressbook/ea-minicard-view.c:104
-#, fuzzy
 msgid " cards"
-msgstr "カード"
+msgstr "カードがあります"
 
 #: a11y/addressbook/ea-minicard-view.c:104
-#, fuzzy
 msgid " card"
-msgstr "カード"
+msgstr "カードがあります"
 
 #: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
 msgid "contact's header: "
-msgstr "連絡先: "
+msgstr "連絡先のヘッダ: "
 
 #: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
 msgid "evolution minicard"
-msgstr "Evolution アラーム"
+msgstr "evolution ミニカード"
 
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
@@ -88,6 +81,7 @@ msgstr "ここで自動補完を設定します"
 #. can not get name, should be a bug of e-book.Anyway, should set a default name.
 #.
 #. name = e_book_get_name (book);
+#. Create the contacts group
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:363
@@ -181,19 +175,16 @@ msgid "Create a new contact list"
 msgstr "新しい連絡先一覧を作成します"
 
 #: addressbook/gui/component/addressbook-component.c:565
-#, fuzzy
 msgid "New Addressbook Book"
 msgstr "新しいアドレス帳"
 
 #: addressbook/gui/component/addressbook-component.c:566
-#, fuzzy
 msgid "_Address Book"
-msgstr "アドレス帳"
+msgstr "アドレス帳(_A)"
 
 #: addressbook/gui/component/addressbook-component.c:567
-#, fuzzy
 msgid "Create a new address book"
-msgstr "新しいタスクを作成します"
+msgstr "新しいアドレス帳を作成します"
 
 #: addressbook/gui/component/addressbook-config.c:407
 msgid "Failed to connect to LDAP server"
@@ -247,6 +238,7 @@ msgid "Migrating `%s':"
 msgstr "'%s' の移行中:"
 
 #. create the local source group
+#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:409
 #: calendar/gui/migration.c:430 calendar/gui/migration.c:513
 #: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
@@ -255,6 +247,9 @@ msgid "On This Computer"
 msgstr "このコンピュータ"
 
 #. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person task list
+#. orange
 #: addressbook/gui/component/addressbook-migrate.c:417
 #: calendar/gui/migration.c:438 calendar/gui/migration.c:521
 #: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
@@ -1012,7 +1007,7 @@ msgstr "カテゴリ(_C)..."
 #: calendar/gui/dialogs/meeting-page.c:651
 #: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
 #: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
-#: mail/em-folder-tree.c:2515 mail/em-folder-view.c:765
+#: mail/em-folder-tree.c:2517 mail/em-folder-view.c:769
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -1084,7 +1079,7 @@ msgstr "住所"
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view-widget.c:121
 #: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard.c:173
 msgid "Editable"
@@ -2377,7 +2372,7 @@ msgstr "連絡先一覧エディタ"
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:215
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: addressbook/gui/widgets/e-minicard-view.c:460
 msgid "Book"
 msgstr "書籍"
@@ -2444,7 +2439,7 @@ msgid "No contacts"
 msgstr "連絡先なし"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "連絡先 %d個"
@@ -2453,7 +2448,7 @@ msgstr[1] "連絡先 %d個"
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
 #: addressbook/gui/widgets/e-addressbook-view.c:229
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: addressbook/gui/widgets/e-minicard-view.c:467
 msgid "Query"
 msgstr "問い合わせ"
@@ -2800,7 +2795,7 @@ msgstr "テキスト・モデル"
 msgid "Max field name length"
 msgstr "項目名の最大長"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: addressbook/gui/widgets/e-minicard-view-widget.c:128
 msgid "Column Width"
 msgstr "カラムの幅"
 
@@ -3108,11 +3103,11 @@ msgid "Merge E-Mail Address"
 msgstr "E-メール・アドレスの結合"
 
 #: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
+#, c-format
 msgid "and one other contact."
 msgid_plural "and %d other contacts."
-msgstr[0] "と他に 1 個の連絡先。"
-msgstr[1] "と他に 1 個の連絡先。"
+msgstr[0] "と他に %d 個の連絡先"
+msgstr[1] "と他に %d 個の連絡先"
 
 #: addressbook/gui/widgets/eab-vcard-control.c:223
 #: addressbook/gui/widgets/eab-vcard-control.c:273
@@ -3135,17 +3130,17 @@ msgstr "カード表示"
 msgid "GTK Tree View"
 msgstr "GTK+ ツリー表示"
 
-#: addressbook/gui/widgets/test-reflow.c:106
+#: addressbook/gui/widgets/test-reflow.c:119
 msgid "Reflow Test"
 msgstr "Reflow のテスト"
 
-#: addressbook/gui/widgets/test-reflow.c:107
+#: addressbook/gui/widgets/test-reflow.c:120
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:109
+#: addressbook/gui/widgets/test-reflow.c:122
 msgid "This should test the reflow canvas item"
 msgstr "キャンバスのアイテムを Reflow するどうかをテストします"
 
@@ -3573,24 +3568,24 @@ msgstr "アラーム停止時間 (分)"
 msgid "_Edit appointment"
 msgstr "予定の編集(_E)"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:906
+#: calendar/gui/alarm-notify/alarm-queue.c:872
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "開く"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:908
+#: calendar/gui/alarm-notify/alarm-queue.c:874
 msgid "Dismiss"
 msgstr "却下"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:910
+#: calendar/gui/alarm-notify/alarm-queue.c:876
 msgid "Dismiss All"
 msgstr "全て却下"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:975
+#: calendar/gui/alarm-notify/alarm-queue.c:941
 msgid "No description available."
 msgstr "無効な説明です。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:993
+#: calendar/gui/alarm-notify/alarm-queue.c:959
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3603,12 +3598,12 @@ msgstr ""
 "起動: %s\n"
 "終了: %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1089
-#: calendar/gui/alarm-notify/alarm-queue.c:1113
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+#: calendar/gui/alarm-notify/alarm-queue.c:1079
 msgid "Warning"
 msgstr "警告"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1093
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3620,7 +3615,7 @@ msgstr ""
 "の設定がされていました。その代わりに Evolution は\n"
 "通常のリマインダ・ダイアログを表示します。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1119
+#: calendar/gui/alarm-notify/alarm-queue.c:1085
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3637,7 +3632,7 @@ msgstr ""
 "\n"
 "本当に、このプログラムを起動してもよろしいですか？"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1133
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 msgid "Do not ask me about this program again."
 msgstr "このメッセージを二度と表示しない"
 
@@ -3801,7 +3796,7 @@ msgstr "コメントが次のものを含む"
 msgid "Location contains"
 msgstr "場所が次のものを含む"
 
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1059
+#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1005
 msgid "Unmatched"
 msgstr "一致しない"
 
@@ -3835,6 +3830,10 @@ msgstr "%Y年 %B %e日 %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1588 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
@@ -4595,7 +4594,7 @@ msgstr "%s  変更しました。この変更を無視してエディタを更�
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  何も変更していませんが、エディタを更新しますか？"
 
-#: calendar/gui/dialogs/comp-editor-page.c:440
+#: calendar/gui/dialogs/comp-editor-page.c:463
 #, c-format
 msgid "Validation error: %s"
 msgstr "整合性のエラー: %s"
@@ -4620,51 +4619,51 @@ msgstr " (期日 "
 msgid "Due "
 msgstr "期日 "
 
-#: calendar/gui/dialogs/comp-editor.c:402
+#: calendar/gui/dialogs/comp-editor.c:424
 msgid "Could not update object"
 msgstr "オブジェクトを更新できませんでした"
 
-#: calendar/gui/dialogs/comp-editor.c:877
-#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:899
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "Edit Appointment"
 msgstr "予定の編集"
 
-#: calendar/gui/dialogs/comp-editor.c:882
-#: calendar/gui/dialogs/comp-editor.c:919
+#: calendar/gui/dialogs/comp-editor.c:904
+#: calendar/gui/dialogs/comp-editor.c:941
 #, c-format
 msgid "Appointment - %s"
 msgstr "予定 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:885
-#: calendar/gui/dialogs/comp-editor.c:922
+#: calendar/gui/dialogs/comp-editor.c:907
+#: calendar/gui/dialogs/comp-editor.c:944
 #, c-format
 msgid "Task - %s"
 msgstr "タスク - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:888
-#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:910
+#: calendar/gui/dialogs/comp-editor.c:947
 #, c-format
 msgid "Journal entry - %s"
 msgstr "ジャーナル・エントリ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:899
-#: calendar/gui/dialogs/comp-editor.c:935
+#: calendar/gui/dialogs/comp-editor.c:921
+#: calendar/gui/dialogs/comp-editor.c:957
 msgid "No summary"
 msgstr "サマリ無し"
 
-#: calendar/gui/dialogs/comp-editor.c:1360
+#: calendar/gui/dialogs/comp-editor.c:1382
 #: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
-#: composer/e-msg-composer.c:1153
+#: composer/e-msg-composer.c:1154
 msgid "Save as..."
 msgstr "別名で保存..."
 
-#: calendar/gui/dialogs/comp-editor.c:1463
-#: calendar/gui/dialogs/comp-editor.c:1487
-#: calendar/gui/dialogs/comp-editor.c:1513
+#: calendar/gui/dialogs/comp-editor.c:1485
+#: calendar/gui/dialogs/comp-editor.c:1509
+#: calendar/gui/dialogs/comp-editor.c:1535
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "更新が届いたらこのアイテムに対する変更を破棄する"
 
-#: calendar/gui/dialogs/comp-editor.c:1552
+#: calendar/gui/dialogs/comp-editor.c:1574
 msgid "Unable to use current version!"
 msgstr "現在のバージョンを使用できません！"
 
@@ -4708,21 +4707,21 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "本当にタイトルなしの仕訳記入を削除してもよろしいですか？"
 
 #: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete %d appointment?"
 msgid_plural "Are you sure you want to delete %d appointments?"
 msgstr[0] "本当に %d 個の予定を削除してもよろしいですか？"
 msgstr[1] "本当に %d 個の予定を削除してもよろしいですか？"
 
 #: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete %d task?"
 msgid_plural "Are you sure you want to delete %d tasks?"
 msgstr[0] "本当に %d 個のタスクを削除してもよろしいですか？"
 msgstr[1] "本当に %d 個のタスクを削除してもよろしいですか？"
 
 #: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete %d journal entry?"
 msgid_plural "Are you sure you want to delete %d journal entries?"
 msgstr[0] "本当に %d 個の仕訳記入を削除してもよろしいですか？"
@@ -4812,31 +4811,31 @@ msgstr "スケジュール"
 msgid "Meeting"
 msgstr "会議"
 
-#: calendar/gui/dialogs/event-page.c:458
+#: calendar/gui/dialogs/event-page.c:460
 msgid "Event with no start date"
 msgstr "開始日のないイベント"
 
-#: calendar/gui/dialogs/event-page.c:461
+#: calendar/gui/dialogs/event-page.c:463
 msgid "Event with no end date"
 msgstr "終了日のないイベント"
 
-#: calendar/gui/dialogs/event-page.c:615 calendar/gui/dialogs/task-page.c:512
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
 msgid "Start date is wrong"
 msgstr "開始日が間違っています"
 
-#: calendar/gui/dialogs/event-page.c:625
+#: calendar/gui/dialogs/event-page.c:627
 msgid "End date is wrong"
 msgstr "終了日が間違っています"
 
-#: calendar/gui/dialogs/event-page.c:648
+#: calendar/gui/dialogs/event-page.c:650
 msgid "Start time is wrong"
 msgstr "開始時刻が間違っています"
 
-#: calendar/gui/dialogs/event-page.c:655
+#: calendar/gui/dialogs/event-page.c:657
 msgid "End time is wrong"
 msgstr "終了時刻が間違っています"
 
-#: calendar/gui/dialogs/event-page.c:1234
+#: calendar/gui/dialogs/event-page.c:1264
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "カレンダ '%s' を開けません。"
@@ -4908,10 +4907,15 @@ msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
 #. an empty string is the same as 'None'
+#. add a "None" option to the stores menu
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2131
-#: mail/em-account-prefs.c:453 mail/em-folder-view.c:774
+#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2132
+#: mail/em-account-prefs.c:453 mail/em-folder-view.c:778
 #: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
 #: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:193
@@ -5192,7 +5196,7 @@ msgstr ""
 "\n"
 "その変更を保存しますか？"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1570
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1571
 msgid "_Discard Changes"
 msgstr "変更の破棄(_D)"
 
@@ -5202,25 +5206,22 @@ msgstr "イベントの保存"
 
 #. create the dialog
 #: calendar/gui/dialogs/select-source-dialog.c:63
-#, fuzzy
 msgid "Select source"
-msgstr "インポーターの選択"
+msgstr "ソースの選択"
 
 #. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
 #: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
+#, c-format
 msgid "Select destination %s"
-msgstr "送信先を指定します"
+msgstr "送信する %s の選択"
 
 #: calendar/gui/dialogs/select-source-dialog.c:71
-#, fuzzy
 msgid "calendar"
 msgstr "カレンダ"
 
 #: calendar/gui/dialogs/select-source-dialog.c:71
-#, fuzzy
 msgid "task list"
-msgstr "新しいタスク一覧"
+msgstr "タスク一覧"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5238,7 +5239,7 @@ msgstr "タスク情報が生成されました。この情報を送信します
 msgid "The task information has changed. Send an updated version?"
 msgstr "タスク情報が変更されました。更新されたバージョンを送信しますか？"
 
-#: calendar/gui/dialogs/task-details-page.c:404
+#: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "完了日が間違っています"
 
@@ -5322,16 +5323,16 @@ msgstr "基本"
 msgid "Assignment"
 msgstr "割当て"
 
-#: calendar/gui/dialogs/task-page.c:485
+#: calendar/gui/dialogs/task-page.c:487
 msgid "Due date is wrong"
 msgstr "期日が間違っています"
 
-#: calendar/gui/dialogs/task-page.c:545 calendar/gui/e-cal-model-tasks.c:738
+#: calendar/gui/dialogs/task-page.c:547 calendar/gui/e-cal-model-tasks.c:738
 #: calendar/gui/e-cal-model-tasks.c:766
 msgid "Due date is before start date!"
 msgstr "期日が開始日の前にあります！"
 
-#: calendar/gui/dialogs/task-page.c:810
+#: calendar/gui/dialogs/task-page.c:840
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s' のタスクを開けません。"
@@ -5407,39 +5408,39 @@ msgid "Weekly"
 msgstr "毎週"
 
 #: calendar/gui/e-alarm-list.c:395
-#, fuzzy, c-format
+#, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "%d 日間"
+msgstr[0] "%d 日"
 msgstr[1] "%d 日間"
 
 #: calendar/gui/e-alarm-list.c:400
-#, fuzzy, c-format
+#, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d 週間"
 msgstr[1] "%d 週間"
 
 #: calendar/gui/e-alarm-list.c:405
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 時間"
 msgstr[1] "%d 時間"
 
 #: calendar/gui/e-alarm-list.c:410
-#, fuzzy, c-format
+#, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
-msgstr[1] "%d 分"
+msgstr[1] "%d 分間"
 
 #: calendar/gui/e-alarm-list.c:415
-#, fuzzy, c-format
+#, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
-msgstr[1] "%d 秒"
+msgstr[1] "%d 秒間"
 
 #: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
@@ -5501,9 +5502,8 @@ msgid "Confidential"
 msgstr "極秘"
 
 #: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
 msgid "End Date"
-msgstr "日付"
+msgstr "終了日"
 
 #: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Start Date"
@@ -5636,7 +5636,7 @@ msgstr "オブジェクトの更新"
 
 #: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1081
 #: calendar/gui/e-calendar-view.c:1261 calendar/gui/e-calendar-view.c:1328
-#: mail/em-folder-view.c:740 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:744 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "開く(_O)"
 
@@ -5646,7 +5646,7 @@ msgstr "ウェブ・ページを開く(_W)"
 
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1087
 #: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1334
-#: mail/em-folder-view.c:742 mail/em-popup.c:689 mail/em-popup.c:804
+#: mail/em-folder-view.c:746 mail/em-popup.c:689 mail/em-popup.c:804
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "別名で保存(_S)..."
@@ -5669,7 +5669,7 @@ msgstr "切り取り(_U)"
 
 #: calendar/gui/e-calendar-table.c:1048 calendar/gui/e-calendar-table.c:1074
 #: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1308
-#: mail/em-folder-tree.c:2508 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2510 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
@@ -5755,14 +5755,12 @@ msgid "New Task"
 msgstr "新しいタスク"
 
 #: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
-#, fuzzy
 msgid "Select _Today"
-msgstr "スレッドで選択(_T)"
+msgstr "今日にする(_T)"
 
 #: calendar/gui/e-calendar-view.c:1251
-#, fuzzy
 msgid "_Select Date..."
-msgstr "選択(_S)..."
+msgstr "日付の選択(_S)..."
 
 #: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
@@ -5805,12 +5803,20 @@ msgid "_Settings..."
 msgstr "設定(_S)..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5834,6 +5840,10 @@ msgstr "%02i 分分割"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
+#. strftime format %A = full weekday name, %d = day of
+#. month, %B = full month name. You can change the
+#. order but don't change the specifiers or add
+#. anything.
 #: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5841,6 +5851,9 @@ msgstr "%B%e日 %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
 #: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -5863,25 +5876,25 @@ msgid "Yes. (Complex Recurrence)"
 msgstr "はい (複合的な繰り返し)"
 
 #: calendar/gui/e-itip-control.c:602
-#, fuzzy, c-format
+#, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "毎日"
-msgstr[1] "毎日"
+msgstr[1] "%d 日間毎"
 
 #: calendar/gui/e-itip-control.c:607
-#, fuzzy, c-format
+#, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "毎週"
-msgstr[1] "毎週"
+msgstr[1] "%d 週間毎"
 
 #: calendar/gui/e-itip-control.c:609
-#, fuzzy, c-format
+#, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "次の毎週 "
-msgstr[1] "次の毎週 "
+msgstr[1] "次の %d 週間毎 "
 
 #: calendar/gui/e-itip-control.c:617
 msgid " and "
@@ -5898,21 +5911,21 @@ msgid "The %s %s of "
 msgstr "次の %s %s "
 
 #: calendar/gui/e-itip-control.c:644
-#, fuzzy, c-format
+#, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "毎月"
-msgstr[1] "毎月"
+msgstr[1] "%d ヶ月毎"
 
 #: calendar/gui/e-itip-control.c:648
-#, fuzzy, c-format
+#, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "毎年"
-msgstr[1] "毎年"
+msgstr[1] "%d 年毎"
 
 #: calendar/gui/e-itip-control.c:659
-#, fuzzy, c-format
+#, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " %d 回の合計"
@@ -6394,6 +6407,10 @@ msgstr "%Y年 %B %e日 %A"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel-item.c:456
 #: calendar/gui/e-meeting-time-sel.c:2093 e-util/e-time-utils.c:203
 #: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6402,6 +6419,10 @@ msgstr "%Y/%m/%d (%a)"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#. This is a strftime() format for a short date. %m = month,
+#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6485,7 +6506,7 @@ msgstr "優先度:"
 msgid "Web Page:"
 msgstr "ウェブ・ページ"
 
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2173
+#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2177
 #, c-format
 msgid "Click to open %s"
 msgstr "クリックすると %s を開きます"
@@ -6557,20 +6578,14 @@ msgid "Opening %s"
 msgstr "%s を開く"
 
 #: calendar/gui/gnome-cal.c:1928
-#, fuzzy, c-format
+#, c-format
 msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-"%s\n"
-"用のカレンダ・バックエンドが\n"
-"クラッシュしました。"
+msgstr "'%s' 用のカレンダ・バックエンドがクラッシュしました。"
 
 #: calendar/gui/gnome-cal.c:1940
-#, fuzzy, c-format
+#, c-format
 msgid "The task backend for '%s' has crashed."
-msgstr ""
-"%s\n"
-"用のタスク・バックエンドが\n"
-"クラッシュしました。"
+msgstr "'%s' 用のタスク・バックエンドがクラッシュしました。"
 
 #: calendar/gui/gnome-cal.c:2754
 msgid "Purging"
@@ -6621,18 +6636,16 @@ msgid "October"
 msgstr "10 月"
 
 #: calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
 msgid "Select Date"
-msgstr "全てのテキストを選択します"
+msgstr "日付の選択"
 
 #: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "9 月"
 
 #: calendar/gui/goto-dialog.glade.h:14
-#, fuzzy
 msgid "_Select Today"
-msgstr "フォルダの選択"
+msgstr "今日にする(_S)"
 
 #: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
@@ -8789,34 +8802,34 @@ msgstr "(match-all) は一つの論理結果を必要とします。"
 msgid "Performing query on unknown header: %s"
 msgstr "未知のヘッダでクエリを実行しています: %s"
 
-#: camel/camel-folder.c:586
+#: camel/camel-folder.c:626
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "サポートしていない操作: %s のメッセージの追加"
 
-#: camel/camel-folder.c:1177
+#: camel/camel-folder.c:1217
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "サポートしていない操作: 式 %s による検索"
 
-#: camel/camel-folder.c:1217
+#: camel/camel-folder.c:1257
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "サポートしていない操作: UID %s による検索"
 
-#: camel/camel-folder.c:1335
+#: camel/camel-folder.c:1374
 msgid "Moving messages"
 msgstr "メッセージの移動中"
 
-#: camel/camel-folder.c:1335
+#: camel/camel-folder.c:1374
 msgid "Copying messages"
 msgstr "メッセージのコピー中"
 
-#: camel/camel-folder.c:1589
+#: camel/camel-folder.c:1624
 msgid "Learning junk and/or non junk message(s)"
 msgstr "Junk と非 Junk またはそのどちらかのメッセージの学習中"
 
-#: camel/camel-folder.c:1618
+#: camel/camel-folder.c:1653
 msgid "Filtering new message(s)"
 msgstr "新しいメッセージのフィルタリング中"
 
@@ -9443,13 +9456,12 @@ msgstr "フォルダを作成できません: この格納場所で不正な操�
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "フォルダを削除できません: %s: 不正な操作です"
 
-#: camel/camel-store.c:793 mail/mail-ops.c:1079
+#: camel/camel-store.c:793
 msgid "Trash"
 msgstr "ゴミ箱"
 
 #: camel/camel-store.c:795 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 mail/mail-ops.c:1083
-#: ui/evolution-mail-message.xml.h:48
+#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Junk"
 
@@ -9666,31 +9678,31 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL '%s' を解析できませんでした"
 
-#: camel/camel-vee-folder.c:611
+#: camel/camel-vee-folder.c:618
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "'%s' の格納中にエラー: %s"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:658
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s に %s のようなメッセージはありません"
 
-#: camel/camel-vee-folder.c:815 camel/camel-vee-folder.c:821
+#: camel/camel-vee-folder.c:824 camel/camel-vee-folder.c:830
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "メッセージの仮想フォルダへのコピーまたは移動ができません"
 
-#: camel/camel-vee-store.c:368
+#: camel/camel-vee-store.c:377
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "フォルダを削除できません: %s: そのようなフォルダはありません"
 
-#: camel/camel-vee-store.c:381
+#: camel/camel-vee-store.c:390
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "フォルダ名を変更できません: %s: 不正な操作です"
 
-#: camel/camel-vee-store.c:389
+#: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "フォルダ名を変更できません: %s: そのようなフォルダはありません"
@@ -9723,13 +9735,12 @@ msgid "Automatically synchronize remote mail locally"
 msgstr "リモートとローカルのメールを自動的に同期する"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:66
-#, fuzzy
 msgid "Address Book And Calendar"
-msgstr "アドレス帳"
+msgstr "アドレス帳とカレンダ"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP Port:"
-msgstr ""
+msgstr "ポスト・オフィス・エージェントの SOAP ポート:"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:80
 msgid "Novell GroupWise"
@@ -9763,12 +9774,12 @@ msgstr "チェックリスト"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3024
+#: camel/providers/imap/camel-imap-store.c:3022
 msgid "Operation cancelled"
 msgstr "操作はキャンセルされました"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3027
+#: camel/providers/imap/camel-imap-store.c:3025
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "突然サーバが接続を切りました: %s"
@@ -9826,12 +9837,12 @@ msgstr "フォルダは破壊され再作成されました"
 msgid "Scanning for changed messages"
 msgstr "変更メッセージの解析中"
 
-#: camel/providers/imap/camel-imap-folder.c:1924
+#: camel/providers/imap/camel-imap-folder.c:1960
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "メッセージを取得できません: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2007
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9847,25 +9858,25 @@ msgstr ""
 "メッセージを取得できません: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1971
+#: camel/providers/imap/camel-imap-folder.c:2007
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "そのようなメッセージはありません"
 
-#: camel/providers/imap/camel-imap-folder.c:2005
-#: camel/providers/imap/camel-imap-folder.c:2601
+#: camel/providers/imap/camel-imap-folder.c:2041
+#: camel/providers/imap/camel-imap-folder.c:2643
 #: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "現在このメッセージは有効ではありません"
 
-#: camel/providers/imap/camel-imap-folder.c:2265
-#: camel/providers/imap/camel-imap-folder.c:2335
+#: camel/providers/imap/camel-imap-folder.c:2307
+#: camel/providers/imap/camel-imap-folder.c:2377
 msgid "Fetching summary information for new messages"
 msgstr "新規メッセージのサマリ情報の同期中"
 
-#: camel/providers/imap/camel-imap-folder.c:2639
+#: camel/providers/imap/camel-imap-folder.c:2681
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH 応答にメッセージ本体がありませんでした。"
 
@@ -10027,19 +10038,19 @@ msgstr ""
 "\n"
 
 #: camel/providers/imap/camel-imap-store.c:1790
-#: camel/providers/imap/camel-imap-store.c:1884
+#: camel/providers/imap/camel-imap-store.c:1883
 #, c-format
 msgid "No such folder %s"
 msgstr "そのようなフォルダ %s はありません"
 
 #: camel/providers/imap/camel-imap-store.c:1801
-#: camel/providers/imap/camel-imap-store.c:2090
+#: camel/providers/imap/camel-imap-store.c:2089
 #, c-format
 msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "フォルダ名 \"%s\" に文字 \"%c\"を含めることはできません"
 
-#: camel/providers/imap/camel-imap-store.c:1825
+#: camel/providers/imap/camel-imap-store.c:1824
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10047,12 +10058,12 @@ msgstr "フォルダ名 \"%s\" に文字 \"%c\"を含めることはできませ
 msgid "Cannot create folder `%s': folder exists."
 msgstr "フォルダ '%s' を作成できません: フォルダが存在します"
 
-#: camel/providers/imap/camel-imap-store.c:2102
+#: camel/providers/imap/camel-imap-store.c:2100
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "未知の親フォルダ: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2152
+#: camel/providers/imap/camel-imap-store.c:2150
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "親フォルダには複数のサブフォルダを含めることはできません"
 
@@ -10443,7 +10454,7 @@ msgstr "元のフォルダ %s を閉じることができませんでした: %s"
 msgid "Could not close temp folder: %s"
 msgstr "作業フォルダを閉じることができませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2470
+#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2472
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "フォルダ名を変更できませんでした: %s"
@@ -11013,13 +11024,12 @@ msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
-#, fuzzy
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "SMTP を使ってリモートのメールハブに接続することでメールを配信します\n"
+msgstr "SMTP を使ってリモートのメールハブに接続することでメールを配信します"
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
-msgstr "構文解析エラー, コマンドではありません"
+msgstr "構文解析エラー: コマンドではありません"
 
 #: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
@@ -11446,30 +11456,30 @@ msgstr ""
 "ファイル %s の読み込み中にエラー:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1168
+#: composer/e-msg-composer.c:1169
 msgid "File exists, overwrite?"
 msgstr "ファイルがあります。上書きしてもよろしいですか？"
 
-#: composer/e-msg-composer.c:1179 composer/e-msg-composer.c:1195
+#: composer/e-msg-composer.c:1180 composer/e-msg-composer.c:1196
 #, c-format
 msgid "Error saving file: %s"
 msgstr "ファイルの保存中にエラー: %s"
 
-#: composer/e-msg-composer.c:1219
+#: composer/e-msg-composer.c:1220
 #, c-format
 msgid "Error loading file: %s"
 msgstr "ファイルのロード中にエラー: %s"
 
-#: composer/e-msg-composer.c:1257
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "ファイルへアクセス中にエラー: %s"
 
-#: composer/e-msg-composer.c:1265
+#: composer/e-msg-composer.c:1266
 msgid "Unable to retrieve message from editor"
 msgstr "エディタからメッセージを取得できません"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11478,7 +11488,7 @@ msgstr ""
 "ファイル上で読み込み位置へ移動できません: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1279
+#: composer/e-msg-composer.c:1280
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11487,7 +11497,7 @@ msgstr ""
 "ファイルの切り詰めができません: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1288
+#: composer/e-msg-composer.c:1289
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11496,7 +11506,7 @@ msgstr ""
 "ファイル・デスクリプタをコピーできません: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1297
+#: composer/e-msg-composer.c:1298
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11505,7 +11515,7 @@ msgstr ""
 "メッセージの自動保存でエラー: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1401
+#: composer/e-msg-composer.c:1402
 msgid ""
 "Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
@@ -11514,7 +11524,7 @@ msgstr ""
 "た。\n"
 "それらのメッセージを復旧してみますか？"
 
-#: composer/e-msg-composer.c:1565
+#: composer/e-msg-composer.c:1566
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11525,48 +11535,48 @@ msgstr ""
 "\n"
 "この変更を保存しますか？"
 
-#: composer/e-msg-composer.c:1567
+#: composer/e-msg-composer.c:1568
 msgid "Untitled Message"
 msgstr "タイトルなしのメッセージ"
 
-#: composer/e-msg-composer.c:1574
+#: composer/e-msg-composer.c:1575
 msgid "Warning: Modified Message"
 msgstr "警告: 変更済みのメッセージ"
 
-#: composer/e-msg-composer.c:1607
+#: composer/e-msg-composer.c:1608
 msgid "Open file"
 msgstr "ファイルを開く"
 
-#: composer/e-msg-composer.c:2014 mail/mail-account-gui.c:1287
+#: composer/e-msg-composer.c:2015 mail/mail-account-gui.c:1287
 msgid "Autogenerated"
 msgstr "自動生成"
 
-#: composer/e-msg-composer.c:2084
+#: composer/e-msg-composer.c:2085
 msgid "Signature:"
 msgstr "署名:"
 
-#: composer/e-msg-composer.c:2316
+#: composer/e-msg-composer.c:2317
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] "添付ファイルが <b>%d</b> 個あります"
 msgstr[1] "添付ファイルが <b>%d</b> 個あります"
 
-#: composer/e-msg-composer.c:2345
+#: composer/e-msg-composer.c:2346
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "添付ファイル・バーを隠す (ここに添付ファイルをドロップして下さい)(_A)"
 
-#: composer/e-msg-composer.c:2348 composer/e-msg-composer.c:3240
+#: composer/e-msg-composer.c:2349 composer/e-msg-composer.c:3241
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 "添付ファイル・バーを表示する (ここに添付ファイルをドロップして下さい)(_A)"
 
-#: composer/e-msg-composer.c:2365 composer/e-msg-composer.c:3122
-#: composer/e-msg-composer.c:3123
+#: composer/e-msg-composer.c:2366 composer/e-msg-composer.c:3123
+#: composer/e-msg-composer.c:3124
 msgid "Compose a message"
 msgstr "メッセージの作成"
 
-#: composer/e-msg-composer.c:3152
+#: composer/e-msg-composer.c:3153
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11574,7 +11584,7 @@ msgstr ""
 "コンポーザ・ウィンドウを生成できませんでした:\n"
 "アドレス選択コントロールを開けません。"
 
-#: composer/e-msg-composer.c:3181
+#: composer/e-msg-composer.c:3182
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11586,7 +11596,7 @@ msgstr ""
 "正しいバージョンの gtkhtml と libgtkhml が\n"
 "インストールされているか確認して下さい。\n"
 
-#: composer/e-msg-composer.c:3285
+#: composer/e-msg-composer.c:3286
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11594,7 +11604,7 @@ msgstr ""
 "コンポーザ・ウィンドウを作成できませんでした:\n"
 "HTML エディタ・コンポーネントを開けません。"
 
-#: composer/e-msg-composer.c:4290
+#: composer/e-msg-composer.c:4291
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11603,7 +11613,7 @@ msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
-msgstr "Ximian Evolution グループウェア・スイート"
+msgstr "Ximian Evolution グループウェア・スイートです"
 
 #: data/evolution.desktop.in.in.h:2
 msgid "Ximian Evolution (Unstable)"
@@ -11749,12 +11759,16 @@ msgstr "カテゴリの同期:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%Y/%m/%d (%a) %H:%M"
@@ -11806,23 +11820,31 @@ msgid "%m/%d/%Y %H"
 msgstr "%Y/%m/%d %H時"
 
 #. strptime format for a time of day, in 12-hour format.
+#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%p %I時%M分%S秒"
 
 #. strptime format for a time of day, in 24-hour format.
+#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H時%M分%S秒"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%p %I時%M分"
 
 #. strptime format for time of day, without seconds 24-hour format.
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -11904,9 +11926,8 @@ msgid "Select a time to compare against"
 msgstr "比較するもう一つの時間の選択"
 
 #: filter/filter-editor.c:147
-#, fuzzy
 msgid "_Filter Rules"
-msgstr "<b>フィルタのルール(_F)</b>"
+msgstr "フィルタのルール(_F)"
 
 #: filter/filter-file.c:166
 msgid "You must specify a file name."
@@ -12222,7 +12243,7 @@ msgstr "にフラグがない"
 msgid "Junk Test"
 msgstr "ジャンクのテスト"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:773
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:777
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "ラベル"
@@ -12252,9 +12273,8 @@ msgid "Move to Folder"
 msgstr "フォルダへ移動"
 
 #: filter/libfilter-i18n.h:44
-#, fuzzy
 msgid "Pipe to Program"
-msgstr "プログラムを終了します"
+msgstr "プログラムへ引き渡す"
 
 #: filter/libfilter-i18n.h:45
 msgid "Play Sound"
@@ -12289,9 +12309,8 @@ msgid "returns less than"
 msgstr "次のものより小さいものを返す"
 
 #: filter/libfilter-i18n.h:53
-#, fuzzy
 msgid "Run Program"
-msgstr "プログラム実行:"
+msgstr "プログラム実行"
 
 #: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
@@ -12360,9 +12379,8 @@ msgid "Rule name"
 msgstr "ルール名"
 
 #: filter/score-editor.c:110
-#, fuzzy
 msgid "_Score Rules"
-msgstr "ルールのスコア"
+msgstr "ルールのスコア(_S)"
 
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
@@ -12397,9 +12415,8 @@ msgid "Subject does not contain"
 msgstr "件名が次のものを含まない"
 
 #: filter/vfolder-editor.c:108
-#, fuzzy
 msgid "Virtual _Folders"
-msgstr "<b>仮想フォルダ(_F)</b>"
+msgstr "仮想フォルダ(_F)"
 
 #: filter/vfolder-rule.c:215
 msgid "You must name this vfolder."
@@ -12507,9 +12524,8 @@ msgid "Language(s)"
 msgstr "言語"
 
 #: mail/em-composer-prefs.c:1000
-#, fuzzy
 msgid "Add signature script"
-msgstr "署名の追加(_A)"
+msgstr "署名スクリプトの追加"
 
 #: mail/em-composer-prefs.c:1020
 msgid "Signature(s)"
@@ -12602,7 +12618,7 @@ msgstr "<ここをクリックしてフォルダを選択して下さい>"
 msgid "Create New Folder"
 msgstr "新規フォルダの作成"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2230
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2232
 #: mail/mail-component.c:638
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
@@ -12627,7 +12643,7 @@ msgstr "一致しないもの"
 msgid "Inbox"
 msgstr "受信箱"
 
-#: mail/em-folder-tree-model.c:483 mail/em-folder-tree-model.c:792
+#: mail/em-folder-tree-model.c:493 mail/em-folder-tree-model.c:802
 msgid "Loading..."
 msgstr "読み込み中..."
 
@@ -12655,244 +12671,244 @@ msgstr "フォルダ %s へメッセージのコピー中"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "メッセージをトップレベルの中に移せません"
 
-#: mail/em-folder-tree.c:1950
+#: mail/em-folder-tree.c:1952
 #, c-format
 msgid "Cannot move folder `%s': illegal operation"
 msgstr "フォルダ '%s' を移動できません: 不正な操作です"
 
-#: mail/em-folder-tree.c:1979 mail/em-folder-tree.c:2156
+#: mail/em-folder-tree.c:1981 mail/em-folder-tree.c:2158
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: mail/em-folder-tree.c:1995 mail/em-folder-tree.c:2008
-#: mail/em-folder-view.c:642 mail/em-folder-view.c:656
+#: mail/em-folder-tree.c:1997 mail/em-folder-tree.c:2010
+#: mail/em-folder-view.c:646 mail/em-folder-view.c:660
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "フォルダの選択"
 
-#: mail/em-folder-tree.c:2035
+#: mail/em-folder-tree.c:2037
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "フォルダ '%s' の作成中"
 
-#: mail/em-folder-tree.c:2230 mail/mail-component.c:638
+#: mail/em-folder-tree.c:2232 mail/mail-component.c:638
 msgid "Create folder"
 msgstr "フォルダの作成"
 
-#: mail/em-folder-tree.c:2347
+#: mail/em-folder-tree.c:2349
 #, c-format
 msgid "Could not delete folder: %s"
 msgstr "フォルダを削除できませんでした: %s"
 
-#: mail/em-folder-tree.c:2372
+#: mail/em-folder-tree.c:2374
 #, c-format
 msgid "Cannot delete local %s folder."
 msgstr "ローカルのフォルダ '%s' を削除できません"
 
-#: mail/em-folder-tree.c:2378
+#: mail/em-folder-tree.c:2380
 #, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "本当にフォルダ \"%s\" とそのサブフォルダの全てを削除しますか？"
 
-#: mail/em-folder-tree.c:2388
+#: mail/em-folder-tree.c:2390
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\" の削除"
 
-#: mail/em-folder-tree.c:2422
+#: mail/em-folder-tree.c:2424
 #, c-format
 msgid "Cannot rename local %s folder."
 msgstr "ローカルのフォルダ %s の名前を変更できません"
 
-#: mail/em-folder-tree.c:2431
+#: mail/em-folder-tree.c:2433
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "フォルダ \"%s\" の変更先:"
 
-#: mail/em-folder-tree.c:2433
+#: mail/em-folder-tree.c:2435
 msgid "Rename Folder"
 msgstr "フォルダ名の変更"
 
-#: mail/em-folder-tree.c:2457
+#: mail/em-folder-tree.c:2459
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr "既にフォルダ名 \"%s\" があります。別の名前を使用して下さい。"
 
-#: mail/em-folder-tree.c:2503 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2505 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "表示(_V)"
 
-#: mail/em-folder-tree.c:2504
+#: mail/em-folder-tree.c:2506
 msgid "Open in _New Window"
 msgstr "新しいウィンドウで開く(_N)"
 
-#: mail/em-folder-tree.c:2509
+#: mail/em-folder-tree.c:2511
 msgid "_Move"
 msgstr "移動(_M)"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2513
+#: mail/em-folder-tree.c:2515
 msgid "_New Folder..."
 msgstr "新しいフォルダ(_N)"
 
-#: mail/em-folder-tree.c:2516
+#: mail/em-folder-tree.c:2518
 msgid "_Rename"
 msgstr "名前の変更(_R)"
 
-#: mail/em-folder-tree.c:2519 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2521 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "プロパティ(_P)..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:741 mail/em-popup.c:688
+#: mail/em-folder-view.c:745 mail/em-popup.c:688
 msgid "_Edit as New Message..."
 msgstr "新規のメッセージとして編集(_E)..."
 
-#: mail/em-folder-view.c:743
+#: mail/em-folder-view.c:747
 msgid "_Print"
 msgstr "印刷(_P)"
 
-#: mail/em-folder-view.c:746 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:750 ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "差出人へ返信(_R)"
 
-#: mail/em-folder-view.c:747 mail/em-popup.c:808
+#: mail/em-folder-view.c:751 mail/em-popup.c:808
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "メーリング・リストへ返信(_L)"
 
-#: mail/em-folder-view.c:748 mail/em-popup.c:809
+#: mail/em-folder-view.c:752 mail/em-popup.c:809
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "全員へ返信(_A)"
 
-#: mail/em-folder-view.c:749 mail/em-popup.c:811
+#: mail/em-folder-view.c:753 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Forward"
 msgstr "転送(_F)"
 
-#: mail/em-folder-view.c:752
+#: mail/em-folder-view.c:756
 msgid "Follo_w Up..."
 msgstr "フォロー・アップ(_W)..."
 
-#: mail/em-folder-view.c:753
+#: mail/em-folder-view.c:757
 msgid "Fla_g Completed"
 msgstr "完了フラグの付与(_G)"
 
-#: mail/em-folder-view.c:754
+#: mail/em-folder-view.c:758
 msgid "Cl_ear Flag"
 msgstr "フラグの解除(_E)"
 
-#: mail/em-folder-view.c:757 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "既読としてマーク(_K)"
 
-#: mail/em-folder-view.c:758
+#: mail/em-folder-view.c:762
 msgid "Mark as _Unread"
 msgstr "未読としてマーク(_U)"
 
-#: mail/em-folder-view.c:759
+#: mail/em-folder-view.c:763
 msgid "Mark as _Important"
 msgstr "重要としてマーク(_I)"
 
-#: mail/em-folder-view.c:760
+#: mail/em-folder-view.c:764
 msgid "_Mark as Unimportant"
 msgstr "重要でないとしてマーク(_M)"
 
-#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:765 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "ジャンクとしてマーク(_J)"
 
-#: mail/em-folder-view.c:762 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:766 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "ジャンクではないとしてマーク(_N)"
 
-#: mail/em-folder-view.c:766
+#: mail/em-folder-view.c:770
 msgid "U_ndelete"
 msgstr "削除の取り消し(_N)"
 
-#: mail/em-folder-view.c:769
+#: mail/em-folder-view.c:773
 msgid "Mo_ve to Folder..."
 msgstr "フォルダへ移動(_V)..."
 
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:774 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "フォルダへコピー(_C)..."
 
-#: mail/em-folder-view.c:778
+#: mail/em-folder-view.c:782
 msgid "Add Sender to Address_book"
 msgstr "差出人をアドレス帳に追加"
 
-#: mail/em-folder-view.c:781
+#: mail/em-folder-view.c:785
 msgid "Appl_y Filters"
 msgstr "フィルタの適用(_Y)"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:786
 msgid "F_ilter Junk"
 msgstr "Junk のフィルタ(_I)"
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:789
 msgid "Crea_te Rule From Message"
 msgstr "メッセージからルールの作成(_T)"
 
-#: mail/em-folder-view.c:786
+#: mail/em-folder-view.c:790
 msgid "VFolder on _Subject"
 msgstr "件名の仮想フォルダ(_S)"
 
-#: mail/em-folder-view.c:787
+#: mail/em-folder-view.c:791
 msgid "VFolder on Se_nder"
 msgstr "差出人の仮想フォルダ(_N)"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:792
 msgid "VFolder on _Recipients"
 msgstr "宛先の仮想フォルダ(_R)"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:793
 msgid "VFolder on Mailing _List"
 msgstr "メーリング・リストの仮想フォルダ(_L)"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:795
 msgid "VFolder on Thread"
 msgstr "仮想フォルダのスレッド表示"
 
-#: mail/em-folder-view.c:795
+#: mail/em-folder-view.c:799
 msgid "Filter on Sub_ject"
 msgstr "件名のフィルタ(_J)"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:800
 msgid "Filter on Sen_der"
 msgstr "差出人のフィルタ(_D)"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:801
 msgid "Filter on Re_cipients"
 msgstr "宛先のフィルタ(_C)"
 
-#: mail/em-folder-view.c:798
+#: mail/em-folder-view.c:802
 msgid "Filter on _Mailing List"
 msgstr "メーリング・リストのフィルタ(_M)"
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:804
 msgid "Filter on Thread"
 msgstr "スレッド表示のフィルタ"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1583 mail/em-folder-view.c:1621
+#: mail/em-folder-view.c:1587 mail/em-folder-view.c:1625
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "デフォルト"
 
-#: mail/em-folder-view.c:1657
+#: mail/em-folder-view.c:1661
 msgid "Print Message"
 msgstr "メッセージの印刷"
 
-#: mail/em-folder-view.c:1904
+#: mail/em-folder-view.c:1908
 msgid "_Copy Link Location"
 msgstr "リンク先のコピー(_C)"
 
-#: mail/em-folder-view.c:2168
+#: mail/em-folder-view.c:2172
 #, c-format
 msgid "Click to mail %s"
 msgstr "メール %s をクリックして下さい"
@@ -12999,31 +13015,31 @@ msgstr ""
 "このメッセージは強力なアルゴリズムで暗号化されています。現実的に、外部の者が"
 "このメッセージの内容を閲覧することは非常に困難と思われます。"
 
-#: mail/em-format-html-display.c:741
+#: mail/em-format-html-display.c:754
 msgid "_View Certificate"
 msgstr "証明書の表示(_V)"
 
-#: mail/em-format-html-display.c:746
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "この証明書は表示可能な形式ではありません"
 
-#: mail/em-format-html-display.c:979
+#: mail/em-format-html-display.c:1001
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%Y年%B%e日 %p %l:%M に完了"
 
-#: mail/em-format-html-display.c:987
+#: mail/em-format-html-display.c:1009
 msgid "Overdue:"
 msgstr "期限切れ:"
 
-#: mail/em-format-html-display.c:990
+#: mail/em-format-html-display.c:1012
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y年%B%e日 %p %l:%M まで"
 
-#: mail/em-format-html-display.c:1060
+#: mail/em-format-html-display.c:1082
 msgid "_View Inline"
 msgstr "インライン表示(_V)"
 
-#: mail/em-format-html-display.c:1061
+#: mail/em-format-html-display.c:1083
 msgid "_Hide"
 msgstr "隠す(_H)"
 
@@ -13194,22 +13210,22 @@ msgstr ""
 "\n"
 "Evolution がお使いのフォルダを移行している間、少々お待ち下さい..."
 
-#: mail/em-migrate.c:1845 mail/em-migrate.c:1860
+#: mail/em-migrate.c:1899 mail/em-migrate.c:1914
 #, c-format
 msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "POP3 UID キャッシュの移行に失敗しました: %s"
 
-#: mail/em-migrate.c:1948 mail/em-migrate.c:2049
+#: mail/em-migrate.c:2002 mail/em-migrate.c:2103
 #, c-format
 msgid "Failed to migrate folder expand state: %s"
 msgstr "フォルダ展開ステータスの移行に失敗しました: %s"
 
-#: mail/em-migrate.c:2173 mail/em-migrate.c:2345
+#: mail/em-migrate.c:2227 mail/em-migrate.c:2399
 #, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "フォルダ '%s' の作成に失敗しました: %s"
 
-#: mail/em-migrate.c:2185
+#: mail/em-migrate.c:2239
 #, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "'%s' の格納場所を開けませんでした: %s"
@@ -13428,9 +13444,8 @@ msgid "Default height of the Message Window"
 msgstr "メッセージ・ウィンドウのデフォルトの高さです。"
 
 #: mail/evolution-mail.schemas.in.in.h:15
-#, fuzzy
 msgid "Default height of the Subscribe dialog"
-msgstr "メッセージ・ウィンドウのデフォルトの高さです。"
+msgstr "購読ダイアログのデフォルトの高さです。"
 
 #: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
@@ -13445,9 +13460,8 @@ msgid "Default width of the Message Window"
 msgstr "メッセージ・ウィンドウのデフォルトの幅です。"
 
 #: mail/evolution-mail.schemas.in.in.h:19
-#, fuzzy
 msgid "Default width of the Subscribe dialog"
-msgstr "メッセージ・ウィンドウのデフォルトの幅です。"
+msgstr "購読フォルダのデフォルトの幅です。"
 
 #: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
@@ -13702,14 +13716,12 @@ msgid "Spell check inline"
 msgstr "インラインでスペルをチェックする"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-#, fuzzy
 msgid "Subscribe dialog default hight"
-msgstr "メッセージ・ウィンドウの高さ (デフォルト)"
+msgstr "購読ダイアログの高さ (デフォルト)"
 
 #: mail/evolution-mail.schemas.in.in.h:77
-#, fuzzy
 msgid "Subscribe dialog default width"
-msgstr "メッセージ・ウィンドウの幅 (デフォルト)"
+msgstr "購読ダイアログの幅 (デフォルト)"
 
 #: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
@@ -14209,138 +14221,128 @@ msgid "Connecting to server..."
 msgstr "サーバへ接続中..."
 
 #: mail/mail-config.glade.h:1
-#, fuzzy
 msgid " Ch_eck for Supported Types "
-msgstr " サポートしているかチェックする(_C) "
+msgstr " サポートしているかチェックする(_E) "
 
 #: mail/mail-config.glade.h:3
-#, fuzzy
 msgid "<b>Preview</b>"
-msgstr "プレビュー"
+msgstr "<b>プレビュー</b>"
 
 #: mail/mail-config.glade.h:4
-#, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
-msgstr "(この Evolution は SSL サポート付きで作成されていません)"
+msgstr "<b>この Evolution は SSL サポート付きでビルドされていません</b>"
 
 #: mail/mail-config.glade.h:5
-#, fuzzy
 msgid "<b>S_ignatures</b>"
-msgstr "<b>ステータス:</b> "
+msgstr "<b>署名(_I)</b> "
 
 #: mail/mail-config.glade.h:6
-#, fuzzy
 msgid "<b>_Languages</b>"
-msgstr "<b>ステータス:</b> "
+msgstr "<b>言語(_L)</b> "
 
 #: mail/mail-config.glade.h:7
 msgid "<span weight=\"bold\">Account Information</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">アカウント情報</span>"
 
 #: mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Alerts</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">警告</span>"
 
 #: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">認証方式の種類</span>"
 
 #: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">認証</span>"
 
 #: mail/mail-config.glade.h:11
-#, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
-msgstr "新着メールのチェック"
+msgstr "<span weight=\"bold\">新着メールのチェック</span>"
 
 #: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">メッセージの作成</span>"
 
 #: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">設定</span>"
 
 #: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">デフォルトの動作</span>"
 
 #: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">メールの削除</span>"
 
 #: mail/mail-config.glade.h:16
-#, fuzzy
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr "<b>表示するヘッダの項目(_D)</b>"
+msgstr "<span weight=\"bold\">表示するヘッダの項目(_H)</span>"
 
 #: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">フィルタリングのオプション</span>"
 
 #: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">General</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">全般</span>"
 
 #: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">ラベルと色</span>"
 
 #: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">画像の読み込み</span>"
 
 #: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Display</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">メッセージの表示</span>"
 
 #: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">メッセージのフォント</span>"
 
 #: mail/mail-config.glade.h:23
-#, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "新着メールの通知"
+msgstr "<span weight=\"bold\">新着メールの通知</span>"
 
 #: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">追加情報</span>"
 
 #: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Options</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">オプション</span>"
 
 #: mail/mail-config.glade.h:26
-#, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr "ちょっとしたプライバシー (PGP/GnuPG)"
+msgstr "<span weight=\"bold\">ちょっとしたプライバシー (PGP/GPG)</span>"
 
 #: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">印刷用フォント</span>"
 
 #: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">必須情報</span>"
 
 #: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">セキュアな MIME (S/MIME)</span>"
 
 #: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">セキュリティ</span>"
 
 #: mail/mail-config.glade.h:31
-#, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "送信済と草案メッセージ"
+msgstr "<span weight=\"bold\">送信メッセージと草案メッセージ</span>"
 
 #: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">サーバの設定</span>"
 
 #: mail/mail-config.glade.h:33
 msgid "A_lso encrypt to self when sending encrypted mail"
@@ -14351,33 +14353,28 @@ msgid "Account Editor"
 msgstr "アカウント・エディタ"
 
 #: mail/mail-config.glade.h:36
-#, fuzzy
 msgid "Add Ne_w Signature..."
-msgstr "新しい署名の追加..."
+msgstr "新しい署名の追加(_W)..."
 
 #: mail/mail-config.glade.h:37
-#, fuzzy
 msgid "Add _Script"
-msgstr "スクリプトの追加(_R)"
+msgstr "スクリプトの追加(_S)"
 
 #: mail/mail-config.glade.h:38
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "暗号化したメールを送信する場合は、常にメールを暗号化する(_W)"
 
 #: mail/mail-config.glade.h:39
-#, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "常に使用する CC 先(_C):"
+msgstr "常に使用する CC 先(_S):"
 
 #: mail/mail-config.glade.h:41
-#, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "常に使用する Bcc 先(_B):"
 
 #: mail/mail-config.glade.h:42
-#, fuzzy
 msgid "Always _sign outgoing messages when using this account"
-msgstr "このアカウントを使用する場合は、常に送信メッセージに署名を付与する(_Y)"
+msgstr "このアカウントを使用する場合は、常に送信メッセージに署名を付与する(_S)"
 
 #: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
@@ -14392,14 +14389,12 @@ msgid "Attachment"
 msgstr "添付する"
 
 #: mail/mail-config.glade.h:46
-#, fuzzy
 msgid "Automatically _insert smiley images"
-msgstr "スマイリー・アイコンを自動的に挿入する(_A)"
+msgstr "スマイリー・アイコンを自動的に挿入する(_I)"
 
 #: mail/mail-config.glade.h:47
-#, fuzzy
 msgid "Automatically check for _new mail every"
-msgstr "新着メールを自動的にチェックする(_A)"
+msgstr "新着メールを自動的にチェックする(_N)"
 
 #: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-13)"
@@ -14410,18 +14405,16 @@ msgid "Baltic (ISO-8859-4)"
 msgstr "バルチック語 (ISO-8859-4)"
 
 #: mail/mail-config.glade.h:50
-#, fuzzy
 msgid "Beep w_hen new mail arrives"
-msgstr "新着メールが届いたらビープ音を鳴らす(_B)"
+msgstr "新着メールが届いたらビープ音を鳴らす(_H)"
 
 #: mail/mail-config.glade.h:51
 msgid "C_haracter set:"
 msgstr "文字セット(_H):"
 
 #: mail/mail-config.glade.h:52
-#, fuzzy
 msgid "Ch_eck for Supported Types "
-msgstr " サポートしているかチェックする(_C) "
+msgstr "サポートしているかチェックする(_E) "
 
 #: mail/mail-config.glade.h:53
 msgid "Check _Incoming Mail"
@@ -14441,14 +14434,12 @@ msgid "Color for _misspelled words:"
 msgstr "スペルミスした文字の色(_M):"
 
 #: mail/mail-config.glade.h:57
-#, fuzzy
 msgid "Colors"
-msgstr "色(_O)"
+msgstr "色"
 
 #: mail/mail-config.glade.h:58
-#, fuzzy
 msgid "Confirm _when expunging a folder"
-msgstr "フォルダを抹消する前に確認する(_C)"
+msgstr "フォルダを抹消する前に確認する(_W)"
 
 #: mail/mail-config.glade.h:59
 msgid ""
@@ -14471,14 +14462,12 @@ msgid "De_fault"
 msgstr "デフォルト(_F)"
 
 #: mail/mail-config.glade.h:67
-#, fuzzy
 msgid "Default character e_ncoding:"
-msgstr "デフォルトの文字エンコード(_E): "
+msgstr "デフォルトの文字エンコード(_N): "
 
 #: mail/mail-config.glade.h:68
-#, fuzzy
 msgid "Defaults"
-msgstr "デフォルト(_D)"
+msgstr "デフォルト"
 
 #: mail/mail-config.glade.h:70
 msgid "Do not quote original message"
@@ -14493,7 +14482,6 @@ msgid "Done"
 msgstr "完了"
 
 #: mail/mail-config.glade.h:73
-#, fuzzy
 msgid "Drafts _Folder:"
 msgstr "草案フォルダ(_F):"
 
@@ -14502,14 +14490,12 @@ msgid "Email Accounts"
 msgstr "E-メール・アカウント"
 
 #: mail/mail-config.glade.h:76
-#, fuzzy
 msgid "Email _Address:"
 msgstr "E-メール・アドレス(_A):"
 
 #: mail/mail-config.glade.h:77
-#, fuzzy
 msgid "Empty trash folders on e_xit"
-msgstr "終了時にゴミ箱フォルダを空にする(_T)"
+msgstr "終了時にゴミ箱フォルダを空にする(_X)"
 
 #: mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
@@ -14536,14 +14522,12 @@ msgid "Format messages in _HTML"
 msgstr "HTML の中のメッセージを整形する(_H)"
 
 #: mail/mail-config.glade.h:85
-#, fuzzy
 msgid "HTML Mail"
-msgstr "HTML 形式のメール(_H)"
+msgstr "HTML 形式のメール"
 
 #: mail/mail-config.glade.h:86
-#, fuzzy
 msgid "Headers"
-msgstr "ヘッダ(_E)"
+msgstr "ヘッダ"
 
 #: mail/mail-config.glade.h:87
 msgid "Highlight _quotations with"
@@ -14592,9 +14576,8 @@ msgid "Pick a color"
 msgstr "色の選択"
 
 #: mail/mail-config.glade.h:108
-#, fuzzy
 msgid "Play sound file when new mail arri_ves"
-msgstr "新着メールが届いたらサウンドを演奏する(_P)"
+msgstr "新着メールが届いたらサウンドを演奏する(_V)"
 
 #: mail/mail-config.glade.h:109
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
@@ -14613,9 +14596,8 @@ msgid "Quoted"
 msgstr "引用する"
 
 #: mail/mail-config.glade.h:113
-#, fuzzy
 msgid "Re_member password"
-msgstr "このパスワードを記憶する"
+msgstr "このパスワードを記憶する(_M)"
 
 #: mail/mail-config.glade.h:114
 msgid "Re_ply-To:"
@@ -14626,24 +14608,20 @@ msgid "Receiving Email"
 msgstr "メールの受信"
 
 #: mail/mail-config.glade.h:117
-#, fuzzy
 msgid "Receiving Options"
-msgstr "返信オプション(_O)"
+msgstr "返信オプション"
 
 #: mail/mail-config.glade.h:118
-#, fuzzy
 msgid "Remember _password"
-msgstr "このパスワードを記憶する"
+msgstr "このパスワードを記憶する(_P)"
 
 #: mail/mail-config.glade.h:120
-#, fuzzy
 msgid "S_tandard Font:"
-msgstr "標準フォント(_S):"
+msgstr "標準フォント(_T):"
 
 #: mail/mail-config.glade.h:121
-#, fuzzy
 msgid "Security"
-msgstr "セキュリティ(_S)"
+msgstr "セキュリティ"
 
 #: mail/mail-config.glade.h:122
 msgid "Select HTML fixed width font"
@@ -14662,16 +14640,14 @@ msgid "Select HTML variable width font for printing"
 msgstr "印刷時の HTML 可変幅フォントの選択"
 
 #: mail/mail-config.glade.h:126
-#, fuzzy
 msgid "Select..."
-msgstr "選択(_S)..."
+msgstr "選択..."
 
 #: mail/mail-config.glade.h:127
 msgid "Sending Email"
 msgstr "メールの送信"
 
 #: mail/mail-config.glade.h:130
-#, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "送信済フォルダ(_M):"
 
@@ -14688,37 +14664,32 @@ msgid "Si_gning certificate:"
 msgstr "署名する証明書(_G):"
 
 #: mail/mail-config.glade.h:134
-#, fuzzy
 msgid "Signat_ure:"
-msgstr "署名:"
+msgstr "署名(_U):"
 
 #: mail/mail-config.glade.h:135
-#, fuzzy
 msgid "Signatures"
-msgstr "署名(_S):"
+msgstr "署名"
 
 #: mail/mail-config.glade.h:136
 msgid "Specify _filename:"
 msgstr "ファイル名の指定(_F):"
 
 #: mail/mail-config.glade.h:137
-#, fuzzy
 msgid "Spell Checking"
-msgstr "スペル・チェック(_C)"
+msgstr "スペル・チェック"
 
 #: mail/mail-config.glade.h:138
 msgid "Standard Unix mbox"
 msgstr "標準的な UNIX の mbox ファイル"
 
 #: mail/mail-config.glade.h:139
-#, fuzzy
 msgid "T_erminal Font:"
-msgstr "端末のフォント(_T):"
+msgstr "端末のフォント(_E):"
 
 #: mail/mail-config.glade.h:140
-#, fuzzy
 msgid "T_ype: "
-msgstr "種別:"
+msgstr "種別(_Y): "
 
 #: mail/mail-config.glade.h:141
 msgid ""
@@ -14769,14 +14740,12 @@ msgid "_Add Signature"
 msgstr "署名の追加(_A)"
 
 #: mail/mail-config.glade.h:157
-#, fuzzy
 msgid "_Always load images from the Internet"
-msgstr "常に画像を読み込まない(_A)"
+msgstr "常に画像を読み込む(_A)"
 
 #: mail/mail-config.glade.h:158
-#, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
-msgstr "送信するメッセージにデジタル署名する (デフォルト)(_S)"
+msgstr "送信するメッセージにデジタル署名する (デフォルト)(_D)"
 
 #: mail/mail-config.glade.h:159
 msgid "_Do not notify me when new mail arrives"
@@ -14815,7 +14784,6 @@ msgid "_Name:"
 msgstr "名前(_N):"
 
 #: mail/mail-config.glade.h:171
-#, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "二度と画像を読み込まない(_N)"
 
@@ -14840,7 +14808,6 @@ msgid "_Show animated images"
 msgstr "アニメーションを表示する(_S)"
 
 #: mail/mail-config.glade.h:178
-#, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "セキュリティ保護された接続 (SSL) の利用(_U):"
 
@@ -14849,9 +14816,8 @@ msgid "_Use the same fonts as other applications"
 msgstr "他のアプリと同じフォントを使う(_U)"
 
 #: mail/mail-config.glade.h:180
-#, fuzzy
 msgid "_minute(s)"
-msgstr "分"
+msgstr "分(間)(_M)"
 
 #: mail/mail-config.glade.h:181
 msgid "color"
@@ -14861,7 +14827,7 @@ msgstr "色"
 msgid "description"
 msgstr "説明"
 
-#: mail/mail-folder-cache.c:796
+#: mail/mail-folder-cache.c:803
 #, c-format
 msgid "Pinging %s"
 msgstr "%s へ ping"
@@ -14948,77 +14914,77 @@ msgstr "%s へメッセージをコピー中"
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" の中のフォルダを走査中"
 
-#: mail/mail-ops.c:1190
+#: mail/mail-ops.c:1123
 msgid "Forwarded messages"
 msgstr "転送メッセージ"
 
-#: mail/mail-ops.c:1233
+#: mail/mail-ops.c:1166
 #, c-format
 msgid "Opening folder %s"
 msgstr "フォルダ %s をオープンする"
 
-#: mail/mail-ops.c:1305
+#: mail/mail-ops.c:1238
 #, c-format
 msgid "Opening store %s"
 msgstr "保存された %s をオープンする"
 
-#: mail/mail-ops.c:1383
+#: mail/mail-ops.c:1316
 #, c-format
 msgid "Removing folder %s"
 msgstr "フォルダ %s を削除"
 
-#: mail/mail-ops.c:1477
+#: mail/mail-ops.c:1410
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "フォルダ '%s' の格納"
 
-#: mail/mail-ops.c:1542
+#: mail/mail-ops.c:1475
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "アカウント '%s' の削除と保存"
 
-#: mail/mail-ops.c:1543
+#: mail/mail-ops.c:1476
 #, c-format
 msgid "Storing account '%s'"
 msgstr "アカウント '%s' の格納"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1531
 msgid "Refreshing folder"
 msgstr "フォルダを更新中"
 
-#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
+#: mail/mail-ops.c:1567 mail/mail-ops.c:1618
 msgid "Expunging folder"
 msgstr "フォルダを抹消中"
 
-#: mail/mail-ops.c:1682
+#: mail/mail-ops.c:1615
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' の中にあるゴミ箱を空にする"
 
-#: mail/mail-ops.c:1683
+#: mail/mail-ops.c:1616
 msgid "Local Folders"
 msgstr "ローカル・フォルダ"
 
-#: mail/mail-ops.c:1766
+#: mail/mail-ops.c:1699
 #, c-format
 msgid "Retrieving message %s"
 msgstr "メッセージ %s を取得中"
 
-#: mail/mail-ops.c:1838
-#, fuzzy, c-format
+#: mail/mail-ops.c:1771
+#, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "メッセージ %d 通の受信中"
 msgstr[1] "メッセージ %d 通の受信中"
 
-#: mail/mail-ops.c:1924
-#, fuzzy, c-format
+#: mail/mail-ops.c:1857
+#, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "メッセージ %d 通の保存中"
 msgstr[1] "メッセージ %d 通の保存中"
 
-#: mail/mail-ops.c:1974
+#: mail/mail-ops.c:1907
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15027,7 +14993,7 @@ msgstr ""
 "出力ファイルを生成できません: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2002
+#: mail/mail-ops.c:1935
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15036,11 +15002,11 @@ msgstr ""
 "ファイルの保存中にエラー: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2073
+#: mail/mail-ops.c:2006
 msgid "Saving attachment"
 msgstr "添付した内容の保存中"
 
-#: mail/mail-ops.c:2090
+#: mail/mail-ops.c:2023
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15049,17 +15015,17 @@ msgstr ""
 "出力ファイルを生成できません: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2120
+#: mail/mail-ops.c:2053
 #, c-format
 msgid "Could not write data: %s"
 msgstr "データを書き出せませんでした: %s"
 
-#: mail/mail-ops.c:2268
+#: mail/mail-ops.c:2201
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s からの接続はありません"
 
-#: mail/mail-ops.c:2268
+#: mail/mail-ops.c:2201
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s へ再接続"
@@ -15078,11 +15044,11 @@ msgstr "検索:"
 
 #: mail/mail-security.glade.h:1
 msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">デジタル署名</span>"
 
 #: mail/mail-security.glade.h:2
 msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">暗号化</span>"
 
 #: mail/mail-security.glade.h:4
 msgid "Security Information"
@@ -15388,7 +15354,6 @@ msgstr ""
 "\"フラグ\" メニューからフォローアップの内容を選択して下さい。"
 
 #: mail/message-tags.glade.h:6
-#, fuzzy
 msgid "_Due By:"
 msgstr "期日(_D):"
 
@@ -15921,9 +15886,8 @@ msgid "Create a new test item"
 msgstr "新しいタスク・アイテムを作成します"
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Active Connections</b>"
-msgstr "接続を有効にする"
+msgstr "<b>接続を有効にする</b>"
 
 #: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "Active Connections"
@@ -16832,19 +16796,16 @@ msgid "Purge old appointments and meetings"
 msgstr "古い予定と会議を完全に削除します"
 
 #: ui/evolution-calendar.xml.h:25
-#, fuzzy
 msgid "Select _Date"
-msgstr "全てのテキストを選択します"
+msgstr "日付の選択(_D)"
 
 #: ui/evolution-calendar.xml.h:27
-#, fuzzy
 msgid "Select a specific date"
 msgstr "指定日に移動します"
 
 #: ui/evolution-calendar.xml.h:28
-#, fuzzy
 msgid "Select today"
-msgstr "フォルダの選択"
+msgstr "今日にする"
 
 #: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
@@ -18035,9 +17996,8 @@ msgid "_Day View"
 msgstr "日間ビュー(_D)"
 
 #: views/calendar/galview.xml.h:3
-#, fuzzy
 msgid "_List View"
-msgstr "一覧表示"
+msgstr "一覧表示(_L)"
 
 #: views/calendar/galview.xml.h:4
 msgid "_Month View"
@@ -18072,14 +18032,12 @@ msgid "_Messages"
 msgstr "メッセージ(_M)"
 
 #: views/tasks/galview.xml.h:1
-#, fuzzy
 msgid "With _Due Date"
-msgstr "期日:"
+msgstr "期日(_D)"
 
 #: views/tasks/galview.xml.h:2
-#, fuzzy
 msgid "With _Status"
-msgstr "ステータスの設定"
+msgstr "ステータス(_S)"
 
 #: views/tasks/galview.xml.h:3
 msgid "_Tasks"
@@ -18198,9 +18156,8 @@ msgid "Western European"
 msgstr "西欧"
 
 #: widgets/misc/e-charset-picker.c:73
-#, fuzzy
 msgid "Western European, New"
-msgstr "西欧"
+msgstr "西欧 (New)"
 
 #: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
 #: widgets/misc/e-charset-picker.c:92
@@ -18298,7 +18255,6 @@ msgid "Spacing around expander arrow"
 msgstr "エキスパンダの矢印の周りに配置する領域"
 
 #: widgets/misc/e-filter-bar.c:191
-#, fuzzy
 msgid "_Searches"
 msgstr "検索(_S)"
 
@@ -18364,240 +18320,3 @@ msgstr "%s (...)"
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完了)"
-
-#~ msgid "2:30"
-#~ msgstr "2:30"
-
-#~ msgid "Address Book Sources"
-#~ msgstr "アドレス帳のソース"
-
-#~ msgid "Selected:"
-#~ msgstr "選択済:"
-
-#~ msgid "1 contact"
-#~ msgstr "連絡先 1個"
-
-#~ msgid "and %d other contacts."
-#~ msgstr "と他に %d 個の連絡先。"
-
-#~ msgid "1 day"
-#~ msgstr "1 日"
-
-#~ msgid "1 week"
-#~ msgstr "1 週間"
-
-#~ msgid "1 hour"
-#~ msgstr "1 時間"
-
-#~ msgid "1 minute"
-#~ msgstr "1 分"
-
-#~ msgid "1 second"
-#~ msgstr "1 秒"
-
-#~ msgid "Description"
-#~ msgstr "説明"
-
-#~ msgid "component"
-#~ msgstr "コンポーネント"
-
-#~ msgid "Alarms"
-#~ msgstr "アラーム"
-
-#~ msgid "Geographical position"
-#~ msgstr "緯度経度"
-
-#~ msgid "URL"
-#~ msgstr "URL"
-
-#~ msgid "Every %d days"
-#~ msgstr "%d 日毎"
-
-#~ msgid "Every %d weeks"
-#~ msgstr "%d 週間毎"
-
-#~ msgid "Every %d weeks on "
-#~ msgstr "次の %d 週間毎 "
-
-#~ msgid "every %d months"
-#~ msgstr "%d 月毎"
-
-#~ msgid "Every %d years"
-#~ msgstr "%d 年毎"
-
-#~ msgid "Go To Date"
-#~ msgstr "指定日へ移動"
-
-#~ msgid "_Go To Today"
-#~ msgstr "今日へ移動(_G)"
-
-#~ msgid "LDAP Server Name:"
-#~ msgstr "LDAP サーバ名:"
-
-#~ msgid "Search base:"
-#~ msgstr "検索ベース:"
-
-#~ msgid "<b>Filter Rules</b>"
-#~ msgstr "<b>フィルタのルール</b>"
-
-#~ msgid "Edit Filters"
-#~ msgstr "フィルタを編集"
-
-#~ msgid "Edit VFolders"
-#~ msgstr "仮想フォルダの編集"
-
-#~ msgid "Outgoing"
-#~ msgstr "出力"
-
-#~ msgid "Pipe Message to Shell Command"
-#~ msgstr "メッセージを SHELL コマンドにパイプ"
-
-#~ msgid "Shell Command"
-#~ msgstr "SHELL コマンド"
-
-#~ msgid "[script]"
-#~ msgstr "[スクリプト]"
-
-#~ msgid "Add script signature"
-#~ msgstr "署名スクリプトの追加"
-
-#~ msgid "Current store format:"
-#~ msgstr "現在の形式:"
-
-#~ msgid "Index body contents"
-#~ msgstr "インデックスの内容を含める"
-
-#~ msgid "New store format:"
-#~ msgstr "新しい形式:"
-
-#~ msgid ""
-#~ "Note: When converting between mailbox formats, a failure\n"
-#~ "(such as lack of disk space) may not be automatically\n"
-#~ "recoverable.  Please use this feature with care."
-#~ msgstr ""
-#~ "注意: メールボックスの形式を変換するときに発生した問題\n"
-#~ "(例: ディスク容量の不足) を自動的に修復する\n"
-#~ "ことはできないかもしれません。この機能は注意して使用して下さい。"
-
-#~ msgid "maildir"
-#~ msgstr "maildir"
-
-#~ msgid "mbox"
-#~ msgstr "mbox"
-
-#~ msgid "mh"
-#~ msgstr "mh"
-
-#~ msgid "(SSL is not supported in this build of Evolution)"
-#~ msgstr "(この Evolution は SSL サポート付きで作成されていません)"
-
-#~ msgid "Account Information"
-#~ msgstr "アカウント情報"
-
-#~ msgid "Authentication"
-#~ msgstr "認証方式"
-
-#~ msgid "Composing Messages"
-#~ msgstr "メッセージの生成"
-
-#~ msgid "Configuration"
-#~ msgstr "設定"
-
-#~ msgid "Default Behavior"
-#~ msgstr "デフォルトの動作"
-
-#~ msgid "Deleting Mail"
-#~ msgstr "メールの削除中"
-
-#~ msgid "Filter Options"
-#~ msgstr "フィルタリングのオプション"
-
-#~ msgid "Labels and Colors"
-#~ msgstr "ラベルと色"
-
-#~ msgid "Loading Images"
-#~ msgstr "画像の読み込み"
-
-#~ msgid "Message Display"
-#~ msgstr "メッセージの表示"
-
-#~ msgid "Message Fonts"
-#~ msgstr "メッセージのフォント"
-
-#~ msgid "Optional Information"
-#~ msgstr "追加情報"
-
-#~ msgid "Printed Fonts"
-#~ msgstr "印刷用フォント"
-
-#~ msgid "Re_member this password"
-#~ msgstr "このパスワードを記憶する(_M)"
-
-#~ msgid "Remember this _password"
-#~ msgstr "このパスワードを記憶する(_P)"
-
-#~ msgid "Required Information"
-#~ msgstr "必須情報"
-
-#~ msgid "Restore Defaults"
-#~ msgstr "初期値に戻す"
-
-#~ msgid "S_ecurity"
-#~ msgstr "セキュリティ(_E)"
-
-#~ msgid "Secure MIME (S/MIME)"
-#~ msgstr "セキュリティ保護された MIME (S/MIME)"
-
-#~ msgid "Server Configuration"
-#~ msgstr "サーバの設定"
-
-#~ msgid "_Authentication Type: "
-#~ msgstr "認証種別(_A): "
-
-#~ msgid "_Authentication type: "
-#~ msgstr "認証方法(_A): "
-
-#~ msgid "_Default signature:"
-#~ msgstr "デフォルトの署名(_D):"
-
-#~ msgid "_Full name:"
-#~ msgstr "氏名(_F):"
-
-#~ msgid "_Identity"
-#~ msgstr "身元情報(_I)"
-
-#~ msgid "_Junk"
-#~ msgstr "ジャンク(_J)"
-
-#~ msgid "_Receiving Mail"
-#~ msgstr "メールの受信(_R)"
-
-#~ msgid "_Restore defaults"
-#~ msgstr "初期値に戻す(_R)"
-
-#~ msgid "_Sending Mail"
-#~ msgstr "メールの送信(_S)"
-
-#~ msgid "Search"
-#~ msgstr "検索"
-
-#~ msgid "Digital Signature"
-#~ msgstr "デジタル署名"
-
-#~ msgid "Encryption"
-#~ msgstr "暗号化"
-
-#~ msgid "The following connections are currently active:"
-#~ msgstr "次の接続が現在有効です:"
-
-#~ msgid "_Search for Contacts"
-#~ msgstr "連絡先の検索(_S)"
-
-#~ msgid "Go to _Date"
-#~ msgstr "指定日に移動(_D)"
-
-#~ msgid "Go to today"
-#~ msgstr "今日へ移動します"
-
-#~ msgid "With _Category"
-#~ msgstr "カテゴリ付き(_C)"