[evolution-data-server] l10n: Update Japanese translation



commit 137237d8647cd565e35896c768fdf1ed8d631ed8
Author: Jiro Matsuzawa <jmatsuzawa gnome org>
Date:   Tue Mar 25 05:07:48 2014 +0900

    l10n: Update Japanese translation

 po/ja.po | 4917 ++++++++++++++++++++++----------------------------------------
 1 files changed, 1707 insertions(+), 3210 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index da543f3..02d5cef 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,15 +8,15 @@
 # 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, 2013.
+# Jiro Matsuzawa <jmatsuzawa src gnome org>, 2011, 2013, 2014.
 # Noriko Mizumoto <noriko fedoraproject org>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server master\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: 2013-09-23 16:05+0000\n"
-"PO-Revision-Date: 2013-09-24 05:57+0000\n"
+"POT-Creation-Date: 2014-03-24 15:15+0000\n"
+"PO-Revision-Date: 2014-03-25 05:04+0000\n"
 "Last-Translator: Jiro Matsuzawa <jmatsuzawa gnome org>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "Language: ja\n"
@@ -25,118 +25,154 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:115
+#: ../addressbook/backends/file/e-book-backend-file.c:117
 #, c-format
 msgid "Failed to remove file '%s': %s"
 msgstr "ファイル '%s' の削除に失敗しました: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:143
+#: ../addressbook/backends/file/e-book-backend-file.c:145
 #, c-format
 msgid "Failed to make directory %s: %s"
 msgstr "フォルダー %s の作成に失敗しました: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:394
+#: ../addressbook/backends/file/e-book-backend-file.c:396
 #, c-format
 msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "リソース '%s' のハードリンクの作成に失敗しました: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:499
-#: ../addressbook/backends/file/e-book-backend-file.c:1135
+#: ../addressbook/backends/file/e-book-backend-file.c:501
+#: ../addressbook/backends/file/e-book-backend-file.c:1230
 msgid "No UID in the contact"
 msgstr "この連絡先に UID はありません"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:773
+#: ../addressbook/backends/file/e-book-backend-file.c:828
 #, c-format
 msgid "Conflicting UIDs found in added contacts"
 msgstr "追加した連絡先に UID の衝突が見つかりました"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:881
+#: ../addressbook/backends/file/e-book-backend-file.c:967
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:883
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4419
+#: ../addressbook/backends/file/e-book-backend-file.c:969
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4423
 msgid "Searching..."
 msgstr "検索中..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1164
+#: ../addressbook/backends/file/e-book-backend-file.c:1258
 #, c-format
 msgid "Tried to modify contact '%s' with out of sync revision"
 msgstr "同期していない版の連絡先 '%s' を変更しようとしました"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1300
-#: ../addressbook/backends/file/e-book-backend-file.c:1369
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2707
+#: ../addressbook/backends/file/e-book-backend-file.c:1449
+#: ../addressbook/backends/file/e-book-backend-file.c:1532
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3077
+#: ../addressbook/libedata-book/e-book-sqlite.c:6706
 #, c-format
 msgid "Contact '%s' not found"
 msgstr "連絡先 '%s' が見つかりません"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1411
-#: ../addressbook/backends/file/e-book-backend-file.c:1478
+#: ../addressbook/backends/file/e-book-backend-file.c:1592
+#: ../addressbook/backends/file/e-book-backend-file.c:1673
 #, c-format
 msgid "Query '%s' not supported"
 msgstr "問い合わせ '%s' はサポートされていません"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1420
-#: ../addressbook/backends/file/e-book-backend-file.c:1487
+#: ../addressbook/backends/file/e-book-backend-file.c:1601
+#: ../addressbook/backends/file/e-book-backend-file.c:1682
 #, c-format
 msgid "Invalid Query '%s'"
 msgstr "問い合わせ内容 '%s' は無効です"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1671
+#: ../addressbook/backends/file/e-book-backend-file.c:1947
+msgid "Requested to delete an unrelated cursor"
+msgstr "関係ないカーソルの削除が要求されました"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:2014
 #, c-format
 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:1240
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4314
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:383
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:826
+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:147
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1242
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4318
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:417
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:874
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:35
-#: ../addressbook/libebook-contacts/e-phone-number.c:58
-#: ../addressbook/libedata-book/e-book-backend-sexp.c:874
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:568
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:599
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:611
-#: ../calendar/libecal/e-cal.c:2335 ../calendar/libecal/e-cal-client.c:268
-#: ../camel/camel-imapx-command.c:650 ../libedataserver/e-client.c:177
+#: ../addressbook/libebook-contacts/e-phone-number.c:56
+#: ../addressbook/libebook/e-book.c:1078
+#: ../addressbook/libebook/e-book-client.c:1882
+#: ../addressbook/libebook/e-book-client.c:2054
+#: ../addressbook/libebook/e-book-client.c:2267
+#: ../addressbook/libebook/e-book-client.c:2398
+#: ../addressbook/libebook/e-book-client.c:2557
+#: ../addressbook/libebook/e-book-client.c:2691
+#: ../addressbook/libebook/e-book-client.c:2822
+#: ../addressbook/libebook/e-book-client.c:2980
+#: ../addressbook/libebook/e-book-client.c:3175
+#: ../addressbook/libebook/e-book-client.c:3393
+#: ../addressbook/libedata-book/e-book-backend-sexp.c:878
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:576
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:607
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:270
+#: ../calendar/libecal/e-cal.c:2334 ../calendar/libecal/e-cal-client.c:276
+#: ../calendar/libecal/e-cal-client.c:3239
+#: ../calendar/libecal/e-cal-client.c:3412
+#: ../calendar/libecal/e-cal-client.c:3676
+#: ../calendar/libecal/e-cal-client.c:3917
+#: ../calendar/libecal/e-cal-client.c:4105
+#: ../calendar/libecal/e-cal-client.c:4297
+#: ../calendar/libecal/e-cal-client.c:4467
+#: ../calendar/libecal/e-cal-client.c:4636
+#: ../calendar/libecal/e-cal-client.c:4839
+#: ../calendar/libecal/e-cal-client.c:4989
+#: ../calendar/libecal/e-cal-client.c:5183
+#: ../calendar/libecal/e-cal-client.c:5336
+#: ../calendar/libecal/e-cal-client.c:5553
+#: ../calendar/libecal/e-cal-client.c:5707
+#: ../calendar/libecal/e-cal-client.c:5933
+#: ../calendar/libecal/e-cal-client.c:6129
+#: ../calendar/libecal/e-cal-client.c:6492
+#: ../calendar/libecal/e-cal-client.c:6706
+#: ../camel/providers/imapx/camel-imapx-command.c:642
+#: ../libedataserver/e-client.c:185
 msgid "Unknown error"
 msgstr "エラーを特定できません"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:833
+#: ../addressbook/backends/google/e-book-backend-google.c:847
 msgid "Querying for updated contacts…"
 msgstr "更新された連絡先を問い合わせ中…"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:985
+#: ../addressbook/backends/google/e-book-backend-google.c:999
 msgid "Querying for updated groups…"
 msgstr "更新されたグループを問い合わせ中…"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1673
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5050
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1293
+#: ../addressbook/backends/google/e-book-backend-google.c:1719
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5054
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1361
 msgid "The backend does not support bulk additions"
 msgstr "バックエンドが大量追加に対応していません"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1822
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5186
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1395
+#: ../addressbook/backends/google/e-book-backend-google.c:1868
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5190
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1473
 msgid "The backend does not support bulk modifications"
 msgstr "バックエンドが大量修正に対応していません"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2022
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1487
+#: ../addressbook/backends/google/e-book-backend-google.c:2068
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1573
 msgid "The backend does not support bulk removals"
 msgstr "バックエンドが大量削除に対応していません"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:2148
+#: ../addressbook/backends/google/e-book-backend-google.c:2194
 msgid "Loading…"
 msgstr "読み込み中…"
 
 #. System Group: My Contacts
-#: ../addressbook/backends/google/e-book-google-utils.c:1620
+#: ../addressbook/backends/google/e-book-google-utils.c:1625
 #: ../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
@@ -145,129 +181,130 @@ msgid "Personal"
 msgstr "個人"
 
 #. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1622
+#: ../addressbook/backends/google/e-book-google-utils.c:1627
 msgid "Friends"
 msgstr "友人"
 
 #. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1624
+#: ../addressbook/backends/google/e-book-google-utils.c:1629
 msgid "Family"
 msgstr "家族"
 
 #. System Group: Coworkers
-#: ../addressbook/backends/google/e-book-google-utils.c:1626
+#: ../addressbook/backends/google/e-book-google-utils.c:1631
 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:174
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:170
 msgid "Not connected"
 msgstr "接続していません"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:968
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:969
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr "v3 または v2 のバインドいずれかを使った結合に失敗しました"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1091
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1092
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP サーバーへ再接続中..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1221
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1223
 msgid "Invalid DN syntax"
 msgstr "無効な識別名 (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1237
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4313
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1239
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4317
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "LDAP エラー 0x%x (%s)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1849
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2172
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1851
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2174
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s: ldap_first_entry から NULL が返されました"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2102
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2230
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2104
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2232
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr "%s: 未処理の結果タイプ %d が返されました"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2363
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2490
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2365
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2492
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr "%s: 未処理の検索結果タイプ %d が返されました"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4262
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4266
 msgid "Receiving LDAP search results..."
 msgstr "LDAP サーバー検索結果を取得中..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4441
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4445
 msgid "Error performing search"
 msgstr "検索中にエラーが発生しました"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4569
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573
 #, c-format
 msgid "Downloading contacts (%d)..."
 msgstr "連絡先 (%d 個目) をダウンロード中..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5133
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5137
 msgid "Adding contact to LDAP server..."
 msgstr "LDAP サーバーへ連絡先を追加中..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5208
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5212
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP サーバーにある連絡先を修正中..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5274
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5278
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP サーバーから連絡先を削除中..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5663
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5667
 #, c-format
 msgid "Failed to get the DN for user '%s'"
 msgstr "ユーザー '%s' の DN 取得に失敗しました"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:805
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:853
 msgid "Loading Addressbook summary..."
 msgstr "アドレス帳の要約を読み込み中..."
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:823
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:871
 #, 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:842
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:890
 msgid "No response body in webdav PROPFIND result"
 msgstr "WebDAV PROPFIND の結果にレスポンスボディがありません"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:884
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:951
 #, c-format
 msgid "Loading Contacts (%d%%)"
 msgstr "連絡先を読み込み中 (%d%%)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1215
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1283
 msgid "Cannot transform SoupURI to string"
 msgstr "SoupURI を文字列に変換できません"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1326
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1402
 #, c-format
 msgid "Create resource '%s' failed with HTTP status %d (%s)"
 msgstr "リソース '%s' の作成に失敗しました。HTTP ステータス %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1424
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1504
 msgid "Contact on server changed -> not modifying"
 msgstr "サーバー上の連絡先が変更されました -> 修正していません"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1432
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1512
 #, c-format
 msgid "Modify contact failed with HTTP status %d (%s)"
 msgstr "連絡先の変更に失敗しました。HTTP ステータス %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1508
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1605
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1621
 #, c-format
 msgid "DELETE failed with HTTP status %d"
 msgstr "削除に失敗しました。HTTP ステータス: %d"
@@ -277,12 +314,12 @@ msgid "No such book"
 msgstr "そのようなアドレス帳はありません"
 
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:26
-#: ../addressbook/libedata-book/e-data-book.c:346
+#: ../addressbook/libedata-book/e-data-book.c:371
 msgid "Contact not found"
 msgstr "連絡先が見つかりません"
 
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:28
-#: ../addressbook/libedata-book/e-data-book.c:347
+#: ../addressbook/libedata-book/e-data-book.c:372
 msgid "Contact ID already exists"
 msgstr "連絡先 ID が既に存在します"
 
@@ -291,12 +328,12 @@ msgid "No such source"
 msgstr "そのようなソースはありません"
 
 #: ../addressbook/libebook-contacts/e-book-contacts-types.c:32
-#: ../addressbook/libedata-book/e-data-book.c:363
+#: ../addressbook/libedata-book/e-data-book.c:388
 msgid "No space"
 msgstr "スペースがありません"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook-contacts/e-contact.c:123
+#: ../addressbook/libebook-contacts/e-contact.c:131
 msgid "Unique ID"
 msgstr "重複しない ID"
 
@@ -304,12 +341,12 @@ msgstr "重複しない ID"
 #. * 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:128
+#: ../addressbook/libebook-contacts/e-contact.c:136
 msgid "File Under"
 msgstr "FILE UNDER"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook-contacts/e-contact.c:130
+#: ../addressbook/libebook-contacts/e-contact.c:138
 msgid "Book UID"
 msgstr "アドレス帳の UID"
 
@@ -317,434 +354,434 @@ msgstr "アドレス帳の UID"
 #. 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-contacts/e-contact.c:136
+#: ../addressbook/libebook-contacts/e-contact.c:144
 msgid "Full Name"
 msgstr "氏名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:137
+#: ../addressbook/libebook-contacts/e-contact.c:145
 msgid "Given Name"
 msgstr "名"
 
-#: ../addressbook/libebook-contacts/e-contact.c:138
+#: ../addressbook/libebook-contacts/e-contact.c:146
 msgid "Family Name"
 msgstr "姓"
 
-#: ../addressbook/libebook-contacts/e-contact.c:139
+#: ../addressbook/libebook-contacts/e-contact.c:147
 msgid "Nickname"
 msgstr "あだ名"
 
 #. Email fields
-#: ../addressbook/libebook-contacts/e-contact.c:142
+#: ../addressbook/libebook-contacts/e-contact.c:150
 msgid "Email 1"
 msgstr "メール 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:143
+#: ../addressbook/libebook-contacts/e-contact.c:151
 msgid "Email 2"
 msgstr "メール 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:144
+#: ../addressbook/libebook-contacts/e-contact.c:152
 msgid "Email 3"
 msgstr "メール 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:145
+#: ../addressbook/libebook-contacts/e-contact.c:153
 msgid "Email 4"
 msgstr "メール 4"
 
-#: ../addressbook/libebook-contacts/e-contact.c:147
+#: ../addressbook/libebook-contacts/e-contact.c:155
 msgid "Mailer"
 msgstr "メールクライアント"
 
 #. Address Labels
-#: ../addressbook/libebook-contacts/e-contact.c:150
+#: ../addressbook/libebook-contacts/e-contact.c:158
 msgid "Home Address Label"
 msgstr "自宅の住所ラベル"
 
-#: ../addressbook/libebook-contacts/e-contact.c:151
+#: ../addressbook/libebook-contacts/e-contact.c:159
 msgid "Work Address Label"
 msgstr "勤務先の住所ラベル"
 
-#: ../addressbook/libebook-contacts/e-contact.c:152
+#: ../addressbook/libebook-contacts/e-contact.c:160
 msgid "Other Address Label"
 msgstr "その他の住所ラベル"
 
 #. Phone fields
-#: ../addressbook/libebook-contacts/e-contact.c:155
+#: ../addressbook/libebook-contacts/e-contact.c:163
 msgid "Assistant Phone"
 msgstr "アシスタントの電話番号"
 
-#: ../addressbook/libebook-contacts/e-contact.c:156
+#: ../addressbook/libebook-contacts/e-contact.c:164
 msgid "Business Phone"
 msgstr "仕事の電話番号"
 
-#: ../addressbook/libebook-contacts/e-contact.c:157
+#: ../addressbook/libebook-contacts/e-contact.c:165
 msgid "Business Phone 2"
 msgstr "仕事の電話番号 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:158
+#: ../addressbook/libebook-contacts/e-contact.c:166
 msgid "Business Fax"
 msgstr "仕事の FAX 番号"
 
-#: ../addressbook/libebook-contacts/e-contact.c:159
+#: ../addressbook/libebook-contacts/e-contact.c:167
 msgid "Callback Phone"
 msgstr "得意先の電話番号"
 
-#: ../addressbook/libebook-contacts/e-contact.c:160
+#: ../addressbook/libebook-contacts/e-contact.c:168
 msgid "Car Phone"
 msgstr "車載電話の番号"
 
-#: ../addressbook/libebook-contacts/e-contact.c:161
+#: ../addressbook/libebook-contacts/e-contact.c:169
 msgid "Company Phone"
 msgstr "会社の電話番号"
 
-#: ../addressbook/libebook-contacts/e-contact.c:162
+#: ../addressbook/libebook-contacts/e-contact.c:170
 msgid "Home Phone"
 msgstr "自宅の電話番号"
 
-#: ../addressbook/libebook-contacts/e-contact.c:163
+#: ../addressbook/libebook-contacts/e-contact.c:171
 msgid "Home Phone 2"
 msgstr "自宅の電話番号 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:164
+#: ../addressbook/libebook-contacts/e-contact.c:172
 msgid "Home Fax"
 msgstr "自宅の FAX 番号"
 
-#: ../addressbook/libebook-contacts/e-contact.c:165
+#: ../addressbook/libebook-contacts/e-contact.c:173
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook-contacts/e-contact.c:166
+#: ../addressbook/libebook-contacts/e-contact.c:174
 msgid "Mobile Phone"
 msgstr "携帯電話の番号"
 
-#: ../addressbook/libebook-contacts/e-contact.c:167
+#: ../addressbook/libebook-contacts/e-contact.c:175
 msgid "Other Phone"
 msgstr "その他の電話番号"
 
-#: ../addressbook/libebook-contacts/e-contact.c:168
+#: ../addressbook/libebook-contacts/e-contact.c:176
 msgid "Other Fax"
 msgstr "その他の FAX 番号"
 
-#: ../addressbook/libebook-contacts/e-contact.c:169
+#: ../addressbook/libebook-contacts/e-contact.c:177
 msgid "Pager"
 msgstr "ポケベルの番号"
 
-#: ../addressbook/libebook-contacts/e-contact.c:170
+#: ../addressbook/libebook-contacts/e-contact.c:178
 msgid "Primary Phone"
 msgstr "電話番号"
 
-#: ../addressbook/libebook-contacts/e-contact.c:171
+#: ../addressbook/libebook-contacts/e-contact.c:179
 msgid "Radio"
 msgstr "ラジオ"
 
-#: ../addressbook/libebook-contacts/e-contact.c:172
+#: ../addressbook/libebook-contacts/e-contact.c:180
 msgid "Telex"
 msgstr "テレックス"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook-contacts/e-contact.c:174
+#: ../addressbook/libebook-contacts/e-contact.c:182
 msgid "TTY"
 msgstr "テレタイプライター"
 
 #. Organizational fields
-#: ../addressbook/libebook-contacts/e-contact.c:177
+#: ../addressbook/libebook-contacts/e-contact.c:185
 msgid "Organization"
 msgstr "組織"
 
-#: ../addressbook/libebook-contacts/e-contact.c:178
+#: ../addressbook/libebook-contacts/e-contact.c:186
 msgid "Organizational Unit"
 msgstr "組織"
 
-#: ../addressbook/libebook-contacts/e-contact.c:179
+#: ../addressbook/libebook-contacts/e-contact.c:187
 msgid "Office"
 msgstr "事務所"
 
-#: ../addressbook/libebook-contacts/e-contact.c:180
+#: ../addressbook/libebook-contacts/e-contact.c:188
 msgid "Title"
 msgstr "敬称 (前つけ)"
 
-#: ../addressbook/libebook-contacts/e-contact.c:181
+#: ../addressbook/libebook-contacts/e-contact.c:189
 msgid "Role"
 msgstr "役割"
 
-#: ../addressbook/libebook-contacts/e-contact.c:182
+#: ../addressbook/libebook-contacts/e-contact.c:190
 msgid "Manager"
 msgstr "マネージャー"
 
-#: ../addressbook/libebook-contacts/e-contact.c:183
+#: ../addressbook/libebook-contacts/e-contact.c:191
 msgid "Assistant"
 msgstr "アシスタント"
 
 #. Web fields
-#: ../addressbook/libebook-contacts/e-contact.c:186
+#: ../addressbook/libebook-contacts/e-contact.c:194
 msgid "Homepage URL"
 msgstr "ホームページの URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:187
+#: ../addressbook/libebook-contacts/e-contact.c:195
 msgid "Weblog URL"
 msgstr "ブログの URL"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:190
+#: ../addressbook/libebook-contacts/e-contact.c:198
 msgid "Categories"
 msgstr "カテゴリ"
 
 #. Collaboration fields
-#: ../addressbook/libebook-contacts/e-contact.c:193
+#: ../addressbook/libebook-contacts/e-contact.c:201
 msgid "Calendar URI"
 msgstr "カレンダーの URI"
 
-#: ../addressbook/libebook-contacts/e-contact.c:194
+#: ../addressbook/libebook-contacts/e-contact.c:202
 msgid "Free/Busy URL"
 msgstr "予定の有無の URL"
 
-#: ../addressbook/libebook-contacts/e-contact.c:195
+#: ../addressbook/libebook-contacts/e-contact.c:203
 msgid "ICS Calendar"
 msgstr "ICS カレンダー"
 
-#: ../addressbook/libebook-contacts/e-contact.c:196
+#: ../addressbook/libebook-contacts/e-contact.c:204
 msgid "Video Conferencing URL"
 msgstr "ビデオ会議用の URL"
 
 #. Misc fields
-#: ../addressbook/libebook-contacts/e-contact.c:199
+#: ../addressbook/libebook-contacts/e-contact.c:207
 msgid "Spouse's Name"
 msgstr "配偶者の名前"
 
-#: ../addressbook/libebook-contacts/e-contact.c:200
+#: ../addressbook/libebook-contacts/e-contact.c:208
 msgid "Note"
 msgstr "ノート"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:203
+#: ../addressbook/libebook-contacts/e-contact.c:211
 msgid "AIM Home Screen Name 1"
 msgstr "自宅の AIM スクリーン名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:204
+#: ../addressbook/libebook-contacts/e-contact.c:212
 msgid "AIM Home Screen Name 2"
 msgstr "自宅の AIM スクリーン名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:205
+#: ../addressbook/libebook-contacts/e-contact.c:213
 msgid "AIM Home Screen Name 3"
 msgstr "自宅の AIM スクリーン名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:206
+#: ../addressbook/libebook-contacts/e-contact.c:214
 msgid "AIM Work Screen Name 1"
 msgstr "勤務先の AIM スクリーン名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:207
+#: ../addressbook/libebook-contacts/e-contact.c:215
 msgid "AIM Work Screen Name 2"
 msgstr "勤務先の AIM スクリーン名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:208
+#: ../addressbook/libebook-contacts/e-contact.c:216
 msgid "AIM Work Screen Name 3"
 msgstr "勤務先の AIM スクリーン名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:209
+#: ../addressbook/libebook-contacts/e-contact.c:217
 msgid "GroupWise Home Screen Name 1"
 msgstr "自宅の GroupWise スクリーン名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:210
+#: ../addressbook/libebook-contacts/e-contact.c:218
 msgid "GroupWise Home Screen Name 2"
 msgstr "自宅の GroupWise スクリーン名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:211
+#: ../addressbook/libebook-contacts/e-contact.c:219
 msgid "GroupWise Home Screen Name 3"
 msgstr "自宅の GroupWise スクリーン名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:212
+#: ../addressbook/libebook-contacts/e-contact.c:220
 msgid "GroupWise Work Screen Name 1"
 msgstr "勤務先の GroupWise スクリーン名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:213
+#: ../addressbook/libebook-contacts/e-contact.c:221
 msgid "GroupWise Work Screen Name 2"
 msgstr "勤務先の GroupWise スクリーン名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:214
+#: ../addressbook/libebook-contacts/e-contact.c:222
 msgid "GroupWise Work Screen Name 3"
 msgstr "勤務先の GroupWise スクリーン名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:215
+#: ../addressbook/libebook-contacts/e-contact.c:223
 msgid "Jabber Home ID 1"
 msgstr "自宅の Jabber ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:216
+#: ../addressbook/libebook-contacts/e-contact.c:224
 msgid "Jabber Home ID 2"
 msgstr "自宅の Jabber ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:217
+#: ../addressbook/libebook-contacts/e-contact.c:225
 msgid "Jabber Home ID 3"
 msgstr "自宅の Jabber ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:218
+#: ../addressbook/libebook-contacts/e-contact.c:226
 msgid "Jabber Work ID 1"
 msgstr "勤務先の Jabber ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:219
+#: ../addressbook/libebook-contacts/e-contact.c:227
 msgid "Jabber Work ID 2"
 msgstr "勤務先の Jabber ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:220
+#: ../addressbook/libebook-contacts/e-contact.c:228
 msgid "Jabber Work ID 3"
 msgstr "勤務先の Jabber ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:221
+#: ../addressbook/libebook-contacts/e-contact.c:229
 msgid "Yahoo! Home Screen Name 1"
 msgstr "自宅の Yahoo! スクリーン名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:222
+#: ../addressbook/libebook-contacts/e-contact.c:230
 msgid "Yahoo! Home Screen Name 2"
 msgstr "自宅の Yahoo! スクリーン名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:223
+#: ../addressbook/libebook-contacts/e-contact.c:231
 msgid "Yahoo! Home Screen Name 3"
 msgstr "自宅の Yahoo! スクリーン名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:224
+#: ../addressbook/libebook-contacts/e-contact.c:232
 msgid "Yahoo! Work Screen Name 1"
 msgstr "勤務先の Yahoo! スクリーン名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:225
+#: ../addressbook/libebook-contacts/e-contact.c:233
 msgid "Yahoo! Work Screen Name 2"
 msgstr "勤務先の Yahoo! スクリーン名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:226
+#: ../addressbook/libebook-contacts/e-contact.c:234
 msgid "Yahoo! Work Screen Name 3"
 msgstr "勤務先の Yahoo! スクリーン名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:227
+#: ../addressbook/libebook-contacts/e-contact.c:235
 msgid "MSN Home Screen Name 1"
 msgstr "自宅の MSN スクリーン名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:228
+#: ../addressbook/libebook-contacts/e-contact.c:236
 msgid "MSN Home Screen Name 2"
 msgstr "自宅の MSN スクリーン名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:229
+#: ../addressbook/libebook-contacts/e-contact.c:237
 msgid "MSN Home Screen Name 3"
 msgstr "自宅の MSN スクリーン名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:230
+#: ../addressbook/libebook-contacts/e-contact.c:238
 msgid "MSN Work Screen Name 1"
 msgstr "勤務先の MSN スクリーン名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:231
+#: ../addressbook/libebook-contacts/e-contact.c:239
 msgid "MSN Work Screen Name 2"
 msgstr "勤務先の MSN スクリーン名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:232
+#: ../addressbook/libebook-contacts/e-contact.c:240
 msgid "MSN Work Screen Name 3"
 msgstr "勤務先の MSN スクリーン名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:233
+#: ../addressbook/libebook-contacts/e-contact.c:241
 msgid "ICQ Home ID 1"
 msgstr "自宅の ICQ ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:234
+#: ../addressbook/libebook-contacts/e-contact.c:242
 msgid "ICQ Home ID 2"
 msgstr "自宅の ICQ ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:235
+#: ../addressbook/libebook-contacts/e-contact.c:243
 msgid "ICQ Home ID 3"
 msgstr "自宅の ICQ ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:236
+#: ../addressbook/libebook-contacts/e-contact.c:244
 msgid "ICQ Work ID 1"
 msgstr "勤務先の ICQ ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:237
+#: ../addressbook/libebook-contacts/e-contact.c:245
 msgid "ICQ Work ID 2"
 msgstr "勤務先の ICQ ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:238
+#: ../addressbook/libebook-contacts/e-contact.c:246
 msgid "ICQ Work ID 3"
 msgstr "勤務先の ICQ ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook-contacts/e-contact.c:241
+#: ../addressbook/libebook-contacts/e-contact.c:249
 msgid "Last Revision"
 msgstr "最終更新日時"
 
 #. 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:245
+#: ../addressbook/libebook-contacts/e-contact.c:253
 msgid "Name or Org"
 msgstr "名前または組織"
 
 #. Address fields
-#: ../addressbook/libebook-contacts/e-contact.c:248
+#: ../addressbook/libebook-contacts/e-contact.c:256
 msgid "Address List"
 msgstr "住所の一覧"
 
-#: ../addressbook/libebook-contacts/e-contact.c:249
+#: ../addressbook/libebook-contacts/e-contact.c:257
 msgid "Home Address"
 msgstr "自宅の住所"
 
-#: ../addressbook/libebook-contacts/e-contact.c:250
+#: ../addressbook/libebook-contacts/e-contact.c:258
 msgid "Work Address"
 msgstr "勤務先の住所"
 
-#: ../addressbook/libebook-contacts/e-contact.c:251
+#: ../addressbook/libebook-contacts/e-contact.c:259
 msgid "Other Address"
 msgstr "その他の住所"
 
 #. Contact categories
-#: ../addressbook/libebook-contacts/e-contact.c:254
+#: ../addressbook/libebook-contacts/e-contact.c:262
 msgid "Category List"
 msgstr "カテゴリの一覧"
 
 #. Photo/Logo
-#: ../addressbook/libebook-contacts/e-contact.c:257
+#: ../addressbook/libebook-contacts/e-contact.c:265
 msgid "Photo"
 msgstr "写真"
 
-#: ../addressbook/libebook-contacts/e-contact.c:258
+#: ../addressbook/libebook-contacts/e-contact.c:266
 msgid "Logo"
 msgstr "ロゴ"
 
 #. 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:262
+#: ../addressbook/libebook-contacts/e-contact.c:270
 msgid "Name"
 msgstr "名前"
 
-#: ../addressbook/libebook-contacts/e-contact.c:263
+#: ../addressbook/libebook-contacts/e-contact.c:271
 msgid "Email List"
 msgstr "メール一覧"
 
 #. Instant messaging fields
-#: ../addressbook/libebook-contacts/e-contact.c:266
+#: ../addressbook/libebook-contacts/e-contact.c:274
 msgid "AIM Screen Name List"
 msgstr "AIM スクリーン名の一覧"
 
-#: ../addressbook/libebook-contacts/e-contact.c:267
+#: ../addressbook/libebook-contacts/e-contact.c:275
 msgid "GroupWise ID List"
 msgstr "GroupWise ID の一覧"
 
-#: ../addressbook/libebook-contacts/e-contact.c:268
+#: ../addressbook/libebook-contacts/e-contact.c:276
 msgid "Jabber ID List"
 msgstr "Jabber ID の一覧"
 
-#: ../addressbook/libebook-contacts/e-contact.c:269
+#: ../addressbook/libebook-contacts/e-contact.c:277
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! スクリーン名の一覧"
 
-#: ../addressbook/libebook-contacts/e-contact.c:270
+#: ../addressbook/libebook-contacts/e-contact.c:278
 msgid "MSN Screen Name List"
 msgstr "MSN スクリーン名の一覧"
 
-#: ../addressbook/libebook-contacts/e-contact.c:271
+#: ../addressbook/libebook-contacts/e-contact.c:279
 msgid "ICQ ID List"
 msgstr "ICQ の ID 一覧です"
 
-#: ../addressbook/libebook-contacts/e-contact.c:273
+#: ../addressbook/libebook-contacts/e-contact.c:281
 msgid "Wants HTML Mail"
 msgstr "HTML 形式のメールを希望する"
 
 #. 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:278
+#: ../addressbook/libebook-contacts/e-contact.c:286
 msgid "List"
 msgstr "一覧"
 
@@ -752,447 +789,544 @@ msgstr "一覧"
 #. * 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:283
+#: ../addressbook/libebook-contacts/e-contact.c:291
 msgid "List Shows Addresses"
 msgstr "住所を表示する一覧です"
 
