[evolution-data-server/gnome-3-8] l10n: Update Japanese translation



commit 18d4460c0bf5e2076f42ca8f507be99badf3884c
Author: Noriko Mizumoto <noriko fedoraproject org>
Date:   Sun Mar 24 03:07:29 2013 +0900

    l10n: Update Japanese translation

 po/ja.po | 6485 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 3671 insertions(+), 2814 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 1dd691f..6b3c203 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,1127 +8,1223 @@
 # Takayuki KUSANO <AE5T-KSN asahi-net or jp>, 2009-2011.
 # Kiyotaka NISHIBORI <nl nishibori kiyotaka gmail com>, 2010.
 # Takayoshi OKANO <kano na rim or jp>, 2011.
-# Jiro Matsuzawa <jmatsuzawa src gnome org>, 2011.
+# Jiro Matsuzawa <jmatsuzawa src gnome org>, 2011, 2013.
+# Noriko Mizumoto <noriko fedoraproject org>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server gnome-3-0\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2011-12-23 17:42+0000\n"
-"PO-Revision-Date: 2011-12-25 23:40+0900\n"
-"Last-Translator: OKANO Takayoshi <kano na rim or jp>\n"
+"Project-Id-Version: evolution-data-server master\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-24 03:00+0900\n"
+"PO-Revision-Date: 2013-03-24 03:05+0000\n"
+"Last-Translator: Jiro Matsuzawa <jmatsuzawa gnome org>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:125
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:276
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:937
-#: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:441
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:527
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:556
-#: ../calendar/backends/http/e-cal-backend-http.c:437
-#: ../calendar/libecal/e-cal.c:4595 ../calendar/libecal/e-cal-client.c:147
-#: ../camel/providers/imap/camel-imap-command.c:510
-#: ../camel/providers/imap/camel-imap-store.c:450
-#: ../camel/providers/imapx/camel-imapx-server.c:2421
-#: ../libedataserver/e-client.c:161
-msgid "Unknown error"
-msgstr "エラーを特定できません"
-
-#: ../addressbook/backends/file/e-book-backend-file.c:150
-#, fuzzy, c-format
-#| msgid "Failed to create child process '%s': %s"
+#: ../addressbook/backends/file/e-book-backend-file.c:114
+#, c-format
 msgid "Failed to remove file '%s': %s"
-msgstr "子プロセス '%s' の生成に失敗しました: %s"
+msgstr "ファイル '%s' の削除に失敗しました: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:173
-#, fuzzy, c-format
-#| msgid "Could not create directory %s: %s"
+#: ../addressbook/backends/file/e-book-backend-file.c:138
+#, c-format
 msgid "Failed to make directory %s: %s"
-msgstr "フォルダー %s を作成できませんでした: %s"
+msgstr "フォルダー %s の作成に失敗しました: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:468
-#, fuzzy, c-format
-#| msgid "Failed to create child process '%s': %s"
+#: ../addressbook/backends/file/e-book-backend-file.c:385
+#, c-format
 msgid "Failed to create hardlink for resource '%s': %s"
-msgstr "子プロセス '%s' の生成に失敗しました: %s"
+msgstr "リソース '%s' のハードリンクの作成に失敗しました: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:570
-#: ../addressbook/backends/file/e-book-backend-file.c:1125
+#: ../addressbook/backends/file/e-book-backend-file.c:487
+#: ../addressbook/backends/file/e-book-backend-file.c:911
 msgid "No UID in the contact"
+msgstr "この連絡先に UID はありません"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:757
+#, c-format
+msgid "Conflicting UIDs found in added contacts"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:844
+#: ../addressbook/backends/file/e-book-backend-file.c:1038
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2615
+#, c-format
+msgid "Contact '%s' not found"
+msgstr "連絡先 '%s' が見つかりません"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:940
+#, c-format
+msgid "Tried to modify contact '%s' with out of sync revision"
 msgstr ""
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1559
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:512
+#: ../addressbook/backends/file/e-book-backend-file.c:1089
+#: ../addressbook/backends/file/e-book-backend-file.c:1139
+#, fuzzy, c-format
+#| msgid "Protocol not supported"
+msgid "Query '%s' not supported"
+msgstr "プロトコルはサポートされていません"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1098
+#: ../addressbook/backends/file/e-book-backend-file.c:1148
+#, fuzzy, c-format
+#| msgid "Invalid query: "
+msgid "Invalid Query '%s'"
+msgstr "問い合わせ内容が無効です: "
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1248
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1562
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4847
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:514
+#: ../addressbook/backends/file/e-book-backend-file.c:1250
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4963
 msgid "Searching..."
 msgstr "検索中..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2104
-#, c-format
-msgid "Failed to build summary for an address book %s"
-msgstr ""
+#: ../addressbook/backends/file/e-book-backend-file.c:1568
+#, fuzzy, c-format
+#| msgid "Could not rename folder %s to %s: %s"
+msgid "Failed to rename old database from '%s' to '%s': %s"
+msgstr "フォルダーを %s から %s へ名前変更できませんでした: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:149
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1222
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4858
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:338
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1029
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
+#: ../addressbook/libebook-contacts/e-phone-number.c:58
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:562
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:592
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:604
+#: ../calendar/libecal/e-cal.c:2339 ../calendar/libecal/e-cal-client.c:275
+#: ../camel/camel-imapx-command.c:596 ../libedataserver/e-client.c:179
+msgid "Unknown error"
+msgstr "エラーを特定できません"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:831
+#: ../addressbook/backends/google/e-book-backend-google.c:649
 msgid "Querying for updated contacts…"
 msgstr "更新された連絡先を問い合わせ中…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:880
-#: ../addressbook/libebook/e-book.c:3529 ../calendar/libecal/e-cal.c:1381
-#: ../libedataserver/e-client.c:1915
-msgid "Personal"
-msgstr "個人"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:882
-msgid "Friends"
-msgstr "友人"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:884
-msgid "Family"
-msgstr "家族"
-
-#: ../addressbook/backends/google/e-book-backend-google.c:886
-msgid "Coworkers"
-msgstr "同僚"
-
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:970
+#: ../addressbook/backends/google/e-book-backend-google.c:786
 msgid "Querying for updated groups…"
 msgstr "更新されたグループを問い合わせ中…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1362
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1635
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:291
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:324
+#: ../addressbook/backends/google/e-book-backend-google.c:1235
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1653
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:389
 msgid "The backend does not support bulk additions"
-msgstr ""
+msgstr "バックエンドが大量追加に対応していません"
 
 #. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1389
+#: ../addressbook/backends/google/e-book-backend-google.c:1267
 msgid "Creating new contact…"
 msgstr "新しい連絡先の作成中…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1476
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:323
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:431
-#, fuzzy
-#| msgid "Calendar doesn't support Free/Busy"
+#: ../addressbook/backends/google/e-book-backend-google.c:1358
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:506
 msgid "The backend does not support bulk removals"
-msgstr "カレンダーは予定の有無に対応しません"
+msgstr "バックエンドが大量削除に対応していません"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1504
+#: ../addressbook/backends/google/e-book-backend-google.c:1386
 msgid "Deleting contact…"
 msgstr "連絡先の削除中…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1749
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2292
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:371
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:485
-#, fuzzy
-#| msgid "Key usage does not support certificate signing"
+#: ../addressbook/backends/google/e-book-backend-google.c:1640
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2319
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:567
 msgid "The backend does not support bulk modifications"
-msgstr "キーの利用方法が認証署名をサポートしていません"
+msgstr "バックエンドが大量修正に対応していません"
 
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1782
+#: ../addressbook/backends/google/e-book-backend-google.c:1678
 msgid "Modifying contact…"
 msgstr "連絡先の更新中…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1983
+#: ../addressbook/backends/google/e-book-backend-google.c:1849
 msgid "Loading…"
 msgstr "読み込み中…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2108
-msgid "Authenticating with the server…"
-msgstr "サーバーで認証中…"
+#. System Group: My Contacts
+#: ../addressbook/backends/google/e-book-google-utils.c:1602
+#: ../services/evolution-source-registry/builtin/system-address-book.source.in.h:1
+#: ../services/evolution-source-registry/builtin/system-calendar.source.in.h:1
+#: ../services/evolution-source-registry/builtin/system-memo-list.source.in.h:1
+#: ../services/evolution-source-registry/builtin/system-task-list.source.in.h:1
+msgid "Personal"
+msgstr "個人"
+
+#. System Group: Friends
+#: ../addressbook/backends/google/e-book-google-utils.c:1604
+msgid "Friends"
+msgstr "友人"
+
+#. System Group: Family
+#: ../addressbook/backends/google/e-book-google-utils.c:1606
+msgid "Family"
+msgstr "家族"
 
-#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book 
which is not connected to the server
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
+#. System Group: Coworkers
+#: ../addressbook/backends/google/e-book-google-utils.c:1608
+msgid "Coworkers"
+msgstr "同僚"
+
+#. Translators: An error message shown to a user when trying to do an
+#. * operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
 msgid "Not connected"
 msgstr "接続していません"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:793
-msgid "Using Distinguished Name (DN)"
-msgstr "識別名 (DN) を使用する"
-
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:796
-msgid "Using Email Address"
-msgstr "E-メール・アドレスを使用する"
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:950
+msgid "Failed to bind using either v3 or v2 binds"
+msgstr "v3 または v2 のバインドいずれかを使った結合に失敗しました"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1073
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP サーバーへ再接続中..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1196
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1203
 msgid "Invalid DN syntax"
 msgstr "無効な識別名 (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1734
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1219
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4857
+#, c-format
+msgid "LDAP error 0x%x (%s)"
+msgstr "LDAP エラー 0x%x (%s)"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1737
 msgid "Adding contact to LDAP server..."
 msgstr "LDAP サーバーへ連絡先を追加中..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1865
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1875
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP サーバーから連絡先を削除中..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2314
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2019
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2416
+#, c-format
+msgid "%s: NULL returned from ldap_first_entry"
+msgstr "%s: ldap_first_entry から NULL が返されました"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2272
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2474
+#, c-format
+msgid "%s: Unhandled result type %d returned"
+msgstr "%s: 未処理の結果タイプ %d が返されました"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2341
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP サーバーにある連絡先を修正中..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4697
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2703
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2935
+#, c-format
+msgid "%s: Unhandled search result type %d returned"
+msgstr "%s: 未処理の検索結果タイプ %d が返されました"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4806
 msgid "Receiving LDAP search results..."
 msgstr "LDAP サーバー検索結果を取得中..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4868
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4985
 msgid "Error performing search"
 msgstr "検索中にエラーが発生しました"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4989
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5108
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "連絡先 (%d 個目) をダウンロード中... "
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:352
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5571
 #, c-format
-msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgid "Failed to get the DN for user '%s'"
+msgstr "ユーザー '%s' の DN 取得に失敗しました"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:420
+#, fuzzy, c-format
+#| msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgid "Create resource '%s' failed with HTTP status %d (%s)"
 msgstr "リソース '%s' の作成に失敗しました。HTTP ステータス: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3196
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:522
 #, c-format
-msgid "%s: there was no source for UID '%s' stored in GConf."
-msgstr "%s: GConf に UID '%s' のソースがありません。"
+msgid "DELETE failed with HTTP status %d"
+msgstr "削除に失敗しました。HTTP ステータス: %d"
 
-#: ../addressbook/libebook/e-book.c:3512 ../calendar/libecal/e-cal.c:1361
-#: ../libedataserver/e-client.c:1910
-msgid "On This Computer"
-msgstr "このコンピューター"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:588
+msgid "Contact on server changed -> not modifying"
+msgstr "サーバー上の連絡先が変更されました -> 修正していません"
 
-#: ../addressbook/libebook/e-book.c:3638
-#: ../addressbook/libebook/e-book-client.c:699
-#: ../addressbook/libedata-book/e-data-book.c:322
-msgid "Address book does not exist"
-msgstr "アドレス帳がありません"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:597
+#, fuzzy, c-format
+#| msgid "Modify contact failed with HTTP status: %d (%s)"
+msgid "Modify contact failed with HTTP status %d (%s)"
+msgstr "連絡先の変更に失敗しました。HTTP ステータス: %d (%s)"
 
-#: ../addressbook/libebook/e-book-client.c:92
-#, fuzzy
-#| msgid "No such folder %s"
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1007
+msgid "Loading Addressbook summary..."
+msgstr "アドレス帳の要約を読み込み中..."
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1026
+#, c-format
+msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
+msgstr "WebDAV での PROPFIND に失敗しました。HTTP ステータス: %d (%s)"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1051
+msgid "No response body in webdav PROPFIND result"
+msgstr "WebDAV PROPFIND の結果にレスポンスボディがありません"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1083
+#, c-format
+msgid "Loading Contacts (%d%%)"
+msgstr "連絡先を読み込み中 (%d%%)"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1416
+msgid "Cannot transform SoupURI to string"
+msgstr "SoupURI を文字列に変換できません"
+
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:24
 msgid "No such book"
-msgstr "そのようなフォルダー %s はありません"
+msgstr "そのようなアドレス帳はありません"
 
-#: ../addressbook/libebook/e-book-client.c:94
-#: ../addressbook/libedata-book/e-data-book.c:315
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:26
+#: ../addressbook/libedata-book/e-data-book.c:797
 msgid "Contact not found"
 msgstr "連絡先が見つかりません"
 
-#: ../addressbook/libebook/e-book-client.c:96
-#: ../addressbook/libedata-book/e-data-book.c:316
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:28
+#: ../addressbook/libedata-book/e-data-book.c:798
 msgid "Contact ID already exists"
-msgstr "連絡先 ID が既に存在しています"
+msgstr "連絡先 ID が既に存在します"
 
-#: ../addressbook/libebook/e-book-client.c:98
-#, fuzzy
-#| msgid "No such message"
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:30
 msgid "No such source"
-msgstr "そのようなメッセージはありません"
+msgstr "そのようなソースはありません"
 
-#: ../addressbook/libebook/e-book-client.c:100
-#: ../addressbook/libedata-book/e-data-book.c:332
+#: ../addressbook/libebook-contacts/e-book-contacts-types.c:32
+#: ../addressbook/libedata-book/e-data-book.c:814
 msgid "No space"
 msgstr "スペースがありません"
 
-#: ../addressbook/libebook/e-book-client.c:512
-#, fuzzy
-#| msgid "Failed to encode data"
-msgid "Failed to run book factory"
-msgstr "データのエンコードに失敗しました"
-
-#: ../addressbook/libebook/e-book-client.c:522
-#: ../addressbook/libedata-book/e-data-book-factory.c:196
-#: ../addressbook/libedata-book/e-data-book-factory.c:228
-#: ../calendar/libecal/e-cal-client.c:610
-#: ../calendar/libedata-cal/e-data-cal-factory.c:213
-#: ../calendar/libedata-cal/e-data-cal-factory.c:242
-#, c-format
-msgid "Invalid source"
-msgstr "ソースが無効です"
-
-#: ../addressbook/libebook/e-book-client.c:624
-#: ../calendar/libecal/e-cal-client.c:725
-#, c-format
-msgid "Incorrect uri '%s'"
-msgstr ""
-
-#: ../addressbook/libebook/e-book-client.c:662
-#, fuzzy
-#| msgid "Failed on message %d"
-msgid "Failed to find system book"
-msgstr "メッセージ %d で失敗しました"
-
-#: ../addressbook/libebook/e-book-client.c:771
-#: ../calendar/libecal/e-cal-client.c:878
-#, fuzzy, c-format
-#| msgid "%s: there was no source for UID '%s' stored in GConf."
-msgid "There was no source for UID '%s' stored in a source list."
-msgstr "%s: GConf に UID '%s' のソースがありません。"
-
-#: ../addressbook/libebook/e-book-client.c:2563
-#: ../calendar/libecal/e-cal-client.c:4480
-#, fuzzy
-#| msgid "Cannot get contact list: %s"
-msgid "Cannot get connection to view"
-msgstr "連絡先の一覧を取得できません: %s"
-
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:117
+#: ../addressbook/libebook-contacts/e-contact.c:120
 msgid "Unique ID"
 msgstr "重複しない ID"
 
 #. FILE_AS is not really a structured field - we use a getter/setter
-#. *         so we can generate its value if necessary in the getter
-#: ../addressbook/libebook/e-contact.c:120
+#. * so we can generate its value if necessary in the getter
+#. Translators: This is an EContact field description, in this case it's a
+#. * preferred user's description (or display name) of the contact. Note 'File' is a verb here.
+#: ../addressbook/libebook-contacts/e-contact.c:125
 msgid "File Under"
 msgstr "FILE UNDER"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:122
-msgid "Book URI"
-msgstr "アドレス帳の URI"
+#: ../addressbook/libebook-contacts/e-contact.c:127
+msgid "Book UID"
+msgstr "アドレス帳の UID"
 
 #. Name fields
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook-contacts/e-contact.c:133
 msgid "Full Name"
 msgstr "氏名"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook-contacts/e-contact.c:134
 msgid "Given Name"
 msgstr "名"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook-contacts/e-contact.c:135
 msgid "Family Name"
 msgstr "姓"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook-contacts/e-contact.c:136
 msgid "Nickname"
 msgstr "あだ名"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook-contacts/e-contact.c:139
 msgid "Email 1"
 msgstr "E-メール 1"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook-contacts/e-contact.c:140
 msgid "Email 2"
 msgstr "E-メール 2"
 
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook-contacts/e-contact.c:141
 msgid "Email 3"
 msgstr "E-メール 3"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook-contacts/e-contact.c:142
 msgid "Email 4"
 msgstr "E-メール 4"
 
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook-contacts/e-contact.c:144
 msgid "Mailer"
 msgstr "メール・クライアント"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook-contacts/e-contact.c:147
 msgid "Home Address Label"
 msgstr "自宅の住所ラベル"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook-contacts/e-contact.c:148
 msgid "Work Address Label"
 msgstr "勤務先の住所ラベル"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook-contacts/e-contact.c:149
 msgid "Other Address Label"
 msgstr "その他の住所ラベル"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook-contacts/e-contact.c:152
 msgid "Assistant Phone"
 msgstr "アシスタントの電話番号"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook-contacts/e-contact.c:153
 msgid "Business Phone"
 msgstr "仕事の電話番号"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook-contacts/e-contact.c:154
 msgid "Business Phone 2"
 msgstr "仕事の電話番号 2"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook-contacts/e-contact.c:155
 msgid "Business Fax"
 msgstr "仕事の FAX 番号"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook-contacts/e-contact.c:156
 msgid "Callback Phone"
 msgstr "得意先の電話番号"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook-contacts/e-contact.c:157
 msgid "Car Phone"
 msgstr "車載電話の番号"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook-contacts/e-contact.c:158
 msgid "Company Phone"
 msgstr "会社の電話番号"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook-contacts/e-contact.c:159
 msgid "Home Phone"
 msgstr "自宅の電話番号"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook-contacts/e-contact.c:160
 msgid "Home Phone 2"
 msgstr "自宅の電話番号 2"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook-contacts/e-contact.c:161
 msgid "Home Fax"
 msgstr "自宅の FAX 番号"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook-contacts/e-contact.c:162
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook-contacts/e-contact.c:163
 msgid "Mobile Phone"
 msgstr "携帯電話の番号"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook-contacts/e-contact.c:164
 msgid "Other Phone"
 msgstr "その他の電話番号"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook-contacts/e-contact.c:165
 msgid "Other Fax"
 msgstr "その他の FAX 番号"
 
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook-contacts/e-contact.c:166
 msgid "Pager"
 msgstr "ポケベルの番号"
 
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook-contacts/e-contact.c:167
 msgid "Primary Phone"
 msgstr "電話番号"
 
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook-contacts/e-contact.c:168
 msgid "Radio"
 msgstr "ラジオ"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook-contacts/e-contact.c:169
 msgid "Telex"
 msgstr "テレックス"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook-contacts/e-contact.c:171
 msgid "TTY"
 msgstr "テレタイプライター"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook-contacts/e-contact.c:174
 msgid "Organization"
 msgstr "組織"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook-contacts/e-contact.c:175
 msgid "Organizational Unit"
 msgstr "組織"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook-contacts/e-contact.c:176
 msgid "Office"
 msgstr "事務所"
 
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook-contacts/e-contact.c:177
 msgid "Title"
 msgstr "敬称 (前つけ)"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook-contacts/e-contact.c:178
 msgid "Role"
 msgstr "役割"
 
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook-contacts/e-contact.c:179
 msgid "Manager"
 msgstr "マネージャー"
 
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook-contacts/e-contact.c:180
 msgid "Assistant"
 msgstr "アシスタント"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook-contacts/e-contact.c:183
 msgid "Homepage URL"
 msgstr "ホームページの URL"
 
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook-contacts/e-contact.c:184
 msgid "Weblog URL"
 msgstr "ブログの URL"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:182
-#: ../libedataserverui/e-categories-dialog.c:85
+#: ../addressbook/libebook-contacts/e-contact.c:187
 msgid "Categories"
 msgstr "カテゴリ"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook-contacts/e-contact.c:190
 msgid "Calendar URI"
 msgstr "カレンダーの URI"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook-contacts/e-contact.c:191
 msgid "Free/Busy URL"
 msgstr "予定の有無の URL"
 
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook-contacts/e-contact.c:192
 msgid "ICS Calendar"
 msgstr "ICS カレンダー"
 
-#: ../addressbook/libebook/e-contact.c:188
+#: ../addressbook/libebook-contacts/e-contact.c:193
 msgid "Video Conferencing URL"
 msgstr "ビデオ会議用の URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook-contacts/e-contact.c:196
 msgid "Spouse's Name"
 msgstr "配偶者の名前"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook-contacts/e-contact.c:197
 msgid "Note"
 msgstr "ノート"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook-contacts/e-contact.c:200
 msgid "AIM Home Screen Name 1"
 msgstr "自宅の AIM スクリーン名 1"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook-contacts/e-contact.c:201
 msgid "AIM Home Screen Name 2"
 msgstr "自宅の AIM スクリーン名 2"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook-contacts/e-contact.c:202
 msgid "AIM Home Screen Name 3"
 msgstr "自宅の AIM スクリーン名 3"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook-contacts/e-contact.c:203
 msgid "AIM Work Screen Name 1"
 msgstr "勤務先の AIM スクリーン名 1"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook-contacts/e-contact.c:204
 msgid "AIM Work Screen Name 2"
 msgstr "勤務先の AIM スクリーン名 2"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook-contacts/e-contact.c:205
 msgid "AIM Work Screen Name 3"
 msgstr "勤務先の AIM スクリーン名 3"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook-contacts/e-contact.c:206
 msgid "GroupWise Home Screen Name 1"
 msgstr "自宅の GroupWise スクリーン名 1"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook-contacts/e-contact.c:207
 msgid "GroupWise Home Screen Name 2"
 msgstr "自宅の GroupWise スクリーン名 2"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook-contacts/e-contact.c:208
 msgid "GroupWise Home Screen Name 3"
 msgstr "自宅の GroupWise スクリーン名 3"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook-contacts/e-contact.c:209
 msgid "GroupWise Work Screen Name 1"
 msgstr "勤務先の GroupWise スクリーン名 1"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook-contacts/e-contact.c:210
 msgid "GroupWise Work Screen Name 2"
 msgstr "勤務先の GroupWise スクリーン名 2"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook-contacts/e-contact.c:211
 msgid "GroupWise Work Screen Name 3"
 msgstr "勤務先の GroupWise スクリーン名 3"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook-contacts/e-contact.c:212
 msgid "Jabber Home ID 1"
 msgstr "自宅の Jabber ID 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook-contacts/e-contact.c:213
 msgid "Jabber Home ID 2"
 msgstr "自宅の Jabber ID 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook-contacts/e-contact.c:214
 msgid "Jabber Home ID 3"
 msgstr "自宅の Jabber ID 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook-contacts/e-contact.c:215
 msgid "Jabber Work ID 1"
 msgstr "勤務先の Jabber ID 1"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook-contacts/e-contact.c:216
 msgid "Jabber Work ID 2"
 msgstr "勤務先の Jabber ID 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook-contacts/e-contact.c:217
 msgid "Jabber Work ID 3"
 msgstr "勤務先の Jabber ID 3"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook-contacts/e-contact.c:218
 msgid "Yahoo! Home Screen Name 1"
 msgstr "自宅の Yahoo! スクリーン名 1"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook-contacts/e-contact.c:219
 msgid "Yahoo! Home Screen Name 2"
 msgstr "自宅の Yahoo! スクリーン名 2"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook-contacts/e-contact.c:220
 msgid "Yahoo! Home Screen Name 3"
 msgstr "自宅の Yahoo! スクリーン名 3"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook-contacts/e-contact.c:221
 msgid "Yahoo! Work Screen Name 1"
 msgstr "勤務先の Yahoo! スクリーン名 1"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook-contacts/e-contact.c:222
 msgid "Yahoo! Work Screen Name 2"
 msgstr "勤務先の Yahoo! スクリーン名 2"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook-contacts/e-contact.c:223
 msgid "Yahoo! Work Screen Name 3"
 msgstr "勤務先の Yahoo! スクリーン名 3"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook-contacts/e-contact.c:224
 msgid "MSN Home Screen Name 1"
 msgstr "自宅の MSN スクリーン名 1"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook-contacts/e-contact.c:225
 msgid "MSN Home Screen Name 2"
 msgstr "自宅の MSN スクリーン名 2"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook-contacts/e-contact.c:226
 msgid "MSN Home Screen Name 3"
 msgstr "自宅の MSN スクリーン名 3"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook-contacts/e-contact.c:227
 msgid "MSN Work Screen Name 1"
 msgstr "勤務先の MSN スクリーン名 1"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook-contacts/e-contact.c:228
 msgid "MSN Work Screen Name 2"
 msgstr "勤務先の MSN スクリーン名 2"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook-contacts/e-contact.c:229
 msgid "MSN Work Screen Name 3"
 msgstr "勤務先の MSN スクリーン名 3"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook-contacts/e-contact.c:230
 msgid "ICQ Home ID 1"
 msgstr "自宅の ICQ ID 1"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook-contacts/e-contact.c:231
 msgid "ICQ Home ID 2"
 msgstr "自宅の ICQ ID 2"
 
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook-contacts/e-contact.c:232
 msgid "ICQ Home ID 3"
 msgstr "自宅の ICQ ID 3"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook-contacts/e-contact.c:233
 msgid "ICQ Work ID 1"
 msgstr "勤務先の ICQ ID 1"
 
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook-contacts/e-contact.c:234
 msgid "ICQ Work ID 2"
 msgstr "勤務先の ICQ ID 2"
 
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook-contacts/e-contact.c:235
 msgid "ICQ Work ID 3"
 msgstr "勤務先の ICQ ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook-contacts/e-contact.c:238
 msgid "Last Revision"
 msgstr "最終更新日時"
 
-#: ../addressbook/libebook/e-contact.c:234
+#. Translators: This is an EContact field description, in this case it's a
+#. * virtual field, which returns either name of the contact or the organization
+#. * name, recognized by multiple other fields, where the first filled is used.
+#: ../addressbook/libebook-contacts/e-contact.c:242
 msgid "Name or Org"
 msgstr "名前または組織"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook-contacts/e-contact.c:245
 msgid "Address List"
 msgstr "住所の一覧"
 
-#: ../addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook-contacts/e-contact.c:246
 msgid "Home Address"
 msgstr "自宅の住所"
 
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook-contacts/e-contact.c:247
 msgid "Work Address"
 msgstr "勤務先の住所"
 
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook-contacts/e-contact.c:248
 msgid "Other Address"
 msgstr "その他の住所"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook-contacts/e-contact.c:251
 msgid "Category List"
 msgstr "カテゴリの一覧"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook-contacts/e-contact.c:254
 msgid "Photo"
 msgstr "写真"
 
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook-contacts/e-contact.c:255
 msgid "Logo"
 msgstr "ロゴ"
 
-#: ../addressbook/libebook/e-contact.c:249
+#. Translators: This is an EContact field description, in this case it's a name
+#. * of the contact, as specified in http://tools.ietf.org/html/rfc6350#section-6.2.2
+#: ../addressbook/libebook-contacts/e-contact.c:259
 msgid "Name"
 msgstr "名前"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook-contacts/e-contact.c:260
 msgid "Email List"
 msgstr "E-メール一覧"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook-contacts/e-contact.c:263
 msgid "AIM Screen Name List"
 msgstr "AIM スクリーン名の一覧"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook-contacts/e-contact.c:264
 msgid "GroupWise ID List"
 msgstr "GroupWise ID の一覧"
 
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook-contacts/e-contact.c:265
 msgid "Jabber ID List"
 msgstr "Jabber ID の一覧"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook-contacts/e-contact.c:266
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! スクリーン名の一覧"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook-contacts/e-contact.c:267
 msgid "MSN Screen Name List"
 msgstr "MSN スクリーン名の一覧"
 
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook-contacts/e-contact.c:268
 msgid "ICQ ID List"
 msgstr "ICQ の ID 一覧です"
 
-#: ../addressbook/libebook/e-contact.c:260
+#: ../addressbook/libebook-contacts/e-contact.c:270
 msgid "Wants HTML Mail"
 msgstr "HTML 形式のメールを希望する"
 
-#: ../addressbook/libebook/e-contact.c:262
+#. Translators: This is an EContact field description, in this case it's a
+#. * field describing whether it's a Contact list (list of email addresses) or a
+#. * regular contact for one person/organization/...
+#: ../addressbook/libebook-contacts/e-contact.c:275
 msgid "List"
 msgstr "一覧"
 
-#: ../addressbook/libebook/e-contact.c:263
-msgid "List Show Addresses"
+#. Translators: This is an EContact field description, in this case it's a flag
+#. * used to determine whether when sending to Contact lists the addresses should be
+#. * shown or not to other recipients - basically whether to use BCC field or CC
+#. * message header when sending messages to this Contact list.
+#: ../addressbook/libebook-contacts/e-contact.c:280
+msgid "List Shows Addresses"
 msgstr "住所を表示する一覧です"
 
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook-contacts/e-contact.c:282
 msgid "Birth Date"
 msgstr "誕生日"
 
-#: ../addressbook/libebook/e-contact.c:266
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1057
+#: ../addressbook/libebook-contacts/e-contact.c:283
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:875
 msgid "Anniversary"
 msgstr "記念日"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook-contacts/e-contact.c:286
 msgid "X.509 Certificate"
 msgstr "X.509 認証"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook-contacts/e-contact.c:288
 msgid "Gadu-Gadu Home ID 1"
 msgstr "自宅の Gadu-Gadu ID 1"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook-contacts/e-contact.c:289
 msgid "Gadu-Gadu Home ID 2"
 msgstr "自宅の Gadu-Gadu ID 2"
 
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook-contacts/e-contact.c:290
 msgid "Gadu-Gadu Home ID 3"
 msgstr "自宅の Gadu-Gadu ID 3"
 
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook-contacts/e-contact.c:291
 msgid "Gadu-Gadu Work ID 1"
 msgstr "勤務先の Gadu-Gadu ID 1"
 
-#: ../addressbook/libebook/e-contact.c:275
+#: ../addressbook/libebook-contacts/e-contact.c:292
 msgid "Gadu-Gadu Work ID 2"
 msgstr "勤務先の Gadu-Gadu ID 2"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook-contacts/e-contact.c:293
 msgid "Gadu-Gadu Work ID 3"
 msgstr "勤務先の Gadu-Gadu ID 3"
 
-#: ../addressbook/libebook/e-contact.c:277
+#: ../addressbook/libebook-contacts/e-contact.c:294
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID の一覧"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook-contacts/e-contact.c:297
 msgid "Geographic Information"
 msgstr "地理情報"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook-contacts/e-contact.c:299
 msgid "Telephone"
 msgstr "電話"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook-contacts/e-contact.c:301
 msgid "Skype Home Name 1"
 msgstr "自宅の Skype 名 1"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook-contacts/e-contact.c:302
 msgid "Skype Home Name 2"
 msgstr "自宅の Skype 名 2"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook-contacts/e-contact.c:303
 msgid "Skype Home Name 3"
 msgstr "自宅の Skype 名 3"
 
-#: ../addressbook/libebook/e-contact.c:287
+#: ../addressbook/libebook-contacts/e-contact.c:304
 msgid "Skype Work Name 1"
 msgstr "勤務先の Skype 名 1"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook-contacts/e-contact.c:305
 msgid "Skype Work Name 2"
 msgstr "勤務先の Skype 名 2"
 
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook-contacts/e-contact.c:306
 msgid "Skype Work Name 3"
 msgstr "勤務先の Skype 名 3"
 
-#: ../addressbook/libebook/e-contact.c:290
+#: ../addressbook/libebook-contacts/e-contact.c:307
 msgid "Skype Name List"
 msgstr "Skype 名の一覧"
 
-#: ../addressbook/libebook/e-contact.c:292
+#: ../addressbook/libebook-contacts/e-contact.c:309
 msgid "SIP address"
 msgstr "SIP アドレス"
 
-#: ../addressbook/libebook/e-contact.c:294
-#, fuzzy
-#| msgid "Skype Home Name 1"
+#: ../addressbook/libebook-contacts/e-contact.c:311
 msgid "Google Talk Home Name 1"
-msgstr "自宅の Skype 名 1"
+msgstr "自宅の Google トーク名 1"
 
-#: ../addressbook/libebook/e-contact.c:295
-#, fuzzy
-#| msgid "Skype Home Name 2"
+#: ../addressbook/libebook-contacts/e-contact.c:312
 msgid "Google Talk Home Name 2"
-msgstr "自宅の Skype 名 2"
+msgstr "自宅の Google トーク名 2"
 
-#: ../addressbook/libebook/e-contact.c:296
-#, fuzzy
-#| msgid "Skype Home Name 3"
+#: ../addressbook/libebook-contacts/e-contact.c:313
 msgid "Google Talk Home Name 3"
-msgstr "自宅の Skype 名 3"
+msgstr "自宅の Google トーク名 3"
 
-#: ../addressbook/libebook/e-contact.c:297
-#, fuzzy
-#| msgid "Skype Work Name 1"
+#: ../addressbook/libebook-contacts/e-contact.c:314
 msgid "Google Talk Work Name 1"
-msgstr "勤務先の Skype 名 1"
+msgstr "勤務先の Google トーク名 1"
 
-#: ../addressbook/libebook/e-contact.c:298
-#, fuzzy
-#| msgid "Skype Work Name 2"
+#: ../addressbook/libebook-contacts/e-contact.c:315
 msgid "Google Talk Work Name 2"
-msgstr "勤務先の Skype 名 2"
+msgstr "勤務先の Google トーク名 2"
 
-#: ../addressbook/libebook/e-contact.c:299
-#, fuzzy
-#| msgid "Skype Work Name 3"
+#: ../addressbook/libebook-contacts/e-contact.c:316
 msgid "Google Talk Work Name 3"
-msgstr "勤務先の Skype 名 3"
+msgstr "勤務先の Google トーク名 3"
 
-#: ../addressbook/libebook/e-contact.c:300
-#, fuzzy
-#| msgid "Skype Name List"
+#: ../addressbook/libebook-contacts/e-contact.c:317
 msgid "Google Talk Name List"
-msgstr "Skype 名の一覧"
+msgstr "Google トーク名の一覧"
 
-#: ../addressbook/libebook/e-contact.c:1601
+#: ../addressbook/libebook-contacts/e-contact.c:319
+msgid "Twitter Name List"
+msgstr "Twitter 名の一覧"
+
+#: ../addressbook/libebook-contacts/e-contact.c:1624
 #: ../addressbook/libebook/e-destination.c:884
 msgid "Unnamed List"
 msgstr "名前なしの一覧"
 
-#: ../addressbook/libedata-book/e-book-backend.c:19
-msgid "Cannot process, book backend is opening"
+#: ../addressbook/libebook-contacts/e-phone-number.c:43
+msgid "The library was built without phone number support."
 msgstr ""
 
-#: ../addressbook/libedata-book/e-book-backend.c:87
-#, fuzzy, c-format
-#| msgid "Unknown error: %s"
+#: ../addressbook/libebook-contacts/e-phone-number.c:45
+msgid "The phone number parser reported an yet unkown error code."
+msgstr ""
+
+#: ../addressbook/libebook-contacts/e-phone-number.c:47
+msgid "Not a phone number"
+msgstr ""
+
+#: ../addressbook/libebook-contacts/e-phone-number.c:49
+#, fuzzy
+#| msgid "Invalid range"
+msgid "Invalid country calling code"
+msgstr "有効範囲が無効です"
+
+#: ../addressbook/libebook-contacts/e-phone-number.c:51
+msgid "Remaining text after the country calling code is too short for a phone number"
+msgstr ""
+
+#: ../addressbook/libebook-contacts/e-phone-number.c:53
+msgid "Text is too short for a phone number"
+msgstr ""
+
+#: ../addressbook/libebook-contacts/e-phone-number.c:55
+msgid "Text is too long for a phone number"
+msgstr ""
+
+#: ../addressbook/libebook/e-book-client.c:659
+#: ../addressbook/libedata-book/e-book-backend.c:120
+#, c-format
 msgid "Unknown book property '%s'"
-msgstr "原因不明のエラー: %s"
+msgstr "不明なアドレス帳プロパティ '%s'"
 
