From 31d60040afd06ffe62e8d761cd61b4b3720454e0 Mon Sep 17 00:00:00 2001
From: JP Rosevear <jpr@ximian.com>
Date: Tue, 13 Jan 2004 04:30:14 +0000
Subject: bump version and requirements

2004-01-12  JP Rosevear  <jpr@ximian.com>

	* configure.in: bump version and requirements

svn path=/trunk/; revision=24193
---
 po/ja.po | 3437 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 1988 insertions(+), 1449 deletions(-)

(limited to 'po/ja.po')

diff --git a/po/ja.po b/po/ja.po
index 6393ac4c7e..b11d60bad0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS-20010612\n"
-"POT-Creation-Date: 2003-12-29 12:04-0500\n"
+"POT-Creation-Date: 2004-01-12 22:53-0500\n"
 "PO-Revision-Date: 2003-05-01 15:33+0900\n"
 "Last-Translator: Takuo KITAME <kitame@debian.org>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -52,6 +52,7 @@ msgstr "
 #. name = e_book_get_name (book);
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
+#: calendar/gui/calendar-component.c:583
 #: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
 msgid "Contacts"
 msgstr "連絡先"
@@ -100,19 +101,20 @@ msgstr "Evolution 
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:211
+#: addressbook/gui/component/addressbook-component.c:202
+#, c-format
+msgid "Addressbook '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:258
 #: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "New Addressbook"
 msgstr "アドレス帳"
 
-#: addressbook/gui/component/addressbook-component.c:212
-msgid "Properties..."
-msgstr "プロパティ..."
-
-#: addressbook/gui/component/addressbook-component.c:213
+#: addressbook/gui/component/addressbook-component.c:259
 #: addressbook/gui/widgets/e-addressbook-view.c:1017
-#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:418
+#: calendar/gui/calendar-component.c:410 calendar/gui/tasks-component.c:399
 #: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -120,65 +122,37 @@ msgstr "
 msgid "Delete"
 msgstr "削除"
 
-#: addressbook/gui/component/addressbook-component.c:214
-#: calendar/gui/calendar-component.c:435 calendar/gui/tasks-component.c:416
-msgid "Rename"
-msgstr "リネーム"
+#: addressbook/gui/component/addressbook-component.c:260
+#: calendar/gui/calendar-component.c:411 calendar/gui/tasks-component.c:401
+msgid "Properties..."
+msgstr "プロパティ..."
 
-#: addressbook/gui/component/addressbook-component.c:285
+#: addressbook/gui/component/addressbook-component.c:331
 #, fuzzy
 msgid "New Contact"
 msgstr "新規連絡先:"
 
-#: addressbook/gui/component/addressbook-component.c:286
+#: addressbook/gui/component/addressbook-component.c:332
 msgid "_Contact"
 msgstr "連絡先(_C)"
 
-#: addressbook/gui/component/addressbook-component.c:287
+#: addressbook/gui/component/addressbook-component.c:333
 msgid "Create a new contact"
 msgstr "新規連絡先を作成します"
 
-#: addressbook/gui/component/addressbook-component.c:292
+#: addressbook/gui/component/addressbook-component.c:338
 msgid "New Contact List"
 msgstr "新規連絡先リスト"
 
-#: addressbook/gui/component/addressbook-component.c:293
+#: addressbook/gui/component/addressbook-component.c:339
 #, fuzzy
 msgid "Contact _List"
 msgstr "連絡先リスト(_C)"
 
-#: addressbook/gui/component/addressbook-component.c:294
+#: addressbook/gui/component/addressbook-component.c:340
 msgid "Create a new contact list"
 msgstr "新規連絡先リストを作成"
 
-#: addressbook/gui/component/addressbook-component.c:443
-#: calendar/gui/calendar-component.c:831 calendar/gui/tasks-component.c:772
-msgid "On This Computer"
-msgstr ""
-
-#. orange
-#: addressbook/gui/component/addressbook-component.c:453
-#: calendar/gui/calendar-component.c:839 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:780
-#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:88
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "パーソナル"
-
-#. red
-#: addressbook/gui/component/addressbook-component.c:460
-#: calendar/gui/calendar-component.c:846 filter/filter-label.c:122
-#: mail/mail-config.c:64 mail/mail-config.glade.h:135
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "仕事"
-
-#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-component.c:468
-#, fuzzy
-msgid "On LDAP Servers"
-msgstr "LDAP サーバ"
-
 #. FIXME: parent
 #: addressbook/gui/component/addressbook-config.c:244
 #, fuzzy
@@ -218,6 +192,51 @@ msgstr ""
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP サーバの応答は %s 情報を含んでいません"
 
+#: addressbook/gui/component/addressbook-migrate.c:45 mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "待機中..."
+
+#: addressbook/gui/component/addressbook-migrate.c:53
+msgid ""
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-migrate.c:86 mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "%s を走査中"
+
+#. create the local source group
+#: addressbook/gui/component/addressbook-migrate.c:313
+#: calendar/gui/calendar-component.c:540 calendar/gui/calendar-component.c:550
+#: calendar/gui/tasks-component.c:502 calendar/gui/tasks-component.c:508
+msgid "On This Computer"
+msgstr ""
+
+#. orange
+#: addressbook/gui/component/addressbook-migrate.c:323
+#: calendar/gui/calendar-component.c:557 calendar/gui/migration.c:124
+#: calendar/gui/migration.c:147 calendar/gui/tasks-component.c:515
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:88
+#: shell/e-config-upgrade.c:1456
+msgid "Personal"
+msgstr "パーソナル"
+
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-migrate.c:331
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP サーバ"
+
+#: addressbook/gui/component/addressbook-migrate.c:463
+#, fuzzy
+msgid "LDAP Servers"
+msgstr "LDAP サーバ"
+
 #: addressbook/gui/component/addressbook.c:273
 msgid ""
 "More cards matched this query than either the server is \n"
@@ -247,9 +266,10 @@ msgid "This query did not complete successfully."
 msgstr ""
 
 #: addressbook/gui/component/addressbook.c:592
+#, fuzzy
 msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
 msgstr ""
 "このアドレス帳を開くことが出来ませんでした. パスが存在し, アクセス権\n"
 "を持っているかどうかチェックしてください"
@@ -257,20 +277,19 @@ msgstr ""
 #: addressbook/gui/component/addressbook.c:599
 #, fuzzy
 msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is unreachable."
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 "このアドレス帳を開くことが出来ません. これは誤ったURI\n"
 "を入力したか, あるいは LDAP サーバが落ちているかのどちらか\n"
 "を意味します"
 
 #: addressbook/gui/component/addressbook.c:604
+#, fuzzy
 msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution you must compile the program from the CVS "
+"sources after retrieving OpenLDAP from the link below."
 msgstr ""
 "この Evolution のバージョンは LDAP サポートをせずにコンパイル\n"
 "されています. Evolution で LDAP を使いたいならば, 下記リンク\n"
@@ -280,9 +299,8 @@ msgstr ""
 #: addressbook/gui/component/addressbook.c:613
 #, fuzzy
 msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the server\n"
-"is unreachable."
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
 msgstr ""
 "このアドレス帳を開くことが出来ません. これは誤ったURI\n"
 "を入力したか, あるいは LDAP サーバが落ちているかのどちらか\n"
@@ -345,12 +363,13 @@ msgstr "
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/calendar-setup.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
 #: calendar/gui/dialogs/new-task-list.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
@@ -389,19 +408,24 @@ msgid "Addressbook Creation Assistant"
 msgstr "アドレス帳のソース"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "Addressbook Properties"
+msgstr "アドレス帳のソース"
+
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Addressbook Sources"
 msgstr "アドレス帳のソース"
 
-#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:66
+#: addressbook/gui/component/ldap-config.glade.h:14 mail/mail-account-gui.c:66
 #: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "常に使用"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid "Anonymously"
 msgstr "匿名"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid ""
 "Congratulations, you are finished setting up this addressbook.\n"
 "\n"
@@ -409,21 +433,16 @@ msgid ""
 "here."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:18
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Connecting"
 msgstr "%s に再接続中"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "リスト名(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
-#, fuzzy
-msgid "Edit LDAP Server"
-msgstr "LDAP サーバ"
-
 #: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address:"
@@ -439,17 +458,20 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:24
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "Finished"
 msgstr "検索(_I)"
 
 #: addressbook/gui/component/ldap-config.glade.h:25
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "一般"
 
 #: addressbook/gui/component/ldap-config.glade.h:26
+#: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "Group:"
 msgstr "グループ"
@@ -479,7 +501,7 @@ msgid "S_earch scope: "
 msgstr "検索範囲(_C): "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:605
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:660
 #: calendar/gui/gnome-cal.c:586
 #, fuzzy
 msgid "Searching"
@@ -518,6 +540,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:45
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
@@ -531,6 +554,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:48
+#: calendar/gui/dialogs/calendar-setup.glade.h:20
 msgid "Step 1: Folder Characteristics"
 msgstr ""
 
@@ -622,6 +646,7 @@ msgid ""
 msgstr "この名前はアカウントを表しています。表示するためだけのものです。"
 
 #: addressbook/gui/component/ldap-config.glade.h:74
+#: calendar/gui/dialogs/calendar-setup.glade.h:34
 #, fuzzy
 msgid ""
 "This is the name that will appear in your Evolution folder list. It is for "
@@ -667,6 +692,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:85
+#: calendar/gui/dialogs/calendar-setup.glade.h:37
 msgid "_Display name:"
 msgstr "表示名(_D):"
 
@@ -674,13 +700,15 @@ msgstr "表
 msgid "_Download limit:"
 msgstr "ダウンロード制限(_D):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:43
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-tasks.xml.h:20
 msgid "_Edit"
 msgstr "編集(_E)"
 
@@ -725,37 +753,37 @@ msgstr ""
 msgid "Evolution Addressbook name selection interface"
 msgstr "Evolution のアドレス帳の名前選択インターフェース"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:205
+#: addressbook/gui/component/select-names/e-select-names-popup.c:207
 msgid "Remove All"
 msgstr "すべて削除"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:694
+#: addressbook/gui/component/select-names/e-select-names-popup.c:214
+#: addressbook/gui/component/select-names/e-select-names.c:693
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "削除"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:219
+#: addressbook/gui/component/select-names/e-select-names-popup.c:221
 #, fuzzy
 msgid "View Contact List"
 msgstr "新規連絡先リスト"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:219
+#: addressbook/gui/component/select-names/e-select-names-popup.c:221
 #, fuzzy
 msgid "View Contact Info"
 msgstr "連絡先情報の編集"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:226
-#: addressbook/gui/component/select-names/e-select-names-popup.c:336
+#: addressbook/gui/component/select-names/e-select-names-popup.c:228
+#: addressbook/gui/component/select-names/e-select-names-popup.c:338
 msgid "Send HTML Mail?"
 msgstr "HTML メールを送信しますか?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:328
+#: addressbook/gui/component/select-names/e-select-names-popup.c:330
 #: addressbook/gui/widgets/eab-popup-control.c:1002
 msgid "Add to Contacts"
 msgstr "連絡先へ追加"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:354
+#: addressbook/gui/component/select-names/e-select-names-popup.c:356
 msgid "Unnamed Contact"
 msgstr "名前のない連絡先"
 
@@ -771,42 +799,40 @@ msgstr "名
 msgid "Source"
 msgstr "ソース"
 
-#: addressbook/gui/component/select-names/e-select-names.c:518
-msgid "Select Contacts from Addressbook"
+#: addressbook/gui/component/select-names/e-select-names.c:494
+#, fuzzy
+msgid "Select Contents from Address Book"
 msgstr "アドレス帳から連絡先を選択"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
-msgid "Find"
-msgstr "検索:"
+msgid "<b>Contacts</b>"
+msgstr "<b>説明:</b>"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "名前を選択"
+#, fuzzy
+msgid "<b>Show Contacts</b>"
+msgstr "連絡先"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
 #, fuzzy
-msgid "Selected Contacts:"
-msgstr "連絡先を削除しますか?"
+msgid "Address _Book:"
+msgstr "アドレス帳"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:5
 #, fuzzy
-msgid "Show Contacts"
-msgstr "連絡先"
+msgid "C_ategory:"
+msgstr "カテゴリ(_C):"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid ""
-"Type a name into the entry, or\n"
-"select one from the list below:"
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Category:"
-msgstr "カテゴリ(_C):"
+#, fuzzy
+msgid "Select Contacts from Address Book"
+msgstr "アドレス帳から連絡先を選択"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-msgid "_Folder:"
-msgstr "フォルダ(_F)"
+#: addressbook/gui/component/select-names/select-names.glade.h:7
+#, fuzzy
+msgid "_Find"
+msgstr "検索:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #, fuzzy
@@ -851,7 +877,7 @@ msgstr "
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:1520
+#: addressbook/gui/contact-editor/e-contact-editor.c:1989
 msgid "Contact Editor"
 msgstr "連絡先エディタ"
 
@@ -866,19 +892,32 @@ msgid "Details"
 msgstr "詳細"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "Enter the person's instant messenger accounts here."
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "F_ree/Busy URL:"
 msgstr "空き/多忙 URL(_R):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #, fuzzy
 msgid "File a_s:"
 msgstr "別名(_S):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Full _Name..."
 msgstr "フルネーム(_N)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#, fuzzy
+msgid ""
+"If this person has the ability to participate in a video conference, enter "
+"their address here."
+msgstr ""
+"この人が 空き/多忙情報や他のカレンダー情報をインターネットに公開したら,\n"
+" そのアドレス情報をここに入力します。"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
 "Internet, enter the address\n"
@@ -887,97 +926,106 @@ msgstr ""
 "この人が 空き/多忙情報や他のカレンダー情報をインターネットに公開したら,\n"
 " そのアドレス情報をここに入力します。"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#, fuzzy
+msgid "Instant Messaging"
+msgstr "ポストメッセージ(_P)"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "New phone type"
 msgstr "新規電話種別"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "No_tes:"
 msgstr "ノート(_T):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "Organi_zation:"
 msgstr "会社(_Z):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "P_rofession:"
 msgstr "職業(_P):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Primary _email:"
 msgstr "主要なメール"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "S_pouse:"
 msgstr "配偶者(_P):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Wants to receive _HTML mail"
 msgstr "HTML メールを受信許可(_H)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Add"
 msgstr "追加(_A)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "_Business:"
 msgstr "仕事(_B)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "_Categories..."
 msgstr "カテゴリ(_T)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1236
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-calendar-table.c:1043
-#: calendar/gui/e-calendar-table.c:1061 mail/em-folder-tree.c:1502
-#: mail/em-folder-view.c:706 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1264
+#: calendar/gui/e-cal-view.c:1295 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-table.c:1073 mail/em-folder-tree.c:1654
+#: mail/em-folder-view.c:731 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
-#: ui/evolution-tasks.xml.h:18
+#: ui/evolution-tasks.xml.h:19
 msgid "_Delete"
 msgstr "削除(_D)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "_Home:"
 msgstr "家(_H)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Job title:"
 msgstr "職種(_J):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #, fuzzy
 msgid "_Manager's name:"
 msgstr "マネージャの名前(_M):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "_Mobile:"
 msgstr "モバイル(_M)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Nickname:"
 msgstr "ニックネーム(_N):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Office:"
 msgstr "オフィス(_O):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Public Calendar URL:"
 msgstr "公開カレンダ URI:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
 msgid "_This is the mailing address"
 msgstr "これは郵便物の住所です(_M)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:43
+msgid "_Video Conferencing URL:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Web page address:"
 msgstr "ウェブページのURL(_W):"
 
@@ -988,7 +1036,7 @@ msgstr "
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor.c:226
+#: addressbook/gui/contact-editor/e-contact-editor.c:242
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -1197,10 +1245,13 @@ msgid "Comoros"
 msgstr "コモロ諸島"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:185
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo"
 msgstr "コンゴ"
 
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+msgid "Congo, The Democratic Republic Of The"
+msgstr ""
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cook Islands"
 msgstr ""
@@ -1246,117 +1297,118 @@ msgid "Dominican Republic"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "East Timor"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ecuador"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Egypt"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "El Salvador"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Estonia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Finland"
 msgstr "フィンランド"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "France"
 msgstr "フランス"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Georgia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Germany"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Gibraltar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Greece"
 msgstr "ギリシア"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "グリーンランド"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "グレナダ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "グアム"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guatemala"
 msgstr ""
 
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#, fuzzy
+msgid "Guernsey"
+msgstr "ケニア"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea"
 msgstr "ギニア共和国"
@@ -1406,546 +1458,585 @@ msgid "Indonesia"
 msgstr "インドネシア"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#, fuzzy
+msgid "Iran"
+msgstr "ポーランド"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#, fuzzy
+msgid "Iraq"
+msgstr "イスラエル"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Ireland"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+msgid "Isle of Man"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Israel"
 msgstr "イスラエル"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Italy"
 msgstr "イタリア"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Jamaica"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Japan"
 msgstr "日本"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#, fuzzy
+msgid "Jersey"
+msgstr "新規"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jordan"
 msgstr "ジョーダン"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kazakhstan"
 msgstr "カザフスタン"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kenya"
 msgstr "ケニア"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kiribati"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+msgid "Korea, Democratic People's Republic Of"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Kuwait"
 msgstr "クウェート"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kyrgyzstan"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Laos"
 msgstr "ラオス"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Latvia"
 msgstr "ラトビア"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lebanon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lesotho"
 msgstr "レソト"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Liberia"
 msgstr "リベリア"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#, fuzzy
+msgid "Libya"
+msgstr "リベリア"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Liechtenstein"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Lithuania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Luxembourg"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Macau"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#, fuzzy
+msgid "Macao"
 msgstr "マカオ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macedonia"
 msgstr "マケドニア"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Madagascar"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malawi"
 msgstr "マラウイ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malaysia"
 msgstr "マレーシア"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Maldives"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mali"
 msgstr "マリ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Malta"
 msgstr "マルタ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Marshall Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Martinique"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mauritania"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritius"
 msgstr "モーリシャス"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mayotte"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mexico"
 msgstr "メキシコ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Micronesia"
 msgstr "ミクロネシア"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Moldova, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Monaco"
 msgstr "モナコ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Mongolia"
 msgstr "モンゴル"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Montserrat"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Morocco"
 msgstr "モロッコ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Mozambique"
 msgstr "モザンビーク"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Myanmar"
 msgstr "ミャンマー"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Namibia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Nauru"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nepal"
 msgstr "ネパール"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Netherlands"
 msgstr "オランダ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands Antilles"
 msgstr "オランダ領アンティル諸島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "New Caledonia"
 msgstr "ニューカレドニア"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Zealand"
 msgstr "ニュージーランド"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Nicaragua"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Niger"
 msgstr "ニジェール"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Nigeria"
 msgstr "ナイジェリア"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Niue"
 msgstr "ニウエ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Norfolk Island"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Northern Mariana Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Norway"
 msgstr "ノルウェー"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Oman"
 msgstr "オマーン"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Pakistan"
 msgstr "パキスタン"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Palau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 #, fuzzy
 msgid "Palestinian Territory"
 msgstr "英領インド海域"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Panama"
 msgstr "パナマ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Papua New Guinea"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Paraguay"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Peru"
 msgstr "ペルー"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Philippines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Pitcairn"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Poland"
 msgstr "ポーランド"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Portugal"
 msgstr "ポルトガル"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Puerto Rico"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Qatar"
 msgstr "カタール"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Reunion"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Romania"
 msgstr "ルーマニア"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Russian Federation"
 msgstr "ロシア共和国"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Rwanda"
 msgstr "ルワンダ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Saint Kitts And Nevis"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Lucia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Vincent And The Grena-dines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Samoa"
 msgstr "サモア諸島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "San Marino"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sao Tome And Principe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Saudi Arabia"
 msgstr "サウジアラビア"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Senegal"
 msgstr "セネガル"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+msgid "Serbia And Montenegro"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Seychelles"
 msgstr "セイシェル"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Sierra Leone"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Singapore"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Slovakia"
 msgstr "スロバキア"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovenia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Solomon Islands"
 msgstr "ソロモン島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Somalia"
 msgstr "ソマリア"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "South Africa"
 msgstr "南アフリカ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Spain"
 msgstr "スペイン"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Sri Lanka"
 msgstr "スリランカ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "St. Helena"
 msgstr "セントヘレナ島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Pierre And Miquelon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sudan"
 msgstr "スーダン"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Suriname"
 msgstr "スリナム"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Svalbard And Jan Mayen Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Swaziland"
 msgstr "スワジランド"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Sweden"
 msgstr "スウェーデン"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Switzerland"
 msgstr "スイス"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#, fuzzy