-#: ../addressbook/libebook-contacts/e-contact.c:285
+#: ../addressbook/libebook-contacts/e-contact.c:293
 msgid "Birth Date"
 msgstr "誕生日"
 
-#: ../addressbook/libebook-contacts/e-contact.c:286
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:887
+#: ../addressbook/libebook-contacts/e-contact.c:294
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:893
 msgid "Anniversary"
 msgstr "記念日"
 
 #. Security fields
-#: ../addressbook/libebook-contacts/e-contact.c:289
+#: ../addressbook/libebook-contacts/e-contact.c:297
 msgid "X.509 Certificate"
 msgstr "X.509 認証"
 
-#: ../addressbook/libebook-contacts/e-contact.c:291
+#: ../addressbook/libebook-contacts/e-contact.c:299
 msgid "Gadu-Gadu Home ID 1"
 msgstr "自宅の Gadu-Gadu ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:292
+#: ../addressbook/libebook-contacts/e-contact.c:300
 msgid "Gadu-Gadu Home ID 2"
 msgstr "自宅の Gadu-Gadu ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:293
+#: ../addressbook/libebook-contacts/e-contact.c:301
 msgid "Gadu-Gadu Home ID 3"
 msgstr "自宅の Gadu-Gadu ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:294
+#: ../addressbook/libebook-contacts/e-contact.c:302
 msgid "Gadu-Gadu Work ID 1"
 msgstr "勤務先の Gadu-Gadu ID 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:295
+#: ../addressbook/libebook-contacts/e-contact.c:303
 msgid "Gadu-Gadu Work ID 2"
 msgstr "勤務先の Gadu-Gadu ID 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:296
+#: ../addressbook/libebook-contacts/e-contact.c:304
 msgid "Gadu-Gadu Work ID 3"
 msgstr "勤務先の Gadu-Gadu ID 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:297
+#: ../addressbook/libebook-contacts/e-contact.c:305
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID の一覧"
 
 #. Geo information
-#: ../addressbook/libebook-contacts/e-contact.c:300
+#: ../addressbook/libebook-contacts/e-contact.c:308
 msgid "Geographic Information"
 msgstr "地理情報"
 
-#: ../addressbook/libebook-contacts/e-contact.c:302
+#: ../addressbook/libebook-contacts/e-contact.c:310
 msgid "Telephone"
 msgstr "電話"
 
-#: ../addressbook/libebook-contacts/e-contact.c:304
+#: ../addressbook/libebook-contacts/e-contact.c:312
 msgid "Skype Home Name 1"
 msgstr "自宅の Skype 名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:305
+#: ../addressbook/libebook-contacts/e-contact.c:313
 msgid "Skype Home Name 2"
 msgstr "自宅の Skype 名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:306
+#: ../addressbook/libebook-contacts/e-contact.c:314
 msgid "Skype Home Name 3"
 msgstr "自宅の Skype 名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:307
+#: ../addressbook/libebook-contacts/e-contact.c:315
 msgid "Skype Work Name 1"
 msgstr "勤務先の Skype 名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:308
+#: ../addressbook/libebook-contacts/e-contact.c:316
 msgid "Skype Work Name 2"
 msgstr "勤務先の Skype 名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:309
+#: ../addressbook/libebook-contacts/e-contact.c:317
 msgid "Skype Work Name 3"
 msgstr "勤務先の Skype 名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:310
+#: ../addressbook/libebook-contacts/e-contact.c:318
 msgid "Skype Name List"
 msgstr "Skype 名の一覧"
 
-#: ../addressbook/libebook-contacts/e-contact.c:312
+#: ../addressbook/libebook-contacts/e-contact.c:320
 msgid "SIP address"
 msgstr "SIP アドレス"
 
-#: ../addressbook/libebook-contacts/e-contact.c:314
+#: ../addressbook/libebook-contacts/e-contact.c:322
 msgid "Google Talk Home Name 1"
 msgstr "自宅の Google Talk 名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:315
+#: ../addressbook/libebook-contacts/e-contact.c:323
 msgid "Google Talk Home Name 2"
 msgstr "自宅の Google Talk 名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:316
+#: ../addressbook/libebook-contacts/e-contact.c:324
 msgid "Google Talk Home Name 3"
 msgstr "自宅の Google Talk 名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:317
+#: ../addressbook/libebook-contacts/e-contact.c:325
 msgid "Google Talk Work Name 1"
 msgstr "勤務先の Google Talk 名 1"
 
-#: ../addressbook/libebook-contacts/e-contact.c:318
+#: ../addressbook/libebook-contacts/e-contact.c:326
 msgid "Google Talk Work Name 2"
 msgstr "勤務先の Google Talk 名 2"
 
-#: ../addressbook/libebook-contacts/e-contact.c:319
+#: ../addressbook/libebook-contacts/e-contact.c:327
 msgid "Google Talk Work Name 3"
 msgstr "勤務先の Google Talk 名 3"
 
-#: ../addressbook/libebook-contacts/e-contact.c:320
+#: ../addressbook/libebook-contacts/e-contact.c:328
 msgid "Google Talk Name List"
 msgstr "Google Talk 名の一覧"
 
-#: ../addressbook/libebook-contacts/e-contact.c:322
+#: ../addressbook/libebook-contacts/e-contact.c:330
 msgid "Twitter Name List"
 msgstr "Twitter 名の一覧"
 
-#: ../addressbook/libebook-contacts/e-contact.c:1627
-#: ../addressbook/libebook/e-destination.c:883
+#: ../addressbook/libebook-contacts/e-contact.c:1635
+#: ../addressbook/libebook/e-destination.c:917
 msgid "Unnamed List"
 msgstr "名前なしの一覧"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:43
+#: ../addressbook/libebook-contacts/e-phone-number.c:41
 msgid "The library was built without phone number support."
 msgstr "このライブラリは電話番号サポートなしでビルドされています。"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:45
+#: ../addressbook/libebook-contacts/e-phone-number.c:43
 msgid "The phone number parser reported an yet unkown error code."
 msgstr "電話番号パーサーが未知のエラーコードを返しました。"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:47
+#: ../addressbook/libebook-contacts/e-phone-number.c:45
 msgid "Not a phone number"
 msgstr "電話番号ではありません"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:49
+#: ../addressbook/libebook-contacts/e-phone-number.c:47
 msgid "Invalid country calling code"
 msgstr "国呼び出しコードが無効です"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:51
+#: ../addressbook/libebook-contacts/e-phone-number.c:49
 msgid "Remaining text after the country calling code is too short for a phone number"
 msgstr "国呼び出しコードの後の残り文字列が電話番号としては短すぎます"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:53
+#: ../addressbook/libebook-contacts/e-phone-number.c:51
 msgid "Text is too short for a phone number"
 msgstr "文字列が電話番号としては短すぎます"
 
-#: ../addressbook/libebook-contacts/e-phone-number.c:55
+#: ../addressbook/libebook-contacts/e-phone-number.c:53
 msgid "Text is too long for a phone number"
 msgstr "文字列が電話番号としては長すぎます"
 
-#: ../addressbook/libebook/e-book-client.c:749
+#: ../addressbook/libebook/e-book-client.c:807
 #, c-format
 msgid "Unknown book property '%s'"
 msgstr "不明なアドレス帳プロパティ '%s'"
 
-#: ../addressbook/libebook/e-book-client.c:764
+#: ../addressbook/libebook/e-book-client.c:822
 #, c-format
 msgid "Cannot change value of book property '%s'"
 msgstr "アドレス帳プロパティ '%s' の値を変更できません"
 
-#: ../addressbook/libebook/e-book-client.c:1099
-#: ../addressbook/libebook/e-book-client.c:1274
-#: ../calendar/libecal/e-cal-client.c:1522
-#: ../calendar/libecal/e-cal-client.c:1704
+#: ../addressbook/libebook/e-book-client.c:1207
+#: ../addressbook/libebook/e-book-client.c:1382
+#: ../addressbook/libebook/e-book-client.c:1649
+#: ../calendar/libecal/e-cal-client.c:1530
+#: ../calendar/libecal/e-cal-client.c:1712
 #, c-format
 msgid "Unable to connect to '%s': "
 msgstr "'%s' へ接続できません: "
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:796
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:899
+#: ../addressbook/libedata-book/e-book-sqlite.c:2163
 #, c-format
 msgid "Error introspecting unknown summary field '%s'"
 msgstr "不明なサマリーフィールド '%s' の内部検査エラー"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1295
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1509
+#: ../addressbook/libedata-book/e-book-sqlite.c:1319
 msgid "Error parsing regular expression"
 msgstr "正規表現解析エラー"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1340
-#: ../camel/camel-db.c:544
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1554
+#: ../addressbook/libedata-book/e-book-sqlite.c:1803 ../camel/camel-db.c:545
 #, c-format
 msgid "Insufficient memory"
 msgstr "メモリが足りません"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1473
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1691
 #, c-format
 msgid "Invalid contact field '%d' specified in summary"
 msgstr "無効な連絡先 '%d' がサマリーで指定されています"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1507
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1725
+#: ../addressbook/libedata-book/e-book-sqlite.c:557
 #, c-format
 msgid "Contact field '%s' of type '%s' specified in summary, but only boolean, string and string list field 
types are supported"
 msgstr "サマリーで連絡先 '%s' が型 '%s' に対して指定されていますが、サポートされている型は真偽値、文字列、文字列一覧だけです"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2695
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3772
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3065
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4161
 #, c-format
 msgid "Full search_contacts are not stored in cache. vcards cannot be returned."
 msgstr "search_contacts は全体がキャッシュに保管されてはいません。vcard を返せません。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3898
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3979
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4292
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4385
+#: ../addressbook/libedata-book/e-book-sqlite.c:5364
 #, c-format
 msgid "Query contained unsupported elements"
 msgstr "問い合わせにサポート外のエレメントがありました"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3902
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4296
 #, c-format
 msgid "Invalid Query"
 msgstr "問い合わせの内容が無効です"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3926
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4320
 #, c-format
 msgid "Full search_contacts are not stored in cache. Hence only summary query is supported."
 msgstr "search_contacts は全体がキャッシュに保管されてはいません。サマリーの問い合わせだけをサポートしています。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3983
-#: ../addressbook/libedata-book/e-data-book.c:358
-#: ../addressbook/libedata-book/e-data-book.c:992
-#: ../calendar/libedata-cal/e-data-cal.c:412
-#: ../calendar/libedata-cal/e-data-cal.c:1299 ../libedataserver/e-client.c:164
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4389
+#: ../addressbook/libedata-book/e-data-book.c:383
+#: ../addressbook/libedata-book/e-data-book.c:1028
+#: ../calendar/libedata-cal/e-data-cal.c:420
+#: ../calendar/libedata-cal/e-data-cal.c:1307 ../libedataserver/e-client.c:172
 #, c-format
 msgid "Invalid query"
 msgstr "問い合わせの内容が無効です"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4026
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4432
 #, c-format
 msgid "Full vcards are not stored in cache. Hence only summary query is supported."
 msgstr "vcard は全体がキャッシュに保管されてはいません。サマリーの問い合わせだけをサポートしています。"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:4729
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:5255
 #, c-format
 msgid "Unable to remove the db file: errno %d"
 msgstr "データベースファイルの削除に失敗しました: エラー番号: %d"
 
-#: ../addressbook/libedata-book/e-data-book.c:342
-#: ../calendar/libedata-cal/e-data-cal.c:393
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6042
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6442
+#, c-format
+msgid "Only summary queries are supported by EbSdbCursor"
+msgstr "EbSdbCursor ではサマリーの問い合わせだけをサポートしています"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6049
+#, c-format
+msgid "At least one sort field must be specified to use an EbSdbCursor"
+msgstr "EbSdbCursor を利用するには並べ替える項目を最低でも1つは指定する必要があります"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6063
+#, c-format
+msgid "Cannot sort by a field that is not in the summary"
+msgstr "サマリーにない項目による並べ替えはできません"
+
+# Translator's NOTE: 「複数の値を取り得る」では突っ込みの余地が生まれるので補った
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6070
+#, c-format
+msgid "Cannot sort by a field which may have multiple values"
+msgstr "複数の値を同時に取り得る項目による並べ替えはできません"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6203
+#: ../addressbook/libedata-book/e-book-sqlite.c:7376
+#, c-format
+msgid "Tried to step a cursor in reverse, but cursor is already at the beginning of the contact list"
+msgstr "カーソルを1つ手前に移動しようとしましたがカーソルは既に連絡先一覧の先頭にありました"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:6211
+#: ../addressbook/libedata-book/e-book-sqlite.c:7384
+#, c-format
+msgid "Tried to step a cursor forwards, but cursor is already at the end of the contact list"
+msgstr "カーソルを1つ先に移動しようとしましたがカーソルは既に連絡先一覧の最後尾にありました"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:524
+#, fuzzy, c-format
+#| msgid "Invalid contact field '%d' specified in summary"
+msgid "Unsupported contact field '%d' specified in summary"
+msgstr "無効な連絡先 '%d' がサマリーで指定されています"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:1876
+msgid "Cannot upgrade contacts database from a legacy database with more than one addressbook. Delete one of 
the entries in the 'folders' table first."
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:5357
+#, fuzzy, c-format
+#| msgid "Invalid query: "
+msgid "Invalid query: %s"
+msgstr "問い合わせ内容が無効です: "
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:5532
+#, fuzzy
+#| msgid "Invalid query: "
+msgid "Invalid query for EbSqlCursor"
+msgstr "問い合わせ内容が無効です: "
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:7198
+#, fuzzy
+#| msgid "At least one sort field must be specified to use an EbSdbCursor"
+msgid "At least one sort field must be specified to use an EbSqlCursor"
+msgstr "EbSdbCursor を利用するには並べ替える項目を最低でも1つは指定する必要があります"
+
+#: ../addressbook/libedata-book/e-book-sqlite.c:7216
+#, fuzzy
+#| msgid "Cannot sort by a field that is not in the summary"
+msgid "Cannot sort by a field that is not a string type"
+msgstr "サマリーにない項目による並べ替えはできません"
+
+#: ../addressbook/libedata-book/e-data-book.c:367
+#: ../calendar/libedata-cal/e-data-cal.c:401
 msgid "Success"
 msgstr "成功しました"
 
-#: ../addressbook/libedata-book/e-data-book.c:343
-#: ../calendar/libecal/e-cal.c:2303 ../calendar/libedata-cal/e-data-cal.c:394
-#: ../libedataserver/e-client.c:131
+#: ../addressbook/libedata-book/e-data-book.c:368
+#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:402
+#: ../libedataserver/e-client.c:139
 msgid "Backend is busy"
 msgstr "バックエンドが処理中です"
 
-#: ../addressbook/libedata-book/e-data-book.c:344
-#: ../calendar/libedata-cal/e-data-cal.c:395 ../libedataserver/e-client.c:141
+#: ../addressbook/libedata-book/e-data-book.c:369
+#: ../calendar/libedata-cal/e-data-cal.c:403 ../libedataserver/e-client.c:149
 msgid "Repository offline"
 msgstr "リポジトリはオフラインです"
 
-#: ../addressbook/libedata-book/e-data-book.c:345
-#: ../calendar/libecal/e-cal.c:2317 ../calendar/libedata-cal/e-data-cal.c:396
-#: ../libedataserver/e-client.c:148
+#: ../addressbook/libedata-book/e-data-book.c:370
+#: ../calendar/libecal/e-cal.c:2316 ../calendar/libedata-cal/e-data-cal.c:404
+#: ../libedataserver/e-client.c:156
 msgid "Permission denied"
 msgstr "権限がありません"
 
-#: ../addressbook/libedata-book/e-data-book.c:348
-#: ../calendar/libedata-cal/e-data-cal.c:401
+#: ../addressbook/libedata-book/e-data-book.c:373
+#: ../calendar/libedata-cal/e-data-cal.c:409
 msgid "Authentication Failed"
 msgstr "認証に失敗しました"
 
-#: ../addressbook/libedata-book/e-data-book.c:349
-#: ../calendar/libedata-cal/e-data-cal.c:402
+#: ../addressbook/libedata-book/e-data-book.c:374
+#: ../calendar/libedata-cal/e-data-cal.c:410
 msgid "Authentication Required"
 msgstr "認証が必要です"
 
-#: ../addressbook/libedata-book/e-data-book.c:350
-#: ../calendar/libedata-cal/e-data-cal.c:403
+#: ../addressbook/libedata-book/e-data-book.c:375
+#: ../calendar/libedata-cal/e-data-cal.c:411
 msgid "Unsupported field"
 msgstr "サポートしていない項目です"
 
-#: ../addressbook/libedata-book/e-data-book.c:351
-#: ../calendar/libedata-cal/e-data-cal.c:405 ../libedataserver/e-client.c:156
+#: ../addressbook/libedata-book/e-data-book.c:376
+#: ../calendar/libedata-cal/e-data-cal.c:413 ../libedataserver/e-client.c:164
 msgid "Unsupported authentication method"
 msgstr "サポートしていない認証方法です"
 
-#: ../addressbook/libedata-book/e-data-book.c:352
-#: ../calendar/libedata-cal/e-data-cal.c:406 ../libedataserver/e-client.c:158
+#: ../addressbook/libedata-book/e-data-book.c:377
+#: ../calendar/libedata-cal/e-data-cal.c:414 ../libedataserver/e-client.c:166
 msgid "TLS not available"
 msgstr "TLS は利用できません"
 
-#: ../addressbook/libedata-book/e-data-book.c:353
+#: ../addressbook/libedata-book/e-data-book.c:378
 msgid "Address book does not exist"
 msgstr "アドレス帳がありません"
 
-#: ../addressbook/libedata-book/e-data-book.c:354
+#: ../addressbook/libedata-book/e-data-book.c:379
 msgid "Book removed"
 msgstr "データブックは削除されました"
 
-#: ../addressbook/libedata-book/e-data-book.c:355
-#: ../calendar/libedata-cal/e-data-cal.c:409
+#: ../addressbook/libedata-book/e-data-book.c:380
+#: ../calendar/libedata-cal/e-data-cal.c:417
 msgid "Not available in offline mode"
 msgstr "オフラインモードでは利用できません"
 
-#: ../addressbook/libedata-book/e-data-book.c:356
-#: ../calendar/libedata-cal/e-data-cal.c:410 ../libedataserver/e-client.c:160
+#: ../addressbook/libedata-book/e-data-book.c:381
+#: ../calendar/libedata-cal/e-data-cal.c:418 ../libedataserver/e-client.c:168
 msgid "Search size limit exceeded"
 msgstr "検索サイズが上限を超えました"
 
-#: ../addressbook/libedata-book/e-data-book.c:357
-#: ../calendar/libedata-cal/e-data-cal.c:411 ../libedataserver/e-client.c:162
+#: ../addressbook/libedata-book/e-data-book.c:382
+#: ../calendar/libedata-cal/e-data-cal.c:419 ../libedataserver/e-client.c:170
 msgid "Search time limit exceeded"
 msgstr "検索時間の上限を超えました"
 
-#: ../addressbook/libedata-book/e-data-book.c:359
-#: ../calendar/libedata-cal/e-data-cal.c:413 ../libedataserver/e-client.c:166
+#: ../addressbook/libedata-book/e-data-book.c:384
+#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:174
 msgid "Query refused"
 msgstr "問い合わせを拒否しました"
 
-#: ../addressbook/libedata-book/e-data-book.c:360
-#: ../calendar/libedata-cal/e-data-cal.c:414 ../libedataserver/e-client.c:152
+#: ../addressbook/libedata-book/e-data-book.c:385
+#: ../calendar/libedata-cal/e-data-cal.c:422 ../libedataserver/e-client.c:160
 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:362
-#: ../calendar/libedata-cal/e-data-cal.c:416
+#: ../addressbook/libedata-book/e-data-book.c:387
+#: ../calendar/libedata-cal/e-data-cal.c:424
 msgid "Invalid server version"
 msgstr "サーバーバージョンが無効です"
 
-#: ../addressbook/libedata-book/e-data-book.c:364
-#: ../calendar/libecal/e-cal.c:2301 ../calendar/libedata-cal/e-data-cal.c:417
-#: ../libedataserver/e-client.c:129
+#: ../addressbook/libedata-book/e-data-book.c:389
+#: ../calendar/libecal/e-cal.c:2300 ../calendar/libedata-cal/e-data-cal.c:425
+#: ../libedataserver/e-client.c:137
 msgid "Invalid argument"
 msgstr "無効な引数"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:366
-#: ../calendar/libecal/e-cal.c:1060 ../calendar/libecal/e-cal.c:1428
-#: ../calendar/libecal/e-cal.c:1908 ../calendar/libecal/e-cal.c:2340
-#: ../calendar/libedata-cal/e-data-cal.c:419 ../libedataserver/e-client.c:154
+#: ../addressbook/libedata-book/e-data-book.c:391
+#: ../calendar/libecal/e-cal.c:1059 ../calendar/libecal/e-cal.c:1427
+#: ../calendar/libecal/e-cal.c:1907 ../calendar/libecal/e-cal.c:2339
+#: ../calendar/libedata-cal/e-data-cal.c:427 ../libedataserver/e-client.c:162
 #, c-format
 msgid "Not supported"
 msgstr "サポートされていません"
 
-#: ../addressbook/libedata-book/e-data-book.c:367
-#: ../calendar/libedata-cal/e-data-cal.c:420 ../libedataserver/e-client.c:172
+#: ../addressbook/libedata-book/e-data-book.c:392
+#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:180
 msgid "Backend is not opened yet"
 msgstr "まだバックエンドが開かれていません"
 
-#: ../addressbook/libedata-book/e-data-book.c:368
-#: ../libedataserver/e-client.c:174
+#: ../addressbook/libedata-book/e-data-book.c:393
+#: ../libedataserver/e-client.c:182
 msgid "Object is out of sync"
 msgstr "オブジェクトが同期していません"
 
-#: ../addressbook/libedata-book/e-data-book.c:376
-#: ../calendar/libedata-cal/e-data-cal.c:428 ../libedataserver/e-client.c:170
+#: ../addressbook/libedata-book/e-data-book.c:401
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:178
 msgid "Other error"
 msgstr "その他のエラー"
 
-#: ../addressbook/libedata-book/e-data-book.c:1017
-#: ../calendar/libedata-cal/e-data-cal.c:1324
+#: ../addressbook/libedata-book/e-data-book.c:1053
+#: ../calendar/libedata-cal/e-data-cal.c:1332
 msgid "Invalid query: "
 msgstr "問い合わせ内容が無効です: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1069
+#: ../addressbook/libedata-book/e-data-book.c:1272
 msgid "Cannot open book: "
 msgstr "データブックを開けません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1106
+#: ../addressbook/libedata-book/e-data-book.c:1309
 msgid "Cannot refresh address book: "
 msgstr "アドレス帳を更新できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1137
+#: ../addressbook/libedata-book/e-data-book.c:1340
 msgid "Cannot get contact: "
 msgstr "連絡先を取得できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1175
+#: ../addressbook/libedata-book/e-data-book.c:1378
 msgid "Cannot get contact list: "
 msgstr "連絡先の一覧を取得できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1227
+#: ../addressbook/libedata-book/e-data-book.c:1430
 msgid "Cannot get contact list uids: "
 msgstr "連絡先一覧の UID を取得できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1274
+#: ../addressbook/libedata-book/e-data-book.c:1477
 msgid "Cannot add contact: "
 msgstr "連絡先を追加できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1323
+#: ../addressbook/libedata-book/e-data-book.c:1526
 msgid "Cannot modify contacts: "
 msgstr "連絡先を変更できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:1365
+#: ../addressbook/libedata-book/e-data-book.c:1568
 msgid "Cannot remove contacts: "
 msgstr "連絡先を削除できません: "
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:273
-#: ../calendar/libedata-cal/e-data-cal-factory.c:276
+#: ../addressbook/libedata-book/e-data-book-cursor.c:772
+msgid "Cursor does not support setting the search expression"
+msgstr "カーソルは検索表現の設定をサポートしていません"
+
+#: ../addressbook/libedata-book/e-data-book-cursor.c:855
+msgid "Cursor does not support step"
+msgstr "カーソルはステップをサポートしていません"
+
+#: ../addressbook/libedata-book/e-data-book-cursor.c:938
+msgid "Cursor does not support alphabetic indexes"
+msgstr "カーソルは英字の索引をサポートしていません"
+
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:268
+msgid "Unrecognized cursor origin"
+msgstr "カーソルの基点を認識できません"
+
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:336
+msgid "Out of sync revision while moving cursor"
+msgstr "カーソル移動中に改訂を同期できなくなりました"
+
+#: ../addressbook/libedata-book/e-data-book-cursor-sqlite.c:430
+msgid "Alphabetic index was set for incorrect locale"
+msgstr "英字の索引が誤ったロケールにセットされていました"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:289
+#: ../calendar/libedata-cal/e-data-cal-factory.c:285
 #, c-format
 msgid "No backend name in source '%s'"
 msgstr "ソース '%s' にはバックエンド名がありません"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:324
-#: ../calendar/libedata-cal/e-data-cal-factory.c:330
+#: ../addressbook/libedata-book/e-data-book-factory.c:377
+#: ../calendar/libedata-cal/e-data-cal-factory.c:339
 #, c-format
 msgid "Missing source UID"
 msgstr "ソース UID が見つかりません"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:335
-#: ../calendar/libedata-cal/e-data-cal-factory.c:340
+#: ../addressbook/libedata-book/e-data-book-factory.c:388
+#: ../calendar/libedata-cal/e-data-cal-factory.c:349
 #, c-format
 msgid "No such source for UID '%s'"
 msgstr "UID '%s' にそのようなソースはありません"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:566
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "サーバーに接続できません (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:597
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:605
 #, c-format
 msgid "Failed to connect to a server using SSL: %s"
 msgstr "SSL によるサーバーへの接続に失敗しました: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:608
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "予想外の HTTP ステータスコード %d が返されました (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:627
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:635
 msgid "CalDAV backend is not loaded yet"
 msgstr "CalDAV バックエンドがまだ読み込まれていません"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1048
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1074
 msgid "Invalid Redirect URL"
 msgstr "無効な転送 URL です"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2525
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2917
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2577
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2942
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1201,797 +1335,751 @@ msgstr ""
 "サーバーに接続できないんで、カレンダーを読み込み専用モードで開きます。\n"
 "エラーメッセージ: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2869
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2897
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "'%s' というローカルキャッシュフォルダーを作成できません"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3957
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3982
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV が大量追加に対応していません"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4060
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4085
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV が大量修正に対応していません"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4236
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4261
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV が大量削除に対応していません"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4903
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4928
 msgid "Calendar doesn't support Free/Busy"
 msgstr "カレンダーは予定の有無に対応しません"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4912
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4937
 msgid "Schedule outbox url not found"
 msgstr "スケジュールのアウトボックス URL が見つかりません"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5009
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:5034
 msgid "Unexpected result in schedule-response"
 msgstr "schedule-response の予期しない結果"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:889
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:895
 msgid "Birthday"
 msgstr "誕生日"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:925
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:931
 #, c-format
 msgid "Birthday: %s"
 msgstr "誕生日: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:956
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:962
 #, c-format
 msgid "Anniversary: %s"
 msgstr "記念日: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:245
+#: ../calendar/backends/file/e-cal-backend-file.c:244
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "カレンダーのデータを保存できません: URI が間違っています。"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:252
-#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:251
+#: ../calendar/backends/file/e-cal-backend-file.c:257
 msgid "Cannot save calendar data"
 msgstr "カレンダーのデータを保存できません"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:479
+#: ../calendar/backends/http/e-cal-backend-http.c:486
 #, c-format
 msgid "Malformed URI: %s"
 msgstr "不正な URI: %s"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:570
+#: ../calendar/backends/http/e-cal-backend-http.c:577
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "URI へのリダイレクトが無効です"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:613
+#: ../calendar/backends/http/e-cal-backend-http.c:620
 #, c-format
 msgid "Bad file format."
 msgstr "ファイルのフォーマットが間違っています。"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:623
+#: ../calendar/backends/http/e-cal-backend-http.c:630
 #, c-format
 msgid "Not a calendar."
 msgstr "カレンダーではありません。"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:927
-#: ../calendar/backends/weather/e-cal-backend-weather.c:514
+#: ../calendar/backends/http/e-cal-backend-http.c:917
+#: ../calendar/backends/weather/e-cal-backend-weather.c:536
 msgid "Could not create cache file"
 msgstr "キャッシュファイルを生成できませんでした"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:173
+#: ../calendar/backends/weather/e-cal-backend-weather.c:174
 msgid "Could not retrieve weather data"
 msgstr "天気のデータを取得できませんでした"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:295
 msgid "Weather: Fog"
 msgstr "天気: 霧"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:285
+#: ../calendar/backends/weather/e-cal-backend-weather.c:296
 msgid "Weather: Cloudy Night"
 msgstr "天気: 曇のある夜空"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:297
 msgid "Weather: Cloudy"
 msgstr "天気: 曇り"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:298
 msgid "Weather: Overcast"
 msgstr "天気: 本曇り"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:299
 msgid "Weather: Showers"
 msgstr "天気: 雨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:300
 msgid "Weather: Snow"
 msgstr "天気: 雪"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:301
 msgid "Weather: Clear Night"
 msgstr "天気: 澄んだ夜空"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:302
 msgid "Weather: Sunny"
 msgstr "天気: 暖かい快晴"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:303
 msgid "Weather: Thunderstorms"
 msgstr "天気: 雷雨"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:416
+#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
+#: ../calendar/backends/weather/e-cal-backend-weather.c:329
+#, c-format
+msgid "%.1f °F"
+msgstr ""
+
+#. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
+#: ../calendar/backends/weather/e-cal-backend-weather.c:332
+#, c-format
+msgid "%.1f °C"
+msgstr ""
+
+#. TRANSLATOR: This is the temperature in kelvin
+#: ../calendar/backends/weather/e-cal-backend-weather.c:335
+#, c-format
+msgid "%.1f K"
+msgstr ""
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:341
+#, c-format
+msgid "%.1f"
+msgstr ""
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:452
 msgid "Forecast"
 msgstr "天気予報"
 
-#: ../calendar/libecal/e-cal.c:2305
+#: ../calendar/libecal/e-cal.c:2304
 msgid "Repository is offline"
 msgstr "リポジトリはオフラインです"
 
-#: ../calendar/libecal/e-cal.c:2307 ../calendar/libecal/e-cal-client.c:255
+#: ../calendar/libecal/e-cal.c:2306 ../calendar/libecal/e-cal-client.c:263
 msgid "No such calendar"
 msgstr "そのようなカレンダーはありません"
 
-#: ../calendar/libecal/e-cal.c:2309 ../calendar/libecal/e-cal-client.c:257
-#: ../calendar/libedata-cal/e-data-cal.c:398
+#: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:265
+#: ../calendar/libedata-cal/e-data-cal.c:406
 msgid "Object not found"
 msgstr "オブジェクトが見つかりません"
 
-#: ../calendar/libecal/e-cal.c:2311 ../calendar/libecal/e-cal-client.c:259
-#: ../calendar/libedata-cal/e-data-cal.c:399
+#: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:267
+#: ../calendar/libedata-cal/e-data-cal.c:407
 msgid "Invalid object"
 msgstr "無効なオブジェクトです"
 
-#: ../calendar/libecal/e-cal.c:2313
+#: ../calendar/libecal/e-cal.c:2312
 msgid "URI not loaded"
 msgstr "URI を読み込んでいません"
 