-#: ../addressbook/libedata-book/e-book-backend.c:104
-#, fuzzy, c-format
-#| msgid "Cannot create folder '%s': %s"
+#: ../addressbook/libebook/e-book-client.c:674
+#, c-format
 msgid "Cannot change value of book property '%s'"
-msgstr "'%s' というフォルダーを作成できません: %s"
+msgstr "アドレス帳プロパティ '%s' の値を変更できません"
+
+#: ../addressbook/libebook/e-book-client.c:985
+#: ../addressbook/libebook/e-book-client.c:1158
+#: ../calendar/libecal/e-cal-client.c:1502
+#: ../calendar/libecal/e-cal-client.c:1682
+#, fuzzy, c-format
+#| msgid "Could not connect to %s: "
+msgid "Unable to connect to '%s': "
+msgstr "%s へ接続できませんでした: "
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:449
-#: ../camel/camel-db.c:503
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:752
+#, c-format
+msgid "Error introspecting unknown summary field '%s'"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1241
+#: ../camel/camel-db.c:544
 #, c-format
 msgid "Insufficient memory"
 msgstr "メモリが足りません"
 
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:206
-#: ../addressbook/libedata-book/e-data-book.c:219
-#: ../addressbook/libedata-book/e-data-book.c:733
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1374
+#, c-format
+msgid "Invalid contact field '%d' specified in summary"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1408
+#, c-format
+msgid "Contact field '%s' of type '%s' specified in summary, but only boolean, string and string list field 
types are supported"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2603
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3644
+#, c-format
+msgid "Full search_contacts are not stored in cache. vcards cannot be returned."
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3770
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3851
+#, c-format
+msgid "Query contained unsupported elements"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3774
+#, fuzzy, c-format
+#| msgid "Invalid query"
+msgid "Invalid Query"
+msgstr "問い合わせの内容が無効です"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3798
+#, c-format
+msgid "Full search_contacts are not stored in cache. Hence only summary query is supported."
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3855
+#: ../addressbook/libedata-book/e-data-book.c:669
+#: ../addressbook/libedata-book/e-data-book.c:809
+#: ../calendar/libedata-cal/e-data-cal.c:612
+#: ../calendar/libedata-cal/e-data-cal.c:771 ../libedataserver/e-client.c:166
+#, c-format
+msgid "Invalid query"
+msgstr "問い合わせの内容が無効です"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3897
+#, c-format
+msgid "Full vcards are not stored in cache. Hence only summary query is supported."
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4598
+#, fuzzy, c-format
+#| msgid "Failed to remove file '%s': %s"
+msgid "Unable to remove the db file: errno %d"
+msgstr "ファイル '%s' の削除に失敗しました: %s"
+
+#: ../addressbook/libedata-book/e-book-backend-sync.c:179
+#: ../calendar/libedata-cal/e-cal-backend-sync.c:182
 #, fuzzy
-#| msgid "Invalid query: %s"
+#| msgid "Cannot set backend property: "
+msgid "Clients cannot set backend properties"
+msgstr "バックエンドのプロパティを設定できません: "
+
+#. Translators: This is prefix to a detailed error message
+#. Translators: This is a prefix to a detailed error message *
+#.
+#: ../addressbook/libedata-book/e-data-book.c:691
+#: ../calendar/libedata-cal/e-data-cal.c:635
 msgid "Invalid query: "
-msgstr "問い合わせ内容が無効です: %s"
+msgstr "問い合わせ内容が無効です: "
 
-#: ../addressbook/libedata-book/e-data-book.c:311
-#: ../calendar/libedata-cal/e-data-cal.c:427
+#: ../addressbook/libedata-book/e-data-book.c:793
+#: ../calendar/libedata-cal/e-data-cal.c:752
 msgid "Success"
 msgstr "成功しました"
 
-#: ../addressbook/libedata-book/e-data-book.c:312
-#: ../calendar/libecal/e-cal.c:4563 ../calendar/libedata-cal/e-data-cal.c:428
-#: ../libedataserver/e-client.c:120
+#: ../addressbook/libedata-book/e-data-book.c:794
+#: ../calendar/libecal/e-cal.c:2307 ../calendar/libedata-cal/e-data-cal.c:753
+#: ../libedataserver/e-client.c:133
 msgid "Backend is busy"
 msgstr "バックエンドが処理中です"
 
-#: ../addressbook/libedata-book/e-data-book.c:313
-#: ../calendar/libedata-cal/e-data-cal.c:429 ../libedataserver/e-client.c:130
+#: ../addressbook/libedata-book/e-data-book.c:795
+#: ../calendar/libedata-cal/e-data-cal.c:754 ../libedataserver/e-client.c:143
 msgid "Repository offline"
 msgstr "リポジトリはオフラインです"
 
-#: ../addressbook/libedata-book/e-data-book.c:314
-#: ../calendar/libecal/e-cal.c:4577 ../calendar/libedata-cal/e-data-cal.c:430
-#: ../libedataserver/e-client.c:134
+#: ../addressbook/libedata-book/e-data-book.c:796
+#: ../calendar/libecal/e-cal.c:2321 ../calendar/libedata-cal/e-data-cal.c:755
+#: ../libedataserver/e-client.c:150
 msgid "Permission denied"
 msgstr "権限がありません"
 
-#: ../addressbook/libedata-book/e-data-book.c:317
-#: ../calendar/libedata-cal/e-data-cal.c:435
+#: ../addressbook/libedata-book/e-data-book.c:799
+#: ../calendar/libedata-cal/e-data-cal.c:760
 msgid "Authentication Failed"
 msgstr "認証に失敗しました"
 
-#: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libedata-cal/e-data-cal.c:436
+#: ../addressbook/libedata-book/e-data-book.c:800
+#: ../calendar/libedata-cal/e-data-cal.c:761
 msgid "Authentication Required"
 msgstr "認証が必要です"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-#: ../calendar/libedata-cal/e-data-cal.c:437
+#: ../addressbook/libedata-book/e-data-book.c:801
+#: ../calendar/libedata-cal/e-data-cal.c:762
 msgid "Unsupported field"
 msgstr "サポートしていない項目です"
 
-#: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:142
+#: ../addressbook/libedata-book/e-data-book.c:802
+#: ../calendar/libedata-cal/e-data-cal.c:764 ../libedataserver/e-client.c:158
 msgid "Unsupported authentication method"
 msgstr "サポートしていない認証方法です"
 
-#: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:144
+#: ../addressbook/libedata-book/e-data-book.c:803
+#: ../calendar/libedata-cal/e-data-cal.c:765 ../libedataserver/e-client.c:160
 msgid "TLS not available"
 msgstr "TLS は利用できません"
 
-#: ../addressbook/libedata-book/e-data-book.c:323
+#: ../addressbook/libedata-book/e-data-book.c:804
+msgid "Address book does not exist"
+msgstr "アドレス帳がありません"
+
+#: ../addressbook/libedata-book/e-data-book.c:805
 msgid "Book removed"
 msgstr "データブックは削除されました"
 
-#: ../addressbook/libedata-book/e-data-book.c:324
-#: ../calendar/libedata-cal/e-data-cal.c:443
+#: ../addressbook/libedata-book/e-data-book.c:806
+#: ../calendar/libedata-cal/e-data-cal.c:768
 msgid "Not available in offline mode"
 msgstr "オフラインモードでは利用できません"
 
-#: ../addressbook/libedata-book/e-data-book.c:325
-#: ../calendar/libedata-cal/e-data-cal.c:444 ../libedataserver/e-client.c:146
+#: ../addressbook/libedata-book/e-data-book.c:807
+#: ../calendar/libedata-cal/e-data-cal.c:769 ../libedataserver/e-client.c:162
 msgid "Search size limit exceeded"
 msgstr "検索サイズが上限を超えました"
 
-#: ../addressbook/libedata-book/e-data-book.c:326
-#: ../calendar/libedata-cal/e-data-cal.c:445 ../libedataserver/e-client.c:148
+#: ../addressbook/libedata-book/e-data-book.c:808
+#: ../calendar/libedata-cal/e-data-cal.c:770 ../libedataserver/e-client.c:164
 msgid "Search time limit exceeded"
 msgstr "検索時間の上限を超えました"
 
-#: ../addressbook/libedata-book/e-data-book.c:327
-#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:150
-msgid "Invalid query"
-msgstr "問い合わせの内容が無効です"
-
-#: ../addressbook/libedata-book/e-data-book.c:328
-#: ../calendar/libedata-cal/e-data-cal.c:447 ../libedataserver/e-client.c:152
+#: ../addressbook/libedata-book/e-data-book.c:810
+#: ../calendar/libedata-cal/e-data-cal.c:772 ../libedataserver/e-client.c:168
 msgid "Query refused"
 msgstr "問い合わせを拒否しました"
 
-#: ../addressbook/libedata-book/e-data-book.c:329
-#: ../calendar/libedata-cal/e-data-cal.c:448 ../libedataserver/e-client.c:138
+#: ../addressbook/libedata-book/e-data-book.c:811
+#: ../calendar/libedata-cal/e-data-cal.c:773 ../libedataserver/e-client.c:154
 msgid "Could not cancel"
 msgstr "キャンセルできませんでした"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,                   N_("Other error") },
 #. { OtherError,                       N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../calendar/libedata-cal/e-data-cal.c:450
+#: ../addressbook/libedata-book/e-data-book.c:813
+#: ../calendar/libedata-cal/e-data-cal.c:775
 msgid "Invalid server version"
 msgstr "サーバー・バージョンが無効です"
 
-#: ../addressbook/libedata-book/e-data-book.c:333
-#: ../calendar/libecal/e-cal.c:4561 ../calendar/libedata-cal/e-data-cal.c:451
-#: ../libedataserver/e-client.c:118
+#: ../addressbook/libedata-book/e-data-book.c:815
+#: ../calendar/libecal/e-cal.c:2305 ../calendar/libedata-cal/e-data-cal.c:776
+#: ../libedataserver/e-client.c:131
 msgid "Invalid argument"
 msgstr "無効な引数"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:335
-#: ../calendar/libecal/e-cal.c:4600 ../calendar/libedata-cal/e-data-cal.c:453
-#: ../libedataserver/e-client.c:140
+#: ../addressbook/libedata-book/e-data-book.c:817
+#: ../calendar/libecal/e-cal.c:1064 ../calendar/libecal/e-cal.c:1432
+#: ../calendar/libecal/e-cal.c:1912 ../calendar/libecal/e-cal.c:2344
+#: ../calendar/libedata-cal/e-data-cal.c:778 ../libedataserver/e-client.c:156
+#, c-format
 msgid "Not supported"
 msgstr "サポートされていません"
 
-#: ../addressbook/libedata-book/e-data-book.c:336
-#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:158
-#, fuzzy
-#| msgid "Backend is busy"
+#: ../addressbook/libedata-book/e-data-book.c:818
+#: ../calendar/libedata-cal/e-data-cal.c:779 ../libedataserver/e-client.c:174
 msgid "Backend is not opened yet"
-msgstr "バックエンドが処理中です"
-
-#: ../addressbook/libedata-book/e-data-book.c:344
-#: ../calendar/libecal/e-cal-client.c:618
-#: ../calendar/libedata-cal/e-data-cal.c:462 ../libedataserver/e-client.c:156
-msgid "Other error"
-msgstr "その他のエラー"
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:551
-#: ../addressbook/libedata-book/e-data-book.c:943
-#, fuzzy
-#| msgid "Cannot get contact: %s"
-msgid "Cannot get contact: "
-msgstr "連絡先を取得できません: %s"
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:576
-#: ../addressbook/libedata-book/e-data-book.c:601
-#, fuzzy
-#| msgid "Empty query: %s"
-msgid "Empty query: "
-msgstr "問い合わせ内容が空です: %s"
-
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:626
-#: ../addressbook/libedata-book/e-data-book.c:1041
-#, fuzzy
-#| msgid "Cannot add contact: %s"
-msgid "Cannot add contact: "
-msgstr "連絡先を追加できません: %s"
+msgstr "まだバックエンドが開かれていません"
 
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:651
-#: ../addressbook/libedata-book/e-data-book.c:1075
+#: ../addressbook/libedata-book/e-data-book.c:819
+#: ../libedataserver/e-client.c:176
 #, fuzzy
-#| msgid "Cannot modify contact: %s"
-msgid "Cannot modify contacts: "
-msgstr "連絡先を変更できません: %s"
+#| msgid "Object not found"
+msgid "Object is out of sync"
+msgstr "オブジェクトが見つかりません"
 
-#. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:759
-#: ../calendar/libedata-cal/e-data-cal.c:866
-#, fuzzy
-#| msgid "Cannot authenticate user: %s"
-msgid "Cannot authenticate user: "
-msgstr "ユーザー認証できません: %s"
+#: ../addressbook/libedata-book/e-data-book.c:827
+#: ../calendar/libedata-cal/e-data-cal.c:787 ../libedataserver/e-client.c:172
+msgid "Other error"
+msgstr "その他のエラー"
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:830
-#, fuzzy
-#| msgid "Cannot open book: %s"
+#: ../addressbook/libedata-book/e-data-book.c:1133
 msgid "Cannot open book: "
-msgstr "データブックを開けません: %s"
+msgstr "データブックを開けません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:846
-#, fuzzy
-#| msgid "Cannot remove book: %s"
-msgid "Cannot remove book: "
-msgstr "データブックを削除できません: %s"
+#: ../addressbook/libedata-book/e-data-book.c:1217
+msgid "Cannot refresh address book: "
+msgstr "アドレス帳を更新できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:873
-#, fuzzy
-#| msgid "Cannot refresh calendar: %s"
-msgid "Cannot refresh address book: "
-msgstr "カレンダーを更新できません: %s"
+#: ../addressbook/libedata-book/e-data-book.c:1298
+msgid "Cannot get contact: "
+msgstr "連絡先を取得できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:899
-#, fuzzy
-#| msgid "Cannot create calendar object: %s"
-msgid "Cannot get backend property: "
-msgstr "カレンダーオブジェクトを作成できません: %s"
+#: ../addressbook/libedata-book/e-data-book.c:1364
+msgid "Cannot get contact list: "
+msgstr "連絡先の一覧を取得できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:924
-#: ../calendar/libedata-cal/e-data-cal.c:1069
-#, fuzzy
-#| msgid "Cannot send calendar objects: %s"
-msgid "Cannot set backend property: "
-msgstr "カレンダーオブジェクトを送信できません: %s"
+#: ../addressbook/libedata-book/e-data-book.c:1456
+msgid "Cannot get contact list uids: "
+msgstr "連絡先一覧の UID を取得できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:961
-#, fuzzy
-#| msgid "Cannot get contact list: %s"
-msgid "Cannot get contact list: "
-msgstr "連絡先の一覧を取得できません: %s"
+#: ../addressbook/libedata-book/e-data-book.c:1536
+msgid "Cannot add contact: "
+msgstr "連絡先を追加できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:995
-#, fuzzy
-#| msgid "Cannot get contact list: %s"
-msgid "Cannot get contact list uids: "
-msgstr "連絡先の一覧を取得できません: %s"
+#: ../addressbook/libedata-book/e-data-book.c:1599
+msgid "Cannot modify contacts: "
+msgstr "連絡先を変更できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1100
-#, fuzzy
-#| msgid "Cannot remove contacts: %s"
+#: ../addressbook/libedata-book/e-data-book.c:1640
 msgid "Cannot remove contacts: "
-msgstr "連絡先を削除できません: %s"
+msgstr "連絡先を削除できません: "
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:94
+#: ../calendar/libedata-cal/e-data-cal-factory.c:97
+#, c-format
+msgid "No backend name in source '%s'"
+msgstr "ソース '%s' にはバックエンド名がありません"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:185
+#: ../calendar/libedata-cal/e-data-cal-factory.c:191
+#, c-format
+msgid "Missing source UID"
+msgstr "ソース UID が見つかりません"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:184
-#: ../addressbook/libedata-book/e-data-book-factory.c:212
-#: ../calendar/libedata-cal/e-data-cal-factory.c:229
+#: ../addressbook/libedata-book/e-data-book-factory.c:196
+#: ../calendar/libedata-cal/e-data-cal-factory.c:201
 #, c-format
-msgid "Empty URI"
-msgstr "空の URI"
+msgid "No such source for UID '%s'"
+msgstr "UID '%s' にそのようなソースはありません"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:525
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:560
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "サーバーに接続できません (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:553
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:590
+#, c-format
+msgid "Failed to connect to a server using SSL: %s"
+msgstr "SSL によるサーバーへの接続に失敗しました: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:601
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "予想外の HTTP ステータスコード %d が返されました (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2167
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2526
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:620
+msgid "CalDAV backend is not loaded yet"
+msgstr "CalDAV バックエンドがまだ読み込まれていません"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1009
+msgid "Invalid Redirect URL"
+msgstr "無効な転送 URL です"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2491
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2849
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1137,696 +1233,608 @@ msgstr ""
 "サーバーに接続できないんで、カレンダーを読み込み専用モードで開きます。\n"
 "エラーメッセージ: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4485
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2801
+#, c-format
+msgid "Cannot create local cache folder '%s'"
+msgstr "'%s' というローカルキャッシュフォルダーを作成できません"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3893
+msgid "CalDAV does not support bulk additions"
+msgstr "CalDAV が大量追加に対応していません"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3996
+msgid "CalDAV does not support bulk modifications"
+msgstr "CalDAV が大量修正に対応していません"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4165
+msgid "CalDAV does not support bulk removals"
+msgstr "CalDAV が大量削除に対応していません"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4837
 msgid "Calendar doesn't support Free/Busy"
 msgstr "カレンダーは予定の有無に対応しません"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:214
-#: ../libedataserverui/e-client-utils.c:875
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid ""
-"Enter password for address book %s (user %s)\n"
-"Reason: %s"
-msgstr "%s (ユーザー %s) のパスワードを入力してください"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4846
+msgid "Schedule outbox url not found"
+msgstr "スケジュールのアウトボックス URL が見つかりません"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:216
-#: ../libedataserverui/e-client-utils.c:877
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for address book %s (user %s)"
-msgstr "%s (ユーザー %s) のパスワードを入力してください"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4945
+msgid "Unexpected result in schedule-response"
+msgstr "schedule-response の予期しない結果"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1059
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:877
 msgid "Birthday"
 msgstr "誕生日"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1095
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:913
 #, c-format
 msgid "Birthday: %s"
 msgstr "誕生日: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1126
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:944
 #, c-format
 msgid "Anniversary: %s"
 msgstr "記念日: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:248
+#: ../calendar/backends/file/e-cal-backend-file.c:243
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "カレンダーのデータを保存できません: URI が間違っています。"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:255
-#: ../calendar/backends/file/e-cal-backend-file.c:261
+#: ../calendar/backends/file/e-cal-backend-file.c:250
+#: ../calendar/backends/file/e-cal-backend-file.c:256
 msgid "Cannot save calendar data"
 msgstr "カレンダーのデータを保存できません"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:418
+#: ../calendar/backends/http/e-cal-backend-http.c:477
+#, c-format
+msgid "Malformed URI: %s"
+msgstr "不正な URI: %s"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:568
+#, c-format
 msgid "Redirected to Invalid URI"
 msgstr "URI へのリダイレクトが無効です"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:459
+#: ../calendar/backends/http/e-cal-backend-http.c:605
+#, c-format
 msgid "Bad file format."
 msgstr "ファイルのフォーマットが間違っています。"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:467
+#: ../calendar/backends/http/e-cal-backend-http.c:615
+#, c-format
 msgid "Not a calendar."
 msgstr "カレンダーではありません。"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:791
-#: ../calendar/backends/http/e-cal-backend-http.c:792
-#: ../calendar/backends/weather/e-cal-backend-weather.c:522
+#: ../calendar/backends/http/e-cal-backend-http.c:926
+#: ../calendar/backends/weather/e-cal-backend-weather.c:514
 msgid "Could not create cache file"
 msgstr "キャッシュ・ファイルを生成できませんでした"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:181
+#: ../calendar/backends/weather/e-cal-backend-weather.c:173
 msgid "Could not retrieve weather data"
 msgstr "天気のデータを取得できませんでした"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:277
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Fog"
 msgstr "天気: 霧"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:278
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Cloudy Night"
 msgstr "天気: 曇のある夜空"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:279
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Cloudy"
 msgstr "天気: 曇り"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:280
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Overcast"
 msgstr "天気: 本曇り"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:281
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Showers"
 msgstr "天気: 雨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:282
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Snow"
 msgstr "天気: 雪"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:283
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Clear Night"
 msgstr "天気: 澄んだ夜空"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Sunny"
 msgstr "天気: 暖かい快晴"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Thunderstorms"
 msgstr "天気: 雷雨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:433
+#: ../calendar/backends/weather/e-cal-backend-weather.c:410
 msgid "Forecast"
 msgstr "天気予報"
 
-#: ../calendar/libecal/e-cal.c:892 ../libedataserverui/e-book-auth-util.c:204
-#: ../libedataserverui/e-book-auth-util.c:428
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "%s (ユーザー %s) のパスワードを入力してください"
-
-#.
-#. * This password prompt will be prompted rarely. Since the key that is passed to
-#. * the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:906
-#, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "%s のパスワードを入力して、ユーザー %s のプロキシを有効にしてください"
-
-#: ../calendar/libecal/e-cal.c:4565
+#: ../calendar/libecal/e-cal.c:2309
 msgid "Repository is offline"
 msgstr "リポジトリはオフラインです"
 
-#: ../calendar/libecal/e-cal.c:4567 ../calendar/libecal/e-cal-client.c:134
+#: ../calendar/libecal/e-cal.c:2311 ../calendar/libecal/e-cal-client.c:262
 msgid "No such calendar"
 msgstr "そのようなカレンダーはありません"
 
-#: ../calendar/libecal/e-cal.c:4569 ../calendar/libecal/e-cal-client.c:136
-#: ../calendar/libedata-cal/e-data-cal.c:432
+#: ../calendar/libecal/e-cal.c:2313 ../calendar/libecal/e-cal-client.c:264
+#: ../calendar/libedata-cal/e-data-cal.c:757
 msgid "Object not found"
 msgstr "オブジェクトが見つかりません"
 
-#: ../calendar/libecal/e-cal.c:4571 ../calendar/libecal/e-cal-client.c:138
-#: ../calendar/libedata-cal/e-data-cal.c:433
+#: ../calendar/libecal/e-cal.c:2315 ../calendar/libecal/e-cal-client.c:266
+#: ../calendar/libedata-cal/e-data-cal.c:758
 msgid "Invalid object"
 msgstr "無効なオブジェクトです"
 
-#: ../calendar/libecal/e-cal.c:4573
+#: ../calendar/libecal/e-cal.c:2317
 msgid "URI not loaded"
 msgstr "URI を読み込んでいません"
 
-#: ../calendar/libecal/e-cal.c:4575
+#: ../calendar/libecal/e-cal.c:2319
 msgid "URI already loaded"
 msgstr "URL は既に読み込み済みです"
 
-#: ../calendar/libecal/e-cal.c:4579
+#: ../calendar/libecal/e-cal.c:2323
 msgid "Unknown User"
 msgstr "ユーザーを特定できません"
 
-#: ../calendar/libecal/e-cal.c:4581 ../calendar/libecal/e-cal-client.c:142
-#: ../calendar/libedata-cal/e-data-cal.c:434
+#: ../calendar/libecal/e-cal.c:2325 ../calendar/libecal/e-cal-client.c:270
+#: ../calendar/libedata-cal/e-data-cal.c:759
 msgid "Object ID already exists"
 msgstr "既にオブジェクト ID が存在しています"
 
-#: ../calendar/libecal/e-cal.c:4583
+#: ../calendar/libecal/e-cal.c:2327
 msgid "Protocol not supported"
 msgstr "プロトコルはサポートされていません"
 
-#: ../calendar/libecal/e-cal.c:4585
+#: ../calendar/libecal/e-cal.c:2329
 msgid "Operation has been canceled"
 msgstr "操作をキャンセルしました"
 
-#: ../calendar/libecal/e-cal.c:4587
+#: ../calendar/libecal/e-cal.c:2331
 msgid "Could not cancel operation"
 msgstr "操作をキャンセルできませんでした"
 
-#: ../calendar/libecal/e-cal.c:4589 ../libedataserver/e-client.c:126
+#: ../calendar/libecal/e-cal.c:2333 ../libedataserver/e-client.c:139
 msgid "Authentication failed"
 msgstr "認証に失敗しました"
 
-#: ../calendar/libecal/e-cal.c:4591
-#: ../camel/providers/smtp/camel-smtp-transport.c:821
-#: ../libedataserver/e-client.c:128
+#: ../calendar/libecal/e-cal.c:2335
+#: ../camel/providers/smtp/camel-smtp-transport.c:923
+#: ../libedataserver/e-client.c:141
 msgid "Authentication required"
 msgstr "認証を必要としています"
 
-#: ../calendar/libecal/e-cal.c:4593
+#: ../calendar/libecal/e-cal.c:2337
 msgid "A D-Bus exception has occurred"
 msgstr "D-Bus 例外が発生しました"
 
-#: ../calendar/libecal/e-cal.c:4597
+#: ../calendar/libecal/e-cal.c:2341
 msgid "No error"
 msgstr "エラーはありません"
 
-#: ../calendar/libecal/e-cal-client.c:140
-#: ../calendar/libedata-cal/e-data-cal.c:442
+#: ../calendar/libecal/e-cal-client.c:268
+#: ../calendar/libedata-cal/e-data-cal.c:767
 msgid "Unknown user"
 msgstr "ユーザーを特定できません"
 
-#: ../calendar/libecal/e-cal-client.c:144
-#: ../calendar/libedata-cal/e-data-cal.c:431
+#: ../calendar/libecal/e-cal-client.c:272
+#: ../calendar/libedata-cal/e-data-cal.c:756
 msgid "Invalid range"
 msgstr "有効範囲が無効です"
 
-#: ../calendar/libecal/e-cal-client.c:600
-#, fuzzy
-#| msgid "Failed to encode data"
-msgid "Failed to run calendar factory"
-msgstr "データのエンコードに失敗しました"
-
-#: ../calendar/libecal/e-cal-client.c:765
-#, fuzzy
-#| msgid "Failed to encode data"
-msgid "Failed to find system calendar"
-msgstr "データのエンコードに失敗しました"
-
-#: ../calendar/libecal/e-cal-client.c:804
-#: ../calendar/libedata-cal/e-data-cal.c:441
-msgid "Calendar does not exist"
-msgstr "カレンダーが存在しません"
+#: ../calendar/libecal/e-cal-client.c:936
+#: ../calendar/libedata-cal/e-cal-backend.c:204
+#, c-format
+msgid "Unknown calendar property '%s'"
+msgstr "不明なカレンダープロパティ '%s'"
 
-#: ../calendar/libecal/e-cal-client.c:919
-#, fuzzy
-#| msgid "Invalid source"
-msgid "Invalid source type"
-msgstr "ソースが無効です"
+#: ../calendar/libecal/e-cal-client.c:951
+#, c-format
+msgid "Cannot change value of calendar property '%s'"
+msgstr "カレンダープロパティ '%s' の値を変更できません"
 
-#: ../calendar/libecal/e-cal-component.c:1362
+#: ../calendar/libecal/e-cal-component.c:1340
 msgid "Untitled appointment"
 msgstr "タイトルなしの予定"
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:4036
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/libecal/e-cal-recur.c:3982
+#: ../calendar/libecal/e-cal-recur.c:4037
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/libecal/e-cal-recur.c:3983
+#: ../calendar/libecal/e-cal-recur.c:4038
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/libecal/e-cal-recur.c:3984
+#: ../calendar/libecal/e-cal-recur.c:4039
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/libecal/e-cal-recur.c:3985
+#: ../calendar/libecal/e-cal-recur.c:4040
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:4041
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:4042
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:4043
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:4044
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:4045
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:4046
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:4047
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:4048
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4049
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4050
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4051
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4052
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4053
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4054
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4055
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4056
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4057
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4058
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4059
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4060
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4061
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4062
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4063
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4064
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4065
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4066
 msgid "31st"
 msgstr "31日"
 
-#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
-#, fuzzy
-#| msgid "High"
+#: ../calendar/libecal/e-cal-util.c:707 ../calendar/libecal/e-cal-util.c:734
 msgctxt "Priority"
 msgid "High"
 msgstr "高い"
 
-#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
-#, fuzzy
-#| msgid "Normal"
+#: ../calendar/libecal/e-cal-util.c:709 ../calendar/libecal/e-cal-util.c:736
 msgctxt "Priority"
 msgid "Normal"
 msgstr "普通"
 
-#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722
-#, fuzzy
-#| msgid "Low"
+#: ../calendar/libecal/e-cal-util.c:711 ../calendar/libecal/e-cal-util.c:738
 msgctxt "Priority"
 msgid "Low"
 msgstr "低い"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:716
-#, fuzzy
-#| msgid "Undefined"
+#: ../calendar/libecal/e-cal-util.c:732
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "未定義"
 
-#: ../calendar/libedata-cal/e-cal-backend.c:34
-#, fuzzy
-#| msgid "Cannot remove calendar object: %s"
-msgid "Cannot process, calendar backend is opening"
-msgstr "カレンダーオブジェクトを削除できません: %s"
-
-#: ../calendar/libedata-cal/e-cal-backend.c:142
-#, fuzzy, c-format
-#| msgid "Unknown error: %s"
-msgid "Unknown calendar property '%s'"
-msgstr "原因不明のエラー: %s"
-
-#: ../calendar/libedata-cal/e-cal-backend.c:159
-#, fuzzy, c-format
-#| msgid "Cannot create calendar object: %s"
-msgid "Cannot change value of calendar property '%s'"
-msgstr "カレンダーオブジェクトを作成できません: %s"
-
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:77
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:808
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:945
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:976
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1176
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1206
-#, c-format
-msgid "\"%s\" expects no arguments"
-msgstr "\"%s\" は引数を必要としません"
-
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:229
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:274
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:313
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1247
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:78
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1056
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1365
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1492
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1541
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" は引数を一つ必要とします"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:119
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:126
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:319
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:875
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:85
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:667
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1372
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1380
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" は最初の引数として文字列を必要とします"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:134
-#, c-format
-msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-msgstr ""
-"\"%s\" は最初の引数として \"ISO 8601 日付/時刻\" の文字列を必要とします"
-
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:535
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:869
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1011
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
 #, c-format
-msgid "\"%s\" expects two arguments"
-msgstr "\"%s\" は引数を二つ必要とします"
+msgid "\"%s\" expects two or three arguments"
+msgstr "\"%s\" は引数を二つまたは三つ必要とします"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:235
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:280
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:401
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:484
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:541
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1017
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1253
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:167
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:256
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:318
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1063
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1441
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1499
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1548
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" は最初の引数として time_t 型の値を必要とします"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:190
-#, c-format
-msgid "\"%s\" expects the second argument to be an integer"
-msgstr "\"%s\" は二番目の引数として整数値を必要とします"
-
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:395
-#, fuzzy, c-format
-#| msgid "\"%s\" expects two arguments"
-msgid "\"%s\" expects two or three arguments"
-msgstr "\"%s\" は引数を二つ必要とします"
-
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:409
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:490
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:550
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:264
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:328
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:826
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" は二番目の引数として time_t 型の値を必要とします"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:418
-#, fuzzy, c-format
-#| msgid "\"%s\" expects the first argument to be a string"
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:186
+#, c-format
 msgid "\"%s\" expects the third argument to be a string"
-msgstr "\"%s\" は最初の引数として文字列を必要とします"
+msgstr "\"%s\" は三番目の引数として文字列を必要とします"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478
-#, fuzzy, c-format
-#| msgid "\"%s\" expects two arguments"
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:248
+#, c-format
 msgid "\"%s\" expects none or two arguments"
+msgstr "\"%s\" は引数なしまたは引数を二つ必要とします"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:311
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:660
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:810
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1434
+#, c-format
+msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" は引数を二つ必要とします"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:883
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:596
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:619
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:742
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:774
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:981
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1014
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1326
+#, c-format
+msgid "\"%s\" expects no arguments"
+msgstr "\"%s\" は引数を必要としません"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" は二番目の引数として文字列を必要とします"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:913
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:707
 #, c-format
-msgid ""
-"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
-"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
-"\"classification\""
-msgstr ""
-"\"%s\" は最初の引数として \"any\", \"summary\" または \"description\"、"
-"\"location\"、\"attendee\"、\"organizer\"、\"classification\" のいずれか一つ"
-"が必要です"
+msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or 
\"location\", or \"attendee\", or \"organizer\", or \"classification\""
+msgstr "\"%s\" は最初の引数として \"any\", \"summary\" または 
\"description\"、\"location\"、\"attendee\"、\"organizer\"、\"classification\" のいずれか一つが必要です"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1075
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" は少なくとも引数を一つ必要とします"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1089
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:893
 #, c-format
-msgid ""
-"\"%s\" expects all arguments to be strings or one and only one argument to "
-"be a boolean false (#f)"
-msgstr ""
-"\"%s\" は、すべての引数が文字列であるか、または引数が一つだけで論理値 FALSE "
-"(#f) である必要があります"
+msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
+msgstr "\"%s\" は、すべての引数が文字列であるか、または引数が一つだけで論理値 FALSE (#f) である必要があります"
 
-#: ../calendar/libedata-cal/e-data-cal.c:438
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1389
+#, c-format
+msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
+msgstr "\"%s\" は最初の引数として \"ISO 8601 日付/時刻\" の文字列を必要とします"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1450
+#, c-format
+msgid "\"%s\" expects the second argument to be an integer"
+msgstr "\"%s\" は二番目の引数として整数値を必要とします"
+
+#: ../calendar/libedata-cal/e-data-cal.c:763
 msgid "Unsupported method"
 msgstr "サポートしていない方法です"
 
-#. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:962
-#, fuzzy
-#| msgid "Cannot open calendar: %s"
-msgid "Cannot open calendar: "
-msgstr "カレンダーを開けません: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:766
+msgid "Calendar does not exist"
+msgstr "カレンダーが存在しません"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:987
-#, fuzzy
-#| msgid "Cannot remove calendar: %s"
-msgid "Cannot remove calendar: "
-msgstr "カレンダーを削除できません: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1237
+msgid "Cannot open calendar: "
+msgstr "カレンダーを開けません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1014
-#, fuzzy
-#| msgid "Cannot refresh calendar: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1298
 msgid "Cannot refresh calendar: "
-msgstr "カレンダーを更新できません: %s"
+msgstr "カレンダーを更新できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1043
-#, fuzzy
-#| msgid "Cannot retrieve calendar address: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1337
 msgid "Cannot retrieve backend property: "
-msgstr "カレンダーのアドレスを回復できません: %s"
+msgstr "バックエンドのプロパティを取得できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1098
-#, fuzzy
-#| msgid "Cannot retrieve calendar object path: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1395
 msgid "Cannot retrieve calendar object path: "
-msgstr "カレンダーオブジェクトへのパスを回復できません: %s"
+msgstr "カレンダーオブジェクトのパスを取得できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1128
-#, fuzzy
-#| msgid "Cannot retrieve calendar object list: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1441
 msgid "Cannot retrieve calendar object list: "
-msgstr "カレンダーオブジェクトの一覧を回復できません: %s"
+msgstr "カレンダーオブジェクトの一覧を取得できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1157
-#, fuzzy
-#| msgid "Cannot retrieve calendar free/busy list: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1494
 msgid "Cannot retrieve calendar free/busy list: "
-msgstr "カレンダーの予定の有無の一覧を回復できません: %s"
+msgstr "カレンダーの予定の有無の一覧を取得できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1188
-#, fuzzy
-#| msgid "Cannot create calendar object: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1535
 msgid "Cannot create calendar object: "
-msgstr "カレンダーオブジェクトを作成できません: %s"
+msgstr "カレンダーオブジェクトを作成できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1220
-#, fuzzy
-#| msgid "Cannot modify calendar object: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1604
 msgid "Cannot modify calendar object: "
-msgstr "カレンダーオブジェクトを変更できません: %s"
+msgstr "カレンダーオブジェクトを変更できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1254
-#, fuzzy
-#| msgid "Cannot remove calendar object: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1666
 msgid "Cannot remove calendar object: "
-msgstr "カレンダーオブジェクトを削除できません: %s"
+msgstr "カレンダーオブジェクトを削除できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1281
-#, fuzzy
-#| msgid "Cannot receive calendar objects: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1727
 msgid "Cannot receive calendar objects: "
-msgstr "カレンダーオブジェクトを受信できません: %s"
+msgstr "カレンダーオブジェクトを受信できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1312
-#, fuzzy
-#| msgid "Cannot send calendar objects: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1768
 msgid "Cannot send calendar objects: "
-msgstr "カレンダーオブジェクトを送信できません: %s"
+msgstr "カレンダーオブジェクトを送信できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1344
-#, fuzzy
-#| msgid "Could not retrieve attachment list: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1828
 msgid "Could not retrieve attachment uris: "
-msgstr "添付ファイルの一覧を回復できませんでした: %s"
+msgstr "添付ファイルの URI を取得できませんでした: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1372
-#, fuzzy
-#| msgid "Could not store folder: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1878
 msgid "Could not discard reminder: "
-msgstr "フォルダーを保存できませんでした: %s"
+msgstr "リマインダーを破棄できませんでした: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1401
-#, fuzzy
-#| msgid "Could not retrieve calendar time zone: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1917
 msgid "Could not get calendar view path: "