+msgid "Syria"
+msgstr "スリナム"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Taiwan"
 msgstr " 台湾"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tajikistan"
 msgstr "タジキスタン"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tanzania, United Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Thailand"
 msgstr "タイ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#, fuzzy
+msgid "Timor-Leste"
+msgstr "テスト"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Togo"
 msgstr "トーゴ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Tokelau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tonga"
 msgstr "トンガ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Trinidad And Tobago"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tunisia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Turkey"
 msgstr "トルコ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkmenistan"
 msgstr "トルクメニスタン"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turks And Caicos Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Tuvalu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uganda"
 msgstr "ウガンダ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Ukraine"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "United Arab Emirates"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Kingdom"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Uruguay"
 msgstr " ウルグアイ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uzbekistan"
 msgstr "ウズベキスタン"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Vanuatu"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Venezuela"
 msgstr "ベネズエラ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Viet Nam"
 msgstr "ベトナム"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:371
 #, fuzzy
 msgid "Virgin Islands, British"
 msgstr "英バージン島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:372
 #, fuzzy
 msgid "Virgin Islands, U.S."
 msgstr "英バージン島"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Wallis And Futuna Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Western Sahara"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Yemen"
 msgstr "イエメン"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Yugoslavia"
-msgstr "ユーゴスラビア"
-
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Zambia"
 msgstr "ザンビア"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zimbabwe"
 msgstr "ジンバブエ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#: addressbook/gui/contact-editor/e-contact-editor.c:207
 #, fuzzy
 msgid "Source Book"
 msgstr "ソース"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:198
+#: addressbook/gui/contact-editor/e-contact-editor.c:214
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:205
+#: addressbook/gui/contact-editor/e-contact-editor.c:221
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
@@ -1953,36 +2044,45 @@ msgstr ""
 msgid "Contact"
 msgstr "連絡先"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:212
+#: addressbook/gui/contact-editor/e-contact-editor.c:228
 #, fuzzy
 msgid "Is New Contact"
 msgstr "新規連絡先"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:219
+#: addressbook/gui/contact-editor/e-contact-editor.c:235
 #, fuzzy
 msgid "Writable Fields"
 msgstr "差出人フィールド(_F)"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:233
+#: addressbook/gui/contact-editor/e-contact-editor.c:249
 #, fuzzy
 msgid "Changed"
 msgstr "チャド"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:976
+#: addressbook/gui/contact-editor/e-contact-editor.c:708
+#, fuzzy
+msgid "Service"
+msgstr "サービスは利用できます"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:722
+msgid "Account Name"
+msgstr "アカウント名"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1426
 #, fuzzy
 msgid "Category editor not available."
 msgstr "説明はありません。"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:984
+#: addressbook/gui/contact-editor/e-contact-editor.c:1434
 msgid "This contact belongs to these categories:"
 msgstr "この連絡先はこれらのカテゴリに所属しています:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1206
+#: addressbook/gui/contact-editor/e-contact-editor.c:1657
 #, fuzzy
 msgid "Save Contact as VCard"
 msgstr "VCard で保存"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1697
 #, fuzzy
 msgid ""
 "Are you sure you want\n"
@@ -1991,7 +2091,7 @@ msgstr ""
 "本当にこの連絡先を\n"
 "削除してもよろしいですか?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1249
+#: addressbook/gui/contact-editor/e-contact-editor.c:1700
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1999,19 +2099,41 @@ msgstr ""
 "本当にこの連絡先を\n"
 "削除してもよろしいですか?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2028
+#: addressbook/gui/contact-editor/e-contact-editor.c:2497
 msgid "Business"
 msgstr "仕事"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2498
 msgid "Home"
 msgstr "家"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2030
+#: addressbook/gui/contact-editor/e-contact-editor.c:2499
 msgid "Other"
 msgstr "その他"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2569
+#: addressbook/gui/contact-editor/e-contact-editor.c:2807
+msgid "AIM"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2808
+#, fuzzy
+msgid "Jabber"
+msgstr "名前のないリスト"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2809
+#, fuzzy
+msgid "Yahoo"
+msgstr "インド"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2810
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2811
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:3098
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "フィールド`%s'のウィジェットが見つかりませんでした"
@@ -2374,9 +2496,9 @@ msgstr "
 
 #. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:1015
-#: calendar/gui/calendar-component.c:433
+#: calendar/gui/calendar-component.c:408
 #: calendar/gui/dialogs/copy-source-dialog.c:136
-#: calendar/gui/tasks-component.c:414 ui/evolution-addressbook.xml.h:2
+#: calendar/gui/tasks-component.c:397 ui/evolution-addressbook.xml.h:2
 #: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "コピー"
@@ -2387,7 +2509,7 @@ msgid "Paste"
 msgstr "貼り付け"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1021
-#: calendar/gui/e-cal-view.c:1205
+#: calendar/gui/e-cal-view.c:1233
 msgid "Current View"
 msgstr "現在のビュー"
 
@@ -2708,7 +2830,7 @@ msgstr "
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1012
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1010
 msgid "Unknown error"
 msgstr "不明なエラー"
 
@@ -2735,9 +2857,9 @@ msgid "Protocol not supported"
 msgstr "プロトコルはサポートされていません"
 
 #: addressbook/gui/widgets/eab-gui-util.c:50
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:601
-#: calendar/gui/e-calendar-table.c:465 calendar/gui/e-tasks.c:213
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:212
 #: calendar/gui/print.c:2319 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
@@ -2961,13 +3083,13 @@ msgstr ""
 msgid "Print envelope"
 msgstr "封筒を印刷"
 
-#: addressbook/printing/e-contact-print.c:1003
+#: addressbook/printing/e-contact-print.c:1004
 #, fuzzy
 msgid "Print contacts"
 msgstr "選択した連絡先を印刷します"
 
-#: addressbook/printing/e-contact-print.c:1069
-#: addressbook/printing/e-contact-print.c:1096
+#: addressbook/printing/e-contact-print.c:1070
+#: addressbook/printing/e-contact-print.c:1097
 #, fuzzy
 msgid "Print contact"
 msgstr "選択した連絡先を印刷します"
@@ -3244,6 +3366,12 @@ msgstr "
 msgid "Unnamed List"
 msgstr "名前のないリスト"
 
+#: calendar/common/authentication.c:34 calendar/gui/itip-utils.c:1156
+#: smime/gui/component.c:39
+#, fuzzy
+msgid "Enter password"
+msgstr "パスワードを入力してください"
+
 #: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr ""
@@ -3328,8 +3456,8 @@ msgid "Evolution's Tasks component"
 msgstr "Evolution メールコンポーザ"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1795
-#: calendar/gui/tasks-control.c:490
+#: calendar/gui/e-tasks.c:1042 calendar/gui/print.c:1795
+#: calendar/gui/tasks-control.c:505
 #: calendar/importers/icalendar-importer.c:717
 #: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
 msgid "Tasks"
@@ -3376,11 +3504,26 @@ msgstr "
 msgid "_Edit appointment"
 msgstr "アポイントの編集(_E)"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:871
+#: calendar/gui/alarm-notify/alarm-queue.c:900 calendar/gui/e-cal-view.c:1246
+#: calendar/gui/e-cal-view.c:1311 calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1076 mail/em-folder-view.c:706
+#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "開く(_O)"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:902
+msgid "_Dismiss"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:904
+msgid "Dismiss _All"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 msgid "No description available."
 msgstr "説明はありません。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:889
+#: calendar/gui/alarm-notify/alarm-queue.c:987
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3389,12 +3532,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:976
-#: calendar/gui/alarm-notify/alarm-queue.c:1000
+#: calendar/gui/alarm-notify/alarm-queue.c:1079
+#: calendar/gui/alarm-notify/alarm-queue.c:1103
 msgid "Warning"
 msgstr "警告"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:980
+#: calendar/gui/alarm-notify/alarm-queue.c:1083
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3406,7 +3549,7 @@ msgstr ""
 "設定すれば、代わりに通常のリマインダダイアログボックス\n"
 "にて表示します。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1006
+#: calendar/gui/alarm-notify/alarm-queue.c:1109
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3423,24 +3566,24 @@ msgstr ""
 "\n"
 "本当にこのプログラムを起動してよいですか?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1020
+#: calendar/gui/alarm-notify/alarm-queue.c:1123
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "二度と質問しない"
 
-#: calendar/gui/alarm-notify/notify-main.c:159
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo の初期化が出来ませんでした"
 
-#: calendar/gui/alarm-notify/notify-main.c:162
+#: calendar/gui/alarm-notify/notify-main.c:163
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs の初期化が出来ませんでした"
 
-#: calendar/gui/alarm-notify/notify-main.c:171
+#: calendar/gui/alarm-notify/notify-main.c:172
 msgid "Could not create the alarm notify service factory"
 msgstr "アラーム通知サービスファクトリを作成出来ませんでした"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:110
 msgid "invalid time"
 msgstr "不正な時間"
 
@@ -3484,96 +3627,100 @@ msgid "Intervals shown in Day and Work Week views"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
-msgid "Minute the workday ends on"
+msgid "List of urls for free/busy publishing"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
-msgid "Minute the workday starts on"
+msgid "Minute the workday ends on"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
-msgid "Number of units for default reminder"
+msgid "Minute the workday starts on"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
-msgid "Number of units for determining when to hide tasks"
+msgid "Number of units for default reminder"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Position of the horizontal pane"
+msgid "Number of units for determining when to hide tasks"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Position of the horizontal pane in the month view"
+msgid "Position of the horizontal pane"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
-msgid "Position of the vertical pane"
+msgid "Position of the horizontal pane in the month view"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
-msgid "Position of the vertical pane in the month view"
+msgid "Position of the vertical pane"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Position of the vertical pane in the task view"
+msgid "Position of the vertical pane in the month view"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
-msgid "Programs that can run as part of alarms"
+msgid "Position of the vertical pane in the task view"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 #, fuzzy
 msgid "Show where events end in week and month views"
 msgstr "アポイントの終了時間を週間と月間で表示(_S)"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 #, fuzzy
 msgid "The view showing when the calendar starts"
 msgstr "印刷されるカレンダのプレビューを表示します"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Time last alarm ran"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "Units for determining when to hide tasks"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 #, fuzzy
 msgid "Units of default reminder"
 msgstr "標準のリマインだで新規アポイントを作成します"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Weekday the week starts on"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 #, fuzzy
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "アイテムの削除時に確認をとる(_A)"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 #, fuzzy
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "アイテムの削除時に確認をとる(_A)"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 #, fuzzy
 msgid "Whether to hide completed tasks"
 msgstr "選択したタスクを削除します"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr ""
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "日付ナビゲータで週番号を表示(_N)"
@@ -3590,11 +3737,11 @@ msgstr "
 msgid "Comment contains"
 msgstr "コメントが次のものを含む"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1117
 msgid "Unmatched"
 msgstr "不一致"
 
-#: calendar/gui/calendar-commands.c:371
+#: calendar/gui/calendar-commands.c:342
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3606,129 +3753,141 @@ msgstr ""
 "\n"
 "本当にこれらのメッセージを消去しますか?"
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:348
 #, fuzzy
 msgid "Purge events older than"
 msgstr "が次のものより小さい"
 
-#: calendar/gui/calendar-commands.c:383
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/calendar-commands.c:353
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "日"
 
-#: calendar/gui/calendar-commands.c:452
+#: calendar/gui/calendar-commands.c:422
 msgid "%A %d %B %Y"
 msgstr "%Y年%m月%d日 %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:455 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/calendar-commands.c:425 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/e-day-view.c:1365 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%m/%d (%a)"
 
-#: calendar/gui/calendar-commands.c:457 calendar/gui/calendar-commands.c:462
-#: calendar/gui/calendar-commands.c:464
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434
 msgid "%a %d %b %Y"
 msgstr "%Y/%m/%d (%a)"
 
-#: calendar/gui/calendar-commands.c:481 calendar/gui/calendar-commands.c:487
-#: calendar/gui/calendar-commands.c:493 calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:463 calendar/gui/calendar-commands.c:465
 msgid "%d %B %Y"
 msgstr "%Y年%m月%d日"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:455
 #: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1516
 msgid "%d %B"
 msgstr "%m月%d日"
 
-#: calendar/gui/calendar-component.c:369
+#: calendar/gui/calendar-component.c:361
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:410
-#, fuzzy
-msgid "Rename this calendar to"
-msgstr "このカレンダを印刷します"
-
-#: calendar/gui/calendar-component.c:431
+#: calendar/gui/calendar-component.c:406
+#: calendar/gui/dialogs/calendar-setup.glade.h:13
 #, fuzzy
 msgid "New Calendar"
 msgstr "ニューカレドニア"
 
-#: calendar/gui/calendar-component.c:615
+#. create the remote source group
+#: calendar/gui/calendar-component.c:544 calendar/gui/calendar-component.c:573
+msgid "On The Web"
+msgstr ""
+
+#. red
+#: calendar/gui/calendar-component.c:564 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:135
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "仕事"
+
+#: calendar/gui/calendar-component.c:584 calendar/gui/calendar-component.c:596
+msgid "Birthdays & Anniversaries"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:595
+#, fuzzy
+msgid "Birthdays"
+msgstr "誕生日(_Y):"
+
+#: calendar/gui/calendar-component.c:720
 msgid "New appointment"
 msgstr "新規アポイント"
 
-#: calendar/gui/calendar-component.c:616
+#: calendar/gui/calendar-component.c:721
 msgid "_Appointment"
 msgstr "アポイント(_A)"
 
-#: calendar/gui/calendar-component.c:617
+#: calendar/gui/calendar-component.c:722
 msgid "Create a new appointment"
 msgstr "新規アポイントを作成します"
 
-#: calendar/gui/calendar-component.c:622
+#: calendar/gui/calendar-component.c:727
 msgid "New meeting"
 msgstr "新規ミーティング"
 
-#: calendar/gui/calendar-component.c:623
+#: calendar/gui/calendar-component.c:728
 #, fuzzy
 msgid "M_eeting"
 msgstr "会議"
 
-#: calendar/gui/calendar-component.c:624
+#: calendar/gui/calendar-component.c:729
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "新規ミーティング要求作成"
 
-#: calendar/gui/calendar-component.c:629
+#: calendar/gui/calendar-component.c:734
 #, fuzzy
 msgid "New all day appointment"
 msgstr "新規終日アポイント"
 
-#: calendar/gui/calendar-component.c:630
+#: calendar/gui/calendar-component.c:735
 msgid "All _Day Appointment"
 msgstr "終日アポイント(_D)"
 
-#: calendar/gui/calendar-component.c:631
+#: calendar/gui/calendar-component.c:736
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "新規アポイントを作成します"
 
-#: calendar/gui/calendar-component.c:636
+#: calendar/gui/calendar-component.c:741
 #, fuzzy
 msgid "New calendar"
 msgstr "ニューカレドニア"
 
-#: calendar/gui/calendar-component.c:637
+#: calendar/gui/calendar-component.c:742
 #, fuzzy
 msgid "C_alendar"
 msgstr "カレンダ(_A):"
 
-#: calendar/gui/calendar-component.c:638
+#: calendar/gui/calendar-component.c:743
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "新規フォルダを作成します"
 
-#: calendar/gui/calendar-component.c:705
+#: calendar/gui/calendar-component.c:810
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:718
+#: calendar/gui/calendar-component.c:822
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#. create the remote source group
-#: calendar/gui/calendar-component.c:855
-msgid "On The Web"
-msgstr ""
-
 #: calendar/gui/calendar-offline-handler.c:192
 #, c-format
 msgid "backend_go_offline(): %s"
@@ -3774,7 +3933,7 @@ msgstr ""
 msgid "Permission denied to open the calendar"
 msgstr "許可がありません"
 
-#: calendar/gui/comp-editor-factory.c:519
+#: calendar/gui/comp-editor-factory.c:518
 #, c-format
 msgid "open_client(): %s"
 msgstr ""
@@ -3813,80 +3972,55 @@ msgstr "
 msgid "Unknown Alarm Options"
 msgstr "不明アラームオプション"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-#: calendar/gui/dialogs/task-details-page.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
-msgid "    "
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-#, fuzzy
-msgid "<b>Alarm Action</b>"
-msgstr "カレンダ情報"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-#, fuzzy
-msgid "<b>Alarm Email</b>"
-msgstr "メールを送信中"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 #, fuzzy
-msgid "<b>Alarm Repeat</b>"
+msgid "Alarm Repeat"
 msgstr "アラームの繰り返し"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-#, fuzzy
-msgid "<b>Alarm Sound</b>"
-msgstr "カレンダ情報"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:3
 #, fuzzy
-msgid "<b>Message to Display</b>"
-msgstr "表示するメッセージ"
+msgid "Message to Display:"
+msgstr "メッセージ表示"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8
+#: calendar/gui/dialogs/alarm-options.glade.h:4
 #, fuzzy
 msgid "Message to Send"
 msgstr "メッセージ本体"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "音楽を再生:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "アラームを繰り返す"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "プログラムを実行する:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
+#: calendar/gui/dialogs/alarm-options.glade.h:8
 #, fuzzy
 msgid "Send To:"
 msgstr "送信"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "これらの引数をとる:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:15 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:16
+#: calendar/gui/dialogs/alarm-options.glade.h:12
 msgid "extra times every"
 msgstr "次の時間毎に延長"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:17 filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
 msgid "hours"
 msgstr "時"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:18 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "分"
 
@@ -3894,221 +4028,224 @@ msgstr "分"
 msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