-#: ../calendar/libecal/e-cal.c:2315
+#: ../calendar/libecal/e-cal.c:2314
 msgid "URI already loaded"
 msgstr "URL は既に読み込み済みです"
 
-#: ../calendar/libecal/e-cal.c:2319
+#: ../calendar/libecal/e-cal.c:2318
 msgid "Unknown User"
 msgstr "ユーザーを特定できません"
 
-#: ../calendar/libecal/e-cal.c:2321 ../calendar/libecal/e-cal-client.c:263
-#: ../calendar/libedata-cal/e-data-cal.c:400
+#: ../calendar/libecal/e-cal.c:2320 ../calendar/libecal/e-cal-client.c:271
+#: ../calendar/libedata-cal/e-data-cal.c:408
 msgid "Object ID already exists"
 msgstr "既にオブジェクト ID が存在しています"
 
-#: ../calendar/libecal/e-cal.c:2323
+#: ../calendar/libecal/e-cal.c:2322
 msgid "Protocol not supported"
 msgstr "プロトコルはサポートされていません"
 
-#: ../calendar/libecal/e-cal.c:2325
+#: ../calendar/libecal/e-cal.c:2324
 msgid "Operation has been canceled"
 msgstr "操作をキャンセルしました"
 
-#: ../calendar/libecal/e-cal.c:2327
+#: ../calendar/libecal/e-cal.c:2326
 msgid "Could not cancel operation"
 msgstr "操作をキャンセルできませんでした"
 
-#: ../calendar/libecal/e-cal.c:2329 ../libedataserver/e-client.c:137
+#: ../calendar/libecal/e-cal.c:2328 ../libedataserver/e-client.c:145
 msgid "Authentication failed"
 msgstr "認証に失敗しました"
 
-#: ../calendar/libecal/e-cal.c:2331
-#: ../camel/providers/smtp/camel-smtp-transport.c:911
-#: ../libedataserver/e-client.c:139
+#: ../calendar/libecal/e-cal.c:2330
+#: ../camel/providers/smtp/camel-smtp-transport.c:921
+#: ../libedataserver/e-client.c:147
 msgid "Authentication required"
 msgstr "認証を必要としています"
 
-#: ../calendar/libecal/e-cal.c:2333
+#: ../calendar/libecal/e-cal.c:2332
 msgid "A D-Bus exception has occurred"
 msgstr "D-Bus 例外が発生しました"
 
-#: ../calendar/libecal/e-cal.c:2337
+#: ../calendar/libecal/e-cal.c:2336
 msgid "No error"
 msgstr "エラーはありません"
 
-#: ../calendar/libecal/e-cal-client.c:261
-#: ../calendar/libedata-cal/e-data-cal.c:408
+#: ../calendar/libecal/e-cal-client.c:269
+#: ../calendar/libedata-cal/e-data-cal.c:416
 msgid "Unknown user"
 msgstr "ユーザーを特定できません"
 
-#: ../calendar/libecal/e-cal-client.c:265
-#: ../calendar/libedata-cal/e-data-cal.c:397
+#: ../calendar/libecal/e-cal-client.c:273
+#: ../calendar/libedata-cal/e-data-cal.c:405
 msgid "Invalid range"
 msgstr "有効範囲が無効です"
 
-#: ../calendar/libecal/e-cal-client.c:928
+#: ../calendar/libecal/e-cal-client.c:936
 #, c-format
 msgid "Unknown calendar property '%s'"
 msgstr "不明なカレンダープロパティ '%s'"
 
-#: ../calendar/libecal/e-cal-client.c:943
+#: ../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:1340
+#: ../calendar/libecal/e-cal-component.c:1348
 msgid "Untitled appointment"
 msgstr "タイトルなしの予定"
 
-#: ../calendar/libecal/e-cal-recur.c:4036
+#: ../calendar/libecal/e-cal-recur.c:4037
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/libecal/e-cal-recur.c:4037
+#: ../calendar/libecal/e-cal-recur.c:4038
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/libecal/e-cal-recur.c:4038
+#: ../calendar/libecal/e-cal-recur.c:4039
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/libecal/e-cal-recur.c:4039
+#: ../calendar/libecal/e-cal-recur.c:4040
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/libecal/e-cal-recur.c:4040
+#: ../calendar/libecal/e-cal-recur.c:4041
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:4042
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:4043
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:4044
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:4045
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:4046
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:4047
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:4048
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:4049
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:4050
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:4051
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:4052
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:4053
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:4054
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:4055
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:4056
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:4057
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:4058
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:4059
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:4060
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4061
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4062
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4063
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4064
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4065
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4066
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4067
 msgid "31st"
 msgstr "31日"
 
-#: ../calendar/libecal/e-cal-util.c:707 ../calendar/libecal/e-cal-util.c:734
+#: ../calendar/libecal/e-cal-util.c:706 ../calendar/libecal/e-cal-util.c:733
 msgctxt "Priority"
 msgid "High"
 msgstr "高い"
 
-#: ../calendar/libecal/e-cal-util.c:709 ../calendar/libecal/e-cal-util.c:736
+#: ../calendar/libecal/e-cal-util.c:708 ../calendar/libecal/e-cal-util.c:735
 msgctxt "Priority"
 msgid "Normal"
 msgstr "普通"
 
-#: ../calendar/libecal/e-cal-util.c:711 ../calendar/libecal/e-cal-util.c:738
+#: ../calendar/libecal/e-cal-util.c:710 ../calendar/libecal/e-cal-util.c:737
 msgctxt "Priority"
 msgid "Low"
 msgstr "低い"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:732
+#: ../calendar/libecal/e-cal-util.c:731
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "未定義"
 
-#: ../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
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:84
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1062
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1371
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1498
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1547
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" は引数を一つ必要とします"
 
-#: ../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
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:91
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:673
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1378
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1386
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" は最初の引数として文字列を必要とします"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
 #, c-format
 msgid "\"%s\" expects two or three arguments"
 msgstr "\"%s\" は引数を二つまたは三つ必要とします"
 
-#: ../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
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:173
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:262
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:324
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:823
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1069
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1447
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1505
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1554
 #, 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: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
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:270
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:334
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
 #, 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:186
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:192
 #, c-format
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "\"%s\" は三番目の引数として文字列を必要とします"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:248
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
 #, 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
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:317
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:666
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:816
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1440
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" は引数を二つ必要とします"
 
-#: ../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
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:602
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:625
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:748
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:780
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:987
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1332
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" は引数を必要としません"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:682
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" は二番目の引数として文字列を必要とします"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:707
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:713
 #, 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\" のいずれか一つが必要です"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" は少なくとも引数を一つ必要とします"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:893
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:899
 #, 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) である必要があります"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1389
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1395
 #, 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
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1456
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\" は二番目の引数として整数値を必要とします"
 
-#: ../calendar/libedata-cal/e-data-cal.c:404
+#: ../calendar/libedata-cal/e-data-cal.c:412
 msgid "Unsupported method"
 msgstr "サポートしていない方法です"
 
-#: ../calendar/libedata-cal/e-data-cal.c:407
+#: ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Calendar does not exist"
 msgstr "カレンダーが存在しません"
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1495
+#: ../calendar/libedata-cal/e-data-cal.c:1503
 msgid "Cannot open calendar: "
 msgstr "カレンダーを開けません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1532
+#: ../calendar/libedata-cal/e-data-cal.c:1540
 msgid "Cannot refresh calendar: "
 msgstr "カレンダーを更新できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1573
+#: ../calendar/libedata-cal/e-data-cal.c:1581
 msgid "Cannot retrieve calendar object path: "
 msgstr "カレンダーオブジェクトのパスを取得できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1625
+#: ../calendar/libedata-cal/e-data-cal.c:1633
 msgid "Cannot retrieve calendar object list: "
 msgstr "カレンダーオブジェクトの一覧を取得できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1676
+#: ../calendar/libedata-cal/e-data-cal.c:1684
 msgid "Cannot retrieve calendar free/busy list: "
 msgstr "カレンダーの予定の有無の一覧を取得できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1719
+#: ../calendar/libedata-cal/e-data-cal.c:1727
 msgid "Cannot create calendar object: "
 msgstr "カレンダーオブジェクトを作成できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1787
+#: ../calendar/libedata-cal/e-data-cal.c:1795
 msgid "Cannot modify calendar object: "
 msgstr "カレンダーオブジェクトを変更できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1865
+#: ../calendar/libedata-cal/e-data-cal.c:1873
 msgid "Cannot remove calendar object: "
 msgstr "カレンダーオブジェクトを削除できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1951
+#: ../calendar/libedata-cal/e-data-cal.c:1959
 msgid "Cannot receive calendar objects: "
 msgstr "カレンダーオブジェクトを受信できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1994
+#: ../calendar/libedata-cal/e-data-cal.c:2002
 msgid "Cannot send calendar objects: "
 msgstr "カレンダーオブジェクトを送信できません: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2046
+#: ../calendar/libedata-cal/e-data-cal.c:2054
 msgid "Could not retrieve attachment uris: "
 msgstr "添付ファイルの URI を取得できませんでした: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2091
+#: ../calendar/libedata-cal/e-data-cal.c:2099
 msgid "Could not discard reminder: "
 msgstr "リマインダーを破棄できませんでした: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2132
+#: ../calendar/libedata-cal/e-data-cal.c:2140
 msgid "Could not retrieve calendar time zone: "
 msgstr "カレンダーのタイムゾーンを取得できませんでした: "
 
 #. Translators: This is prefix to a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:2172
+#: ../calendar/libedata-cal/e-data-cal.c:2180
 msgid "Could not add calendar time zone: "
 msgstr "カレンダーのタイムゾーンを追加できませんでした: "
 
-#: ../camel/camel-cipher-context.c:208
+#: ../camel/camel-cipher-context.c:200
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "この暗号は署名をサポートしていません"
 
-#: ../camel/camel-cipher-context.c:221
+#: ../camel/camel-cipher-context.c:213
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "この暗号は妥当性の検証をサポートしていません"
 
-#: ../camel/camel-cipher-context.c:237
+#: ../camel/camel-cipher-context.c:229
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "この暗号化は符号化をサポートしていません"
 
-#: ../camel/camel-cipher-context.c:251
+#: ../camel/camel-cipher-context.c:243
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "この暗号は復号化をサポートしていません"
 
-#: ../camel/camel-cipher-context.c:264
-#, c-format
-msgid "You may not import keys with this cipher"
-msgstr "この暗号で鍵をインポートできません"
-
-#: ../camel/camel-cipher-context.c:278
-#, c-format
-msgid "You may not export keys with this cipher"
-msgstr "この暗号で鍵をエクスポートできません"
-
-#: ../camel/camel-cipher-context.c:819
+#: ../camel/camel-cipher-context.c:359
 msgid "Signing message"
 msgstr "メッセージの署名中"
 
-#: ../camel/camel-cipher-context.c:1060
+#: ../camel/camel-cipher-context.c:649
 msgid "Encrypting message"
 msgstr "メッセージを暗号化しています"
 
-#: ../camel/camel-cipher-context.c:1187
+#: ../camel/camel-cipher-context.c:821
 msgid "Decrypting message"
 msgstr "メッセージの暗号を解除しています"
 
-#: ../camel/camel-data-cache.c:181
+#: ../camel/camel-data-cache.c:179
 #, c-format
 msgid "Unable to create cache path"
 msgstr "キャッシュファイルを生成できません"
 
-#: ../camel/camel-data-cache.c:440
+#: ../camel/camel-data-cache.c:449
 msgid "Empty cache file"
 msgstr "キャッシュファイルを空にする"
 
-#: ../camel/camel-data-cache.c:509
+#: ../camel/camel-data-cache.c:522
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "キャッシュエントリを開けませんでした: %s: %s"
 
-#: ../camel/camel-disco-diary.c:207
-#, c-format
-msgid ""
-"Could not write log entry: %s\n"
-"Further operations on this server will not be replayed when you\n"
-"reconnect to the network."
-msgstr ""
-"ログを書き込めませんでした: %s\n"
-"ネットワークに再接続しても、このサーバーに対する\n"
-"これ以降の操作は再現されません。"
-
-#: ../camel/camel-disco-diary.c:279
-#, c-format
-msgid ""
-"Could not open '%s':\n"
-"%s\n"
-"Changes made to this folder will not be resynchronized."
-msgstr ""
-"'%s' が開けませんでした:\n"
-"%s\n"
-"このフォルダーに対する変更が再び同期されることはありません。"
-
-#: ../camel/camel-disco-diary.c:326
-msgid "Resynchronizing with server"
-msgstr "サーバーの再同期中"
-
-#: ../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:422
-#, c-format
-msgid "Preparing folder '%s' for offline"
-msgstr "オフラインに切り替える準備中: %s"
-
-#: ../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:518 ../camel/camel-imapx-store.c:618
-#: ../camel/camel-imapx-store.c:2241
-#: ../camel/providers/pop3/camel-pop3-folder.c:596
-#: ../camel/providers/pop3/camel-pop3-folder.c:746
-#: ../camel/providers/pop3/camel-pop3-folder.c:987
-#: ../camel/providers/pop3/camel-pop3-folder.c:1216
-#: ../camel/providers/pop3/camel-pop3-store.c:291
-#: ../camel/providers/pop3/camel-pop3-store.c:519
-#: ../camel/providers/pop3/camel-pop3-store.c:567
-#: ../camel/providers/pop3/camel-pop3-store.c:659
-#: ../camel/providers/pop3/camel-pop3-store.c:1059
-#, c-format
-msgid "You must be working online to complete this operation"
-msgstr "この動作を完了するためにオンラインで作業してください"
-
-#: ../camel/camel-file-utils.c:732
-#, c-format
-msgid "Canceled"
-msgstr "キャンセル済み"
-
-#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:797
+#: ../camel/camel-filter-driver.c:914 ../camel/camel-filter-search.c:795
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "子プロセス '%s' の生成に失敗しました: %s"
 
-#: ../camel/camel-filter-driver.c:964
+#: ../camel/camel-filter-driver.c:962
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s から受信したメッセージストリームが正しくありません: %s"
 
-#: ../camel/camel-filter-driver.c:1171 ../camel/camel-filter-driver.c:1180
+#: ../camel/camel-filter-driver.c:1169 ../camel/camel-filter-driver.c:1178
 msgid "Syncing folders"
 msgstr "フォルダーの同期中"
 
-#: ../camel/camel-filter-driver.c:1278
+#: ../camel/camel-filter-driver.c:1276
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "フィルターの構文解析中にエラー: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1289
+#: ../camel/camel-filter-driver.c:1287
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "フィルター実行中にエラー: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1385
+#: ../camel/camel-filter-driver.c:1383
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "スプールフォルダーを開けません"
 
-#: ../camel/camel-filter-driver.c:1397
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "スプールフォルダーを処理できません"
 
-#: ../camel/camel-filter-driver.c:1420
+#: ../camel/camel-filter-driver.c:1418
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "メッセージ %d の取得中 (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1429 ../camel/camel-filter-driver.c:1451
+#: ../camel/camel-filter-driver.c:1427 ../camel/camel-filter-driver.c:1449
 #, c-format
 msgid "Failed on message %d"
 msgstr "メッセージ %d で失敗しました"
 
-#: ../camel/camel-filter-driver.c:1470 ../camel/camel-filter-driver.c:1584
+#: ../camel/camel-filter-driver.c:1468 ../camel/camel-filter-driver.c:1582
 msgid "Syncing folder"
 msgstr "フォルダーの同期中"
 
-#: ../camel/camel-filter-driver.c:1475 ../camel/camel-filter-driver.c:1592
+#: ../camel/camel-filter-driver.c:1473 ../camel/camel-filter-driver.c:1590
 msgid "Complete"
 msgstr "完了しました"
 
-#: ../camel/camel-filter-driver.c:1538
+#: ../camel/camel-filter-driver.c:1536
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "メッセージ %d / %d の取得中"
 
-#: ../camel/camel-filter-driver.c:1556
+#: ../camel/camel-filter-driver.c:1554
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "メッセージ %d / %d で失敗しました"
 
-#: ../camel/camel-filter-driver.c:1752 ../camel/camel-filter-driver.c:1779
+#: ../camel/camel-filter-driver.c:1750 ../camel/camel-filter-driver.c:1777
 #, c-format
 msgid "Execution of filter '%s' failed: "
 msgstr "フィルター '%s' の実行に失敗しました: "
 
-#: ../camel/camel-filter-driver.c:1769
+#: ../camel/camel-filter-driver.c:1767
 #, c-format
 msgid "Error parsing filter '%s': %s: %s"
 msgstr "フィルター '%s' の構文解析中にエラー: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1788
+#: ../camel/camel-filter-driver.c:1786
 #, c-format
 msgid "Error executing filter '%s': %s: %s"
 msgstr "フィルター '%s' の実行中にエラー: %s: %s"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "メッセージの取得に失敗しました"
 
-#: ../camel/camel-filter-search.c:537
+#: ../camel/camel-filter-search.c:535
 msgid "Invalid arguments to (system-flag)"
 msgstr "(system-flag) に対する無効な引数"
 
-#: ../camel/camel-filter-search.c:555
+#: ../camel/camel-filter-search.c:553
 msgid "Invalid arguments to (user-tag)"
 msgstr "(user-tag) に対する無効な引数"
 
-#: ../camel/camel-filter-search.c:1046 ../camel/camel-filter-search.c:1055
+#: ../camel/camel-filter-search.c:1044 ../camel/camel-filter-search.c:1053
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "フィルター検索実行中にエラー: %s: %s"
 
-#: ../camel/camel-folder.c:309
+#: ../camel/camel-folder.c:323
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "'%s' にある新しいスパムメッセージの学習中"
 
-#: ../camel/camel-folder.c:349
+#: ../camel/camel-folder.c:363
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "'%s' にある新しいハムメッセージの学習中"
 
-#: ../camel/camel-folder.c:397
+#: ../camel/camel-folder.c:411
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "'%s' にある新しいメッセージのフィルターリング中"
 
-#: ../camel/camel-folder.c:989
-#: ../camel/providers/local/camel-maildir-folder.c:321
+#: ../camel/camel-folder.c:1011
+#: ../camel/providers/local/camel-maildir-folder.c:330
 msgid "Moving messages"
 msgstr "メッセージの移動中"
 
-#: ../camel/camel-folder.c:992
+#: ../camel/camel-folder.c:1014
 msgid "Copying messages"
 msgstr "メッセージのコピー中"
 
-#: ../camel/camel-folder.c:1312
+#: ../camel/camel-folder.c:1056
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "フォルダー'%s' に対してはクオータ情報はサポートされていません"
 
-#: ../camel/camel-folder.c:3486
+#: ../camel/camel-folder.c:2868
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "フォルダー '%s' の抹消中"
 
-#: ../camel/camel-folder.c:3718
+#: ../camel/camel-folder.c:2996
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "メッセージ '%s' (%s 内) の取得中"
 
-#: ../camel/camel-folder.c:3873
+#: ../camel/camel-folder.c:3187
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "'%s' のクオータ情報を取得中"
 
-#: ../camel/camel-folder.c:4113
+#: ../camel/camel-folder.c:3487
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "フォルダー '%s' を更新中"
@@ -2026,7 +2114,7 @@ msgstr "(%s) は配列の結果を期待します"
 msgid "(%s) requires the folder set"
 msgstr "(%s) にはフォルダーの組が必要です"
 
-#: ../camel/camel-folder-search.c:1930 ../camel/camel-folder-search.c:2096
+#: ../camel/camel-folder-search.c:1931 ../camel/camel-folder-search.c:2097
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -2035,7 +2123,7 @@ msgstr ""
 "正規表現の構文を解析できません: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:1942 ../camel/camel-folder-search.c:2108
+#: ../camel/camel-folder-search.c:1943 ../camel/camel-folder-search.c:2109
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -2044,18 +2132,18 @@ msgstr ""
 "正規表現での検索を実行中にエラー: %s:\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:730 ../camel/camel-gpg-context.c:735
-#: ../camel/camel-gpg-context.c:1398
+#: ../camel/camel-gpg-context.c:721 ../camel/camel-gpg-context.c:726
+#: ../camel/camel-gpg-context.c:1383
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "GPG の実行に失敗しました: %s"
 
-#: ../camel/camel-gpg-context.c:735
-#: ../camel/providers/smtp/camel-smtp-transport.c:914
+#: ../camel/camel-gpg-context.c:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:924
 msgid "Unknown"
 msgstr "不明"
 
-#: ../camel/camel-gpg-context.c:800
+#: ../camel/camel-gpg-context.c:791
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2066,17 +2154,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:836
+#: ../camel/camel-gpg-context.c:827
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "GnuPG のユーザー ID ヒントの解析に失敗しました。"
 
-#: ../camel/camel-gpg-context.c:861 ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:852 ../camel/camel-gpg-context.c:867
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "GnuPG のパスフレーズ要求の解析に失敗しました。"
 
-#: ../camel/camel-gpg-context.c:897
+#: ../camel/camel-gpg-context.c:888
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2085,7 +2173,7 @@ msgstr ""
 "お使いのスマートカードのキーを解除するには\n"
 "PIN が必要です: \"%s\""
 
-#: ../camel/camel-gpg-context.c:901
+#: ../camel/camel-gpg-context.c:892
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2094,65 +2182,63 @@ msgstr ""
 "次のユーザーのキーを解除するにはパスフレーズが必要です:\n"
 " \"%s\""
 
-#: ../camel/camel-gpg-context.c:907
+#: ../camel/camel-gpg-context.c:898
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "'%s' に対して GnuPG から想定外の要求がありました"
 
-#: ../camel/camel-gpg-context.c:919
+#: ../camel/camel-gpg-context.c:910
 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:950 ../camel/camel-net-utils.c:524
-#: ../camel/camel-tcp-stream-raw.c:268
-#: ../camel/providers/nntp/camel-nntp-summary.c:403
-#: ../libedataserver/e-client.c:150
+#: ../camel/camel-gpg-context.c:941 ../camel/camel-net-utils.c:522
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
+#: ../libedataserver/e-client.c:158
 #, c-format
 msgid "Cancelled"
 msgstr "キャンセル済み"
 
-#: ../camel/camel-gpg-context.c:971
+#: ../camel/camel-gpg-context.c:962
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "秘密鍵の解除に失敗しました: 指定した三つのパスフレーズがおかしいです。"
 
-#: ../camel/camel-gpg-context.c:984
+#: ../camel/camel-gpg-context.c:975
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG から想定外の応答がありました: %s"
 
-#: ../camel/camel-gpg-context.c:1115
+#: ../camel/camel-gpg-context.c:1106
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "暗号化に失敗しました: 正しい宛先が指定されていません。"
 
-#: ../camel/camel-gpg-context.c:1665 ../camel/camel-smime-context.c:846
+#: ../camel/camel-gpg-context.c:1658 ../camel/camel-smime-context.c:844
 msgid "Could not generate signing data: "
 msgstr "署名データを生成できませんでした: "
 
-#: ../camel/camel-gpg-context.c:1714 ../camel/camel-gpg-context.c:1918
-#: ../camel/camel-gpg-context.c:2028 ../camel/camel-gpg-context.c:2179
-#: ../camel/camel-gpg-context.c:2279 ../camel/camel-gpg-context.c:2327
+#: ../camel/camel-gpg-context.c:1708 ../camel/camel-gpg-context.c:1920
+#: ../camel/camel-gpg-context.c:2030 ../camel/camel-gpg-context.c:2179
 msgid "Failed to execute gpg."
 msgstr "GPG の実行に失敗しました。"
 
-#: ../camel/camel-gpg-context.c:1793 ../camel/camel-gpg-context.c:1801
-#: ../camel/camel-gpg-context.c:1809 ../camel/camel-gpg-context.c:1829
+#: ../camel/camel-gpg-context.c:1791 ../camel/camel-gpg-context.c:1799
+#: ../camel/camel-gpg-context.c:1807 ../camel/camel-gpg-context.c:1827
 #: ../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 "このメッセージ署名の整合性を確認できません: メッセージの書式が正しくありません"
 
-#: ../camel/camel-gpg-context.c:1871
+#: ../camel/camel-gpg-context.c:1873
 msgid "Cannot verify message signature: "
 msgstr "このメッセージ署名の整合性を確認できません: "
 
-#: ../camel/camel-gpg-context.c:1994
+#: ../camel/camel-gpg-context.c:1996
 msgid "Could not generate encrypting data: "
 msgstr "暗号化されたデータを生成できませんでした: "
 
-#: ../camel/camel-gpg-context.c:2047
+#: ../camel/camel-gpg-context.c:2049
 msgid "This is a digitally encrypted message part"
 msgstr "これはデジタル署名された部分です"
 
@@ -2167,499 +2253,204 @@ msgstr "メッセージを解読できません: メッセージの書式が正
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME 型の暗号解読に失敗しました: プロトコルエラー"
 
-#: ../camel/camel-gpg-context.c:2220 ../camel/camel-smime-context.c:1287
+#: ../camel/camel-gpg-context.c:2220 ../camel/camel-smime-context.c:1289
 msgid "Encrypted content"
 msgstr "暗号化した内容"
 
-#: ../camel/camel-imapx-folder.c:643
-#, c-format
-msgid "No quota information available for folder '%s'"
-msgstr "フォルダー'%s' について利用できるクオータ情報はありません"
-
-#: ../camel/camel-imapx-folder.c:727 ../camel/camel-imapx-folder.c:801
-#, c-format
-msgid "No destination folder specified"
-msgstr "対象フォルダーが指定されていません"
-
-#: ../camel/camel-imapx-folder.c:747
-msgid "Unable to move junk messages"
-msgstr "ジャンクメッセージを移動できません"
-
-#: ../camel/camel-imapx-folder.c:821
-msgid "Unable to move deleted messages"
-msgstr "削除したメッセージを移動できません"
-
-#: ../camel/camel-imapx-folder.c:1008
-#: ../camel/providers/nntp/camel-nntp-folder.c:794
-msgid "Apply message _filters to this folder"
-msgstr "このフォルダーにメッセージフィルターを適用 (_F)"
-
-#: ../camel/camel-imapx-folder.c:1114
-#, c-format
-msgid "Could not create folder summary for %s"
-msgstr "%s のフォルダーサマリを作成できませんでした"
-
-#: ../camel/camel-imapx-folder.c:1123
-#, c-format
-msgid "Could not create cache for %s: "
-msgstr "%s のキャッシュを生成できませんでした: "
-
-#: ../camel/camel-imapx-server.c:1333
-msgid "Server disconnected"
-msgstr "サーバーが切断されました"
-
-#: ../camel/camel-imapx-server.c:1756
-msgid "Error writing to cache stream"
-msgstr "キャッシュストリームに書き込み中にエラー"
-
-#: ../camel/camel-imapx-server.c:2439
-#, c-format
-msgid ""
-"Alert from IMAP server %s:\n"
-"%s"
-msgstr ""
-"IMAP サーバー %s からの警告:\n"
-"%s"
-
-#: ../camel/camel-imapx-server.c:3035
-#, c-format
-msgid "Not authenticated"
-msgstr "認証されていません"
-
-#: ../camel/camel-imapx-server.c:3113
-msgid "Error performing IDLE"
-msgstr "IDLE を実行する際にエラーが発生しました"
-
-#: ../camel/camel-imapx-server.c:4005
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "セキュリティ保護されたモードで IMAP サーバー %s への接続に失敗しました: %s"
-
-#: ../camel/camel-imapx-server.c:4006
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
-msgid "STARTTLS not supported"
-msgstr "STARTTLS 拡張はサポートしていません。"
-
-#: ../camel/camel-imapx-server.c:4047
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: "
-msgstr "セキュリティ保護されたモードによる IMAP サーバー %s への接続に失敗しました: "
-
-#: ../camel/camel-imapx-server.c:4125
-#, c-format
-msgid "IMAP server %s does not support %s authentication"
-msgstr "IMAP サーバーの %s では %s という認証タイプをサポートしていません"
-
-#: ../camel/camel-imapx-server.c:4136 ../camel/camel-session.c:494
-#: ../camel/providers/pop3/camel-pop3-store.c:303
-#: ../camel/providers/pop3/camel-pop3-store.c:744
-#: ../camel/providers/smtp/camel-smtp-transport.c:505
-#, c-format
-msgid "No support for %s authentication"
-msgstr "%s という認証タイプはサポートしていません"
-
-#: ../camel/camel-imapx-server.c:4155
-#: ../camel/providers/nntp/camel-nntp-store.c:409
-#: ../camel/providers/nntp/camel-nntp-store.c:595
-msgid "Cannot authenticate without a username"
-msgstr "ユーザー名がないと認証を行えません"
-
-#: ../camel/camel-imapx-server.c:4164
-#: ../camel/providers/nntp/camel-nntp-store.c:604
-#: ../camel/providers/pop3/camel-pop3-store.c:669
-#: ../camel/providers/pop3/camel-pop3-store.c:689
-msgid "Authentication password not available"
-msgstr "認証用のパスワードがありません"
-
-#: ../camel/camel-imapx-server.c:4377
-msgid "Error fetching message"
-msgstr "メッセージを取得する際にエラーが発生しました"
-
-#: ../camel/camel-imapx-server.c:4427 ../camel/camel-imapx-server.c:4434
-msgid "Failed to close the tmp stream"
-msgstr "tmp ストリームのクローズに失敗しました"
-
-#: ../camel/camel-imapx-server.c:4463
-msgid "Failed to copy the tmp file"
-msgstr "tmp ファイルのコピーに失敗しました"
-
-#: ../camel/camel-imapx-server.c:4588
-msgid "Error moving messages"
-msgstr "メッセージを移動する際にエラーが発生しました"
-
-#: ../camel/camel-imapx-server.c:4592
-msgid "Error copying messages"
-msgstr "メッセージをコピーする際にエラーが発生しました"
-
-#: ../camel/camel-imapx-server.c:4759
-msgid "Error appending message"
-msgstr "メッセージを追加する際にエラーが発生しました"
-
-#: ../camel/camel-imapx-server.c:4956
-msgid "Error fetching message headers"
-msgstr "メッセージヘッダーを取得する際にエラーが発生しました"
-
-#: ../camel/camel-imapx-server.c:5119
-msgid "Error retrieving message"
-msgstr "メッセージの取得中にエラーが発生しました"
-
-#: ../camel/camel-imapx-server.c:5250 ../camel/camel-imapx-server.c:5471
-#, c-format
-msgid "Fetching summary information for new messages in '%s'"
-msgstr "'%s' にある新着メッセージのサマリ情報を取得中"
-
-#: ../camel/camel-imapx-server.c:5310
-#, c-format
-msgid "Scanning for changed messages in '%s'"
-msgstr "'%s' 内の変更されたメッセージをスキャン中"
-
-#: ../camel/camel-imapx-server.c:5365
-msgid "Error fetching new messages"
-msgstr "新しいメッセージの取得中にエラーが発生しました"
-
-#: ../camel/camel-imapx-server.c:5577
-msgid "Error while fetching messages"
-msgstr "メッセージの取得中にエラーが発生しました"
-
-#: ../camel/camel-imapx-server.c:5585 ../camel/camel-imapx-server.c:5618
-#, 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:5752 ../camel/camel-imapx-server.c:5782
-msgid "Error refreshing folder"
-msgstr "フォルダーを更新する際にエラーが発生しました"
-
-#: ../camel/camel-imapx-server.c:5904
-msgid "Error expunging message"
-msgstr "メッセージを抹消する際にエラーが発生しました"
-
-#: ../camel/camel-imapx-server.c:6012
-msgid "Error fetching folders"
-msgstr "フォルダーを取得する際にエラーが発生しました"
-
-#: ../camel/camel-imapx-server.c:6095
-msgid "Error subscribing to folder"
-msgstr "フォルダーをサブスクライブする際にエラーが発生しました"
-
-#: ../camel/camel-imapx-server.c:6157
-msgid "Error creating folder"
-msgstr "フォルダーを作成する際にエラーが発生しました"
-
-#: ../camel/camel-imapx-server.c:6210
-msgid "Error deleting folder"
-msgstr "フォルダーを削除する際にエラーが発生しました"
-
-#: ../camel/camel-imapx-server.c:6281
-msgid "Error renaming folder"
-msgstr "フォルダーの名前を変更する際にエラーが発生しました"
-
-#: ../camel/camel-imapx-server.c:6355
-msgid "Error retrieving quota information"
-msgstr "クオータ情報の取得エラー"
-
-#: ../camel/camel-imapx-server.c:6413
-msgid "Search failed"
-msgstr "検索失敗"
-
-#: ../camel/camel-imapx-server.c:6475
-msgid "Error performing NOOP"
-msgstr "NOOP を実行する際にエラーが発生しました"
-
-#: ../camel/camel-imapx-server.c:6583
-msgid "Error syncing changes"
-msgstr "変更を同期する際にエラーが発生しました"
-
-#: ../camel/camel-imapx-server.c:6883
-msgid "Lost connection to IMAP server"
-msgstr "IMAP サーバーへの接続を失いました"
-
-#: ../camel/camel-imapx-server.c:7330
-#, c-format
-msgid "Cannot get message with message ID %s: %s"
-msgstr "%s という ID のメッセージを取得できません: %s"
-
-#: ../camel/camel-imapx-server.c:7331
-msgid "No such message available."
-msgstr "そのようなメッセージは利用できません。"
-
-#: ../camel/camel-imapx-server.c:7492 ../camel/camel-imapx-server.c:7507
-msgid "Cannot create spool file: "
-msgstr "スプールファイルを作成できません: "
-
-#: ../camel/camel-imapx-server.c:8212
-msgid "IMAP server does not support quotas"
-msgstr "IMAP サーバーはクオータをサポートしていません"
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/camel-imapx-store.c:203 ../camel/camel-imapx-store.c:1143
-#: ../camel/providers/local/camel-maildir-folder.c:473
-#: ../camel/providers/local/camel-maildir-store.c:316
-#: ../camel/providers/local/camel-maildir-store.c:752
-#: ../camel/providers/local/camel-maildir-store.c:758
-#: ../camel/providers/local/camel-maildir-store.c:841
-#: ../camel/providers/local/camel-spool-store.c:393
-msgid "Inbox"
-msgstr "受信箱"
-
-#: ../camel/camel-imapx-store.c:487
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP サーバー %s"
-
-#: ../camel/camel-imapx-store.c:490
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s の %s にある IMAP サービス"
-
-#: ../camel/camel-imapx-store.c:591
-#: ../camel/providers/nntp/camel-nntp-provider.c:95
-#: ../camel/providers/pop3/camel-pop3-provider.c:83
-msgid "Password"
-msgstr "パスワード"
-
-#: ../camel/camel-imapx-store.c:593
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "このオプションはプレインテキストのパスワードを使って IMAP サーバーに接続します。"
-
-#: ../camel/camel-imapx-store.c:687
-#, c-format
-msgid "No such folder %s"
-msgstr "そのようなフォルダー %s はありません"
-
-#: ../camel/camel-imapx-store.c:1413
-#, c-format
-msgid "Retrieving folder list for %s"
-msgstr "%s のフォルダーの一覧を取得中"
-
-#: ../camel/camel-imapx-store.c:1783
-#, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "\"%s\" というフォルダー名に \"%c\" という文字を含めることはできません"
-
-#: ../camel/camel-imapx-store.c:1794
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "親フォルダーを特定できません: %s"
-
-#: ../camel/camel-imapx-store.c:1804
-#, 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-junk-filter.c:168
+#: ../camel/camel-junk-filter.c:167
 msgid "Synchronizing junk database"
 msgstr "ジャンクデータベースを同期しています"
 