-msgstr "カレンダーのタイムゾーンを回復できませんでした: %s"
+msgstr "カレンダービューのパスを取得できませんでした: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1431
-#, fuzzy
-#| msgid "Could not retrieve calendar time zone: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:1963
 msgid "Could not retrieve calendar time zone: "
-msgstr "カレンダーのタイムゾーンを回復できませんでした: %s"
+msgstr "カレンダーのタイムゾーンを取得できませんでした: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1457
-#, fuzzy
-#| msgid "Could not add calendar time zone: %s"
+#: ../calendar/libedata-cal/e-data-cal.c:2007
 msgid "Could not add calendar time zone: "
-msgstr "カレンダーのタイムゾーンを追加できませんでした: %s"
-
-#: ../calendar/libedata-cal/e-data-cal-factory.c:199
-#, fuzzy, c-format
-#| msgid "Invalid range"
-msgid "Invalid call"
-msgstr "有効範囲が無効です"
+msgstr "カレンダーのタイムゾーンを追加できませんでした: "
 
-#: ../camel/camel-cipher-context.c:200
+#: ../camel/camel-cipher-context.c:208
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "この暗号は署名をサポートしていません"
 
-#: ../camel/camel-cipher-context.c:213
+#: ../camel/camel-cipher-context.c:221
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "この暗号は妥当性の検証をサポートしていません"
 
-#: ../camel/camel-cipher-context.c:229
+#: ../camel/camel-cipher-context.c:237
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "この暗号化は符号化をサポートしていません"
 
-#: ../camel/camel-cipher-context.c:243
+#: ../camel/camel-cipher-context.c:251
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "この暗号は復号化をサポートしていません"
 
-#: ../camel/camel-cipher-context.c:256
+#: ../camel/camel-cipher-context.c:264
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "この暗号で鍵をインポートできません"
 
-#: ../camel/camel-cipher-context.c:270
+#: ../camel/camel-cipher-context.c:278
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "この暗号で鍵をエクスポートできません"
 
-#: ../camel/camel-cipher-context.c:800
+#: ../camel/camel-cipher-context.c:819
 msgid "Signing message"
 msgstr "メッセージの署名中"
 
-#: ../camel/camel-cipher-context.c:1041
+#: ../camel/camel-cipher-context.c:1060
 msgid "Encrypting message"
 msgstr "メッセージを暗号化しています"
 
-#: ../camel/camel-cipher-context.c:1168
+#: ../camel/camel-cipher-context.c:1187
 msgid "Decrypting message"
 msgstr "メッセージの暗号を解除しています"
 
-#: ../camel/camel-data-cache.c:178
+#: ../camel/camel-data-cache.c:181
 #, c-format
 msgid "Unable to create cache path"
 msgstr "キャッシュファイルを生成できません"
 
-#: ../camel/camel-data-cache.c:504
+#: ../camel/camel-data-cache.c:440
+msgid "Empty cache file"
+msgstr "キャッシュファイルを空にする"
+
+#: ../camel/camel-data-cache.c:509
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "キャッシュ・エントリを開けませんでした: %s: %s"
 
-#: ../camel/camel-disco-diary.c:201
+#: ../camel/camel-disco-diary.c:207
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1837,8 +1845,7 @@ msgstr ""
 "ネットワークに再接続しても、このサーバーに対する\n"
 "これ以降の操作は再現されません。"
 
-#: ../camel/camel-disco-diary.c:266
-#: ../camel/providers/imap/camel-imap-journal.c:309
+#: ../camel/camel-disco-diary.c:279
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1849,45 +1856,36 @@ msgstr ""
 "%s\n"
 "このフォルダーに対する変更が再び同期されることはありません。"
 
-#: ../camel/camel-disco-diary.c:310
+#: ../camel/camel-disco-diary.c:326
 msgid "Resynchronizing with server"
 msgstr "サーバーの再同期中"
 
-#: ../camel/camel-disco-folder.c:72 ../camel/camel-offline-folder.c:89
+#: ../camel/camel-disco-folder.c:76 ../camel/camel-offline-folder.c:93
 msgid "Downloading new messages for offline mode"
 msgstr "オフライン・モードでの新着メールのダウンロード中"
 
-#: ../camel/camel-disco-folder.c:412
+#: ../camel/camel-disco-folder.c:422
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "オフラインに切り替える準備中: %s"
 
-#: ../camel/camel-disco-folder.c:478 ../camel/camel-offline-folder.c:323
-msgid "Copy folder content locally for offline operation"
-msgstr "フォルダーの内容をローカルへコピーする (オフライン用)"
-
-#: ../camel/camel-disco-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1193
-#: ../camel/providers/imap/camel-imap-store.c:1980
-#: ../camel/providers/imap/camel-imap-store.c:2475
-#: ../camel/providers/imap/camel-imap-store.c:3231
-#: ../camel/providers/imapx/camel-imapx-folder.c:333
-#: ../camel/providers/imapx/camel-imapx-folder.c:366
-#: ../camel/providers/imapx/camel-imapx-folder.c:420
-#: ../camel/providers/imapx/camel-imapx-folder.c:466
-#: ../camel/providers/imapx/camel-imapx-folder.c:500
-#: ../camel/providers/imapx/camel-imapx-folder.c:540
-#: ../camel/providers/imapx/camel-imapx-folder.c:576
-#: ../camel/providers/imapx/camel-imapx-store.c:270
-#: ../camel/providers/imapx/camel-imapx-store.c:1333
-#: ../camel/providers/imapx/camel-imapx-store.c:1421
-#: ../camel/providers/imapx/camel-imapx-store.c:1467
-#: ../camel/providers/pop3/camel-pop3-folder.c:357
-#: ../camel/providers/pop3/camel-pop3-folder.c:487
-#: ../camel/providers/pop3/camel-pop3-folder.c:591
-#: ../camel/providers/pop3/camel-pop3-folder.c:765
-#: ../camel/providers/pop3/camel-pop3-store.c:373
-#: ../camel/providers/pop3/camel-pop3-store.c:770
+#: ../camel/camel-disco-folder.c:489 ../camel/camel-offline-folder.c:336
+msgid "Copy folder content locally for _offline operation"
+msgstr "オフラインでの作業用にフォルダーの内容をローカルへコピーする (_O)"
+
+#: ../camel/camel-disco-store.c:475 ../camel/camel-imapx-folder.c:478
+#: ../camel/camel-imapx-folder.c:514 ../camel/camel-imapx-folder.c:553
+#: ../camel/camel-imapx-folder.c:613 ../camel/camel-imapx-folder.c:748
+#: ../camel/camel-imapx-folder.c:933 ../camel/camel-imapx-folder.c:993
+#: ../camel/camel-imapx-folder.c:1032 ../camel/camel-imapx-store.c:368
+#: ../camel/camel-imapx-store.c:1573 ../camel/camel-imapx-store.c:1662
+#: ../camel/camel-imapx-store.c:1711
+#: ../camel/providers/pop3/camel-pop3-folder.c:534
+#: ../camel/providers/pop3/camel-pop3-folder.c:677
+#: ../camel/providers/pop3/camel-pop3-folder.c:906
+#: ../camel/providers/pop3/camel-pop3-folder.c:1106
+#: ../camel/providers/pop3/camel-pop3-store.c:472
+#: ../camel/providers/pop3/camel-pop3-store.c:896
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "この動作を完了するためにオンラインで作業してください"
@@ -1897,212 +1895,236 @@ msgstr "この動作を完了するためにオンラインで作業してくだ
 msgid "Canceled"
 msgstr "キャンセル済み"
 
-#: ../camel/camel-filter-driver.c:877 ../camel/camel-filter-search.c:695
+#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:797
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "子プロセス '%s' の生成に失敗しました: %s"
 
-#: ../camel/camel-filter-driver.c:925
+#: ../camel/camel-filter-driver.c:964
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s から受信したメッセージ・ストリームが正しくありません: %s"
 
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1139
+#: ../camel/camel-filter-driver.c:1170 ../camel/camel-filter-driver.c:1179
 msgid "Syncing folders"
 msgstr "フォルダーの同期中"
 
-#: ../camel/camel-filter-driver.c:1234 ../camel/camel-filter-driver.c:1680
+#: ../camel/camel-filter-driver.c:1277
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "フィルターの構文解析中にエラー: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1245 ../camel/camel-filter-driver.c:1691
+#: ../camel/camel-filter-driver.c:1288
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "フィルター実行中にエラー: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1343
+#: ../camel/camel-filter-driver.c:1384
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "スプール・フォルダーを開けません"
 
-#: ../camel/camel-filter-driver.c:1354
+#: ../camel/camel-filter-driver.c:1396
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "スプール・フォルダーを処理できません"
 
-#: ../camel/camel-filter-driver.c:1372
+#: ../camel/camel-filter-driver.c:1419
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "メッセージ %d の取得中 (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1379 ../camel/camel-filter-driver.c:1401
+#: ../camel/camel-filter-driver.c:1428 ../camel/camel-filter-driver.c:1450
 #, c-format
 msgid "Failed on message %d"
 msgstr "メッセージ %d で失敗しました"
 
-#: ../camel/camel-filter-driver.c:1416 ../camel/camel-filter-driver.c:1517
+#: ../camel/camel-filter-driver.c:1469 ../camel/camel-filter-driver.c:1583
 msgid "Syncing folder"
 msgstr "フォルダーの同期中"
 
-#: ../camel/camel-filter-driver.c:1421 ../camel/camel-filter-driver.c:1523
+#: ../camel/camel-filter-driver.c:1474 ../camel/camel-filter-driver.c:1591
 msgid "Complete"
 msgstr "完了しました"
 
-#: ../camel/camel-filter-driver.c:1481
+#: ../camel/camel-filter-driver.c:1537
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "メッセージ %d / %d の取得中"
 
-#: ../camel/camel-filter-driver.c:1499
+#: ../camel/camel-filter-driver.c:1555
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "メッセージ %d / %d で失敗しました"
 
-#: ../camel/camel-filter-search.c:136
+#: ../camel/camel-filter-driver.c:1751 ../camel/camel-filter-driver.c:1785
+#, fuzzy, c-format
+#| msgid "Error executing filter: %s: %s"
+msgid "Execution of filter '%s' failed: "
+msgstr "フィルター実行中にエラー: %s: %s"
+
+#: ../camel/camel-filter-driver.c:1775
+#, fuzzy, c-format
+#| msgid "Error parsing filter: %s: %s"
+msgid "Error parsing filter '%s': %s: %s"
+msgstr "フィルターの構文解析中にエラー: %s: %s"
+
+#: ../camel/camel-filter-driver.c:1794
+#, fuzzy, c-format
+#| msgid "Error executing filter: %s: %s"
+msgid "Error executing filter '%s': %s: %s"
+msgstr "フィルター実行中にエラー: %s: %s"
+
+#: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
 msgstr "メッセージの取得に失敗しました"
 
-#: ../camel/camel-filter-search.c:445
+#: ../camel/camel-filter-search.c:537
 msgid "Invalid arguments to (system-flag)"
 msgstr "(system-flag) に対する無効な引数"
 
-#: ../camel/camel-filter-search.c:463
+#: ../camel/camel-filter-search.c:555
 msgid "Invalid arguments to (user-tag)"
 msgstr "(user-tag) に対する無効な引数"
 
-#: ../camel/camel-filter-search.c:872 ../camel/camel-filter-search.c:881
+#: ../camel/camel-filter-search.c:1046 ../camel/camel-filter-search.c:1055
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "フィルター検索実行中にエラー: %s: %s"
 
-#: ../camel/camel-folder.c:251
+#: ../camel/camel-folder.c:291
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "'%s' にある新しいスパム・メッセージの学習中"
 
-#: ../camel/camel-folder.c:291
+#: ../camel/camel-folder.c:331
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "'%s' にある新しいハム・メッセージの学習中"
 
-#: ../camel/camel-folder.c:339
+#: ../camel/camel-folder.c:379
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "'%s' にある新しいメッセージのフィルターリング中"
 
-#: ../camel/camel-folder.c:907
-#: ../camel/providers/local/camel-maildir-folder.c:322
+#: ../camel/camel-folder.c:953
+#: ../camel/providers/local/camel-maildir-folder.c:321
 msgid "Moving messages"
 msgstr "メッセージの移動中"
 
-#: ../camel/camel-folder.c:910
+#: ../camel/camel-folder.c:956
 msgid "Copying messages"
 msgstr "メッセージのコピー中"
 
-#: ../camel/camel-folder.c:1157
+#: ../camel/camel-folder.c:1276
 #, c-format
 msgid "Quota information not supported for folder '%s'"
-msgstr ""
+msgstr "フォルダー'%s' に対してはクオータ情報はサポートされていません"
 
-#: ../camel/camel-folder.c:3278
-#, fuzzy, c-format
-#| msgid "Retrieving message '%s'"
-msgid "Retrieving message '%s' in %s"
-msgstr "メッセージ '%s' の取得中"
+#: ../camel/camel-folder.c:3509
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr "フォルダー '%s' の抹消中"
 
-#: ../camel/camel-folder.c:3424
-#, fuzzy, c-format
-#| msgid "Fetching summary information for new messages in %s"
-msgid "Retrieving quota information for '%s'"
-msgstr "%s にある新着メッセージのサマリ情報の同期中"
+#: ../camel/camel-folder.c:3741
+#, c-format
+msgid "Retrieving message '%s' in %s"
+msgstr "メッセージ '%s' (%s 内) の取得中"
 
-#: ../camel/camel-folder-search.c:348 ../camel/camel-folder-search.c:458
-#: ../camel/camel-folder-search.c:629
+#: ../camel/camel-folder.c:3892
 #, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"正規表現の構文を解析できません: %s:\n"
-"%s"
+msgid "Retrieving quota information for '%s'"
+msgstr "'%s' のクォータ情報を取得中"
 
-#: ../camel/camel-folder-search.c:360 ../camel/camel-folder-search.c:470
-#: ../camel/camel-folder-search.c:641
+#: ../camel/camel-folder.c:4124
 #, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"正規表現での検索を実行中にエラー: %s:\n"
-"%s"
+msgid "Refreshing folder '%s'"
+msgstr "フォルダー '%s' を更新中"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:855 ../camel/camel-folder-search.c:898
+#: ../camel/camel-folder-search.c:838 ../camel/camel-folder-search.c:881
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) には論理結果が必要です"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:959
+#: ../camel/camel-folder-search.c:916
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) は %s の中に含めることはできません"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:966 ../camel/camel-folder-search.c:974
+#: ../camel/camel-folder-search.c:923 ../camel/camel-folder-search.c:931
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) には検索の種類を表す文字列が必要です"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1002
+#: ../camel/camel-folder-search.c:959
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) は配列の結果を期待します"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1012
+#: ../camel/camel-folder-search.c:969
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) にはフォルダーの組が必要です"
 
-#: ../camel/camel-gpg-context.c:659 ../camel/camel-gpg-context.c:664
-#: ../camel/camel-gpg-context.c:1323
+#: ../camel/camel-folder-search.c:1862 ../camel/camel-folder-search.c:2029
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"正規表現の構文を解析できません: %s:\n"
+"%s"
+
+#: ../camel/camel-folder-search.c:1874 ../camel/camel-folder-search.c:2041
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"正規表現での検索を実行中にエラー: %s:\n"
+"%s"
+
+#: ../camel/camel-gpg-context.c:691 ../camel/camel-gpg-context.c:696
+#: ../camel/camel-gpg-context.c:1359
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "GPG の実行に失敗しました: %s"
 
-#: ../camel/camel-gpg-context.c:664
-#: ../camel/providers/smtp/camel-smtp-transport.c:824
+#: ../camel/camel-gpg-context.c:696
+#: ../camel/providers/smtp/camel-smtp-transport.c:926
 msgid "Unknown"
 msgstr "不明"
 
-#: ../camel/camel-gpg-context.c:729
+#: ../camel/camel-gpg-context.c:761
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
 "\n"
 "%s"
 msgstr ""
-"GnuPG に想定外のステータス・メッセージがあります:\n"
+"Unexpected GnuPG status message encountered:\n"
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:765
+#: ../camel/camel-gpg-context.c:797
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "GnuPG のユーザー ID ヒントの解析に失敗しました。"
 
-#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:805
+#: ../camel/camel-gpg-context.c:822 ../camel/camel-gpg-context.c:837
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "GnuPG のパスフレーズ要求の解析に失敗しました。"
 
-#: ../camel/camel-gpg-context.c:826
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2111,7 +2133,7 @@ msgstr ""
 "お使いのスマートカードのキーを解除するには\n"
 "PIN が必要です: \"%s\""
 
-#: ../camel/camel-gpg-context.c:830
+#: ../camel/camel-gpg-context.c:862
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2120,190 +2142,464 @@ msgstr ""
 "次のユーザーのキーを解除するにはパスフレーズが必要です:\n"
 " \"%s\""
 
-#: ../camel/camel-gpg-context.c:836
+#: ../camel/camel-gpg-context.c:868
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "'%s' に対して GnuPG から想定外の要求がありました"
 
-#: ../camel/camel-gpg-context.c:846
-msgid ""
-"Note the encrypted content doesn't contain information about a recipient, "
-"thus there will be a password prompt for each of stored private key."
-msgstr ""
+#: ../camel/camel-gpg-context.c:880
+msgid "Note the encrypted content doesn't contain information about a recipient, thus there will be a 
password prompt for each of stored private key."
+msgstr "暗号化されたコンテンツには受信者に関する情報は含まれないため、格納されている各プライベートキーごとにパスワードの入力が求められることになります。"
 
-#: ../camel/camel-gpg-context.c:875 ../camel/camel-net-utils.c:523
+#: ../camel/camel-gpg-context.c:911 ../camel/camel-net-utils.c:523
 #: ../camel/camel-tcp-stream-raw.c:268
-#: ../camel/providers/nntp/camel-nntp-summary.c:368
-#: ../libedataserver/e-client.c:136 ../libedataserverui/e-book-auth-util.c:227
+#: ../camel/providers/nntp/camel-nntp-summary.c:388
+#: ../libedataserver/e-client.c:152
 #, c-format
 msgid "Cancelled"
 msgstr "キャンセル済み"
 
-#: ../camel/camel-gpg-context.c:896
+#: ../camel/camel-gpg-context.c:932
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "秘密鍵の解除に失敗しました: 指定した三つのパスフレーズがおかしいです。"
 
-#: ../camel/camel-gpg-context.c:909
+#: ../camel/camel-gpg-context.c:945
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG から想定外の応答がありました: %s"
 
-#: ../camel/camel-gpg-context.c:1040
+#: ../camel/camel-gpg-context.c:1076
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "暗号化に失敗しました: 正しい宛先が指定されていません。"
 
-#: ../camel/camel-gpg-context.c:1587 ../camel/camel-smime-context.c:827
+#: ../camel/camel-gpg-context.c:1626 ../camel/camel-smime-context.c:846
 msgid "Could not generate signing data: "
 msgstr "署名データを生成できませんでした: "
 
-#: ../camel/camel-gpg-context.c:1636 ../camel/camel-gpg-context.c:1840
-#: ../camel/camel-gpg-context.c:1950 ../camel/camel-gpg-context.c:2097
-#: ../camel/camel-gpg-context.c:2197 ../camel/camel-gpg-context.c:2245
+#: ../camel/camel-gpg-context.c:1675 ../camel/camel-gpg-context.c:1879
+#: ../camel/camel-gpg-context.c:1989 ../camel/camel-gpg-context.c:2136
+#: ../camel/camel-gpg-context.c:2236 ../camel/camel-gpg-context.c:2284
 msgid "Failed to execute gpg."
 msgstr "GPG の実行に失敗しました。"
 
-#: ../camel/camel-gpg-context.c:1715 ../camel/camel-gpg-context.c:1723
-#: ../camel/camel-gpg-context.c:1731 ../camel/camel-gpg-context.c:1751
-#: ../camel/camel-smime-context.c:953 ../camel/camel-smime-context.c:967
-#: ../camel/camel-smime-context.c:976
+#: ../camel/camel-gpg-context.c:1754 ../camel/camel-gpg-context.c:1762
+#: ../camel/camel-gpg-context.c:1770 ../camel/camel-gpg-context.c:1790
+#: ../camel/camel-smime-context.c:973 ../camel/camel-smime-context.c:987
+#: ../camel/camel-smime-context.c:996
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
-msgstr ""
-"このメッセージ署名の整合性を確認できません: メッセージの書式が正しくありませ"
-"ん"
+msgstr "このメッセージ署名の整合性を確認できません: メッセージの書式が正しくありません"
 
-#: ../camel/camel-gpg-context.c:1793
+#: ../camel/camel-gpg-context.c:1832
 msgid "Cannot verify message signature: "
 msgstr "このメッセージ署名の整合性を確認できません: "
 
-#: ../camel/camel-gpg-context.c:1916
+#: ../camel/camel-gpg-context.c:1955
 msgid "Could not generate encrypting data: "
 msgstr "暗号化されたデータを生成できませんでした: "
 
-#: ../camel/camel-gpg-context.c:1969
+#: ../camel/camel-gpg-context.c:2008
 msgid "This is a digitally encrypted message part"
 msgstr "これはデジタル署名された部分です"
 
-#: ../camel/camel-gpg-context.c:2027 ../camel/camel-gpg-context.c:2036
-#: ../camel/camel-gpg-context.c:2059
+#: ../camel/camel-gpg-context.c:2066 ../camel/camel-gpg-context.c:2075
+#: ../camel/camel-gpg-context.c:2098
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "メッセージを解読できません: メッセージの書式が正しくありません"
 
-#: ../camel/camel-gpg-context.c:2047
+#: ../camel/camel-gpg-context.c:2086
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME 型の暗号解読に失敗しました: プロトコル・エラー"
 
-#: ../camel/camel-gpg-context.c:2138 ../camel/camel-smime-context.c:1264
+#: ../camel/camel-gpg-context.c:2177 ../camel/camel-smime-context.c:1287
 msgid "Encrypted content"
 msgstr "暗号化した内容"
 
-#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
-msgid "Only reset to beginning is supported with CamelHttpStream"
-msgstr ""
-
-#: ../camel/camel-lock.c:102
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "%s のロック・ファイルを作成できませんでした: %s"
+#: ../camel/camel-imapx-folder.c:710
+#, fuzzy, c-format
+#| msgid "Quota information not supported for folder '%s'"
+msgid "No quota information available for folder '%s'"
+msgstr "フォルダー'%s' に対してはクオータ情報はサポートされていません"
 
-#: ../camel/camel-lock.c:145
+#: ../camel/camel-imapx-folder.c:809 ../camel/camel-imapx-folder.c:882
 #, c-format
-msgid "Timed out trying to get lock file on %s.  Try again later."
+msgid "No destination folder specified"
 msgstr ""
-"%s のロック・ファイルの取得中にタイムアウトしました。後でやり直してください。"
 
-#: ../camel/camel-lock.c:205
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "fcntl(2) を使ったロックに失敗しました: %s"
+#: ../camel/camel-imapx-folder.c:828
+#, fuzzy
+#| msgid "Unable to retrieve message: "
+msgid "Unable to move junk messages"
+msgstr "メッセージを回復できません: "
 
-#: ../camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "flock(2) を使ったロックに失敗しました: %s"
+#: ../camel/camel-imapx-folder.c:901
+#, fuzzy
+#| msgid "Unable to retrieve message: "
+msgid "Unable to move deleted messages"
+msgstr "メッセージを回復できません: "
 
-#: ../camel/camel-lock-client.c:106
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "ロッキング・ヘルパー・パイプが構築できません: %s"
+#: ../camel/camel-imapx-folder.c:1119
+#: ../camel/providers/nntp/camel-nntp-folder.c:738
+msgid "Apply message _filters to this folder"
+msgstr "このフォルダーにメッセージフィルターを適用 (_F)"
 
-#: ../camel/camel-lock-client.c:130
+#: ../camel/camel-imapx-folder.c:1228
 #, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "ロッキング・ヘルパーのプロセスを作成できません: %s"
+msgid "Could not create folder summary for %s"
+msgstr "%s のフォルダーサマリを作成できませんでした"
 
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#: ../camel/camel-imapx-folder.c:1236
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "'%s' をロックできませんでした: lock-helper のプロトコル・エラーです"
+msgid "Could not create cache for %s: "
+msgstr "%s のキャッシュを生成できませんでした: "
 
-#: ../camel/camel-lock-client.c:227
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "'%s' をロックできません"
+#: ../camel/camel-imapx-server.c:1279
+msgid "Server disconnected"
+msgstr "サーバーが切断されました"
 
-#: ../camel/camel-movemail.c:105
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "メール・ファイル %s をチェックできませんでした: %s"
+#: ../camel/camel-imapx-server.c:1787
+#, fuzzy
+#| msgid "Error writing to cache stream: "
+msgid "Error writing to cache stream"
+msgstr "キャッシュストリームに書き込み中にエラー: "
 
-#: ../camel/camel-movemail.c:119
+#: ../camel/camel-imapx-server.c:2994
 #, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "メール・ファイル %s を開けませんでした: %s"
+msgid "Not authenticated"
+msgstr "認証されていません"
 
-#: ../camel/camel-movemail.c:129
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "メール・ファイル %s のテンポラリを開けませんでした: %s"
+#: ../camel/camel-imapx-server.c:3072
+msgid "Error performing IDLE"
+msgstr "IDLE を実行する際にエラーが発生しました"
 
-#: ../camel/camel-movemail.c:159
+#: ../camel/camel-imapx-server.c:4029
 #, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "作業ファイル %s へメールの保存に失敗しました: %s"
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "セキュリティ保護されたモードで IMAP サーバー %s への接続に失敗しました: %s"
 
-#: ../camel/camel-movemail.c:193
+#: ../camel/camel-imapx-server.c:4030
+#: ../camel/providers/smtp/camel-smtp-transport.c:208
+msgid "STARTTLS not supported"
+msgstr "STARTTLS 拡張はサポートしていません。"
+
+#: ../camel/camel-imapx-server.c:4069
 #, c-format
-msgid "Could not create pipe: %s"
-msgstr "パイプが作成できませんでした: %s"
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "セキュリティ保護されたモードによる IMAP サーバー %s への接続に失敗しました: "
 
-#: ../camel/camel-movemail.c:207
+#: ../camel/camel-imapx-server.c:4149
 #, c-format
-msgid "Could not fork: %s"
-msgstr "fork(2) できませんでした: %s"
+msgid "IMAP server %s does not support %s authentication"
+msgstr "IMAP サーバーの %s では %s という認証タイプをサポートしていません"
 
-#: ../camel/camel-movemail.c:245
+#: ../camel/camel-imapx-server.c:4160 ../camel/camel-session.c:495
+#: ../camel/providers/pop3/camel-pop3-store.c:272
+#: ../camel/providers/pop3/camel-pop3-store.c:654
+#: ../camel/providers/smtp/camel-smtp-transport.c:517
 #, c-format
-msgid "Movemail program failed: %s"
-msgstr "Movemail プログラムは失敗しました: %s"
+msgid "No support for %s authentication"
+msgstr "%s という認証タイプはサポートしていません"
 
-#: ../camel/camel-movemail.c:246
-msgid "(Unknown error)"
-msgstr "(特定できないエラー)"
+#: ../camel/camel-imapx-server.c:4179
+#: ../camel/providers/nntp/camel-nntp-store.c:362
+#: ../camel/providers/nntp/camel-nntp-store.c:562
+msgid "Cannot authenticate without a username"
+msgstr "ユーザー名がないと認証を行えません"
 
-#: ../camel/camel-movemail.c:273
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "メール・ファイルの読み込み中にエラー: %s"
+#: ../camel/camel-imapx-server.c:4188
+#: ../camel/providers/nntp/camel-nntp-store.c:571
+#: ../camel/providers/pop3/camel-pop3-store.c:579
+#: ../camel/providers/pop3/camel-pop3-store.c:599
+msgid "Authentication password not available"
+msgstr "認証用のパスワードがありません"
 
-#: ../camel/camel-movemail.c:286
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "メール作業ファイルの書き込み中にエラー: %s"
+#: ../camel/camel-imapx-server.c:4396
+msgid "Error fetching message"
+msgstr "メッセージを取得する際にエラーが発生しました"
 
-#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
-#, c-format
-msgid "Error copying mail temp file: %s"
-msgstr "メール作業ファイルのコピー中にエラー: %s"
+#: ../camel/camel-imapx-server.c:4478
+msgid "Failed to copy the tmp file"
+msgstr "tmp ファイルのコピーに失敗しました"
 
-#: ../camel/camel-multipart-signed.c:297
-#, c-format
-msgid "No content available"
-msgstr "利用できるコンテンツがありません"
+#: ../camel/camel-imapx-server.c:4492
+msgid "Failed to close the tmp stream"
+msgstr "tmp ストリームのクローズに失敗しました"
+
+#: ../camel/camel-imapx-server.c:4613
+msgid "Error copying messages"
+msgstr "メッセージをコピーする際にエラーが発生しました"
+
+#: ../camel/camel-imapx-server.c:4779
+msgid "Error appending message"
+msgstr "メッセージを追加する際にエラーが発生しました"
+
+#: ../camel/camel-imapx-server.c:4978
+msgid "Error fetching message headers"
+msgstr "メッセージヘッダーを取得する際にエラーが発生しました"
+
+#: ../camel/camel-imapx-server.c:5129
+msgid "Error retrieving message"
+msgstr "メッセージの取得中にエラーが発生しました"
+
+#: ../camel/camel-imapx-server.c:5260 ../camel/camel-imapx-server.c:5488
+#, c-format
+msgid "Fetching summary information for new messages in '%s'"
+msgstr "'%s' にある新着メッセージのサマリ情報を取得中"
+
+#: ../camel/camel-imapx-server.c:5324
+#, c-format
+msgid "Scanning for changed messages in '%s'"
+msgstr "'%s' 内の変更されたメッセージをスキャン中"
+
+#: ../camel/camel-imapx-server.c:5377
+msgid "Error fetching new messages"
+msgstr "新しいメッセージの取得中にエラーが発生しました"
+
+#: ../camel/camel-imapx-server.c:5590
+msgid "Error while fetching messages"
+msgstr "メッセージの取得中にエラーが発生しました"
+
+#: ../camel/camel-imapx-server.c:5598 ../camel/camel-imapx-server.c:5631
+#, c-format
+msgid "Fetching summary information for %d message in '%s'"
+msgid_plural "Fetching summary information for %d messages in '%s'"
+msgstr[0] "%d メッセージ (%s 内) のサマリ情報を取得中"
+
+#: ../camel/camel-imapx-server.c:5767 ../camel/camel-imapx-server.c:5797
+msgid "Error refreshing folder"
+msgstr "フォルダーを更新する際にエラーが発生しました"
+
+#: ../camel/camel-imapx-server.c:5921
+msgid "Error expunging message"
+msgstr "メッセージを抹消する際にエラーが発生しました"
+
+#: ../camel/camel-imapx-server.c:6032
+msgid "Error fetching folders"
+msgstr "フォルダーを取得する際にエラーが発生しました"
+
+#: ../camel/camel-imapx-server.c:6114
+msgid "Error subscribing to folder"
+msgstr "フォルダーをサブスクライブする際にエラーが発生しました"
+
+#: ../camel/camel-imapx-server.c:6179
+msgid "Error creating folder"
+msgstr "フォルダーを作成する際にエラーが発生しました"
+
+#: ../camel/camel-imapx-server.c:6233
+msgid "Error deleting folder"
+msgstr "フォルダーを削除する際にエラーが発生しました"
+
+#: ../camel/camel-imapx-server.c:6307
+msgid "Error renaming folder"
+msgstr "フォルダーの名前を変更する際にエラーが発生しました"
+
+#: ../camel/camel-imapx-server.c:6382
+#, fuzzy
+#| msgid "Retrieving quota information for '%s'"
+msgid "Error retrieving quota information"
+msgstr "'%s' のクォータ情報を取得中"
+
+#: ../camel/camel-imapx-server.c:6447
+#, fuzzy
+#| msgid "Decoder failed"
+msgid "Search failed"
+msgstr "デコーダーのエラーです"
+
+#: ../camel/camel-imapx-server.c:6510
+msgid "Error performing NOOP"
+msgstr "NOOP を実行する際にエラーが発生しました"
+
+#: ../camel/camel-imapx-server.c:6619
+msgid "Error syncing changes"
+msgstr "変更を同期する際にエラーが発生しました"
+
+#: ../camel/camel-imapx-server.c:7431
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "%s という ID のメッセージを取得できません: %s"
+
+#: ../camel/camel-imapx-server.c:7432
+msgid "No such message available."
+msgstr "そのようなメッセージは利用できません。"
+
+#: ../camel/camel-imapx-server.c:7590 ../camel/camel-imapx-server.c:7605
+msgid "Cannot create spool file: "
+msgstr "スプールファイルを作成できません: "
+
+#: ../camel/camel-imapx-server.c:8347
+#, fuzzy
+#| msgid "IMAP server %s does not support %s authentication"
+msgid "IMAP server does not support quotas"
+msgstr "IMAP サーバーの %s では %s という認証タイプをサポートしていません"
+
+#: ../camel/camel-imapx-store.c:249
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP サーバー %s"
+
+#: ../camel/camel-imapx-store.c:252
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s の %s にある IMAP サービス"
+
+#: ../camel/camel-imapx-store.c:343
+#: ../camel/providers/nntp/camel-nntp-provider.c:95
+#: ../camel/providers/pop3/camel-pop3-provider.c:83
+msgid "Password"
+msgstr "パスワード"
+
+#: ../camel/camel-imapx-store.c:345
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr "このオプションはプレイン・テキストのパスワードを使って IMAP サーバーに接続します。"
+
+#: ../camel/camel-imapx-store.c:453
+#, c-format
+msgid "No such folder %s"
+msgstr "そのようなフォルダー %s はありません"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/camel-imapx-store.c:478 ../camel/camel-imapx-store.c:968
+#: ../camel/providers/local/camel-maildir-folder.c:473
+#: ../camel/providers/local/camel-maildir-store.c:316
+#: ../camel/providers/local/camel-maildir-store.c:750
+#: ../camel/providers/local/camel-maildir-store.c:756
+#: ../camel/providers/local/camel-maildir-store.c:840
+#: ../camel/providers/local/camel-spool-store.c:393
+msgid "Inbox"
+msgstr "受信箱"
+
+#: ../camel/camel-imapx-store.c:1212
+#, c-format
+msgid "Retrieving folder list for %s"
+msgstr "%s のフォルダーの一覧を取得中"
+
+#: ../camel/camel-imapx-store.c:1595
+#, c-format
+msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "\"%s\" というフォルダー名に \"%c\" という文字を含めることはできません"
+
+#: ../camel/camel-imapx-store.c:1606
+#, c-format
+msgid "Unknown parent folder: %s"
+msgstr "親フォルダーを特定できません: %s"
+
+#: ../camel/camel-imapx-store.c:1616
+#, c-format
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "親フォルダーには複数のサブフォルダーを含めることはできません"
+
+#: ../camel/camel-imapx-stream.c:98
+#, c-format
+msgid "Source stream returned no data"
+msgstr "ソースストリームはデータを返しませんでした"
+
+#: ../camel/camel-imapx-stream.c:107
+#, c-format
+msgid "Source stream unavailable"
+msgstr "ソースストリームは利用できません"
+
+#: ../camel/camel-lock.c:102
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "%s のロック・ファイルを作成できませんでした: %s"
+
+#: ../camel/camel-lock.c:145
+#, c-format
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr "%s のロック・ファイルの取得中にタイムアウトしました。後でやり直してください。"
+
+#: ../camel/camel-lock.c:205
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "fcntl(2) を使ったロックに失敗しました: %s"
+
+#: ../camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "flock(2) を使ったロックに失敗しました: %s"
+
+#: ../camel/camel-lock-client.c:106
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "ロッキング・ヘルパー・パイプが構築できません: %s"
+
+#: ../camel/camel-lock-client.c:130
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "ロッキング・ヘルパーのプロセスを作成できません: %s"
+
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "'%s' をロックできませんでした: lock-helper のプロトコル・エラーです"
+
+#: ../camel/camel-lock-client.c:227
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "'%s' をロックできません"
+
+#: ../camel/camel-movemail.c:105
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "メール・ファイル %s をチェックできませんでした: %s"
+
+#: ../camel/camel-movemail.c:119
+#, c-format
+msgid "Could not open mail file %s: %s"
+msgstr "メール・ファイル %s を開けませんでした: %s"
+
+#: ../camel/camel-movemail.c:129
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
+msgstr "メール・ファイル %s のテンポラリを開けませんでした: %s"
+
+#: ../camel/camel-movemail.c:159
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr "作業ファイル %s へメールの保存に失敗しました: %s"
+
+#: ../camel/camel-movemail.c:193
+#, c-format
+msgid "Could not create pipe: %s"
+msgstr "パイプが作成できませんでした: %s"
+
+#: ../camel/camel-movemail.c:207
+#, c-format
+msgid "Could not fork: %s"
+msgstr "fork できませんでした: %s"
+
+#: ../camel/camel-movemail.c:245
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr "Movemail プログラムは失敗しました: %s"
+
+#: ../camel/camel-movemail.c:246
+msgid "(Unknown error)"
+msgstr "(特定できないエラー)"
+
+#: ../camel/camel-movemail.c:273
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "メール・ファイルの読み込み中にエラー: %s"
+
+#: ../camel/camel-movemail.c:286
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "メール作業ファイルの書き込み中にエラー: %s"
+
+#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562
+#, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "メール作業ファイルのコピー中にエラー: %s"
+
+#: ../camel/camel-multipart-signed.c:297
+#, c-format
+msgid "No content available"
+msgstr "利用できるコンテンツがありません"
 
 #: ../camel/camel-multipart-signed.c:305
 #, c-format