-#, fuzzy
-msgid "<b>Basics</b>"
-msgstr "<b>説明:</b>"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#, fuzzy
-msgid "<b>Reminders</b>"
-msgstr "催促状"
+msgid "Basics"
+msgstr "基本"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "Date/Time:"
 msgstr "日付/時間:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:463
 msgid "Display a message"
 msgstr "メッセージを表示"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:459
 msgid "Play a sound"
 msgstr "次の時に音楽を再生する:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#, fuzzy
+msgid "Reminders"
+msgstr "催促状"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:471
 msgid "Run a program"
 msgstr "次の時にプログラムを実行する:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.glade.h:7
 #, fuzzy
 msgid "Send an Email"
 msgstr "次の時にメールを送信する:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-itip-control.c:933 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:168
+#: calendar/gui/e-tasks.c:167
 msgid "Summary:"
 msgstr "サマリ:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:9
 msgid "_Options..."
 msgstr "オプション(_O)..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:10
 msgid "after"
 msgstr "後"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "before"
 msgstr "前"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "日"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "end of appointment"
 msgstr "アポイントの終了"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 msgid "hour(s)"
 msgstr "時"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:40 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "分"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "start of appointment"
 msgstr "アポイントの開始"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
 msgstr "05 分"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "10 minutes"
 msgstr "10 分"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "15 minutes"
 msgstr "15 分"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "30 minutes"
 msgstr "30 分"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "60 minutes"
 msgstr "60 分"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Alerts</b>"
-msgstr "<b>説明:</b>"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, fuzzy
-msgid "<b>Task List</b>"
-msgstr "カレンダ情報"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#, fuzzy
-msgid "<b>Time</b>"
-msgstr "<b>説明:</b>"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Work Week</b>"
-msgstr "週間"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:15
+msgid "Alerts"
+msgstr "警告"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "Calendar and Tasks Settings"
 msgstr "カレンダとタスクの設定..."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Color for overdue tasks"
 msgstr "期限切れの色"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Color for tasks due today"
 msgstr "今日が期限の色"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Day _ends:"
 msgstr "一日の終了(_E):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Days"
 msgstr "日間"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: mail/mail-config.glade.h:51
+msgid "E_nable"
+msgstr "有効(_N)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #: calendar/gui/dialogs/recurrence-page.c:1048
 #: calendar/gui/e-itip-control.c:557
 msgid "Friday"
 msgstr "金曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Hours"
 msgstr "時間"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Minutes"
 msgstr "分"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:553
 msgid "Monday"
 msgstr "月曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "S_un"
 msgstr "日(_U)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:558
 msgid "Saturday"
 msgstr "土曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Sh_ow a reminder"
 msgstr "リマインダをアポイントの"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Show week _numbers in date navigator"
 msgstr "日付ナビゲータで週番号を表示(_N)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:552
 msgid "Sunday"
 msgstr "日曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "T_asks due today:"
 msgstr "今日が期限のタスク(_A):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "T_hu"
 msgstr "木(_H)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#, fuzzy
+msgid "Task List"
+msgstr "タスクリスト"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:556
 msgid "Thursday"
 msgstr "木曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Time"
+msgstr "時間"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Time _zone:"
 msgstr "タイムゾーン(_Z):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Time format:"
 msgstr "時間の書式:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:554
 msgid "Tuesday"
 msgstr "火曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "W_eek starts:"
 msgstr "週の開始曜日(_E):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:555
 msgid "Wednesday"
 msgstr "水曜日"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ui/evolution-calendar.xml.h:32
+msgid "Work Week"
+msgstr "週間"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Work days:"
 msgstr "平日:"
@@ -4122,66 +4259,206 @@ msgid "_24 hour"
 msgstr "_24 時間"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "_Add URL"
+msgstr "追加(_A)->"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Ask for confirmation when deleting items"
 msgstr "アイテムの削除時に確認をとる(_A)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Compress weekends in month view"
 msgstr "月間表示で週末を表示しない(_C)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Day begins:"
 msgstr "一日の開始"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Display"
 msgstr "表示(_D)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#, fuzzy
+msgid "_Free/Busy Publishing"
+msgstr "空き/多忙 の要求"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Fri"
 msgstr "金(_F)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "一般(_G)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Hide completed tasks after"
 msgstr "完了済みタスクを次の時間経過後に隠す(_H)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Mon"
 msgstr "月(_M)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Overdue tasks:"
 msgstr "期限切れタスク(_O)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Sat"
 msgstr "土(_S)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Show appointment end times in week and month views"
 msgstr "アポイントの終了時間を週間と月間で表示(_S)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Time divisions:"
 msgstr "時分割(_T):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Tue"
 msgstr "火(_T)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Wed"
 msgstr "水(_W)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "before every appointment"
 msgstr "前に表示する"
 
+#: calendar/gui/dialogs/calendar-setup.c:155
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "スタイル名:"
+
+#: calendar/gui/dialogs/calendar-setup.c:163
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "'%s' を読み込むことを要求されるメソッドはサポートしていません"
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:213
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:226
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:254
+#, fuzzy
+msgid "Could not create directory for new calendar"
+msgstr "ディレクトリ %s を作成出来ませんでした: %s"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Calendar Creation Assistant"
+msgstr "アドレス帳のソース"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Calendar Properties"
+msgstr "iCalendar エラー"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid ""
+"Congratulations, you are finished setting up this calendar.\n"
+"\n"
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid ""
+"Congratulations, you are finished setting up this task list.\n"
+"\n"
+"Please click the \"Finish\" button to save the settings you have entered "
+"here."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+#: calendar/gui/tasks-component.c:395
+#, fuzzy
+msgid "New Task List"
+msgstr "タスクリスト"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#, fuzzy
+msgid "Remote"
+msgstr "削除"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid ""
+"Specifying a display name and group is the first step in setting up a "
+"calendar."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:19
+msgid ""
+"Specifying a display name and group is the first step in setting up a task "
+"list."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:21
+msgid "Step 2: Remote Folder Parameters"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:22
+#, fuzzy
+msgid "Task List Creation Assistant"
+msgstr "アドレス帳のソース"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23
+#, fuzzy
+msgid "Task List Properties"
+msgstr "タスクリスト"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:24
+msgid ""
+"This assistant will help you create a new calendar. \n"
+"\n"
+"Depending on the type of calendar you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:29
+msgid ""
+"This assistant will help you create a new task list.\n"
+"\n"
+"Depending on the type of task list you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:35
+msgid ""
+"You're creating a folder in a group that's stored in a remote location. This "
+"requires you\n"
+"to specify additional parameters."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:38
+#, fuzzy
+msgid "_Refresh Interval:"
+msgstr "リストを更新(_R)"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:39
+#, fuzzy
+msgid "_Source URL:"
+msgstr "POP ソース URI"
+
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4281,53 +4558,53 @@ msgstr " (
 msgid "Due "
 msgstr "期日 "
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:404
 msgid "Could not update object"
 msgstr "オブジェクトを更新できませんでした"
 
-#: calendar/gui/dialogs/comp-editor.c:818
-#: calendar/gui/dialogs/comp-editor.c:855
+#: calendar/gui/dialogs/comp-editor.c:870
+#: calendar/gui/dialogs/comp-editor.c:907
 msgid "Edit Appointment"
 msgstr "アポイントの編集"
 
-#: calendar/gui/dialogs/comp-editor.c:823
-#: calendar/gui/dialogs/comp-editor.c:860
+#: calendar/gui/dialogs/comp-editor.c:875
+#: calendar/gui/dialogs/comp-editor.c:912
 #, c-format
 msgid "Appointment - %s"
 msgstr "アポイント - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:826
-#: calendar/gui/dialogs/comp-editor.c:863
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 #, c-format
 msgid "Task - %s"
 msgstr "タスク - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:829
-#: calendar/gui/dialogs/comp-editor.c:866
+#: calendar/gui/dialogs/comp-editor.c:881
+#: calendar/gui/dialogs/comp-editor.c:918
 #, c-format
 msgid "Journal entry - %s"
 msgstr "仕訳記入 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:840
-#: calendar/gui/dialogs/comp-editor.c:876
+#: calendar/gui/dialogs/comp-editor.c:892
+#: calendar/gui/dialogs/comp-editor.c:928
 msgid "No summary"
 msgstr "サマリはありません"
 
-#: calendar/gui/dialogs/comp-editor.c:1313 calendar/gui/e-cal-view.c:992
-#: calendar/gui/e-calendar-table.c:1175 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1353 calendar/gui/e-cal-view.c:1047
+#: calendar/gui/e-calendar-table.c:1187 composer/e-msg-composer.c:1128
 msgid "Save as..."
 msgstr "別名で保存..."
 
-#: calendar/gui/dialogs/comp-editor.c:1416
-#: calendar/gui/dialogs/comp-editor.c:1440
-#: calendar/gui/dialogs/comp-editor.c:1466
+#: calendar/gui/dialogs/comp-editor.c:1456
+#: calendar/gui/dialogs/comp-editor.c:1480
+#: calendar/gui/dialogs/comp-editor.c:1506
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1506
-#: calendar/gui/dialogs/comp-editor.c:1515
-msgid "Unable to obtain current version!"
-msgstr ""
+#: calendar/gui/dialogs/comp-editor.c:1562
+#, fuzzy
+msgid "Unable to use current version!"
+msgstr "現在のメール操作をキャンセルします"
 
 #: calendar/gui/dialogs/copy-source-dialog.c:142
 #, fuzzy
@@ -4484,90 +4761,84 @@ msgstr ""
 msgid "Unable to open the calendar '%s'."
 msgstr "許可がありません"
 
-#: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:3
-#, fuzzy
-msgid "<b>Classification</b>"
-msgstr "分類"
-
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:4
-#, fuzzy
-msgid "<b>Date &amp; Time</b>"
-msgstr "日付と時間"
-
-#: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:5
-#, fuzzy
-msgid "<b>Description</b>"
-msgstr "説明:"
-
-#: calendar/gui/dialogs/event-page.glade.h:6
-#, fuzzy
-msgid "<b>L_ocation</b>"
-msgstr "場所(_O):"
-
-#: calendar/gui/dialogs/event-page.glade.h:7
-#, fuzzy
-msgid "<b>Show Time As</b>"
-msgstr "時間を指定して表示"
-
-#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:6
-#, fuzzy
-msgid "<b>Su_mmary</b>"
-msgstr "<b>サマリ:</b> %s<br><br>"
-
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "毎日のイベント(_L)"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "ビジー(_U)"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 msgid "Ca_tegories..."
 msgstr "カテゴリ(_T)..."
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "カレンダ(_A):"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/e-cal-list-view.etspec.h:2
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
+msgstr "分類"
+
+#: calendar/gui/dialogs/event-page.glade.h:7
 #, fuzzy
 msgid "Co_nfidential"
 msgstr "秘密"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Date & Time"
+msgstr "日付/時間:"
+
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "F_ree"
 msgstr "フリー(_R)"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
-#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:10
+#, fuzzy
+msgid "L_ocation:"
+msgstr "場所:"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Pri_vate"
 msgstr "私的(_V)"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
-#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Pu_blic"
 msgstr "公的(_B)"
 
-#: calendar/gui/dialogs/event-page.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:13
+#, fuzzy
+msgid "Show Time As"
+msgstr "時間を指定して表示"
+
+#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:11
+msgid "Su_mmary:"
+msgstr "サマリ(_M):"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_End time:"
 msgstr "終了時間(_E):"
 
-#: calendar/gui/dialogs/event-page.glade.h:18
+#: calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Start time:"
 msgstr "開始時間(_S):"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:593 composer/e-msg-composer.c:2050
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:715
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2066
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:740
 #: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
 #: mail/mail-config.glade.h:80
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
@@ -4661,45 +4932,6 @@ msgstr "
 msgid "_Invite Others..."
 msgstr "他の招待(_I)..."
 
-#: calendar/gui/dialogs/new-calendar.c:102
-#: calendar/gui/dialogs/new-task-list.c:46
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/new-calendar.c:116
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-
-#: calendar/gui/dialogs/new-calendar.c:125
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "'%s' を読み込むことを要求されるメソッドはサポートしていません"
-
-#: calendar/gui/dialogs/new-calendar.c:138
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/new-calendar.c:155
-#, fuzzy
-msgid "Could not create cache for new calendar"
-msgstr "ディレクトリ %s を作成出来ませんでした: %s"
-
-#: calendar/gui/dialogs/new-calendar.c:174
-#, fuzzy
-msgid "Could not create directory for new calendar"
-msgstr "ディレクトリ %s を作成出来ませんでした: %s"
-
-#: calendar/gui/dialogs/new-calendar.c:254
-#: calendar/gui/dialogs/new-task-list.c:131
-#, fuzzy
-msgid "A group must be selected"
-msgstr "主催者は必須です"
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
 msgid "<b>Calendar options</b>"
@@ -4725,11 +4957,6 @@ msgstr "
 msgid "Calendar Name"
 msgstr "カレンダ"
 
-#: calendar/gui/dialogs/new-task-list.c:56
-#, fuzzy
-msgid "Could not create directory for new task list"
-msgstr "ディレクトリ %s を作成出来ませんでした: %s"
-
 #: calendar/gui/dialogs/new-task-list.glade.h:2
 #, fuzzy
 msgid "<b>Task List Options</b>"
@@ -4763,19 +4990,19 @@ msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 msgid "This and Prior Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 #, fuzzy
 msgid "All Instances"
 msgstr "すべての場所(_L)"
@@ -4838,70 +5065,70 @@ msgstr "
 msgid "Date/Time"
 msgstr "日付/時間:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-#, fuzzy
-msgid "<b>Exceptions</b>"
-msgstr "例外"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+msgid "A_dd"
+msgstr "追加(_D)"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "プレビュー"
+msgid "Every"
+msgstr "毎"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
 #, fuzzy
-msgid "<b>Recurrence Rule</b>"
-msgstr "繰り返しルール"
+msgid "Exceptions"
+msgstr "例外"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "A_dd"
-msgstr "追加(_D)"
+#, fuzzy
+msgid "Preview"
+msgstr "プレビュー:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "Every"
-msgstr "毎"
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#, fuzzy
+msgid "Recurrence Rule"
+msgstr "繰り返しルール"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "_Custom recurrence"
 msgstr "カスタム"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "_Modify"
 msgstr "変更(_M)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "_No recurrence"
 msgstr "繰り返しなし(_N)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "_Remove"
 msgstr "削除(_R)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "_Simple recurrence"
 msgstr "単純な繰り返し(_S)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "for"
 msgstr "次の回数"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
 msgid "forever"
 msgstr "永遠"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
 msgid "month(s)"
 msgstr "月"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "until"
 msgstr "次の日まで"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "week(s)"
 msgstr "週"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
 msgid "year(s)"
 msgstr "年"
 
@@ -4916,11 +5143,11 @@ msgstr ""
 "\n"
 "変更を保存しますか?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1555
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1545
 msgid "_Discard Changes"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 #, fuzzy
 msgid "Save Event"
 msgstr "カレンダメッセージ"
@@ -4947,80 +5174,80 @@ msgstr ""
 msgid "Completed date is wrong"
 msgstr "完了済 "
 
-#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:2
 #, fuzzy, no-c-format
 msgid "% _Complete"
 msgstr "% 完了"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#, fuzzy
-msgid "<b>Progress</b>"
-msgstr "処理中"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#, fuzzy
-msgid "<b>Web Page</b>"
-msgstr "メールを送信中"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:599
-#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:209
 #: calendar/gui/print.c:2316
 msgid "Completed"
 msgstr "完了しました"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:389 calendar/gui/e-tasks.c:231
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:230
 #: mail/message-list.c:919
 msgid "High"
 msgstr "高い"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:597
-#: calendar/gui/e-cal-model-tasks.c:659 calendar/gui/e-calendar-table.c:463
-#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2313
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:465
+#: calendar/gui/e-tasks.c:206 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "処理中"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:235
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:234
 #: mail/message-list.c:917
 msgid "Low"
 msgstr "低い"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:390
-#: calendar/gui/e-tasks.c:233 mail/message-list.c:918
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:392
+#: calendar/gui/e-tasks.c:232 mail/message-list.c:918
 msgid "Normal"
 msgstr "普通"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:595
-#: calendar/gui/e-calendar-table.c:462 calendar/gui/e-tasks.c:217
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
+#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:216
 #: calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr "開始していない"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:392
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#, fuzzy
+msgid "Progress"
+msgstr "処理中"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:394
 msgid "Undefined"
 msgstr "未定義"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 #, fuzzy
 msgid "_Date Completed:"
 msgstr "完了日:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
 msgstr "優先度(_P):"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "ステータス(_S):"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Web Page:"
+msgstr "ウェブページのURL(_W):"
+
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "基本"
@@ -5044,136 +5271,137 @@ msgstr ""
 msgid "Unable to open tasks in '%s'."
 msgstr "アドレス帳を開くことが出来ません"
 
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Con_fidential"
 msgstr "秘密(_F)"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:988
+#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:246
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:45
+msgid "Description:"
+msgstr "説明:"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #, fuzzy
 msgid "Folder:"
 msgstr "フォルダ(_F)"
 
-#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt Date:"
 msgstr "開始日(_R):"
 
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:12
 msgid "_Due Date:"
 msgstr "期日(_D):"
 
-#: calendar/gui/e-alarm-list.c:397
+#: calendar/gui/e-alarm-list.c:395
 #, c-format
 msgid "%d days"
 msgstr "%d 日"
 
-#: calendar/gui/e-alarm-list.c:400
+#: calendar/gui/e-alarm-list.c:398
 msgid "1 day"
 msgstr "1 日"
 
-#: calendar/gui/e-alarm-list.c:405
+#: calendar/gui/e-alarm-list.c:403
 #, c-format
 msgid "%d weeks"
 msgstr "%d 週間"
 
-#: calendar/gui/e-alarm-list.c:408
+#: calendar/gui/e-alarm-list.c:406
 msgid "1 week"
 msgstr "1 週間"
 
-#: calendar/gui/e-alarm-list.c:413
+#: calendar/gui/e-alarm-list.c:411
 #, c-format
 msgid "%d hours"
 msgstr "%d 時間"
 
-#: calendar/gui/e-alarm-list.c:416
+#: calendar/gui/e-alarm-list.c:414
 msgid "1 hour"
 msgstr "1 時間"
 
-#: calendar/gui/e-alarm-list.c:421
+#: calendar/gui/e-alarm-list.c:419
 #, c-format
 msgid "%d minutes"
 msgstr "%d 分"
 
-#: calendar/gui/e-alarm-list.c:424
+#: calendar/gui/e-alarm-list.c:422
 msgid "1 minute"
 msgstr "1 分"
 
-#: calendar/gui/e-alarm-list.c:429
+#: calendar/gui/e-alarm-list.c:427
 #, c-format
 msgid "%d seconds"
 msgstr "%d 秒"
 