-#: ../camel/camel-lock.c:102
+#: ../camel/camel-lock.c:110
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "%s のロックファイルを作成できませんでした: %s"
 
-#: ../camel/camel-lock.c:145
+#: ../camel/camel-lock.c:153
 #, c-format
 msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr "%s のロックファイルの取得中にタイムアウトしました。後でやり直してください。"
 
-#: ../camel/camel-lock.c:205
+#: ../camel/camel-lock.c:215
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2) を使ったロックに失敗しました: %s"
 
-#: ../camel/camel-lock.c:272
+#: ../camel/camel-lock.c:282
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) を使ったロックに失敗しました: %s"
 
-#: ../camel/camel-lock-client.c:106
+#: ../camel/camel-lock-client.c:107
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "ロッキングヘルパーパイプが構築できません: %s"
 
-#: ../camel/camel-lock-client.c:130
+#: ../camel/camel-lock-client.c:131
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "ロッキングヘルパーのプロセスを作成できません: %s"
 
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#: ../camel/camel-lock-client.c:218 ../camel/camel-lock-client.c:246
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "'%s' をロックできませんでした: lock-helper のプロトコルエラーです"
 
-#: ../camel/camel-lock-client.c:227
+#: ../camel/camel-lock-client.c:234
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "'%s' をロックできません"
 
-#: ../camel/camel-movemail.c:105
+#: ../camel/camel-movemail.c:109
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "メールファイル %s をチェックできませんでした: %s"
 
-#: ../camel/camel-movemail.c:119
+#: ../camel/camel-movemail.c:123
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "メールファイル %s を開けませんでした: %s"
 
-#: ../camel/camel-movemail.c:129
+#: ../camel/camel-movemail.c:133
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "メールファイル %s のテンポラリを開けませんでした: %s"
 
-#: ../camel/camel-movemail.c:159
+#: ../camel/camel-movemail.c:163
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "作業ファイル %s へメールの保存に失敗しました: %s"
 
-#: ../camel/camel-movemail.c:193
+#: ../camel/camel-movemail.c:197
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "パイプが作成できませんでした: %s"
 
-#: ../camel/camel-movemail.c:207
+#: ../camel/camel-movemail.c:211
 #, c-format
 msgid "Could not fork: %s"
 msgstr "fork できませんでした: %s"
 
-#: ../camel/camel-movemail.c:245
+#: ../camel/camel-movemail.c:249
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail プログラムは失敗しました: %s"
 
-#: ../camel/camel-movemail.c:246
+#: ../camel/camel-movemail.c:250
 msgid "(Unknown error)"
 msgstr "(特定できないエラー)"
 
-#: ../camel/camel-movemail.c:273
+#: ../camel/camel-movemail.c:277
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "メールファイルの読み込み中にエラー: %s"
 
-#: ../camel/camel-movemail.c:286
+#: ../camel/camel-movemail.c:290
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "メール作業ファイルの書き込み中にエラー: %s"
 
-#: ../camel/camel-movemail.c:493 ../camel/camel-movemail.c:562
+#: ../camel/camel-movemail.c:497 ../camel/camel-movemail.c:566
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "メール作業ファイルのコピー中にエラー: %s"
 
-#: ../camel/camel-multipart-signed.c:297
+#: ../camel/camel-multipart-signed.c:279 ../camel/camel-multipart-signed.c:432
 #, c-format
 msgid "No content available"
 msgstr "利用できるコンテンツがありません"
 
-#: ../camel/camel-multipart-signed.c:305
+#: ../camel/camel-multipart-signed.c:287 ../camel/camel-multipart-signed.c:440
 #, c-format
 msgid "No signature available"
 msgstr "利用できる署名がありません"
 
-#: ../camel/camel-multipart-signed.c:689
+#: ../camel/camel-multipart-signed.c:806
 #, c-format
 msgid "parse error"
 msgstr "解析エラー"
 
-#: ../camel/camel-net-utils.c:704
+#: ../camel/camel-net-utils.c:702
 #, c-format
 msgid "Resolving: %s"
 msgstr "解決中: %s"
 
-#: ../camel/camel-net-utils.c:727
+#: ../camel/camel-net-utils.c:725
 msgid "Host lookup failed"
 msgstr "ホストの検索に失敗しました"
 
-#: ../camel/camel-net-utils.c:733
+#: ../camel/camel-net-utils.c:731
 #, c-format
 msgid "Host lookup '%s' failed. Check your host name for spelling errors."
 msgstr "ホストの検索 '%s' に失敗しました。ホスト名につづりの誤りがないか確認してください。"
 
-#: ../camel/camel-net-utils.c:737
+#: ../camel/camel-net-utils.c:735
 #, c-format
 msgid "Host lookup '%s' failed: %s"
 msgstr "ホストの検索 '%s' に失敗しました: %s"
 
-#: ../camel/camel-net-utils.c:858
-msgid "Resolving address"
-msgstr "アドレスの解決中"
-
-#: ../camel/camel-net-utils.c:879
-msgid "Name lookup failed"
-msgstr "名前の検索に失敗しました"
-
-#: ../camel/camel-net-utils.c:886
-msgid "Name lookup failed. Check your host name for spelling errors."
-msgstr "名前の検索 '%s' に失敗しました。ホスト名につづりの誤りがないか確認してください。"
-
-#: ../camel/camel-net-utils.c:890
-#, c-format
-msgid "Name lookup failed: %s"
-msgstr "名前の検索に失敗しました: %s"
+#: ../camel/camel-network-service.c:1009
+#, fuzzy
+#| msgid "No quota information available for folder '%s'"
+msgid "No host information available"
+msgstr "フォルダー'%s' について利用できるクオータ情報はありません"
 
-#: ../camel/camel-network-service.c:350
-#, c-format
-msgid "Could not connect to '%s:%s': "
-msgstr "'%s:%s' へ接続できませんでした: "
+#: ../camel/camel-offline-folder.c:90
+msgid "Downloading new messages for offline mode"
+msgstr "オフラインモードでの新着メールのダウンロード中"
 
-#: ../camel/camel-offline-folder.c:212
+#: ../camel/camel-offline-folder.c:209
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "フォルダー '%s' にあるメッセージを同期して保存中"
 
-#: ../camel/camel-provider.c:58
+#: ../camel/camel-offline-folder.c:266
+msgid "Copy folder content locally for _offline operation"
+msgstr "オフラインでの作業用にフォルダーの内容をローカルへコピーする (_O)"
+
+#: ../camel/camel-provider.c:56
 msgid "Virtual folder email provider"
 msgstr "仮想フォルダーメールプロバイダー"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "For reading mail as a query of another set of folders"
 msgstr "その他のフォルダーセットのクエリとしてメールを読む"
 
-#: ../camel/camel-provider.c:263
+#: ../camel/camel-provider.c:261
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "%s を読み込めませんでした: このシステムではモジュールの読み込みをサポートしていません。"
 
-#: ../camel/camel-provider.c:272
+#: ../camel/camel-provider.c:270
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s を読み込めませんでした: %s"
 
-#: ../camel/camel-provider.c:281
+#: ../camel/camel-provider.c:279
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s を読み込めませんでした: モジュールのコードが初期化されていません。"
 
-#: ../camel/camel-provider.c:429 ../camel/camel-session.c:406
+#: ../camel/camel-provider.c:427 ../camel/camel-session.c:424
 #, 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
+#: ../camel/camel-sasl-anonymous.c:33
+#: ../camel/providers/nntp/camel-nntp-provider.c:83
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "This option will connect to the server using an anonymous login."
 msgstr "このオプションは匿名ログインを使ってサーバーへ接続します。"
 
-#: ../camel/camel-sasl-anonymous.c:70
+#: ../camel/camel-sasl-anonymous.c:68
 #, c-format
 msgid "Authentication failed."
 msgstr "認証に失敗しました。"
 
-#: ../camel/camel-sasl-anonymous.c:81
+#: ../camel/camel-sasl-anonymous.c:79
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -2668,7 +2459,7 @@ msgstr ""
 "無効な メールアドレスのトレース情報:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:95
+#: ../camel/camel-sasl-anonymous.c:93
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -2677,7 +2468,7 @@ msgstr ""
 "無効で不可解なトレース情報:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:109
+#: ../camel/camel-sasl-anonymous.c:107
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -2686,57 +2477,57 @@ msgstr ""
 "無効なトレース情報:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:46
+#: ../camel/camel-sasl-cram-md5.c:44
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:48
+#: ../camel/camel-sasl-cram-md5.c:46
 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:59
+#: ../camel/camel-sasl-digest-md5.c:57
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:61
+#: ../camel/camel-sasl-digest-md5.c:59
 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:855
+#: ../camel/camel-sasl-digest-md5.c:853
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "サーバー要求が長すぎます (2048 octet 以上です)"
 
-#: ../camel/camel-sasl-digest-md5.c:866
+#: ../camel/camel-sasl-digest-md5.c:864
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "無効です\n"
 
-#: ../camel/camel-sasl-digest-md5.c:874
+#: ../camel/camel-sasl-digest-md5.c:872
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "サーバー要求におかしな \"保護品質 (QOP: Quality of Protection)\" のトークンが含まれています"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:905
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "サーバーの応答に認証データがありません"
 
-#: ../camel/camel-sasl-digest-md5.c:928
+#: ../camel/camel-sasl-digest-md5.c:926
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "サーバーの応答に不完全な認証データがあります"
 
-#: ../camel/camel-sasl-digest-md5.c:941
+#: ../camel/camel-sasl-digest-md5.c:939
 #, c-format
 msgid "Server response does not match"
 msgstr "サーバーの応答が一致しません"
 
-#: ../camel/camel-sasl-gssapi.c:91
+#: ../camel/camel-sasl-gssapi.c:89
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:93
+#: ../camel/camel-sasl-gssapi.c:91
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "このオプションは Kerberos 5 認証を使ってサーバーに接続します。"
 
@@ -2780,472 +2571,390 @@ msgstr "証明書で実施した整合性のチェックが失敗しました。
 msgid "The referenced credentials have expired."
 msgstr "参照している証明書の期限が過ぎています。"
 
-#: ../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:612
+#: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:352
+#: ../camel/camel-sasl-gssapi.c:400 ../camel/camel-sasl-gssapi.c:417
+#: ../camel/providers/smtp/camel-smtp-transport.c:622
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "サーバーから間違った認証応答がありました。"
 
-#: ../camel/camel-sasl-gssapi.c:417
+#: ../camel/camel-sasl-gssapi.c:429
 #, c-format
 msgid "Unsupported security layer."
 msgstr "サポートしていないセキュリティレイヤーです。"
 
-#: ../camel/camel-sasl-login.c:40
+#: ../camel/camel-sasl-login.c:38
 msgid "Login"
 msgstr "ログイン"
 
-#: ../camel/camel-sasl-login.c:42 ../camel/camel-sasl-plain.c:46
+#: ../camel/camel-sasl-login.c:40 ../camel/camel-sasl-plain.c:44
 msgid "This option will connect to the server using a simple password."
 msgstr "このオプションは簡単なパスワードを使ってサーバーへ接続します。"
 
-#: ../camel/camel-sasl-login.c:110
+#: ../camel/camel-sasl-login.c:108
 #, c-format
 msgid "Unknown authentication state."
 msgstr "特定できない認証状態です。"
 
-#: ../camel/camel-sasl-ntlm.c:48
+#: ../camel/camel-sasl-ntlm.c:46
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:50
+#: ../camel/camel-sasl-ntlm.c:48
 msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
 msgstr "このオプションは NTLM/セキュリティ保護されたパスワード認証を使って Windows サーバーに接続します。"
 
-#: ../camel/camel-sasl-plain.c:44
+#: ../camel/camel-sasl-plain.c:42
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:46
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "POP before SMTP"
 msgstr "POP before SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:48
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "このオプションは SMTP 接続を確立する前に POP 接続の認証を行います"
 
-#: ../camel/camel-sasl-popb4smtp.c:84
+#: ../camel/camel-sasl-popb4smtp.c:82
 msgid "POP Source UID"
 msgstr "POP ソース UID"
 
-#: ../camel/camel-sasl-popb4smtp.c:98
+#: ../camel/camel-sasl-popb4smtp.c:96
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "不明な転送を利用した POP Before SMTP 認証です"
 
-#: ../camel/camel-sasl-popb4smtp.c:110 ../camel/camel-sasl-popb4smtp.c:119
+#: ../camel/camel-sasl-popb4smtp.c:108 ../camel/camel-sasl-popb4smtp.c:117
 #, c-format
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "%s サービスで試行される POP Before SMTP 認証です"
 
-#: ../camel/camel-search-private.c:116
+#: ../camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "正規表現の編集に失敗: %s: %s"
 
-#: ../camel/camel-session.c:415
+#: ../camel/camel-session.c:433
 #, c-format
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "'%s' というプロトコルに無効な GType が登録されています"
 
-#: ../camel/camel-session.c:509
+#: ../camel/camel-session.c:502
+#: ../camel/providers/imapx/camel-imapx-server.c:4814
+#: ../camel/providers/pop3/camel-pop3-store.c:311
+#: ../camel/providers/pop3/camel-pop3-store.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:515
+#, c-format
+msgid "No support for %s authentication"
+msgstr "%s という認証タイプはサポートしていません"
+
+#: ../camel/camel-session.c:517
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s 認証に失敗しました"
 
-#: ../camel/camel-session.c:645
+#: ../camel/camel-session.c:586
 msgid "Forwarding messages is not supported"
 msgstr "メッセージの転送はサポートされていません"
 
-#. 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:1420
-#, c-format
-msgid "Please enter the %s password for %s on host %s."
-msgstr "%2$s %3$s の %1$s パスワードを入力してください。"
-
-#: ../camel/camel-smime-context.c:351 ../camel/camel-smime-context.c:1074
+#: ../camel/camel-smime-context.c:349 ../camel/camel-smime-context.c:1076
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' の証明書が見つかりません"
 
-#: ../camel/camel-smime-context.c:379
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS message"
 msgstr "CMS メッセージを作成できません"
 
-#: ../camel/camel-smime-context.c:384
+#: ../camel/camel-smime-context.c:382
 msgid "Cannot create CMS signed data"
 msgstr "CMS 署名データを作成できません"
 
-#: ../camel/camel-smime-context.c:390
+#: ../camel/camel-smime-context.c:388
 msgid "Cannot attach CMS signed data"
 msgstr "CMS 署名データを添付できません"
 
-#: ../camel/camel-smime-context.c:397
+#: ../camel/camel-smime-context.c:395
 msgid "Cannot attach CMS data"
 msgstr "CMS データを添付できません"
 
-#: ../camel/camel-smime-context.c:403
+#: ../camel/camel-smime-context.c:401
 msgid "Cannot create CMS Signer information"
 msgstr "CMS 署名者の情報を作成できません"
 
-#: ../camel/camel-smime-context.c:409
+#: ../camel/camel-smime-context.c:407
 msgid "Cannot find certificate chain"
 msgstr "認証チェインが見つかりません"
 
-#: ../camel/camel-smime-context.c:415
+#: ../camel/camel-smime-context.c:413
 msgid "Cannot add CMS Signing time"
 msgstr "CMS 署名時刻を追加できません"
 
-#: ../camel/camel-smime-context.c:439 ../camel/camel-smime-context.c:454
+#: ../camel/camel-smime-context.c:437 ../camel/camel-smime-context.c:452
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' の暗号化証明書がありません"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "属性 SMIMEEncKeyPrefs を追加できません"
 
-#: ../camel/camel-smime-context.c:466
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "属性 MS SMIMEEncKeyPrefs を追加できません"
 
-#: ../camel/camel-smime-context.c:471
+#: ../camel/camel-smime-context.c:469
 msgid "Cannot add encryption certificate"
 msgstr "暗号化証明書を追加できません"
 
-#: ../camel/camel-smime-context.c:477
+#: ../camel/camel-smime-context.c:475
 msgid "Cannot add CMS Signer information"
 msgstr "CMS 署名者情報を追加できません"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:510
+#: ../camel/camel-smime-context.c:508
 msgid "Unverified"
 msgstr "未検証"
 
-#: ../camel/camel-smime-context.c:512
+#: ../camel/camel-smime-context.c:510
 msgid "Good signature"
 msgstr "良い署名"
 
-#: ../camel/camel-smime-context.c:514
+#: ../camel/camel-smime-context.c:512
 msgid "Bad signature"
 msgstr "悪い署名"
 
-#: ../camel/camel-smime-context.c:516
+#: ../camel/camel-smime-context.c:514
 msgid "Content tampered with or altered in transit"
 msgstr "データの転送中に不当に改竄された内容です"
 
-#: ../camel/camel-smime-context.c:518
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not found"
 msgstr "署名付き証明書がみつかりません"
 
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:518
 msgid "Signing certificate not trusted"
 msgstr "署名付き証明書は信頼できません"
 
-#: ../camel/camel-smime-context.c:522
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unknown"
 msgstr "署名アルゴリズムが不明です"
 
-#: ../camel/camel-smime-context.c:524
+#: ../camel/camel-smime-context.c:522
 msgid "Signature algorithm unsupported"
 msgstr "署名アルゴリズムは未サポートです"
 
-#: ../camel/camel-smime-context.c:526
+#: ../camel/camel-smime-context.c:524
 msgid "Malformed signature"
 msgstr "おかしな署名です"
 
-#: ../camel/camel-smime-context.c:528
+#: ../camel/camel-smime-context.c:526
 msgid "Processing error"
 msgstr "処理エラーです"
 
-#: ../camel/camel-smime-context.c:573
+#: ../camel/camel-smime-context.c:571
 msgid "No signed data in signature"
 msgstr "署名の中に署名したデータがありません"
 
-#: ../camel/camel-smime-context.c:578
+#: ../camel/camel-smime-context.c:576
 msgid "Digests missing from enveloped data"
 msgstr "EnvelopedData からのダイジェストがありません"
 
-#: ../camel/camel-smime-context.c:591 ../camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:589 ../camel/camel-smime-context.c:600
 msgid "Cannot calculate digests"
 msgstr "ダイジェストを計算できません"
 
-#: ../camel/camel-smime-context.c:609 ../camel/camel-smime-context.c:613
+#: ../camel/camel-smime-context.c:607 ../camel/camel-smime-context.c:611
 msgid "Cannot set message digests"
 msgstr "メッセージダイジェストをセットできません"
 
-#: ../camel/camel-smime-context.c:623 ../camel/camel-smime-context.c:628
+#: ../camel/camel-smime-context.c:621 ../camel/camel-smime-context.c:626
 msgid "Certificate import failed"
 msgstr "証明書のインポートに失敗しました"
 
-#: ../camel/camel-smime-context.c:638
+#: ../camel/camel-smime-context.c:636
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "メッセージのみ認証しますが、妥当性を検証できません"
 
-#: ../camel/camel-smime-context.c:641
+#: ../camel/camel-smime-context.c:639
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "メッセージとインポート済で検証済みの証明書のみ認証します"
 
-#: ../camel/camel-smime-context.c:645
+#: ../camel/camel-smime-context.c:643
 msgid "Cannot find signature digests"
 msgstr "証明書のダイジェストが見つかりません"
 
-#: ../camel/camel-smime-context.c:662
+#: ../camel/camel-smime-context.c:660
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "署名者: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:858 ../camel/camel-smime-context.c:1148
+#: ../camel/camel-smime-context.c:856 ../camel/camel-smime-context.c:1150
 msgid "Cannot create encoder context"
 msgstr "エンコーダーのコンテキストを作成できません"
 
-#: ../camel/camel-smime-context.c:864
+#: ../camel/camel-smime-context.c:862
 msgid "Failed to add data to CMS encoder"
 msgstr "CMS エンコーダーへのデータの追加が失敗しました"
 
-#: ../camel/camel-smime-context.c:869 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:867 ../camel/camel-smime-context.c:1167
 msgid "Failed to encode data"
 msgstr "データのエンコードに失敗しました"
 
-#: ../camel/camel-smime-context.c:1013 ../camel/camel-smime-context.c:1262
+#: ../camel/camel-smime-context.c:1015 ../camel/camel-smime-context.c:1264
 msgid "Decoder failed"
 msgstr "デコーダーのエラーです"
 
-#: ../camel/camel-smime-context.c:1082
+#: ../camel/camel-smime-context.c:1084
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "共通なバルク暗号化アルゴリズムが見つかりません"
 
-#: ../camel/camel-smime-context.c:1090
+#: ../camel/camel-smime-context.c:1092
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "暗号化バルク鍵のスロットを確保できません"
 
-#: ../camel/camel-smime-context.c:1101
+#: ../camel/camel-smime-context.c:1103
 msgid "Cannot create CMS Message"
 msgstr "CMS メッセージを作成できません"
 
-#: ../camel/camel-smime-context.c:1107
+#: ../camel/camel-smime-context.c:1109
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS Enveloped データを作成できません"
 
-#: ../camel/camel-smime-context.c:1113
+#: ../camel/camel-smime-context.c:1115
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS Enveloped データを添付できません"
 
-#: ../camel/camel-smime-context.c:1119
+#: ../camel/camel-smime-context.c:1121
 msgid "Cannot attach CMS data object"
 msgstr "CMS データオブジェクトを添付できません"
 
-#: ../camel/camel-smime-context.c:1128
+#: ../camel/camel-smime-context.c:1130
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS 受領情報を作成できません"
 
-#: ../camel/camel-smime-context.c:1133
+#: ../camel/camel-smime-context.c:1135
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS 受領情報を追加できません"
 
-#: ../camel/camel-smime-context.c:1159
+#: ../camel/camel-smime-context.c:1161
 msgid "Failed to add data to encoder"
 msgstr "データのエンコーダーへの追加に失敗しました"
 
-#: ../camel/camel-smime-context.c:1269
+#: ../camel/camel-smime-context.c:1271
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME 復号化: 暗号化された内容がありません"
 
-#: ../camel/camel-store.c:1928
-#, c-format
-msgid "Cannot create folder '%s': folder exists"
-msgstr "'%s' というフォルダーを作成できません: 既に存在しています"
-
-#: ../camel/camel-store.c:1971
+#: ../camel/camel-store.c:1232
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "フォルダー '%s' を開いています"
 
-#: ../camel/camel-store.c:2160
+#: ../camel/camel-store.c:1523
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "'%s' にあるフォルダーをスキャン中"
 
-#: ../camel/camel-store.c:2188 ../camel/camel-store.c:2233
-#: ../camel/camel-vtrash-folder.c:48
+#: ../camel/camel-store.c:1551 ../camel/camel-store.c:1596
+#: ../camel/camel-vtrash-folder.c:46
 msgid "Trash"
 msgstr "ゴミ箱"
 
-#: ../camel/camel-store.c:2202 ../camel/camel-store.c:2250
-#: ../camel/camel-vtrash-folder.c:50
+#: ../camel/camel-store.c:1565 ../camel/camel-store.c:1613
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Junk"
 msgstr "ジャンク"
 
-#: ../camel/camel-store.c:2703
+#: ../camel/camel-store.c:2214
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "フォルダーを作成できません: %s: フォルダーが存在します"
 
-#: ../camel/camel-store.c:2717
+#: ../camel/camel-store.c:2221
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "フォルダー '%s' の作成中"
 
-#: ../camel/camel-store.c:2835 ../camel/camel-vee-store.c:416
-#: ../camel/providers/local/camel-maildir-store.c:315
+#: ../camel/camel-store.c:2398 ../camel/camel-vee-store.c:416
+#: ../camel/providers/local/camel-maildir-store.c:321
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "フォルダーを削除できません: %s: 無効な操作です"
 
-#: ../camel/camel-store.c:2978 ../camel/camel-vee-store.c:466
-#: ../camel/providers/local/camel-maildir-store.c:840
+#: ../camel/camel-store.c:2588 ../camel/camel-vee-store.c:467
+#: ../camel/providers/local/camel-maildir-store.c:852
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "フォルダー名を変更できません: %s: 無効な操作です"
 
-#: ../camel/camel-stream-filter.c:334
+#: ../camel/camel-stream.c:285 ../camel/camel-stream.c:336
+#, c-format
+msgid "Stream type '%s' is not seekable"
+msgstr "ストリームタイプ '%s' は検索できません"
+
+#: ../camel/camel-stream-filter.c:344
 msgid "Only reset to beginning is supported with CamelStreamFilter"
 msgstr "CamelStreamFilter でサポートしているのは先頭へのリセットのみです"
 
-#: ../camel/camel-stream-null.c:78
+#: ../camel/camel-stream-null.c:76
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr "CamelHttpStream でサポートしているのは先頭へのリセットのみです"
 
-#: ../camel/camel-stream-process.c:275
+#: ../camel/camel-stream-process.c:280
 #, c-format
 msgid "Connection cancelled"
 msgstr "接続をキャンセルしました"
 
-#: ../camel/camel-stream-process.c:280
+#: ../camel/camel-stream-process.c:285
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "コマンド \"%s\" で接続できませんでした: %s"
 
-#: ../camel/camel-subscribable.c:389
+#: ../camel/camel-subscribable.c:273
 #, c-format
 msgid "Subscribing to folder '%s'"
 msgstr "'%s' というフォルダーにサブスクライブ中"
 
-#: ../camel/camel-subscribable.c:517
+#: ../camel/camel-subscribable.c:442
 #, c-format
 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:675
-#, c-format
-msgid "The proxy host denied our request: code %d"
-msgstr "プロキシホストはリクエストを拒否しました: コード %d"
-
-#: ../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:789
-#, c-format
-msgid "Could not find a suitable authentication type: code 0x%x"
-msgstr "適合する認証形式が見つかりませんでした: コード 0x%x"
-
-#: ../camel/camel-tcp-stream-raw.c:801
-msgid "General SOCKS server failure"
-msgstr "SOCKS サーバーの一般的な失敗です"
-
-#: ../camel/camel-tcp-stream-raw.c:802
-msgid "SOCKS server's rules do not allow connection"
-msgstr "SOCKS サーバーのルール設定により接続が許可されません"
-
-#: ../camel/camel-tcp-stream-raw.c:803
-msgid "Network is unreachable from SOCKS server"
-msgstr "SOCKS サーバーからネットワークに到達できません"
-
-#: ../camel/camel-tcp-stream-raw.c:804
-msgid "Host is unreachable from SOCKS server"
-msgstr "SOCKS サーバーからホストに到達できません"
-
-#: ../camel/camel-tcp-stream-raw.c:805
-msgid "Connection refused"
-msgstr "接続が拒否されました"
-
-#: ../camel/camel-tcp-stream-raw.c:806
-msgid "Time-to-live expired"
-msgstr "Time-to-live の期限が切れました"
-
-#: ../camel/camel-tcp-stream-raw.c:807
-msgid "Command not supported by SOCKS server"
-msgstr "SOCKSサーバーでサポートされないコマンドです"
-
-#: ../camel/camel-tcp-stream-raw.c:808
-msgid "Address type not supported by SOCKS server"
-msgstr "SOCKSサーバーでサポートされないアドレス形式です"
-
-#: ../camel/camel-tcp-stream-raw.c:809
-msgid "Unknown error from SOCKS server"
-msgstr "SOCKSサーバーからの不明なエラーです"
-
-#: ../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:860
-#, c-format
-msgid "Incomplete reply from SOCKS server"
-msgstr "SOCKS サーバーからの応答が不完全です"
-
-#: ../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:912 ../camel/camel-tcp-stream-raw.c:922
-#, c-format
-msgid "Invalid reply from proxy server"
-msgstr "プロキシサーバーからの応答が無効です"
-
-#: ../camel/camel-url.c:331
+#: ../camel/camel-url.c:329
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "'%s' という URL を解析できませんでした"
 