@@ -2326,33 +2622,44 @@ msgstr "ホストの検索に失敗しました"
 
 #: ../camel/camel-net-utils.c:732
 #, c-format
-msgid "Host lookup failed: %s: %s"
+msgid "Host lookup '%s' failed. Check your host name for spelling errors."
+msgstr ""
+
+#: ../camel/camel-net-utils.c:736
+#, fuzzy, c-format
+#| msgid "Host lookup failed: %s: %s"
+msgid "Host lookup '%s' failed: %s"
 msgstr "ホストの検索に失敗しました: %s: %s"
 
-#: ../camel/camel-net-utils.c:853
+#: ../camel/camel-net-utils.c:857
 msgid "Resolving address"
 msgstr "アドレスの解決中"
 
-#: ../camel/camel-net-utils.c:874
+#: ../camel/camel-net-utils.c:878
 msgid "Name lookup failed"
 msgstr "名前の検索に失敗しました"
 
-#: ../camel/camel-net-utils.c:880
+#: ../camel/camel-net-utils.c:885
+msgid "Name lookup failed. Check your host name for spelling errors."
+msgstr ""
+
+#: ../camel/camel-net-utils.c:889
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "名前の検索に失敗しました: %s"
 
-#: ../camel/camel-network-service.c:112
-#, c-format
-msgid "Could not connect to %s: "
-msgstr "%s へ接続できませんでした: "
+#: ../camel/camel-network-service.c:350
+#, fuzzy, c-format
+#| msgid "Could not connect to %s: %s"
+msgid "Could not connect to '%s:%s': "
+msgstr "%s へ接続できませんでした: %s"
 
-#: ../camel/camel-offline-folder.c:202
+#: ../camel/camel-offline-folder.c:212
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "フォルダー '%s' にあるメッセージを同期して保存中"
 
-#: ../camel/camel-offline-journal.c:147 ../camel/camel-offline-journal.c:177
+#: ../camel/camel-offline-journal.c:145 ../camel/camel-offline-journal.c:177
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "フォルダー '%s' のオフライン・ジャーナルに書き込めません: %s"
@@ -2365,29 +2672,28 @@ msgstr "仮想フォルダー・メール・プロバイダー"
 msgid "For reading mail as a query of another set of folders"
 msgstr "その他のフォルダー・セットのクエリとしてメールを読む"
 
-#: ../camel/camel-provider.c:192
+#: ../camel/camel-provider.c:263
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr ""
-"%s を読み込めませんでした: このシステムではモジュールの読み込みをサポートして"
-"いません。"
+msgstr "%s を読み込めませんでした: このシステムではモジュールの読み込みをサポートしていません。"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:272
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s を読み込めませんでした: %s"
 
-#: ../camel/camel-provider.c:210
+#: ../camel/camel-provider.c:281
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s を読み込めませんでした: モジュールのコードが初期化されていません。"
 
-#: ../camel/camel-provider.c:395 ../camel/camel-session.c:384
+#: ../camel/camel-provider.c:429 ../camel/camel-session.c:407
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "'%s' というプロトコルを利用できるプロバイダーはありません"
 
 #: ../camel/camel-sasl-anonymous.c:35
+#: ../camel/providers/nntp/camel-nntp-provider.c:85
 msgid "Anonymous"
 msgstr "匿名"
 
@@ -2427,688 +2733,583 @@ msgstr ""
 "無効なトレース情報:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:42
+#: ../camel/camel-sasl-cram-md5.c:46
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:44
-msgid ""
-"This option will connect to the server using a secure CRAM-MD5 password, if "
-"the server supports it."
-msgstr ""
-"サーバーがサポートしている場合、このオプションはセキュリティ保護された CRAM-"
-"MD5 認証を使ってサーバーへ接続します。"
+#: ../camel/camel-sasl-cram-md5.c:48
+msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
+msgstr "サーバーがサポートしている場合、このオプションはセキュリティ保護された CRAM-MD5 認証を使ってサーバーへ接続します。"
 
-#: ../camel/camel-sasl-digest-md5.c:55
+#: ../camel/camel-sasl-digest-md5.c:59
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:57
-msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, "
-"if the server supports it."
-msgstr ""
-"サーバーがサポートしている場合、このオプションはセキュリティ保護された "
-"DIGEST-MD5 を使ってサーバーへ接続します。"
+#: ../camel/camel-sasl-digest-md5.c:61
+msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
+msgstr "サーバーがサポートしている場合、このオプションはセキュリティ保護された DIGEST-MD5 を使ってサーバーへ接続します。"
 
-#: ../camel/camel-sasl-digest-md5.c:846
+#: ../camel/camel-sasl-digest-md5.c:855
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "サーバー要求が長すぎます (2048 octet 以上です)"
 
-#: ../camel/camel-sasl-digest-md5.c:857
+#: ../camel/camel-sasl-digest-md5.c:866
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "無効です\n"
 
-#: ../camel/camel-sasl-digest-md5.c:865
+#: ../camel/camel-sasl-digest-md5.c:874
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr ""
-"サーバー要求におかしな \"保護品質 (QOP: Quality of Protection)\" のトークンが"
-"含まれています"
+msgstr "サーバー要求におかしな \"保護品質 (QOP: Quality of Protection)\" のトークンが含まれています"
 
-#: ../camel/camel-sasl-digest-md5.c:898
+#: ../camel/camel-sasl-digest-md5.c:907
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "サーバーの応答に認証データがありません"
 
-#: ../camel/camel-sasl-digest-md5.c:919
+#: ../camel/camel-sasl-digest-md5.c:928
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "サーバーの応答に不完全な認証データがあります"
 
-#: ../camel/camel-sasl-digest-md5.c:932
+#: ../camel/camel-sasl-digest-md5.c:941
 #, c-format
 msgid "Server response does not match"
 msgstr "サーバーの応答が一致しません"
 
-#: ../camel/camel-sasl-gssapi.c:87
+#: ../camel/camel-sasl-gssapi.c:91
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:89
+#: ../camel/camel-sasl-gssapi.c:93
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "このオプションは Kerberos 5 認証を使ってサーバーに接続します。"
 
-#: ../camel/camel-sasl-gssapi.c:130
-msgid ""
-"The specified mechanism is not supported by the provided credential, or is "
-"unrecognized by the implementation."
-msgstr ""
-"指定したメカニズムが提供された証明書ではサポートされていないか、その実装で認"
-"識されていません。"
+#: ../camel/camel-sasl-gssapi.c:134
+msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the 
implementation."
+msgstr "指定したメカニズムが提供された証明書ではサポートされていないか、その実装で認識されていません。"
 
-#: ../camel/camel-sasl-gssapi.c:135
+#: ../camel/camel-sasl-gssapi.c:139
 msgid "The provided target_name parameter was ill-formed."
 msgstr "指定した引数 target_name の形式が間違っています。"
 
-#: ../camel/camel-sasl-gssapi.c:138
-msgid ""
-"The provided target_name parameter contained an invalid or unsupported type "
-"of name."
-msgstr ""
-"指定した引数の target_name に無効な、あるいはサポートしていない種類の名前があ"
-"ります。"
-
 #: ../camel/camel-sasl-gssapi.c:142
-msgid ""
-"The input_token contains different channel bindings to those specified via "
-"the input_chan_bindings parameter."
-msgstr ""
-"input_token に引数 input_chan_bindings を介して指定された別のチャンネルのビン"
-"ディングがあります。"
+msgid "The provided target_name parameter contained an invalid or unsupported type of name."
+msgstr "指定した引数の target_name に無効な、あるいはサポートしていない種類の名前があります。"
 
-#: ../camel/camel-sasl-gssapi.c:147
-msgid ""
-"The input_token contains an invalid signature, or a signature that could not "
-"be verified."
-msgstr ""
-"input_token の中に無効な署名があるか、またはその署名が正しくありません。"
+#: ../camel/camel-sasl-gssapi.c:146
+msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings 
parameter."
+msgstr "input_token に引数 input_chan_bindings を介して指定された別のチャンネルのビンディングがあります。"
 
 #: ../camel/camel-sasl-gssapi.c:151
-msgid ""
-"The supplied credentials were not valid for context initiation, or the "
-"credential handle did not reference any credentials."
-msgstr ""
-"指定した証明書でコンテキストの初期化はできないか、または証明書のハンドルが任"
-"意の証明書を参照していませんでした。"
+msgid "The input_token contains an invalid signature, or a signature that could not be verified."
+msgstr "input_token の中に無効な署名があるか、またはその署名が正しくありません。"
 
-#: ../camel/camel-sasl-gssapi.c:156
+#: ../camel/camel-sasl-gssapi.c:155
+msgid "The supplied credentials were not valid for context initiation, or the credential handle did not 
reference any credentials."
+msgstr "指定した証明書でコンテキストの初期化はできないか、または証明書のハンドルが任意の証明書を参照していませんでした。"
+
+#: ../camel/camel-sasl-gssapi.c:160
 msgid "The supplied context handle did not refer to a valid context."
-msgstr ""
-"指定したコンテキストのハンドルが正しいコンテキストを参照していませんでした。"
+msgstr "指定したコンテキストのハンドルが正しいコンテキストを参照していませんでした。"
 
-#: ../camel/camel-sasl-gssapi.c:159
+#: ../camel/camel-sasl-gssapi.c:163
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_token で実施した整合性のチェックが失敗しました。"
 
-#: ../camel/camel-sasl-gssapi.c:162
+#: ../camel/camel-sasl-gssapi.c:166
 msgid "The consistency checks performed on the credential failed."
 msgstr "証明書で実施した整合性のチェックが失敗しました。"
 
-#: ../camel/camel-sasl-gssapi.c:165
+#: ../camel/camel-sasl-gssapi.c:169
 msgid "The referenced credentials have expired."
 msgstr "参照している証明書の期限が過ぎています。"
 
-#: ../camel/camel-sasl-gssapi.c:171 ../camel/camel-sasl-gssapi.c:333
-#: ../camel/camel-sasl-gssapi.c:377 ../camel/camel-sasl-gssapi.c:394
-#: ../camel/providers/smtp/camel-smtp-transport.c:537
+#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340
+#: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405
+#: ../camel/providers/smtp/camel-smtp-transport.c:624
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "サーバーから間違った認証応答がありました。"
 
-#: ../camel/camel-sasl-gssapi.c:406
+#: ../camel/camel-sasl-gssapi.c:417
 #, c-format
 msgid "Unsupported security layer."
 msgstr "サポートしていないセキュリティ・レイヤーです。"
 
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:40
 msgid "Login"
 msgstr "ログイン"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:42
+#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46
 msgid "This option will connect to the server using a simple password."
 msgstr "このオプションは簡単なパスワードを使ってサーバーへ接続します。"
 
-#: ../camel/camel-sasl-login.c:103
+#: ../camel/camel-sasl-login.c:110
 #, c-format
 msgid "Unknown authentication state."
 msgstr "特定できない認証状態です。"
 
-#: ../camel/camel-sasl-ntlm.c:43
+#: ../camel/camel-sasl-ntlm.c:47
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:45
-msgid ""
-"This option will connect to a Windows-based server using NTLM / Secure "
-"Password Authentication."
-msgstr ""
-"このオプションは NTLM/セキュリティ保護されたパスワード認証を使って Windows "
-"サーバーに接続します。"
+#: ../camel/camel-sasl-ntlm.c:49
+msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
+msgstr "このオプションは NTLM/セキュリティ保護されたパスワード認証を使って Windows サーバーに接続します。"
 
-#: ../camel/camel-sasl-plain.c:40
+#: ../camel/camel-sasl-plain.c:44
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:42
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "POP before SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:44
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "このオプションは SMTP 接続を確立する前に POP 接続の認証を行います"
 
-#: ../camel/camel-sasl-popb4smtp.c:80
-#, fuzzy
-#| msgid "POP Source URI"
+#: ../camel/camel-sasl-popb4smtp.c:84
 msgid "POP Source UID"
-msgstr "POP ソース URI"
+msgstr "POP ソース UID"
 
-#: ../camel/camel-sasl-popb4smtp.c:92
+#: ../camel/camel-sasl-popb4smtp.c:98
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "不明な転送を利用した POP Before SMTP 認証です"
 
-#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
-#, fuzzy, c-format
-#| msgid "POP Before SMTP authentication using a non-POP source"
+#: ../camel/camel-sasl-popb4smtp.c:110 ../camel/camel-sasl-popb4smtp.c:119
+#, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
-msgstr "POP ソースを利用しない POP Before SMTP です"
+msgstr "%s サービスで試行される POP Before SMTP 認証です"
 
-#: ../camel/camel-search-private.c:112
+#: ../camel/camel-search-private.c:116
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "正規表現の編集に失敗: %s: %s"
 
-#: ../camel/camel-session.c:393
-#, fuzzy, c-format
-#| msgid "No provider available for protocol '%s'"
+#: ../camel/camel-session.c:416
+#, c-format
 msgid "Invalid GType registered for protocol '%s'"
-msgstr "'%s' というプロトコルを利用できるプロバイダーはありません"
-
-#: ../camel/camel-session.c:462
-#: ../camel/providers/imap/camel-imap-store.c:1097
-#: ../camel/providers/imapx/camel-imapx-server.c:3357
-#: ../camel/providers/pop3/camel-pop3-store.c:242
-#: ../camel/providers/pop3/camel-pop3-store.c:538
-#: ../camel/providers/smtp/camel-smtp-transport.c:430
-#, fuzzy, c-format
-#| msgid "No support for authentication type %s"
-msgid "No support for %s authentication"
-msgstr "%s という認証タイプはサポートしていません"
+msgstr "'%s' というプロトコルに無効な GType が登録されています"
 
-#: ../camel/camel-session.c:477
-#, fuzzy, c-format
-#| msgid "Authentication failed"
+#: ../camel/camel-session.c:510
+#, c-format
 msgid "%s authentication failed"
-msgstr "認証に失敗しました"
+msgstr "%s 認証に失敗しました"
+
+#: ../camel/camel-session.c:646
+msgid "Forwarding messages is not supported"
+msgstr "メッセージの転送はサポートされていません"
 
-#: ../camel/camel-session.c:1186
+#. Translators: The first argument is the account type
+#. * (e.g. "IMAP"), the second is the user name, and the
+#. * third is the host name.
+#: ../camel/camel-session.c:1423
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
-msgstr "%s%s %s のパスワードを入力してください。"
+msgstr "%2$s %3$s の %1$s パスワードを入力してください。"
 
-#: ../camel/camel-smime-context.c:347 ../camel/camel-smime-context.c:1053
+#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1074
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' の証明書が見つかりません"
 
-#: ../camel/camel-smime-context.c:375
+#: ../camel/camel-smime-context.c:379
 msgid "Cannot create CMS message"
 msgstr "CMS メッセージを作成できません"
 
-#: ../camel/camel-smime-context.c:380
+#: ../camel/camel-smime-context.c:384
 msgid "Cannot create CMS signed data"
 msgstr "CMS 署名データを作成できません"
 
-#: ../camel/camel-smime-context.c:386
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS signed data"
 msgstr "CMS 署名データを添付できません"
 
-#: ../camel/camel-smime-context.c:393
+#: ../camel/camel-smime-context.c:397
 msgid "Cannot attach CMS data"
 msgstr "CMS データを添付できません"
 
-#: ../camel/camel-smime-context.c:399
+#: ../camel/camel-smime-context.c:403
 msgid "Cannot create CMS Signer information"
 msgstr "CMS 署名者の情報を作成できません"
 
-#: ../camel/camel-smime-context.c:405
+#: ../camel/camel-smime-context.c:409
 msgid "Cannot find certificate chain"
 msgstr "認証チェインが見つかりません"
 
-#: ../camel/camel-smime-context.c:411
+#: ../camel/camel-smime-context.c:415
 msgid "Cannot add CMS Signing time"
 msgstr "CMS 署名時刻を追加できません"
 
-#: ../camel/camel-smime-context.c:435 ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' の暗号化証明書がありません"
 
-#: ../camel/camel-smime-context.c:457
+#: ../camel/camel-smime-context.c:461
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "属性 SMIMEEncKeyPrefs を追加できません"
 
-#: ../camel/camel-smime-context.c:462
+#: ../camel/camel-smime-context.c:466
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "属性 MS SMIMEEncKeyPrefs を追加できません"
 
-#: ../camel/camel-smime-context.c:467
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot add encryption certificate"
 msgstr "暗号化証明書を追加できません"
 
-#: ../camel/camel-smime-context.c:473
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot add CMS Signer information"
 msgstr "CMS 署名者情報を追加できません"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:506
+#: ../camel/camel-smime-context.c:510
 msgid "Unverified"
 msgstr "未検証"
 
-#: ../camel/camel-smime-context.c:508
+#: ../camel/camel-smime-context.c:512
 msgid "Good signature"
 msgstr "良い署名"
 
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:514
 msgid "Bad signature"
 msgstr "悪い署名"
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:516
 msgid "Content tampered with or altered in transit"
 msgstr "データの転送中に不当に改竄された内容です"
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:518
 msgid "Signing certificate not found"
 msgstr "署名付き証明書がみつかりません"
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:520
 msgid "Signing certificate not trusted"
 msgstr "署名付き証明書は信頼できません"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:522
 msgid "Signature algorithm unknown"
 msgstr "署名アルゴリズムが不明です"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:524
 msgid "Signature algorithm unsupported"
 msgstr "署名アルゴリズムは未サポートです"
 
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:526
 msgid "Malformed signature"
 msgstr "おかしな署名です"
 
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:528
 msgid "Processing error"
 msgstr "処理エラーです"
 
-#: ../camel/camel-smime-context.c:569
+#: ../camel/camel-smime-context.c:573
 msgid "No signed data in signature"
 msgstr "署名の中に署名したデータがありません"
 
-#: ../camel/camel-smime-context.c:574
+#: ../camel/camel-smime-context.c:578
 msgid "Digests missing from enveloped data"
 msgstr "EnvelopedData からのダイジェストがありません"
 
-#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:598
+#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
 msgid "Cannot calculate digests"
 msgstr "ダイジェストを計算できません"
 
-#: ../camel/camel-smime-context.c:605 ../camel/camel-smime-context.c:609
+#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
 msgid "Cannot set message digests"
 msgstr "メッセージ・ダイジェストをセットできません"
 
-#: ../camel/camel-smime-context.c:619 ../camel/camel-smime-context.c:624
+#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
 msgid "Certificate import failed"
 msgstr "証明書のインポートに失敗しました"
 
-#: ../camel/camel-smime-context.c:634
+#: ../camel/camel-smime-context.c:638
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "メッセージのみ認証しますが、妥当性を検証できません"
 
-#: ../camel/camel-smime-context.c:637
+#: ../camel/camel-smime-context.c:641
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "メッセージとインポート済で検証済みの証明書のみ認証します"
 
-#: ../camel/camel-smime-context.c:641
+#: ../camel/camel-smime-context.c:645
 msgid "Cannot find signature digests"
 msgstr "証明書のダイジェストが見つかりません"
 
-#: ../camel/camel-smime-context.c:657
+#: ../camel/camel-smime-context.c:662
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "署名者: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:838 ../camel/camel-smime-context.c:1126
+#: ../camel/camel-smime-context.c:858 ../camel/camel-smime-context.c:1148
 msgid "Cannot create encoder context"
 msgstr "エンコーダーのコンテキストを作成できません"
 
-#: ../camel/camel-smime-context.c:844
+#: ../camel/camel-smime-context.c:864
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS エンコーダーへのデータの追加が失敗しました"
 
-#: ../camel/camel-smime-context.c:849 ../camel/camel-smime-context.c:1143
+#: ../camel/camel-smime-context.c:869 ../camel/camel-smime-context.c:1165
 msgid "Failed to encode data"
 msgstr "データのエンコードに失敗しました"
 
-#: ../camel/camel-smime-context.c:992 ../camel/camel-smime-context.c:1239
+#: ../camel/camel-smime-context.c:1013 ../camel/camel-smime-context.c:1262
 msgid "Decoder failed"
 msgstr "デコーダーのエラーです"
 
-#: ../camel/camel-smime-context.c:1061
+#: ../camel/camel-smime-context.c:1082
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "共通なバルク暗号化アルゴリズムが見つかりません"
 
-#: ../camel/camel-smime-context.c:1069
+#: ../camel/camel-smime-context.c:1090
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "暗号化バルク鍵のスロットを確保できません"
 
-#: ../camel/camel-smime-context.c:1080
+#: ../camel/camel-smime-context.c:1101
 msgid "Cannot create CMS Message"
 msgstr "CMS メッセージを作成できません"
 
-#: ../camel/camel-smime-context.c:1086
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS Enveloped データを作成できません"
 
-#: ../camel/camel-smime-context.c:1092
+#: ../camel/camel-smime-context.c:1113
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS Enveloped データを添付できません"
 
-#: ../camel/camel-smime-context.c:1098
+#: ../camel/camel-smime-context.c:1119
 msgid "Cannot attach CMS data object"
 msgstr "CMS データ・オブジェクトを添付できません"
 
-#: ../camel/camel-smime-context.c:1107
+#: ../camel/camel-smime-context.c:1128
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS 受領情報を作成できません"
 
-#: ../camel/camel-smime-context.c:1112
+#: ../camel/camel-smime-context.c:1133
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS 受領情報を追加できません"
 
-#: ../camel/camel-smime-context.c:1137
+#: ../camel/camel-smime-context.c:1159
 msgid "Failed to add data to encoder"
 msgstr "データのエンコーダーへの追加に失敗しました"
 
-#: ../camel/camel-smime-context.c:1246
+#: ../camel/camel-smime-context.c:1269
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME 復号化: 暗号化された内容がありません"
 
-#: ../camel/camel-store.c:1797
+#: ../camel/camel-store.c:1871
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "'%s' というフォルダーを作成できません: 既に存在しています"
 
-#: ../camel/camel-store.c:1840
-#, fuzzy, c-format
-#| msgid "Syncing folders"
+#: ../camel/camel-store.c:1914
+#, c-format
 msgid "Opening folder '%s'"
-msgstr "フォルダーの同期中"
+msgstr "フォルダー '%s' を開いています"
 
-#: ../camel/camel-store.c:2025
-#, fuzzy, c-format
-#| msgid "Scanning for changed messages in %s"
+#: ../camel/camel-store.c:2099
+#, c-format
 msgid "Scanning folders in '%s'"
-msgstr "%s にあるメッセージの解析中"
+msgstr "'%s' にあるフォルダーをスキャン中"
 
-#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2037 ../camel/camel-store.c:2047
+#: ../camel/camel-store.c:2115 ../camel/camel-store.c:2146
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ゴミ箱"
 
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2040 ../camel/camel-store.c:2051
+#: ../camel/camel-store.c:2127 ../camel/camel-store.c:2162
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ジャンク"
 
-#: ../camel/camel-store.c:2499
+#: ../camel/camel-store.c:2615
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "フォルダーを作成できません: %s: フォルダーが存在します"
 
-#: ../camel/camel-store.c:2513
-#, fuzzy, c-format
-#| msgid "Cannot get folder '%s': %s"
+#: ../camel/camel-store.c:2629
+#, c-format
 msgid "Creating folder '%s'"
-msgstr "'%s' というフォルダーを取得できません: %s"
+msgstr "フォルダー '%s' の作成中"
 
-#: ../camel/camel-store.c:2631 ../camel/camel-vee-store.c:352
-#: ../camel/providers/local/camel-maildir-store.c:300
+#: ../camel/camel-store.c:2747 ../camel/camel-vee-store.c:416
+#: ../camel/providers/local/camel-maildir-store.c:315
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "フォルダーを削除できません: %s: 無効な操作です"
 
-#: ../camel/camel-store.c:2774 ../camel/camel-vee-store.c:402
-#: ../camel/providers/local/camel-maildir-store.c:747
+#: ../camel/camel-store.c:2890 ../camel/camel-vee-store.c:466
+#: ../camel/providers/local/camel-maildir-store.c:839
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "フォルダー名を変更できません: %s: 無効な操作です"
 
-#: ../camel/camel-stream-filter.c:327
+#: ../camel/camel-stream-filter.c:334
 msgid "Only reset to beginning is supported with CamelStreamFilter"
-msgstr ""
+msgstr "CamelStreamFilter でサポートしているのは先頭へのリセットのみです"
+
+#: ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr "CamelHttpStream でサポートしているのは先頭へのリセットのみです"
 
-#: ../camel/camel-stream-process.c:267
+#: ../camel/camel-stream-process.c:275
 #, c-format
 msgid "Connection cancelled"
 msgstr "接続をキャンセルしました"
 
-#: ../camel/camel-stream-process.c:272
+#: ../camel/camel-stream-process.c:280
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "コマンド \"%s\" で接続できませんでした: %s"
 
-#: ../camel/camel-tcp-stream-raw.c:303
+#: ../camel/camel-subscribable.c:397
 #, c-format
-msgid "NSPR error code %d"
-msgstr ""
+msgid "Subscribing to folder '%s'"
+msgstr "'%s' というフォルダーにサブスクライブ中"
 
-#: ../camel/camel-tcp-stream-raw.c:640 ../camel/camel-tcp-stream-raw.c:651
+#: ../camel/camel-subscribable.c:529
 #, c-format
-msgid "The proxy host does not support SOCKS4"
+msgid "Unsubscribing from folder '%s'"
+msgstr "'%s' というフォルダーのサブスクリプションを停止中"
+
+#: ../camel/camel-tcp-stream-raw.c:310
+#, c-format
+msgid "NSPR error code %d"
+msgstr "NSPR エラーコード %d"
+
+#: ../camel/camel-tcp-stream-raw.c:649 ../camel/camel-tcp-stream-raw.c:662
+#, c-format
+msgid "The proxy host does not support SOCKS4"
 msgstr "プロキシホストは SOCKS 4 をサポートしていません"
 
-#: ../camel/camel-tcp-stream-raw.c:662
+#: ../camel/camel-tcp-stream-raw.c:675
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr "プロキシホストはリクエストを拒否しました: コード %d"
 
-#: ../camel/camel-tcp-stream-raw.c:758 ../camel/camel-tcp-stream-raw.c:764
+#: ../camel/camel-tcp-stream-raw.c:773 ../camel/camel-tcp-stream-raw.c:781
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "プロキシホストは SOCKS 5 をサポートしません"
 
-#: ../camel/camel-tcp-stream-raw.c:770
+#: ../camel/camel-tcp-stream-raw.c:789
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "適合する認証形式が見つかりませんでした: コード 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:782
+#: ../camel/camel-tcp-stream-raw.c:801
 msgid "General SOCKS server failure"
 msgstr "SOCKS サーバーの一般的な失敗です"
 
-#: ../camel/camel-tcp-stream-raw.c:783
+#: ../camel/camel-tcp-stream-raw.c:802
 msgid "SOCKS server's rules do not allow connection"
 msgstr "SOCKS サーバーのルール設定により接続が許可されません"
 
-#: ../camel/camel-tcp-stream-raw.c:784
+#: ../camel/camel-tcp-stream-raw.c:803
 msgid "Network is unreachable from SOCKS server"
 msgstr "SOCKS サーバーからネットワークに到達できません"
 
-#: ../camel/camel-tcp-stream-raw.c:785
+#: ../camel/camel-tcp-stream-raw.c:804
 msgid "Host is unreachable from SOCKS server"
 msgstr "SOCKS サーバーからホストに到達できません"
 
-#: ../camel/camel-tcp-stream-raw.c:786
+#: ../camel/camel-tcp-stream-raw.c:805
 msgid "Connection refused"
 msgstr "接続が拒否されました"
 
-#: ../camel/camel-tcp-stream-raw.c:787
+#: ../camel/camel-tcp-stream-raw.c:806
 msgid "Time-to-live expired"
 msgstr "Time-to-live の期限が切れました"
 
-#: ../camel/camel-tcp-stream-raw.c:788
+#: ../camel/camel-tcp-stream-raw.c:807
 msgid "Command not supported by SOCKS server"
 msgstr "SOCKSサーバーでサポートされないコマンドです"
 
-#: ../camel/camel-tcp-stream-raw.c:789
+#: ../camel/camel-tcp-stream-raw.c:808
 msgid "Address type not supported by SOCKS server"
 msgstr "SOCKSサーバーでサポートされないアドレス形式です"
 
-#: ../camel/camel-tcp-stream-raw.c:790
+#: ../camel/camel-tcp-stream-raw.c:809
 msgid "Unknown error from SOCKS server"
 msgstr "SOCKSサーバーからの不明なエラーです"
 
-#: ../camel/camel-tcp-stream-raw.c:823
+#: ../camel/camel-tcp-stream-raw.c:842
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "SOCKS サーバーから不明なアドレス形式を取得しました"
 
-#: ../camel/camel-tcp-stream-raw.c:841
+#: ../camel/camel-tcp-stream-raw.c:860
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "SOCKS サーバーからの応答が不完全です"
 
-#: ../camel/camel-tcp-stream-raw.c:861
+#: ../camel/camel-tcp-stream-raw.c:880
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "ホスト名が長すぎます (255 文字以下でなければいけません)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:893 ../camel/camel-tcp-stream-raw.c:903
+#: ../camel/camel-tcp-stream-raw.c:912 ../camel/camel-tcp-stream-raw.c:922
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "プロキシサーバーからの応答が無効です"
 
-#: ../camel/camel-tcp-stream-ssl.c:470
-#, fuzzy, c-format
-#| msgid ""
-#| "Issuer:            %s\n"
-#| "Subject:           %s\n"
-#| "Fingerprint:       %s\n"
-#| "Signature:         %s"
-msgid ""
-"   Issuer:       %s\n"
-"   Subject:      %s\n"
-"   Fingerprint:  %s\n"
-"   Signature:    %s"
-msgstr ""
-"発行者:            %s\n"
-"タイトル:          %s\n"
-"指紋:              %s\n"
-"署名:              %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:476
-msgid "GOOD"
-msgstr "GOOD"
-
-#: ../camel/camel-tcp-stream-ssl.c:476
-msgid "BAD"
-msgstr "BAD"
-
-#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:480
-#, c-format
-msgid ""
-"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
-"\n"
-"Detailed information about the certificate:\n"
-"%s"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-ssl.c:484
-msgid "_Reject"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-ssl.c:485
-msgid "Accept _Temporarily"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-ssl.c:486
-msgid "_Accept Permanently"
-msgstr ""
-
-#: ../camel/camel-tcp-stream-ssl.c:544
-#, c-format
-msgid ""
-"Certificate problem: %s\n"
-"Issuer: %s"
-msgstr ""
-"認証問題: %s\n"
-"発行者: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:596
-#, c-format
-msgid ""
-"Bad certificate domain: %s\n"
-"Issuer: %s"
-msgstr ""
-"おかしな認証ドメイン: %s\n"
-"発行者: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:614
-#, c-format
-msgid ""
-"Certificate expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"証明書の有効期限切れ: %s\n"
-"発行者: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:631
-#, c-format
-msgid ""
-"Certificate revocation list expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"証明書取り消し一覧の期限切れ: %s\n"
-"発行者: %s"
-
-#: ../camel/camel-url.c:330
+#: ../camel/camel-url.c:331
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "'%s' という URL を解析できませんでした"
 
-#: ../camel/camel-vee-folder.c:1286 ../camel/camel-vee-folder.c:1443
+#: ../camel/camel-vee-folder.c:494
+#, c-format
+msgid "Updating folder '%s'"
+msgstr "フォルダー '%s' の更新中"
+
+#: ../camel/camel-vee-folder.c:855 ../camel/camel-vee-folder.c:965
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "メッセージの仮想フォルダーへのコピーまたは移動ができません。"
 
-#: ../camel/camel-vee-folder.c:1319
+#: ../camel/camel-vee-folder.c:888
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%2$s にメッセージ %1$s はありません。"
 
-#: ../camel/camel-vee-folder.c:1387
+#: ../camel/camel-vee-folder.c:941
 #, c-format
 msgid "Error storing '%s': "
 msgstr "'%s' の格納中にエラー: "
 
+#: ../camel/camel-vee-folder.c:1171
+msgid "Automatically _update on change in source folders"
+msgstr "ソースフォルダー内の変更を自動的に更新する(_U)"
+
 #. Translators: 'Unmatched' is a folder name under Search folders where are shown
 #. * all messages not belonging into any other configured search folder
-#: ../camel/camel-vee-store.c:37
+#: ../camel/camel-vee-store.c:42
 msgid "Unmatched"
 msgstr "該当しないもの"
 
-#: ../camel/camel-vee-store.c:378
+#: ../camel/camel-vee-store.c:442
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "フォルダーを削除できません: %s: そのようなフォルダーはありません"
 
-#: ../camel/camel-vee-store.c:412
+#: ../camel/camel-vee-store.c:476
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "フォルダー名を変更できません: %s: そのようなフォルダーはありません"
 
+#: ../camel/camel-vee-store.c:538
+msgid "Enable _Unmatched folder"
+msgstr "一致しないフォルダーを有効にする(_U)"
+
 #: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "ゴミ箱フォルダーへメッセージをコピーできません"
@@ -3117,714 +3318,335 @@ msgstr "ゴミ箱フォルダーへメッセージをコピーできません"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ジャンク・フォルダーへメッセージをコピーできません"
 
-#: ../camel/providers/imap/camel-imap-command.c:200
-#: ../camel/providers/imap/camel-imap-command.c:297
-#, c-format
-msgid "No output stream"
-msgstr "出力ストリームはありません"
-
-#: ../camel/providers/imap/camel-imap-command.c:208
-#: ../camel/providers/imap/camel-imap-command.c:305
-#, c-format
-msgid "No input stream"
-msgstr "入力ストリームはありません"
-
-#: ../camel/providers/imap/camel-imap-command.c:382
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "突然サーバーが接続を切りました: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:415
-#, fuzzy, c-format
-#| msgid ""
-#| "Alert from IMAP server %s %s:\n"
-#| "%s"
-msgid ""
-"Alert from IMAP server %s %s in folder %s:\n"
-"%s"
-msgstr ""
-"IMAP サーバー %s %s からの警告:\n"
-"%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:419
-#, c-format
-msgid ""
-"Alert from IMAP server %s %s:\n"
-"%s"
-msgstr ""
-"IMAP サーバー %s %s からの警告:\n"
-"%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:497
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "IMAP サーバーから想定外の応答がありました: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:509
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP コマンドが失敗しました: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:589
-#, c-format
-msgid "Server response ended too soon."
-msgstr "サーバーレスポンスはあっけなく終わりました。"
-
-#: ../camel/providers/imap/camel-imap-command.c:801
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "IMAP サーバーの応答は %s 情報を含んでいません"
-
-#: ../camel/providers/imap/camel-imap-command.c:839
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "IMAP サーバーから想定外の OK 応答がありました: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:307
-msgid "Always check for new mail in this folder"
-msgstr "常にこのフォルダーにある新着メールをチェックする"
-
-#: ../camel/providers/imap/camel-imap-folder.c:383
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "フォルダー %s を作成できませんでした: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:404
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "%s のサマリをロードできませんでした"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1074
-#: ../camel/providers/imapx/camel-imapx-server.c:4236
-#, c-format
-msgid "Scanning for changed messages in %s"
-msgstr "%s にあるメッセージの解析中"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3422
-msgid "Unable to retrieve message: "
-msgstr "メッセージを回復できません: "
-
-#: ../camel/providers/imap/camel-imap-folder.c:3459
-#: ../camel/providers/imapx/camel-imapx-server.c:5484
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "%s という ID のメッセージを取得できません: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3460
-#: ../camel/providers/imapx/camel-imapx-server.c:5485
-msgid "No such message available."
-msgstr "そのようなメッセージは利用できません。"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3535
-#: ../camel/providers/imap/camel-imap-folder.c:4411
-#: ../camel/providers/nntp/camel-nntp-folder.c:446
-#, c-format
-msgid "This message is not currently available"
-msgstr "このメッセージは現在利用できません"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3992
-#: ../camel/providers/imap/camel-imap-folder.c:4075
-#: ../camel/providers/imapx/camel-imapx-server.c:4194
-#: ../camel/providers/imapx/camel-imapx-server.c:4344
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "%s にある新着メッセージのサマリ情報の同期中"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4209
-#, c-format
-msgid "Incomplete server response: no information provided for message %d"
-msgstr "不完全なサーバーの応答: メッセージ %d の情報が提供されませんでした"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4219
-#, c-format
-msgid "Incomplete server response: no UID provided for message %d"
-msgstr "不完全なサーバーの応答: メッセージ %d の UID が提供されませんでした"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4451
-#, c-format
-msgid "Could not find message body in FETCH response."
-msgstr "FETCH 応答にメッセージ本体がありませんでした。"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:196
-#: ../camel/providers/imap/camel-imap-message-cache.c:253
-msgid "Could not open cache directory: "
-msgstr "キャッシュ・フォルダーを開けませんでした: "
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:331
-#, c-format
-msgid "Failed to cache message %s: %s"
-msgstr "%s というメッセージをキャッシュできませんでした: %s"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:397
-#, c-format
-msgid "Failed to cache message %s: "
-msgstr "メッセージ %s のキャッシュに失敗しました: "
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:539
-#, c-format
-msgid "Failed to cache %s: "
-msgstr "%s のキャッシュに失敗しました: "
-
-#: ../camel/providers/imap/camel-imap-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "新着メールのチェック"
 