-#: calendar/gui/e-alarm-list.c:432
+#: calendar/gui/e-alarm-list.c:430
 msgid "1 second"
 msgstr "1 秒"
 
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/e-alarm-list.c:467
 msgid "Send an email"
 msgstr "次の時にメールを送信する:"
 
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:477
 msgid "Unknown action to be performed"
 msgstr "未知の実行されるアクション"
 
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:489
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "アポイントの開始前 %s %s"
 
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:492
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "アポイントの開始後 %s %s"
 
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:497
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "アポイントの開始 %s"
 
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:506
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "アポイント終了の前 %s %s"
 
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:509
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "アポイントの終了後 %s %s"
 
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:514
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "アポイントの終了時 %s"
 
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:538
 #, c-format
 msgid "%s at %s"
 msgstr "%s の %s"
 
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:544
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s は未知の発動タイプ"
 
 #: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:367
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:369
 msgid "Public"
 msgstr "一般"
 
 #: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:368
+#: calendar/gui/e-calendar-table.c:370
 msgid "Private"
 msgstr "私的"
 
 #: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:369
+#: calendar/gui/e-calendar-table.c:371
 msgid "Confidential"
 msgstr "秘密"
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#: calendar/gui/e-calendar-table.etspec.h:5
-msgid "Classification"
-msgstr "分類"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -5200,11 +5428,11 @@ msgstr "
 msgid "component"
 msgstr "アポイント"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
 msgid "Free"
 msgstr "空き"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:444
 #: calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "ビジー"
@@ -5235,7 +5463,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:934 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -5243,7 +5471,7 @@ msgstr ""
 msgid "Yes"
 msgstr "はい"
 
-#: calendar/gui/e-cal-model-tasks.c:934 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -5260,7 +5488,7 @@ msgstr "
 #: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1664
 #: camel/camel-gpg-context.c:1715 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2003
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2094
 #: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "未知"
@@ -5273,182 +5501,175 @@ msgstr "
 msgid "Assigned"
 msgstr "割当て済み"
 
-#: calendar/gui/e-cal-view.c:626 calendar/gui/e-calendar-table.c:686
+#: calendar/gui/e-cal-view.c:681 calendar/gui/e-calendar-table.c:698
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "選択した連絡先を削除します"
 
-#: calendar/gui/e-cal-view.c:730 calendar/gui/e-calendar-table.c:847
+#: calendar/gui/e-cal-view.c:785 calendar/gui/e-calendar-table.c:859
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-cal-view.c:1190 calendar/gui/e-cal-view.c:1275
+#: calendar/gui/e-cal-view.c:1218 calendar/gui/e-cal-view.c:1303
 msgid "New _Appointment..."
 msgstr "新規アポイント(_A)..."
 
-#: calendar/gui/e-cal-view.c:1191 calendar/gui/e-cal-view.c:1277
+#: calendar/gui/e-cal-view.c:1219 calendar/gui/e-cal-view.c:1305
 msgid "New All Day _Event"
 msgstr "新規全日イベント"
 
-#: calendar/gui/e-cal-view.c:1192 calendar/gui/e-cal-view.c:1279
+#: calendar/gui/e-cal-view.c:1220 calendar/gui/e-cal-view.c:1307
 #, fuzzy
 msgid "New Meeting"
 msgstr "会議"
 
-#: calendar/gui/e-cal-view.c:1193 calendar/gui/e-cal-view.c:1281
+#: calendar/gui/e-cal-view.c:1221 calendar/gui/e-cal-view.c:1309
 msgid "New Task"
 msgstr "新規タスク"
 
-#: calendar/gui/e-cal-view.c:1197 calendar/gui/e-cal-view.c:1220
-#: calendar/gui/e-cal-view.c:1287 calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-calendar-table.c:1068 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1248
+#: calendar/gui/e-cal-view.c:1315 calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1080 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
-#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
+#: ui/evolution-tasks.xml.h:23 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "印刷(_P)..."
 
-#: calendar/gui/e-cal-view.c:1201 calendar/gui/e-cal-view.c:1227
-#: calendar/gui/e-cal-view.c:1285 calendar/gui/e-calendar-table.c:1032
-#: calendar/gui/e-calendar-table.c:1066 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-cal-view.c:1229 calendar/gui/e-cal-view.c:1255
+#: calendar/gui/e-cal-view.c:1313 calendar/gui/e-calendar-table.c:1044
+#: calendar/gui/e-calendar-table.c:1078 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:22
 msgid "_Paste"
 msgstr "貼り付け(_P)"
 
-#: calendar/gui/e-cal-view.c:1207 calendar/gui/e-cal-view.c:1271
+#: calendar/gui/e-cal-view.c:1235 calendar/gui/e-cal-view.c:1299
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "今日へ移動(_T)"
 
-#: calendar/gui/e-cal-view.c:1208 calendar/gui/e-cal-view.c:1273
+#: calendar/gui/e-cal-view.c:1236 calendar/gui/e-cal-view.c:1301
 msgid "_Go to Date..."
 msgstr "指定日へ移動(_G)..."
 
-#: calendar/gui/e-cal-view.c:1212 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1240 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "空き/多忙 情報の公開(_P)"
 
-#: calendar/gui/e-cal-view.c:1218 calendar/gui/e-cal-view.c:1283
-#: calendar/gui/e-calendar-table.c:1023 calendar/gui/e-calendar-table.c:1064
-#: mail/em-folder-view.c:681 shell/e-shortcuts-view.c:422
-#: ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "開く(_O)"
-
-#: calendar/gui/e-cal-view.c:1219 calendar/gui/e-cal-view.c:1289
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1070
-#: mail/em-folder-view.c:683 mail/em-popup.c:597 mail/em-popup.c:712
+#: calendar/gui/e-cal-view.c:1247 calendar/gui/e-cal-view.c:1317
+#: calendar/gui/e-calendar-table.c:1037 calendar/gui/e-calendar-table.c:1082
+#: mail/em-folder-view.c:708 mail/em-popup.c:597 mail/em-popup.c:712
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "別名で保存(_S)..."
 
-#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1265
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1059
+#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1293
+#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1071
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "切取り(_U)"
 
-#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1263
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1057
-#: mail/em-folder-tree.c:1497 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-cal-view.c:1291
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1069
+#: mail/em-folder-tree.c:1649 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:18
 msgid "_Copy"
 msgstr "コピー(_C)"
 
-#: calendar/gui/e-cal-view.c:1231
+#: calendar/gui/e-cal-view.c:1259
 msgid "_Schedule Meeting..."
 msgstr "ミーティングのスケジュール(_S)..."
 
-#: calendar/gui/e-cal-view.c:1232
+#: calendar/gui/e-cal-view.c:1260
 msgid "_Forward as iCalendar..."
 msgstr "iCalenderとして転送(_F)..."
 
-#: calendar/gui/e-cal-view.c:1237 calendar/gui/e-cal-view.c:1268
+#: calendar/gui/e-cal-view.c:1265 calendar/gui/e-cal-view.c:1296
 msgid "Delete this _Occurrence"
 msgstr "この出来事を削除(_O)"
 
-#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1269
+#: calendar/gui/e-cal-view.c:1266 calendar/gui/e-cal-view.c:1297
 msgid "Delete _All Occurrences"
 msgstr "すべての出来事を削除(_A)"
 
-#: calendar/gui/e-cal-view.c:1291 ui/evolution.xml.h:30
+#: calendar/gui/e-cal-view.c:1319 ui/evolution.xml.h:30
 msgid "_Settings..."
 msgstr "設定(_S)..."
 
-#: calendar/gui/e-calendar-table.c:411
+#: calendar/gui/e-calendar-table.c:413
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:412
+#: calendar/gui/e-calendar-table.c:414
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:415
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:416
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:417
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:418
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:419
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:418
+#: calendar/gui/e-calendar-table.c:420
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:421
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:422
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:423
 #, fuzzy
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:1024
+#: calendar/gui/e-calendar-table.c:1036
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "メッセージを開く(_O)"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1048
 msgid "_Assign Task"
 msgstr "タスクの割当て(_A)"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1049
 msgid "_Forward as iCalendar"
 msgstr "iCalenderとして転送(_F)"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1050
 msgid "_Mark as Complete"
 msgstr "完了としてマーク(_M)"
 
-#: calendar/gui/e-calendar-table.c:1039
+#: calendar/gui/e-calendar-table.c:1051
 msgid "_Mark Selected Tasks as Complete"
 msgstr "選択されたタスクを完了としてマーク(_M)"
 
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-table.c:1056 calendar/gui/e-calendar-table.c:1074
 msgid "_Delete Selected Tasks"
 msgstr "選択したタスクを削除(_D)"
 
-#: calendar/gui/e-calendar-table.c:1355
+#: calendar/gui/e-calendar-table.c:1367
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "タスクを追加するにはここをクリック"
@@ -5463,7 +5684,7 @@ msgid "Alarms"
 msgstr "アラーム"
 
 #: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:578
 msgid "Complete"
 msgstr "完了しました"
 
@@ -5521,26 +5742,26 @@ 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:688 calendar/gui/e-day-view.c:1342
+#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1348
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1532
 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:696 calendar/gui/e-day-view.c:1375
+#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1381
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%b/%d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
+#: calendar/gui/e-day-view.c:602 calendar/gui/e-week-view.c:334
 #: calendar/gui/print.c:818
 msgid "am"
 msgstr "午前"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
+#: calendar/gui/e-day-view.c:605 calendar/gui/e-week-view.c:337
 #: calendar/gui/print.c:820
 msgid "pm"
 msgstr "午後"
@@ -5669,18 +5890,18 @@ msgid "Location:"
 msgstr "場所:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-tasks.c:203
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-tasks.c:202
 msgid "Status:"
 msgstr "ステータス:"
 
 #: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "受諾した"
 
-#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:421
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "暫定"
@@ -5688,17 +5909,11 @@ msgstr "
 #: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
-#: calendar/gui/itip-utils.c:450
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:428
+#: calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "辞退した"
 
-#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
-#: calendar/gui/e-tasks.c:247 composer/e-msg-composer-attachment.glade.h:3
-#: mail/mail-config.glade.h:45
-msgid "Description:"
-msgstr "説明:"
-
 #: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
 #: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
 #: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
@@ -5714,7 +5929,7 @@ msgstr "
 #: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
 #: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
 #: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
-#: shell/e-shell.c:1002 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1000 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -5747,9 +5962,9 @@ msgstr ""
 msgid "Send Latest Information"
 msgstr "タスク情報"
 
-#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:438
-#: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
-#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: shell/e-shell-startup-wizard.c:794 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -6206,86 +6421,83 @@ msgstr "
 msgid "Meeting _end time:"
 msgstr "会議終了時間(_E):"
 
-#: calendar/gui/e-tasks.c:181
+#: calendar/gui/e-tasks.c:180
 #, fuzzy
 msgid "Start Date:"
 msgstr "開始日(_R):"
 
-#: calendar/gui/e-tasks.c:197
+#: calendar/gui/e-tasks.c:196
 #, fuzzy
 msgid "Due Date:"
 msgstr "期日(_D):"
 
 #. write priority
-#: calendar/gui/e-tasks.c:225
+#: calendar/gui/e-tasks.c:224
 #, fuzzy
 msgid "Priority:"
 msgstr "優先度(_P):"
 
 #. URL
-#: calendar/gui/e-tasks.c:281
+#: calendar/gui/e-tasks.c:280
 #, fuzzy
 msgid "Web Page:"
 msgstr "ページ"
 
-#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "'%s' のタスクを読み込むことが出来ませんでした"
-
-#: calendar/gui/e-tasks.c:725
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "'%s' を読み込むことを要求されるメソッドはサポートしていません"
+#: calendar/gui/e-tasks.c:730 calendar/gui/gnome-cal.c:1890
+#, fuzzy, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr "%s の開始中にエラーが発生しました"
 
-#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
+#: calendar/gui/e-tasks.c:793
 #, fuzzy, c-format
-msgid "You don't have permission to open the folder in `%s'"
-msgstr "`%s' のフォルダを開くことが出来ませんでした"
+msgid "Opening tasks at %s"
+msgstr "保存された %s をオープン中"
 
-#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1978
+#: calendar/gui/e-tasks.c:808
 #, fuzzy, c-format
 msgid ""
-"Error on %s:\n"
-" %s"
+"Error opening %s:\n"
+"%s"
 msgstr "%s の開始中にエラーが発生しました"
 
-#: calendar/gui/e-tasks.c:958
+#: calendar/gui/e-tasks.c:825
+#, fuzzy
+msgid "Loading tasks"
+msgstr "画像の読み込み"
+
+#: calendar/gui/e-tasks.c:918
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "完了日"
 
-#: calendar/gui/e-tasks.c:981
+#: calendar/gui/e-tasks.c:941
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "選択した連絡先を削除します"
 
-#: calendar/gui/e-tasks.c:1006
+#: calendar/gui/e-tasks.c:966
 #, fuzzy
 msgid "Expunging"
 msgstr "フォルダを削除中"
 
-#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
+#: calendar/gui/gnome-cal.c:1607 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
 msgid "Calendar"
 msgstr "カレンダ"
 
-#: calendar/gui/gnome-cal.c:1737
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "`%s' のフォルダを開くことが出来ませんでした"
-
-#: calendar/gui/gnome-cal.c:1751
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "'%s' を開くことを要求されるメソッドはサポートしていません"
+#: calendar/gui/gnome-cal.c:1755
+#, fuzzy, c-format
+msgid "Opening %s"
+msgstr "%s に開く..."
 
-#: calendar/gui/gnome-cal.c:1808
+#: calendar/gui/gnome-cal.c:1766
 #, fuzzy, c-format
-msgid "Adding %s"
-msgstr "\"%s\" を送信中"
+msgid "Could not open '%s': %s"
+msgstr "フォルダをリネーム出来ませんでした: %s"
 
-#: calendar/gui/gnome-cal.c:1999
+#: calendar/gui/gnome-cal.c:1911
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6293,7 +6505,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:1919
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6301,7 +6513,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2867
+#: calendar/gui/gnome-cal.c:2798
 #, fuzzy
 msgid "Purging"
 msgstr "トルコ語"
@@ -6362,68 +6574,73 @@ msgstr "10 
 msgid "September"
 msgstr "9 月"
 
-#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
-#: calendar/gui/itip-utils.c:347
+#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
+#: calendar/gui/itip-utils.c:351
 msgid "An organizer must be set."
 msgstr "主催者は必須です"
 
-#: calendar/gui/itip-utils.c:302
+#: calendar/gui/itip-utils.c:306
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 #, fuzzy
 msgid "Event information"
 msgstr "カレンダ情報"
 
-#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
 #, fuzzy
 msgid "Task information"
 msgstr "タスク情報"
 
-#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
+#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
 #, fuzzy
 msgid "Journal information"
 msgstr "オプション"
 
-#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
+#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "空き/多忙 情報"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:402
 #, fuzzy
 msgid "Calendar information"
 msgstr "カレンダ情報"
 
-#: calendar/gui/itip-utils.c:434
+#: calendar/gui/itip-utils.c:438
 #, fuzzy
 msgid "Updated"
 msgstr "タスクを更新"
 
-#: calendar/gui/itip-utils.c:442
+#: calendar/gui/itip-utils.c:446
 #, fuzzy
 msgid "Refresh"
 msgstr "リストを更新"
 
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/itip-utils.c:450
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:517
+#: calendar/gui/itip-utils.c:521
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "空き/多忙 情報"
 
-#: calendar/gui/itip-utils.c:527
+#: calendar/gui/itip-utils.c:531
 #, fuzzy
 msgid "iCalendar information"
 msgstr "カレンダ情報"
 
-#: calendar/gui/itip-utils.c:667
+#: calendar/gui/itip-utils.c:671
 msgid "You must be an attendee of the event."
 msgstr ""
 
+#: calendar/gui/itip-utils.c:1155
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "%s のためのパスワードを入力してください"
+
 #: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1 日"
@@ -6647,7 +6864,7 @@ msgid "Contacts: "
 msgstr "連絡先(_N):"
 
 #: calendar/gui/print.c:2530 calendar/gui/print.c:2616
-#: calendar/gui/tasks-control.c:567 mail/em-format-html-print.c:147
+#: calendar/gui/tasks-control.c:582 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "印刷プレビュー"
 
@@ -6664,57 +6881,52 @@ msgstr "
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:391
-#, fuzzy
-msgid "Rename this task list to"
-msgstr "このショートカットをリネーム"
-
-#: calendar/gui/tasks-component.c:412
-#, fuzzy
-msgid "New Task List"
-msgstr "タスクリスト"
-
-#: calendar/gui/tasks-component.c:587
+#: calendar/gui/tasks-component.c:622
 msgid "New task"
 msgstr "新規タスク"
 
-#: calendar/gui/tasks-component.c:588
+#: calendar/gui/tasks-component.c:623
 msgid "_Task"
 msgstr "タスク(_T)"
 
-#: calendar/gui/tasks-component.c:589
+#: calendar/gui/tasks-component.c:624
 msgid "Create a new task"
 msgstr "新規タスクを作成します"
 
-#: calendar/gui/tasks-component.c:594
+#: calendar/gui/tasks-component.c:629
 #, fuzzy
 msgid "New task list"
 msgstr "タスクリスト"
 
-#: calendar/gui/tasks-component.c:595
+#: calendar/gui/tasks-component.c:630
 #, fuzzy
 msgid "_Task List"
 msgstr "タスクリスト"
 
-#: calendar/gui/tasks-component.c:596
+#: calendar/gui/tasks-component.c:631
 #, fuzzy
 msgid "Create a new task list"
 msgstr "新規タスクを作成します"
 
-#: calendar/gui/tasks-component.c:663
+#: calendar/gui/tasks-component.c:698
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:676
+#: calendar/gui/tasks-component.c:710
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:148
+#: calendar/gui/tasks-control.c:151
 msgid "The URI of the tasks folder to display"
 msgstr "タスクフォルダが表示する URI"
 
-#: calendar/gui/tasks-control.c:450
+#: calendar/gui/tasks-control.c:203
+#, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "'%s' のタスクを読み込むことが出来ませんでした"
+
+#: calendar/gui/tasks-control.c:466
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -6727,11 +6939,11 @@ msgstr ""
 "\n"
 "本当にこれらのメッセージを消去しますか?"
 
-#: calendar/gui/tasks-control.c:454
+#: calendar/gui/tasks-control.c:469
 msgid "Do not ask me again."
 msgstr "二度と質問しない"
 
-#: calendar/gui/tasks-control.c:596
+#: calendar/gui/tasks-control.c:611
 #, fuzzy
 msgid "Print Tasks"
 msgstr "カードの印刷"
@@ -8456,11 +8668,15 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-folder.c:90
+#: camel/camel-disco-folder.c:41
+msgid "Copy folder content locally for offline operation"
+msgstr ""
+
+#: camel/camel-disco-folder.c:101
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:351
+#: camel/camel-disco-folder.c:441
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "フォルダ '%s' を保存中"
@@ -8637,7 +8853,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
 #: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
-#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:572
+#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:574
 msgid "Cancelled."
 msgstr "キャンセルしました"
 
@@ -9001,7 +9217,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1217
+#: camel/providers/imap/camel-imap-store.c:1221
 msgid "Bad authentication response from server."
 msgstr "サーバから間違った認証応答がありました"
 