-#: ../camel/camel-vee-folder.c:493
+#: ../camel/camel-vee-folder.c:491
 #, c-format
 msgid "Updating folder '%s'"
 msgstr "フォルダー '%s' の更新中"
 
-#: ../camel/camel-vee-folder.c:853 ../camel/camel-vee-folder.c:963
+#: ../camel/camel-vee-folder.c:851 ../camel/camel-vee-folder.c:961
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "メッセージの仮想フォルダーへのコピーまたは移動ができません。"
 
-#: ../camel/camel-vee-folder.c:886
+#: ../camel/camel-vee-folder.c:884
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%2$s にメッセージ %1$s はありません。"
 
-#: ../camel/camel-vee-folder.c:939
+#: ../camel/camel-vee-folder.c:937
 #, c-format
 msgid "Error storing '%s': "
 msgstr "'%s' の格納中にエラー: "
 
-#: ../camel/camel-vee-folder.c:1169
+#: ../camel/camel-vee-folder.c:1167
 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:42
+#: ../camel/camel-vee-store.c:40
 msgid "Unmatched"
 msgstr "該当しないもの"
 
@@ -3254,23 +2963,67 @@ msgstr "該当しないもの"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "フォルダーを削除できません: %s: そのようなフォルダーはありません"
 
-#: ../camel/camel-vee-store.c:476
+#: ../camel/camel-vee-store.c:477
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "フォルダー名を変更できません: %s: そのようなフォルダーはありません"
 
-#: ../camel/camel-vee-store.c:537
+#: ../camel/camel-vee-store.c:539
 msgid "Enable _Unmatched folder"
 msgstr "一致しないフォルダーを有効にする(_U)"
 
-#: ../camel/camel-vtrash-folder.c:49
+#: ../camel/camel-vtrash-folder.c:47
 msgid "Cannot copy messages to the Trash folder"
 msgstr "ゴミ箱フォルダーへメッセージをコピーできません"
 
-#: ../camel/camel-vtrash-folder.c:51
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ジャンクフォルダーへメッセージをコピーできません"
 
+#: ../camel/providers/imapx/camel-imapx-folder.c:727
+#, c-format
+msgid "No quota information available for folder '%s'"
+msgstr "フォルダー'%s' について利用できるクオータ情報はありません"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:841
+#: ../camel/providers/imapx/camel-imapx-folder.c:934
+#, c-format
+msgid "No destination folder specified"
+msgstr "対象フォルダーが指定されていません"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:869
+msgid "Unable to move junk messages"
+msgstr "ジャンクメッセージを移動できません"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:962
+msgid "Unable to move deleted messages"
+msgstr "削除したメッセージを移動できません"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1189
+#: ../camel/providers/nntp/camel-nntp-folder.c:758
+msgid "Apply message _filters to this folder"
+msgstr "このフォルダーにメッセージフィルターを適用 (_F)"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1295
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "%s のフォルダーサマリを作成できませんでした"
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1304
+#, c-format
+msgid "Could not create cache for %s: "
+msgstr "%s のキャッシュを生成できませんでした: "
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:1489
+#, c-format
+msgid "No IMAP mailbox available for folder '%s'"
+msgstr "フォルダー '%s' で利用できる IMAP mailbox はありません"
+
+#: ../camel/providers/imapx/camel-imapx-input-stream.c:92
+#, c-format
+msgid "Source stream returned no data"
+msgstr "ソースストリームはデータを返しませんでした"
+
 #: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "新着メールのチェック"
@@ -3292,7 +3045,7 @@ msgid "_Listen for server change notifications"
 msgstr "サーバー変更の通知をリッスンする(_L)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:49
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid "Folders"
 msgstr "フォルダー"
 
@@ -3309,15 +3062,15 @@ msgid "Namespace:"
 msgstr "ネームスペース:"
 
 #: ../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
+#: ../camel/providers/local/camel-local-provider.c:39
+#: ../camel/providers/local/camel-local-provider.c:79
+#: ../camel/providers/local/camel-local-provider.c:99
+#: ../camel/providers/nntp/camel-nntp-provider.c:39
 msgid "Options"
 msgstr "オプション"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:61
-#: ../camel/providers/nntp/camel-nntp-provider.c:43
+#: ../camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Apply _filters to new messages in all folders"
 msgstr "すべてのフォルダーの新着メッセージにフィルターを適用する(_F)"
 
@@ -3353,27 +3106,257 @@ msgstr "IMAP+"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP サーバーのメールを読んだり大切なメールを保存します。"
 
-#: ../camel/providers/local/camel-local-folder.c:194
+#: ../camel/providers/imapx/camel-imapx-server.c:844
+#, c-format
+msgid "Not authenticated"
+msgstr "認証されていません"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:1773
+msgid "Server disconnected"
+msgstr "サーバーが切断されました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2255
+msgid "Error writing to cache stream"
+msgstr "キャッシュストリームに書き込み中にエラー"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3672
+msgid "Error performing IDLE"
+msgstr "IDLE を実行する際にエラーが発生しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4661
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "セキュリティ保護されたモードで IMAP サーバー %s への接続に失敗しました: %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4662
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
+msgid "STARTTLS not supported"
+msgstr "STARTTLS 拡張はサポートしていません。"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4722
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: "
+msgstr "セキュリティ保護されたモードによる IMAP サーバー %s への接続に失敗しました: "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4803
+#, c-format
+msgid "IMAP server %s does not support %s authentication"
+msgstr "IMAP サーバーの %s では %s という認証タイプをサポートしていません"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4833
+#: ../camel/providers/nntp/camel-nntp-store.c:394
+#: ../camel/providers/nntp/camel-nntp-store.c:531
+msgid "Cannot authenticate without a username"
+msgstr "ユーザー名がないと認証を行えません"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:4842
+#: ../camel/providers/nntp/camel-nntp-store.c:540
+#: ../camel/providers/pop3/camel-pop3-store.c:678
+#: ../camel/providers/pop3/camel-pop3-store.c:699
+msgid "Authentication password not available"
+msgstr "認証用のパスワードがありません"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5093
+msgid "Error fetching message"
+msgstr "メッセージを取得する際にエラーが発生しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5139
+msgid "Failed to close the tmp stream"
+msgstr "tmp ストリームのクローズに失敗しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5168
+msgid "Failed to copy the tmp file"
+msgstr "tmp ファイルのコピーに失敗しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5294
+msgid "Error moving messages"
+msgstr "メッセージを移動する際にエラーが発生しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5298
+msgid "Error copying messages"
+msgstr "メッセージをコピーする際にエラーが発生しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5520
+msgid "Error appending message"
+msgstr "メッセージを追加する際にエラーが発生しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5756
+msgid "Error fetching message headers"
+msgstr "メッセージヘッダーを取得する際にエラーが発生しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5921
+msgid "Error retrieving message"
+msgstr "メッセージの取得中にエラーが発生しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6051
+#: ../camel/providers/imapx/camel-imapx-server.c:6274
+#, c-format
+msgid "Fetching summary information for new messages in '%s'"
+msgstr "'%s' にある新着メッセージのサマリ情報を取得中"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6103
+#, c-format
+msgid "Scanning for changed messages in '%s'"
+msgstr "'%s' 内の変更されたメッセージをスキャン中"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6155
+msgid "Error fetching new messages"
+msgstr "新しいメッセージの取得中にエラーが発生しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6423
+msgid "Error refreshing folder"
+msgstr "フォルダーを更新する際にエラーが発生しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6573
+msgid "Error expunging message"
+msgstr "メッセージを抹消する際にエラーが発生しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6682
+#: ../camel/providers/imapx/camel-imapx-server.c:6707
+msgid "Error fetching folders"
+msgstr "フォルダーを取得する際にエラーが発生しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6787
+msgid "Error creating folder"
+msgstr "フォルダーを作成する際にエラーが発生しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6839
+msgid "Error deleting folder"
+msgstr "フォルダーを削除する際にエラーが発生しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6906
+msgid "Error renaming folder"
+msgstr "フォルダーの名前を変更する際にエラーが発生しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:6993
+msgid "Error subscribing to folder"
+msgstr "フォルダーをサブスクライブする際にエラーが発生しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:7053
+msgid "Error unsubscribing from folder"
+msgstr "フォルダーをサブスクライブ解除する際にエラーが発生しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:7109
+msgid "Error retrieving quota information"
+msgstr "クオータ情報の取得エラー"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:7161
+msgid "Search failed"
+msgstr "検索失敗"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:7223
+msgid "Error performing NOOP"
+msgstr "NOOP を実行する際にエラーが発生しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:7330
+msgid "Error syncing changes"
+msgstr "変更を同期する際にエラーが発生しました"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:8441
+#, c-format
+msgid "Cannot get message with message ID %s: %s"
+msgstr "%s という ID のメッセージを取得できません: %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:8442
+msgid "No such message available."
+msgstr "そのようなメッセージは利用できません。"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:8640
+#: ../camel/providers/imapx/camel-imapx-server.c:8661
+msgid "Cannot create spool file: "
+msgstr "スプールファイルを作成できません: "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:9403
+msgid "IMAP server does not support quotas"
+msgstr "IMAP サーバーはクオータをサポートしていません"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imapx/camel-imapx-store.c:207
+#: ../camel/providers/local/camel-maildir-folder.c:482
+#: ../camel/providers/local/camel-maildir-store.c:322
+#: ../camel/providers/local/camel-maildir-store.c:764
+#: ../camel/providers/local/camel-maildir-store.c:770
+#: ../camel/providers/local/camel-maildir-store.c:853
+#: ../camel/providers/local/camel-spool-store.c:393
+msgid "Inbox"
+msgstr "受信箱"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:823
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP サーバー %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:826
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s の %s にある IMAP サービス"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1035
+#: ../camel/providers/nntp/camel-nntp-provider.c:93
+#: ../camel/providers/pop3/camel-pop3-provider.c:81
+msgid "Password"
+msgstr "パスワード"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1037
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr "このオプションはプレインテキストのパスワードを使って IMAP サーバーに接続します。"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1112
+#, c-format
+msgid "No such folder %s"
+msgstr "そのようなフォルダー %s はありません"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1507
+#, c-format
+msgid "No IMAP namespace for folder path '%s'"
+msgstr "フォルダーパス '%s' には IMAP 名前空間がありません"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:1656
+#, c-format
+msgid "Retrieving folder list for %s"
+msgstr "%s のフォルダーの一覧を取得中"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2094
+#, c-format
+msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "\"%s\" というフォルダー名に \"%c\" という文字を含めることはできません"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:2615
+#: ../camel/providers/nntp/camel-nntp-store.c:1250
+#: ../camel/providers/pop3/camel-pop3-folder.c:450
+#: ../camel/providers/pop3/camel-pop3-folder.c:593
+#: ../camel/providers/pop3/camel-pop3-folder.c:789
+#: ../camel/providers/pop3/camel-pop3-folder.c:987
+#: ../camel/providers/pop3/camel-pop3-store.c:299
+#: ../camel/providers/pop3/camel-pop3-store.c:528
+#: ../camel/providers/pop3/camel-pop3-store.c:576
+#: ../camel/providers/pop3/camel-pop3-store.c:668
+#: ../camel/providers/pop3/camel-pop3-store.c:1072
+#, c-format
+msgid "You must be working online to complete this operation"
+msgstr "この動作を完了するためにオンラインで作業してください"
+
+#: ../camel/providers/local/camel-local-folder.c:192
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:204
-#: ../camel/providers/local/camel-local-folder.c:213
+#: ../camel/providers/local/camel-local-folder.c:202
+#: ../camel/providers/local/camel-local-folder.c:211
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "mailbox: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:222
+#: ../camel/providers/local/camel-local-folder.c:220
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:499
+#: ../camel/providers/local/camel-local-folder.c:497
 msgid "_Index message body data"
 msgstr "メール本文のインデックスを作成する(_I)"
 
-#: ../camel/providers/local/camel-local-folder.c:727
+#: ../camel/providers/local/camel-local-folder.c:725
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3382,49 +3365,49 @@ msgstr ""
 "メッセージ %s をフォルダー %s から取得できません\n"
 "  %s"
 
-#: ../camel/providers/local/camel-local-provider.c:43
+#: ../camel/providers/local/camel-local-provider.c:41
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "'.folders' をサマリファイルとして使用する (exmh)(_U)"
 
-#: ../camel/providers/local/camel-local-provider.c:50
+#: ../camel/providers/local/camel-local-provider.c:48
 msgid "MH-format mail directories"
 msgstr "MH 形式のメールフォルダー"
 
-#: ../camel/providers/local/camel-local-provider.c:51
+#: ../camel/providers/local/camel-local-provider.c:49
 msgid "For storing local mail in MH-like mail directories."
 msgstr "ローカルメールを MH 形式のメールフォルダーの中に保存します。"
 
-#: ../camel/providers/local/camel-local-provider.c:68
+#: ../camel/providers/local/camel-local-provider.c:66
 msgid "Local delivery"
 msgstr "ローカルの配信"
 
-#: ../camel/providers/local/camel-local-provider.c:69
+#: ../camel/providers/local/camel-local-provider.c:67
 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:83
-#: ../camel/providers/local/camel-local-provider.c:103
+#: ../camel/providers/local/camel-local-provider.c:81
+#: ../camel/providers/local/camel-local-provider.c:101
 msgid "_Apply filters to new messages in Inbox"
 msgstr "受信箱にある新着メールにフィルターを適用する(_A)"
 
-#: ../camel/providers/local/camel-local-provider.c:90
+#: ../camel/providers/local/camel-local-provider.c:88
 msgid "Maildir-format mail directories"
 msgstr "Maildir 形式のメールフォルダー"
 
-#: ../camel/providers/local/camel-local-provider.c:91
+#: ../camel/providers/local/camel-local-provider.c:89
 msgid "For storing local mail in maildir directories."
 msgstr "ローカルメールを Maildir 形式のフォルダーに保存します。"
 
-#: ../camel/providers/local/camel-local-provider.c:104
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "ステータスヘッダーを Elm/Pine/Mutt 形式で格納する(_S)"
 
-#: ../camel/providers/local/camel-local-provider.c:111
+#: ../camel/providers/local/camel-local-provider.c:109
 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
+#: ../camel/providers/local/camel-local-provider.c:110
+#: ../camel/providers/local/camel-local-provider.c:124
 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."
@@ -3432,220 +3415,214 @@ msgstr ""
 "外部の標準 mbox 形式のスプールファイルにあるローカルメールを読み込んだり格納します\n"
 "(Elm、Pine、Mutt 形式のフォルダーの読み込みにも対応)。"
 
-#: ../camel/providers/local/camel-local-provider.c:125
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid "Standard Unix mbox spool directory"
 msgstr "標準的な UNIX の mbox 形式のスプールフォルダー"
 
-#: ../camel/providers/local/camel-local-store.c:98
+#: ../camel/providers/local/camel-local-store.c:96
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "フォルダーを %s から %s へ名前変更できませんでした: %s"
 
-#: ../camel/providers/local/camel-local-store.c:180
+#: ../camel/providers/local/camel-local-store.c:178
 #, c-format
 msgid "Local mail file %s"
 msgstr "ローカルメールのファイル %s"
 
-#: ../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
+#: ../camel/providers/local/camel-local-store.c:221
+#: ../camel/providers/local/camel-local-store.c:381
+#: ../camel/providers/local/camel-maildir-store.c:122
+#: ../camel/providers/local/camel-mbox-store.c:572
+#: ../camel/providers/local/camel-spool-store.c:87
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "保存したルート %s は絶対パスではありません"
 
-#: ../camel/providers/local/camel-local-store.c:232
+#: ../camel/providers/local/camel-local-store.c:230
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "保存したルート %s は通常のフォルダーではありません"
 
-#: ../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
+#: ../camel/providers/local/camel-local-store.c:242
+#: ../camel/providers/local/camel-local-store.c:252
+#: ../camel/providers/local/camel-local-store.c:394
+#: ../camel/providers/local/camel-maildir-store.c:156
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "フォルダーを取得できません: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:291
+#: ../camel/providers/local/camel-local-store.c:289
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "ローカルへの保存では受信箱を持てません"
 
-#: ../camel/providers/local/camel-local-store.c:456
-#: ../camel/providers/local/camel-mbox-store.c:748
+#: ../camel/providers/local/camel-local-store.c:454
+#: ../camel/providers/local/camel-mbox-store.c:739
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "'%s' というインデックスファイルを削除できませんでした: %s"
 
-#: ../camel/providers/local/camel-local-store.c:484
-#: ../camel/providers/local/camel-mbox-store.c:778
+#: ../camel/providers/local/camel-local-store.c:482
+#: ../camel/providers/local/camel-mbox-store.c:769
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "'%s' というメタファイルを削除できませんでした: %s"
 
-#: ../camel/providers/local/camel-local-store.c:596
+#: ../camel/providers/local/camel-local-store.c:594
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' の名前を変更できませんでした: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../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:159
+#: ../camel/providers/local/camel-maildir-folder.c:109
+#: ../camel/providers/local/camel-maildir-folder.c:344
+#: ../camel/providers/local/camel-mbox-folder.c:126
+#: ../camel/providers/local/camel-mbox-folder.c:339
+#: ../camel/providers/local/camel-mh-folder.c:157
 msgid "No such message"
 msgstr "そのようなメッセージはありません"
 
-#: ../camel/providers/local/camel-maildir-folder.c:225
+#: ../camel/providers/local/camel-maildir-folder.c:234
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "Maildir 形式のフォルダーへメッセージを追加できません: %s: "
 
-#: ../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:171
-#: ../camel/providers/local/camel-mh-folder.c:181
+#: ../camel/providers/local/camel-maildir-folder.c:282
+#: ../camel/providers/local/camel-maildir-folder.c:292
+#: ../camel/providers/local/camel-mbox-folder.c:400
+#: ../camel/providers/local/camel-mh-folder.c:169
+#: ../camel/providers/local/camel-mh-folder.c:179
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "メッセージ %s をフォルダー %s から取得できません: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:353
+#: ../camel/providers/local/camel-maildir-folder.c:362
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "指定のフォルダーにメッセージを転送できません: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:125
-#: ../camel/providers/local/camel-maildir-store.c:849
+#: ../camel/providers/local/camel-maildir-store.c:130
+#: ../camel/providers/local/camel-maildir-store.c:149
+#: ../camel/providers/local/camel-maildir-store.c:861
 #, c-format
 msgid "Folder %s already exists"
 msgstr "既にフォルダー %s があります"
 
-#: ../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
+#: ../camel/providers/local/camel-maildir-store.c:241
+#: ../camel/providers/local/camel-maildir-store.c:272
+#: ../camel/providers/local/camel-mbox-store.c:401
+#: ../camel/providers/local/camel-mbox-store.c:422
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "'%s' というフォルダーを作成できません: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:245
-#: ../camel/providers/local/camel-mbox-store.c:369
-#: ../camel/providers/local/camel-mh-store.c:514
+#: ../camel/providers/local/camel-maildir-store.c:256
+#: ../camel/providers/local/camel-mbox-store.c:367
+#: ../camel/providers/local/camel-mh-store.c:523
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "'%s' というフォルダーを取得できません: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:251
-#: ../camel/providers/local/camel-mbox-store.c:379
-#: ../camel/providers/local/camel-mh-store.c:523
+#: ../camel/providers/local/camel-maildir-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:377
+#: ../camel/providers/local/camel-mh-store.c:532
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "'%s' というフォルダーを取得できません: フォルダーが存在しません。"
 
-#: ../camel/providers/local/camel-maildir-store.c:278
+#: ../camel/providers/local/camel-maildir-store.c:289
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 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:556
-#, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "'%s' というフォルダーを作成できません: 既に存在しています。"
-
-#: ../camel/providers/local/camel-maildir-store.c:347
-#: ../camel/providers/local/camel-maildir-store.c:387
-#: ../camel/providers/local/camel-mh-store.c:674
+#: ../camel/providers/local/camel-maildir-store.c:353
+#: ../camel/providers/local/camel-maildir-store.c:393
+#: ../camel/providers/local/camel-mh-store.c:676
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "'%s' というフォルダーを削除できませんでした: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:349
+#: ../camel/providers/local/camel-maildir-store.c:355
 msgid "not a maildir directory"
 msgstr "maildir 形式のフォルダーではありません"
 
-#: ../camel/providers/local/camel-maildir-store.c:630
-#: ../camel/providers/local/camel-maildir-store.c:1063
+#: ../camel/providers/local/camel-maildir-store.c:636
+#: ../camel/providers/local/camel-maildir-store.c:1075
 #: ../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-summary.c:458
-#: ../camel/providers/local/camel-maildir-summary.c:598
+#: ../camel/providers/local/camel-maildir-summary.c:465
+#: ../camel/providers/local/camel-maildir-summary.c:605
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir フォルダーのパスを開けませんでした: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:589
+#: ../camel/providers/local/camel-maildir-summary.c:596
 msgid "Checking folder consistency"
 msgstr "フォルダーの整合性の確認中"
 
-#: ../camel/providers/local/camel-maildir-summary.c:682
+#: ../camel/providers/local/camel-maildir-summary.c:689
 msgid "Checking for new messages"
 msgstr "新しいメッセージのチェック"
 
-#: ../camel/providers/local/camel-maildir-summary.c:777
-#: ../camel/providers/local/camel-mbox-summary.c:450
-#: ../camel/providers/local/camel-mbox-summary.c:665
-#: ../camel/providers/local/camel-mbox-summary.c:813
-#: ../camel/providers/local/camel-spool-summary.c:141
+#: ../camel/providers/local/camel-maildir-summary.c:784
+#: ../camel/providers/local/camel-mbox-summary.c:466
+#: ../camel/providers/local/camel-mbox-summary.c:682
+#: ../camel/providers/local/camel-mbox-summary.c:831
+#: ../camel/providers/local/camel-spool-summary.c:139
 msgid "Storing folder"
 msgstr "フォルダーに格納する"
 
-#: ../camel/providers/local/camel-mbox-folder.c:187
+#: ../camel/providers/local/camel-mbox-folder.c:196
 #, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "mailbox を開けません: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:253
+#: ../camel/providers/local/camel-mbox-folder.c:262
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "mbox ファイルにメッセージを追加できません: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:382
+#: ../camel/providers/local/camel-mbox-folder.c:392
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "フォルダーで回復できないエラーが発生したようです。"
 
-#: ../camel/providers/local/camel-mbox-folder.c:439
-#: ../camel/providers/local/camel-spool-folder.c:69
+#: ../camel/providers/local/camel-mbox-folder.c:449
+#: ../camel/providers/local/camel-spool-folder.c:67
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s のフォルダーロックを生成できません: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:391
-#: ../camel/providers/local/camel-mbox-store.c:589
+#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:580
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "そのような名前でフォルダーを作成できません。"
 
-#: ../camel/providers/local/camel-mbox-store.c:435
+#: ../camel/providers/local/camel-mbox-store.c:433
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "'%s' というフォルダーを取得できません: 通常のファイルではありません。"
 
-#: ../camel/providers/local/camel-mbox-store.c:605
+#: ../camel/providers/local/camel-mbox-store.c:596
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "'%s' というフォルダーを作成できません: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:617
+#: ../camel/providers/local/camel-mbox-store.c:608
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "フォルダーを作成できません: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:619
+#: ../camel/providers/local/camel-mbox-store.c:610
 msgid "Folder already exists"
 msgstr "既にフォルダーがあります"
 
-#: ../camel/providers/local/camel-mbox-store.c:659
-#: ../camel/providers/local/camel-mbox-store.c:672
-#: ../camel/providers/local/camel-mbox-store.c:701
+#: ../camel/providers/local/camel-mbox-store.c:650
+#: ../camel/providers/local/camel-mbox-store.c:663
+#: ../camel/providers/local/camel-mbox-store.c:692
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3654,137 +3631,137 @@ msgstr ""
 "'%s' というフォルダーを削除できませんでした:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:682
+#: ../camel/providers/local/camel-mbox-store.c:673
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' は通常のファイルではありません。"
 
-#: ../camel/providers/local/camel-mbox-store.c:691
+#: ../camel/providers/local/camel-mbox-store.c:682
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "'%s' というフォルダーは空ではないので削除しません。"
 
-#: ../camel/providers/local/camel-mbox-store.c:718
-#: ../camel/providers/local/camel-mbox-store.c:733
+#: ../camel/providers/local/camel-mbox-store.c:709
+#: ../camel/providers/local/camel-mbox-store.c:724
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "'%s' というサマリファイルを削除できませんでした: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:815
+#: ../camel/providers/local/camel-mbox-store.c:806
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "新しいフォルダーの名前は正しくありません。"
 
-#: ../camel/providers/local/camel-mbox-store.c:831
+#: ../camel/providers/local/camel-mbox-store.c:822
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "'%s' の名前を変更できませんでした: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:915
+#: ../camel/providers/local/camel-mbox-store.c:906
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s' から %s へ名前を変更できませんでした: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:460
+#: ../camel/providers/local/camel-mbox-summary.c:476
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "フォルダーを開けませんでした: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:590
+#: ../camel/providers/local/camel-mbox-summary.c:606
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "フォルダーをチェックできません: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:678
-#: ../camel/providers/local/camel-mbox-summary.c:822
-#: ../camel/providers/local/camel-spool-summary.c:148
+#: ../camel/providers/local/camel-mbox-summary.c:695
+#: ../camel/providers/local/camel-mbox-summary.c:840
+#: ../camel/providers/local/camel-spool-summary.c:146
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ファイルを開けませんでした: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:692
-#: ../camel/providers/local/camel-spool-summary.c:163
+#: ../camel/providers/local/camel-mbox-summary.c:710
+#: ../camel/providers/local/camel-spool-summary.c:161
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "作業用の mailbox を開けませんでした: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:709
-#: ../camel/providers/local/camel-mbox-summary.c:939
+#: ../camel/providers/local/camel-mbox-summary.c:727
+#: ../camel/providers/local/camel-mbox-summary.c:962
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "元のフォルダー %s を閉じることができませんでした: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-mbox-summary.c:740
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "作業用フォルダーを閉じることができませんでした: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:741
+#: ../camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "フォルダー名を変更できませんでした: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:836
-#: ../camel/providers/local/camel-mbox-summary.c:1105
+#: ../camel/providers/local/camel-mbox-summary.c:854
+#: ../camel/providers/local/camel-mbox-summary.c:1127
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "フォルダーを保存できませんでした: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:875
-#: ../camel/providers/local/camel-mbox-summary.c:1145
+#: ../camel/providers/local/camel-mbox-summary.c:893
+#: ../camel/providers/local/camel-mbox-summary.c:1167
 #, c-format
 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:885
-#: ../camel/providers/local/camel-mbox-summary.c:1157
+#: ../camel/providers/local/camel-mbox-summary.c:903
+#: ../camel/providers/local/camel-mbox-summary.c:1179
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "サマリとフォルダーが一致しませんでした (同期しても)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1050
+#: ../camel/providers/local/camel-mbox-summary.c:1072
 #: ../camel/providers/local/camel-spool-summary.c:356
 #, c-format
 msgid "Unknown error: %s"
 msgstr "原因不明のエラー: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1215
-#: ../camel/providers/local/camel-mbox-summary.c:1245
+#: ../camel/providers/local/camel-mbox-summary.c:1237
+#: ../camel/providers/local/camel-mbox-summary.c:1267
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "作業用の mailbox に書き込めませんでした: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1234
+#: ../camel/providers/local/camel-mbox-summary.c:1256
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "作業用の mailbox に書き込めませんでした: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:118
+#: ../camel/providers/local/camel-mh-folder.c:116
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "MH 形式フォルダーへメッセージを追加できません: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:533
+#: ../camel/providers/local/camel-mh-store.c:542
 #, 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:558
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "'%s' というフォルダーを取得できません: フォルダーではありません。"
 
-#: ../camel/providers/local/camel-mh-summary.c:233
+#: ../camel/providers/local/camel-mh-summary.c:236
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH フォルダーのパスを開けません: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:97
+#: ../camel/providers/local/camel-spool-store.c:95
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "'%s' というスプールを開けません: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:111
+#: ../camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "'%s' というスプールは通常のファイルまたはフォルダーではありません"
@@ -3851,14 +3828,14 @@ msgstr "スプールフォルダーは削除できません"
 msgid "Spool folders cannot be renamed"
 msgstr "スプールフォルダーの名前は変更できません"
 
-#: ../camel/providers/local/camel-spool-summary.c:179
-#: ../camel/providers/local/camel-spool-summary.c:191
-#: ../camel/providers/local/camel-spool-summary.c:203
+#: ../camel/providers/local/camel-spool-summary.c:177
+#: ../camel/providers/local/camel-spool-summary.c:189
+#: ../camel/providers/local/camel-spool-summary.c:201
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
 msgstr "作業用フォルダー %s を同期できませんでした: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:221
+#: ../camel/providers/local/camel-spool-summary.c:219
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
 msgstr "スプールフォルダー %s を同期できませんでした: %s"
@@ -3874,103 +3851,98 @@ msgstr ""
 "%s というスプールフォルダーと同期できませんでした: %s\n"
 "フォルダーが壊れている可能性があります。そのコピーを '%s' に保存しました。"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:285
-#: ../camel/providers/nntp/camel-nntp-folder.c:388
-#: ../camel/providers/nntp/camel-nntp-folder.c:510
+#: ../camel/providers/nntp/camel-nntp-folder.c:222
+#: ../camel/providers/nntp/camel-nntp-folder.c:588
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "内部エラー: UID の書式が無効です: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:349
-#: ../camel/providers/nntp/camel-nntp-folder.c:354
-#: ../camel/providers/pop3/camel-pop3-folder.c:698
-#: ../camel/providers/pop3/camel-pop3-folder.c:1173
+#: ../camel/providers/nntp/camel-nntp-folder.c:291
+#: ../camel/providers/nntp/camel-nntp-folder.c:296
+#: ../camel/providers/pop3/camel-pop3-folder.c:546
+#: ../camel/providers/pop3/camel-pop3-folder.c:945
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "メッセージ %s を取得できません: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:361
-#: ../camel/providers/nntp/camel-nntp-folder.c:536
-#: ../camel/providers/pop3/camel-pop3-folder.c:623
-#: ../camel/providers/pop3/camel-pop3-folder.c:688
-#: ../camel/providers/pop3/camel-pop3-folder.c:707
+#: ../camel/providers/nntp/camel-nntp-folder.c:303
+#: ../camel/providers/nntp/camel-nntp-folder.c:622
+#: ../camel/providers/pop3/camel-pop3-folder.c:476
+#: ../camel/providers/pop3/camel-pop3-folder.c:536
+#: ../camel/providers/pop3/camel-pop3-folder.c:555
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "メッセージ %s を取得できません: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:525
-#, c-format
-msgid "This message is not currently available"
-msgstr "このメッセージは現在利用できません"
-
-#: ../camel/providers/nntp/camel-nntp-folder.c:593
-#: ../camel/providers/nntp/camel-nntp-folder.c:599
+#: ../camel/providers/nntp/camel-nntp-folder.c:430
+#: ../camel/providers/nntp/camel-nntp-folder.c:436
 #, c-format
 msgid "Posting failed: %s"
 msgstr "投稿に失敗しました: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:664
+#: ../camel/providers/nntp/camel-nntp-folder.c:501
 msgid "Posting failed: "
 msgstr "投稿に失敗しました: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:689
+#: ../camel/providers/nntp/camel-nntp-folder.c:611
 #, c-format