-#: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "C_heck for new messages in all folders"
 msgstr "すべてのフォルダーの新着メールをチェックする(_H)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "購読しているフォルダーの新着メールをチェックする(_E)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:52
-msgid "Connection to Server"
-msgstr "サーバーへ接続"
-
-#: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "_Use custom command to connect to server"
-msgstr "サーバーへ接続する際にカスタム・コマンドを使用する(_U)"
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use _Quick Resync if the server supports it"
+msgstr "サーバーがサポートするときは Quick Resync を使用する(_Q)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:52
-msgid "Co_mmand:"
-msgstr "コマンド(_M):"
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "_Listen for server change notifications"
+msgstr "サーバー変更の通知をリッスンする(_L)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:62
-#: ../camel/providers/nntp/camel-nntp-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "フォルダー"
 
-#: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
 msgid "_Show only subscribed folders"
 msgstr "購読しているフォルダーだけ表示する(_S)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:67
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "O_verride server-supplied folder namespace"
 msgstr "サーバーが提供するフォルダーのネームスペースを上書きする(_V)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:62
-msgid "Names_pace:"
-msgstr "ネームスペース(_P):"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Namespace:"
+msgstr "ネームスペース:"
 
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:42
-#: ../camel/providers/local/camel-local-provider.c:84
-#: ../camel/providers/local/camel-local-provider.c:105
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
+#: ../camel/providers/local/camel-local-provider.c:41
+#: ../camel/providers/local/camel-local-provider.c:81
+#: ../camel/providers/local/camel-local-provider.c:101
+#: ../camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Options"
 msgstr "オプション"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../camel/providers/nntp/camel-nntp-provider.c:43
+msgid "Apply _filters to new messages in all folders"
+msgstr "すべてのフォルダーの新着メッセージにフィルターを適用する(_F)"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
 msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "このサーバーの受信箱にある新しいメッセージへフィルターを適用する(_A)"
+msgstr "このサーバーの受信箱の新しいメッセージへフィルターを適用する(_A)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
-msgid "Check new messages for Jun_k contents"
-msgstr "新着メールがスパムかどうかチェックする(_K)"
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
+msgid "Check new messages for _Junk contents"
+msgstr "新着メールにスパムが含まれているかチェックする(_J)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "受信箱にあるメールだけスパムかどうかチェックする(_B)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "リモートとローカルのメールを自動的に同期する(_Z)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:78
-msgid "IMAP default port"
-msgstr ""
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
+msgid "Default IMAP port"
+msgstr "デフォルトの IMAP ポート"
 
-#: ../camel/providers/imap/camel-imap-provider.c:79
-#: ../camel/providers/imapx/camel-imapx-provider.c:87
-#, fuzzy
-#| msgid "IMAP server %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "IMAP over SSL"
-msgstr "IMAP サーバー %s"
+msgstr "IMAP over SSL"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
-msgid "IMAP"
-msgstr "IMAP"
+#: ../camel/providers/imapx/camel-imapx-provider.c:83
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap/camel-imap-provider.c:87
-#: ../camel/providers/imapx/camel-imapx-provider.c:96
+#: ../camel/providers/imapx/camel-imapx-provider.c:85
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP サーバーのメールを読んだり大切なメールを保存します。"
 
-#: ../camel/providers/imap/camel-imap-provider.c:105
-#: ../camel/providers/imapx/camel-imapx-provider.c:113
-#: ../camel/providers/nntp/camel-nntp-provider.c:80
-#: ../camel/providers/pop3/camel-pop3-provider.c:81
-msgid "Password"
-msgstr "パスワード"
+#: ../camel/providers/local/camel-local-folder.c:194
+#, c-format
+msgid "~%s (%s)"
+msgstr "~%s (%s)"
 
-#: ../camel/providers/imap/camel-imap-provider.c:107
-#: ../camel/providers/imapx/camel-imapx-provider.c:115
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"このオプションはプレイン・テキストのパスワードを使って IMAP サーバーに接続し"
-"ます。"
+#: ../camel/providers/local/camel-local-folder.c:204
+#: ../camel/providers/local/camel-local-folder.c:213
+#, c-format
+msgid "mailbox: %s (%s)"
+msgstr "mailbox: %s (%s)"
 
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:268
-#: ../camel/providers/imap/camel-imap-store.c:2646
-#: ../camel/providers/imapx/camel-imapx-store.c:367
-#: ../camel/providers/imapx/camel-imapx-store.c:823
-#: ../camel/providers/local/camel-maildir-folder.c:471
-#: ../camel/providers/local/camel-maildir-store.c:301
-#: ../camel/providers/local/camel-maildir-store.c:658
-#: ../camel/providers/local/camel-maildir-store.c:664
-#: ../camel/providers/local/camel-maildir-store.c:748
-#: ../camel/providers/local/camel-spool-store.c:378
-msgid "Inbox"
-msgstr "受信箱"
+#: ../camel/providers/local/camel-local-folder.c:222
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../camel/providers/local/camel-local-folder.c:499
+msgid "_Index message body data"
+msgstr "メール本文のインデックスを作成する(_I)"
 
-#: ../camel/providers/imap/camel-imap-store.c:401
-#: ../camel/providers/imap/camel-imap-store.c:449
-#: ../camel/providers/imapx/camel-imapx-server.c:3235
+#: ../camel/providers/local/camel-local-folder.c:727
 #, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
 msgstr ""
-"セキュリティ保護されたモードで IMAP サーバー %s への接続に失敗しました: %s"
+"メッセージ %s をフォルダー %s から取得できません\n"
+"  %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:402
-#: ../camel/providers/imapx/camel-imapx-server.c:3236
-#: ../camel/providers/smtp/camel-smtp-transport.c:189
-msgid "STARTTLS not supported"
-msgstr "STARTTLS 拡張はサポートしていません。"
+#: ../camel/providers/local/camel-local-provider.c:43
+msgid "_Use the '.folders' folder summary file (exmh)"
+msgstr "'.folders' をサマリ・ファイルとして使用する (exmh)(_U)"
 
-#: ../camel/providers/imap/camel-imap-store.c:422
-#: ../camel/providers/imapx/camel-imapx-server.c:3276
-#, fuzzy, c-format
-#| msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgid "Failed to connect to IMAP server %s in secure mode: "
-msgstr ""
-"セキュリティ保護されたモードで IMAP サーバー %s への接続に失敗しました: %s"
+#: ../camel/providers/local/camel-local-provider.c:50
+msgid "MH-format mail directories"
+msgstr "MH 形式のメール・フォルダー"
 
-#: ../camel/providers/imap/camel-imap-store.c:704
-#: ../camel/providers/imapx/camel-imapx-server.c:3347
-#, fuzzy, c-format
-#| msgid "IMAP server %s does not support requested authentication type %s"
-msgid "IMAP server %s does not support %s authentication"
-msgstr "IMAP サーバーの %s では %s という認証タイプをサポートしていません"
+#: ../camel/providers/local/camel-local-provider.c:51
+msgid "For storing local mail in MH-like mail directories."
+msgstr "ローカル・メールを MH 形式のメール・フォルダーの中に保存します。"
 
-#: ../camel/providers/imap/camel-imap-store.c:771
-#: ../camel/providers/imapx/camel-imapx-store.c:154
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP サーバー %s"
+#: ../camel/providers/local/camel-local-provider.c:68
+msgid "Local delivery"
+msgstr "ローカルの配信"
 
-#: ../camel/providers/imap/camel-imap-store.c:774
-#: ../camel/providers/imapx/camel-imapx-store.c:157
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s の %s にある IMAP サービス"
+#: ../camel/providers/local/camel-local-provider.c:69
+msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by 
Evolution."
+msgstr "ローカル・メールを収集して標準 mbox 形式のスプールから Evolution が管理するフォルダーに移動します。"
 
-#: ../camel/providers/imap/camel-imap-store.c:1068
-#: ../camel/providers/imapx/camel-imapx-server.c:3376
-#: ../camel/providers/nntp/camel-nntp-store.c:497
-#, fuzzy
-#| msgid "Cannot authenticate to server: %s"
-msgid "Cannot authenticate without a username"
-msgstr "サーバーの認証を行えません: %s"
+#: ../camel/providers/local/camel-local-provider.c:83
+#: ../camel/providers/local/camel-local-provider.c:103
+msgid "_Apply filters to new messages in Inbox"
+msgstr "受信箱にある新着メールにフィルターを適用する(_A)"
 
-#: ../camel/providers/imap/camel-imap-store.c:1076
-#: ../camel/providers/imapx/camel-imapx-server.c:3384
-#: ../camel/providers/nntp/camel-nntp-store.c:505
-#: ../camel/providers/pop3/camel-pop3-store.c:468
-#: ../camel/providers/pop3/camel-pop3-store.c:487
-#, fuzzy
-#| msgid "Authentication Failed"
-msgid "Authentication password not available"
-msgstr "認証に失敗しました"
+#: ../camel/providers/local/camel-local-provider.c:90
+msgid "Maildir-format mail directories"
+msgstr "Maildir 形式のメール・フォルダー"
 
-#: ../camel/providers/imap/camel-imap-store.c:2017
-#: ../camel/providers/imap/camel-imap-store.c:2221
-#: ../camel/providers/imapx/camel-imapx-store.c:342
-#, c-format
-msgid "No such folder %s"
-msgstr "そのようなフォルダー %s はありません"
+#: ../camel/providers/local/camel-local-provider.c:91
+msgid "For storing local mail in maildir directories."
+msgstr "ローカル・メールを Maildir 形式のフォルダーに保存します。"
 
-#: ../camel/providers/imap/camel-imap-store.c:2031
-#: ../camel/providers/imap/camel-imap-store.c:2490
-#: ../camel/providers/imapx/camel-imapx-store.c:1354
-#, c-format
+#: ../camel/providers/local/camel-local-provider.c:104
+msgid "_Store status headers in Elm/Pine/Mutt format"
+msgstr "ステータス・ヘッダーを Elm/Pine/Mutt 形式で格納する(_S)"
+
+#: ../camel/providers/local/camel-local-provider.c:111
+msgid "Standard Unix mbox spool file"
+msgstr "標準的な UNIX の mbox 形式のスプール・ファイル"
+
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:126
 msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "\"%s\" というフォルダー名に \"%c\" という文字を含めることはできません"
+"For reading and storing local mail in external standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
+msgstr ""
+"外部の標準 mbox 形式のスプール・ファイルにあるローカル・メールを読み込んだり格納します\n"
+"(Elm、Pine、Mutt 形式のフォルダーの読み込みにも対応)。"
 
-#: ../camel/providers/imap/camel-imap-store.c:2095
-#: ../camel/providers/imap/camel-imap-store.c:2554
-#: ../camel/providers/imapx/camel-imapx-store.c:1375
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "親フォルダーには複数のサブフォルダーを含めることはできません"
+#: ../camel/providers/local/camel-local-provider.c:125
+msgid "Standard Unix mbox spool directory"
+msgstr "標準的な UNIX の mbox 形式のスプール・フォルダー"
 
-#: ../camel/providers/imap/camel-imap-store.c:2148
-#: ../camel/providers/local/camel-maildir-store.c:262
-#: ../camel/providers/local/camel-mbox-store.c:421
-#: ../camel/providers/local/camel-mh-store.c:557
+#: ../camel/providers/local/camel-local-store.c:98
 #, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "'%s' というフォルダーを作成できません: 既に存在しています。"
+msgid "Could not rename folder %s to %s: %s"
+msgstr "フォルダーを %s から %s へ名前変更できませんでした: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:2503
-#: ../camel/providers/imapx/camel-imapx-store.c:1365
+#: ../camel/providers/local/camel-local-store.c:180
 #, c-format
-msgid "Unknown parent folder: %s"
-msgstr "親フォルダーを特定できません: %s"
+msgid "Local mail file %s"
+msgstr "ローカル・メールのファイル %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3275
+#: ../camel/providers/local/camel-local-store.c:223
+#: ../camel/providers/local/camel-local-store.c:383
+#: ../camel/providers/local/camel-maildir-store.c:117
+#: ../camel/providers/local/camel-mbox-store.c:581
+#: ../camel/providers/local/camel-spool-store.c:89
 #, c-format
-msgid "Server unexpectedly disconnected"
-msgstr "突然サーバーが接続を切りました"
+msgid "Store root %s is not an absolute path"
+msgstr "保存したルート %s は絶対パスではありません"
 
-#: ../camel/providers/imap/camel-imap-store.c:3278
-msgid "Server unexpectedly disconnected: "
-msgstr "突然サーバーから切断されました: "
+#: ../camel/providers/local/camel-local-store.c:232
+#, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "保存したルート %s は通常のフォルダーではありません"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:90
+#: ../camel/providers/local/camel-local-store.c:244
+#: ../camel/providers/local/camel-local-store.c:254
+#: ../camel/providers/local/camel-local-store.c:396
+#: ../camel/providers/local/camel-maildir-store.c:145
 #, c-format
-msgid "Could not create folder summary for %s"
-msgstr "%s のフォルダーサマリを作成できませんでした"
+msgid "Cannot get folder: %s: %s"
+msgstr "フォルダーを取得できません: %s: %s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:98
+#: ../camel/providers/local/camel-local-store.c:291
 #, c-format
-msgid "Could not create cache for %s: "
-msgstr "%s のキャッシュを生成できませんでした: "
+msgid "Local stores do not have an inbox"
+msgstr "ローカルへの保存では受信箱を持てません"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "Use _Quick Resync if the server supports it"
-msgstr "サーバーがサポートするときは Quick Resync を使用する(_Q)"
+#: ../camel/providers/local/camel-local-store.c:456
+#: ../camel/providers/local/camel-mbox-store.c:748
+#, c-format
+msgid "Could not delete folder index file '%s': %s"
+msgstr "'%s' というインデックス・ファイルを削除できませんでした: %s"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
-msgid "_Listen for server change notifications"
-msgstr ""
+#: ../camel/providers/local/camel-local-store.c:484
+#: ../camel/providers/local/camel-mbox-store.c:778
+#, c-format
+msgid "Could not delete folder meta file '%s': %s"
+msgstr "'%s' というメタ・ファイルを削除できませんでした: %s"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "Command:"
-msgstr "コマンド:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Numbe_r of cached connections to use"
-msgstr "キャッシュ接続の数(_R)"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:69
-msgid "Namespace:"
-msgstr "ネームスペース:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:86
-msgid "Default IMAP port"
-msgstr ""
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:94
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:1542
-msgid "Error writing to cache stream: "
-msgstr "キャッシュストリームに書き込み中にエラー: "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:2345
-#, c-format
-msgid "Not authenticated"
-msgstr "認証されていません"
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3630
-msgid "Closing tmp stream failed: "
-msgstr "作業用ストリームのクローズに失敗しました: "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:5630
-#: ../camel/providers/imapx/camel-imapx-server.c:5645
-msgid "Cannot create spool file: "
-msgstr "スプールファイルを作成できません: "
-
-#: ../camel/providers/imapx/camel-imapx-store.c:1142
-#: ../camel/providers/nntp/camel-nntp-store.c:1772
-#, c-format
-msgid "No such folder: %s"
-msgstr "そのようなフォルダーはありません: %s"
-
-#: ../camel/providers/imapx/camel-imapx-stream.c:70
-#, c-format
-msgid "Source stream returned no data"
-msgstr "ソースストリームはデータを返しませんでした"
-
-#: ../camel/providers/imapx/camel-imapx-stream.c:79
-#, c-format
-msgid "Source stream unavailable"
-msgstr "ソースストリームは利用できません"
-
-#: ../camel/providers/local/camel-local-folder.c:187
-#, c-format
-msgid "~%s (%s)"
-msgstr "~%s (%s)"
-
-#: ../camel/providers/local/camel-local-folder.c:197
-#: ../camel/providers/local/camel-local-folder.c:206
-#, c-format
-msgid "mailbox: %s (%s)"
-msgstr "mailbox: %s (%s)"
-
-#: ../camel/providers/local/camel-local-folder.c:215
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: ../camel/providers/local/camel-local-folder.c:479
-msgid "Index message body data"
-msgstr "メール本文のインデックスを作成する"
-
-#: ../camel/providers/local/camel-local-folder.c:710
-#, c-format
-msgid ""
-"Cannot get message %s from folder %s\n"
-"%s"
-msgstr ""
-"メッセージ %s をフォルダー %s から取得できません\n"
-"  %s"
-
-#: ../camel/providers/local/camel-local-provider.c:44
-msgid "_Use the '.folders' folder summary file (exmh)"
-msgstr "'.folders' をサマリ・ファイルとして使用する (exmh)(_U)"
-
-#: ../camel/providers/local/camel-local-provider.c:51
-msgid "MH-format mail directories"
-msgstr "MH 形式のメール・フォルダー"
-
-#: ../camel/providers/local/camel-local-provider.c:52
-msgid "For storing local mail in MH-like mail directories."
-msgstr "ローカル・メールを MH 形式のメール・フォルダーの中に保存します。"
-
-#: ../camel/providers/local/camel-local-provider.c:70
-msgid "Local delivery"
-msgstr "ローカルの配信"
-
-#: ../camel/providers/local/camel-local-provider.c:71
-msgid ""
-"For retrieving (moving) local mail from standard mbox-formatted spools into "
-"folders managed by Evolution."
-msgstr ""
-"ローカル・メールを収集して標準 mbox 形式のスプールから Evolution が管理する"
-"フォルダーに移動します。"
-
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:107
-msgid "_Apply filters to new messages in INBOX"
-msgstr "受信箱にある新着メールにフィルターを適用する(_A)"
-
-#: ../camel/providers/local/camel-local-provider.c:93
-msgid "Maildir-format mail directories"
-msgstr "Maildir 形式のメール・フォルダー"
-
-#: ../camel/providers/local/camel-local-provider.c:94
-msgid "For storing local mail in maildir directories."
-msgstr "ローカル・メールを Maildir 形式のフォルダーに保存します。"
-
-#: ../camel/providers/local/camel-local-provider.c:108
-msgid "_Store status headers in Elm/Pine/Mutt format"
-msgstr "ステータス・ヘッダーを Elm/Pine/Mutt 形式で格納する(_S)"
-
-#: ../camel/providers/local/camel-local-provider.c:115
-msgid "Standard Unix mbox spool file"
-msgstr "標準的な UNIX の mbox 形式のスプール・ファイル"
-
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:128
-msgid ""
-"For reading and storing local mail in external standard mbox spool files.\n"
-"May also be used to read a tree of Elm, Pine, or Mutt style folders."
-msgstr ""
-"外部の標準 mbox 形式のスプール・ファイルにあるローカル・メールを読み込んだり"
-"格納します\n"
-"(Elm、Pine、Mutt 形式のフォルダーの読み込みにも対応)。"
-
-#: ../camel/providers/local/camel-local-provider.c:127
-msgid "Standard Unix mbox spool directory"
-msgstr "標準的な UNIX の mbox 形式のスプール・フォルダー"
-
-#: ../camel/providers/local/camel-local-store.c:98
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "フォルダーを %s から %s へ名前変更できませんでした: %s"
-
-#: ../camel/providers/local/camel-local-store.c:177
-#, c-format
-msgid "Local mail file %s"
-msgstr "ローカル・メールのファイル %s"
-
-#: ../camel/providers/local/camel-local-store.c:212
-#: ../camel/providers/local/camel-local-store.c:363
-#: ../camel/providers/local/camel-maildir-store.c:101
-#: ../camel/providers/local/camel-mbox-store.c:547
-#: ../camel/providers/local/camel-spool-store.c:85
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "保存したルート %s は絶対パスではありません"
-
-#: ../camel/providers/local/camel-local-store.c:221
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "保存したルート %s は通常のフォルダーではありません"
-
-#: ../camel/providers/local/camel-local-store.c:232
-#: ../camel/providers/local/camel-local-store.c:242
-#: ../camel/providers/local/camel-local-store.c:376
-#: ../camel/providers/local/camel-maildir-store.c:133
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "フォルダーを取得できません: %s: %s"
-
-#: ../camel/providers/local/camel-local-store.c:274
-#, c-format
-msgid "Local stores do not have an inbox"
-msgstr "ローカルへの保存では受信箱を持てません"
-
-#: ../camel/providers/local/camel-local-store.c:431
-#: ../camel/providers/local/camel-mbox-store.c:721
-#, c-format
-msgid "Could not delete folder index file '%s': %s"
-msgstr "'%s' というインデックス・ファイルを削除できませんでした: %s"
-
-#: ../camel/providers/local/camel-local-store.c:459
-#: ../camel/providers/local/camel-mbox-store.c:751
-#, c-format
-msgid "Could not delete folder meta file '%s': %s"
-msgstr "'%s' というメタ・ファイルを削除できませんでした: %s"
-
-#: ../camel/providers/local/camel-local-store.c:565
+#: ../camel/providers/local/camel-local-store.c:596
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' の名前を変更できませんでした: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:527
+#: ../camel/providers/local/camel-local-summary.c:567
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "メッセージをサマリへ追加できません: 原因は不明です"
 
 #: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:336
+#: ../camel/providers/local/camel-maildir-folder.c:335
 #: ../camel/providers/local/camel-mbox-folder.c:117
 #: ../camel/providers/local/camel-mbox-folder.c:329
-#: ../camel/providers/local/camel-mh-folder.c:160
+#: ../camel/providers/local/camel-mh-folder.c:159
 msgid "No such message"
 msgstr "そのようなメッセージはありません"
 
-#: ../camel/providers/local/camel-maildir-folder.c:226
+#: ../camel/providers/local/camel-maildir-folder.c:225
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "Maildir 形式のフォルダーへメッセージを追加できません: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:284
+#: ../camel/providers/local/camel-maildir-folder.c:273
+#: ../camel/providers/local/camel-maildir-folder.c:283
 #: ../camel/providers/local/camel-mbox-folder.c:390
-#: ../camel/providers/local/camel-mh-folder.c:172
-#: ../camel/providers/local/camel-mh-folder.c:182
+#: ../camel/providers/local/camel-mh-folder.c:171
+#: ../camel/providers/local/camel-mh-folder.c:181
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "メッセージ %s をフォルダー %s から取得できません: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:354
+#: ../camel/providers/local/camel-maildir-folder.c:353
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "指定のフォルダーにメッセージを転送できません: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:109
-#, c-format
-msgid "Cannot create folder: %s : Folder name cannot contain a dot"
-msgstr ""
-"フォルダーを作成できません: %s: フォルダー名にドットを含むことはできません"
-
-#: ../camel/providers/local/camel-maildir-store.c:118
-#: ../camel/providers/local/camel-maildir-store.c:765
+#: ../camel/providers/local/camel-maildir-store.c:125
+#: ../camel/providers/local/camel-maildir-store.c:848
 #, c-format
 msgid "Folder %s already exists"
 msgstr "既にフォルダー %s があります"
 
-#: ../camel/providers/local/camel-maildir-store.c:209
-#: ../camel/providers/local/camel-maildir-store.c:240
-#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-maildir-store.c:230
+#: ../camel/providers/local/camel-maildir-store.c:261
 #: ../camel/providers/local/camel-mbox-store.c:403
+#: ../camel/providers/local/camel-mbox-store.c:424
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "'%s' というフォルダーを作成できません: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:224
-#: ../camel/providers/local/camel-mbox-store.c:355
-#: ../camel/providers/local/camel-mh-store.c:512
+#: ../camel/providers/local/camel-maildir-store.c:245
+#: ../camel/providers/local/camel-mbox-store.c:369
+#: ../camel/providers/local/camel-mh-store.c:522
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "'%s' というフォルダーを取得できません: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:230
-#: ../camel/providers/local/camel-mbox-store.c:365
-#: ../camel/providers/local/camel-mh-store.c:521
+#: ../camel/providers/local/camel-maildir-store.c:251
+#: ../camel/providers/local/camel-mbox-store.c:379
+#: ../camel/providers/local/camel-mh-store.c:531
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "'%s' というフォルダーを取得できません: フォルダーが存在しません。"
 
-#: ../camel/providers/local/camel-maildir-store.c:257
+#: ../camel/providers/local/camel-maildir-store.c:278
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
-msgstr ""
-"'%s' というフォルダーを取得できません: maildir フォルダーが存在しません。"
+msgstr "'%s' というフォルダーを取得できません: maildir フォルダーが存在しません。"
+
+#: ../camel/providers/local/camel-maildir-store.c:283
+#: ../camel/providers/local/camel-mbox-store.c:442
+#: ../camel/providers/local/camel-mh-store.c:564
+#, c-format
+msgid "Cannot create folder '%s': folder exists."
+msgstr "'%s' というフォルダーを作成できません: 既に存在しています。"
 
-#: ../camel/providers/local/camel-maildir-store.c:321
-#: ../camel/providers/local/camel-maildir-store.c:361
-#: ../camel/providers/local/camel-mh-store.c:664
+#: ../camel/providers/local/camel-maildir-store.c:347
+#: ../camel/providers/local/camel-maildir-store.c:387
+#: ../camel/providers/local/camel-mh-store.c:682
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "'%s' というフォルダーを削除できませんでした: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:323
+#: ../camel/providers/local/camel-maildir-store.c:349
 msgid "not a maildir directory"
 msgstr "maildir 形式のフォルダーではありません"
 
-#: ../camel/providers/local/camel-maildir-store.c:556
-#: ../camel/providers/local/camel-maildir-store.c:952
-#: ../camel/providers/local/camel-spool-store.c:204
-#: ../camel/providers/local/camel-spool-store.c:223
+#: ../camel/providers/local/camel-maildir-store.c:628
+#: ../camel/providers/local/camel-maildir-store.c:1063
+#: ../camel/providers/local/camel-spool-store.c:212
+#: ../camel/providers/local/camel-spool-store.c:231
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "'%s' というフォルダーをスキャンできませんでした: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:756
-#, c-format
-msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
-msgstr ""
-"フォルダーの名前を変更できません: %s: フォルダー名にドットを含むことはできま"
-"せん"
-
-#: ../camel/providers/local/camel-maildir-summary.c:413
-#: ../camel/providers/local/camel-maildir-summary.c:546
+#: ../camel/providers/local/camel-maildir-summary.c:458
+#: ../camel/providers/local/camel-maildir-summary.c:591
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir フォルダーのパスを開けませんでした: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:537
+#: ../camel/providers/local/camel-maildir-summary.c:582
 msgid "Checking folder consistency"
 msgstr "フォルダーの整合性の確認中"
 
-#: ../camel/providers/local/camel-maildir-summary.c:630
+#: ../camel/providers/local/camel-maildir-summary.c:675
 msgid "Checking for new messages"
 msgstr "新しいメッセージのチェック"
 
-#: ../camel/providers/local/camel-maildir-summary.c:725
-#: ../camel/providers/local/camel-mbox-summary.c:418
-#: ../camel/providers/local/camel-mbox-summary.c:649
-#: ../camel/providers/local/camel-mbox-summary.c:795
-#: ../camel/providers/local/camel-spool-summary.c:130
+#: ../camel/providers/local/camel-maildir-summary.c:770
+#: ../camel/providers/local/camel-mbox-summary.c:450
+#: ../camel/providers/local/camel-mbox-summary.c:682
+#: ../camel/providers/local/camel-mbox-summary.c:830
+#: ../camel/providers/local/camel-spool-summary.c:141
 msgid "Storing folder"
 msgstr "フォルダーに格納する"
 
@@ -3843,39 +3665,39 @@ msgid "The folder appears to be irrecoverably corrupted."
 msgstr "フォルダーで回復できないエラーが発生したようです。"
 
 #: ../camel/providers/local/camel-mbox-folder.c:439
-#: ../camel/providers/local/camel-spool-folder.c:70
+#: ../camel/providers/local/camel-spool-folder.c:69
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s のフォルダー・ロックを生成できません: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:377
-#: ../camel/providers/local/camel-mbox-store.c:555
+#: ../camel/providers/local/camel-mbox-store.c:391
+#: ../camel/providers/local/camel-mbox-store.c:589
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "そのような名前でフォルダーを作成できません。"
 
-#: ../camel/providers/local/camel-mbox-store.c:414
+#: ../camel/providers/local/camel-mbox-store.c:435
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "'%s' というフォルダーを取得できません: 通常のファイルではありません。"
 
-#: ../camel/providers/local/camel-mbox-store.c:571
+#: ../camel/providers/local/camel-mbox-store.c:605
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "'%s' というフォルダーを作成できません: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:587
+#: ../camel/providers/local/camel-mbox-store.c:617
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "フォルダーを作成できません: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:589
+#: ../camel/providers/local/camel-mbox-store.c:619
 msgid "Folder already exists"
 msgstr "既にフォルダーがあります"
 
-#: ../camel/providers/local/camel-mbox-store.c:632
-#: ../camel/providers/local/camel-mbox-store.c:645
-#: ../camel/providers/local/camel-mbox-store.c:674
+#: ../camel/providers/local/camel-mbox-store.c:659
+#: ../camel/providers/local/camel-mbox-store.c:672
+#: ../camel/providers/local/camel-mbox-store.c:701
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3884,172 +3706,166 @@ msgstr ""
 "'%s' というフォルダーを削除できませんでした:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:655
+#: ../camel/providers/local/camel-mbox-store.c:682
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' は通常のファイルではありません。"
 
-#: ../camel/providers/local/camel-mbox-store.c:664
+#: ../camel/providers/local/camel-mbox-store.c:691
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "'%s' というフォルダーは空ではないので削除しません。"
 
-#: ../camel/providers/local/camel-mbox-store.c:691
-#: ../camel/providers/local/camel-mbox-store.c:706
+#: ../camel/providers/local/camel-mbox-store.c:718
+#: ../camel/providers/local/camel-mbox-store.c:733
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "'%s' というサマリ・ファイルを削除できませんでした: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:788
+#: ../camel/providers/local/camel-mbox-store.c:815
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "新しいフォルダーの名前は正しくありません。"
 
-#: ../camel/providers/local/camel-mbox-store.c:804
+#: ../camel/providers/local/camel-mbox-store.c:831
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "'%s' の名前を変更できませんでした: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:887
+#: ../camel/providers/local/camel-mbox-store.c:915
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s' から %s へ名前を変更できませんでした: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:428
+#: ../camel/providers/local/camel-mbox-summary.c:460
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "フォルダーを開けませんでした: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:490
+#: ../camel/providers/local/camel-mbox-summary.c:522
 #, c-format
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "フォルダー %2$s の %1$s 付近で致命的なメール構文解析エラーです"
 
-#: ../camel/providers/local/camel-mbox-summary.c:574
+#: ../camel/providers/local/camel-mbox-summary.c:607
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "フォルダーをチェックできません: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:662
-#: ../camel/providers/local/camel-mbox-summary.c:804
-#: ../camel/providers/local/camel-spool-summary.c:137
+#: ../camel/providers/local/camel-mbox-summary.c:695
+#: ../camel/providers/local/camel-mbox-summary.c:839
+#: ../camel/providers/local/camel-spool-summary.c:148
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ファイルを開けませんでした: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:676
-#: ../camel/providers/local/camel-spool-summary.c:152
+#: ../camel/providers/local/camel-mbox-summary.c:709
+#: ../camel/providers/local/camel-spool-summary.c:163
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "作業用の mailbox を開けませんでした: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:693
-#: ../camel/providers/local/camel-mbox-summary.c:920
+#: ../camel/providers/local/camel-mbox-summary.c:726
+#: ../camel/providers/local/camel-mbox-summary.c:956
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "元のフォルダー %s を閉じることができませんでした: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:704
+#: ../camel/providers/local/camel-mbox-summary.c:739
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "作業用フォルダーを閉じることができませんでした: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:721
+#: ../camel/providers/local/camel-mbox-summary.c:758
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "フォルダー名を変更できませんでした: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:818
-#: ../camel/providers/local/camel-mbox-summary.c:1086
+#: ../camel/providers/local/camel-mbox-summary.c:853
+#: ../camel/providers/local/camel-mbox-summary.c:1122
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "フォルダーを保存できませんでした: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:857
-#: ../camel/providers/local/camel-mbox-summary.c:1117
+#: ../camel/providers/local/camel-mbox-summary.c:892
+#: ../camel/providers/local/camel-mbox-summary.c:1162
 #, c-format
-msgid ""
-"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
-"it.)"
-msgstr ""
-"MBOX ファイルが壊れています (差出人の行を得るはずですが、できませんでした)。"
-"修正してください。"
+msgid "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get it.)"
+msgstr "MBOX ファイルが壊れています (差出人の行を得るはずですが、できませんでした)。修正してください。"
 
-#: ../camel/providers/local/camel-mbox-summary.c:866
-#: ../camel/providers/local/camel-mbox-summary.c:1126
+#: ../camel/providers/local/camel-mbox-summary.c:902
+#: ../camel/providers/local/camel-mbox-summary.c:1174
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "サマリとフォルダーが一致しませんでした (同期しても)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1031
-#: ../camel/providers/local/camel-spool-summary.c:345
+#: ../camel/providers/local/camel-mbox-summary.c:1067
+#: ../camel/providers/local/camel-spool-summary.c:356
 #, c-format
 msgid "Unknown error: %s"
 msgstr "原因不明のエラー: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1184
-#: ../camel/providers/local/camel-mbox-summary.c:1214
+#: ../camel/providers/local/camel-mbox-summary.c:1232
+#: ../camel/providers/local/camel-mbox-summary.c:1262
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "作業用の mailbox に書き込めませんでした: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1203
+#: ../camel/providers/local/camel-mbox-summary.c:1251
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "作業用の mailbox に書き込めませんでした: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:119
+#: ../camel/providers/local/camel-mh-folder.c:118
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "MH 形式フォルダーへメッセージを追加できません: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:532
+#: ../camel/providers/local/camel-mh-store.c:541
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "'%s' というフォルダーを作成できませんでした: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:549
+#: ../camel/providers/local/camel-mh-store.c:557
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "'%s' というフォルダーを取得できません: フォルダーではありません。"
 
-#: ../camel/providers/local/camel-mh-summary.c:226
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH フォルダーのパスを開けません: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:94
+#: ../camel/providers/local/camel-spool-store.c:97
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "'%s' というスプールを開けません: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:108
+#: ../camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "'%s' というスプールは通常のファイルまたはフォルダーではありません"
 
-#: ../camel/providers/local/camel-spool-store.c:407
+#: ../camel/providers/local/camel-spool-store.c:425
 #, c-format
 msgid "Spool mail file %s"
 msgstr "スプール・メール・ファイル %s"
 
-#: ../camel/providers/local/camel-spool-store.c:411
+#: ../camel/providers/local/camel-spool-store.c:429
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "スプール・フォルダー・ツリー %s"
 
-#: ../camel/providers/local/camel-spool-store.c:414
-#, fuzzy
-#| msgid "Invalid source"
+#: ../camel/providers/local/camel-spool-store.c:432
 msgid "Invalid spool"
-msgstr "ソースが無効です"
+msgstr "スプールが無効です"
 
-#: ../camel/providers/local/camel-spool-store.c:469
+#: ../camel/providers/local/camel-spool-store.c:492
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "'%s/%s' というフォルダーが存在しません。"
 
-#: ../camel/providers/local/camel-spool-store.c:482
+#: ../camel/providers/local/camel-spool-store.c:505
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4058,12 +3874,12 @@ msgstr ""
 "'%s' というフォルダーを開けませんでした:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:488
+#: ../camel/providers/local/camel-spool-store.c:511
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "'%s' というフォルダーが存在しません。"
 
-#: ../camel/providers/local/camel-spool-store.c:495
+#: ../camel/providers/local/camel-spool-store.c:519
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4072,41 +3888,41 @@ msgstr ""
 "'%s' というフォルダーを作成できませんでした:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:507
+#: ../camel/providers/local/camel-spool-store.c:532
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' はメールボックス・ファイルではありません。"
 
-#: ../camel/providers/local/camel-spool-store.c:569
+#: ../camel/providers/local/camel-spool-store.c:596
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "受信箱への格納をサポートしていません"
 
-#: ../camel/providers/local/camel-spool-store.c:588
+#: ../camel/providers/local/camel-spool-store.c:615
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "スプール・フォルダーは削除できません"
 
-#: ../camel/providers/local/camel-spool-store.c:603
+#: ../camel/providers/local/camel-spool-store.c:630
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "スプール・フォルダーの名前は変更できません"
 
-#: ../camel/providers/local/camel-spool-summary.c:168
-#: ../camel/providers/local/camel-spool-summary.c:180
-#: ../camel/providers/local/camel-spool-summary.c:192
+#: ../camel/providers/local/camel-spool-summary.c:179
+#: ../camel/providers/local/camel-spool-summary.c:191
+#: ../camel/providers/local/camel-spool-summary.c:203
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "作業用フォルダー %s を同期できませんでした: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:210
+#: ../camel/providers/local/camel-spool-summary.c:221
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "スプール・フォルダー %s を同期できませんでした: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:242
-#: ../camel/providers/local/camel-spool-summary.c:261
-#: ../camel/providers/local/camel-spool-summary.c:274
+#: ../camel/providers/local/camel-spool-summary.c:253
+#: ../camel/providers/local/camel-spool-summary.c:272
+#: ../camel/providers/local/camel-spool-summary.c:285
 #, c-format
 msgid ""
 "Could not synchronize spool folder %s: %s\n"
@@ -4115,101 +3931,106 @@ msgstr ""
 "%s というスプール・フォルダーと同期できませんでした: %s\n"
 "フォルダーが壊れている可能性があります。そのコピーを '%s' に保存しました。"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:221