@@ -9228,11 +9444,11 @@ msgid "Cannot create folder: Invalid operation on this store"
 msgstr "フォルダを作成できません: このストアでは不正な操作です"
 
 #: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1119
+#: mail/mail-ops.c:1102
 msgid "Trash"
 msgstr "ごみ箱"
 
-#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: camel/camel-store.c:793 mail/mail-ops.c:1108
 #: ui/evolution-mail-message.xml.h:46
 #, fuzzy
 msgid "Junk"
@@ -9473,25 +9689,69 @@ msgstr "
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "フォルダを削除できません: %s: そのようなフォルダはありません"
 
-#: camel/camel-vee-store.c:312
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "フォルダをリネームできません: %s: 不正な操作です"
+#: camel/camel-vee-store.c:312
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "フォルダをリネームできません: %s: 不正な操作です"
+
+#: camel/camel-vee-store.c:320
+#, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "フォルダをリネームできません: %s: そのようなフォルダはありません"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Checking for new mail"
+msgstr "新着メールのチェック"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:55
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Check for new messages in all folders"
+msgstr "すべてのフォルダの新着メールをチェックします"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:71
+#, fuzzy
+msgid "Apply filters to new messages in Inbox on this server"
+msgstr "このサーバ上の INBOX 内にある新規メッセージへフィルタを適用する"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Automatically synchronize remote mail locally"
+msgstr "新着メールを自動的にチェックする間隔(_A)"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:82
+msgid "Novell GroupWise"
+msgstr ""
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:84
+msgid "For accesing Novell Groupwise servers"
+msgstr ""
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/imap/camel-imap-provider.c:89
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-provider.c:71
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
+msgid "Password"
+msgstr "パスワード"
 
-#: camel/camel-vee-store.c:320
-#, c-format
-msgid "Cannot rename folder: %s: No such folder"
-msgstr "フォルダをリネームできません: %s: そのようなフォルダはありません"
+#: camel/providers/groupwise/camel-groupwise-provider.c:101
+#: camel/providers/imap/camel-imap-provider.c:91
+#: camel/providers/imapp/camel-imapp-provider.c:67
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
+"このオプションはプレインテキストパスワードを使って IMAP サーバに接続します"
 
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2817
+#: camel/providers/imap/camel-imap-store.c:2821
 msgid "Operation cancelled"
 msgstr "操作はキャンセルしました"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2820
+#: camel/providers/imap/camel-imap-store.c:2824
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "サーバは予期しない切断をしました: %s"
@@ -9538,21 +9798,21 @@ msgstr "
 msgid "Could not load summary for %s"
 msgstr "%s のサマリーをロード出来ませんでした"
 
-#: camel/providers/imap/camel-imap-folder.c:308
+#: camel/providers/imap/camel-imap-folder.c:314
 msgid "Folder was destroyed and recreated on server."
 msgstr "フォルダは破壊され再作成されました"
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:550
+#: camel/providers/imap/camel-imap-folder.c:560
 msgid "Scanning for changed messages"
 msgstr "変更されたメッセージを走査中"
 
-#: camel/providers/imap/camel-imap-folder.c:1886
+#: camel/providers/imap/camel-imap-folder.c:1899
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "メッセージのデコードに失敗しました"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9568,24 +9828,25 @@ msgstr ""
 "メッセージを取得出来ません: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
+#: camel/providers/imap/camel-imap-folder.c:1936
 #: 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:1946
-#: camel/providers/imap/camel-imap-folder.c:2542
+#: camel/providers/imap/camel-imap-folder.c:1959
+#: camel/providers/imap/camel-imap-folder.c:2555
+#: camel/providers/nntp/camel-nntp-folder.c:205
 msgid "This message is not currently available"
 msgstr "このメッセージは現在利用出来ません"
 
-#: camel/providers/imap/camel-imap-folder.c:2206
-#: camel/providers/imap/camel-imap-folder.c:2276
+#: camel/providers/imap/camel-imap-folder.c:2219
+#: camel/providers/imap/camel-imap-folder.c:2289
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2580
+#: camel/providers/imap/camel-imap-folder.c:2593
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH 応答にメッセージ本体を見付けることが出来ませんでした"
 
@@ -9624,15 +9885,8 @@ msgstr ""
 "\n"
 "注釈: "
 
-#: camel/providers/imap/camel-imap-provider.c:50
-msgid "Checking for new mail"
-msgstr "新着メールのチェック"
-
-#: camel/providers/imap/camel-imap-provider.c:52
-msgid "Check for new messages in all folders"
-msgstr "すべてのフォルダの新着メールをチェックします"
-
 #: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Folders"
 msgstr "フォルダ"
 
@@ -9652,11 +9906,6 @@ msgstr "
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "このサーバ上の INBOX 内にある新規メッセージへフィルタを適用する"
 
-#: camel/providers/imap/camel-imap-provider.c:66
-#, fuzzy
-msgid "Automatically synchronize remote mail locally"
-msgstr "新着メールを自動的にチェックする間隔(_A)"
-
 #: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
@@ -9665,19 +9914,6 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP サーバでメールを読んだり蓄積するためのものです"
 
-#: camel/providers/imap/camel-imap-provider.c:89
-#: camel/providers/imapp/camel-imapp-provider.c:65
-#: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
-msgid "Password"
-msgstr "パスワード"
-
-#: camel/providers/imap/camel-imap-provider.c:91
-#: camel/providers/imapp/camel-imapp-provider.c:67
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"このオプションはプレインテキストパスワードを使って IMAP サーバに接続します"
-
 #: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP server %s"
@@ -9691,7 +9927,7 @@ msgstr "%s 
 #: camel/providers/imap/camel-imap-store.c:582
 #: camel/providers/imap/camel-imap-store.c:602
 #: camel/providers/imapp/camel-imapp-store.c:236
-#: camel/providers/nntp/camel-nntp-store.c:131
+#: camel/providers/nntp/camel-nntp-store.c:140
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -9709,8 +9945,8 @@ msgstr "TLS 
 #: camel/providers/imap/camel-imap-store.c:599
 #: camel/providers/imap/camel-imap-store.c:831
 #: camel/providers/imapp/camel-imapp-store.c:233
-#: camel/providers/nntp/camel-nntp-store.c:128
-#: camel/providers/nntp/camel-nntp-store.c:146
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
 #: camel/providers/pop3/camel-pop3-store.c:194
 msgid "Connection cancelled"
 msgstr "接続はキャンセルしました"
@@ -9740,28 +9976,28 @@ msgstr "認
 msgid "Could not connect with command \"%s\": %s"
 msgstr "サーバへ接続することが出来ませんでした: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/imap/camel-imap-store.c:1251
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP サーバ %s は要求した認証タイプ %s をサポートしていません"
 
-#: camel/providers/imap/camel-imap-store.c:1257
+#: camel/providers/imap/camel-imap-store.c:1261
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "認証タイプ %s をサポートしていません"
 
-#: camel/providers/imap/camel-imap-store.c:1280
+#: camel/providers/imap/camel-imap-store.c:1284
 #: camel/providers/imapp/camel-imapp-store.c:349
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s の IMAP パスワードを入力してください"
 
-#: camel/providers/imap/camel-imap-store.c:1294
+#: camel/providers/imap/camel-imap-store.c:1298
 msgid "You didn't enter a password."
 msgstr "パスワードを入力していません"
 
-#: camel/providers/imap/camel-imap-store.c:1323
+#: camel/providers/imap/camel-imap-store.c:1327
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9772,24 +10008,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1670
-#: camel/providers/imap/camel-imap-store.c:1812
+#: camel/providers/imap/camel-imap-store.c:1674
+#: camel/providers/imap/camel-imap-store.c:1816
 #, c-format
 msgid "No such folder %s"
 msgstr "そのようなフォルダ %s はありません"
 
-#: camel/providers/imap/camel-imap-store.c:2013
+#: camel/providers/imap/camel-imap-store.c:2017
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2025
+#: camel/providers/imap/camel-imap-store.c:2029
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "未知のエラー: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2061
+#: camel/providers/imap/camel-imap-store.c:2065
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -10209,7 +10445,7 @@ msgstr "
 msgid "Could not close temp folder: %s"
 msgstr "作業フォルダを閉じることが出来ませんでした: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1286
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1410
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "フォルダをリネーム出来ませんでした: %s"
@@ -10327,6 +10563,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
+#: camel/providers/nntp/camel-nntp-store.c:998
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%s@%s の NNTP パスワードを入力してください"
@@ -10343,13 +10580,19 @@ msgstr "
 msgid "Server rejected username/password"
 msgstr "サーバはユーザ名/パスワードを拒否しました"
 
-#: camel/providers/nntp/camel-nntp-folder.c:114
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
+#: camel/providers/nntp/camel-nntp-folder.c:140
+#: camel/providers/nntp/camel-nntp-folder.c:230
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+#, fuzzy
+msgid "User cancelled"
+msgstr "操作はキャンセルしました"
 
-#: camel/providers/nntp/camel-nntp-folder.c:155
-#: camel/providers/nntp/camel-nntp-folder.c:161
+#: camel/providers/nntp/camel-nntp-folder.c:142
+#: camel/providers/nntp/camel-nntp-folder.c:226
+#: camel/providers/nntp/camel-nntp-folder.c:232
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10360,14 +10603,52 @@ msgstr ""
 "メッセージを取得出来ません: %s\n"
 "  %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
+#: camel/providers/nntp/camel-nntp-folder.c:157
+#: camel/providers/nntp/camel-nntp-folder.c:195
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:170
+#, fuzzy, c-format
+msgid "Could not get article %s from NNTP server"
+msgstr "サーバからグループリストを取得出来ませんでした"
+
+#: camel/providers/nntp/camel-nntp-folder.c:353
+msgid "Posting not allowed by news server"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:364
+#, c-format
+msgid "Failed to send newsgroups header: %s: message not posted"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:404
+#: camel/providers/nntp/camel-nntp-folder.c:417
+#, c-format
+msgid "Error posting to newsgroup: %s: message not posted"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:429
+msgid "Error reading response to posted message: message not posted"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:432
+#, fuzzy, c-format
+msgid "Error posting message: %s: message not posted"
+msgstr ""
+"メッセージの自動保存中にエラー: %s\n"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:448
 #, fuzzy
-msgid "User cancelled"
-msgstr "操作はキャンセルしました"
+msgid "You cannot post NNTP messages while working offline!"
+msgstr "このゴミ箱フォルダからメッセージをコピーすることが出来ません"
+
+#: camel/providers/nntp/camel-nntp-folder.c:459
+#, fuzzy
+msgid "You cannot copy messages from a NNTP folder!"
+msgstr "このゴミ箱フォルダからメッセージをコピーすることが出来ません"
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
@@ -10384,68 +10665,129 @@ msgstr "%s 
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "%s のグループリストファイルを保存出来ません: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:41
+#: camel/providers/nntp/camel-nntp-provider.c:43
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:45
+msgid "In the subscription dialog, show relative folder names"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:52
 msgid "USENET news"
 msgstr "USENET news"
 
-#: camel/providers/nntp/camel-nntp-provider.c:43
+#: camel/providers/nntp/camel-nntp-provider.c:54
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "これは USENET のニュースグループへ送受信するためのプロバイダです"
 
-#: camel/providers/nntp/camel-nntp-store.c:149
+#: camel/providers/nntp/camel-nntp-provider.c:73
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"このオプションはプレインテキストパスワードを使って NNTP サーバで認証します"
+
+#: camel/providers/nntp/camel-nntp-store.c:158
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "ディレクトリ %s を作成出来ませんでした: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:161
+#: camel/providers/nntp/camel-nntp-store.c:170
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:260
+#: camel/providers/nntp/camel-nntp-store.c:326
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s 経由の USENET News"
 
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/nntp/camel-nntp-store.c:641
+#, fuzzy
+msgid "Stream error"
+msgstr "その他のエラー"
+
+#: camel/providers/nntp/camel-nntp-store.c:644
+#, fuzzy, c-format
 msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
+"Error retrieving newsgroups:\n"
+"\n"
+"%s"
 msgstr ""
-"このオプションはプレインテキストパスワードを使って NNTP サーバで認証します"
+"ファイルの保存中にエラー: %s:\n"
+" %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:736
+msgid ""
+"You cannot subscribe to this newsgroup:\n"
+"\n"
+"No such newsgroup. The selected item is a probably a parent folder."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:768
+msgid ""
+"You cannot unsubscribe to this newsgroup:\n"
+"\n"
+"newsgroup does not exist!"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:793
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:801
+#, fuzzy
+msgid "You cannot rename a folder in a News store."
+msgstr "フォルダを %s から %s へ名前変更することが出来ませんでした: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:809
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-summary.c:229
+#, fuzzy, c-format
+msgid "Connection error: %s"
+msgstr "未知のエラー: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:237
+#: camel/providers/nntp/camel-nntp-summary.c:240
 #, fuzzy, c-format
 msgid "No such folder: %s"
 msgstr "そのようなフォルダ %s はありません"
 
-#: camel/providers/nntp/camel-nntp-summary.c:241
+#: camel/providers/nntp/camel-nntp-summary.c:246
 #, fuzzy, c-format
 msgid "Could not get group: %s"
 msgstr "パイプが作成できませんでした: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:347
+#: camel/providers/nntp/camel-nntp-summary.c:311
+#, fuzzy
+msgid "Could not get messages: unspecificed error"
+msgstr "メッセージを取得出来ませんでした: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:356
 #, fuzzy, c-format
 msgid "NNTP Command failed: %s"
 msgstr "IMAP コマンドは失敗しました: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:407
-#: camel/providers/nntp/camel-nntp-summary.c:508
+#: camel/providers/nntp/camel-nntp-summary.c:416
+#: camel/providers/nntp/camel-nntp-summary.c:517
 #, fuzzy, c-format
 msgid "%s: Scanning new messages"
 msgstr "新規メッセージを走査中"
 
-#: camel/providers/nntp/camel-nntp-summary.c:523
+#: camel/providers/nntp/camel-nntp-summary.c:532
 #, fuzzy, c-format
 msgid "Unknown server response: %s"
 msgstr "未知のエラー: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:569
+#: camel/providers/nntp/camel-nntp-summary.c:579
 #, fuzzy
 msgid "Use cancel"
 msgstr "キャンセル"
 
-#: camel/providers/nntp/camel-nntp-summary.c:571
+#: camel/providers/nntp/camel-nntp-summary.c:581
 #, fuzzy, c-format
 msgid "Operation failed: %s"
 msgstr "操作はキャンセルしました"
@@ -10810,7 +11152,7 @@ msgstr "%s 
 msgid "Cannot send message: sender address not valid."
 msgstr "メッセージを送信出来ません: 送信者のアドレスが正しくありません"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:611
 msgid "Sending message"
 msgstr "メッセージを送信中"
 
@@ -10939,7 +11281,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1382
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1473
 msgid "attachment"
 msgstr "添付"
 
@@ -10984,14 +11326,23 @@ msgstr "MIME 
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:287
+#: composer/e-msg-composer-hdrs.c:304
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "あなたはメールを作成する前にユーザ情報の\n"
 "設定をする必要があります"
 
-#: composer/e-msg-composer-hdrs.c:480
+#: composer/e-msg-composer-hdrs.c:507
+msgid "Posting destination"
+msgstr "投稿先"
+
+#: composer/e-msg-composer-hdrs.c:508
+#, fuzzy
+msgid "Choose folders to post the message to."
+msgstr "メッセージへファイルを添付します"
+
+#: composer/e-msg-composer-hdrs.c:542
 msgid "Click here for the address book"
 msgstr "アドレス帳のためにここでクリック"
 
@@ -11002,45 +11353,45 @@ msgstr "
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:510
+#: composer/e-msg-composer-hdrs.c:572
 msgid "Reply-To:"
 msgstr "返信先:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:516
+#: composer/e-msg-composer-hdrs.c:578
 msgid "From:"
 msgstr "差出人:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:522
+#: composer/e-msg-composer-hdrs.c:584
 msgid "Subject:"
 msgstr "件名:"
 
-#: composer/e-msg-composer-hdrs.c:531
+#: composer/e-msg-composer-hdrs.c:593
 msgid "To:"
 msgstr "宛先:"
 
-#: composer/e-msg-composer-hdrs.c:532
+#: composer/e-msg-composer-hdrs.c:594
 msgid "Enter the recipients of the message"
 msgstr "メッセージの受信者を入力します"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:597
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:536
+#: composer/e-msg-composer-hdrs.c:598
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "メッセージのカーボンコピーを受信するアドレスを入力します"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:601
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:540
+#: composer/e-msg-composer-hdrs.c:602
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -11051,38 +11402,34 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:547
+#: composer/e-msg-composer-hdrs.c:609
 msgid "Post To:"
 msgstr "宛先:"
 
-#: composer/e-msg-composer-hdrs.c:548
-msgid "Posting destination"
-msgstr "投稿先"
-
-#: composer/e-msg-composer-hdrs.c:548
+#: composer/e-msg-composer-hdrs.c:614
 #, fuzzy
-msgid "Choose a folder to post the message to."
-msgstr "メッセージへファイルを添付します"
+msgid "Click here to select folders to post to"
+msgstr "<フォルダを選択するためにここをクリックしてください>"
 
 #: composer/e-msg-composer-select-file.c:119
 #, fuzzy
 msgid "Attach file(s)"
 msgstr "ファイルを添付します"
 
-#: composer/e-msg-composer.c:651
+#: composer/e-msg-composer.c:654
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr "このアカウントでのメッセージ送信には常に署名する(_A)"
 
-#: composer/e-msg-composer.c:657
+#: composer/e-msg-composer.c:660
 #, fuzzy
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 msgstr "このメッセージを暗号化できません: 暗号化する平文テキストがありません"
 
-#: composer/e-msg-composer.c:788
+#: composer/e-msg-composer.c:791
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11091,30 +11438,30 @@ msgstr ""
 "ファイルの読み込み中にエラー: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1153
+#: composer/e-msg-composer.c:1143
 msgid "File exists, overwrite?"
 msgstr "ファイルは存在します。上書きしますか?"
 
-#: composer/e-msg-composer.c:1164 composer/e-msg-composer.c:1180
+#: composer/e-msg-composer.c:1154 composer/e-msg-composer.c:1170
 #, c-format
 msgid "Error saving file: %s"
 msgstr "ファイルの保存中にエラー: %s"
 
-#: composer/e-msg-composer.c:1204
+#: composer/e-msg-composer.c:1194
 #, c-format
 msgid "Error loading file: %s"
 msgstr "ファイルのロード中にエラー: %s"
 
-#: composer/e-msg-composer.c:1242
+#: composer/e-msg-composer.c:1232
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "ファイルのアクセス中にエラー: %s"
 
-#: composer/e-msg-composer.c:1250
+#: composer/e-msg-composer.c:1240
 msgid "Unable to retrieve message from editor"
 msgstr "エディタからメッセージを取得出来ませんでした"
 
-#: composer/e-msg-composer.c:1257
+#: composer/e-msg-composer.c:1247
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -11123,7 +11470,7 @@ msgstr ""
 "ファイルを走査できません: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1264