-msgid "You cannot post NNTP messages while working offline!"
-msgstr "オフライン状態の間は NNTP メッセージを投稿できません!"
+msgid "This message is not currently available"
+msgstr "このメッセージは現在利用できません"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:709
-#, c-format
-msgid "You cannot copy messages from a NNTP folder!"
+#: ../camel/providers/nntp/camel-nntp-folder.c:720
+#, fuzzy, c-format
+#| msgid "You cannot copy messages from a NNTP folder!"
+msgid "You cannot copy messages from a NNTP folder"
 msgstr "NNTP フォルダーからメッセージのコピーはできません!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 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:51
+#: ../camel/providers/nntp/camel-nntp-provider.c:49
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "関連するフォルダー名を購読ダイアログに表示する(_D)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "Default NNTP port"
 msgstr "デフォルトの NNTP ポート"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:58
+#: ../camel/providers/nntp/camel-nntp-provider.c:56
 msgid "NNTP over SSL"
 msgstr "NNTP over SSL"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:64
+#: ../camel/providers/nntp/camel-nntp-provider.c:62
 msgid "USENET news"
 msgstr "USENET ニュース"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:66
+#: ../camel/providers/nntp/camel-nntp-provider.c:64
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "USENET のニュースグループを購読したり投稿します。"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:87
+#: ../camel/providers/nntp/camel-nntp-provider.c:85
 msgid "This option will connect to the NNTP server anonymously, without authentication."
 msgstr "このオプションは NNTP サーバーに匿名で、認証せずに接続します。"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:97
+#: ../camel/providers/nntp/camel-nntp-provider.c:95
 msgid "This option will authenticate with the NNTP server using a plaintext password."
 msgstr "このオプションはプレインテキストのパスワードを使って NNTP サーバーで認証します。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:386
+#: ../camel/providers/nntp/camel-nntp-store.c:371
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "%s からの挨拶を読むことができませんでした: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:394
+#: ../camel/providers/nntp/camel-nntp-store.c:379
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP サーバー %s がエラーコード %d を返しました: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:555
+#: ../camel/providers/nntp/camel-nntp-store.c:449
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s 経由の USENET ニュース"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1225
+#: ../camel/providers/nntp/camel-nntp-store.c:1151
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -3981,22 +3953,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1337
+#: ../camel/providers/nntp/camel-nntp-store.c:1267
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "ニュースストアにフォルダーを生成できません: 代わりに購読を申請してください。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1353
+#: ../camel/providers/nntp/camel-nntp-store.c:1283
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "ニュース格納場所のフォルダー名を変更できません。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1376
+#: ../camel/providers/nntp/camel-nntp-store.c:1306
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "ニュース格納場所のフォルダーを削除できません: 代わりに購読を停止してください。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1595
+#: ../camel/providers/nntp/camel-nntp-store.c:1516
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4007,7 +3979,7 @@ msgstr ""
 "\n"
 "そのようなニュースグループはありません。選択したアイテムは親フォルダーのものかもしれません。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1662
+#: ../camel/providers/nntp/camel-nntp-store.c:1583
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4018,180 +3990,180 @@ msgstr ""
 "\n"
 "ニュースグループがありません!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2098
+#: ../camel/providers/nntp/camel-nntp-store.c:2009
 msgid "NNTP Command failed: "
 msgstr "NNTP コマンドが失敗しました: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2195
+#: ../camel/providers/nntp/camel-nntp-store.c:2106
 #, c-format
 msgid "Not connected."
 msgstr "接続していません。"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:2289
+#: ../camel/providers/nntp/camel-nntp-store.c:2200
 #, c-format
 msgid "No such folder: %s"
 msgstr "そのようなフォルダーはありません: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:199
-#: ../camel/providers/nntp/camel-nntp-summary.c:339
+#: ../camel/providers/nntp/camel-nntp-summary.c:197
+#: ../camel/providers/nntp/camel-nntp-summary.c:337
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: 新しいメッセージの解析中"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:221
+#: ../camel/providers/nntp/camel-nntp-summary.c:219
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover から想定外の応答がありました: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:360
+#: ../camel/providers/nntp/camel-nntp-summary.c:358
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "head から想定外の応答がありました: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:408
+#: ../camel/providers/nntp/camel-nntp-summary.c:406
 #, c-format
 msgid "Operation failed: %s"
 msgstr "操作が失敗しました: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:509
-#: ../camel/providers/pop3/camel-pop3-folder.c:588
+#: ../camel/providers/pop3/camel-pop3-folder.c:359
+#: ../camel/providers/pop3/camel-pop3-folder.c:442
 #, c-format
 msgid "No message with UID %s"
 msgstr "UID %s のメッセージはありません"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:604
+#: ../camel/providers/pop3/camel-pop3-folder.c:458
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "メッセージ %d を POP で取得中"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:699
+#: ../camel/providers/pop3/camel-pop3-folder.c:547
 msgid "Unknown reason"
 msgstr "原因不明"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:751
+#: ../camel/providers/pop3/camel-pop3-folder.c:598
 msgid "Retrieving POP summary"
 msgstr "POP サマリの取得中"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:812
-#: ../camel/providers/pop3/camel-pop3-folder.c:815
-#: ../camel/providers/pop3/camel-pop3-folder.c:828
-#: ../camel/providers/pop3/camel-pop3-folder.c:841
-#: ../camel/providers/pop3/camel-pop3-folder.c:855
+#: ../camel/providers/pop3/camel-pop3-folder.c:659
+#: ../camel/providers/pop3/camel-pop3-folder.c:662
+#: ../camel/providers/pop3/camel-pop3-folder.c:675
+#: ../camel/providers/pop3/camel-pop3-folder.c:688
+#: ../camel/providers/pop3/camel-pop3-folder.c:702
 msgid "Cannot get POP summary: "
 msgstr "POP サマリを取得できません: "
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:966
+#: ../camel/providers/pop3/camel-pop3-folder.c:766
 msgid "Expunging old messages"
 msgstr "古いメッセージの抹消中"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:992
+#: ../camel/providers/pop3/camel-pop3-folder.c:794
 msgid "Expunging deleted messages"
 msgstr "ローカルで削除済みのメッセージの抹消中"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:39
+#: ../camel/providers/pop3/camel-pop3-provider.c:37
 msgid "Message Storage"
 msgstr "メッセージの格納"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
 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:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "%s 日後に削除する(_D)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "Delete _expunged from local Inbox"
 msgstr "ローカルの受信箱で消したメールを削除する(_E)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:47
 msgid "Disable _support for all POP3 extensions"
 msgstr "すべての POP3 拡張サポートを無効にする(_S)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
 msgid "Default POP3 port"
 msgstr "デフォルトの POP3 ポート"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:56
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
 msgid "POP3 over SSL"
 msgstr "POP3 over SSL"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:63
+#: ../camel/providers/pop3/camel-pop3-provider.c:61
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:65
+#: ../camel/providers/pop3/camel-pop3-provider.c:63
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "POP サーバーに接続したりメールを読んだりします。"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:85
+#: ../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:95
+#: ../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 
対応を謳っているサーバーであっても、すべてのユーザーが正常に動作するわけではありません。"
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:99
+#: ../camel/providers/pop3/camel-pop3-store.c:97
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:161
+#: ../camel/providers/pop3/camel-pop3-store.c:164
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP サーバー %s から妥当な挨拶の読み込みが失敗しました"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:176
+#: ../camel/providers/pop3/camel-pop3-store.c:179
 #, 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:177
+#: ../camel/providers/pop3/camel-pop3-store.c:180
 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:198
+#: ../camel/providers/pop3/camel-pop3-store.c:201
 #, 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:211
+#: ../camel/providers/pop3/camel-pop3-store.c:219
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "セキュリティ保護されたモードで POP サーバー %s への接続に失敗しました: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:351
+#: ../camel/providers/pop3/camel-pop3-store.c:360
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP サーバー %s へログインできません: SASL プロトコルエラーです"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:373
+#: ../camel/providers/pop3/camel-pop3-store.c:382
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "POP サーバー %s で認証に失敗しました: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:481
+#: ../camel/providers/pop3/camel-pop3-store.c:490
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP3 サーバー %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:484
+#: ../camel/providers/pop3/camel-pop3-store.c:493
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "%s の %s にある POP3 サーバー"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:703
+#: ../camel/providers/pop3/camel-pop3-store.c:713
 #, 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 を受け取りました; 詐称攻撃の可能性があるので管理者に連絡してください。"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:755
+#: ../camel/providers/pop3/camel-pop3-store.c:768
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4202,7 +4174,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:770
+#: ../camel/providers/pop3/camel-pop3-store.c:783
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4211,314 +4183,314 @@ msgstr ""
 "POP サーバー %s に接続できません。\n"
 "ユーザー名の送信中にエラー%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:852
+#: ../camel/providers/pop3/camel-pop3-store.c:865
 #, c-format
 msgid "No such folder '%s'."
 msgstr "'%s' というフォルダーは存在しません。"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:869
+#: ../camel/providers/pop3/camel-pop3-store.c:882
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 ストアはフォルダーの階層構造を持ちません"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:34
 #: ../services/evolution-source-registry/builtin/sendmail.source.in.h:1
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
 msgstr "メールを配送するためにローカルシステムの \"sendmail\" プログラムへ渡します。"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:48
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:52
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:50
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail 経由でメールを配信"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:140
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:138
 #, c-format
 msgid "Failed to read From address"
 msgstr "From アドレスの読み取りに失敗しました"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:157
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:155
 #, c-format
 msgid "Message send in offline mode is disabled"
 msgstr "オフラインモードでのメッセージ送信は無効化されています"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:185
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:183
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "返信リストを解析できませんでした"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:202
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:200
 #, c-format
 msgid "Could not parse arguments"
 msgstr "引数を解析できませんでした"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:233
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:231
 #, c-format
 msgid "Could not create pipe to '%s': %s: mail not sent"
 msgstr "'%s' へのパイプを作成できませんでした: %s: メールは送信されません"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:258
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:256
 #, c-format
 msgid "Could not fork '%s': %s: mail not sent"
 msgstr "'%s' を fork できませんでした: %s: メールは送信されません"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:307
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:305
 msgid "Could not send message: "
 msgstr "メッセージを送信できませんでした: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:337
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:335
 #, c-format
 msgid "'%s' exited with signal %s: mail not sent."
 msgstr "'%s' はシグナル %s で終了しました: メールは送信されません。"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:347
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:345
 #, c-format
 msgid "Could not execute '%s': mail not sent."
 msgstr "'%s' を実行できませんでした。"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:352
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:350
 #, c-format
 msgid "'%s' exited with status %d: mail not sent."
 msgstr "'%s' はステータス %d で終了しました: メールは送信されません。"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:42
+#: ../camel/providers/smtp/camel-smtp-provider.c:40
 msgid "Default SMTP port"
 msgstr "デフォルトの SMTP ポート"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:41
 msgid "SMTP over SSL"
 msgstr "SMTP over SSL"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:44
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
 msgid "Message submission port"
 msgstr "メッセージのサブミッションポート"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:50
+#: ../camel/providers/smtp/camel-smtp-provider.c:48
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:52
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "SMTP を使ってリモートのメールハブに接続することでメールを配信します。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:158
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
+#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Welcome response error: "
 msgstr "Welcome 応答エラー: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:214
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "セキュリティ保護されたモードで SMTP サーバー %s への接続に失敗しました: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
-#: ../camel/providers/smtp/camel-smtp-transport.c:226
-#: ../camel/providers/smtp/camel-smtp-transport.c:234
+#: ../camel/providers/smtp/camel-smtp-transport.c:224
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS コマンドが失敗しました: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:265
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "セキュリティ保護されたモードで SMTP サーバー %s への接続に失敗しました: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:338
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP サーバー %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:341
+#: ../camel/providers/smtp/camel-smtp-transport.c:360
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s 経由で SMTP メールを配信します"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:415
+#: ../camel/providers/smtp/camel-smtp-transport.c:434
 #, c-format
 msgid "SMTP server %s does not support %s authentication"
 msgstr "SMTP サーバー %s は認証方式 %s をサポートしていません"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
+#: ../camel/providers/smtp/camel-smtp-transport.c:506
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr "SASL メカニズムが指定されていませんでした"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:526
-#: ../camel/providers/smtp/camel-smtp-transport.c:537
-#: ../camel/providers/smtp/camel-smtp-transport.c:550
+#: ../camel/providers/smtp/camel-smtp-transport.c:536
+#: ../camel/providers/smtp/camel-smtp-transport.c:547
+#: ../camel/providers/smtp/camel-smtp-transport.c:560
 msgid "AUTH command failed: "
 msgstr "AUTH コマンドが失敗しました: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:691
+#: ../camel/providers/smtp/camel-smtp-transport.c:701
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "メッセージを送信できません: サービスが接続されていません。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:698
+#: ../camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "メッセージを送信できません: 差出人のアドレスが正しくありません。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
+#: ../camel/providers/smtp/camel-smtp-transport.c:712
 msgid "Sending message"
 msgstr "メッセージの送信中"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "メッセージを送信できません: 宛先が定義されていません。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:740
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "メッセージを送信できません: 無効な応答が一つ以上あります"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:861
+#: ../camel/providers/smtp/camel-smtp-transport.c:871
 msgid "Syntax error, command unrecognized"
 msgstr "構文解析エラー: コマンドではありません"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:863
+#: ../camel/providers/smtp/camel-smtp-transport.c:873
 msgid "Syntax error in parameters or arguments"
 msgstr "パラメーターあるいは引数に構文解析エラー"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:865
+#: ../camel/providers/smtp/camel-smtp-transport.c:875
 msgid "Command not implemented"
 msgstr "コマンドは実装されていません"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:867
+#: ../camel/providers/smtp/camel-smtp-transport.c:877
 msgid "Command parameter not implemented"
 msgstr "コマンドパラメーターは実装されていません"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:869
+#: ../camel/providers/smtp/camel-smtp-transport.c:879
 msgid "System status, or system help reply"
 msgstr "システムステータスまたはシステムヘルプの応答"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:871
+#: ../camel/providers/smtp/camel-smtp-transport.c:881
 msgid "Help message"
 msgstr "ヘルプメッセージ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:873
+#: ../camel/providers/smtp/camel-smtp-transport.c:883
 msgid "Service ready"
 msgstr "サービスは利用できます"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:875
+#: ../camel/providers/smtp/camel-smtp-transport.c:885
 msgid "Service closing transmission channel"
 msgstr "サービスは送信チャンネルを閉じています"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:877
+#: ../camel/providers/smtp/camel-smtp-transport.c:887
 msgid "Service not available, closing transmission channel"
 msgstr "サービスは利用できません, 送信チャンネルを閉じています"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:879
+#: ../camel/providers/smtp/camel-smtp-transport.c:889
 msgid "Requested mail action okay, completed"
 msgstr "要求されたメールの動作はOK, 完了しました"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:881
+#: ../camel/providers/smtp/camel-smtp-transport.c:891
 msgid "User not local; will forward to <forward-path>"
 msgstr "ユーザーはローカルではありません; <forward-path> へ転送します"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:883
+#: ../camel/providers/smtp/camel-smtp-transport.c:893
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "要求されたメールの動作は完了しません: メールボックスは利用できません"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:885
+#: ../camel/providers/smtp/camel-smtp-transport.c:895
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "要求された動作は完了しません: メールボックスは利用できません"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:887
+#: ../camel/providers/smtp/camel-smtp-transport.c:897
 msgid "Requested action aborted: error in processing"
 msgstr "要求された動作を中断しました: 処理中にエラー"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:889
+#: ../camel/providers/smtp/camel-smtp-transport.c:899
 msgid "User not local; please try <forward-path>"
 msgstr "ユーザーはローカルではありません; <forward-path> を試してください。"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:891
+#: ../camel/providers/smtp/camel-smtp-transport.c:901
 msgid "Requested action not taken: insufficient system storage"
 msgstr "要求された動作は完了しません: システムの保存領域が足りません"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:893
+#: ../camel/providers/smtp/camel-smtp-transport.c:903
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "要求されたメールの動作を中断しました: 領域割り当てを越えました"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:895
+#: ../camel/providers/smtp/camel-smtp-transport.c:905
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "要求された動作は完了しません: メールボックス名は認められません"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:897
+#: ../camel/providers/smtp/camel-smtp-transport.c:907
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "メールの入力を開始します; <CRLF>.<CRLF> で終了します"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:899
+#: ../camel/providers/smtp/camel-smtp-transport.c:909
 msgid "Transaction failed"
 msgstr "処理は失敗しました"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:903
+#: ../camel/providers/smtp/camel-smtp-transport.c:913
 msgid "A password transition is needed"
 msgstr "パスワードの変更が必要です"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:905
+#: ../camel/providers/smtp/camel-smtp-transport.c:915
 msgid "Authentication mechanism is too weak"
 msgstr "認証メカニズムは不十分過ぎます"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:907
+#: ../camel/providers/smtp/camel-smtp-transport.c:917
 msgid "Encryption required for requested authentication mechanism"
 msgstr "要求した認証メカニズムのために暗号化が必要です"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:909
+#: ../camel/providers/smtp/camel-smtp-transport.c:919
 msgid "Temporary authentication failure"
 msgstr "一時的な認証に失敗しました"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1166
+#: ../camel/providers/smtp/camel-smtp-transport.c:1207
 msgid "SMTP Greeting"
 msgstr "SMTP で接続中"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1193
-#: ../camel/providers/smtp/camel-smtp-transport.c:1207
-#: ../camel/providers/smtp/camel-smtp-transport.c:1215
+#: ../camel/providers/smtp/camel-smtp-transport.c:1217
+#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+#: ../camel/providers/smtp/camel-smtp-transport.c:1239
 msgid "HELO command failed: "
 msgstr "HELO コマンドが失敗しました: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#: ../camel/providers/smtp/camel-smtp-transport.c:1305
-#: ../camel/providers/smtp/camel-smtp-transport.c:1315
+#: ../camel/providers/smtp/camel-smtp-transport.c:1314
+#: ../camel/providers/smtp/camel-smtp-transport.c:1329
+#: ../camel/providers/smtp/camel-smtp-transport.c:1339
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM コマンドが失敗しました: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1342
+#: ../camel/providers/smtp/camel-smtp-transport.c:1366
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO コマンドが失敗しました: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1359
-#: ../camel/providers/smtp/camel-smtp-transport.c:1369
+#: ../camel/providers/smtp/camel-smtp-transport.c:1383
+#: ../camel/providers/smtp/camel-smtp-transport.c:1393
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> コマンドが失敗しました: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1412
-#: ../camel/providers/smtp/camel-smtp-transport.c:1423
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
-#: ../camel/providers/smtp/camel-smtp-transport.c:1493
-#: ../camel/providers/smtp/camel-smtp-transport.c:1513
-#: ../camel/providers/smtp/camel-smtp-transport.c:1527
-#: ../camel/providers/smtp/camel-smtp-transport.c:1536
+#: ../camel/providers/smtp/camel-smtp-transport.c:1436
+#: ../camel/providers/smtp/camel-smtp-transport.c:1447
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1517
+#: ../camel/providers/smtp/camel-smtp-transport.c:1537
+#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#: ../camel/providers/smtp/camel-smtp-transport.c:1560
 msgid "DATA command failed: "
 msgstr "DATA コマンドが失敗しました: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1561
-#: ../camel/providers/smtp/camel-smtp-transport.c:1576
 #: ../camel/providers/smtp/camel-smtp-transport.c:1585
+#: ../camel/providers/smtp/camel-smtp-transport.c:1600
+#: ../camel/providers/smtp/camel-smtp-transport.c:1609
 msgid "RSET command failed: "
 msgstr "RSET コマンドが失敗しました: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1610
-#: ../camel/providers/smtp/camel-smtp-transport.c:1624
-#: ../camel/providers/smtp/camel-smtp-transport.c:1631
+#: ../camel/providers/smtp/camel-smtp-transport.c:1634
+#: ../camel/providers/smtp/camel-smtp-transport.c:1648
+#: ../camel/providers/smtp/camel-smtp-transport.c:1655
 msgid "QUIT command failed: "
 msgstr "QUIT コマンドが失敗しました: "
 
@@ -4550,333 +4522,394 @@ msgstr "誕生日や記念日のリマインダーユニット"
 msgid "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or \"days\""
 msgstr "\"minutes\"、\"hours\"、\"days\" など誕生日または記念日の単位です"
 
-#: ../libebackend/e-authentication-mediator.c:205
-#: ../libebackend/e-authentication-mediator.c:216
-#: ../libebackend/e-authentication-mediator.c:862
-#: ../libebackend/e-authentication-mediator.c:1193
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:1
+msgid "(Deprecated) Proxy type to use"
+msgstr "(非推奨) 使用するプロキシタイプ"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:2
+msgid "This key was deprecated in version 3.12 and should no longer be used. Proxy settings are now 
integrated into Evolution-Data-Server's account system. See the ESourceProxy API documentation for details."
+msgstr "このキーはバージョン 3.12 で非推奨となっており、利用すべきではなくなっています。プロキシ設定は今では Evolution-Data-Server 
のアカウントシステムに統合されています。詳細については ESourceProxy API 文書を見てください。"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:3
+msgid "(Deprecated) Whether to use http-proxy"
+msgstr "(非推奨) http-proxy を使用する"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:4
+msgid "(Deprecated) Whether proxy server requires authentication"
+msgstr "(非推奨) プロキシサーバーに認証を必要とする"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:5
+msgid "(Deprecated) Host name for HTTP requests"
+msgstr "(非推奨) HTTP リクエストのホスト名"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:6
+msgid "(Deprecated) Port number for HTTP requests"
+msgstr "(非推奨) HTTP リクエストのポート番号"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:7
+msgid "(Deprecated) Proxy authentication user name"
+msgstr "(非推奨) プロキシ認証のユーザー名"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:8
+msgid "(Deprecated) Proxy authentication password"
+msgstr "(非推奨) プロキシ認証のパスワード"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:9
+msgid "(Deprecated) List of hosts to connect to without proxy"
+msgstr "(非推奨) プロキシなしで接続するホストの一覧"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:10
+msgid "(Deprecated) Host name for HTTPS requests"
+msgstr "(非推奨) HTTPS リクエストのホスト名"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:11
+msgid "(Deprecated) Port number for HTTPS requests"
+msgstr "(非推奨) HTTPS リクエストのポート番号"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:12
+msgid "(Deprecated) Host name for SOCKS requests"
+msgstr "(非推奨) SOCKS リクエストのホスト名"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:13
+msgid "(Deprecated) Port number for SOCKS requests"
+msgstr "(非推奨) SOCKS リクエストのポート番号"
+
+#: ../data/org.gnome.evolution.shell.network-config.gschema.xml.in.h:14
+msgid "(Deprecated) Automatic proxy configuration URL"
+msgstr "(非推奨) 自動プロキシ設定の URL"
+
+#: ../libebackend/e-authentication-mediator.c:204
+#: ../libebackend/e-authentication-mediator.c:215
+#: ../libebackend/e-authentication-mediator.c:861
+#: ../libebackend/e-authentication-mediator.c:1198
 msgid "Bus name vanished (client terminated?)"
 msgstr "バス名が消えています (クライアントを終了しませんでしたか?)"
 
-#: ../libebackend/e-authentication-mediator.c:264
+#: ../libebackend/e-authentication-mediator.c:263
 msgid "No response from client"
 msgstr "クライアントから応答がありません"
 
-#: ../libebackend/e-authentication-mediator.c:334
-#: ../libebackend/e-authentication-mediator.c:345
-#: ../libebackend/e-authentication-mediator.c:856
-#: ../libebackend/e-authentication-mediator.c:1187
+#: ../libebackend/e-authentication-mediator.c:333
+#: ../libebackend/e-authentication-mediator.c:344
+#: ../libebackend/e-authentication-mediator.c:855
+#: ../libebackend/e-authentication-mediator.c:1192
 msgid "Client cancelled the operation"
 msgstr "クライアントにより操作が取り消されました"
 
-#: ../libebackend/e-authentication-mediator.c:416
+#: ../libebackend/e-authentication-mediator.c:415
 msgid "Client reports password was rejected"
 msgstr "クライアントはパスワードが拒否されたと報告しています"
 
-#: ../libebackend/e-authentication-session.c:569
+#: ../libebackend/e-authentication-session.c:554
 msgid "Add this password to your keyring"
 msgstr "キーリングにこのパスワードを追加する"
 
-#: ../libebackend/e-authentication-session.c:674
+#: ../libebackend/e-authentication-session.c:664
 msgid "Password was incorrect"
 msgstr "パスワードが間違っています"
 
-#: ../libebackend/e-backend.c:428
+#: ../libebackend/e-backend.c:408
 #, c-format
 msgid "%s does not support authentication"
 msgstr "%s では認証をサポートしていません"
 
-#: ../libebackend/e-collection-backend.c:800
+#: ../libebackend/e-collection-backend.c:900
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr "%s ではリモートリソースの作成をサポートしていません"
 
-#: ../libebackend/e-collection-backend.c:859
+#: ../libebackend/e-collection-backend.c:959
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr "%s ではリモートリソースの削除をサポートしていません"
 
-#: ../libebackend/e-data-factory.c:304
+#: ../libebackend/e-data-factory.c:303
 #, c-format
 msgid "No backend factory for hash key '%s'"
 msgstr "ハッシュキー '%s' にはバックエンドファクトリーがありません"
 
-#: ../libebackend/e-server-side-source.c:134
+#: ../libebackend/e-server-side-source.c:133
 #, c-format
 msgid "Data source is missing a [%s] group"
 msgstr "データソースには [%s] グループがありません"
 
-#: ../libebackend/e-server-side-source.c:1008
-#: ../libedataserver/e-source.c:1138
+#: ../libebackend/e-server-side-source.c:1020
+#: ../libedataserver/e-source.c:1348
 #, c-format
 msgid "Data source '%s' does not support creating remote resources"
 msgstr "データソース '%s' ではリモートリソースの作成をサポートしていません"
 
-#: ../libebackend/e-server-side-source.c:1022
+#: ../libebackend/e-server-side-source.c:1034
 #, 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:1251
+#: ../libebackend/e-server-side-source.c:1062
+#: ../libedataserver/e-source.c:1461
 #, c-format
 msgid "Data source '%s' does not support deleting remote resources"
 msgstr "データソース '%s' はリモートリソースの削除をサポートしていません"
 
-#: ../libebackend/e-server-side-source.c:1064
+#: ../libebackend/e-server-side-source.c:1076
 #, 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:1347
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:990
+#: ../libebackend/e-server-side-source.c:1107
+#: ../libedataserver/e-source.c:1557
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1027
 #, c-format
 msgid "Data source '%s' does not support OAuth 2.0 authentication"
 msgstr "データソース %s は OAuth 2.0 という認証タイプをサポートしていません"
 
-#: ../libebackend/e-server-side-source.c:1438
+#: ../libebackend/e-server-side-source.c:1452
 #, c-format
 msgid "File must have a '.source' extension"
 msgstr "ファイルには '.source' 拡張子が必要です"
 
-#: ../libebackend/e-source-registry-server.c:521
-#: ../libedataserver/e-source-registry.c:1876
+#: ../libebackend/e-source-registry-server.c:531
+#: ../libedataserver/e-source-registry.c:1957
 msgid "The user declined to authenticate"
 msgstr "ユーザー認証に失敗しました"
 
-#: ../libebackend/e-source-registry-server.c:790
+#: ../libebackend/e-source-registry-server.c:800
 #, c-format
 msgid "UID '%s' is already in use"
 msgstr "UID '%s' は既に使用されています"
 
-#: ../libebackend/e-user-prompter-server.c:301
+#: ../libebackend/e-user-prompter-server.c:305
 #, c-format
 msgid "Extension dialog '%s' not found."
 msgstr "拡張ダイアログ '%s' が見つかりません"
 
-#: ../libedataserver/e-categories.c:46
+#: ../libedataserver/e-categories.c:48
 msgctxt "CategoryName"
 msgid "Anniversary"
 msgstr "記念日"
 
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:49
 msgctxt "CategoryName"
 msgid "Birthday"
 msgstr "誕生日"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:50
 msgctxt "CategoryName"
 msgid "Business"
 msgstr "仕事"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:51
 msgctxt "CategoryName"
 msgid "Competition"
 msgstr "競合他社"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:52
 msgctxt "CategoryName"
 msgid "Favorites"
 msgstr "お気に入り"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:53
 msgctxt "CategoryName"
 msgid "Gifts"
 msgstr "贈り物"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:54
 msgctxt "CategoryName"
 msgid "Goals/Objectives"
 msgstr "ゴール/目標"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:55
 msgctxt "CategoryName"
 msgid "Holiday"
 msgstr "休日"
 
-#: ../libedataserver/e-categories.c:54
+#: ../libedataserver/e-categories.c:56
 msgctxt "CategoryName"
 msgid "Holiday Cards"
 msgstr "ホリデーカード"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:58
 msgctxt "CategoryName"
 msgid "Hot Contacts"
 msgstr "最新の連絡先"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:59
 msgctxt "CategoryName"
 msgid "Ideas"
 msgstr "アイディア"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:60
 msgctxt "CategoryName"
 msgid "International"
 msgstr "国際"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:61
 msgctxt "CategoryName"
 msgid "Key Customer"
 msgstr "重要な顧客"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:62
 msgctxt "CategoryName"
 msgid "Miscellaneous"
 msgstr "その他"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:63
 msgctxt "CategoryName"
 msgid "Personal"
 msgstr "個人"
 
-#: ../libedataserver/e-categories.c:62
+#: ../libedataserver/e-categories.c:64
 msgctxt "CategoryName"
 msgid "Phone Calls"
 msgstr "電話する"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:66
 msgctxt "CategoryName"
 msgid "Status"
 msgstr "状態"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:67
 msgctxt "CategoryName"
 msgid "Strategies"
 msgstr "戦略"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:68
 msgctxt "CategoryName"
 msgid "Suppliers"
 msgstr "サプライヤー"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:69
 msgctxt "CategoryName"
 msgid "Time & Expenses"
 msgstr "時間と経費"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:70
 msgctxt "CategoryName"
 msgid "VIP"
 msgstr "重要人物"
 
-#: ../libedataserver/e-categories.c:69
+#: ../libedataserver/e-categories.c:71
 msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "待ち"
 
-#: ../libedataserver/e-client.c:133
+#: ../libedataserver/e-client.c:141
 msgid "Source not loaded"
 msgstr "ソースを読み込んでいません"
 
-#: ../libedataserver/e-client.c:135
+#: ../libedataserver/e-client.c:143
 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:146
+#: ../libedataserver/e-client.c:154
 msgid "Offline unavailable"
 msgstr "オフラインモードに切り替えられません"
 
-#: ../libedataserver/e-client.c:168
+#: ../libedataserver/e-client.c:176
 msgid "D-Bus error"
 msgstr "D-Bus エラー"
 
-#: ../libedataserver/e-source-authenticator.c:166
+#: ../libedataserver/e-source-authenticator.c:162
 msgid "Address book authentication request"
 msgstr "アドレス帳の認証を必要としています"
 
-#: ../libedataserver/e-source-authenticator.c:171
+#: ../libedataserver/e-source-authenticator.c:167
 msgid "Calendar authentication request"
 msgstr "カレンダーの認証を必要としています"
 
-#: ../libedataserver/e-source-authenticator.c:175
+#: ../libedataserver/e-source-authenticator.c:171
 msgid "Mail authentication request"
 msgstr "メールの認証を必要としています"
 
 #. generic account prompt
-#: ../libedataserver/e-source-authenticator.c:178
+#: ../libedataserver/e-source-authenticator.c:174
 msgid "Authentication request"
 msgstr "認証を必要としています"
 