-#: ../camel/providers/nntp/camel-nntp-folder.c:310
-#: ../camel/providers/nntp/camel-nntp-folder.c:432
+#: ../camel/providers/nntp/camel-nntp-folder.c:278
+#: ../camel/providers/nntp/camel-nntp-folder.c:360
+#: ../camel/providers/nntp/camel-nntp-folder.c:481
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "内部エラー: UID の書式が無効です: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:271
-#: ../camel/providers/nntp/camel-nntp-folder.c:275
-#: ../camel/providers/pop3/camel-pop3-folder.c:443
-#: ../camel/providers/pop3/camel-pop3-folder.c:724
+#: ../camel/providers/nntp/camel-nntp-folder.c:328
+#: ../camel/providers/nntp/camel-nntp-folder.c:332
+#: ../camel/providers/pop3/camel-pop3-folder.c:633
+#: ../camel/providers/pop3/camel-pop3-folder.c:1065
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "メッセージ %s を取得できません: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:282
-#: ../camel/providers/nntp/camel-nntp-folder.c:457
-#: ../camel/providers/pop3/camel-pop3-folder.c:381
-#: ../camel/providers/pop3/camel-pop3-folder.c:433
-#: ../camel/providers/pop3/camel-pop3-folder.c:452
+#: ../camel/providers/nntp/camel-nntp-folder.c:339
+#: ../camel/providers/nntp/camel-nntp-folder.c:504
+#: ../camel/providers/pop3/camel-pop3-folder.c:558
+#: ../camel/providers/pop3/camel-pop3-folder.c:623
+#: ../camel/providers/pop3/camel-pop3-folder.c:642
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "メッセージ %s を取得できません: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:516
-#: ../camel/providers/nntp/camel-nntp-folder.c:522
-#: ../camel/providers/nntp/camel-nntp-folder.c:569
+#: ../camel/providers/nntp/camel-nntp-folder.c:493
+#, c-format
+msgid "This message is not currently available"
+msgstr "このメッセージは現在利用できません"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:559
+#: ../camel/providers/nntp/camel-nntp-folder.c:565
+#: ../camel/providers/nntp/camel-nntp-folder.c:611
 #, c-format
 msgid "Posting failed: %s"
 msgstr "投稿に失敗しました: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:564
+#: ../camel/providers/nntp/camel-nntp-folder.c:606
 msgid "Posting failed: "
 msgstr "投稿に失敗しました: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:593
+#: ../camel/providers/nntp/camel-nntp-folder.c:633
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "オフライン状態の間は NNTP メッセージを投稿できません!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:613
+#: ../camel/providers/nntp/camel-nntp-folder.c:653
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "NNTP フォルダーからメッセージのコピーはできません!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid ""
-"_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr ""
-"フォルダー名を短く表記する (例: \"comp.os.linux\" => \"c.o.linux\")(_S)"
+#: ../camel/providers/nntp/camel-nntp-provider.c:48
+msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr "フォルダー名を短く表記する (例: \"comp.os.linux\" => \"c.o.linux\")(_S)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:51
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "関連するフォルダー名を購読ダイアログに表示する(_D)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:52
+#: ../camel/providers/nntp/camel-nntp-provider.c:57
 msgid "Default NNTP port"
-msgstr ""
+msgstr "デフォルトの NNTP ポート"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:53
+#: ../camel/providers/nntp/camel-nntp-provider.c:58
 msgid "NNTP over SSL"
-msgstr ""
+msgstr "NNTP over SSL"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:59
+#: ../camel/providers/nntp/camel-nntp-provider.c:64
 msgid "USENET news"
 msgstr "USENET ニュース"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:61
+#: ../camel/providers/nntp/camel-nntp-provider.c:66
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "USENET のニュースグループを購読したり投稿します。"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:82
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"このオプションはプレイン・テキストのパスワードを使って NNTP サーバーで認証し"
-"ます。"
+#: ../camel/providers/nntp/camel-nntp-provider.c:87
+#, fuzzy
+#| msgid "This option will connect to the server using Kerberos 5 authentication."
+msgid "This option will connect to the NNTP server anonymously, without authentication."
+msgstr "このオプションは Kerberos 5 認証を使ってサーバーに接続します。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:285
+#: ../camel/providers/nntp/camel-nntp-provider.c:97
+msgid "This option will authenticate with the NNTP server using a plaintext password."
+msgstr "このオプションはプレイン・テキストのパスワードを使って NNTP サーバーで認証します。"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:333
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "%s からの挨拶を読むことができませんでした: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:297
+#: ../camel/providers/nntp/camel-nntp-store.c:345
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP サーバー %s がエラーコード %d を返しました: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:464
+#: ../camel/providers/nntp/camel-nntp-store.c:522
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s 経由の USENET ニュース"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1054
+#: ../camel/providers/nntp/camel-nntp-store.c:1123
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4220,26 +4041,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1147
+#: ../camel/providers/nntp/camel-nntp-store.c:1217
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr ""
-"ニュース・ストアにフォルダーを生成できません: 代わりに購読を申請してくださ"
-"い。"
+msgstr "ニュース・ストアにフォルダーを生成できません: 代わりに購読を申請してください。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1163
+#: ../camel/providers/nntp/camel-nntp-store.c:1233
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "ニュース格納場所のフォルダー名を変更できません。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1186
+#: ../camel/providers/nntp/camel-nntp-store.c:1256
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
-"ニュース格納場所のフォルダーを削除できません: 代わりに購読を停止してくださ"
-"い。"
+msgstr "ニュース格納場所のフォルダーを削除できません: 代わりに購読を停止してください。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1384
+#: ../camel/providers/nntp/camel-nntp-store.c:1455
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4248,10 +4065,9 @@ msgid ""
 msgstr ""
 "このニュースグループは購読できません:\n"
 "\n"
-"そのようなニュースグループはありません。選択したアイテムは親フォルダーのもの"
-"かもしれません。"
+"そのようなニュースグループはありません。選択したアイテムは親フォルダーのものかもしれません。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1435
+#: ../camel/providers/nntp/camel-nntp-store.c:1503
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4262,72 +4078,77 @@ msgstr ""
 "\n"
 "ニュースグループがありません!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1629
+#: ../camel/providers/nntp/camel-nntp-store.c:1707
 msgid "NNTP Command failed: "
 msgstr "NNTP コマンドが失敗しました: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1714
+#: ../camel/providers/nntp/camel-nntp-store.c:1794
 #, c-format
 msgid "Not connected."
 msgstr "接続していません。"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:192
-#: ../camel/providers/nntp/camel-nntp-summary.c:312
+#: ../camel/providers/nntp/camel-nntp-store.c:1856
+#, c-format
+msgid "No such folder: %s"
+msgstr "そのようなフォルダーはありません: %s"
+
+#: ../camel/providers/nntp/camel-nntp-summary.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:328
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: 新しいメッセージの解析中"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:208
+#: ../camel/providers/nntp/camel-nntp-summary.c:216
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover から想定外の応答がありました: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:328
+#: ../camel/providers/nntp/camel-nntp-summary.c:346
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "head から想定外の応答がありました: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:373
+#: ../camel/providers/nntp/camel-nntp-summary.c:393
 #, c-format
 msgid "Operation failed: %s"
 msgstr "操作が失敗しました: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:290
-#: ../camel/providers/pop3/camel-pop3-folder.c:349
+#: ../camel/providers/pop3/camel-pop3-folder.c:453
+#: ../camel/providers/pop3/camel-pop3-folder.c:526
 #, c-format
 msgid "No message with UID %s"
 msgstr "UID %s のメッセージはありません"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:365
+#: ../camel/providers/pop3/camel-pop3-folder.c:542
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "メッセージ %d を POP で取得中"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:444
+#: ../camel/providers/pop3/camel-pop3-folder.c:634
 msgid "Unknown reason"
 msgstr "原因不明"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:492
+#: ../camel/providers/pop3/camel-pop3-folder.c:682
 msgid "Retrieving POP summary"
 msgstr "POP サマリの取得中"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:507
-#, fuzzy
-#| msgid "Cannot get POP summary: %s"
+#: ../camel/providers/pop3/camel-pop3-folder.c:741
+#: ../camel/providers/pop3/camel-pop3-folder.c:744
+#: ../camel/providers/pop3/camel-pop3-folder.c:757
+#: ../camel/providers/pop3/camel-pop3-folder.c:770
+#: ../camel/providers/pop3/camel-pop3-folder.c:784
 msgid "Cannot get POP summary: "
-msgstr "POP サマリを取得できません: %s"
+msgstr "POP サマリを取得できません: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:576
+#: ../camel/providers/pop3/camel-pop3-folder.c:891
 msgid "Expunging old messages"
 msgstr "古いメッセージの抹消中"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:596
+#: ../camel/providers/pop3/camel-pop3-folder.c:911
 msgid "Expunging deleted messages"
 msgstr "ローカルで削除済みのメッセージの抹消中"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
-#, fuzzy
-#| msgid "Message storage"
 msgid "Message Storage"
 msgstr "メッセージの格納"
 
@@ -4335,133 +4156,113 @@ msgstr "メッセージの格納"
 msgid "_Leave messages on server"
 msgstr "サーバーにメッセージを残す(_L)"
 
-#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on 
the server
-#: ../camel/providers/pop3/camel-pop3-provider.c:44
+#. Translators: '%s' is replaced with a widget, where user can
+#. * select how many days can be message left on the server.
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "%s 日後に削除する(_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:46
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
 msgid "Delete _expunged from local Inbox"
 msgstr "ローカルの受信箱で消したメールを削除する(_E)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:48
+#: ../camel/providers/pop3/camel-pop3-provider.c:49
 msgid "Disable _support for all POP3 extensions"
 msgstr "すべての POP3 拡張サポートを無効にする(_S)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:54
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "Default POP3 port"
-msgstr ""
+msgstr "デフォルトの POP3 ポート"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
-#, fuzzy
-#| msgid "POP3 server %s"
+#: ../camel/providers/pop3/camel-pop3-provider.c:56
 msgid "POP3 over SSL"
-msgstr "POP サーバー %s"
+msgstr "POP3 over SSL"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:62
+#: ../camel/providers/pop3/camel-pop3-provider.c:63
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:64
+#: ../camel/providers/pop3/camel-pop3-provider.c:65
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "POP サーバーに接続したりメールを読んだりします。"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"このオプションはプレイン・テキストのパスワードを使って POP サーバーへ接続しま"
-"す。これは多くの POP サーバーでサポートされるオプションです。"
+#: ../camel/providers/pop3/camel-pop3-provider.c:85
+msgid "This option will connect to the POP server using a plaintext password. This is the only option 
supported by many POP servers."
+msgstr "このオプションはプレイン・テキストのパスワードを使って POP サーバーへ接続します。これは多くの POP サーバーでサポートされるオプションです。"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:93
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"このオプションは APOP プロトコル経由で暗号化されたパスワードを使って POP サー"
-"バーへ接続します。これは、たとえ APOP 対応を謳っているサーバーであっても、す"
-"べてのユーザーが正常に動作するわけではありません。"
+#: ../camel/providers/pop3/camel-pop3-provider.c:95
+msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This 
may not work for all users even on servers that claim to support it."
+msgstr "このオプションは APOP プロトコル経由で暗号化されたパスワードを使って POP サーバーへ接続します。これは、たとえ APOP 
対応を謳っているサーバーであっても、すべてのユーザーが正常に動作するわけではありません。"
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:83
+#: ../camel/providers/pop3/camel-pop3-store.c:89
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:133
+#: ../camel/providers/pop3/camel-pop3-store.c:150
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP サーバー %s から妥当な挨拶の読み込みが失敗しました"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:152
+#: ../camel/providers/pop3/camel-pop3-store.c:165
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr ""
-"セキュリティ保護されたモードで POP サーバー %s への接続に失敗しました: %s"
+msgstr "セキュリティ保護されたモードで POP サーバー %s への接続に失敗しました: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:153
+#: ../camel/providers/pop3/camel-pop3-store.c:166
 msgid "STLS not supported by server"
 msgstr "サーバーは STLS 拡張をサポートしていません"
 
-#. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:171
+#. Translators: Last %s is an optional
+#. * explanation beginning with ": " separator.
+#: ../camel/providers/pop3/camel-pop3-store.c:187
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "セキュリティ保護モードでの POP サーバー %s への接続に失敗しました%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:184
-#, fuzzy, c-format
-#| msgid "Failed to connect to POP server %s in secure mode: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:200
+#, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
-msgstr ""
-"セキュリティ保護されたモードで POP サーバー %s への接続に失敗しました: %s"
+msgstr "セキュリティ保護されたモードで POP サーバー %s への接続に失敗しました: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:280
+#: ../camel/providers/pop3/camel-pop3-store.c:311
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP サーバー %s へログインできません: SASL プロトコル・エラーです"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:302
+#: ../camel/providers/pop3/camel-pop3-store.c:333
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "POP サーバー %s で認証に失敗しました: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:347
+#: ../camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid "POP3 server %s"
-msgstr "POP サーバー %s"
+msgstr "POP3 サーバー %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:350
+#: ../camel/providers/pop3/camel-pop3-store.c:438
 #, c-format
 msgid "POP3 server for %s on %s"
-msgstr "%s の %s にある POP サーバー"
+msgstr "%s の %s にある POP3 サーバー"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:500
+#: ../camel/providers/pop3/camel-pop3-store.c:613
 #, c-format
-msgid ""
-"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
-"attack suspected. Please contact your admin."
-msgstr ""
-"POP サーバー %s へ接続できません:\t無効な APOP ID を受け取りました; 詐称攻撃"
-"の可能性があるので管理者に連絡してください。"
+msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please 
contact your admin."
+msgstr "POP サーバー %s へ接続できません:\t無効な APOP ID を受け取りました; 詐称攻撃の可能性があるので管理者に連絡してください。"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:548
-#, fuzzy, c-format
-#| msgid ""
-#| "Unable to connect to POP server %s.\n"
-#| "Error sending password: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:665
+#, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: "
 msgstr ""
 "POP サーバー %s に接続できません。\n"
-"パスワードの送信中にエラー: %s"
+"パスワードの送信中にエラー: "
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:563
+#: ../camel/providers/pop3/camel-pop3-store.c:680
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4470,87 +4271,84 @@ msgstr ""
 "POP サーバー %s に接続できません。\n"
 "ユーザー名の送信中にエラー%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:617
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "POP サーバー %s へ接続できませんでした"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:643
+#: ../camel/providers/pop3/camel-pop3-store.c:751
 #, c-format
 msgid "No such folder '%s'."
 msgstr "'%s' というフォルダーは存在しません。"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:660
+#: ../camel/providers/pop3/camel-pop3-store.c:768
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 ストアはフォルダーの階層構造を持ちません"
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:36
+#: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
 msgstr "Sendmail"
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"メールを配送するためにローカルシステムの \"sendmail\" プログラムへ渡します。"
+msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
+msgstr "メールを配送するためにローカルシステムの \"sendmail\" プログラムへ渡します。"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:52
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail 経由でメールを配信"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "返信リストを解析できませんでした"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#, fuzzy, c-format
+#| msgid "Could not parse recipient list"
+msgid "Could not parse arguments"
+msgstr "返信リストを解析できませんでした"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:213
 #, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "sendmail へパイプを作成できませんでした: %s: メールを送信しません"
+msgid "Could not create pipe to '%s': %s: mail not sent"
+msgstr "'%s' へのパイプを作成できませんでした: %s: メールは送信されません"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:238
 #, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "sendmail を fork(2) できませんでした: %s: メールを送信しません"
+msgid "Could not fork '%s': %s: mail not sent"
+msgstr "'%s' を fork できませんでした: %s: メールは送信されません"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:287
 msgid "Could not send message: "
 msgstr "メッセージを送信できませんでした: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:317
 #, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail はシグナル %s で終了しました: メールを送信しません。"
+msgid "'%s' exited with signal %s: mail not sent."
+msgstr "'%s' はシグナル %s で終了しました: メールは送信されません。"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:327
 #, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "%s を実行できませんでした: メールを送信しません"
+msgid "Could not execute '%s': mail not sent."
+msgstr "'%s' を実行できませんでした。"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:332
 #, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail はステータス %d で終了しました: メールを送信しません。"
+msgid "'%s' exited with status %d: mail not sent."
+msgstr "'%s' はステータス %d で終了しました: メールは送信されません。"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:42
 msgid "Default SMTP port"
-msgstr ""
+msgstr "デフォルトの SMTP ポート"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:43
-#, fuzzy
-#| msgid "SMTP server %s"
 msgid "SMTP over SSL"
-msgstr "SMTP サーバー %s"
+msgstr "SMTP over SSL"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:44
 msgid "Message submission port"
-msgstr ""
+msgstr "メッセージのサブミッションポート"
 
 #: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "SMTP"
@@ -4560,735 +4358,1922 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "SMTP を使ってリモートのメールハブに接続することでメールを配信します。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:147
-#: ../camel/providers/smtp/camel-smtp-transport.c:154
+#: ../camel/providers/smtp/camel-smtp-transport.c:160
+#: ../camel/providers/smtp/camel-smtp-transport.c:168
 msgid "Welcome response error: "
 msgstr "Welcome 応答エラー: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:207
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr ""
-"セキュリティ保護されたモードで SMTP サーバー %s への接続に失敗しました: %s"
+msgstr "セキュリティ保護されたモードで SMTP サーバー %s への接続に失敗しました: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:229
+#: ../camel/providers/smtp/camel-smtp-transport.c:236
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS コマンドが失敗しました: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:228
-#, fuzzy, c-format
-#| msgid "Failed to connect to SMTP server %s in secure mode: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:247
+#, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
-msgstr ""
-"セキュリティ保護されたモードで SMTP サーバー %s への接続に失敗しました: %s"
+msgstr "セキュリティ保護されたモードで SMTP サーバー %s への接続に失敗しました: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:279
+#: ../camel/providers/smtp/camel-smtp-transport.c:349
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP サーバー %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:282
+#: ../camel/providers/smtp/camel-smtp-transport.c:352
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s 経由で SMTP メールを配信します"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:346
-#, fuzzy, c-format
-#| msgid "SMTP server %s does not support requested authentication type %s."
+#: ../camel/providers/smtp/camel-smtp-transport.c:426
+#, c-format
 msgid "SMTP server %s does not support %s authentication"
-msgstr "SMTP サーバー %s は要求した認証方式 %s をサポートしていません。"
+msgstr "SMTP サーバー %s は認証方式 %s をサポートしていません"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:421
+#: ../camel/providers/smtp/camel-smtp-transport.c:508
 #, c-format
 msgid "No SASL mechanism was specified"
-msgstr ""
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:434
-msgid "SMTP Authentication"
-msgstr "SMTP 認証"
+msgstr "SASL メカニズムが指定されていませんでした"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:453
-#: ../camel/providers/smtp/camel-smtp-transport.c:464
-#: ../camel/providers/smtp/camel-smtp-transport.c:477
+#: ../camel/providers/smtp/camel-smtp-transport.c:538
+#: ../camel/providers/smtp/camel-smtp-transport.c:549
+#: ../camel/providers/smtp/camel-smtp-transport.c:562
 msgid "AUTH command failed: "
 msgstr "AUTH コマンドが失敗しました: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:618
+#: ../camel/providers/smtp/camel-smtp-transport.c:703
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "メッセージを送信できません: サービスが接続されていません。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:625
+#: ../camel/providers/smtp/camel-smtp-transport.c:710
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "メッセージを送信できません: 差出人のアドレスが正しくありません。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:629
+#: ../camel/providers/smtp/camel-smtp-transport.c:714
 msgid "Sending message"
 msgstr "メッセージの送信中"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:654
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "メッセージを送信できません: 宛先が定義されていません。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:667
+#: ../camel/providers/smtp/camel-smtp-transport.c:752
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "メッセージを送信できません: 無効な応答が一つ以上あります"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:771
+#: ../camel/providers/smtp/camel-smtp-transport.c:873
 msgid "Syntax error, command unrecognized"
 msgstr "構文解析エラー: コマンドではありません"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:773
+#: ../camel/providers/smtp/camel-smtp-transport.c:875
 msgid "Syntax error in parameters or arguments"
 msgstr "パラメーターあるいは引数に構文解析エラー"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:775
+#: ../camel/providers/smtp/camel-smtp-transport.c:877
 msgid "Command not implemented"
 msgstr "コマンドは実装されていません"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:777
+#: ../camel/providers/smtp/camel-smtp-transport.c:879
 msgid "Command parameter not implemented"
 msgstr "コマンドパラメーターは実装されていません"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:779
+#: ../camel/providers/smtp/camel-smtp-transport.c:881
 msgid "System status, or system help reply"
 msgstr "システム・ステータスまたはシステム・ヘルプの応答"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:781
+#: ../camel/providers/smtp/camel-smtp-transport.c:883
 msgid "Help message"
 msgstr "ヘルプ・メッセージ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:783
+#: ../camel/providers/smtp/camel-smtp-transport.c:885
 msgid "Service ready"
 msgstr "サービスは利用できます"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:785
+#: ../camel/providers/smtp/camel-smtp-transport.c:887
 msgid "Service closing transmission channel"
 msgstr "サービスは送信チャンネルを閉じています"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:787
+#: ../camel/providers/smtp/camel-smtp-transport.c:889
 msgid "Service not available, closing transmission channel"
 msgstr "サービスは利用できません, 送信チャンネルを閉じています"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:789
+#: ../camel/providers/smtp/camel-smtp-transport.c:891
 msgid "Requested mail action okay, completed"
 msgstr "要求されたメールの動作はOK, 完了しました"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:791
+#: ../camel/providers/smtp/camel-smtp-transport.c:893
 msgid "User not local; will forward to <forward-path>"
 msgstr "ユーザーはローカルではありません; <forward-path> へ転送します"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:793
+#: ../camel/providers/smtp/camel-smtp-transport.c:895
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "要求されたメールの動作は完了しません: メールボックスは利用できません"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:795
+#: ../camel/providers/smtp/camel-smtp-transport.c:897
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "要求された動作は完了しません: メールボックスは利用できません"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:797
+#: ../camel/providers/smtp/camel-smtp-transport.c:899
 msgid "Requested action aborted: error in processing"
 msgstr "要求された動作を中断しました: 処理中にエラー"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:799
+#: ../camel/providers/smtp/camel-smtp-transport.c:901
 msgid "User not local; please try <forward-path>"
 msgstr "ユーザーはローカルではありません; <forward-path> を試してください。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:801
+#: ../camel/providers/smtp/camel-smtp-transport.c:903
 msgid "Requested action not taken: insufficient system storage"
 msgstr "要求された動作は完了しません: システムの保存領域が足りません"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:803
+#: ../camel/providers/smtp/camel-smtp-transport.c:905
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "要求されたメールの動作を中断しました: 領域割り当てを越えました"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:805
+#: ../camel/providers/smtp/camel-smtp-transport.c:907
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "要求された動作は完了しません: メールボックス名は認められません"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:807
+#: ../camel/providers/smtp/camel-smtp-transport.c:909
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "メールの入力を開始します; <CRLF>.<CRLF> で終了します"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:809
+#: ../camel/providers/smtp/camel-smtp-transport.c:911
 msgid "Transaction failed"
 msgstr "処理は失敗しました"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:813
+#: ../camel/providers/smtp/camel-smtp-transport.c:915
 msgid "A password transition is needed"
 msgstr "パスワードの変更が必要です"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:815
+#: ../camel/providers/smtp/camel-smtp-transport.c:917
 msgid "Authentication mechanism is too weak"
 msgstr "認証メカニズムは不十分過ぎます"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:817
+#: ../camel/providers/smtp/camel-smtp-transport.c:919
 msgid "Encryption required for requested authentication mechanism"
 msgstr "要求した認証メカニズムのために暗号化が必要です"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:819
+#: ../camel/providers/smtp/camel-smtp-transport.c:921
 msgid "Temporary authentication failure"
 msgstr "一時的な認証に失敗しました"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1070
+#: ../camel/providers/smtp/camel-smtp-transport.c:1178
 msgid "SMTP Greeting"
 msgstr "SMTP で接続中"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1097
-#: ../camel/providers/smtp/camel-smtp-transport.c:1114
-#: ../camel/providers/smtp/camel-smtp-transport.c:1122
+#: ../camel/providers/smtp/camel-smtp-transport.c:1205
+#: ../camel/providers/smtp/camel-smtp-transport.c:1223
+#: ../camel/providers/smtp/camel-smtp-transport.c:1231
 msgid "HELO command failed: "
 msgstr "HELO コマンドが失敗しました: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1197
-#: ../camel/providers/smtp/camel-smtp-transport.c:1211
-#: ../camel/providers/smtp/camel-smtp-transport.c:1220
+#: ../camel/providers/smtp/camel-smtp-transport.c:1306
+#: ../camel/providers/smtp/camel-smtp-transport.c:1321
+#: ../camel/providers/smtp/camel-smtp-transport.c:1331
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM コマンドが失敗しました: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
+#: ../camel/providers/smtp/camel-smtp-transport.c:1358
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO コマンドが失敗しました: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1263
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
+#: ../camel/providers/smtp/camel-smtp-transport.c:1375
+#: ../camel/providers/smtp/camel-smtp-transport.c:1385
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> コマンドが失敗しました: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:1324
-#: ../camel/providers/smtp/camel-smtp-transport.c:1334
-#: ../camel/providers/smtp/camel-smtp-transport.c:1393
-#: ../camel/providers/smtp/camel-smtp-transport.c:1412
-#: ../camel/providers/smtp/camel-smtp-transport.c:1425
-#: ../camel/providers/smtp/camel-smtp-transport.c:1433
+#: ../camel/providers/smtp/camel-smtp-transport.c:1428
+#: ../camel/providers/smtp/camel-smtp-transport.c:1439
+#: ../camel/providers/smtp/camel-smtp-transport.c:1450
+#: ../camel/providers/smtp/camel-smtp-transport.c:1509
+#: ../camel/providers/smtp/camel-smtp-transport.c:1529
+#: ../camel/providers/smtp/camel-smtp-transport.c:1543
+#: ../camel/providers/smtp/camel-smtp-transport.c:1552
 msgid "DATA command failed: "
 msgstr "DATA コマンドが失敗しました: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
-#: ../camel/providers/smtp/camel-smtp-transport.c:1472
-#: ../camel/providers/smtp/camel-smtp-transport.c:1480
+#: ../camel/providers/smtp/camel-smtp-transport.c:1577
+#: ../camel/providers/smtp/camel-smtp-transport.c:1592
+#: ../camel/providers/smtp/camel-smtp-transport.c:1601
 msgid "RSET command failed: "
 msgstr "RSET コマンドが失敗しました: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1505
-#: ../camel/providers/smtp/camel-smtp-transport.c:1519
-#: ../camel/providers/smtp/camel-smtp-transport.c:1526
+#: ../camel/providers/smtp/camel-smtp-transport.c:1626
+#: ../camel/providers/smtp/camel-smtp-transport.c:1640
+#: ../camel/providers/smtp/camel-smtp-transport.c:1647
 msgid "QUIT command failed: "
 msgstr "QUIT コマンドが失敗しました: "
 
-#: ../libedataserver/e-categories.c:47
-msgctxt "CategoryName"
-msgid "Anniversary"
-msgstr "記念日"
+#: ../data/org.gnome.evolution-data-server.addressbook.gschema.xml.in.h:1
+msgid "Contact UID of a user"
+msgstr "ユーザーの連絡先 UID"
 
-#: ../libedataserver/e-categories.c:48
-msgctxt "CategoryName"
-msgid "Birthday"
-msgstr "誕生日"
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:1
+msgid "Birthday and anniversary reminder"
+msgstr "誕生日や記念日のリマインダー"
 
-#: ../libedataserver/e-categories.c:49
-msgctxt "CategoryName"
-msgid "Business"
-msgstr "仕事"
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:2
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr "誕生日や記念日のリマインダーを設定するかどうかです"
 
-#: ../libedataserver/e-categories.c:50
-msgctxt "CategoryName"
-msgid "Competition"
-msgstr "競合他社"
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:3
+msgid "Birthday and anniversary reminder value"
+msgstr "誕生日や記念日のリマインダー値"
 
-#: ../libedataserver/e-categories.c:51
-msgctxt "CategoryName"
-msgid "Favorites"
-msgstr "お気に入り"
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:4
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr "誕生日または記念日のリマインダーを確定する単位数です"
 
-#: ../libedataserver/e-categories.c:52
-msgctxt "CategoryName"
-msgid "Gifts"
-msgstr "贈り物"
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:5
+msgid "Birthday and anniversary reminder units"
+msgstr "誕生日や記念日のリマインダーユニット"
 
-#: ../libedataserver/e-categories.c:53
-msgctxt "CategoryName"
-msgid "Goals/Objectives"
-msgstr "ゴール/目標"
+#: ../data/org.gnome.evolution-data-server.calendar.gschema.xml.in.h:6
+msgid "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or \"days\""
+msgstr "\"minutes\"、\"hours\"、\"days\" など誕生日または記念日の単位です"
 
-#: ../libedataserver/e-categories.c:54
-msgctxt "CategoryName"
-msgid "Holiday"
-msgstr "休日"
+#: ../libebackend/e-authentication-mediator.c:205
+#: ../libebackend/e-authentication-mediator.c:216
+#: ../libebackend/e-authentication-mediator.c:852
+#: ../libebackend/e-authentication-mediator.c:1185
+msgid "Bus name vanished (client terminated?)"
+msgstr "バス名が消えています (クライアントを終了しませんでしたか?)"
 
-#: ../libedataserver/e-categories.c:55
-msgctxt "CategoryName"
-msgid "Holiday Cards"
-msgstr "ホリデー・カード"
+#: ../libebackend/e-authentication-mediator.c:264
+msgid "No response from client"
+msgstr "クライアントから応答がありません"
 