+#: composer/e-msg-composer.c:1254
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -11132,7 +11479,7 @@ msgstr ""
 "ファイルを切り詰めることが出来ません: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1273
+#: composer/e-msg-composer.c:1263
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -11141,7 +11488,7 @@ msgstr ""
 "ファイルを走査できません: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1282
+#: composer/e-msg-composer.c:1272
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -11150,15 +11497,16 @@ msgstr ""
 "メッセージの自動保存中にエラー: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1386
+#: composer/e-msg-composer.c:1376
+#, fuzzy
 msgid ""
-"Ximian Evolution has found unsaved files from a previous session.\n"
+"Ximian Evolution has found unsaved messages from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 "Evolution は 前回のセッションで保存されていないファイルを発見しました。\n"
 "これらをリカバリしてみますか?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1540
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -11169,34 +11517,49 @@ msgstr ""
 "\n"
 "変更を保存しますか?"
 
-#: composer/e-msg-composer.c:1559
+#: composer/e-msg-composer.c:1549
 msgid "Warning: Modified Message"
 msgstr "警告: 変更されたメッセージ"
 
-#: composer/e-msg-composer.c:1592
+#: composer/e-msg-composer.c:1582
 msgid "Open file"
 msgstr "ファイルを開く"
 
-#: composer/e-msg-composer.c:2011
+#: composer/e-msg-composer.c:2027
 msgid "Signature:"
 msgstr "署名:"
 
-#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2067 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "自動生成"
 
-#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
-#: composer/e-msg-composer.c:2930
+#: composer/e-msg-composer.c:2245
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2274
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2277 composer/e-msg-composer.c:3136
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2294 composer/e-msg-composer.c:3020
+#: composer/e-msg-composer.c:3021
 msgid "Compose a message"
 msgstr "メッセージを作成します"
 
-#: composer/e-msg-composer.c:2961
+#: composer/e-msg-composer.c:3052
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2991
+#: composer/e-msg-composer.c:3081
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11207,7 +11570,7 @@ msgstr ""
 "メールコンポーネントにまだ構成されていないため\n"
 "メッセージ作成ウィンドウを作成することが出来ませんでした"
 
-#: composer/e-msg-composer.c:3061
+#: composer/e-msg-composer.c:3182
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -11216,7 +11579,7 @@ msgstr ""
 "メールコンポーネントにまだ構成されていないため\n"
 "メッセージ作成ウィンドウを作成することが出来ませんでした"
 
-#: composer/e-msg-composer.c:4071
+#: composer/e-msg-composer.c:4190
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11240,46 +11603,6 @@ msgstr "
 msgid "calendar information"
 msgstr "カレンダ情報"
 
-#: default_user/searches.xml.h:1
-msgid "Body contains"
-msgstr "本文が次のものを含む"
-
-#: default_user/searches.xml.h:2
-msgid "Body does not contain"
-msgstr "本文が次のものを含まない"
-
-#: default_user/searches.xml.h:3
-msgid "Body or subject contains"
-msgstr "本文か件名が次のものを含む"
-
-#: default_user/searches.xml.h:4
-msgid "Message contains"
-msgstr "メッセージが次のものを含む"
-
-#: default_user/searches.xml.h:5
-msgid "Recipients contain"
-msgstr "受信者が次のものを含む"
-
-#: default_user/searches.xml.h:6
-msgid "Sender contains"
-msgstr "送信者が次のものを含む"
-
-#: default_user/searches.xml.h:7
-msgid "Subject contains"
-msgstr "件名が次のものを含む"
-
-#: default_user/searches.xml.h:8
-msgid "Subject does not contain"
-msgstr "件名が次のものを含まない"
-
-#: default_user/vfolders.xml.h:1
-msgid "Important mail (local)"
-msgstr ""
-
-#: default_user/vfolders.xml.h:2
-msgid "Unread mail (local)"
-msgstr ""
-
 #: designs/OOA/ooa.glade.h:1
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
@@ -11646,7 +11969,7 @@ msgstr "To Do"
 msgid "Later"
 msgstr "後で"
 
-#: filter/filter-part.c:531
+#: filter/filter-part.c:531 shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "テスト"
 
@@ -11850,7 +12173,8 @@ msgstr "表
 msgid "Follow Up"
 msgstr "フォローアップ"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:714
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:739
+#: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr ""
 
@@ -11932,7 +12256,7 @@ msgstr "
 msgid "Stop Processing"
 msgstr "処理停止"
 
-#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1449 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1472 mail/em-format.c:679
 #: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
 #: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
 msgid "Subject"
@@ -12065,6 +12389,38 @@ msgstr "
 msgid "Score Rules"
 msgstr "スコアルール"
 
+#: filter/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "本文が次のものを含む"
+
+#: filter/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "本文が次のものを含まない"
+
+#: filter/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "本文か件名が次のものを含む"
+
+#: filter/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "メッセージが次のものを含む"
+
+#: filter/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "受信者が次のものを含む"
+
+#: filter/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "送信者が次のものを含む"
+
+#: filter/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "件名が次のものを含む"
+
+#: filter/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "件名が次のものを含まない"
+
 #: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "この仮想フォルダの名前を設定してください"
@@ -12131,7 +12487,7 @@ msgstr "Evolution 
 msgid "Evolution Mail preferences control"
 msgstr "Evolution メール実行サマリコンポーネント"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:804
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:806
 #: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
 #: mail/importers/pine-importer.c:572
 msgid "Mail"
@@ -12245,11 +12601,11 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: mail/em-composer-utils.c:301
+#: mail/em-composer-utils.c:305
 msgid "You must specify recipients in order to send this message."
 msgstr "このメッセージを送信する適切な受信者を指定しなければなりません"
 
-#: mail/em-composer-utils.c:543
+#: mail/em-composer-utils.c:579
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -12261,7 +12617,7 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "検索から仮想フォルダを作成(_V)..."
 
-#: mail/em-folder-selection-button.c:116
+#: mail/em-folder-selection-button.c:120
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<フォルダを選択するためにここをクリックしてください>"
@@ -12271,7 +12627,7 @@ msgstr "<
 msgid "Create New Folder"
 msgstr "新規フォルダを作成(_N)..."
 
-#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1189
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "フォルダを作成する場所を指定してください:"
@@ -12282,399 +12638,420 @@ msgstr "
 msgid "Folder _name:"
 msgstr "フォルダ名:"
 
-#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1994
+#: mail/em-folder-tree-model.c:560 mail/em-utils.c:2085
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "作業ディレクトリを作成出来ませんでした: %s"
 
-#: mail/em-folder-tree-model.c:568
+#: mail/em-folder-tree-model.c:569
 #, fuzzy, c-format
 msgid "Could not create temporary mbox store: %s"
 msgstr "作業ディレクトリを作成出来ませんでした: %s"
 
-#: mail/em-folder-tree-model.c:577
+#: mail/em-folder-tree-model.c:578
 #, fuzzy, c-format
 msgid "Could not create temporary mbox folder: %s"
 msgstr "作業ファイルを作成できませんでした '%s': %s"
 
-#: mail/em-folder-tree-model.c:592
+#: mail/em-folder-tree-model.c:593
 #, fuzzy, c-format
 msgid "Could not copy messages to temporary mbox folder: %s"
 msgstr "作業フォルダを閉じることが出来ませんでした: %s"
 
-#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+#: mail/em-folder-tree-model.c:772 mail/em-folder-tree-model.c:1062
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#: mail/em-folder-tree.c:1067 mail/em-folder-tree.c:1154
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
-#: mail/em-folder-view.c:591 mail/em-folder-view.c:605
+#: mail/em-folder-tree.c:1083 mail/em-folder-tree.c:1096
+#: mail/em-folder-view.c:616 mail/em-folder-view.c:630
 #: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "フォルダを選択"
 
-#: mail/em-folder-tree.c:1091
+#: mail/em-folder-tree.c:1189
 #, fuzzy
 msgid "Create folder"
 msgstr "新規フォルダを作成します"
 
-#: mail/em-folder-tree.c:1182
+#: mail/em-folder-tree.c:1306
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "フォルダ `%s' を削除することが出来ませんでした: %s"
 
-#: mail/em-folder-tree.c:1203
+#: mail/em-folder-tree.c:1327
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "フォルダを削除します '%s'"
 
-#: mail/em-folder-tree.c:1213 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:1337 shell/e-shell-folder-commands.c:416
 #, c-format
 msgid "Delete \"%s\""
 msgstr "\"%s\" を削除"
 
-#: mail/em-folder-tree.c:1247 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:1371 shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "フォルダ \"%s\" をリネーム"
 
-#: mail/em-folder-tree.c:1249 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:1373 shell/e-shell-folder-commands.c:541
 #, fuzzy
 msgid "Rename Folder"
 msgstr "フォルダをリネーム"
 
-#: mail/em-folder-tree.c:1273 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:1397 shell/e-shell-folder-commands.c:554
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:1371
+#: mail/em-folder-tree.c:1497
 #, fuzzy
 msgid "Folder properties"
 msgstr "フォントプロパティ"
 
 #. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-tree.c:1377
+#: mail/em-folder-tree.c:1503
 msgid "Properties"
 msgstr "プロパティ"
 
-#: mail/em-folder-tree.c:1385
+#. TODO: can this be done in a loop?
+#: mail/em-folder-tree.c:1512
 #, fuzzy
 msgid "Folder Name"
 msgstr "フォルダ名(_F):"
 
-#: mail/em-folder-tree.c:1492 ui/evolution-addressbook.xml.h:45
+#: mail/em-folder-tree.c:1523
+#, fuzzy
+msgid "Total messages"
+msgstr "ヘルプメッセージ"
+
+#: mail/em-folder-tree.c:1535
+#, fuzzy
+msgid "Unread messages"
+msgstr "次の未読メッセージ(_U)"
+
+#: mail/em-folder-tree.c:1644 ui/evolution-addressbook.xml.h:45
 #: ui/evolution-mail-global.xml.h:20 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:32
 msgid "_View"
 msgstr "表示(_V)"
 
-#: mail/em-folder-tree.c:1493
+#: mail/em-folder-tree.c:1645
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "新規ウィンドウで開く"
 
-#: mail/em-folder-tree.c:1498
+#: mail/em-folder-tree.c:1650
 #, fuzzy
 msgid "_Move"
 msgstr "移動"
 
-#: mail/em-folder-tree.c:1501
+#: mail/em-folder-tree.c:1653
 msgid "_New Folder..."
 msgstr "新規フォルダ(_N)..."
 
-#: mail/em-folder-tree.c:1503 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:1655 shell/e-shortcuts-view.c:427
 msgid "_Rename"
 msgstr "リネーム(_R)"
 
-#: mail/em-folder-tree.c:1506 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:1658 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:682 mail/em-popup.c:596
+#: mail/em-folder-view.c:707 mail/em-popup.c:596
 msgid "_Edit as New Message..."
 msgstr "新規メッセージとして編集..."
 
-#: mail/em-folder-view.c:684
+#: mail/em-folder-view.c:709
 msgid "_Print"
 msgstr "印刷(_P)"
 
-#: mail/em-folder-view.c:687 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:712 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "送信者へ返信(_R)"
 
-#: mail/em-folder-view.c:688 mail/em-popup.c:716
+#: mail/em-folder-view.c:713 mail/em-popup.c:716
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "リストへ返信(_L)"
 
-#: mail/em-folder-view.c:689 mail/em-popup.c:717
+#: mail/em-folder-view.c:714 mail/em-popup.c:717
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "全員へ返信(_A)"
 
-#: mail/em-folder-view.c:690 mail/em-popup.c:719
+#: mail/em-folder-view.c:715 mail/em-popup.c:719
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "転送(_F)"
 
-#: mail/em-folder-view.c:693
+#: mail/em-folder-view.c:718
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:719
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "完了しました"
 
-#: mail/em-folder-view.c:695
+#: mail/em-folder-view.c:720
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "クリア"
 
-#: mail/em-folder-view.c:698 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:723 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "開封済みとしてマーク(_K)"
 
-#: mail/em-folder-view.c:699
+#: mail/em-folder-view.c:724
 msgid "Mark as _Unread"
 msgstr "未読としてマーク(_U)"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:725
 msgid "Mark as _Important"
 msgstr "重要としてマーク(_I)"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:726
 msgid "_Mark as Unimportant"
 msgstr "非重要としてマーク(_M)"
 
-#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:727 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "未読としてマーク(_U)"
 
-#: mail/em-folder-view.c:703 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:728 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "重要としてマーク(_I)"
 
-#: mail/em-folder-view.c:707
+#: mail/em-folder-view.c:732
 msgid "U_ndelete"
 msgstr "削除取消(_N)"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:735
 msgid "Mo_ve to Folder..."
 msgstr "フォルダへ移動(_V)..."
 
-#: mail/em-folder-view.c:711 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:736 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "フォルダへコピー(_C)..."
 
-#: mail/em-folder-view.c:719
+#: mail/em-folder-view.c:744
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "送信者をアドレス帳に追加"
 
-#: mail/em-folder-view.c:722
+#: mail/em-folder-view.c:747
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "フィルタ適用"
 
-#: mail/em-folder-view.c:725
+#: mail/em-folder-view.c:750
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "メッセージからルールを作成(_L)"
 
-#: mail/em-folder-view.c:726
+#: mail/em-folder-view.c:751
 msgid "VFolder on _Subject"
 msgstr "件名の仮想フォルダ(_S)"
 
-#: mail/em-folder-view.c:727
+#: mail/em-folder-view.c:752
 msgid "VFolder on Se_nder"
 msgstr "送信者の仮想フォルダ(_N)"
 
-#: mail/em-folder-view.c:728
+#: mail/em-folder-view.c:753
 msgid "VFolder on _Recipients"
 msgstr "受信者の仮想フォルダ(_R)"
 
-#: mail/em-folder-view.c:729
+#: mail/em-folder-view.c:754
 msgid "VFolder on Mailing _List"
 msgstr "メーリングリストの仮想フォルダ(_L)"
 
-#: mail/em-folder-view.c:731
+#: mail/em-folder-view.c:756
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "送信者の仮想フォルダ(_N)"
 
-#: mail/em-folder-view.c:735
+#: mail/em-folder-view.c:760
 msgid "Filter on Sub_ject"
 msgstr "件名のフィルタ(_J)"
 
-#: mail/em-folder-view.c:736
+#: mail/em-folder-view.c:761
 msgid "Filter on Sen_der"
 msgstr "送信者のフィルタ(_D)"
 
-#: mail/em-folder-view.c:737
+#: mail/em-folder-view.c:762
 msgid "Filter on Re_cipients"
 msgstr "受信者のフィルタ(_C)"
 
-#: mail/em-folder-view.c:738
+#: mail/em-folder-view.c:763
 msgid "Filter on _Mailing List"
 msgstr "メーリングリストのフィルタ(_M)"
 
-#: mail/em-folder-view.c:740
+#: mail/em-folder-view.c:765
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "送信者のフィルタ(_D)"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1512 mail/em-folder-view.c:1550
+#: mail/em-folder-view.c:1537 mail/em-folder-view.c:1575
 #: mail/mail-config.glade.h:41
 msgid "Default"
 msgstr "デフォルト"
 
-#: mail/em-folder-view.c:1584
+#: mail/em-folder-view.c:1611
 msgid "Print Message"
 msgstr "メッセージを印刷"
 
-#: mail/em-folder-view.c:1826
+#: mail/em-folder-view.c:1865
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "場所をコピー"
 
+#: mail/em-folder-view.c:2113
+#, fuzzy, c-format
+msgid "Click to mail %s"
+msgstr "タスクを追加するにはここをクリック"
+
+#: mail/em-folder-view.c:2115
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "タスクを追加するにはここをクリック"
+
 #. message-search popup match count string
-#: mail/em-format-html-display.c:373
+#: mail/em-format-html-display.c:395
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "一致:"
 
-#: mail/em-format-html-display.c:603 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:632 mail/em-format-html.c:564
 #, fuzzy
 msgid "Unsigned"
 msgstr "割当て済み"
 
-#: mail/em-format-html-display.c:603
+#: mail/em-format-html-display.c:632
 #, fuzzy
 msgid ""
 "This message is not signed.  There is no guarantee the sender of the message "
 "is authentic."
 msgstr "このメッセージはデジタル署名されたものですが, 信頼を証明出来ません"
 
-#: mail/em-format-html-display.c:604 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:633 mail/em-format-html.c:565
 #, fuzzy
 msgid "Valid signature"
 msgstr "署名を編集"
 
-#: mail/em-format-html-display.c:604
+#: mail/em-format-html-display.c:633
 msgid ""
 "This message is signed and is valid, the sender of this message is very "
 "likely who they claim to be."
 msgstr ""
 
-#: mail/em-format-html-display.c:605 mail/em-format-html.c:566
+#: mail/em-format-html-display.c:634 mail/em-format-html.c:566
 #, fuzzy
 msgid "Invalid signature"
 msgstr "署名を編集"
 
-#: mail/em-format-html-display.c:605
+#: mail/em-format-html-display.c:634
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:606 mail/em-format-html.c:567
+#: mail/em-format-html-display.c:635 mail/em-format-html.c:567
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:606
+#: mail/em-format-html-display.c:635
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr ""
 
-#: mail/em-format-html-display.c:612 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:573
 #, fuzzy
 msgid "Unencrypted"
 msgstr "未定義"
 
-#: mail/em-format-html-display.c:612
+#: mail/em-format-html-display.c:641
 msgid ""
-"This message is not encrypted.  It's content may be viewed in transit across "
-"The Internet."
+"This message is not encrypted.  Its content may be viewed in transit across "
+"the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:613 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:574
 #, fuzzy
 msgid "Encrypted, weak"
 msgstr "暗号化されたメッセージ"
 
-#: mail/em-format-html-display.c:613
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:614 mail/em-format-html.c:575
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:575
 #, fuzzy
 msgid "Encrypted"
 msgstr "PGP による暗号化"
 
-#: mail/em-format-html-display.c:614
+#: mail/em-format-html-display.c:643
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:615 mail/em-format-html.c:576
+#: mail/em-format-html-display.c:644 mail/em-format-html.c:576
 #, fuzzy
 msgid "Encrypted, strong"
 msgstr "暗号化されたメッセージ"
 
-#: mail/em-format-html-display.c:615
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:699
+#: mail/em-format-html-display.c:728
 #, fuzzy
 msgid "_View Certificate"
 msgstr "認証 ID(_C):"
 
-#: mail/em-format-html-display.c:704
+#: mail/em-format-html-display.c:733
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "このメッセージは現在利用出来ません"
 
-#: mail/em-format-html-display.c:866 mail/em-format-html.c:645
+#: mail/em-format-html-display.c:895 mail/em-format-html.c:645
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "MIME メッセージを解析出来ませんでした, ソースを表示します"
 
-#: mail/em-format-html-display.c:902 mail/em-format-html.c:1051
-#: mail/em-format.c:1198
+#: mail/em-format-html-display.c:931 mail/em-format-html.c:1051
+#: mail/em-format.c:1201
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "ユーザによって操作をキャンセルされました"
 