-#: ../libedataserver/e-source-authenticator.c:188
+#: ../libedataserver/e-source-authenticator.c:184
 #, c-format
 msgid "Please enter the password for address book \"%s\"."
 msgstr "アドレス帳 \"%s\" のパスワードを入力してください。"
 
-#: ../libedataserver/e-source-authenticator.c:194
+#: ../libedataserver/e-source-authenticator.c:190
 #, c-format
 msgid "Please enter the password for calendar \"%s\"."
 msgstr "カレンダー \"%s\" のパスワードを入力してください。"
 
-#: ../libedataserver/e-source-authenticator.c:200
+#: ../libedataserver/e-source-authenticator.c:196
 #, c-format
 msgid "Please enter the password for mail account \"%s\"."
 msgstr "メールアカウント \"%s\" のパスワードを入力してください。"
 
-#: ../libedataserver/e-source-authenticator.c:206
+#: ../libedataserver/e-source-authenticator.c:202
 #, c-format
 msgid "Please enter the password for mail transport \"%s\"."
 msgstr "メール転送 \"%s\" のパスワードを入力してください。"
 
-#: ../libedataserver/e-source-authenticator.c:212
+#: ../libedataserver/e-source-authenticator.c:208
 #, c-format
 msgid "Please enter the password for memo list \"%s\"."
 msgstr "メモリスト \"%s\" のパスワードを入力してください。"
 
-#: ../libedataserver/e-source-authenticator.c:218
+#: ../libedataserver/e-source-authenticator.c:214
 #, c-format
 msgid "Please enter the password for task list \"%s\"."
 msgstr "タスクリスト \"%s\" のパスワードを入力してください。"
 
-#: ../libedataserver/e-source-authenticator.c:224
+#: ../libedataserver/e-source-authenticator.c:220
 #, c-format
 msgid "Please enter the password for account \"%s\"."
 msgstr "アカウント \"%s\" のパスワードを入力してください。"
 
-#: ../libedataserver/e-source.c:627
+#: ../libedataserver/e-source.c:765
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "ソースファイルには [%s] グループがありません"
 
-#: ../libedataserver/e-source.c:949
+#: ../libedataserver/e-source.c:1128
 #, c-format
 msgid "Data source '%s' is not removable"
 msgstr "データソース '%s' を削除することはできません"
 
-#: ../libedataserver/e-source.c:1041
+#: ../libedataserver/e-source.c:1251
 #, c-format
 msgid "Data source '%s' is not writable"
 msgstr "データソース '%s' には書き込みできません"
 
-#: ../libedataserver/e-source.c:1559
+#: ../libedataserver/e-source.c:1864
 msgid "Unnamed"
 msgstr "名前なしの一覧"
 
-#: ../libedataserver/e-source-mail-signature.c:487
+#: ../libedataserver/e-source-mail-signature.c:486
 #, c-format
 msgid "Signature script must be a local file"
 msgstr "署名スクリプトはローカルファイルにしてください"
 
-#: ../libedataserver/e-source-webdav.c:1553
+#: ../libedataserver/e-source-proxy.c:1646
+#, c-format
+msgid "Source '%s' does not support proxy lookups"
+msgstr "ソース '%s' ではプロキシ検索をサポートしていません"
+
+#: ../libedataserver/e-source-webdav.c:1551
 #, c-format
 msgid "SSL certificate for host '%s', used by address book '%s', is not trusted. Do you wish to accept it?"
 msgstr "ホスト '%s' の SSL 証明書がアドレス帳 '%s' で利用されていますが信頼できません。許可しますか?"
 
-#: ../libedataserver/e-source-webdav.c:1562
+#: ../libedataserver/e-source-webdav.c:1560
 #, c-format
 msgid "SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you wish to accept it?"
 msgstr "ホスト '%s' の SSL 証明書がカレンダー '%s' で利用されていますが信頼できません。許可しますか?"
 
-#: ../libedataserver/e-source-webdav.c:1571
+#: ../libedataserver/e-source-webdav.c:1569
 #, c-format
 msgid "SSL certificate for host '%s', used by memo list '%s', is not trusted. Do you wish to accept it?"
 msgstr "ホスト '%s' の SSL 証明書がメモ一覧 '%s' で利用されていますが信頼できません。許可しますか?"
 
-#: ../libedataserver/e-source-webdav.c:1580
+#: ../libedataserver/e-source-webdav.c:1578
 #, c-format
 msgid "SSL certificate for host '%s', used by task list '%s', is not trusted. Do you wish to accept it?"
 msgstr "ホスト '%s' の SSL 証明書がタスク一覧 '%s' で利用されていますが信頼できません。許可しますか?"
@@ -4885,7 +4918,7 @@ msgstr "ホスト '%s' の SSL 証明書がタスク一覧 '%s' で利用され
 #. * 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
+#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1961
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p%l:%M:%S"
 
@@ -4893,7 +4926,7 @@ msgstr "%Y/%m/%d (%a) %p%l:%M:%S"
 #. * 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
+#: ../libedataserver/e-time-utils.c:1667 ../libedataserver/e-time-utils.c:1952
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %k:%M:%S"
 
@@ -4901,7 +4934,7 @@ msgstr "%Y/%m/%d (%a) %k:%M:%S"
 #. * 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
+#: ../libedataserver/e-time-utils.c:1672 ../libedataserver/e-time-utils.c:1957
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d (%a) %p%l:%M"
 
@@ -4909,78 +4942,78 @@ msgstr "%Y/%m/%d (%a) %p%l:%M"
 #. * 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
+#: ../libedataserver/e-time-utils.c:1677 ../libedataserver/e-time-utils.c:1948
 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
+#: ../libedataserver/e-time-utils.c:1682
 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
+#: ../libedataserver/e-time-utils.c:1687
 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
+#: ../libedataserver/e-time-utils.c:1690 ../libedataserver/e-time-utils.c:1810
+#: ../libedataserver/e-time-utils.c:1943
 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
+#: ../libedataserver/e-time-utils.c:1697
 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
+#: ../libedataserver/e-time-utils.c:1701
 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
+#: ../libedataserver/e-time-utils.c:1706
 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
+#: ../libedataserver/e-time-utils.c:1711
 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
+#: ../libedataserver/e-time-utils.c:1716
 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
+#: ../libedataserver/e-time-utils.c:1721
 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
+#: ../libedataserver/e-time-utils.c:1724 ../libedataserver/e-time-utils.c:1813
 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
+#: ../libedataserver/e-time-utils.c:1884 ../libedataserver/e-time-utils.c:2005
 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
+#: ../libedataserver/e-time-utils.c:1888 ../libedataserver/e-time-utils.c:1997
 msgid "%H:%M:%S"
 msgstr "%k:%M:%S"
 
@@ -4988,560 +5021,148 @@ msgstr "%k:%M:%S"
 #. * 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
+#: ../libedataserver/e-time-utils.c:1893 ../libedataserver/e-time-utils.c:2002
 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
+#: ../libedataserver/e-time-utils.c:1897 ../libedataserver/e-time-utils.c:1994
 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
+#: ../libedataserver/e-time-utils.c:1901
 msgid "%H%M"
 msgstr "%k%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1906
+#: ../libedataserver/e-time-utils.c:1905
 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:129
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:365
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:130
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:364
 #, c-format
 msgid "No such data source for UID '%s'"
 msgstr "UID '%s' にそのようなデータソースはありません"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:141
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:142
 #, c-format
 msgid "Cannot find a corresponding account in the org.gnome.OnlineAccounts service from which to obtain a 
password for '%s'"
 msgstr "'%s' のパスワード取得先の org.gnome.OnlineAccounts サービスから対応するアカウントを見つけることができません"
 
-#: ../modules/gnome-online-accounts/e-goa-password-based.c:213
+#: ../modules/gnome-online-accounts/e-goa-password-based.c:218
 #, c-format
 msgid "Invalid password for '%s'"
 msgstr "%s のパスワードが無効です"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:222
+#: ../modules/gnome-online-accounts/goaewsclient.c:219
 #, c-format
 msgid "Code: %u - Unexpected response from server"
 msgstr "コード: %u - サーバーからの予期しない応答です"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:243
+#: ../modules/gnome-online-accounts/goaewsclient.c:240
 #, c-format
 msgid "Failed to parse autodiscover response XML"
 msgstr "autodiscover の応答 XML の解析に失敗しました"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:252
+#: ../modules/gnome-online-accounts/goaewsclient.c:249
 #, c-format
 msgid "Failed to find Autodiscover element"
 msgstr "autodiscover エレメントの検出に失敗しました"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:264
+#: ../modules/gnome-online-accounts/goaewsclient.c:261
 #, c-format
 msgid "Failed to find Response element"
 msgstr "response エレメントの検出に失敗しました"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:276
+#: ../modules/gnome-online-accounts/goaewsclient.c:273
 #, c-format
 msgid "Failed to find Account element"
 msgstr "account エレメントの検出に失敗しました"
 
 #. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:290
+#: ../modules/gnome-online-accounts/goaewsclient.c:287
 #, 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:1238
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1261
 #, c-format
 msgid "Cannot find a corresponding account in the org.gnome.OnlineAccounts service from which to obtain an 
access token for '%s'"
 msgstr "'%s' のアクセス用トークン取得先の org.gnome.OnlineAccounts サービスから対応するアカウントを見つけることができません"
 
-#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1265
+#: ../modules/gnome-online-accounts/module-gnome-online-accounts.c:1288
 #, c-format
 msgid "Failed to obtain an access token for '%s': "
 msgstr "'%s' のアクセス用トークン取得に失敗しました: "
 
-#: ../modules/google-backend/module-google-backend.c:192
+#: ../modules/google-backend/module-google-backend.c:191
 #: ../modules/ubuntu-online-accounts/calendar.service-type.in.in.h:1
-#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+#: ../modules/yahoo-backend/module-yahoo-backend.c:199
 msgid "Calendar"
 msgstr "カレンダー"
 
-#: ../modules/google-backend/module-google-backend.c:261
+#: ../modules/google-backend/module-google-backend.c:260
 #: ../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
-msgid "Not part of certificate"
-msgstr "証明書の一部ではありません"
-
-#: ../modules/trust-prompt/certificate-viewer.c:575
-msgid "_Close"
-msgstr "閉じる(_C)"
-
-#: ../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
-msgid "SSL Client Certificate"
-msgstr "SSL クライアント証明書"
-
-#: ../modules/trust-prompt/certificate-viewer.c:609
-#: ../modules/trust-prompt/e-asn1-object.c:391
-msgid "SSL Server Certificate"
-msgstr "SSL サーバー証明書"
-
-#: ../modules/trust-prompt/certificate-viewer.c:614
-msgid "Email Signer Certificate"
-msgstr "メール署名者の証明書"
-
-#: ../modules/trust-prompt/certificate-viewer.c:619
-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 "一般名 (CN)"
-
-#: ../modules/trust-prompt/certificate-viewer.c:636
-#: ../modules/trust-prompt/certificate-viewer.c:642
-msgid "Organization (O)"
-msgstr "組織 (O)"
-
-#: ../modules/trust-prompt/certificate-viewer.c:637
-#: ../modules/trust-prompt/certificate-viewer.c:643
-msgid "Organizational Unit (OU)"
-msgstr "組織単位 (OU)"
-
-#: ../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 "SHA1 指紋"
-
-#: ../modules/trust-prompt/certificate-viewer.c:651
-msgid "MD5 Fingerprint"
-msgstr "MD5 指紋"
-
-#: ../modules/trust-prompt/certificate-viewer.c:653
-msgid "General"
-msgstr "全般"
-
-#: ../modules/trust-prompt/certificate-viewer.c:672
-msgid "Certificate Hierarchy"
-msgstr "証明書階層構造"
-
-#: ../modules/trust-prompt/certificate-viewer.c:676
-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 "バージョン 1"
-
-#: ../modules/trust-prompt/e-asn1-object.c:113
-msgid "Version 2"
-msgstr "バージョン 2"
-
-#: ../modules/trust-prompt/e-asn1-object.c:116
-msgid "Version 3"
-msgstr "バージョン 3"
-
-#: ../modules/trust-prompt/e-asn1-object.c:192
-msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr "PKCS #1 MD2 With RSA Encryption"
-
-#: ../modules/trust-prompt/e-asn1-object.c:195
-msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr "PKCS #1 MD5 With RSA Encryption"
-
-#: ../modules/trust-prompt/e-asn1-object.c:198
-msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr "PKCS #1 SHA-1 With RSA Encryption"
-
-#: ../modules/trust-prompt/e-asn1-object.c:201
-msgid "PKCS #1 SHA-256 With RSA Encryption"
-msgstr "PKCS #1 SHA-256 With RSA Encryption"
-
-#: ../modules/trust-prompt/e-asn1-object.c:204
-msgid "PKCS #1 SHA-384 With RSA Encryption"
-msgstr "PKCS #1 SHA-384 With RSA Encryption"
-
-#: ../modules/trust-prompt/e-asn1-object.c:207
-msgid "PKCS #1 SHA-512 With RSA Encryption"
-msgstr "PKCS #1 SHA-512 With RSA Encryption"
-
-#: ../modules/trust-prompt/e-asn1-object.c:234
-msgid "PKCS #1 RSA Encryption"
-msgstr "PKCS #1 RSA Encryption"
-
-#: ../modules/trust-prompt/e-asn1-object.c:237
-msgid "Certificate Key Usage"
-msgstr "証明書の鍵用途"
-
-#: ../modules/trust-prompt/e-asn1-object.c:240
-msgid "Netscape Certificate Type"
-msgstr "Netscape 証明書タイプ"
-
-#: ../modules/trust-prompt/e-asn1-object.c:243
-msgid "Certificate Authority Key Identifier"
-msgstr "認証局鍵識別子"
-
-#: ../modules/trust-prompt/e-asn1-object.c:255
-#, c-format
-msgid "Object Identifier (%s)"
-msgstr "オブジェクト識別子 (%s)"
-
-#: ../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
-msgid "Error: Unable to process extension"
-msgstr "エラー: 拡張情報を処理できません"
-
-#: ../modules/trust-prompt/e-asn1-object.c:395
-msgid "Email"
-msgstr "メールアドレス"
-
-#: ../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
-msgid "SSL Certificate Authority"
-msgstr "SSL 認証局"
-
-#: ../modules/trust-prompt/e-asn1-object.c:407
-msgid "Email Certificate Authority"
-msgstr "メールアドレス認証局"
-
-#: ../modules/trust-prompt/e-asn1-object.c:436
-msgid "Signing"
-msgstr "署名中"
-
-#: ../modules/trust-prompt/e-asn1-object.c:440
-msgid "Non-repudiation"
-msgstr "否認不可"
-
-#: ../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
-msgid "Certificate Signer"
-msgstr "証明書の署名者"
-
-#: ../modules/trust-prompt/e-asn1-object.c:460
-msgid "CRL Signer"
-msgstr "CRL 署名者"
-
-#: ../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 "%s = %s"
-
-#: ../modules/trust-prompt/e-asn1-object.c:658
-msgid "Certificate"
-msgstr "証明書"
-
-#: ../modules/trust-prompt/e-asn1-object.c:674
-#: ../modules/trust-prompt/e-asn1-object.c:812
-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
-msgid "Issuer Unique ID"
-msgstr "発行者の重複しない ID"
-
-#: ../modules/trust-prompt/e-asn1-object.c:757
-msgid "Subject Unique ID"
-msgstr "サブジェクトの重複しない ID"
-
-#: ../modules/trust-prompt/e-asn1-object.c:818
-msgid "Certificate Signature Value"
-msgstr "証明書の署名の値"
-
-#: ../modules/trust-prompt/module-trust-prompt.c:201
+#: ../modules/trust-prompt/module-trust-prompt.c:82
 msgid "The signing certificate authority is not known."
 msgstr "署名している認証局が未知です"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:203
+#: ../modules/trust-prompt/module-trust-prompt.c:84
 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
+#: ../modules/trust-prompt/module-trust-prompt.c:86
 msgid "The certificate's activation time is still in the future."
 msgstr "証明書の発効時刻が未来になっています。"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:207
+#: ../modules/trust-prompt/module-trust-prompt.c:88
 msgid "The certificate has expired."
 msgstr "証明書の有効期限が切れています。"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:209
+#: ../modules/trust-prompt/module-trust-prompt.c:90
 msgid "The certificate has been revoked according to the connection's certificate revocation list."
 msgstr "この接続の証明書失効リストによれば、この証明書は失効されています。"
 
-#: ../modules/trust-prompt/module-trust-prompt.c:211
+#: ../modules/trust-prompt/module-trust-prompt.c:92
 msgid "The certificate's algorithm is considered insecure."
 msgstr "証明書のアルゴリズムは安全ではないものと見なされています。"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:162
+#: ../modules/trust-prompt/trust-prompt-gtk.c:119
 msgid "Certificate trust..."
 msgstr "証明書の信頼..."
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:163
-msgid "_View Certificate"
-msgstr "証明書を表示(_V)"
-
-#: ../modules/trust-prompt/trust-prompt-gtk.c:164
+#: ../modules/trust-prompt/trust-prompt-gtk.c:120
 msgid "_Reject"
 msgstr "拒否(_R)"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:165
+#: ../modules/trust-prompt/trust-prompt-gtk.c:121
 msgid "Accept _Temporarily"
 msgstr "一時的に許可(_T)"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:166
+#: ../modules/trust-prompt/trust-prompt-gtk.c:122
 msgid "_Accept Permanently"
 msgstr "永久に許可(_A)"
 
-#: ../modules/trust-prompt/trust-prompt-gtk.c:203
+#: ../modules/trust-prompt/trust-prompt-gtk.c:160
 #, c-format
 msgid "SSL certificate for '%s' is not trusted. Do you wish to accept it?"
 msgstr "'%s' の SSL 証明書は信頼できません。許可しますか?"
 
-#: ../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
+#: ../modules/trust-prompt/trust-prompt-gtk.c:175
 msgid "Reason:"
 msgstr "理由:"
 
@@ -5553,9 +5174,9 @@ msgstr "カレンダーと統合"
 msgid "Integrate your contacts"
 msgstr "連絡先と統合"
 
-#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:257
+#: ../modules/ubuntu-online-accounts/e-signon-session-password.c:256
 msgid "Signon service did not return a secret"
-msgstr ""
+msgstr "Signon サービスが secret を返しませんでした"
 
 #: ../modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in.h:1
 msgid "Evolution Data Server"
@@ -5585,24 +5206,47 @@ msgstr "メール"
 msgid "Integrate your mailboxes"
 msgstr "メールボックスを統合"
 
-#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:971
+#: ../modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c:1008
 #, c-format
 msgid "Cannot find a corresponding account service in the accounts database from which to obtain an access 
token for '%s'"
 msgstr "'%s' のアクセス用トークン取得先のアカウントデータベースから対応するアカウントを見つけることができません"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:79
-#, c-format
-msgid "Expected status 200 when requesting guid, instead got status %d (%s)"
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:84
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:281
+#, fuzzy, c-format
+#| msgid "Expected status 200 when requesting guid, instead got status %d (%s)"
+msgid "Expected status 200 when requesting your identity, instead got status %d (%s)"
 msgstr "guid を要求した時に返されるステータスは 200 を期待していましたが、代わりに受け取ったステータスは %d (%s) でした"
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:96
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:101
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:298
 msgid "Error parsing response as JSON: "
 msgstr "応答を JSON として解析中にエラー: "
 
-#: ../modules/ubuntu-online-accounts/uoa-utils.c:112
-msgid "Didn't find email member in JSON data"
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:119
+#, fuzzy
+#| msgid "Didn't find email member in JSON data"
+msgid "Didn't find 'email' in JSON data"
+msgstr "JSON データ中にメールアドレスを見つけられませんでした"
+
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:316
+#, fuzzy
+#| msgid "Didn't find email member in JSON data"
+msgid "Didn't find 'id' in JSON data"
 msgstr "JSON データ中にメールアドレスを見つけられませんでした"
 
+#: ../modules/ubuntu-online-accounts/uoa-utils.c:321
+#, fuzzy
+#| msgid "Didn't find email member in JSON data"
+msgid "Didn't find 'emails.account' in JSON data"
+msgstr "JSON データ中にメールアドレスを見つけられませんでした"
+
+#: ../modules/ubuntu-online-accounts/windows-live-mail.service.in.in.h:1
+#, fuzzy
+#| msgid "Wants HTML Mail"
+msgid "Windows Live Mail"
+msgstr "HTML 形式のメールを希望する"
+
 #: ../modules/ubuntu-online-accounts/yahoo-calendar.service.in.in.h:1
 msgid "Yahoo! Calendar"
 msgstr "Yahoo!カレンダー"
@@ -5611,18 +5255,18 @@ msgstr "Yahoo!カレンダー"
 msgid "Yahoo! Mail"
 msgstr "Yahoo!メール"
 
-#: ../modules/yahoo-backend/module-yahoo-backend.c:227
+#: ../modules/yahoo-backend/module-yahoo-backend.c:226
 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
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:46
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:50
+#: ../services/evolution-user-prompter/evolution-user-prompter.c:30
 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
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:48
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:52
 msgid "Wait running until at least one client is connected"
 msgstr "少なくとも 1 クライアントが接続するまで実行を待機する"
 
@@ -5663,1213 +5307,66 @@ msgstr "ウェブ"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../services/evolution-user-prompter/prompt-user-gtk.c:122
+#: ../services/evolution-source-registry/evolution-source-registry.c:38
+msgid "Don't migrate user data from previous versions of Evolution"
+msgstr ""
+
+#: ../services/evolution-user-prompter/prompt-user-gtk.c:121
 msgid "_Dismiss"
 msgstr "解散(_D)"
 
-#~ msgid "Unable to add message to summary: unknown reason"
-#~ msgstr "メッセージをサマリへ追加できません: 原因は不明です"
-
-#~ msgid "Fatal mail parser error near position %s in folder %s"
-#~ msgstr "フォルダー %2$s の %1$s 付近で致命的なメール構文解析エラーです"
-
-#~ msgid "Creating new contact…"
-#~ msgstr "新しい連絡先の作成中…"
-
-#~ msgid "Deleting contact…"
-#~ msgstr "連絡先の削除中…"
-
-#~ msgid "Modifying contact…"
-#~ msgstr "連絡先の更新中…"
-
-#~ msgid "Cannot retrieve backend property: "
-#~ msgstr "バックエンドのプロパティを取得できません: "
-
-#~ msgid "Could not get calendar view path: "
-#~ msgstr "カレンダービューのパスを取得できませんでした: "
-
-#~ msgid "Cannot write offline journal for folder '%s': %s"
-#~ msgstr "フォルダー '%s' のオフラインジャーナルに書き込めません: %s"
-
-#~ msgid "Failed to build summary for an address book %s"
-#~ msgstr "アドレス帳 %s の要約のビルドに失敗しました"
-
-#~ msgid "Using Distinguished Name (DN)"
-#~ msgstr "識別名 (DN) を使用する"
-
-#~ msgid "Using Email Address"
-#~ msgstr "メールアドレスを使用する"
-
-#~ 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 "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 にあるメッセージの解析中"
-
-#~ msgid "Fetching summary information for new messages in %s"
-#~ msgstr "%s にある新着メッセージのサマリ情報の同期中"
-
-#~ msgid "Incomplete server response: no information provided for message %d"
-#~ msgstr "不完全なサーバーの応答: メッセージ %d の情報が提供されませんでした"
-
-#~ msgid "Incomplete server response: no UID provided for message %d"
-#~ msgstr "不完全なサーバーの応答: メッセージ %d の UID が提供されませんでした"
-
-#~ msgid "Could not find message body in FETCH response."
-#~ msgstr "FETCH 応答にメッセージ本体がありませんでした。"
-
-#~ msgid "Could not open cache directory: "
-#~ msgstr "キャッシュフォルダーを開けませんでした: "
-
-#~ msgid "Failed to cache message %s: %s"
-#~ msgstr "%s というメッセージをキャッシュできませんでした: %s"
-
-#~ msgid "Failed to cache message %s: "
-#~ msgstr "メッセージ %s のキャッシュに失敗しました: "
-
-#~ msgid "Failed to cache %s: "
-#~ msgstr "%s のキャッシュに失敗しました: "
-
-#~ msgid "Names_pace:"
-#~ msgstr "ネームスペース(_P):"
-
-#~ msgid "IMAP default port"
-#~ msgstr "IMAP のデフォルトポート"
-
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-#~ msgid "Retrieving list of folders at '%s'"
-#~ msgstr "'%s' にあるフォルダーの一覧を取得中"
-
-#~ msgid "Server unexpectedly disconnected"
-#~ msgstr "突然サーバーが接続を切りました"
-
-#~ msgid "Server unexpectedly disconnected: "
-#~ msgstr "突然サーバーから切断されました: "
-
-#~ msgid "Cannot create folder: %s: Folder name cannot contain a dot"
-#~ msgstr "フォルダーを作成できません: %s: フォルダー名にドットを含むことはできません"
-
-#~ msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
-#~ msgstr "フォルダーの名前を変更できません: %s: フォルダー名にドットを含むことはできません"
-
-#~ msgid "Could not connect to POP server %s"
-#~ msgstr "POP サーバー %s へ接続できませんでした"
-
-#~ msgid "Keyring operation was cancelled"
-#~ msgstr "キーリングの操作が取り消されました"
-
-#~ msgid "Currently _used categories:"
-#~ msgstr "最近使用したカテゴリ(_U):"
-
-#~ msgid "_Available Categories:"
-#~ msgstr "利用可能なカテゴリ(_A):"
-
-#~ msgid "Icon"
-#~ msgstr "アイコン"
-
-#~ msgid "Category"
-#~ msgstr "カテゴリ"
-
-#~ msgid "Create category \"%s\""
-#~ msgstr "\"%s\" というカテゴリの生成"
-
-#~ msgid "Category Icon"
-#~ msgstr "カテゴリのアイコン"
-
-#~ msgid "_No Image"
-#~ msgstr "画像なし(_N)"
-
-#~ msgid "Category _Name"
-#~ msgstr "カテゴリの名前(_N)"
-
-#~ msgid "Category _Icon"
-#~ msgstr "カテゴリのアイコン(_I)"
-
-#~ msgid "Category Properties"
-#~ msgstr "カテゴリのプロパティ"
-
-#~ msgid "There is already a category '%s' in the configuration. Please use another name"
-#~ msgstr "設定の中にカテゴリ '%s' が存在します。別の名前を指定してください。"
-
-#~ msgid "Show Contacts"
-#~ msgstr "連絡先を表示"
-
-#~ msgid "Address B_ook:"
-#~ msgstr "アドレス帳(_O):"
-
-#~ msgid "Cat_egory:"
-#~ msgstr "カテゴリー(_E):"
-
-#~ msgid "_Search:"
-#~ msgstr "検索(_S):"
-
-#~ msgid "Any Category"
-#~ msgstr "任意のカテゴリ"
-
-#~ msgid "Co_ntacts"
-#~ msgstr "連絡先(_N)"
-
-#~ msgid "Search"
-#~ msgstr "検索"
-
-#~ msgid "Address Book"
-#~ msgstr "アドレス帳"
-
-#~ msgid "Select Contacts from Address Book"
-#~ msgstr "アドレス帳から連絡先の選択"
-
-#~ msgid "_Add"
-#~ msgstr "追加(_A)"
-
-#~ msgid "_Remove"
-#~ msgstr "削除(_R)"
-
-#~ msgid "Error loading address book: %s"
-#~ msgstr "アドレス帳の読み込み中にエラー: %s"
-
-#~ msgid "E_xpand %s Inline"
-#~ msgstr "%s をインラインで展開する(_X)"
-
-#~ msgid "Cop_y %s"
-#~ msgstr "%s のコピー(_Y)"
-
-#~ msgid "C_ut %s"
-#~ msgstr "%s の切り取り(_U)"
-
-#~ msgid "_Edit %s"
-#~ msgstr "%s の編集(_E)"
-
-#~ msgid "_Delete %s"
-#~ msgstr "%s の削除(_D)"
-
-#~ msgid "Keyring key is unusable: no user or host name"
-#~ msgstr "キーリングのキーを使用できません: ユーザーまたはホスト名が存在しません"
-
-#~ msgid "You have the Caps Lock key on."
-#~ msgstr "[Caps Lock] キーが ON 状態です。"
-
-#~ msgid "_Remember this passphrase"
-#~ msgstr "このパスフレーズを記憶する(_R)"
-
-#~ msgid "_Remember this passphrase for the remainder of this session"
-#~ msgstr "このパスフレーズをこのセッション用に保存する(_R)"
-
-#~ msgid "_Remember this password"
-#~ msgstr "このパスワードを記憶する(_R)"
-
-#~ msgid "_Remember this password for the remainder of this session"
-#~ msgstr "このパスワードをこのセッション用に保存する(_R)"
-
-#~ msgid "_Destination"
-#~ msgstr "転送先(_D)"
-
-#~ msgid "Select destination"
-#~ msgstr "転送先の選択"
-
-#~ msgid "Evolution Source Viewer"
-#~ msgstr "Evolution ソースビューワー"
-
-#~ msgid "Display Name"
-#~ msgstr "名前の表示"
-
-#~ msgid "Flags"
-#~ msgstr "フラグ"
-
-#~ msgid "Identity"
-#~ msgstr "アイデンティティ"
-
-#~ msgid "Authenticating with the server…"
-#~ msgstr "サーバーで認証中…"
-
-#~ msgid "%s: there was no source for UID '%s' stored in GConf."
-#~ msgstr "%s: GConf に UID '%s' のソースがありません。"
-
-#~ msgid "Invalid source"
-#~ msgstr "ソースが無効です"
-
-#~ msgid "Empty URI"
-#~ msgstr "空の URI"
-
-#~ msgid "Enter password for %s (user %s)"
-#~ msgstr "%s (ユーザー %s) のパスワードを入力してください"
-
-#~ msgid "Enter password for %s to enable proxy for user %s"
-#~ msgstr "%s のパスワードを入力して、ユーザー %s のプロキシを有効にしてください"
-
-#~ msgid "Connection to Server"
-#~ msgstr "サーバーへ接続"
-
-#~ msgid "_Use custom command to connect to server"
-#~ msgstr "サーバーへ接続する際にカスタムコマンドを使用する(_U)"
-
-#~ msgid "Co_mmand:"
-#~ msgstr "コマンド(_M):"
-
-#~ msgid "Check new messages for Jun_k contents"
-#~ msgstr "新着メールがスパムかどうかチェックする(_K)"
-
-#~ msgid "Command:"
-#~ msgstr "コマンド:"
-
-#~ msgid "Numbe_r of cached connections to use"
-#~ msgstr "キャッシュ接続の数(_R)"
-
-#~ msgid "Closing tmp stream failed: "
-#~ msgstr "作業用ストリームのクローズに失敗しました: "
-
-#~ msgid "SMTP Authentication"
-#~ msgstr "SMTP 認証"
-
-#~ msgid "Accessing LDAP Server anonymously"
-#~ msgstr "匿名で LDAP サーバーへアクセス中"
-
-#~ msgid ""
-#~ "SSL Certificate check for %s:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Do you wish to accept?"
-#~ msgstr ""
-#~ "%s の SSL 証明書のチェック:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "受諾してみますか?"
-
-#~ msgid "Use I_dle if the server supports it"
-#~ msgstr "サーバーがサポートするときは Idle を使用する(_D)"
-
-#~ msgid "URL '%s' needs a host component"
-#~ msgstr "URL '%s' はホストコンポーネントが必要です"
-
-#~ msgid "URL '%s' needs a path component"
-#~ msgstr "URL '%s' はパスコンポーネントが必要です"
-
-#~ msgid "Invalid URI"
-#~ msgstr "無効な URI です"
-
-#~ msgid "Could not instantiate backend"
-#~ msgstr "バックエンドのインスタンスを生成できませんでした"
-
-#~ msgid "SSL unavailable"
-#~ msgstr "SSL は無効です"
-
-#~ msgid "SSL is not available in this build"
-#~ msgstr "このパッケージでは SSL を利用できません"
-
-#~ msgid "Error creating SASL authentication object."
-#~ msgstr "SASL 認証オブジェクトの生成中にエラーが発生しました。"
-
-#~ msgid "You did not enter a password."
-#~ msgstr "パスワードを入力しませんでした。"
-
-#~ 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 "SASL '%s' Login failed for POP server %s%s"
-#~ msgstr "POP サーバー %2$s への SASL '%1$s' 認証ログインに失敗しました: %3$s"
-
 #~ msgid ""