-#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:57
-msgctxt "CategoryName"
-msgid "Hot Contacts"
-msgstr "最新の連絡先"
+#: ../libebackend/e-authentication-mediator.c:334
+#: ../libebackend/e-authentication-mediator.c:345
+#: ../libebackend/e-authentication-mediator.c:846
+#: ../libebackend/e-authentication-mediator.c:1179
+msgid "Client cancelled the operation"
+msgstr "クライアントにより操作が取り消されました"
+
+#: ../libebackend/e-authentication-mediator.c:416
+msgid "Client reports password was rejected"
+msgstr "クライアントはパスワードが拒否されたと報告しています"
+
+#: ../libebackend/e-authentication-session.c:532
+msgid "Add this password to your keyring"
+msgstr "キーリングにこのパスワードを追加する"
+
+#: ../libebackend/e-authentication-session.c:622
+msgid "Password was incorrect"
+msgstr "パスワードが間違っています"
+
+#: ../libebackend/e-backend.c:428
+#, c-format
+msgid "%s does not support authentication"
+msgstr "%s では認証をサポートしていません"
+
+#: ../libebackend/e-collection-backend.c:800
+#, c-format
+msgid "%s does not support creating remote resources"
+msgstr "%s ではリモートリソースの作成をサポートしていません"
+
+#: ../libebackend/e-collection-backend.c:859
+#, c-format
+msgid "%s does not support deleting remote resources"
+msgstr "%s ではリモートリソースの削除をサポートしていません"
+
+#: ../libebackend/e-data-factory.c:320
+#, fuzzy, c-format
+#| msgid "No backend name in source '%s'"
+msgid "No backend factory for hash key '%s'"
+msgstr "ソース '%s' にはバックエンド名がありません"
+
+#: ../libebackend/e-server-side-source.c:134
+#, c-format
+msgid "Data source is missing a [%s] group"
+msgstr "データソースには [%s] グループがありません"
+
+#: ../libebackend/e-server-side-source.c:1008
+#: ../libedataserver/e-source.c:1120
+#, c-format
+msgid "Data source '%s' does not support creating remote resources"
+msgstr "データソース '%s' ではリモートリソースの作成をサポートしていません"
+
+#: ../libebackend/e-server-side-source.c:1022
+#, c-format
+msgid "Data source '%s' has no collection backend to create the remote resource"
+msgstr "データソース '%s' には、リモートリソースを作成するために収集されるバックエンドがありません。"
+
+#: ../libebackend/e-server-side-source.c:1050
+#: ../libedataserver/e-source.c:1227
+#, c-format
+msgid "Data source '%s' does not support deleting remote resources"
+msgstr "データソース '%s' はリモートリソースの削除をサポートしていません"
+
+#: ../libebackend/e-server-side-source.c:1064
+#, c-format
+msgid "Data source '%s' has no collection backend to delete the remote resource"
+msgstr "データソース '%s' には、リモートリソースを削除するために収集されるバックエンドがありません。"
+
+#: ../libebackend/e-server-side-source.c:1095
+#: ../libedataserver/e-source.c:1317
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:990
+#, fuzzy, c-format
+#| msgid "IMAP server %s does not support %s authentication"
+msgid "Data source '%s' does not support OAuth 2.0 authentication"
+msgstr "IMAP サーバーの %s では %s という認証タイプをサポートしていません"
+
+#: ../libebackend/e-server-side-source.c:1438
+#, c-format
+msgid "File must have a '.source' extension"
+msgstr "ファイルには '.source' 拡張子が必要です"
+
+#: ../libebackend/e-source-registry-server.c:523
+#: ../libedataserver/e-source-registry.c:1625
+msgid "The user declined to authenticate"
+msgstr "ユーザー認証に失敗しました"
+
+#: ../libebackend/e-source-registry-server.c:792
+#, c-format
+msgid "UID '%s' is already in use"
+msgstr "UID '%s' は既に使用されています"
+
+#: ../libebackend/e-user-prompter-server.c:303
+#, fuzzy, c-format
+#| msgid "Contact '%s' not found"
+msgid "Extension dialog '%s' not found."
+msgstr "連絡先 '%s' が見つかりません"
+
+#: ../libedataserver/e-categories.c:46
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "記念日"
+
+#: ../libedataserver/e-categories.c:47
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "誕生日"
+
+#: ../libedataserver/e-categories.c:48
+msgctxt "CategoryName"
+msgid "Business"
+msgstr "仕事"
+
+#: ../libedataserver/e-categories.c:49
+msgctxt "CategoryName"
+msgid "Competition"
+msgstr "競合他社"
+
+#: ../libedataserver/e-categories.c:50
+msgctxt "CategoryName"
+msgid "Favorites"
+msgstr "お気に入り"
+
+#: ../libedataserver/e-categories.c:51
+msgctxt "CategoryName"
+msgid "Gifts"
+msgstr "贈り物"
+
+#: ../libedataserver/e-categories.c:52
+msgctxt "CategoryName"
+msgid "Goals/Objectives"
+msgstr "ゴール/目標"
+
+#: ../libedataserver/e-categories.c:53
+msgctxt "CategoryName"
+msgid "Holiday"
+msgstr "休日"
+
+#: ../libedataserver/e-categories.c:54
+msgctxt "CategoryName"
+msgid "Holiday Cards"
+msgstr "ホリデー・カード"
+
+#. important people (e.g. new business partners)
+#: ../libedataserver/e-categories.c:56
+msgctxt "CategoryName"
+msgid "Hot Contacts"
+msgstr "最新の連絡先"
+
+#: ../libedataserver/e-categories.c:57
+msgctxt "CategoryName"
+msgid "Ideas"
+msgstr "アイディア"
+
+#: ../libedataserver/e-categories.c:58
+msgctxt "CategoryName"
+msgid "International"
+msgstr "国際"
+
+#: ../libedataserver/e-categories.c:59
+msgctxt "CategoryName"
+msgid "Key Customer"
+msgstr "重要な顧客"
+
+#: ../libedataserver/e-categories.c:60
+msgctxt "CategoryName"
+msgid "Miscellaneous"
+msgstr "その他"
+
+#: ../libedataserver/e-categories.c:61
+msgctxt "CategoryName"
+msgid "Personal"
+msgstr "個人"
+
+#: ../libedataserver/e-categories.c:62
+msgctxt "CategoryName"
+msgid "Phone Calls"
+msgstr "電話する"
+
+#. Translators: "Status" is a category name; it can mean anything user wants to
+#: ../libedataserver/e-categories.c:64
+msgctxt "CategoryName"
+msgid "Status"
+msgstr "状態"
+
+#: ../libedataserver/e-categories.c:65
+msgctxt "CategoryName"
+msgid "Strategies"
+msgstr "戦略"
+
+#: ../libedataserver/e-categories.c:66
+msgctxt "CategoryName"
+msgid "Suppliers"
+msgstr "サプライヤー"
+
+#: ../libedataserver/e-categories.c:67
+msgctxt "CategoryName"
+msgid "Time & Expenses"
+msgstr "時間と経費"
+
+#: ../libedataserver/e-categories.c:68
+msgctxt "CategoryName"
+msgid "VIP"
+msgstr "重要人物"
+
+#: ../libedataserver/e-categories.c:69
+msgctxt "CategoryName"
+msgid "Waiting"
+msgstr "待ち"
+
+#: ../libedataserver/e-client.c:135
+msgid "Source not loaded"
+msgstr "ソースを読み込んでいません"
+
+#: ../libedataserver/e-client.c:137
+msgid "Source already loaded"
+msgstr "ソースは既に読み込み済みです"
+
+#. Translators: This means that the EClient does not
+#. * support offline mode, or it's not set to by a user,
+#. * thus it is unavailable while user is not connected.
+#: ../libedataserver/e-client.c:148
+msgid "Offline unavailable"
+msgstr "オフライン・モードに切り替えられません"
+
+#: ../libedataserver/e-client.c:170
+msgid "D-Bus error"
+msgstr "D-Bus エラー"
+
+#: ../libedataserver/e-source-authenticator.c:166
+msgid "Address book authentication request"
+msgstr "アドレス帳の認証を必要としています"
+
+#: ../libedataserver/e-source-authenticator.c:171
+msgid "Calendar authentication request"
+msgstr "カレンダーの認証を必要としています"
+
+#: ../libedataserver/e-source-authenticator.c:175
+msgid "Mail authentication request"
+msgstr "メールの認証を必要としています"
+
+#. generic account prompt
+#: ../libedataserver/e-source-authenticator.c:178
+msgid "Authentication request"
+msgstr "認証を必要としています"
+
+#: ../libedataserver/e-source-authenticator.c:188
+#, c-format
+msgid "Please enter the password for address book \"%s\"."
+msgstr "アドレス帳 \"%s\" のパスワードを入力してください。"
+
+#: ../libedataserver/e-source-authenticator.c:194
+#, c-format
+msgid "Please enter the password for calendar \"%s\"."
+msgstr "カレンダー \"%s\" のパスワードを入力してください。"
+
+#: ../libedataserver/e-source-authenticator.c:200
+#, c-format
+msgid "Please enter the password for mail account \"%s\"."
+msgstr "メールアカウント \"%s\" のパスワードを入力してください。"
+
+#: ../libedataserver/e-source-authenticator.c:206
+#, c-format
+msgid "Please enter the password for mail transport \"%s\"."
+msgstr "メール転送 \"%s\" のパスワードを入力してください。"
+
+#: ../libedataserver/e-source-authenticator.c:212
+#, c-format
+msgid "Please enter the password for memo list \"%s\"."
+msgstr "メモリスト \"%s\" のパスワードを入力してください。"
+
+#: ../libedataserver/e-source-authenticator.c:218
+#, c-format
+msgid "Please enter the password for task list \"%s\"."
+msgstr "タスクリスト \"%s\" のパスワードを入力してください。"
+
+#: ../libedataserver/e-source-authenticator.c:224
+#, c-format
+msgid "Please enter the password for account \"%s\"."
+msgstr "アカウント \"%s\" のパスワードを入力してください。"
+
+#: ../libedataserver/e-source.c:622
+#, c-format
+msgid "Source file is missing a [%s] group"
+msgstr "ソースファイルには [%s] グループがありません"
+
+#: ../libedataserver/e-source.c:943
+#, c-format
+msgid "Data source '%s' is not removable"
+msgstr "データソース '%s' を削除することはできません"
+
+#: ../libedataserver/e-source.c:1029
+#, c-format
+msgid "Data source '%s' is not writable"
+msgstr "データソース '%s' には書き込みできません"
+
+#: ../libedataserver/e-source.c:1523
+msgid "Unnamed"
+msgstr "名前なしの一覧"
+
+#: ../libedataserver/e-source-mail-signature.c:487
+#, c-format
+msgid "Signature script must be a local file"
+msgstr "署名スクリプトはローカルファイルにしてください"
+
+#: ../libedataserver/e-source-webdav.c:1529
+#, fuzzy, c-format
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid "SSL certificate for host '%s', used by address book '%s', is not trusted. Do you wish to accept it?"
+msgstr ""
+"'%s' の SSL 証明書は信頼できません。許可しますか?\n"
+"\n"
+"この証明書の詳細情報は以下の通りです。\n"
+"%s"
+
+#: ../libedataserver/e-source-webdav.c:1538
+#, fuzzy, c-format
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you wish to accept it?"
+msgstr ""
+"'%s' の SSL 証明書は信頼できません。許可しますか?\n"
+"\n"
+"この証明書の詳細情報は以下の通りです。\n"
+"%s"
+
+#: ../libedataserver/e-source-webdav.c:1547
+#, fuzzy, c-format
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do you wish to accept it?"
+msgstr ""
+"'%s' の SSL 証明書は信頼できません。許可しますか?\n"
+"\n"
+"この証明書の詳細情報は以下の通りです。\n"
+"%s"
+
+#: ../libedataserver/e-source-webdav.c:1556
+#, fuzzy, c-format
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid "SSL certificate for host '%s', used by task list '%s', is not trusted. Do you wish to accept it?"
+msgstr ""
+"'%s' の SSL 証明書は信頼できません。許可しますか?\n"
+"\n"
+"この証明書の詳細情報は以下の通りです。\n"
+"%s"
+
+#. strptime format of a weekday, a date and a time,
+#. * in 12-hour format.
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format.
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1962
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%Y/%m/%d (%a) %p%l:%M:%S"
+
+#. strptime format of a weekday, a date and a time,
+#. * in 24-hour format.
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format.
+#: ../libedataserver/e-time-utils.c:1668 ../libedataserver/e-time-utils.c:1953
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%Y/%m/%d (%a) %k:%M:%S"
+
+#. strptime format of a weekday, a date and a time,
+#. * in 12-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1673 ../libedataserver/e-time-utils.c:1958
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%Y/%m/%d (%a) %p%l:%M"
+
+#. strptime format of a weekday, a date and a time,
+#. * in 24-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1949
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%Y/%m/%d (%a) %k:%M"
+
+#. strptime format of a weekday, a date and a time,
+#. * in 12-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1683
+msgid "%a %m/%d/%Y %I %p"
+msgstr "%Y/%m/%d (%a) %p%l時"
+
+#. strptime format of a weekday, a date and a time,
+#. * in 24-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1688
+msgid "%a %m/%d/%Y %H"
+msgstr "%Y/%m/%d (%a) %k時"
+
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
+#: ../libedataserver/e-time-utils.c:1691 ../libedataserver/e-time-utils.c:1811
+#: ../libedataserver/e-time-utils.c:1944
+msgid "%a %m/%d/%Y"
+msgstr "%Y/%m/%d (%a)"
+
+#. strptime format of a date and a time, in 12-hour format.
+#: ../libedataserver/e-time-utils.c:1698
+msgid "%m/%d/%Y %I:%M:%S %p"
+msgstr "%Y/%m/%d %p%l:%M:%S"
+
+#. strptime format of a date and a time, in 24-hour format.
+#: ../libedataserver/e-time-utils.c:1702
+msgid "%m/%d/%Y %H:%M:%S"
+msgstr "%Y/%m/%d %k:%M:%S"
+
+#. strptime format of a date and a time, in 12-hour format,
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1707
+msgid "%m/%d/%Y %I:%M %p"
+msgstr "%Y/%m/%d %p%l:%M"
+
+#. strptime format of a date and a time, in 24-hour format,
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1712
+msgid "%m/%d/%Y %H:%M"
+msgstr "%Y/%m/%d %k:%M"
+
+#. strptime format of a date and a time, in 12-hour format,
+#. * without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1717
+msgid "%m/%d/%Y %I %p"
+msgstr "%Y/%m/%d %p%l時"
+
+#. strptime format of a date and a time, in 24-hour format,
+#. * without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1722
+msgid "%m/%d/%Y %H"
+msgstr "%Y/%m/%d %k時"
+
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#: ../libedataserver/e-time-utils.c:1725 ../libedataserver/e-time-utils.c:1814
+msgid "%m/%d/%Y"
+msgstr "%Y/%m/%d"
+
+#. strptime format for a time of day, in 12-hour format.
+#. strftime format of a time in 12-hour format.
+#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:2006
+msgid "%I:%M:%S %p"
+msgstr "%p%l:%M:%S"
+
+#. strptime format for a time of day, in 24-hour format.
+#. strftime format of a time in 24-hour format.
+#: ../libedataserver/e-time-utils.c:1889 ../libedataserver/e-time-utils.c:1998
+msgid "%H:%M:%S"
+msgstr "%k:%M:%S"
+
+#. strptime format for time of day, without seconds,
+#. * in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1894 ../libedataserver/e-time-utils.c:2003
+msgid "%I:%M %p"
+msgstr "%p%l:%M"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#. strftime format of a time in 24-hour format,
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1898 ../libedataserver/e-time-utils.c:1995
+msgid "%H:%M"
+msgstr "%k:%M"
+
+#. strptime format for time of day, without seconds 24-hour format,
+#. * and no colon.
+#: ../libedataserver/e-time-utils.c:1902
+msgid "%H%M"
+msgstr "%k%M"
+
+#. strptime format for hour and AM/PM, 12-hour format.
+#: ../libedataserver/e-time-utils.c:1906
+msgid "%I %p"
+msgstr "%p%l時"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
+msgid "Proxy type to use"
+msgstr "使用するプロキシタイプ"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
+msgid "What proxy type to use. \"0\" means system, \"1\" means no proxy, \"2\" means manual proxy."
+msgstr "使用するプロキシタイプです。\"0\" はシステム、\"1\" はプロシキなし、\"2\" は手作業によるプロキシになります。"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
+msgid "Whether to use http-proxy"
+msgstr "http-proxy を使用する"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
+msgid "Whether to use proxy for HTTP requests."
+msgstr "HTTP リクエストにプロキシを使用するかどうかです。"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
+msgid "Whether proxy server requires authentication"
+msgstr "プロキシサーバーに認証を必要とする"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
+msgid "Whether authentication is required to access proxy server."
+msgstr "プロキシサーバーのアクセスに認証が必要かどうかです。"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
+msgid "Host name for HTTP requests"
+msgstr "HTTP リクエストのホスト名"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
+msgid "Host name to use for HTTP requests."
+msgstr "HTTP リクエストに使用するホスト名です。"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
+msgid "Port number for HTTP requests"
+msgstr "HTTP リクエストのポート番号"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
+msgid "Port number to use for HTTP requests."
+msgstr "HTTP リクエストに使用するポート番号です。"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+msgid "Proxy authentication user name"
+msgstr "プロキシ認証のユーザー名"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
+msgid "User name to use to authenticate against proxy server."
+msgstr "プロキシサーバーに対して認証を行う場合に使用するユーザー名です。"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
+msgid "Proxy authentication password"
+msgstr "プロキシ認証のパスワード"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
+msgid "Password to use to authenticate against proxy server."
+msgstr "プロキシサーバーに対して認証を行う場合に使用するパスワードです。"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:15
+msgid "List of hosts to connect to without proxy"
+msgstr "プロキシなしで接続するホストの一覧"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:16
+msgid "List of hosts for which do not use proxy."
+msgstr "プロキシなしで接続するホストの一覧です。"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:17
+msgid "Host name for HTTPS requests"
+msgstr "HTTPS リクエストのホスト名"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:18
+msgid "Host name to use for HTTPS requests."
+msgstr "HTTPS リクエストに使用するホスト名です。"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:19
+msgid "Port number for HTTPS requests"
+msgstr "HTTPS リクエストのポート番号"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:20
+msgid "Port number to use for HTTPS requests."
+msgstr "HTTPS リクエストに使用するポート番号です。"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:21
+msgid "Host name for SOCKS requests"
+msgstr "SOCKS リクエストのホスト名"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:22
+msgid "Host name to use for SOCKS requests."
+msgstr "SOCKS リクエストに使用するホスト名です。"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:23
+msgid "Port number for SOCKS requests"
+msgstr "SOCKS リクエストのポート番号"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:24
+msgid "Port number to use for SOCKS requests."
+msgstr "SOCKS リクエストに使用するポート番号です。"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:25
+msgid "Automatic proxy configuration URL"
+msgstr "自動プロキシ設定の URL"
+
+#: ../libedataserver/org.gnome.evolution.shell.network-config.gschema.xml.in.h:26
+msgid "Where to read automatic proxy configuration from."
+msgstr "自動プロキシの設定を読み込む URL です。"
+
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:132
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:365
+#, fuzzy, c-format
+#| msgid "No such source for UID '%s'"
+msgid "No such data source for UID '%s'"
+msgstr "UID '%s' にそのようなソースはありません"
+
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:144
+#, c-format
+msgid "Cannot find a corresponding account in the org.gnome.OnlineAccounts service from which to obtain a 
password for '%s'"
+msgstr ""
+
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:216
+#, fuzzy, c-format
+#| msgid "Enter password for %s"
+msgid "Invalid password for '%s'"
+msgstr "%s のパスワードを入力してください"
+
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:223
+#, c-format
+msgid "Code: %u - Unexpected response from server"
+msgstr "コード: %u - サーバーからの予期しない応答です"
+
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:244
+#, c-format
+msgid "Failed to parse autodiscover response XML"
+msgstr "autodiscover の応答 XML の解析に失敗しました"
+
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:253
+#, c-format
+msgid "Failed to find Autodiscover element"
+msgstr "autodiscover エレメントの検出に失敗しました"
+
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:265
+#, c-format
+msgid "Failed to find Response element"
+msgstr "response エレメントの検出に失敗しました"
+
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:277
+#, c-format
+msgid "Failed to find Account element"
+msgstr "account エレメントの検出に失敗しました"
+
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:291
+#, c-format
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr "autodiscover 応答内で ASUrl と OABUrl  の検出に失敗しました"
+
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1237
+#, c-format
+msgid "Cannot find a corresponding account in the org.gnome.OnlineAccounts service from which to obtain an 
access token for '%s'"
+msgstr ""
+
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1264
+#, fuzzy, c-format
+#| msgid "Failed to open addressbook at '%s': %s"
+msgid "Failed to obtain an access token for '%s': "
+msgstr "'%s' でアドレス帳を開くのに失敗しました: %s"
+
+#: ../modules/google-backend/module-google-backend.c:140
+#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
+#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+msgid "Calendar"
+msgstr "カレンダー"
+
+#: ../modules/google-backend/module-google-backend.c:217
+#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:1
+#: ../services/evolution-source-registry/builtin/contacts-stub.source.in.h:1
+msgid "Contacts"
+msgstr "連絡先"
+
+#: ../modules/trust-prompt/certificate-viewer.c:292
+#, fuzzy
+#| msgid "Cannot add encryption certificate"
+msgid "Not part of certificate"
+msgstr "暗号化証明書を追加できません"
+
+#: ../modules/trust-prompt/certificate-viewer.c:600
+msgid "This certificate has been verified for the following uses:"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:604
+#: ../modules/trust-prompt/e-asn1-object.c:387
+#, fuzzy
+#| msgid "X.509 Certificate"
+msgid "SSL Client Certificate"
+msgstr "X.509 認証"
+
+#: ../modules/trust-prompt/certificate-viewer.c:609
+#: ../modules/trust-prompt/e-asn1-object.c:391
+#, fuzzy
+#| msgid "X.509 Certificate"
+msgid "SSL Server Certificate"
+msgstr "X.509 認証"
+
+#: ../modules/trust-prompt/certificate-viewer.c:614
+msgid "Email Signer Certificate"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:619
+#, fuzzy
+#| msgid "Cannot add encryption certificate"
+msgid "Email Recipient Certificate"
+msgstr "暗号化証明書を追加できません"
+
+#: ../modules/trust-prompt/certificate-viewer.c:634
+msgid "Issued To"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:635
+#: ../modules/trust-prompt/certificate-viewer.c:641
+msgid "Common Name (CN)"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:636
+#: ../modules/trust-prompt/certificate-viewer.c:642
+#, fuzzy
+#| msgid "Organization"
+msgid "Organization (O)"
+msgstr "組織"
+
+#: ../modules/trust-prompt/certificate-viewer.c:637
+#: ../modules/trust-prompt/certificate-viewer.c:643
+#, fuzzy
+#| msgid "Organizational Unit"
+msgid "Organizational Unit (OU)"
+msgstr "組織"
+
+#: ../modules/trust-prompt/certificate-viewer.c:638
+#: ../modules/trust-prompt/e-asn1-object.c:134
+msgid "Serial Number"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:640
+msgid "Issued By"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:645
+msgid "Validity"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:646
+msgid "Issued On"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:647
+msgid "Expires On"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:649
+msgid "Fingerprints"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:650
+msgid "SHA1 Fingerprint"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:651
+msgid "MD5 Fingerprint"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:653
+msgid "General"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:672
+#, fuzzy
+#| msgid "Certificate rejected"
+msgid "Certificate Hierarchy"
+msgstr "拒否された証明書です"
+
+#: ../modules/trust-prompt/certificate-viewer.c:676
+#, fuzzy
+#| msgid "Certificate Revoked"
+msgid "Certificate Fields"
+msgstr "無効になった証明書です"
+
+#: ../modules/trust-prompt/certificate-viewer.c:680
+msgid "Field Value"
+msgstr ""
+
+#: ../modules/trust-prompt/certificate-viewer.c:682
+msgid "Details"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:95
+msgid "Version"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:110
+msgid "Version 1"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:113
+msgid "Version 2"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:116
+msgid "Version 3"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:192
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:195
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:198
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:201
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:204
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:207
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:234
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:237
+#, fuzzy
+#| msgid "Certificate Revoked"
+msgid "Certificate Key Usage"
+msgstr "無効になった証明書です"
+
+#: ../modules/trust-prompt/e-asn1-object.c:240
+msgid "Netscape Certificate Type"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:243
+#, fuzzy
+#| msgid "Certificate untrusted"
+msgid "Certificate Authority Key Identifier"
+msgstr "信頼されていない証明書です"
+
+#: ../modules/trust-prompt/e-asn1-object.c:255
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:306
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:314
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:336
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:341
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:356
+msgid "Subject's Public Key"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:378
+#: ../modules/trust-prompt/e-asn1-object.c:428
+#, fuzzy
+#| msgid "Unable to process spool folder"
+msgid "Error: Unable to process extension"
+msgstr "スプール・フォルダーを処理できません"
+
+#: ../modules/trust-prompt/e-asn1-object.c:395
+#, fuzzy
+#| msgid "Email 1"
+msgid "Email"
+msgstr "E-メール 1"
+
+#: ../modules/trust-prompt/e-asn1-object.c:399
+#: ../modules/trust-prompt/e-asn1-object.c:411
+msgid "Object Signer"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:403
+#, fuzzy
+#| msgid "Invalid Certificate Authority (CA)"
+msgid "SSL Certificate Authority"
+msgstr "認証局 (CA) が無効です"
+
+#: ../modules/trust-prompt/e-asn1-object.c:407
+#, fuzzy
+#| msgid "Invalid Certificate Authority (CA)"
+msgid "Email Certificate Authority"
+msgstr "認証局 (CA) が無効です"
+
+#: ../modules/trust-prompt/e-asn1-object.c:436
+#, fuzzy
+#| msgid "Signing message"
+msgid "Signing"
+msgstr "メッセージの署名中"
+
+#: ../modules/trust-prompt/e-asn1-object.c:440
+#, fuzzy
+#| msgid "Non-editing Author"
+msgid "Non-repudiation"
+msgstr "Non-editing Author"
+
+#: ../modules/trust-prompt/e-asn1-object.c:444
+msgid "Key Encipherment"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:448
+msgid "Data Encipherment"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:452
+msgid "Key Agreement"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:456
+#, fuzzy
+#| msgid "Certificate signature failure"
+msgid "Certificate Signer"
+msgstr "証明書の署名に失敗しました"
+
+#: ../modules/trust-prompt/e-asn1-object.c:460
+msgid "CRL Signer"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:509
+msgid "Critical"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:511
+#: ../modules/trust-prompt/e-asn1-object.c:514
+msgid "Not Critical"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:535
+msgid "Extensions"
+msgstr ""
+
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself.  You probably do not need to
+#. * change this string, unless changing the order of
+#. * name and value.  As a result example:
+#. * "OU = VeriSign Trust Network"
+#: ../modules/trust-prompt/e-asn1-object.c:615
+#, c-format
+msgid "%s = %s"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:658
+#, fuzzy
+#| msgid "X.509 Certificate"
+msgid "Certificate"
+msgstr "X.509 認証"
+
+#: ../modules/trust-prompt/e-asn1-object.c:674
+#: ../modules/trust-prompt/e-asn1-object.c:812
+#, fuzzy
+#| msgid "Certificate signature failure"
+msgid "Certificate Signature Algorithm"
+msgstr "証明書の署名に失敗しました"
+
+#: ../modules/trust-prompt/e-asn1-object.c:683
+msgid "Issuer"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:714
+msgid "Subject"
+msgstr ""
+
+#: ../modules/trust-prompt/e-asn1-object.c:738
+#, fuzzy
+#| msgid "Unique ID"
+msgid "Issuer Unique ID"
+msgstr "重複しない ID"
+
+#: ../modules/trust-prompt/e-asn1-object.c:757
+#, fuzzy
+#| msgid "Unique ID"
+msgid "Subject Unique ID"
+msgstr "重複しない ID"
+
+#: ../modules/trust-prompt/e-asn1-object.c:818
+#, fuzzy
+#| msgid "Certificate signature failure"
+msgid "Certificate Signature Value"
+msgstr "証明書の署名に失敗しました"
+
+#: ../modules/trust-prompt/module-trust-prompt.c:201
+#, fuzzy
+#| msgid "Signing certificate not found"
+msgid "The signing certificate authority is not known."
+msgstr "署名付き証明書がみつかりません"
+
+#: ../modules/trust-prompt/module-trust-prompt.c:203
+msgid "The certificate does not match the expected identity of the site that it was retrieved from."
+msgstr ""
+
+#: ../modules/trust-prompt/module-trust-prompt.c:205
+#, fuzzy
+#| msgid "Certificate Revocation List signature failure"
+msgid "The certificate's activation time is still in the future."
+msgstr "認証取り消し一覧の署名に失敗しました"
+
+#: ../modules/trust-prompt/module-trust-prompt.c:207
+#, fuzzy
+#| msgid "Certificate has expired"
+msgid "The certificate has expired."
+msgstr "証明書の有効期間が延びました"
+
+#: ../modules/trust-prompt/module-trust-prompt.c:209
+msgid "The certificate has been revoked according to the connection's certificate revocation list."
+msgstr ""
+
+#: ../modules/trust-prompt/module-trust-prompt.c:211
+msgid "The certificate's algorithm is considered insecure."
+msgstr ""
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:162
+#, fuzzy
+#| msgid "Certificate untrusted"
+msgid "Certificate trust..."
+msgstr "信頼されていない証明書です"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:163
+#, fuzzy
+#| msgid "X.509 Certificate"
+msgid "_View Certificate"
+msgstr "X.509 認証"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:164
+msgid "_Reject"
+msgstr "拒否(_R)"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:165
+msgid "Accept _Temporarily"
+msgstr "一時的に許可(_T)"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:166
+msgid "_Accept Permanently"
+msgstr "永久に許可(_A)"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:203
+#, fuzzy, c-format
+#| msgid ""
+#| "SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+#| "\n"
+#| "Detailed information about the certificate:\n"
+#| "%s"
+msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
+msgstr ""
+"'%s' の SSL 証明書は信頼できません。許可しますか?\n"
+"\n"
+"この証明書の詳細情報は以下の通りです。\n"
+"%s"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:209
+msgid "Detailed information about the certificate:"
+msgstr ""
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:223
+msgid "Issuer:"
+msgstr ""
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:224
+msgid "Subject:"
+msgstr ""
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:225
+msgid "Fingerprint:"
+msgstr ""
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:226
+msgid "Reason:"
+msgstr ""
+
+#: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:2
+msgid "Integrate your calendars"
+msgstr ""
+
+#: ../modules/ubuntu-online-accounts/contacts.service-type.in.in.h:2
+msgid "Integrate your contacts"
+msgstr ""
+
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:257
+msgid "Signon service did not return a secret"
+msgstr ""
+
+#: ../modules/ubuntu-online-accounts/google-calendar.service.in.in.h:1
+#, fuzzy
+#| msgid "Calendar"
+msgid "Google Calendar"
+msgstr "カレンダー"
+
+#: ../modules/ubuntu-online-accounts/google-contacts.service.in.in.h:1
+#, fuzzy
+#| msgctxt "CategoryName"
+#| msgid "Hot Contacts"
+msgid "Google Contacts"
+msgstr "最新の連絡先"
+
+#: ../modules/ubuntu-online-accounts/google-gmail.service.in.in.h:1
+#, fuzzy
+#| msgid "Mailer"
+msgid "GMail"
+msgstr "メール・クライアント"
+
+#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:1
+#, fuzzy
+#| msgid "Mailer"
+msgid "Mail"
+msgstr "メール・クライアント"
+
+#: ../modules/ubuntu-online-accounts/mail.service-type.in.in.h:2
+msgid "Integrate your mailboxes"
+msgstr ""
+
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:971
+#, c-format
+msgid "Cannot find a corresponding account service in the accounts database from which to obtain an access 
token for '%s'"
+msgstr ""
+
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:79
+#, c-format
+msgid "Expected status 200 when requesting guid, instead got status %d (%s)"
+msgstr ""
+
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:96
+#, fuzzy
+#| msgid "Error parsing filter: %s: %s"
+msgid "Error parsing response as JSON: "
+msgstr "フィルターの構文解析中にエラー: %s: %s"
+
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:112
+msgid "Didn't find email member in JSON data"
+msgstr ""
+
+#: ../modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1
+#, fuzzy
+#| msgid "Calendar"
+msgid "Yahoo! Calendar"
+msgstr "カレンダー"
+
+#: ../modules/ubuntu-online-accounts/yahoo-mail.service.in.in.h:1
+msgid "Yahoo! Mail"
+msgstr ""
+
+#: ../modules/yahoo-backend/module-yahoo-backend.c:227
+msgid "Tasks"
+msgstr "タスク"
+
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51
+#: ../services/evolution-user-prompter/evolution-user-prompter.c:31
+msgid "Keep running after the last client is closed"
+msgstr "最後のクライアントの終了後、実行を継続する"
+
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53
+msgid "Wait running until at least one client is connected"
+msgstr "少なくとも 1 クライアントが接続するまで実行を待機する"
+
+#: ../services/evolution-source-registry/builtin/birthdays.source.in.h:1
+#, fuzzy
+#| msgid "Birthday and anniversary reminder"
+msgid "Birthdays & Anniversaries"
+msgstr "誕生日や記念日のリマインダー"
+
+#: ../services/evolution-source-registry/builtin/caldav-stub.source.in.h:1
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../services/evolution-source-registry/builtin/google-stub.source.in.h:1
+msgid "Google"
+msgstr "Google"
+
+#: ../services/evolution-source-registry/builtin/ldap-stub.source.in.h:1
+#, fuzzy
+#| msgid "IMAP server %s"
+msgid "On LDAP Servers"
+msgstr "IMAP サーバー %s"
+
+#: ../services/evolution-source-registry/builtin/local.source.in.h:1
+#: ../services/evolution-source-registry/builtin/local-stub.source.in.h:1
+msgid "On This Computer"
+msgstr "このコンピューター"
+
+#: ../services/evolution-source-registry/builtin/vfolder.source.in.h:1
+#, fuzzy
+#| msgid "Personal Folders"
+msgid "Search Folders"
+msgstr "個人フォルダー"
+
+#: ../services/evolution-source-registry/builtin/weather-stub.source.in.h:1
+#, fuzzy
+#| msgid "Weather: Fog"
+msgid "Weather"
+msgstr "天気: 霧"
+
+#: ../services/evolution-source-registry/builtin/webcal-stub.source.in.h:1
+msgid "On The Web"
+msgstr ""
+
+#: ../services/evolution-source-registry/builtin/webdav-stub.source.in.h:1
+msgid "WebDAV"
+msgstr ""
+
+#: ../services/evolution-user-prompter/prompt-user-gtk.c:122
+msgid "_Dismiss"
+msgstr ""
+
+#~ msgid "Failed to build summary for an address book %s"
+#~ msgstr "アドレス帳 %s の要約のビルドに失敗しました"
+
+#~ msgid "Using Distinguished Name (DN)"
+#~ msgstr "識別名 (DN) を使用する"
+
+#~ msgid "Using Email Address"
+#~ msgstr "E-メール・アドレスを使用する"
+
+#~ msgid "Failed to run book factory"
+#~ msgstr "ブックファクトリーの実行に失敗しました"
+
+#~ msgid "Cannot get connection to view"
+#~ msgstr "ビューへの接続を取得できません"
+
+#~ msgid "Cannot process, book backend is opening"
+#~ msgstr "処理できません、アドレス帳のバックエンドを開いています"
+
+#~ msgid "Empty query: "
+#~ msgstr "問い合わせ内容が空です: "
+
+#~ msgid "Cannot remove book: "
+#~ msgstr "データブックを削除できません: "
+
+#~ msgid "Cannot get backend property: "
+#~ msgstr "バックエンドのプロパティを取得できません: "
+
+#~ msgid "Invalid backend name '%s' in source '%s'"
+#~ msgstr "バックエンド名 '%s' は無効な名前です (ソース '%s')"
+
+#~ msgid "Failed to connect to a server using SSL. One possible reason is an invalid certificate being used 
by the server. If this is expected, like self-signed certificate being used on the server, then disable 
certificate validity tests by selecting 'Ignore invalid SSL certificate' option in Properties"
+#~ msgstr "SSL 
によるサーバーへの接続に失敗しました。考えられる原因のひとつとして、無効な証明書が使用された可能性があります。サーバーで自己署名の証明書を使用したなど、無効な証明書が原因と考えられる場合には、プロパティで「無効な 
SSL 証明書を無視」のオプションを選択して証明書の有効性確認テストを無効にします。"
+
+#~ msgid "Cannot create local store"
+#~ msgstr "ローカルのストアを作成できません"
+
+#~ msgid "Could not create synch slave thread"
+#~ msgstr "同期のスレーブスレッドを作成できませんでした"
+
+#~ msgid "Failed to run calendar factory"
+#~ msgstr "カレンダーファクトリーの実行に失敗しました"
+
+#~ msgid "Cannot process, calendar backend is opening"
+#~ msgstr "処理できません、カレンダーバックエンドを開いています"
+
+#~ msgid "Cannot remove calendar: "
+#~ msgstr "カレンダーを削除できません: "
+
+#~ msgid "Invalid call"
+#~ msgstr "無効なコールです"
+
+#~ msgid ""
+#~ "   Issuer:       %s\n"
+#~ "   Subject:      %s\n"
+#~ "   Fingerprint:  %s\n"
+#~ "   Signature:    %s"
+#~ msgstr ""
+#~ "  発行者:            %s\n"
+#~ "  タイトル:          %s\n"
+#~ "  指紋:              %s\n"
+#~ "  署名:              %s"
+
+#~ msgid "GOOD"
+#~ msgstr "GOOD"
+
+#~ msgid "BAD"
+#~ msgstr "BAD"
+
+#~ msgid ""
+#~ "Certificate problem: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "認証問題: %s\n"
+#~ "発行者: %s"
+
+#~ msgid ""
+#~ "Bad certificate domain: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "おかしな認証ドメイン: %s\n"
+#~ "発行者: %s"
+
+#~ msgid ""
+#~ "Certificate expired: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "証明書の有効期限切れ: %s\n"
+#~ "発行者: %s"
+
+#~ msgid ""
+#~ "Certificate revocation list expired: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "証明書取り消し一覧の期限切れ: %s\n"
+#~ "発行者: %s"
+
+#~ msgid "No output stream"
+#~ msgstr "出力ストリームはありません"
+
+#~ msgid "No input stream"
+#~ msgstr "入力ストリームはありません"
+
+#~ msgid "Server unexpectedly disconnected: %s"
+#~ msgstr "突然サーバーが接続を切りました: %s"
+
+#~ msgid ""
+#~ "Alert from IMAP server %s %s in folder %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "IMAP サーバー %s %s からの警告 (フォルダー %s):\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Alert from IMAP server %s %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "IMAP サーバー %s %s からの警告:\n"
+#~ "%s"
+
+#~ msgid "Unexpected response from IMAP server: %s"
+#~ msgstr "IMAP サーバーから想定外の応答がありました: %s"
+
+#~ msgid "IMAP command failed: %s"
+#~ msgstr "IMAP コマンドが失敗しました: %s"
+
+#~ msgid "Server response ended too soon."
+#~ msgstr "サーバーレスポンスはあっけなく終わりました。"
+
+#~ msgid "IMAP server response did not contain %s information"
+#~ msgstr "IMAP サーバーの応答は %s 情報を含んでいません"
+
+#~ msgid "Unexpected OK response from IMAP server: %s"
+#~ msgstr "IMAP サーバーから想定外の OK 応答がありました: %s"
+
+#~ msgid "Always check for _new mail in this folder"
+#~ msgstr "常にこのフォルダーにある新着メールをチェックする(_N)"
+
+#~ msgid "Could not create directory %s: %s"
+#~ msgstr "フォルダー %s を作成できませんでした: %s"
+
+#~ msgid "Could not load summary for %s"
+#~ msgstr "%s のサマリをロードできませんでした"
+
+#~ msgid "Scanning for changed messages in %s"
+#~ msgstr "%s にあるメッセージの解析中"
 
-#: ../libedataserver/e-categories.c:58
-msgctxt "CategoryName"
-msgid "Ideas"
-msgstr "アイディア"
+#~ msgid "Fetching summary information for new messages in %s"
+#~ msgstr "%s にある新着メッセージのサマリ情報の同期中"
 
-#: ../libedataserver/e-categories.c:59
-msgctxt "CategoryName"
-msgid "International"
-msgstr "国際"
+#~ msgid "Incomplete server response: no information provided for message %d"
+#~ msgstr "不完全なサーバーの応答: メッセージ %d の情報が提供されませんでした"
 
-#: ../libedataserver/e-categories.c:60
-msgctxt "CategoryName"
-msgid "Key Customer"
-msgstr "重要な顧客"
+#~ msgid "Incomplete server response: no UID provided for message %d"
+#~ msgstr "不完全なサーバーの応答: メッセージ %d の UID が提供されませんでした"
 
-#: ../libedataserver/e-categories.c:61
-msgctxt "CategoryName"
-msgid "Miscellaneous"
-msgstr "その他"
+#~ msgid "Could not find message body in FETCH response."
+#~ msgstr "FETCH 応答にメッセージ本体がありませんでした。"
 
-#: ../libedataserver/e-categories.c:62
-msgctxt "CategoryName"
-msgid "Personal"
-msgstr "個人"
+#~ msgid "Could not open cache directory: "
+#~ msgstr "キャッシュ・フォルダーを開けませんでした: "
 
-#: ../libedataserver/e-categories.c:63
-msgctxt "CategoryName"
-msgid "Phone Calls"
-msgstr "電話する"
+#~ msgid "Failed to cache message %s: %s"
+#~ msgstr "%s というメッセージをキャッシュできませんでした: %s"
 
-#. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:65
-msgctxt "CategoryName"
-msgid "Status"
-msgstr "状態"
+#~ msgid "Failed to cache message %s: "
+#~ msgstr "メッセージ %s のキャッシュに失敗しました: "
 
-#: ../libedataserver/e-categories.c:66
-msgctxt "CategoryName"
-msgid "Strategies"
-msgstr "戦略"
+#~ msgid "Failed to cache %s: "
+#~ msgstr "%s のキャッシュに失敗しました: "
 
-#: ../libedataserver/e-categories.c:67
-msgctxt "CategoryName"
-msgid "Suppliers"
-msgstr "サプライヤー"
+#~ msgid "Names_pace:"
+#~ msgstr "ネームスペース(_P):"
 
-#: ../libedataserver/e-categories.c:68
-msgctxt "CategoryName"
-msgid "Time & Expenses"
-msgstr "時間と経費"
+#~ msgid "IMAP default port"
+#~ msgstr "IMAP のデフォルトポート"
 
-#: ../libedataserver/e-categories.c:69
-msgctxt "CategoryName"
-msgid "VIP"
-msgstr "重要人物"
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
 
-#: ../libedataserver/e-categories.c:70
-msgctxt "CategoryName"
-msgid "Waiting"
-msgstr "待ち"
+#~ msgid "Retrieving list of folders at '%s'"
+#~ msgstr "'%s' にあるフォルダーの一覧を取得中"
 
-#: ../libedataserver/e-client.c:122
-#, fuzzy
-#| msgid "URI not loaded"
-msgid "Source not loaded"
-msgstr "URI を読み込んでいません"
+#~ msgid "Server unexpectedly disconnected"
+#~ msgstr "突然サーバーが接続を切りました"
 
-#: ../libedataserver/e-client.c:124
-#, fuzzy
-#| msgid "URI already loaded"
-msgid "Source already loaded"
-msgstr "URL は既に読み込み済みです"
+#~ msgid "Server unexpectedly disconnected: "
+#~ msgstr "突然サーバーから切断されました: "
 
-#: ../libedataserver/e-client.c:132
-#, fuzzy
-#| msgid "Offline mode unavailable"
-msgid "Offline unavailable"
-msgstr "オフライン・モードに切り替えられません"
+#~ msgid "Cannot create folder: %s: Folder name cannot contain a dot"
+#~ msgstr "フォルダーを作成できません: %s: フォルダー名にドットを含むことはできません"
 
-#: ../libedataserver/e-client.c:154
-#, fuzzy
-#| msgid "parse error"
-msgid "D-Bus error"
-msgstr "解析エラー"
+#~ msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+#~ msgstr "フォルダーの名前を変更できません: %s: フォルダー名にドットを含むことはできません"
 
-#. strptime format of a weekday, a date and a time,
-#. * in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1646 ../libedataserver/e-time-utils.c:1944
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%Y/%m/%d (%a) %p%l:%M:%S"
+#~ msgid "Could not connect to POP server %s"
+#~ msgstr "POP サーバー %s へ接続できませんでした"
 
-#. strptime format of a weekday, a date and a time,
-#. * in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1651 ../libedataserver/e-time-utils.c:1935
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%Y/%m/%d (%a) %k:%M:%S"
+#~ msgid "Keyring operation was cancelled"
+#~ msgstr "キーリングの操作が取り消されました"
 