-#: mail/em-format-html-display.c:910 mail/em-format-html.c:1059
+#: mail/em-format-html-display.c:939 mail/em-format-html.c:1059
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "認証の証明に失敗しました"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1070
 #, fuzzy
 msgid "_View Inline"
 msgstr "インライン表示"
 
-#: mail/em-format-html-display.c:1008
+#: mail/em-format-html-display.c:1071
 #, fuzzy
 msgid "_Hide"
 msgstr "隠す"
@@ -12727,74 +13104,69 @@ msgstr "MIME 
 msgid "Formatting message"
 msgstr "メッセージを移動"
 
-#: mail/em-format-html.c:1434 mail/em-format.c:673 mail/em-mailer-prefs.c:67
+#: mail/em-format-html.c:1419 mail/em-format.c:674 mail/em-mailer-prefs.c:67
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "差出人"
 
-#: mail/em-format-html.c:1436 mail/em-format.c:674 mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1419 mail/em-format.c:675 mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "返信先"
 
-#: mail/em-format-html.c:1438 mail/em-format.c:675 mail/em-mailer-prefs.c:69
+#: mail/em-format-html.c:1419 mail/em-format.c:676 mail/em-mailer-prefs.c:69
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "宛先"
 
-#: mail/em-format-html.c:1440 mail/em-format.c:676 mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1419 mail/em-format.c:677 mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1442 mail/em-format.c:677 mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1419 mail/em-format.c:678 mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1458 mail/em-mailer-prefs.c:631
+#: mail/em-format-html.c:1479 mail/em-mailer-prefs.c:631
 msgid "Mailer"
 msgstr "メーラ"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1485
+#: mail/em-format-html.c:1505
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1488
+#: mail/em-format-html.c:1508
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1499 mail/em-format.c:679 mail/em-mailer-prefs.c:73
+#: mail/em-format-html.c:1520 mail/em-format.c:680 mail/em-mailer-prefs.c:73
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "日付"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:896
 #, c-format
 msgid "%s attachment"
 msgstr "%s を添付"
 
-#: mail/em-format.c:1186
+#: mail/em-format.c:1189
 #, fuzzy
 msgid "Session not initialised"
 msgstr "GNOME の初期化が出来ませんでした"
 
-#: mail/em-format.c:1212
+#: mail/em-format.c:1215
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "このメッセージはデジタル署名され信頼できるものです"
 
-#: mail/em-format.c:1214
+#: mail/em-format.c:1217
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "このメッセージはデジタル署名されたものですが, 信頼を証明出来ません"
 
-#: mail/em-junk-filter.c:72
+#: mail/em-junk-filter.c:73
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-migrate.c:120
-#, fuzzy
-msgid "Migrating..."
-msgstr "待機中..."
-
 #: mail/em-migrate.c:128
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
@@ -12803,22 +13175,22 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:161
+#: mail/em-migrate.c:833
 #, fuzzy, c-format
-msgid "Migrating `%s':"
-msgstr "%s を走査中"
+msgid "Failed to migrate `%s': %s"
+msgstr "メッセージのキャッシュに失敗しました %s: %s"
 
-#: mail/em-migrate.c:775
+#: mail/em-migrate.c:857 mail/em-migrate.c:872
 #, fuzzy, c-format
-msgid "Failed to migrate `%s': %s"
+msgid "Failed to migrate pop3 uid caches: %s"
 msgstr "メッセージのキャッシュに失敗しました %s: %s"
 
-#: mail/em-migrate.c:801 mail/em-migrate.c:818
+#: mail/em-migrate.c:931 mail/em-migrate.c:948
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "メッセージのキャッシュに失敗しました %s: %s"
 
-#: mail/em-migrate.c:830
+#: mail/em-migrate.c:960
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "メッセージのキャッシュに失敗しました %s: %s"
@@ -12861,26 +13233,26 @@ msgstr "
 msgid "Open in %s..."
 msgstr "%s に開く..."
 
-#: mail/em-subscribe-editor.c:583
+#: mail/em-subscribe-editor.c:605
 #, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "IMAP サーバの応答は %s 情報を含んでいません"
 
-#: mail/em-subscribe-editor.c:612
+#: mail/em-subscribe-editor.c:634
 #, fuzzy
 msgid "Subscribed"
 msgstr "購読"
 
-#: mail/em-subscribe-editor.c:616
+#: mail/em-subscribe-editor.c:638 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "フォルダ"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:803
+#: mail/em-subscribe-editor.c:826
 msgid "Please select a server."
 msgstr "サーバを選択"
 
-#: mail/em-subscribe-editor.c:824
+#: mail/em-subscribe-editor.c:847
 msgid "No server has been selected"
 msgstr "選択されたサーバはありません"
 
@@ -12901,23 +13273,23 @@ msgstr ""
 msgid "Filters"
 msgstr "フィルタ"
 
-#: mail/em-utils.c:493
+#: mail/em-utils.c:531
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "転送されたメッセージ"
 
-#: mail/em-utils.c:1046
+#: mail/em-utils.c:1136
 msgid "an unknown sender"
 msgstr "不明な送信者"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1056
+#: mail/em-utils.c:1146
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%Y年%m月%d日(%a)の%H時%M分に %%s 曰く:"
 
-#: mail/em-utils.c:1332 mail/em-utils.c:1416 mail/em-utils.c:1425
+#: mail/em-utils.c:1423 mail/em-utils.c:1507 mail/em-utils.c:1516
 #, fuzzy, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12926,7 +13298,7 @@ msgstr ""
 "メッセージを取得出来ません: %s\n"
 "  %s"
 
-#: mail/em-utils.c:1337
+#: mail/em-utils.c:1428
 #, fuzzy, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12935,27 +13307,27 @@ msgstr ""
 "%sはすでに存在します\n"
 "本当に上書きしますか?"
 
-#: mail/em-utils.c:1380
+#: mail/em-utils.c:1471
 #, fuzzy
 msgid "message"
 msgstr "メッセージ"
 
-#: mail/em-utils.c:1432
+#: mail/em-utils.c:1523
 #, fuzzy, c-format
 msgid "Error: '%s' exists and is not a regular file"
 msgstr "スプール`%s' は存在しないか通常のファイルではありません"
 
-#: mail/em-utils.c:1486
+#: mail/em-utils.c:1577
 #, fuzzy
 msgid "Save Message..."
 msgstr "メッセージを別名で保存..."
 
-#: mail/em-utils.c:1524
+#: mail/em-utils.c:1615
 #, fuzzy
 msgid "Add address"
 msgstr "住所(_A):"
 
-#: mail/em-utils.c:2314
+#: mail/em-utils.c:2405
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -12968,7 +13340,7 @@ msgstr ""
 "\n"
 "本当にこれらのメッセージを消去しますか?"
 
-#: mail/em-utils.c:2340
+#: mail/em-utils.c:2431
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -13317,59 +13689,67 @@ msgid "UID string of the default account."
 msgstr "このアカウントを既定に設定する(_M)"
 
 #: mail/evolution-mail.schemas.in.in.h:73
-msgid "Use custom fonts"
+msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:74
-msgid "Use custom fonts for displaying mail"
+msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:75
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
 #, fuzzy
 msgid "Variable width font"
 msgstr "変数"
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:85
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:86
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13494,7 +13874,7 @@ msgstr "
 msgid "Scanning directory"
 msgstr "ディレクトリを走査中"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:569
 msgid "Starting import"
 msgstr "インポート開始"
 
@@ -13635,24 +14015,22 @@ msgstr ""
 msgid "On this Computer"
 msgstr ""
 
-#: mail/mail-component.c:379
+#: mail/mail-component.c:438
 msgid "New Mail Message"
 msgstr "新規メールメッセージ"
 
-#: mail/mail-component.c:380
+#: mail/mail-component.c:439
 msgid "_Mail Message"
 msgstr "メッセージをメール(_M)"
 
-#: mail/mail-component.c:381
+#: mail/mail-component.c:440
 msgid "Compose a new mail message"
 msgstr "新規メールメッセージを作成します"
 
-#: mail/mail-component.c:496
-#, c-format
-msgid ""
-"The following error occured while migrating your mail data:\n"
-"%s"
-msgstr ""
+#: mail/mail-component.c:582
+#, fuzzy
+msgid "URI of the mail source that the view will display"
+msgstr "カレンダが表示する URI"
 
 #: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
@@ -13769,10 +14147,6 @@ msgstr "
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "暗号化したメールを送信する時に常に自分自身に暗号化する(_W)"
 
-#: mail/mail-config.glade.h:15
-msgid "Alerts"
-msgstr "警告"
-
 #: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "常にブラインドカーボンコピー(Bcc)を指定(_B):"
@@ -13896,10 +14270,6 @@ msgstr "
 msgid "Drafts _folder:"
 msgstr "草稿フォルダ(_F):"
 
-#: mail/mail-config.glade.h:51
-msgid "E_nable"
-msgstr "有効(_N)"
-
 #: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "電子メールアカウント"
@@ -14255,7 +14625,8 @@ msgid "_Junk"
 msgstr "6 月"
 
 #: mail/mail-config.glade.h:158
-msgid "_Load images if sender is in addressbook"
+#, fuzzy
+msgid "_Load images if sender is in address book"
 msgstr "送信者がアドレス帳にある場合画像を読み込む(_L)"
 
 #: mail/mail-config.glade.h:159
@@ -14375,122 +14746,122 @@ msgstr "
 msgid "Filtering Folder"
 msgstr "フォルダをフィルタ中"
 
-#: mail/mail-ops.c:264
+#: mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "メールを受信中"
 
-#: mail/mail-ops.c:558
+#: mail/mail-ops.c:537
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "作業ファイル %s へメールの保存に失敗しました: %s"
 
-#: mail/mail-ops.c:579
+#: mail/mail-ops.c:558
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:588
+#: mail/mail-ops.c:567
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "作業ファイル %s へメールの保存に失敗しました: %s"
 
-#: mail/mail-ops.c:630
+#: mail/mail-ops.c:609
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" を送信中"
 
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:727
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "メッセージ %d / %d を送信中"
 
-#: mail/mail-ops.c:767
+#: mail/mail-ops.c:746
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "メッセージ %d / %d は失敗しました"
 
-#: mail/mail-ops.c:769
+#: mail/mail-ops.c:748
 msgid "Complete."
 msgstr "完了しました"
 
-#: mail/mail-ops.c:863
+#: mail/mail-ops.c:842
 msgid "Saving message to folder"
 msgstr "フォルダへメッセージを保存中"
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s へメッセージを移動中"
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:927
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s へメッセージをコピー中"
 
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1040
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" の中のフォルダを走査中"
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1243
 msgid "Forwarded messages"
 msgstr "メッセージを転送"
 
-#: mail/mail-ops.c:1303
+#: mail/mail-ops.c:1286
 #, c-format
 msgid "Opening folder %s"
 msgstr "フォルダ %s をオープン中"
 
-#: mail/mail-ops.c:1375
+#: mail/mail-ops.c:1358
 #, c-format
 msgid "Opening store %s"
 msgstr "保存された %s をオープン中"
 
-#: mail/mail-ops.c:1453
+#: mail/mail-ops.c:1436
 #, c-format
 msgid "Removing folder %s"
 msgstr "フォルダ %s を削除中"
 
-#: mail/mail-ops.c:1547
+#: mail/mail-ops.c:1530
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "フォルダ '%s' を保存中"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1581
 msgid "Refreshing folder"
 msgstr "フォルダを更新中"
 
-#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
+#: mail/mail-ops.c:1617 mail/mail-ops.c:1668
 msgid "Expunging folder"
 msgstr "フォルダを削除中"
 
-#: mail/mail-ops.c:1682
+#: mail/mail-ops.c:1665
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "%s を %s としてインポート中"
 
-#: mail/mail-ops.c:1683
+#: mail/mail-ops.c:1666
 msgid "Local Folders"
 msgstr "ローカルフォルダ"
 
-#: mail/mail-ops.c:1766
+#: mail/mail-ops.c:1749
 #, c-format
 msgid "Retrieving message %s"
 msgstr "メッセージ %s を取得中"
 
-#: mail/mail-ops.c:1838
+#: mail/mail-ops.c:1821
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d 通のメッセージを取得中"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1905
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d 通のメッセージを保存中"
 
-#: mail/mail-ops.c:1970
+#: mail/mail-ops.c:1953
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14499,7 +14870,7 @@ msgstr ""
 "出力ファイルを作成出来ません: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:1981
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14508,11 +14879,11 @@ msgstr ""
 "ファイルの保存中にエラー: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2069
+#: mail/mail-ops.c:2052
 msgid "Saving attachment"
 msgstr "添付を保存中"
 
-#: mail/mail-ops.c:2086
+#: mail/mail-ops.c:2069
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14521,22 +14892,22 @@ msgstr ""
 "出力ファイルを作成出来ません: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2116
+#: mail/mail-ops.c:2099
 #, c-format
 msgid "Could not write data: %s"
 msgstr "データを書き出すことが出来ませんでした: %s"
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2247
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s との接続を切っています"
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2247
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s に再接続中"
 
-#: mail/mail-ops.c:2366
+#: mail/mail-ops.c:2349
 msgid "Changing junk status"
 msgstr ""
 
@@ -14594,37 +14965,37 @@ msgstr "
 msgid "Send & Receive Mail"
 msgstr "メールの送受信"
 
-#: mail/mail-send-recv.c:307
+#: mail/mail-send-recv.c:309
 #, fuzzy
 msgid "Cancel _All"
 msgstr "すべてキャンセル"
 
-#: mail/mail-send-recv.c:388
+#: mail/mail-send-recv.c:390
 msgid "Updating..."
 msgstr "更新中..."
 
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
 msgid "Waiting..."
 msgstr "待機中..."
 
-#: mail/mail-session.c:234
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "ユーザによって操作をキャンセルされました"
 
-#: mail/mail-session.c:267
+#: mail/mail-session.c:273
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s のためのパスワードを入力してください"
 
-#: mail/mail-session.c:269
+#: mail/mail-session.c:275
 msgid "Enter Password"
 msgstr "パスワードを入力してください"
 
-#: mail/mail-session.c:292
+#: mail/mail-session.c:298
 msgid "_Remember this password"
 msgstr "このパスワードを記憶(_R)"
 
-#: mail/mail-session.c:293
+#: mail/mail-session.c:299
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -14778,7 +15149,7 @@ msgstr "%m
 msgid "%b %d %Y"
 msgstr "%Y年 %m月 %d日"
 
-#: mail/message-list.c:3085
+#: mail/message-list.c:3091
 msgid "Generating message list"
 msgstr "メッセージリストを作成中"
 
@@ -15012,52 +15383,6 @@ msgstr ""
 msgid "mail"
 msgstr "メール"
 
-#: shell/e-setup.c:144
-msgid "Could not update files correctly"
-msgstr "正しくファイルを更新出来ませんでした"
-
-#: shell/e-setup.c:165
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"ディレクトリ %s を作成出来ません\n"
-"\n"
-"エラー: %s"
-
-#: shell/e-setup.c:176
-#, c-format
-msgid ""
-"An error occurred in copying files into\n"
-"`%s'."
-msgstr ""
-"ファイルを `%s' へコピー中に\n"
-"エラーは発生しました"
-
-#: shell/e-setup.c:242
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"ファイル '%s' はディレクトリではありません\n"
-"Evolution ユーザファイルのインストールを\n"
-"許容するために移動して下さい"
-
-#: shell/e-setup.c:251
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"ディレクトリ '%s' は存在してますが，Evolution\n"
-"ディレクトリではありません．Evolution ユーザ\n"
-"ファイルのインストールを許容するために移動して下さい"
-
 #: shell/e-shell-about-box.c:45
 msgid "Brought to you by"
 msgstr "提供は"
@@ -15197,7 +15522,7 @@ msgstr ""
 "もし分からないなら \"自働\" を選択することが出来，Evolution は解決を試みるで"
 "しょう"
 
-#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:737
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -15303,7 +15628,7 @@ msgstr "他
 msgid "Import a _single file"
 msgstr "シングルファイルをインポートします"
 
-#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:566
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -15313,7 +15638,7 @@ msgstr ""
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:692
 #, c-format
 msgid "From %s:"
 msgstr "%s から:"
@@ -15371,7 +15696,7 @@ msgstr ""
 "指定されたフォルダを作成することが出来ません:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:778
+#: shell/e-shell-startup-wizard.c:784
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -15380,7 +15705,7 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:789
+#: shell/e-shell-startup-wizard.c:795
 #, fuzzy
 msgid "Quit Assistant"
 msgstr "アシスタント"
@@ -15478,19 +15803,19 @@ msgstr ""
 "Ximian Evolution は現在オフラインです．オンラインにするにはこのボタンをクリッ"
 "クしてください"
 
-#: shell/e-shell.c:1004
+#: shell/e-shell.c:1002
 msgid "Invalid arguments"
 msgstr "不正な引数です"
 
-#: shell/e-shell.c:1006
+#: shell/e-shell.c:1004
 msgid "Cannot register on OAF"
 msgstr "OAF に登録出来ません"
 
-#: shell/e-shell.c:1008
+#: shell/e-shell.c:1006
 msgid "Configuration Database not found"
 msgstr "コンフィグレーションデータベースがみつかりません"
 
-#: shell/e-shell.c:1010
+#: shell/e-shell.c:1008
 msgid "Generic error"
 msgstr "一般的なエラー"
 
@@ -15619,6 +15944,11 @@ msgstr "
 msgid "Shortcuts"
 msgstr "ショートカット"
 
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "チリ"
+
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -15666,6 +15996,21 @@ msgid ""
 "%s"
 msgstr ""
 
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "新規タスク"
+
+#: shell/evolution-test-component.c:141
+#, fuzzy
+msgid "_Test"
+msgstr "テスト"
+
+#: shell/evolution-test-component.c:142
+#, fuzzy
+msgid "Create a new test item"
+msgstr "新規タスクを作成します"
+
 #: shell/glade/e-active-connection-dialog.glade.h:1
 #, fuzzy
 msgid "Active Connections"
@@ -15805,16 +16150,16 @@ msgstr "
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution は次のデータをインポートできます:"
 
-#: shell/main.c:114 shell/main.c:559
+#: shell/main.c:113 shell/main.c:558
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:120
+#: shell/main.c:119
 msgid "Evolution is now exiting ..."
 msgstr "Evolution はただいま終了中です..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:270
+#: shell/main.c:269
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15845,17 +16190,17 @@ msgstr ""
 "我々はあなたが我々の成果を楽しむことを望んでいます．そして我々は\n"
 "熱心にあなたの貢献を待ち受けています!\n"
 
-#: shell/main.c:294
+#: shell/main.c:293
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolutionチームより\n"
 
-#: shell/main.c:302
+#: shell/main.c:301
 msgid "Don't tell me again"
 msgstr "二度と尋ねない"
 
-#: shell/main.c:352
+#: shell/main.c:351
 #, c-format
 msgid ""
 "Warning: Evolution could not upgrade all your data from version %s.\n"
@@ -15863,79 +16208,84 @@ msgid ""
 "Evolution.\n"
 msgstr ""
 