-#~ "Unable to connect to POP server %s.\n"
-#~ "Error sending password%s"
+#~ "Could not write log entry: %s\n"
+#~ "Further operations on this server will not be replayed when you\n"
+#~ "reconnect to the network."
 #~ msgstr ""
-#~ "POP サーバー %s に接続できません。\n"
-#~ "パスワードの送信中にエラー%s"
+#~ "ログを書き込めませんでした: %s\n"
+#~ "ネットワークに再接続しても、このサーバーに対する\n"
+#~ "これ以降の操作は再現されません。"
 
 #~ msgid ""
-#~ "Unable to authenticate to SMTP server.\n"
+#~ "Could not open '%s':\n"
 #~ "%s\n"
-#~ "\n"
+#~ "Changes made to this folder will not be resynchronized."
 #~ msgstr ""
-#~ "SMTP サーバーに認証できません。\n"
+#~ "'%s' が開けませんでした:\n"
 #~ "%s\n"
-#~ "\n"
-
-#~ msgid "Updating contacts cache (%d)... "
-#~ msgstr "連絡先のキャッシュ情報 (%d 個目) を更新中... "
-
-#~ msgid "Cannot get supported fields: %s"
-#~ msgstr "対応する項目を取得できません: %s"
-
-#~ msgid "Cannot get required fields: %s"
-#~ msgstr "要求される項目を取得できません: %s"
-
-#~ msgid "Cannot get supported authentication methods: %s"
-#~ msgstr "対応する認証方法を取得できません: %s"
-
-#~ msgid "Cannot get changes: %s"
-#~ msgstr "変更を取得できません: %s"
-
-#~ msgid "Cancel operation failed: %s"
-#~ msgstr "操作のキャンセルに失敗しました: %s"
-
-#~ msgid "Reply Requested: by "
-#~ msgstr "返信要求: by "
-
-#~ msgid "Reply Requested: When convenient"
-#~ msgstr "返信要求: When convenient"
-
-#~ msgid "Loading Appointment items"
-#~ msgstr "予定アイテムの読み込み中"
-
-#~ msgid "Loading Task items"
-#~ msgstr "タスクアイテムの読み込み中"
-
-#~ msgid "Loading Note items"
-#~ msgstr "ノートアイテムの読み込み中"
-
-#~ msgid "Loading items"
-#~ msgstr "アイテムの読み込み中"
-
-#~ msgid "Could not create thread for populating cache"
-#~ msgstr "キャッシュを生成するためのスレッドを生成できませんでした"
-
-#~ msgid "Cannot retrieve calendar alarm e-mail address: %s"
-#~ msgstr "カレンダーのアラームを送信する メールアドレスを回復できません: %s"
-
-#~ msgid "Cannot retrieve calendar's LDAP attribute: %s"
-#~ msgstr "カレンダーの LDAP 属性を回復できません: %s"
-
-#~ msgid "Cannot retrieve calendar scheduling information: %s"
-#~ msgstr "カレンダーの予定情報を回復できません: %s"
-
-#~ msgid "Cannot discard calendar alarm: %s"
-#~ msgstr "カレンダーのアラームを破棄できません: %s"
-
-#~ msgid "Cannot retrieve default calendar object path: %s"
-#~ msgstr "カレンダーオブジェクトへの既定のパスを回復できません: %s"
-
-#~ msgid "Could not complete calendar query: %s"
-#~ msgstr "カレンダーの検索を完了できませんでした: %s"
-
-#~ msgid "Could not set default calendar time zone: %s"
-#~ msgstr "カレンダーの既定のタイムゾーンを設定できませんでした: %s"
-
-#~ msgid "Cannot retrieve calendar changes: %s"
-#~ msgstr "カレンダーの変更を回復できませんでした: %s"
-
-#~ msgid "No stream available"
-#~ msgstr "利用できるストリームがありません"
-
-#~ msgid ""
-#~ "Could not create directory %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "フォルダー %s を作成できませんでした:\n"
-#~ "%s"
-
-#~ msgid "Checking for deleted messages %s"
-#~ msgstr "削除されたメッセージ %s のチェック中"
-
-#~ msgid "Could not get message"
-#~ msgstr "メッセージを取得できませんでした"
-
-#~ msgid "Cannot append message to folder '%s': %s"
-#~ msgstr "'%s' というフォルダーにメッセージを追加できません: %s"
-
-#~ msgid "Cannot create message: %s"
-#~ msgstr "メッセージを作成できません: %s"
-
-#~ msgid ""
-#~ "Cannot get message: %s\n"
-#~ "  %s"
-#~ msgstr ""
-#~ "メッセージを取得できません: %s\n"
-#~ "  %s"
-
-#~ msgid "This message is not available in offline mode."
-#~ msgstr "このメッセージはオフラインモードでは利用できません。"
-
-#~ msgid "Cannot get folder container %s"
-#~ msgstr "フォルダーのコンテナー %s を取得できません"
-
-#~ msgid "Cannot append message in offline mode: "
-#~ msgstr "オフラインモードでメッセージを追加できません: "
-
-#~ msgid "Checking for new mail"
-#~ msgstr "新着メールのチェック"
-
-#~ msgid "Check new messages for J_unk contents"
-#~ msgstr "新着メールがスパムかどうかチェックする(_U)"
-
-#~ msgid "Automatically synchroni_ze account locally"
-#~ msgstr "ローカルのアカウントを自動的に同期する(_Z)"
-
-#~ msgid "SOAP Settings"
-#~ msgstr "SOAP の設定"
-
-#~ msgid "Post Office Agent SOAP _Port:"
-#~ msgstr "ポストオフィスエージェントの SOAP ポート(_P):"
-
-#~ msgid "Novell GroupWise"
-#~ msgstr "Novell GroupWise"
-
-#~ 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 "Host or user not available in url"
-#~ msgstr "ホスト名またはユーザー名は URI で指定できません"
-
-#~ msgid "Some features may not work correctly with your current server version"
-#~ msgstr "お使いのサーバーのバージョンでは、いくつかの機能が正しく動作しないかもしれません"
-
-#~ msgid "Cannot create GroupWise folders in offline mode."
-#~ msgstr "オフラインモードでは GroupWise フォルダーを生成できません。"
-
-#~ msgid "Cannot create a special system folder"
-#~ msgstr "特別なシステムフォルダーを作成することはできません"
-
-#~ msgid "Cannot rename GroupWise folder '%s' to '%s'"
-#~ msgstr "GroupWise フォルダーの '%s' を '%s' という名前に変更できません"
-
-#~ msgid "GroupWise server %s"
-#~ msgstr "GroupWise のサーバー %s"
-
-#~ msgid "GroupWise service for %s on %s"
-#~ msgstr "%s の %s にある GroupWise のサービス"
-
-#~ msgid "GroupWise mail delivery via %s"
-#~ msgstr "%s 経由で GroupWise のメールを配信します"
-
-#~ msgid "Sending Message"
-#~ 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 "Could not send message: %s"
-#~ msgstr "メッセージを送信できませんでした: %s"
-
-#~ msgid "SSL negotiations failed"
-#~ msgstr "SSL 接続に失敗しました"
-
-#~ msgid "Could not connect to %s (port %s): "
-#~ msgstr "%s (ポート %s) へ接続できませんでした: "
-
-#~ msgid "TLS negotiations failed"
-#~ msgstr "TLS 接続に失敗しました"
-
-#~ msgid "_Edit"
-#~ msgstr "編集(_E)"
-
-#~ msgid "Invalid connection"
-#~ msgstr "無効な接続です"
-
-#~ msgid "Invalid response from server"
-#~ msgstr "サーバーからの応答が無効です"
-
-#~ msgid "Bad parameter"
-#~ msgstr "パラメーターが無効です"
-
-#~ msgid "_Apply filters to new messages in INBOX on this server"
-#~ msgstr "このサーバーの受信箱にある新着メールにフィルターを適用する(_A)"
-
-#~ msgid "Cannot create spool file: %s"
-#~ msgstr "スプールファイルを作成できません: %s"
+#~ "このフォルダーに対する変更が再び同期されることはありません。"
 
-#~ msgid "categories"
-#~ msgstr "カテゴリ"
+#~ msgid "Resynchronizing with server"
+#~ msgstr "サーバーの再同期中"
 
-#~ msgid "*"
-#~ msgstr "*"
+#~ msgid "Preparing folder '%s' for offline"
+#~ msgstr "オフラインに切り替える準備中: %s"
 
-#~ msgid "<b>Co_ntacts</b>"
-#~ msgstr "<b>連絡先(_N)</b>"
-
-#~ msgid "<b>Show Contacts</b>"
-#~ msgstr "<b>連絡先の表示</b>"
-
-#~ msgid "\"%s\" on book before \"%s\""
-#~ msgstr "\"%2$s\" の前にあるブックの \"%1$s\""
-
-#~ msgid "book busy"
-#~ msgstr "ブックは処理中です"
-
-#~ msgid "CORBA exception making \"%s\" call"
-#~ msgstr "\"%s\" 呼び出しを行う際に CORBA 例外が発生しました"
-
-#~ msgid "%s: there is no current operation"
-#~ msgstr "%s: 現在実行中の操作はありません"
-
-#~ msgid "\"%s\" on book after \"%s\""
-#~ msgstr "\"%2$s\" の次にあるブックの \"%1$s\""
-
-#~ msgid "%s: canceled"
-#~ msgstr "%s: キャンセルしました"
-
-#~ msgid "%s: no factories available for URI `%s'"
-#~ msgstr "%s: URI '%s' に対するファクトリを利用できません"
-
-#~ msgid "%s: Could not create EBookListener"
-#~ msgstr "%s: EBookListener を生成できませんでした"
-
-#~ msgid "%s: there was no self contact UID stored in gconf"
-#~ msgstr "%s: GConf にセルフ連絡先 UID がありませんでした"
-
-#~ msgid "Could not create thread for getting deltas"
-#~ msgstr "差分を取得するためのスレッドを生成できませんでした"
-
-#~ msgid "Cannot open message"
-#~ msgstr "メッセージを開けません"
-
-#~ msgid "Unsupported operation: append message: for %s"
-#~ msgstr "サポートしていない操作: %s に対するメッセージの追加"
-
-#~ msgid "Unsupported operation: search by expression: for %s"
-#~ msgstr "サポートしていない操作: %s に対して式を使った検索"
-
-#~ msgid "Unsupported operation: count by expression: for %s"
-#~ msgstr "サポートしていない操作: %s に対して式を使ったカウント"
-
-#~ msgid "Unsupported operation: search by UIDs: for %s"
-#~ msgstr "サポートしていない操作: %s に対して UID を使った検索"
-
-#~ msgid "Learning junk"
-#~ msgstr "ジャンクメールの学習中"
-
-#~ msgid "Learning non-junk"
-#~ msgstr "ジャンクではないメールの学習中"
-
-#~ msgid "Canceled."
-#~ msgstr "キャンセルしました"
-
-#~ msgid "This is a digitally signed message part"
-#~ msgstr "このメッセージにはデジタル署名された部分があります"
-
-#~ msgid "Cannot verify message signature: could not create temp file: %s"
-#~ msgstr "このメッセージの整合性を確認できません: 作業用ファイルを作成できませんでした: %s"
-
-#~ msgid "Unable to parse message content"
-#~ msgstr "メッセージの内容を解析できません"
-
-#~ msgid "cannot create thread"
-#~ msgstr "スレッドを生成できません"
-
-#~ msgid "Kerberos 4"
-#~ msgstr "Kerberos 4"
-
-#~ msgid "This option will connect to the server using Kerberos 4 authentication."
-#~ msgstr "このオプションは Kerberos 4 認証を使ってサーバーに接続します"
+#~ msgid "Canceled"
+#~ msgstr "キャンセル済み"
 
 #~ msgid ""
-#~ "Could not get Kerberos ticket:\n"
+#~ "Alert from IMAP server %s:\n"
 #~ "%s"
 #~ msgstr ""
-#~ "Kerberos チケットを取得できませんでした:\n"
+#~ "IMAP サーバー %s からの警告:\n"
 #~ "%s"
 
-#~ msgid "Camel session doesn't support forwarding of a message."
-#~ msgstr "Camel のセッションではメッセージの転送はサポートしていません"
-
-#~ msgid "import keys: unimplemented"
-#~ msgstr "鍵のインポート: 未だ実装されていません"
-
-#~ msgid "export keys: unimplemented"
-#~ msgstr "鍵のエクスポート: 未だ実装されていません"
-
-#~ msgid "Cannot create folder: Invalid operation on this store"
-#~ msgstr "フォルダーを作成できません: ここでは無効な操作です"
-
-#~ msgid "Unable to get issuer's certificate"
-#~ msgstr "発行者の証明書を取得できません"
-
-#~ msgid "Unable to get Certificate Revocation List"
-#~ msgstr "認証取り消し一覧を取得できません"
-
-#~ msgid "Unable to decrypt certificate signature"
-#~ msgstr "証明書の署名を解読できません"
-
-#~ msgid "Unable to decrypt Certificate Revocation List signature"
-#~ msgstr "認証取り消し一覧の署名の解読ができません"
-
-#~ msgid "Unable to decode issuer's public key"
-#~ msgstr "発行者のパブリックキーを解読できません"
-
-#~ msgid "Certificate not yet valid"
-#~ msgstr "認証がまだ正しくありません"
-
-#~ msgid "Certificate Revocation List (CRL) not yet valid"
-#~ msgstr "証明書失効リスト (CRL) はまだ無効です"
-
-#~ msgid "Certificate Revocation List (CRL) has expired"
-#~ msgstr "証明書失効リスト (CRL) が期限切れです"
-
-#~ msgid "Error in Certificate Revocation List (CRL)"
-#~ msgstr "証明書失効リスト (CRL) にエラー"
-
-#~ msgid "Out of memory"
-#~ msgstr "メモリが足りません"
-
-#~ msgid "Zero-depth self-signed certificate"
-#~ msgstr "Zero-depth self-signed 認証"
-
-#~ msgid "Self-signed certificate in chain"
-#~ msgstr "チェーンの中にある Self-signed 認証"
-
-#~ msgid "Unable to get issuer's certificate locally"
-#~ msgstr "発行者の認証をローカルで取得できません"
-
-#~ msgid "Unable to verify leaf signature"
-#~ msgstr "Leaf 署名を検証できません"
-
-#~ msgid "Certificate chain too long"
-#~ msgstr "認証チェーンが長すぎます"
-
-#~ msgid "Path length exceeded"
-#~ msgstr "パスワードが長すぎます"
-
-#~ msgid "Invalid purpose"
-#~ msgstr "目的が間違っています"
-
-#~ msgid "Subject/Issuer mismatch"
-#~ msgstr "タイトル/発行者が一致しません"
-
-#~ msgid "AKID/SKID mismatch"
-#~ msgstr "AKID/SKID が一致しません"
-
-#~ msgid "AKID/Issuer serial mismatch"
-#~ msgstr "AKID/発行者のシリアル番号が一致しません"
-
-#~ msgid "Error in application verification"
-#~ msgstr "アプリケーションの検証でエラーが発生しました"
-
-#~ msgid ""
-#~ "Bad certificate from %s:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Do you wish to accept anyway?"
-#~ msgstr ""
-#~ "%s からおかしな証明書です:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "受諾してみますか?"
-
-#~ msgid "User canceled"
-#~ msgstr "ユーザーがキャンセルしました"
-
-#~ msgid "Trash Folder Full. Please Empty."
-#~ msgstr "ゴミ箱フォルダーが満杯です。空にしてください。"
-
-#~ msgid "Hula"
-#~ msgstr "Hula"
-
-#~ msgid "For accessing Hula servers"
-#~ 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'"
-
-#~ msgid "No response on continuation after APPEND command"
-#~ msgstr "APPEND コマンドに続く応答がありません"
-
-#~ msgid "Unknown error occurred during APPEND command!"
-#~ msgstr "APPEND コマンドの発行中に原因不明のエラーが発生しました!"
-
-#~ msgid "Failed sending command to IMAP server %s: %s"
-#~ msgstr "%s という IMAP サーバーへのコマンド送信に失敗しました: %s"
-
-#~ msgid "Unexpected response from IMAP4 server %s: %s"
-#~ msgstr "IMAP サーバーの %s から想定外の応答がありました: %s"
-
-#~ msgid "Unexpected greeting from IMAP server %s."
-#~ msgstr "IMAP サーバーの %s から想定外の応答がありました"
-
-#~ msgid "Cannot select folder '%s': Invalid mailbox name"
-#~ msgstr "'%s' というフォルダーを選択できません: mailbox の名前が無効です"
-
-#~ msgid "Cannot select folder '%s': Bad command"
-#~ msgstr "'%s' というフォルダー を選択できません: コマンドが間違っています"
-
-#~ msgid "Failed to send command to IMAP server %s: %s"
-#~ msgstr "%s という IMAP サーバーへのコマンド送信に失敗しました: %s"
-
-#~ 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 "Expire cached messages that haven't been read in X seconds"
-#~ msgstr "X秒間読まれなかったキャッシュ済のメッセージを無効にします"
-
-#~ msgid "Expire cached messages older than X seconds"
-#~ msgstr "X秒より古いキャッシュ済のメッセージを無効にします"
-
-#~ msgid "Cannot access folder '%s': %s"
-#~ msgstr "'%s' というフォルダーにアクセスできません: %s"
-
-#~ msgid "Cannot sync flags to folder '%s': Unknown error"
-#~ msgstr "'%s' というフォルダーとフラグを同期できません: 原因不明のエラー"
-
-#~ msgid "Cannot sync flags to folder '%s': Bad command"
-#~ msgstr "'%s' というフォルダーとフラグを同期できません: コマンドが間違っています"
-
-#~ msgid "Cannot expunge folder '%s': Unknown error"
-#~ msgstr "'%s' というフォルダーを抹消できません: 原因不明のエラー"
-
-#~ msgid "Cannot expunge folder '%s': Bad command"
-#~ msgstr "'%s' というフォルダーを抹消できません: コマンドが間違っています"
-
-#~ msgid "Cannot get message %s from folder '%s': No such message"
-#~ msgstr "%s を '%s' というフォルダーから取得できません: そのようなメッセージはありません"
-
-#~ msgid "Cannot get message %s from folder '%s': Bad command"
-#~ msgstr "%s を '%s' というフォルダーから取得できません: コマンドが間違っています"
-
-#~ msgid "Cannot append message to folder '%s': Folder is read-only"
-#~ msgstr "'%s' というフォルダーにメッセージを追加できません: フォルダーは読み込み専用です"
-
-#~ msgid "Cannot append message to folder '%s': Unknown error"
-#~ msgstr "'%s' というフォルダーにメッセージを追加できません: 原因不明のエラー"
-
-#~ msgid "Cannot append message to folder '%s': Bad command"
-#~ msgstr "'%s' というフォルダーにメッセージを追加できません: コマンドが間違っています"
-
-#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-#~ msgstr "'%s' から '%s' へメッセージを移動できません: 原因不明のエラー"
-
-#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-#~ msgstr "'%s' から '%s' へメッセージをコピーできません: 原因不明のエラー"
-
-#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-#~ msgstr "'%s' から '%s' へメッセージを移動できません: コマンドが間違っています"
-
-#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-#~ msgstr "'%s' から '%s' へメッセージをコピーできません: コマンドが間違っています"
-
-#~ msgid "Only check for Junk messa_ges in the INBOX folder"
-#~ msgstr "受信箱にあるメールだけスパムかどうかチェックする(_G)"
-
-#~ msgid "IMAP4rev1"
-#~ msgstr "IMAP4rev1"
-
-#~ 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 "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"
-#~ msgstr "IMAP サーバー %s に対して認証方式 %s を使って認証できませんでした"
-
-#~ msgid "Cannot authenticate to IMAP server %s using %s"
-#~ msgstr "IMAP サーバー %s で %s を使った認証を行えません"
-
-#~ msgid "Cannot create IMAP folders in offline mode."
-#~ msgstr "オフラインモードでは IMAP フォルダーを作成できません。"
-
-#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-#~ msgstr "'%s' を IMAP サーバーの %s から取得できません: 原因不明のエラー"
-
-#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-#~ msgstr "'%s' の LIST 情報を IMAP サーバーの %s から取得できません: %s"
-
-#~ msgid "Bad command"
-#~ msgstr "コマンドが間違っています"
-
-#~ msgid "Cannot create folder '%s': Invalid mailbox name"
-#~ msgstr "'%s' というフォルダーを作成できません: mailbox の名前が無効です"
-
-#~ msgid "Cannot create folder '%s': Bad command"
-#~ msgstr "'%s' というフォルダーを作成できません: コマンドが間違っています"
-
-#~ msgid "Cannot delete IMAP folders in offline mode."
-#~ msgstr "オフラインモードでは IMAP フォルダーを削除できません。"
-
-#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
-#~ msgstr "'%s' というフォルダーを削除できません: mailbox の名前が無効です"
-
-#~ msgid "Cannot delete folder '%s': Bad command"
-#~ msgstr "'%s' というフォルダーを削除できません: コマンドが間違っています"
-
-#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
-#~ msgstr "'%s' から '%s' に名前を変更できません: 特別なフォルダーです"
-
-#~ msgid "Cannot rename IMAP folders in offline mode."
-#~ msgstr "オフラインモードでは IMAP のフォルダー名を変更できません。"
-
-#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-#~ msgstr "'%s' から '%s' に名前を変更できません: mailbox の名前が無効です"
-
-#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
-#~ msgstr "'%s' から '%s' に名前を変更できません: コマンドが間違っています"
-
-#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-#~ msgstr "%s を '%s' というパターンで IMAP サーバーの %s から取得できません: %s"
-
-#~ msgid "Cannot subscribe to IMAP folders in offline mode."
-#~ msgstr "オフラインモードでは IMAP フォルダーを購読できません。"
-
-#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-#~ msgstr "'%s' というフォルダーを購読できません: mailbox の名前が無効です"
-
-#~ msgid "Cannot subscribe to folder '%s': Bad command"
-#~ msgstr "'%s' というフォルダーを購読できません: コマンドが間違っています"
-
-#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
-#~ msgstr "オフラインモードでは IMAP フォルダーの購読を停止できません。"
-
-#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-#~ msgstr "'%s' というフォルダーの購読を停止できません: mailbox の名前が無効です"
-
-#~ msgid "Scanning for changed messages"
-#~ msgstr "変更メッセージの解析中"
-
-#~ msgid "IMAP server %s is in an inconsistent state."
-#~ msgstr "IMAP サーバー %s の状態が矛盾しています"
-
-#~ msgid "Fetching envelopes of new messages"
-#~ msgstr "新しいメッセージのエンベロープの取得中"
-
-#~ msgid "Unexpected token in response from IMAP server %s: "
-#~ msgstr "IMAP サーバー %s から想定外の応答がありました: "
-
-#~ msgid "No data"
-#~ msgstr "データなし"
-
-#~ msgid "IMAP server %s unexpectedly disconnected: %s"
-#~ msgstr "突然 IMAP サーバー %s が接続を切りました: %s"
-
-#~ msgid ""
-#~ "Experimental IMAP 4(.1) client\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"
-#~ "\n"
-#~ " !!! 重要なメールには利用しないでください  !!!\n"
-
-#~ msgid "Could not connect to POP server on %s"
-#~ msgstr "%s の POP サーバーへ接続できませんでした"
-
-#~ msgid "Maildir append message canceled"
-#~ msgstr "Maildir 形式のメッセージ追加が取り消されました"
-
-#~ msgid "Invalid message contents"
-#~ msgstr "メッセージの内容は無効です"
-
-#~ msgid "Mail append canceled"
-#~ msgstr "メールの追加がキャンセルされました"
-
-#~ msgid "Message construction failed."
-#~ msgstr "メッセージの構築に失敗しました。"
-
-#~ msgid "MH append message canceled"
-#~ msgstr "MH 形式のメッセージ追加がキャンセルされました"
-
-#~ msgid "Use cancel"
-#~ msgstr "キャンセルを利用する"
-
-#~ msgid "STARTTLS command failed"
-#~ msgstr "STARTTLS コマンドが失敗しました"
-
-#~ msgid "HELO command failed"
-#~ msgstr "HELO コマンドが失敗しました"
-
-#~ msgid "AUTH command failed"
-#~ msgstr "AUTH コマンドが失敗しました"
-
-#~ msgid "Bad authentication response from server.\n"
-#~ msgstr "サーバーから間違った認証応答がありました\n"
-
-#~ msgid "MAIL FROM command failed: %s: mail not sent"
-#~ msgstr "MAIL FROM コマンドが失敗しました: %s: メールを送信しません"
-
-#~ msgid "RCPT TO command failed: %s: mail not sent"
-#~ msgstr "RCPT TO コマンドが失敗しました: %s: メールを送信しません"
-
-#~ msgid "DATA command failed: %s: mail not sent"
-#~ msgstr "DATA コマンドが失敗しました: %s: メールを送信しません"
-
-#~ msgid "RSET command failed"
-#~ msgstr "RSET コマンドが失敗しました"
-
-#~ msgid "QUIT command failed"
-#~ msgstr "QUIT コマンドが失敗しました"
-
-#~ msgid "Item(s) belong to these _categories:"
-#~ msgstr "カテゴリに属しているアイテム(_C):"
-
-#~ msgid "Color Info"
-#~ msgstr "色の情報"
-
-#~ msgid "The color to render"
-#~ msgstr "描画する色の情報です"
-
-#~ msgid "Owner"
-#~ msgstr "所有者"
-
-#~ msgid "Publishing Editor"
-#~ msgstr "Publishing Editor"
-
-#~ msgid "Editor"
-#~ msgstr "編集者"
-
-#~ msgid "Publishing Author"
-#~ msgstr "Publishing Author"
-
-#~ msgid "Author"
-#~ msgstr "作者"
-
-#~ msgid "Reviewer"
-#~ msgstr "レビューアー"
-
-#~ msgid "Contributor"
-#~ msgstr "貢献者"
-
-#~ msgid "None"
-#~ msgstr "なし"
-
-#~ msgid "Custom"
-#~ msgstr "カスタム"
-
-#~ msgid "Generic error"
-#~ msgstr "一般的なエラー"
-
-#~ msgid "A folder with the same name already exists"
-#~ msgstr "既に同名のフォルダーが存在します"
-
-#~ msgid "The specified folder type is not valid"
-#~ msgstr "指定したフォルダーの種類が間違っています"
-
-#~ msgid "Not enough space to create the folder"
-#~ msgstr "フォルダーを生成するための容量が足りません"
-
-#~ msgid "The folder is not empty"
-#~ msgstr "そのフォルダーは空ではありません"
-
-#~ msgid "The specified folder was not found"
-#~ msgstr "指定したフォルダーが見つかりませんでした"
-
-#~ msgid "Function not implemented in this storage"
-#~ msgstr "このストレージでは実装されていない機能です"
-
-#~ msgid "The specified type is not supported in this storage"
-#~ msgstr "このストレージでは指定した種類をサポートしていません"
-
-#~ msgid "The specified folder cannot be modified or removed"
-#~ msgstr "指定したフォルダーを変更/削除できません"
-
-#~ msgid "Cannot make a folder a child of one of its descendants"
-#~ msgstr "そのフォルダーの子を生成できません"
-
-#~ msgid "Cannot create a folder with that name"
-#~ msgstr "そのような名前でフォルダーを作成できません"
-
-#~ msgid "This operation cannot be performed in off-line mode"
-#~ msgstr "この操作はオフラインモードでは利用できません。"
-
-#~ msgid "%s's Folders"
-#~ msgstr "%s のフォルダー"
-
-#~ msgid "Favorite Public Folders"
-#~ msgstr "お気に入りのパブリックなフォルダー"
-
-#~ msgid "All Public Folders"
-#~ msgstr "すべてのパブリックなフォルダー"
-
-#~ msgid "Global Address List"
-#~ msgstr "グローバルな住所の一覧"
-
-#~ msgid "Deleted Items"
-#~ msgstr "アイテムを削除しました"
-
-#~ msgid "Drafts"
-#~ msgstr "草案"
-
-#~ msgid "Journal"
-#~ msgstr "ジャーナル"
-
-#~ msgid "Notes"
-#~ msgstr "メモ"
-
-#~ msgid "Outbox"
-#~ msgstr "送信箱"
-
-#~ msgid "Sent Items"
-#~ msgstr "アイテムを送信しました"
-
-#~ msgid "Evolution Addressbook file backend"
-#~ msgstr "Evolution アドレス帳ファイルのバックエンド"
-
-#~ msgid "Evolution Calendar file and webcal backend"
-#~ msgstr "Evolution カレンダーファイルと webcal のバックエンド"
-
-#~ msgid "Evolution Data Server interface check service"
-#~ msgstr "Evolution データサーバーのインターフェース確認サービス"
-
-#~ msgid "Decoder failed, error %d"
-#~ msgstr "デコーダーのエラー (%d)"
-
-#~ msgid "CRL not yet valid"
-#~ msgstr "CRL はまだ正しくありません"
+#~ msgid "Error while fetching messages"
+#~ msgstr "メッセージの取得中にエラーが発生しました"
 
-#~ msgid "CRL has expired"
-#~ msgstr "CRL が期限切れです"
+#~ msgid "Fetching summary information for %d message in '%s'"
+#~ msgid_plural "Fetching summary information for %d messages in '%s'"
+#~ msgstr[0] "%d メッセージ (%s 内) のサマリ情報を取得中"
 
-#~ msgid "Error in CRL"
-#~ msgstr "CRL の中でエラーが発生しました"
+#~ msgid "Lost connection to IMAP server"
+#~ msgstr "IMAP サーバーへの接続を失いました"
 
-#~ msgid "Sent"
-#~ msgstr "送信済"
+#~ msgid "Source stream unavailable"
+#~ msgstr "ソースストリームは利用できません"
 
-#~ msgid "Templates"
-#~ msgstr "テンプレート"
+#~ msgid "Cannot create folder '%s': folder exists"
+#~ msgstr "'%s' というフォルダーを作成できません: 既に存在しています"
 
-#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-#~ msgstr "セグメンテーションフォルトが複数回発生しました: エラーダイアログを表示できません\n"
+#~ msgid "Cannot create folder '%s': folder exists."
+#~ msgstr "'%s' というフォルダーを作成できません: 既に存在しています。"
 
-#~ msgid "Failed to create create child process '%s': %s"
-#~ msgstr "子プロセス '%s' の生成に失敗しました: %s"
+#~ msgid "You cannot post NNTP messages while working offline!"
+#~ msgstr "オフライン状態の間は NNTP メッセージを投稿できません!"



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