-#. strptime format of a weekday, a date and a time,
-#. * in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1656 ../libedataserver/e-time-utils.c:1940
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%Y/%m/%d (%a) %p%l:%M"
+#~ msgid "Currently _used categories:"
+#~ msgstr "最近使用したカテゴリ(_U):"
 
-#. strptime format of a weekday, a date and a time,
-#. * in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1931
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%Y/%m/%d (%a) %k:%M"
+#~ msgid "_Available Categories:"
+#~ msgstr "利用可能なカテゴリ(_A):"
 
-#. strptime format of a weekday, a date and a time,
-#. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1666
-msgid "%a %m/%d/%Y %I %p"
-msgstr "%Y/%m/%d (%a) %p%l時"
+#~ msgid "Icon"
+#~ msgstr "アイコン"
 
-#. strptime format of a weekday, a date and a time,
-#. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1671
-msgid "%a %m/%d/%Y %H"
-msgstr "%Y/%m/%d (%a) %k時"
+#~ msgid "Category"
+#~ msgstr "カテゴリ"
 
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1674 ../libedataserver/e-time-utils.c:1794
-#: ../libedataserver/e-time-utils.c:1926
-msgid "%a %m/%d/%Y"
-msgstr "%Y/%m/%d (%a)"
+#~ msgid "Create category \"%s\""
+#~ msgstr "\"%s\" というカテゴリの生成"
 
-#. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1681
-msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%Y/%m/%d %p%l:%M:%S"
+#~ msgid "Category Icon"
+#~ msgstr "カテゴリのアイコン"
 
-#. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1685
-msgid "%m/%d/%Y %H:%M:%S"
-msgstr "%Y/%m/%d %k:%M:%S"
+#~ msgid "_No Image"
+#~ msgstr "画像なし(_N)"
 
-#. strptime format of a date and a time, in 12-hour format,
-#. * without seconds.
-#: ../libedataserver/e-time-utils.c:1690
-msgid "%m/%d/%Y %I:%M %p"
-msgstr "%Y/%m/%d %p%l:%M"
+#~ msgid "Category _Name"
+#~ msgstr "カテゴリの名前(_N)"
 
-#. strptime format of a date and a time, in 24-hour format,
-#. * without seconds.
-#: ../libedataserver/e-time-utils.c:1695
-msgid "%m/%d/%Y %H:%M"
-msgstr "%Y/%m/%d %k:%M"
+#~ msgid "Category _Icon"
+#~ msgstr "カテゴリのアイコン(_I)"
 
-#. strptime format of a date and a time, in 12-hour format,
-#. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1700
-msgid "%m/%d/%Y %I %p"
-msgstr "%Y/%m/%d %p%l時"
+#~ msgid "Category Properties"
+#~ msgstr "カテゴリのプロパティ"
 
-#. strptime format of a date and a time, in 24-hour format,
-#. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1705
-msgid "%m/%d/%Y %H"
-msgstr "%Y/%m/%d %k時"
+#~ msgid "There is already a category '%s' in the configuration. Please use another name"
+#~ msgstr "設定の中にカテゴリ '%s' が存在します。別の名前を指定してください。"
 
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1708 ../libedataserver/e-time-utils.c:1797
-msgid "%m/%d/%Y"
-msgstr "%Y/%m/%d"
+#~ msgid "Show Contacts"
+#~ msgstr "連絡先を表示"
 
-#. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1988
-msgid "%I:%M:%S %p"
-msgstr "%p%l:%M:%S"
+#~ msgid "Address B_ook:"
+#~ msgstr "アドレス帳(_O):"
 
-#. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1980
-msgid "%H:%M:%S"
-msgstr "%k:%M:%S"
+#~ msgid "Cat_egory:"
+#~ msgstr "カテゴリー(_E):"
 
-#. strptime format for time of day, without seconds,
-#. * in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. * without seconds.
-#: ../libedataserver/e-time-utils.c:1877 ../libedataserver/e-time-utils.c:1985
-msgid "%I:%M %p"
-msgstr "%p%l:%M"
+#~ msgid "_Search:"
+#~ msgstr "検索(_S):"
 
-#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. * without seconds.
-#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1977
-msgid "%H:%M"
-msgstr "%k:%M"
+#~ msgid "Any Category"
+#~ msgstr "任意のカテゴリ"
 
-#. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1884
-msgid "%H%M"
-msgstr "%k%M"
+#~ msgid "Co_ntacts"
+#~ msgstr "連絡先(_N)"
 
-#. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1888
-msgid "%I %p"
-msgstr "%p%l時"
+#~ msgid "Search"
+#~ msgstr "検索"
 
-#: ../libedataserverui/e-book-auth-util.c:96
-#: ../libedataserverui/e-book-auth-util.c:656
-msgid "Accessing LDAP Server anonymously"
-msgstr "匿名で LDAP サーバーへアクセス中"
+#~ msgid "Address Book"
+#~ msgstr "アドレス帳"
 
-#: ../libedataserverui/e-book-auth-util.c:197
-#: ../libedataserverui/e-book-auth-util.c:423
-msgid "Failed to authenticate.\n"
-msgstr "認証に失敗しました。\n"
+#~ msgid "Select Contacts from Address Book"
+#~ msgstr "アドレス帳から連絡先の選択"
 
-#: ../libedataserverui/e-categories-editor.c:224
-msgid "Currently _used categories:"
-msgstr "最近使用したカテゴリ(_U):"
+#~ msgid "_Add"
+#~ msgstr "追加(_A)"
 
-#: ../libedataserverui/e-categories-editor.c:233
-msgid "_Available Categories:"
-msgstr "利用可能なカテゴリ(_A):"
+#~ msgid "_Remove"
+#~ msgstr "削除(_R)"
 
-#: ../libedataserverui/e-categories-selector.c:320
-msgid "Icon"
-msgstr "アイコン"
+#~ msgid "Error loading address book: %s"
+#~ msgstr "アドレス帳の読み込み中にエラー: %s"
 
-#: ../libedataserverui/e-categories-selector.c:325
-msgid "Category"
-msgstr "カテゴリ"
+#~ msgid "E_xpand %s Inline"
+#~ msgstr "%s をインラインで展開する(_X)"
 
-#: ../libedataserverui/e-category-completion.c:294
-#, c-format
-msgid "Create category \"%s\""
-msgstr "\"%s\" というカテゴリの生成"
+#~ msgid "Cop_y %s"
+#~ msgstr "%s のコピー(_Y)"
 
-#: ../libedataserverui/e-category-editor.c:132
-msgid "Category Icon"
-msgstr "カテゴリのアイコン"
+#~ msgid "C_ut %s"
+#~ msgstr "%s の切り取り(_U)"
 
-#: ../libedataserverui/e-category-editor.c:136
-msgid "_No Image"
-msgstr "画像なし(_N)"
+#~ msgid "_Edit %s"
+#~ msgstr "%s の編集(_E)"
 
-#: ../libedataserverui/e-category-editor.c:173
-msgid "Category _Name"
-msgstr "カテゴリの名前(_N)"
+#~ msgid "_Delete %s"
+#~ msgstr "%s の削除(_D)"
 
-#: ../libedataserverui/e-category-editor.c:181
-msgid "Category _Icon"
-msgstr "カテゴリのアイコン(_I)"
+#~ msgid "Keyring key is unusable: no user or host name"
+#~ msgstr "キーリングのキーを使用できません: ユーザーまたはホスト名が存在しません"
 
-#: ../libedataserverui/e-category-editor.c:221
-msgid "Category Properties"
-msgstr "カテゴリのプロパティ"
+#~ msgid "You have the Caps Lock key on."
+#~ msgstr "[Caps Lock] キーが ON 状態です。"
 
-#: ../libedataserverui/e-category-editor.c:282
-#, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
-msgstr "設定の中にカテゴリ '%s' が存在します。別の名前を指定してください。"
+#~ msgid "_Remember this passphrase"
+#~ msgstr "このパスフレーズを記憶する(_R)"
 
-#: ../libedataserverui/e-client-utils.c:856
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid ""
-"Enter password for calendar %s (user %s)\n"
-"Reason: %s"
-msgstr "%s (ユーザー %s) のパスワードを入力してください"
+#~ msgid "_Remember this passphrase for the remainder of this session"
+#~ msgstr "このパスフレーズをこのセッション用に保存する(_R)"
 
-#: ../libedataserverui/e-client-utils.c:858
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for calendar %s (user %s)"
-msgstr "%s (ユーザー %s) のパスワードを入力してください"
+#~ msgid "_Remember this password"
+#~ msgstr "このパスワードを記憶する(_R)"
 
-#: ../libedataserverui/e-client-utils.c:862
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid ""
-"Enter password for task list %s (user %s)\n"
-"Reason: %s"
-msgstr "%s (ユーザー %s) のパスワードを入力してください"
+#~ msgid "_Remember this password for the remainder of this session"
+#~ msgstr "このパスワードをこのセッション用に保存する(_R)"
 
-#: ../libedataserverui/e-client-utils.c:864
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for task list %s (user %s)"
-msgstr "%s (ユーザー %s) のパスワードを入力してください"
+#~ msgid "_Destination"
+#~ msgstr "転送先(_D)"
 
-#: ../libedataserverui/e-client-utils.c:868
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid ""
-"Enter password for memo list %s (user %s)\n"
-"Reason: %s"
-msgstr "%s (ユーザー %s) のパスワードを入力してください"
+#~ msgid "Select destination"
+#~ msgstr "転送先の選択"
 
-#: ../libedataserverui/e-client-utils.c:870
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for memo list %s (user %s)"
-msgstr "%s (ユーザー %s) のパスワードを入力してください"
+#~ msgid "Evolution Source Viewer"
+#~ msgstr "Evolution ソースビューワー"
 
-#: ../libedataserverui/e-client-utils.c:981
-#, fuzzy
-#| msgid "Enter password"
-msgid "Enter Passphrase"
-msgstr "パスワードの入力"
+#~ msgid "Display Name"
+#~ msgstr "名前の表示"
 
-#: ../libedataserverui/e-client-utils.c:983
-#, fuzzy
-#| msgid "Enter password"
-msgid "Enter Password"
-msgstr "パスワードの入力"
+#~ msgid "Flags"
+#~ msgstr "フラグ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:184
-msgid "Show Contacts"
-msgstr "連絡先を表示"
+#~ msgid "Identity"
+#~ msgstr "アイデンティティ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:206
-msgid "Address B_ook:"
-msgstr "アドレス帳(_O):"
+#~ msgid "Authenticating with the server…"
+#~ msgstr "サーバーで認証中…"
 
-#: ../libedataserverui/e-name-selector-dialog.c:214
-msgid "Cate_gory:"
-msgstr "カテゴリ(_G):"
+#~ msgid "%s: there was no source for UID '%s' stored in GConf."
+#~ msgstr "%s: GConf に UID '%s' のソースがありません。"
 
-#: ../libedataserverui/e-name-selector-dialog.c:232
-msgid "_Search:"
-msgstr "検索(_S):"
+#~ msgid "Invalid source"
+#~ msgstr "ソースが無効です"
 
-#: ../libedataserverui/e-name-selector-dialog.c:250
-#: ../libedataserverui/e-name-selector-dialog.c:1035
-msgid "Any Category"
-msgstr "任意のカテゴリ"
+#, fuzzy
+#~| msgid "Failed on message %d"
+#~ msgid "Failed to find system book"
+#~ msgstr "メッセージ %d で失敗しました"
 
-#: ../libedataserverui/e-name-selector-dialog.c:252
-msgid "Co_ntacts"
-msgstr "連絡先(_N)"
+#, fuzzy
+#~| msgid "%s: there was no source for UID '%s' stored in GConf."
+#~ msgid "There was no source for UID '%s' stored in a source list."
+#~ msgstr "%s: GConf に UID '%s' のソースがありません。"
 
-#: ../libedataserverui/e-name-selector-dialog.c:307
-msgid "Search"
-msgstr "検索"
+#, fuzzy
+#~| msgid "Cannot authenticate user: %s"
+#~ msgid "Cannot authenticate user: "
+#~ msgstr "ユーザー認証できません: %s"
 
-#: ../libedataserverui/e-name-selector-dialog.c:310
-msgid "Address Book"
-msgstr "アドレス帳"
+#~ msgid "Empty URI"
+#~ msgstr "空の URI"
 
-#: ../libedataserverui/e-name-selector-dialog.c:313
-msgid "Contacts"
-msgstr "連絡先"
+#, fuzzy
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid ""
+#~ "Enter password for address book %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr "%s (ユーザー %s) のパスワードを入力してください"
 
-#: ../libedataserverui/e-name-selector-dialog.c:430
-msgid "Select Contacts from Address Book"
-msgstr "アドレス帳から連絡先の選択"
+#, fuzzy
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid "Enter password for address book %s (user %s)"
+#~ msgstr "%s (ユーザー %s) のパスワードを入力してください"
 
-#: ../libedataserverui/e-name-selector-dialog.c:778
-msgid "_Add"
-msgstr "追加(_A)"
+#~ msgid "Enter password for %s (user %s)"
+#~ msgstr "%s (ユーザー %s) のパスワードを入力してください"
 
-#: ../libedataserverui/e-name-selector-dialog.c:782
-msgid "_Remove"
-msgstr "削除(_R)"
+#~ msgid "Enter password for %s to enable proxy for user %s"
+#~ msgstr "%s のパスワードを入力して、ユーザー %s のプロキシを有効にしてください"
 
-#: ../libedataserverui/e-name-selector-dialog.c:954
-#, c-format
-msgid "Error loading address book: %s"
-msgstr "アドレス帳の読み込み中にエラー: %s"
+#, fuzzy
+#~| msgid "Invalid source"
+#~ msgid "Invalid source type"
+#~ msgstr "ソースが無効です"
 
-#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2819
-#, c-format
-msgid "E_xpand %s Inline"
-msgstr "%s をインラインで展開する(_X)"
+#~ msgid "Connection to Server"
+#~ msgstr "サーバーへ接続"
 
-#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2834
-#, c-format
-msgid "Cop_y %s"
-msgstr "%s のコピー(_Y)"
+#~ msgid "_Use custom command to connect to server"
+#~ msgstr "サーバーへ接続する際にカスタム・コマンドを使用する(_U)"
 
-#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2844
-#, c-format
-msgid "C_ut %s"
-msgstr "%s の切り取り(_U)"
+#~ msgid "Co_mmand:"
+#~ msgstr "コマンド(_M):"
 
-#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2861
-#, c-format
-msgid "_Edit %s"
-msgstr "%s の編集(_E)"
+#~ msgid "Check new messages for Jun_k contents"
+#~ msgstr "新着メールがスパムかどうかチェックする(_K)"
 
-#: ../libedataserverui/e-name-selector-list.c:520
-#, c-format
-msgid "_Delete %s"
-msgstr "%s の削除(_D)"
+#~ msgid "Command:"
+#~ msgstr "コマンド:"
 
-#: ../libedataserverui/e-passwords.c:126
-msgid "Keyring key is unusable: no user or host name"
-msgstr "キーリングのキーを使用できません: ユーザーまたはホスト名が存在しません"
+#~ msgid "Numbe_r of cached connections to use"
+#~ msgstr "キャッシュ接続の数(_R)"
 
-#: ../libedataserverui/e-passwords.c:701
-#: ../libedataserverui/e-passwords-win32.c:614
-msgid "You have the Caps Lock key on."
-msgstr "[Caps Lock] キーが ON 状態です。"
+#~ msgid "Closing tmp stream failed: "
+#~ msgstr "作業用ストリームのクローズに失敗しました: "
 
-#: ../libedataserverui/e-passwords.c:821
-#: ../libedataserverui/e-passwords-win32.c:737
-msgid "_Remember this passphrase"
-msgstr "このパスフレーズを記憶する(_R)"
+#~ msgid "SMTP Authentication"
+#~ msgstr "SMTP 認証"
 
-#: ../libedataserverui/e-passwords.c:822
-#: ../libedataserverui/e-passwords-win32.c:738
-msgid "_Remember this passphrase for the remainder of this session"
-msgstr "このパスフレーズをこのセッション用に保存する(_R)"
+#~ msgid "Accessing LDAP Server anonymously"
+#~ msgstr "匿名で LDAP サーバーへアクセス中"
 
-#: ../libedataserverui/e-passwords.c:827
-#: ../libedataserverui/e-passwords-win32.c:743
-msgid "_Remember this password"
-msgstr "このパスワードを記憶する(_R)"
+#, fuzzy
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid ""
+#~ "Enter password for calendar %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr "%s (ユーザー %s) のパスワードを入力してください"
 
-#: ../libedataserverui/e-passwords.c:828
-#: ../libedataserverui/e-passwords-win32.c:744
-msgid "_Remember this password for the remainder of this session"
-msgstr "このパスワードをこのセッション用に保存する(_R)"
+#, fuzzy
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid "Enter password for calendar %s (user %s)"
+#~ msgstr "%s (ユーザー %s) のパスワードを入力してください"
 
-#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:99
-msgid "Select destination"
-msgstr "転送先の選択"
+#, fuzzy
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid ""
+#~ "Enter password for task list %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr "%s (ユーザー %s) のパスワードを入力してください"
 
-#: ../libedataserverui/e-source-selector-dialog.c:174
-msgid "_Destination"
-msgstr "転送先(_D)"
+#, fuzzy
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid "Enter password for task list %s (user %s)"
+#~ msgstr "%s (ユーザー %s) のパスワードを入力してください"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:47
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:51
-msgid "Keep running after the last client is closed"
-msgstr ""
+#, fuzzy
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid ""
+#~ "Enter password for memo list %s (user %s)\n"
+#~ "Reason: %s"
+#~ msgstr "%s (ユーザー %s) のパスワードを入力してください"
 
-#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49
-#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53
-msgid "Wait running until at least one client is connected"
-msgstr ""
+#, fuzzy
+#~| msgid "Enter password for %s (user %s)"
+#~ msgid "Enter password for memo list %s (user %s)"
+#~ msgstr "%s (ユーザー %s) のパスワードを入力してください"
+
+#, fuzzy
+#~| msgid "Enter password"
+#~ msgid "Enter Passphrase"
+#~ msgstr "パスワードの入力"
+
+#, fuzzy
+#~| msgid "Enter password"
+#~ msgid "Enter Password"
+#~ msgstr "パスワードの入力"
 
 #~ msgid ""
 #~ "SSL Certificate check for %s:\n"
@@ -5320,15 +6305,9 @@ msgstr ""
 #~ msgid "Invalid URI"
 #~ msgstr "無効な URI です"
 
-#~ msgid "No backend factory for '%s' of '%s'"
-#~ msgstr "'%2$s' の '%1$s' のバックエンドがありません"
-
 #~ msgid "Could not instantiate backend"
 #~ msgstr "バックエンドのインスタンスを生成できませんでした"
 
-#~ msgid "Could not connect to %s: %s"
-#~ msgstr "%s へ接続できませんでした: %s"
-
 #~ msgid "SSL unavailable"
 #~ msgstr "SSL は無効です"
 
@@ -5341,27 +6320,14 @@ msgstr ""
 #~ msgid "You did not enter a password."
 #~ msgstr "パスワードを入力しませんでした。"
 
-#~ msgid ""
-#~ "Unable to authenticate to IMAP server.\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "IMAP サーバーへ認証できません。\n"
-#~ "%s\n"
-#~ "\n"
-
 #~ msgid "Authentication requested but no username provided"
 #~ msgstr "認証を必要としていますが、ユーザー名が指定されていません"
 
 #~ msgid "TLS is not available in this build"
 #~ msgstr "このパッケージでは TLS を利用できません"
 
-#~ msgid ""
-#~ "Unable to connect to POP server %s: No support for requested "
-#~ "authentication mechanism."
-#~ msgstr ""
-#~ "POP サーバー %s へ接続できません: 要求された認証方式をサポートしていませ"
-#~ "ん。"
+#~ msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
+#~ msgstr "POP サーバー %s へ接続できません: 要求された認証方式をサポートしていません。"
 
 #~ msgid "SASL '%s' Login failed for POP server %s%s"
 #~ msgstr "POP サーバー %2$s への SASL '%1$s' 認証ログインに失敗しました: %3$s"
@@ -5418,12 +6384,6 @@ msgstr ""
 #~ msgid "Loading items"
 #~ msgstr "アイテムの読み込み中"
 
-#~ msgid "Calendar"
-#~ msgstr "カレンダー"
-
-#~ msgid "Invalid server URI"
-#~ msgstr "無効なサーバー URI です"
-
 #~ msgid "Could not create thread for populating cache"
 #~ msgstr "キャッシュを生成するためのスレッドを生成できませんでした"
 
@@ -5487,9 +6447,7 @@ msgstr ""
 #~ msgstr "フォルダーのコンテナー %s を取得できません"
 
 #~ msgid "Cannot append message in offline mode: cache unavailable"
-#~ msgstr ""
-#~ "オフライン・モードではメッセージを追加できません: キャッシュを利用できませ"
-#~ "ん"
+#~ msgstr "オフライン・モードではメッセージを追加できません: キャッシュを利用できません"
 
 #~ msgid "Cannot append message in offline mode: "
 #~ msgstr "オフライン・モードでメッセージを追加できません: "
@@ -5515,21 +6473,14 @@ msgstr ""
 #~ msgid "For accessing Novell GroupWise servers"
 #~ msgstr "Novell GroupWise サーバーへのアクセス用です"
 
-#~ msgid ""
-#~ "This option will connect to the GroupWise server using a plaintext "
-#~ "password."
-#~ msgstr ""
-#~ "このオプションはプレイン・テキストのパスワードを使って GroupWise サーバー"
-#~ "に接続します。"
+#~ msgid "This option will connect to the GroupWise server using a plaintext password."
+#~ msgstr "このオプションはプレイン・テキストのパスワードを使って GroupWise サーバーに接続します。"
 
 #~ msgid "Host or user not available in url"
 #~ msgstr "ホスト名またはユーザー名は URI で指定できません"
 
-#~ msgid ""
-#~ "Some features may not work correctly with your current server version"
-#~ msgstr ""
-#~ "お使いのサーバーのバージョンでは、いくつかの機能が正しく動作しないかもしれ"
-#~ "ません"
+#~ msgid "Some features may not work correctly with your current server version"
+#~ msgstr "お使いのサーバーのバージョンでは、いくつかの機能が正しく動作しないかもしれません"
 
 #~ msgid "Cannot create GroupWise folders in offline mode."
 #~ msgstr "オフライン・モードでは GroupWise フォルダーを生成できません。"
@@ -5555,21 +6506,12 @@ msgstr ""
 #~ msgid "Cannot get folder: Invalid operation on this store"
 #~ msgstr "フォルダーを取得できません: ここでは無効な操作です"
 
-#~ msgid ""
-#~ "You have exceeded this account's storage limit. Your messages are queued "
-#~ "in your Outbox. Resend by pressing Send/Receive after deleting/archiving "
-#~ "some of your mail.\n"
-#~ msgstr ""
-#~ "このアカウントで利用できるディスク容量を超えました。送信したメッセージは送"
-#~ "信箱に保存されます。まずはメールを削除したりアーカイブにまとめる等してか"
-#~ "ら、[送受信] ボタンを押してメッセージを送信してください。\n"
+#~ msgid "You have exceeded this account's storage limit. Your messages are queued in your Outbox. Resend by 
pressing Send/Receive after deleting/archiving some of your mail.\n"
+#~ msgstr "このアカウントで利用できるディスク容量を超えました。送信したメッセージは送信箱に保存されます。まずはメールを削除したりアーカイブにまとめる等してから、[送受信] 
ボタンを押してメッセージを送信してください。\n"
 
 #~ msgid "Could not send message: %s"
 #~ msgstr "メッセージを送信できませんでした: %s"
 
-#~ msgid "Operation cancelled"
-#~ msgstr "処理がキャンセルされました"
-
 #~ msgid "SSL negotiations failed"
 #~ msgstr "SSL 接続に失敗しました"
 
@@ -5588,15 +6530,9 @@ msgstr ""
 #~ msgid "Invalid response from server"
 #~ msgstr "サーバーからの応答が無効です"
 
-#~ msgid "No response from the server"
-#~ msgstr "サーバーから応答がありません"
-
 #~ msgid "Bad parameter"
 #~ msgstr "パラメーターが無効です"
 
-#~ msgid "Verifying message"
-#~ msgstr "メッセージの検証中"
-
 #~ msgid "_Apply filters to new messages in INBOX on this server"
 #~ msgstr "このサーバーの受信箱にある新着メールにフィルターを適用する(_A)"
 
@@ -5673,9 +6609,7 @@ msgstr ""
 #~ msgstr "このメッセージにはデジタル署名された部分があります"
 
 #~ msgid "Cannot verify message signature: could not create temp file: %s"
-#~ msgstr ""
-#~ "このメッセージの整合性を確認できません: 作業用ファイルを作成できませんでし"
-#~ "た: %s"
+#~ msgstr "このメッセージの整合性を確認できません: 作業用ファイルを作成できませんでした: %s"
 
 #~ msgid "Unable to parse message content"
 #~ msgstr "メッセージの内容を解析できません"
@@ -5686,8 +6620,7 @@ msgstr ""
 #~ msgid "Kerberos 4"
 #~ msgstr "Kerberos 4"
 
-#~ msgid ""
-#~ "This option will connect to the server using Kerberos 4 authentication."
+#~ msgid "This option will connect to the server using Kerberos 4 authentication."
 #~ msgstr "このオプションは Kerberos 4 認証を使ってサーバーに接続します"
 
 #~ msgid ""
@@ -5724,18 +6657,9 @@ msgstr ""
 #~ msgid "Unable to decode issuer's public key"
 #~ msgstr "発行者のパブリック・キーを解読できません"
 
-#~ msgid "Certificate signature failure"
-#~ msgstr "証明書の署名に失敗しました"
-
-#~ msgid "Certificate Revocation List signature failure"
-#~ msgstr "認証取り消し一覧の署名に失敗しました"
-
 #~ msgid "Certificate not yet valid"
 #~ msgstr "認証がまだ正しくありません"
 
-#~ msgid "Certificate has expired"
-#~ msgstr "証明書の有効期間が延びました"
-
 #~ msgid "Certificate Revocation List (CRL) not yet valid"
 #~ msgstr "証明書失効リスト (CRL) はまだ無効です"
 
@@ -5763,24 +6687,12 @@ msgstr ""
 #~ msgid "Certificate chain too long"
 #~ msgstr "認証チェーンが長すぎます"
 
-#~ msgid "Certificate Revoked"
-#~ msgstr "無効になった証明書です"
-
-#~ msgid "Invalid Certificate Authority (CA)"
-#~ msgstr "認証局 (CA) が無効です"
-
 #~ msgid "Path length exceeded"
 #~ msgstr "パスワードが長すぎます"
 
 #~ msgid "Invalid purpose"
 #~ msgstr "目的が間違っています"
 
-#~ msgid "Certificate untrusted"
-#~ msgstr "信頼されていない証明書です"
-
-#~ msgid "Certificate rejected"
-#~ msgstr "拒否された証明書です"
-
 #~ msgid "Subject/Issuer mismatch"
 #~ msgstr "タイトル/発行者が一致しません"
 
@@ -5822,11 +6734,8 @@ msgstr ""
 #~ msgid "For accessing Hula servers"
 #~ msgstr "Hula サーバーへのアクセス用です"
 
-#~ msgid ""
-#~ "This option will connect to the Hula server using a plaintext password."
-#~ msgstr ""
-#~ "このオプションはプレイン・テキストのパスワードを使って Hula サーバーに接続"
-#~ "します"
+#~ msgid "This option will connect to the Hula server using a plaintext password."
+#~ msgstr "このオプションはプレイン・テキストのパスワードを使って Hula サーバーに接続します"
 
 #~ msgid "Unexpected response status '%s' after APPEND command"
 #~ msgstr "APPEND コマンドの後に想定外の応答ステータスがあります: '%s'"
@@ -5858,12 +6767,8 @@ msgstr ""
 #~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
 #~ msgstr "突然 IMAP4 サーバーの %s が接続を切りました: %s"
 
-#~ msgid ""
-#~ "Enable extended Mailing-List detection required for some filter and "
-#~ "vFolder rules"
-#~ msgstr ""
-#~ "フィルターのルールや仮想フォルダーのルールに必要なメーリング・リストの検出"
-#~ "を有効にする"
+#~ msgid "Enable extended Mailing-List detection required for some filter and vFolder rules"
+#~ msgstr "フィルターのルールや仮想フォルダーのルールに必要なメーリング・リストの検出を有効にする"
 
 #~ msgid "Expire cached messages that haven't been read in X seconds"
 #~ msgstr "X秒間読まれなかったキャッシュ済のメッセージを無効にします"
@@ -5878,8 +6783,7 @@ msgstr ""
 #~ msgstr "'%s' というフォルダーとフラグを同期できません: 原因不明のエラー"
 
 #~ msgid "Cannot sync flags to folder '%s': Bad command"
-#~ msgstr ""
-#~ "'%s' というフォルダーとフラグを同期できません: コマンドが間違っています"
+#~ msgstr "'%s' というフォルダーとフラグを同期できません: コマンドが間違っています"
 
 #~ msgid "Cannot expunge folder '%s': Unknown error"
 #~ msgstr "'%s' というフォルダーを抹消できません: 原因不明のエラー"
@@ -5888,26 +6792,19 @@ msgstr ""
 #~ msgstr "'%s' というフォルダーを抹消できません: コマンドが間違っています"
 
 #~ msgid "Cannot get message %s from folder '%s': No such message"
-#~ msgstr ""
-#~ "%s を '%s' というフォルダーから取得できません: そのようなメッセージはあり"
-#~ "ません"
+#~ msgstr "%s を '%s' というフォルダーから取得できません: そのようなメッセージはありません"
 
 #~ msgid "Cannot get message %s from folder '%s': Bad command"
-#~ msgstr ""
-#~ "%s を '%s' というフォルダーから取得できません: コマンドが間違っています"
+#~ msgstr "%s を '%s' というフォルダーから取得できません: コマンドが間違っています"
 
 #~ msgid "Cannot append message to folder '%s': Folder is read-only"
-#~ msgstr ""
-#~ "'%s' というフォルダーにメッセージを追加できません: フォルダーは読み込み専"
-#~ "用です"
+#~ msgstr "'%s' というフォルダーにメッセージを追加できません: フォルダーは読み込み専用です"
 
 #~ msgid "Cannot append message to folder '%s': Unknown error"
 #~ msgstr "'%s' というフォルダーにメッセージを追加できません: 原因不明のエラー"
 
 #~ msgid "Cannot append message to folder '%s': Bad command"
-#~ msgstr ""
-#~ "'%s' というフォルダーにメッセージを追加できません: コマンドが間違っていま"
-#~ "す"
+#~ msgstr "'%s' というフォルダーにメッセージを追加できません: コマンドが間違っています"
 
 #~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
 #~ msgstr "'%s' から '%s' へメッセージを移動できません: 原因不明のエラー"
@@ -5916,15 +6813,10 @@ msgstr ""
 #~ msgstr "'%s' から '%s' へメッセージをコピーできません: 原因不明のエラー"
 
 #~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-#~ msgstr ""
-#~ "'%s' から '%s' へメッセージを移動できません: コマンドが間違っています"
+#~ msgstr "'%s' から '%s' へメッセージを移動できません: コマンドが間違っています"
 
 #~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-#~ msgstr ""
-#~ "'%s' から '%s' へメッセージをコピーできません: コマンドが間違っています"
-
-#~ msgid "Check new messages for _Junk contents"
-#~ msgstr "新着メールにスパムが含まれているかチェックする(_J)"
+#~ msgstr "'%s' から '%s' へメッセージをコピーできません: コマンドが間違っています"
 
 #~ msgid "Only check for Junk messa_ges in the INBOX folder"
 #~ msgstr "受信箱にあるメールだけスパムかどうかチェックする(_G)"
@@ -5935,23 +6827,13 @@ msgstr ""
 #~ msgid "For reading and storing mail on IMAPv4rev1 servers."
 #~ msgstr "IMAP サーバーにあるメールを読んだり保存します"
 
-#~ msgid ""
-#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
-#~ "password."
-#~ msgstr ""
-#~ "このオプションはプレイン・テキストのパスワードを使って IMAPv4rev1 サーバー"
-#~ "に接続します"
+#~ msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
+#~ msgstr "このオプションはプレイン・テキストのパスワードを使って IMAPv4rev1 サーバーに接続します"
 
-#~ msgid ""
-#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
-#~ "support STARTTLS"
-#~ msgstr ""
-#~ "セキュリティ保護されたモードで IMAP サーバー %s への接続に失敗しました: "
-#~ "サーバー側で STARTTLS をサポートしていないのが原因です"
+#~ msgid "Failed to connect to IMAP server %s in secure mode: Server does not support STARTTLS"
+#~ msgstr "セキュリティ保護されたモードで IMAP サーバー %s への接続に失敗しました: サーバー側で STARTTLS をサポートしていないのが原因です"
 
-#~ msgid ""
-#~ "Cannot authenticate to IMAP server %s using the %s authentication "
-#~ "mechanism"
+#~ msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 #~ msgstr "IMAP サーバー %s に対して認証方式 %s を使って認証できませんでした"
 
 #~ msgid "Cannot authenticate to IMAP server %s using %s"
@@ -5997,8 +6879,7 @@ msgstr ""
 #~ msgstr "'%s' から '%s' に名前を変更できません: コマンドが間違っています"
 
 #~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-#~ msgstr ""
-#~ "%s を '%s' というパターンで IMAP サーバーの %s から取得できません: %s"
+#~ msgstr "%s を '%s' というパターンで IMAP サーバーの %s から取得できません: %s"
 
 #~ msgid "Cannot subscribe to IMAP folders in offline mode."
 #~ msgstr "オフライン・モードでは IMAP フォルダーを購読できません。"
@@ -6013,12 +6894,7 @@ msgstr ""
 #~ msgstr "オフライン・モードでは IMAP フォルダーの購読を停止できません。"
 
 #~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-#~ msgstr ""
-#~ "'%s' というフォルダーの購読を停止できません: mailbox の名前が無効です"
-
-#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
-#~ msgstr ""
-#~ "'%s' というフォルダーの購読を停止できません: コマンドが間違っています"
+#~ msgstr "'%s' というフォルダーの購読を停止できません: mailbox の名前が無効です"
 
 #~ msgid "Scanning for changed messages"
 #~ msgstr "変更メッセージの解析中"
@@ -6040,14 +6916,12 @@ msgstr ""
 
 #~ msgid ""
 #~ "Experimental IMAP 4(.1) client\n"
-#~ "This is untested and unsupported code, you want to use plain imap "
-#~ "instead.\n"
+#~ "This is untested and unsupported code, you want to use plain imap instead.\n"
 #~ "\n"
 #~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 #~ msgstr ""
 #~ "IMAP 4(.1) クライアント (開発版)\n"
-#~ "これは未テスト/未サポートのコードなので、代わりに標準 IMAP を使用してくだ"
-#~ "さい。\n"
+#~ "これは未テスト/未サポートのコードなので、代わりに標準 IMAP を使用してください。\n"
 #~ "\n"
 #~ " !!! 重要なメールには利用しないでください  !!!\n"
 
@@ -6108,9 +6982,6 @@ msgstr ""
 #~ msgid "The color to render"
 #~ msgstr "描画する色の情報です"
 
-#~ msgid "Enter password for %s"
-#~ msgstr "%s のパスワードを入力してください"
-
 #~ msgid "Owner"
 #~ msgstr "所有者"
 
@@ -6126,9 +6997,6 @@ msgstr ""
 #~ msgid "Author"
 #~ msgstr "作者"
 
-#~ msgid "Non-editing Author"
-#~ msgstr "Non-editing Author"
-
 #~ msgid "Reviewer"
 #~ msgstr "レビューアー"
 
@@ -6162,9 +7030,6 @@ msgstr ""
 #~ msgid "Function not implemented in this storage"
 #~ msgstr "このストレージでは実装されていない機能です"
 
-#~ msgid "Operation not supported"
-#~ msgstr "サポートしていない操作です"
-
 #~ msgid "The specified type is not supported in this storage"
 #~ msgstr "このストレージでは指定した種類をサポートしていません"
 
@@ -6183,9 +7048,6 @@ msgstr ""
 #~ msgid "%s's Folders"
 #~ msgstr "%s のフォルダー"
 
-#~ msgid "Personal Folders"
-#~ msgstr "個人フォルダー"
-
 #~ msgid "Favorite Public Folders"
 #~ msgstr "お気に入りのパブリックなフォルダー"
 
@@ -6213,9 +7075,6 @@ msgstr ""
 #~ msgid "Sent Items"
 #~ msgstr "アイテムを送信しました"
 
-#~ msgid "Tasks"
-#~ msgstr "タスク"
-
 #~ msgid "Evolution Addressbook file backend"
 #~ msgstr "Evolution アドレス帳ファイルのバックエンド"
 
@@ -6247,9 +7106,7 @@ msgstr ""
 #~ msgstr "テンプレート"
 
 #~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-#~ msgstr ""
-#~ "セグメンテーション・フォルトが複数回発生しました: エラー・ダイアログを表示"
-#~ "できません\n"
+#~ msgstr "セグメンテーション・フォルトが複数回発生しました: エラー・ダイアログを表示できません\n"
 
 #~ msgid "Failed to create create child process '%s': %s"
 #~ msgstr "子プロセス '%s' の生成に失敗しました: %s"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]