-#: shell/main.c:411
+#: shell/main.c:410
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution シェルにアクセスできません"
 
-#: shell/main.c:420
+#: shell/main.c:419
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution シェルの初期化ができません: %s"
 
-#: shell/main.c:526
+#: shell/main.c:525
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:528
+#: shell/main.c:527
 msgid "Start in offline mode"
 msgstr "オフラインモードで開始"
 
-#: shell/main.c:530
+#: shell/main.c:529
 msgid "Start in online mode"
 msgstr "オンラインモードで開始"
 
-#: shell/main.c:533
+#: shell/main.c:532
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:536
+#: shell/main.c:535
 msgid "Send the debugging output of all components to a file."
 msgstr "すべてのコンポーネントのデバッグ出力をファイルへ送る"
 
-#: shell/main.c:563
+#: shell/main.c:562
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
-#: smime/gui/certificate-manager.c:395
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:311
+#: smime/gui/certificate-manager.c:458
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "フォルダを選択"
 
-#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
-#: smime/gui/certificate-manager.c:473
+#: smime/gui/certificate-manager.c:233 smime/gui/certificate-manager.c:395
+#: smime/gui/certificate-manager.c:541
 #, fuzzy
 msgid "Certificate Name"
 msgstr "認証 ID(_C):"
 
-#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
+#: smime/gui/certificate-manager.c:241 smime/gui/certificate-manager.c:411
 #, fuzzy
 msgid "Purposes"
 msgstr "処理中"
 
-#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:249 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:174
+#: smime/gui/certificate-manager.c:257
 #, fuzzy
 msgid "Expires"
 msgstr "表現"
 
-#: smime/gui/certificate-manager.c:323
+#: smime/gui/certificate-manager.c:403
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "電子メールアドレス:"
 
-#: smime/gui/certificate-viewer.c:281
+#: smime/gui/certificate-viewer.c:326
 #, fuzzy, c-format
 msgid "Certificate Viewer: %s"
 msgstr "認証 ID"
 
+#: smime/gui/component.c:36
+#, fuzzy, c-format
+msgid "Enter the password for `%s'"
+msgstr "%s のためのパスワードを入力してください"
+
 #. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:116
 #, fuzzy, c-format
@@ -16143,7 +16493,7 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "認証 ID(_C):"
 
-#: smime/lib/e-cert-db.c:494
+#: smime/lib/e-cert-db.c:566
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "カードIDはすでに存在します"
@@ -16369,16 +16719,16 @@ msgstr "
 msgid "Certificate Signature Value"
 msgstr "署名ファイル:"
 
-#: smime/lib/e-pkcs12.c:246
+#: smime/lib/e-pkcs12.c:261
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: smime/lib/e-pkcs12.c:246
+#: smime/lib/e-pkcs12.c:261
 #, fuzzy
 msgid "Enter password for PKCS12 file:"
 msgstr "%s のためのパスワードを入力してください"
 
-#: smime/lib/e-pkcs12.c:379
+#: smime/lib/e-pkcs12.c:359
 #, fuzzy
 msgid "Imported Certificate"
 msgstr "認証 ID(_C):"
@@ -16517,7 +16867,7 @@ msgstr "
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
+#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:23
 msgid "_Actions"
 msgstr "動作(_A)"
 
@@ -16657,10 +17007,6 @@ msgstr "
 msgid "Week"
 msgstr "週"
 
-#: ui/evolution-calendar.xml.h:32
-msgid "Work Week"
-msgstr "週間"
-
 #: ui/evolution-calendar.xml.h:37
 #, fuzzy
 msgid "_Open Appointment"
@@ -16725,7 +17071,7 @@ msgstr "
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:13
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:25
 msgid "_File"
@@ -16733,7 +17079,7 @@ msgstr "
 
 #: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
 #: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:50
 #: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "保存(_S)"
@@ -17425,7 +17771,7 @@ msgid "Close this window"
 msgstr "このウィンドウを閉じます"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:24
 msgid "_Close"
 msgstr "閉じる(_C)"
@@ -17565,46 +17911,66 @@ msgid "Toggles whether the From chooser is displayed"
 msgstr "差出人の選択を表示するかどうか切替えます"
 
 #: ui/evolution-message-composer.xml.h:35
-msgid "Toggles whether the Reply-To field is displayed"
+#, fuzzy
+msgid "Toggles whether the Post-To field is displayed"
 msgstr "返信先フィールドを表示するかどうか切替えます"
 
 #: ui/evolution-message-composer.xml.h:36
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "返信先フィールドを表示するかどうか切替えます"
+
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Toggles whether the To field is displayed"
+msgstr "CC フィールドを表示するかどうか切替えます"
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Attachment..."
 msgstr "添付(_A)..."
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:39
 msgid "_Bcc Field"
 msgstr "Bcc フィールド(_B)"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Cc Field"
 msgstr "Cc フィールド(_C)"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:42
 msgid "_Delete all"
 msgstr "すべて削除(_D)"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:45
 msgid "_From Field"
 msgstr "差出人フィールド(_F)"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:46
 #: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "挿入(_I)"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Open..."
 msgstr "開く(_O)..."
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:48
+#, fuzzy
+msgid "_Post-To Field"
+msgstr "返信先フィールド(_R)"
+
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Reply-To Field"
 msgstr "返信先フィールド(_R)"
 
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Security"
 msgstr "セキュリティ(_S)"
 
+#: ui/evolution-message-composer.xml.h:52
+#, fuzzy
+msgid "_To Field"
+msgstr "差出人フィールド(_F)"
+
 #: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
@@ -17707,6 +18073,16 @@ msgstr "
 msgid "Print the list of tasks"
 msgstr "このメッセージを印刷"
 
+#: ui/evolution-tasks.xml.h:16
+#, fuzzy
+msgid "View the selected task"
+msgstr "選択したタスクを削除します"
+
+#: ui/evolution-tasks.xml.h:21
+#, fuzzy
+msgid "_Open Task"
+msgstr "タスク(_T)"
+
 #: ui/evolution.xml.h:1
 msgid "About Ximian Evolution..."
 msgstr "Ximian Evolution について..."
@@ -18092,18 +18468,239 @@ msgstr "
 msgid "Find _Now"
 msgstr "今すぐ検索"
 
-#~ msgid "Basics"
-#~ msgstr "基本"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
 
-#~ msgid "Time"
-#~ msgstr "時間"
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolution メールコンポーザ"
+
+#: widgets/misc/e-expander.c:181
+#, fuzzy
+msgid "Expanded"
+msgstr "完全削除(_E)"
+
+#: widgets/misc/e-expander.c:182
+#, fuzzy
+msgid "Whether or not the expander is expanded"
+msgstr "アイテムの削除時に確認をとる(_A)"
+
+#: widgets/misc/e-expander.c:190
+msgid "Text of the expander's label"
+msgstr ""
+
+#: widgets/misc/e-expander.c:197
+#, fuzzy
+msgid "Use underline"
+msgstr "未定義"
+
+#: widgets/misc/e-expander.c:198
+msgid ""
+"If set, an underline in the text indicates the next character should be used "
+"for the mnemonic accelerator key"
+msgstr ""
+
+#: widgets/misc/e-expander.c:205
+#, fuzzy
+msgid "Spacing"
+msgstr "スペイン"
+
+#: widgets/misc/e-expander.c:206
+msgid "Space to put between the label and the child"
+msgstr ""
+
+#: widgets/misc/e-expander.c:215
+msgid "Label widget"
+msgstr ""
+
+#: widgets/misc/e-expander.c:216
+msgid "A widget to display in place of the usual expander label"
+msgstr ""
+
+#: widgets/misc/e-expander.c:222
+msgid "Expander Size"
+msgstr ""
+
+#: widgets/misc/e-expander.c:223
+msgid "Size of the expander arrow"
+msgstr ""
+
+#: widgets/misc/e-expander.c:231
+msgid "Indicator Spacing"
+msgstr ""
+
+#: widgets/misc/e-expander.c:232
+msgid "Spacing around expander arrow"
+msgstr ""
+
+#~ msgid "Rename"
+#~ msgstr "リネーム"
+
+#, fuzzy
+#~ msgid "Edit LDAP Server"
+#~ msgstr "LDAP サーバ"
+
+#~ msgid "Select Names"
+#~ msgstr "名前を選択"
+
+#, fuzzy
+#~ msgid "Selected Contacts:"
+#~ msgstr "連絡先を削除しますか?"
+
+#~ msgid "_Folder:"
+#~ msgstr "フォルダ(_F)"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "ユーゴスラビア"
+
+#, fuzzy
+#~ msgid "Rename this calendar to"
+#~ msgstr "このカレンダを印刷します"
+
+#, fuzzy
+#~ msgid "<b>Alarm Action</b>"
+#~ msgstr "カレンダ情報"
+
+#, fuzzy
+#~ msgid "<b>Alarm Email</b>"
+#~ msgstr "メールを送信中"
+
+#, fuzzy
+#~ msgid "<b>Alarm Sound</b>"
+#~ msgstr "カレンダ情報"
+
+#, fuzzy
+#~ msgid "<b>Message to Display</b>"
+#~ msgstr "表示するメッセージ"
+
+#, fuzzy
+#~ msgid "<b>Basics</b>"
+#~ msgstr "<b>説明:</b>"
+
+#, fuzzy
+#~ msgid "<b>Reminders</b>"
+#~ msgstr "催促状"
+
+#, fuzzy
+#~ msgid "<b>Alerts</b>"
+#~ msgstr "<b>説明:</b>"
+
+#, fuzzy
+#~ msgid "<b>Task List</b>"
+#~ msgstr "カレンダ情報"
+
+#, fuzzy
+#~ msgid "<b>Time</b>"
+#~ msgstr "<b>説明:</b>"
+
+#, fuzzy
+#~ msgid "<b>Work Week</b>"
+#~ msgstr "週間"
+
+#, fuzzy
+#~ msgid "<b>Classification</b>"
+#~ msgstr "分類"
+
+#, fuzzy
+#~ msgid "<b>Date &amp; Time</b>"
+#~ msgstr "日付と時間"
+
+#, fuzzy
+#~ msgid "<b>Description</b>"
+#~ msgstr "説明:"
+
+#, fuzzy
+#~ msgid "<b>L_ocation</b>"
+#~ msgstr "場所(_O):"
+
+#, fuzzy
+#~ msgid "<b>Su_mmary</b>"
+#~ msgstr "<b>サマリ:</b> %s<br><br>"
+
+#, fuzzy
+#~ msgid "Could not create cache for new calendar"
+#~ msgstr "ディレクトリ %s を作成出来ませんでした: %s"
+
+#, fuzzy
+#~ msgid "A group must be selected"
+#~ msgstr "主催者は必須です"
+
+#, fuzzy
+#~ msgid "Could not create directory for new task list"
+#~ msgstr "ディレクトリ %s を作成出来ませんでした: %s"
+
+#, fuzzy
+#~ msgid "<b>Preview</b>"
+#~ msgstr "プレビュー"
+
+#, fuzzy
+#~ msgid "<b>Progress</b>"
+#~ msgstr "処理中"
+
+#, fuzzy
+#~ msgid "<b>Web Page</b>"
+#~ msgstr "メールを送信中"
+
+#~ msgid "The method required to load `%s' is not supported"
+#~ msgstr "'%s' を読み込むことを要求されるメソッドはサポートしていません"
+
+#, fuzzy
+#~ msgid "You don't have permission to open the folder in `%s'"
+#~ msgstr "`%s' のフォルダを開くことが出来ませんでした"
+
+#~ msgid "Could not open the folder in `%s'"
+#~ msgstr "`%s' のフォルダを開くことが出来ませんでした"
+
+#~ msgid "The method required to open `%s' is not supported"
+#~ msgstr "'%s' を開くことを要求されるメソッドはサポートしていません"
 
-#~ msgid "Su_mmary:"
-#~ msgstr "サマリ(_M):"
+#, fuzzy
+#~ msgid "Adding %s"
+#~ msgstr "\"%s\" を送信中"
 
 #, fuzzy
-#~ msgid "_Web Page:"
-#~ msgstr "ウェブページのURL(_W):"
+#~ msgid "Rename this task list to"
+#~ msgstr "このショートカットをリネーム"
+
+#~ msgid "Could not update files correctly"
+#~ msgstr "正しくファイルを更新出来ませんでした"
+
+#~ msgid ""
+#~ "Cannot create the directory\n"
+#~ "%s\n"
+#~ "Error: %s"
+#~ msgstr ""
+#~ "ディレクトリ %s を作成出来ません\n"
+#~ "\n"
+#~ "エラー: %s"
+
+#~ msgid ""
+#~ "An error occurred in copying files into\n"
+#~ "`%s'."
+#~ msgstr ""
+#~ "ファイルを `%s' へコピー中に\n"
+#~ "エラーは発生しました"
+
+#~ msgid ""
+#~ "The file `%s' is not a directory.\n"
+#~ "Please move it in order to allow installation\n"
+#~ "of the Evolution user files."
+#~ msgstr ""
+#~ "ファイル '%s' はディレクトリではありません\n"
+#~ "Evolution ユーザファイルのインストールを\n"
+#~ "許容するために移動して下さい"
+
+#~ msgid ""
+#~ "The directory `%s' exists but is not the\n"
+#~ "Evolution directory.  Please move it in order\n"
+#~ "to allow installation of the Evolution user files."
+#~ msgstr ""
+#~ "ディレクトリ '%s' は存在してますが，Evolution\n"
+#~ "ディレクトリではありません．Evolution ユーザ\n"
+#~ "ファイルのインストールを許容するために移動して下さい"
 
 #, fuzzy
 #~ msgid "Select Calendar Folder"
@@ -18127,9 +18724,6 @@ msgstr "
 #~ msgid "_Forward Message"
 #~ msgstr "メッセージを転送(_F)"
 
-#~ msgid "Account Name"
-#~ msgstr "アカウント名"
-
 #~ msgid "Server Name"
 #~ msgstr "サーバ名"
 
@@ -18179,10 +18773,6 @@ msgstr "
 #~ msgid "TTY"
 #~ msgstr "TTY"
 
-#, fuzzy
-#~ msgid "Opening tasks at %s"
-#~ msgstr "保存された %s をオープン中"
-
 #~ msgid "Send anyway?"
 #~ msgstr "とにかく送信する?"
 
@@ -18337,10 +18927,6 @@ msgstr "
 #~ msgid "Test type"
 #~ msgstr "ファイル種別:"
 
-#, fuzzy
-#~ msgid "Evolution Test Component"
-#~ msgstr "Evolution メールコンポーザ"
-
 #, fuzzy
 #~ msgid "import"
 #~ msgstr "インポート"
@@ -18404,10 +18990,6 @@ msgstr "
 #~ msgid "Wants HTML Mail"
 #~ msgstr "HTML メールを送信しますか?"
 
-#, fuzzy
-#~ msgid "Jabber Id List"
-#~ msgstr "名前のないリスト"
-
 #, fuzzy
 #~ msgid "ICQ Id List"
 #~ msgstr "新規リスト"
@@ -18812,9 +19394,6 @@ msgstr "
 #~ msgid "New Message Post"
 #~ msgstr "新規メッセージポスト"
 
-#~ msgid "_Post Message"
-#~ msgstr "ポストメッセージ(_P)"
-
 #~ msgid "Post a new mail message"
 #~ msgstr "新規メールメッセージをポスト"
 
@@ -19861,10 +20440,6 @@ msgstr "
 #~ msgid "Chiclayo"
 #~ msgstr "チリ"
 
-#, fuzzy
-#~ msgid "Chico"
-#~ msgstr "チリ"
-
 #, fuzzy
 #~ msgid "Chievres"
 #~ msgstr "中国語"
@@ -20616,14 +21191,6 @@ msgstr "
 #~ msgid "Ibiza"
 #~ msgstr "インド"
 
-#, fuzzy
-#~ msgid "Idaho"
-#~ msgstr "インド"
-
-#, fuzzy
-#~ msgid "Ilan"
-#~ msgstr "ポーランド"
-
 #, fuzzy
 #~ msgid "Iliamna"
 #~ msgstr "インライン"
@@ -20720,10 +21287,6 @@ msgstr "
 #~ msgid "Kazan"
 #~ msgstr "カザフスタン"
 
-#, fuzzy
-#~ msgid "Kearney"
-#~ msgstr "ケニア"
-
 #, fuzzy
 #~ msgid "Keene"
 #~ msgstr "既読"
@@ -20884,10 +21447,6 @@ msgstr "
 #~ msgid "Liberal"
 #~ msgstr "リベリア"
 
-#, fuzzy
-#~ msgid "Libya"
-#~ msgstr "リベリア"
-
 #, fuzzy
 #~ msgid "Liege"
 #~ msgstr "ニジェール"
@@ -21448,10 +22007,6 @@ msgstr "
 #~ msgid "New Iberia"
 #~ msgstr "ニューカレドニア"
 
-#, fuzzy
-#~ msgid "New Jersey"
-#~ msgstr "新規"
-
 #, fuzzy
 #~ msgid "New Mexico"
 #~ msgstr "メキシコ"
@@ -22600,10 +23155,6 @@ msgstr "
 #~ msgid "Trevico"
 #~ msgstr "前"
 
-#, fuzzy
-#~ msgid "Trieste"
-#~ msgstr "テスト"
-
 #, fuzzy
 #~ msgid "Truckee"
 #~ msgstr "トルコ"
@@ -23981,9 +24532,6 @@ msgstr "
 #~ msgid "Select"
 #~ msgstr "すべて選択"
 
-#~ msgid "_Add ->"
-#~ msgstr "追加(_A)->"
-
 #~ msgid "_Add Mapping"
 #~ msgstr "マッピングを追加(_A)"
 
@@ -24529,9 +25077,6 @@ msgstr "
 #~ msgid "Signature hint"
 #~ msgstr "署名を保存"
 
-#~ msgid " _Refresh List "
-#~ msgstr "リストを更新(_R)"
-
 #~ msgid "Show _folders from server: "
 #~ msgstr "サーバのフォルダを表示: "
 
@@ -24718,9 +25263,6 @@ msgstr "
 #~ msgid "No such message: %s"
 #~ msgstr "そのようなメッセージはありません: %s"
 
-#~ msgid "You cannot copy messages from this trash folder."
-#~ msgstr "このゴミ箱フォルダからメッセージをコピーすることが出来ません"
-
 #~ msgid "Cannot append message to spool file: %s: %s"
 #~ msgstr "スプールファイルにメッセージを追加出来ません: %s: %s"
 
@@ -25081,9 +25623,6 @@ msgstr "
 #~ msgid "Could not open folder: message listing was incomplete."
 #~ msgstr "フォルダを開けませんでした: メッセージリストは未完成です"
 
-#~ msgid "Could not fetch message: %s"
-#~ msgstr "メッセージを取得出来ませんでした: %s"
-
 #~ msgid "Could not retrieve message from POP server %s: %s"
 #~ msgstr "POP サーバ %s からメッセージを取得出来ませんでした: %s"
 
-- 
cgit v1.2.3