[evolution-data-server] Updated Japanese translation



commit f049f7bb92d8f28ec6972567d5e314d512a28b92
Author: OKANO Takayoshi <kano na rim or jp>
Date:   Sun Dec 25 23:53:14 2011 +0900

    Updated Japanese translation

 po/ja.po | 1572 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 831 insertions(+), 741 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 8772a73..1dd691f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: evolution-data-server gnome-3-0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2011-10-17 08:09+0000\n"
-"PO-Revision-Date: 2011-10-18 01:08+0900\n"
+"POT-Creation-Date: 2011-12-23 17:42+0000\n"
+"PO-Revision-Date: 2011-12-25 23:40+0900\n"
 "Last-Translator: OKANO Takayoshi <kano na rim or jp>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "MIME-Version: 1.0\n"
@@ -25,17 +25,61 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:964
+#: ../addressbook/backends/file/e-book-backend-file.c:125
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:276
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:937
+#: ../addressbook/libebook/e-book-client.c:103
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:527
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:556
+#: ../calendar/backends/http/e-cal-backend-http.c:437
+#: ../calendar/libecal/e-cal.c:4595 ../calendar/libecal/e-cal-client.c:147
+#: ../camel/providers/imap/camel-imap-command.c:510
+#: ../camel/providers/imap/camel-imap-store.c:450
+#: ../camel/providers/imapx/camel-imapx-server.c:2421
+#: ../libedataserver/e-client.c:161
+msgid "Unknown error"
+msgstr "ããããçåããããã"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:150
+#, fuzzy, c-format
+#| msgid "Failed to create child process '%s': %s"
+msgid "Failed to remove file '%s': %s"
+msgstr "åãããã '%s' ãçæãåæãããã: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:173
+#, fuzzy, c-format
+#| msgid "Could not create directory %s: %s"
+msgid "Failed to make directory %s: %s"
+msgstr "ããããã %s ãäæãããããããã: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:468
+#, fuzzy, c-format
+#| msgid "Failed to create child process '%s': %s"
+msgid "Failed to create hardlink for resource '%s': %s"
+msgstr "åãããã '%s' ãçæãåæãããã: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file.c:570
+#: ../addressbook/backends/file/e-book-backend-file.c:1125
+msgid "No UID in the contact"
+msgstr ""
+
+#: ../addressbook/backends/file/e-book-backend-file.c:1559
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:512
 msgid "Loading..."
 msgstr "èãèãä..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:967
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4842
+#: ../addressbook/backends/file/e-book-backend-file.c:1562
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4847
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:514
 msgid "Searching..."
 msgstr "æçä..."
 
+#: ../addressbook/backends/file/e-book-backend-file.c:2104
+#, c-format
+msgid "Failed to build summary for an address book %s"
+msgstr ""
+
 #. Query for new contacts asynchronously
 #: ../addressbook/backends/google/e-book-backend-google.c:831
 msgid "Querying for updated contactsâ"
@@ -43,7 +87,7 @@ msgstr "ææãããéçåãåãåããäâ"
 
 #: ../addressbook/backends/google/e-book-backend-google.c:880
 #: ../addressbook/libebook/e-book.c:3529 ../calendar/libecal/e-cal.c:1381
-#: ../libedataserver/e-client.c:1906
+#: ../libedataserver/e-client.c:1915
 msgid "Personal"
 msgstr "åä"
 
@@ -89,7 +133,7 @@ msgid "Deleting contactâ"
 msgstr "éçåãåéäâ"
 
 #: ../addressbook/backends/google/e-book-backend-google.c:1749
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2291
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2292
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:371
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:485
 #, fuzzy
@@ -139,38 +183,23 @@ msgstr "LDAP ãããããéçåãèåä..."
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP ããããããéçåãåéä..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2313
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2314
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP ãããããããéçåãäæä..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4693
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4697
 msgid "Receiving LDAP search results..."
 msgstr "LDAP ããããæççæãååä..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4863
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4868
 msgid "Error performing search"
 msgstr "æçäãããããççãããã"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4984
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4989
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "éçå (%d åç) ãããããããä... "
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:276
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:937
-#: ../addressbook/libebook/e-book-client.c:103
-#: ../addressbook/libedata-book/e-data-book.c:441
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:527
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:556
-#: ../calendar/backends/http/e-cal-backend-http.c:430
-#: ../calendar/libecal/e-cal.c:4595 ../calendar/libecal/e-cal-client.c:147
-#: ../camel/providers/imap/camel-imap-command.c:484
-#: ../camel/providers/imap/camel-imap-store.c:403
-#: ../camel/providers/imapx/camel-imapx-server.c:2293
-#: ../libedataserver/e-client.c:161
-msgid "Unknown error"
-msgstr "ããããçåããããã"
-
 #: ../addressbook/backends/webdav/e-book-backend-webdav.c:352
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
@@ -182,7 +211,7 @@ msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: GConf ã UID '%s' ããããããããããã"
 
 #: ../addressbook/libebook/e-book.c:3512 ../calendar/libecal/e-cal.c:1361
-#: ../libedataserver/e-client.c:1901
+#: ../libedataserver/e-client.c:1910
 msgid "On This Computer"
 msgstr "ããããããããã"
 
@@ -229,8 +258,8 @@ msgstr "ããããããããããåæãããã"
 #: ../addressbook/libedata-book/e-data-book-factory.c:196
 #: ../addressbook/libedata-book/e-data-book-factory.c:228
 #: ../calendar/libecal/e-cal-client.c:610
-#: ../calendar/libedata-cal/e-data-cal-factory.c:215
-#: ../calendar/libedata-cal/e-data-cal-factory.c:244
+#: ../calendar/libedata-cal/e-data-cal-factory.c:213
+#: ../calendar/libedata-cal/e-data-cal-factory.c:242
 #, c-format
 msgid "Invalid source"
 msgstr "ããããçåãã"
@@ -255,25 +284,25 @@ msgid "There was no source for UID '%s' stored in a source list."
 msgstr "%s: GConf ã UID '%s' ããããããããããã"
 
 #: ../addressbook/libebook/e-book-client.c:2563
-#: ../calendar/libecal/e-cal-client.c:4482
+#: ../calendar/libecal/e-cal-client.c:4480
 #, fuzzy
 #| msgid "Cannot get contact list: %s"
 msgid "Cannot get connection to view"
 msgstr "éçåãäèãååããããã: %s"
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:117
 msgid "Unique ID"
 msgstr "éèããã ID"
 
 #. FILE_AS is not really a structured field - we use a getter/setter
 #. *         so we can generate its value if necessary in the getter
-#: ../addressbook/libebook/e-contact.c:119
+#: ../addressbook/libebook/e-contact.c:120
 msgid "File Under"
 msgstr "FILE UNDER"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:121
+#: ../addressbook/libebook/e-contact.c:122
 msgid "Book URI"
 msgstr "ããããåã URI"
 
@@ -281,560 +310,560 @@ msgstr "ããããåã URI"
 #. FN isn't really a structured field - we use a getter/setter
 #. * so we can set the N property (since evo 1.4 works fine with
 #. * vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:127
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Full Name"
 msgstr "æå"
 
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:129
 msgid "Given Name"
 msgstr "å"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Family Name"
 msgstr "å"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Nickname"
 msgstr "ããå"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Email 1"
 msgstr "E-ããã 1"
 
-#: ../addressbook/libebook/e-contact.c:134
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Email 2"
 msgstr "E-ããã 2"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Email 3"
 msgstr "E-ããã 3"
 
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:137
 msgid "Email 4"
 msgstr "E-ããã 4"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Mailer"
 msgstr "ãããããããããã"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Home Address Label"
 msgstr "èåãäæããã"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Work Address Label"
 msgstr "åååãäæããã"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Other Address Label"
 msgstr "ããäãäæããã"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Assistant Phone"
 msgstr "ãããããããéèçå"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Business Phone"
 msgstr "ääãéèçå"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Business Phone 2"
 msgstr "ääãéèçå 2"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Business Fax"
 msgstr "ääã FAX çå"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Callback Phone"
 msgstr "åæåãéèçå"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Car Phone"
 msgstr "èèéèãçå"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Company Phone"
 msgstr "äçãéèçå"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Home Phone"
 msgstr "èåãéèçå"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Home Phone 2"
 msgstr "èåãéèçå 2"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Home Fax"
 msgstr "èåã FAX çå"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:157
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Mobile Phone"
 msgstr "æåéèãçå"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Other Phone"
 msgstr "ããäãéèçå"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Other Fax"
 msgstr "ããäã FAX çå"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Pager"
 msgstr "ãããããçå"
 
-#: ../addressbook/libebook/e-contact.c:161
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Primary Phone"
 msgstr "éèçå"
 
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Radio"
 msgstr "ããã"
 
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:164
 msgid "Telex"
 msgstr "ããããã"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:166
 msgid "TTY"
 msgstr "ããããããããã"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Organization"
 msgstr "çç"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Organizational Unit"
 msgstr "çç"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Office"
 msgstr "äåæ"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:172
 msgid "Title"
 msgstr "æç (åãã)"
 
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Role"
 msgstr "åå"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Manager"
 msgstr "ãããããã"
 
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Assistant"
 msgstr "ãããããã"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:177
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Homepage URL"
 msgstr "ããããããã URL"
 
-#: ../addressbook/libebook/e-contact.c:178
+#: ../addressbook/libebook/e-contact.c:179
 msgid "Weblog URL"
 msgstr "ãããã URL"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:182
 #: ../libedataserverui/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "ãããã"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Calendar URI"
 msgstr "ãããããã URI"
 
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:186
 msgid "Free/Busy URL"
 msgstr "äåãæçã URL"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:187
 msgid "ICS Calendar"
 msgstr "ICS ããããã"
 
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Video Conferencing URL"
 msgstr "ãããäèçã URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Spouse's Name"
 msgstr "éåèãåå"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:192
 msgid "Note"
 msgstr "ããã"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Home Screen Name 1"
 msgstr "èåã AIM ãããããå 1"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Home Screen Name 2"
 msgstr "èåã AIM ãããããå 2"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:197
 msgid "AIM Home Screen Name 3"
 msgstr "èåã AIM ãããããå 3"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:198
 msgid "AIM Work Screen Name 1"
 msgstr "åååã AIM ãããããå 1"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Work Screen Name 2"
 msgstr "åååã AIM ãããããå 2"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:200
 msgid "AIM Work Screen Name 3"
 msgstr "åååã AIM ãããããå 3"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Home Screen Name 1"
 msgstr "èåã GroupWise ãããããå 1"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Home Screen Name 2"
 msgstr "èåã GroupWise ãããããå 2"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:203
 msgid "GroupWise Home Screen Name 3"
 msgstr "èåã GroupWise ãããããå 3"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:204
 msgid "GroupWise Work Screen Name 1"
 msgstr "åååã GroupWise ãããããå 1"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Work Screen Name 2"
 msgstr "åååã GroupWise ãããããå 2"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:206
 msgid "GroupWise Work Screen Name 3"
 msgstr "åååã GroupWise ãããããå 3"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Home ID 1"
 msgstr "èåã Jabber ID 1"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Home ID 2"
 msgstr "èåã Jabber ID 2"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Jabber Home ID 3"
 msgstr "èåã Jabber ID 3"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Jabber Work ID 1"
 msgstr "åååã Jabber ID 1"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Jabber Work ID 2"
 msgstr "åååã Jabber ID 2"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Jabber Work ID 3"
 msgstr "åååã Jabber ID 3"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Home Screen Name 1"
 msgstr "èåã Yahoo! ãããããå 1"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Home Screen Name 2"
 msgstr "èåã Yahoo! ãããããå 2"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Yahoo! Home Screen Name 3"
 msgstr "èåã Yahoo! ãããããå 3"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Yahoo! Work Screen Name 1"
 msgstr "åååã Yahoo! ãããããå 1"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Work Screen Name 2"
 msgstr "åååã Yahoo! ãããããå 2"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:218
 msgid "Yahoo! Work Screen Name 3"
 msgstr "åååã Yahoo! ãããããå 3"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Home Screen Name 1"
 msgstr "èåã MSN ãããããå 1"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Home Screen Name 2"
 msgstr "èåã MSN ãããããå 2"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:221
 msgid "MSN Home Screen Name 3"
 msgstr "èåã MSN ãããããå 3"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:222
 msgid "MSN Work Screen Name 1"
 msgstr "åååã MSN ãããããå 1"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Work Screen Name 2"
 msgstr "åååã MSN ãããããå 2"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:224
 msgid "MSN Work Screen Name 3"
 msgstr "åååã MSN ãããããå 3"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Home ID 1"
 msgstr "èåã ICQ ID 1"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Home ID 2"
 msgstr "èåã ICQ ID 2"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:227
 msgid "ICQ Home ID 3"
 msgstr "èåã ICQ ID 3"
 
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:228
 msgid "ICQ Work ID 1"
 msgstr "åååã ICQ ID 1"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:229
 msgid "ICQ Work ID 2"
 msgstr "åååã ICQ ID 2"
 
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:230
 msgid "ICQ Work ID 3"
 msgstr "åååã ICQ ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Last Revision"
 msgstr "æçææææ"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Name or Org"
 msgstr "ååãããçç"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Address List"
 msgstr "äæãäè"
 
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:238
 msgid "Home Address"
 msgstr "èåãäæ"
 
-#: ../addressbook/libebook/e-contact.c:238
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Work Address"
 msgstr "åååãäæ"
 
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:240
 msgid "Other Address"
 msgstr "ããäãäæ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Category List"
 msgstr "ãããããäè"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Photo"
 msgstr "åç"
 
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:247
 msgid "Logo"
 msgstr "ãã"
 
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Name"
 msgstr "åå"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:250
 msgid "Email List"
 msgstr "E-ãããäè"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:253
 msgid "AIM Screen Name List"
 msgstr "AIM ãããããåãäè"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:254
 msgid "GroupWise ID List"
 msgstr "GroupWise ID ãäè"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Jabber ID List"
 msgstr "Jabber ID ãäè"
 
-#: ../addressbook/libebook/e-contact.c:255
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! ãããããåãäè"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:257
 msgid "MSN Screen Name List"
 msgstr "MSN ãããããåãäè"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:258
 msgid "ICQ ID List"
 msgstr "ICQ ã ID äèãã"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:260
 msgid "Wants HTML Mail"
 msgstr "HTML ååãããããåæãã"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:262
 msgid "List"
 msgstr "äè"
 
-#: ../addressbook/libebook/e-contact.c:262
+#: ../addressbook/libebook/e-contact.c:263
 msgid "List Show Addresses"
 msgstr "äæãèçããäèãã"
 
-#: ../addressbook/libebook/e-contact.c:264
+#: ../addressbook/libebook/e-contact.c:265
 msgid "Birth Date"
 msgstr "èçæ"
 
-#: ../addressbook/libebook/e-contact.c:265
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:756
+#: ../addressbook/libebook/e-contact.c:266
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1057
 msgid "Anniversary"
 msgstr "èåæ"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:269
 msgid "X.509 Certificate"
 msgstr "X.509 èè"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Home ID 1"
 msgstr "èåã Gadu-Gadu ID 1"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Home ID 2"
 msgstr "èåã Gadu-Gadu ID 2"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Home ID 3"
 msgstr "èåã Gadu-Gadu ID 3"
 
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:274
 msgid "Gadu-Gadu Work ID 1"
 msgstr "åååã Gadu-Gadu ID 1"
 
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:275
 msgid "Gadu-Gadu Work ID 2"
 msgstr "åååã Gadu-Gadu ID 2"
 
-#: ../addressbook/libebook/e-contact.c:275
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Gadu-Gadu Work ID 3"
 msgstr "åååã Gadu-Gadu ID 3"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:277
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID ãäè"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Geographic Information"
 msgstr "åçæå"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Telephone"
 msgstr "éè"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Home Name 1"
 msgstr "èåã Skype å 1"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Home Name 2"
 msgstr "èåã Skype å 2"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Home Name 3"
 msgstr "èåã Skype å 3"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:287
 msgid "Skype Work Name 1"
 msgstr "åååã Skype å 1"
 
-#: ../addressbook/libebook/e-contact.c:287
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Work Name 2"
 msgstr "åååã Skype å 2"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Work Name 3"
 msgstr "åååã Skype å 3"
 
-#: ../addressbook/libebook/e-contact.c:289
+#: ../addressbook/libebook/e-contact.c:290
 msgid "Skype Name List"
 msgstr "Skype åãäè"
 
-#: ../addressbook/libebook/e-contact.c:291
+#: ../addressbook/libebook/e-contact.c:292
 msgid "SIP address"
 msgstr "SIP ãããã"
 
-#: ../addressbook/libebook/e-contact.c:293
+#: ../addressbook/libebook/e-contact.c:294
 #, fuzzy
 #| msgid "Skype Home Name 1"
 msgid "Google Talk Home Name 1"
 msgstr "èåã Skype å 1"
 
-#: ../addressbook/libebook/e-contact.c:294
+#: ../addressbook/libebook/e-contact.c:295
 #, fuzzy
 #| msgid "Skype Home Name 2"
 msgid "Google Talk Home Name 2"
 msgstr "èåã Skype å 2"
 
-#: ../addressbook/libebook/e-contact.c:295
+#: ../addressbook/libebook/e-contact.c:296
 #, fuzzy
 #| msgid "Skype Home Name 3"
 msgid "Google Talk Home Name 3"
 msgstr "èåã Skype å 3"
 
-#: ../addressbook/libebook/e-contact.c:296
+#: ../addressbook/libebook/e-contact.c:297
 #, fuzzy
 #| msgid "Skype Work Name 1"
 msgid "Google Talk Work Name 1"
 msgstr "åååã Skype å 1"
 
-#: ../addressbook/libebook/e-contact.c:297
+#: ../addressbook/libebook/e-contact.c:298
 #, fuzzy
 #| msgid "Skype Work Name 2"
 msgid "Google Talk Work Name 2"
 msgstr "åååã Skype å 2"
 
-#: ../addressbook/libebook/e-contact.c:298
+#: ../addressbook/libebook/e-contact.c:299
 #, fuzzy
 #| msgid "Skype Work Name 3"
 msgid "Google Talk Work Name 3"
 msgstr "åååã Skype å 3"
 
-#: ../addressbook/libebook/e-contact.c:299
+#: ../addressbook/libebook/e-contact.c:300
 #, fuzzy
 #| msgid "Skype Name List"
 msgid "Google Talk Name List"
 msgstr "Skype åãäè"
 
-#: ../addressbook/libebook/e-contact.c:1592
+#: ../addressbook/libebook/e-contact.c:1601
 #: ../addressbook/libebook/e-destination.c:884
 msgid "Unnamed List"
 msgstr "ååãããäè"
@@ -855,8 +884,8 @@ msgstr "ååäæãããã: %s"
 msgid "Cannot change value of book property '%s'"
 msgstr "'%s' ãããããããããäæããããã: %s"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:484
-#: ../camel/camel-db.c:481
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:449
+#: ../camel/camel-db.c:503
 #, c-format
 msgid "Insufficient memory"
 msgstr "ããããèãããã"
@@ -1083,7 +1112,7 @@ msgstr "éçåãåéããããã: %s"
 
 #: ../addressbook/libedata-book/e-data-book-factory.c:184
 #: ../addressbook/libedata-book/e-data-book-factory.c:212
-#: ../calendar/libedata-cal/e-data-cal-factory.c:231
+#: ../calendar/libedata-cal/e-data-cal-factory.c:229
 #, c-format
 msgid "Empty URI"
 msgstr "çã URI"
@@ -1098,8 +1127,8 @@ msgstr "ãããããæçããããã (%s)"
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "äæåã HTTP ãããããããã %d ãèããããã (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2181
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2540
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2167
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2526
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1108,92 +1137,108 @@ msgstr ""
 "ãããããæçãããããããããããããèãèãåçããããéãããã\n"
 "ãããããããã: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4480
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4485
 msgid "Calendar doesn't support Free/Busy"
 msgstr "ããããããäåãæçãååãããã"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:758
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:214
+#: ../libedataserverui/e-client-utils.c:875
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for address book %s (user %s)\n"
+"Reason: %s"
+msgstr "%s (ãããã %s) ãããããããååãããããã"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:216
+#: ../libedataserverui/e-client-utils.c:877
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for address book %s (user %s)"
+msgstr "%s (ãããã %s) ãããããããååãããããã"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1059
 msgid "Birthday"
 msgstr "èçæ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:788
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1095
 #, c-format
 msgid "Birthday: %s"
 msgstr "èçæ: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:813
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1126
 #, c-format
 msgid "Anniversary: %s"
 msgstr "èåæ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
+#: ../calendar/backends/file/e-cal-backend-file.c:248
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "ããããããããããäåããããã: URI ãééãããããã"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:248
-#: ../calendar/backends/file/e-cal-backend-file.c:254
+#: ../calendar/backends/file/e-cal-backend-file.c:255
+#: ../calendar/backends/file/e-cal-backend-file.c:261
 msgid "Cannot save calendar data"
 msgstr "ããããããããããäåããããã"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:413
+#: ../calendar/backends/http/e-cal-backend-http.c:418
 msgid "Redirected to Invalid URI"
 msgstr "URI ãããããããããçåãã"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:451
+#: ../calendar/backends/http/e-cal-backend-http.c:459
 msgid "Bad file format."
 msgstr "ããããããããããããééãããããã"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:458
+#: ../calendar/backends/http/e-cal-backend-http.c:467
 msgid "Not a calendar."
 msgstr "ããããããããããããã"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:779
-#: ../calendar/backends/http/e-cal-backend-http.c:780
-#: ../calendar/backends/weather/e-cal-backend-weather.c:536
+#: ../calendar/backends/http/e-cal-backend-http.c:791
+#: ../calendar/backends/http/e-cal-backend-http.c:792
+#: ../calendar/backends/weather/e-cal-backend-weather.c:522
 msgid "Could not create cache file"
 msgstr "ãããããããããããçæãããããããã"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:183
+#: ../calendar/backends/weather/e-cal-backend-weather.c:181
 msgid "Could not retrieve weather data"
 msgstr "åæãããããååãããããããã"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Fog"
 msgstr "åæ: é"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Cloudy Night"
 msgstr "åæ: æãããåç"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Cloudy"
 msgstr "åæ: æã"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Overcast"
 msgstr "åæ: ææã"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:295
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Showers"
 msgstr "åæ: é"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:296
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Snow"
 msgstr "åæ: é"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:297
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Clear Night"
 msgstr "åæ: æããåç"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:298
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Sunny"
 msgstr "åæ: æããåæ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:299
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Thunderstorms"
 msgstr "åæ: éé"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:447
+#: ../calendar/backends/weather/e-cal-backend-weather.c:433
 msgid "Forecast"
 msgstr "åæäå"
 
@@ -1264,7 +1309,7 @@ msgid "Authentication failed"
 msgstr "èèãåæãããã"
 
 #: ../calendar/libecal/e-cal.c:4591
-#: ../camel/providers/smtp/camel-smtp-transport.c:810
+#: ../camel/providers/smtp/camel-smtp-transport.c:821
 #: ../libedataserver/e-client.c:128
 msgid "Authentication required"
 msgstr "èèãåèãããããã"
@@ -1310,7 +1355,7 @@ msgstr "ããããããååãããã"
 msgid "Invalid source type"
 msgstr "ããããçåãã"
 
-#: ../calendar/libecal/e-cal-component.c:1326
+#: ../calendar/libecal/e-cal-component.c:1362
 msgid "Untitled appointment"
 msgstr "ãããããããäå"
 
@@ -1723,7 +1768,7 @@ msgstr "ãããããããããããããååãããããããã: %
 msgid "Could not add calendar time zone: "
 msgstr "ãããããããããããããèåãããããããã: %s"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:201
+#: ../calendar/libedata-cal/e-data-cal-factory.c:199
 #, fuzzy, c-format
 #| msgid "Invalid range"
 msgid "Invalid call"
@@ -1822,21 +1867,27 @@ msgid "Copy folder content locally for offline operation"
 msgstr "ããããããååããããããããããã (ãããããç)"
 
 #: ../camel/camel-disco-store.c:456
-#: ../camel/providers/imap/camel-imap-store.c:1109
-#: ../camel/providers/imap/camel-imap-store.c:1916
-#: ../camel/providers/imap/camel-imap-store.c:2411
-#: ../camel/providers/imap/camel-imap-store.c:3152
-#: ../camel/providers/imapx/camel-imapx-folder.c:336
-#: ../camel/providers/imapx/camel-imapx-folder.c:369
-#: ../camel/providers/imapx/camel-imapx-folder.c:423
-#: ../camel/providers/imapx/camel-imapx-folder.c:469
-#: ../camel/providers/imapx/camel-imapx-folder.c:503
-#: ../camel/providers/imapx/camel-imapx-folder.c:543
-#: ../camel/providers/imapx/camel-imapx-folder.c:579
+#: ../camel/providers/imap/camel-imap-store.c:1193
+#: ../camel/providers/imap/camel-imap-store.c:1980
+#: ../camel/providers/imap/camel-imap-store.c:2475
+#: ../camel/providers/imap/camel-imap-store.c:3231
+#: ../camel/providers/imapx/camel-imapx-folder.c:333
+#: ../camel/providers/imapx/camel-imapx-folder.c:366
+#: ../camel/providers/imapx/camel-imapx-folder.c:420
+#: ../camel/providers/imapx/camel-imapx-folder.c:466
+#: ../camel/providers/imapx/camel-imapx-folder.c:500
+#: ../camel/providers/imapx/camel-imapx-folder.c:540
+#: ../camel/providers/imapx/camel-imapx-folder.c:576
 #: ../camel/providers/imapx/camel-imapx-store.c:270
-#: ../camel/providers/imapx/camel-imapx-store.c:1334
-#: ../camel/providers/imapx/camel-imapx-store.c:1422
-#: ../camel/providers/imapx/camel-imapx-store.c:1468
+#: ../camel/providers/imapx/camel-imapx-store.c:1333
+#: ../camel/providers/imapx/camel-imapx-store.c:1421
+#: ../camel/providers/imapx/camel-imapx-store.c:1467
+#: ../camel/providers/pop3/camel-pop3-folder.c:357
+#: ../camel/providers/pop3/camel-pop3-folder.c:487
+#: ../camel/providers/pop3/camel-pop3-folder.c:591
+#: ../camel/providers/pop3/camel-pop3-folder.c:765
+#: ../camel/providers/pop3/camel-pop3-store.c:373
+#: ../camel/providers/pop3/camel-pop3-store.c:770
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "ããåäãåäãããããããããããäæãããããã"
@@ -1846,131 +1897,131 @@ msgstr "ããåäãåäãããããããããããäæãããã
 msgid "Canceled"
 msgstr "ãããããæã"
 
-#: ../camel/camel-filter-driver.c:878 ../camel/camel-filter-search.c:697
+#: ../camel/camel-filter-driver.c:877 ../camel/camel-filter-search.c:695
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "åãããã '%s' ãçæãåæãããã: %s"
 
-#: ../camel/camel-filter-driver.c:926
+#: ../camel/camel-filter-driver.c:925
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s ããåäããããããããããããããæããããããã: %s"
 
-#: ../camel/camel-filter-driver.c:1131 ../camel/camel-filter-driver.c:1140
+#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1139
 msgid "Syncing folders"
 msgstr "ããããããåæä"
 
-#: ../camel/camel-filter-driver.c:1235 ../camel/camel-filter-driver.c:1681
+#: ../camel/camel-filter-driver.c:1234 ../camel/camel-filter-driver.c:1680
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "ããããããææèæäãããã: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1692
+#: ../camel/camel-filter-driver.c:1245 ../camel/camel-filter-driver.c:1691
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "ãããããåèäãããã: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1343
 #, c-format
 msgid "Unable to open spool folder"
 msgstr "ãããããããããããéãããã"
 
-#: ../camel/camel-filter-driver.c:1355
+#: ../camel/camel-filter-driver.c:1354
 #, c-format
 msgid "Unable to process spool folder"
 msgstr "ãããããããããããåçããããã"
 
-#: ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1372
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "ããããã %d ãååä (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1380 ../camel/camel-filter-driver.c:1402
+#: ../camel/camel-filter-driver.c:1379 ../camel/camel-filter-driver.c:1401
 #, c-format
 msgid "Failed on message %d"
 msgstr "ããããã %d ãåæãããã"
 
-#: ../camel/camel-filter-driver.c:1417 ../camel/camel-filter-driver.c:1518
+#: ../camel/camel-filter-driver.c:1416 ../camel/camel-filter-driver.c:1517
 msgid "Syncing folder"
 msgstr "ããããããåæä"
 
-#: ../camel/camel-filter-driver.c:1422 ../camel/camel-filter-driver.c:1524
+#: ../camel/camel-filter-driver.c:1421 ../camel/camel-filter-driver.c:1523
 msgid "Complete"
 msgstr "åäãããã"
 
-#: ../camel/camel-filter-driver.c:1482
+#: ../camel/camel-filter-driver.c:1481
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "ããããã %d / %d ãååä"
 
-#: ../camel/camel-filter-driver.c:1500
+#: ../camel/camel-filter-driver.c:1499
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "ããããã %d / %d ãåæãããã"
 
-#: ../camel/camel-filter-search.c:138
+#: ../camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "ããããããååãåæãããã"
 
-#: ../camel/camel-filter-search.c:447
+#: ../camel/camel-filter-search.c:445
 msgid "Invalid arguments to (system-flag)"
 msgstr "(system-flag) ãåããçåãåæ"
 
-#: ../camel/camel-filter-search.c:465
+#: ../camel/camel-filter-search.c:463
 msgid "Invalid arguments to (user-tag)"
 msgstr "(user-tag) ãåããçåãåæ"
 
-#: ../camel/camel-filter-search.c:874 ../camel/camel-filter-search.c:883
+#: ../camel/camel-filter-search.c:872 ../camel/camel-filter-search.c:881
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "ãããããæçåèäãããã: %s: %s"
 
-#: ../camel/camel-folder.c:243
+#: ../camel/camel-folder.c:251
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "'%s' ãããæããããããããããããåçä"
 
-#: ../camel/camel-folder.c:283
+#: ../camel/camel-folder.c:291
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "'%s' ãããæãããããããããããåçä"
 
-#: ../camel/camel-folder.c:331
+#: ../camel/camel-folder.c:339
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "'%s' ãããæããããããããããããããããä"
 
-#: ../camel/camel-folder.c:896
-#: ../camel/providers/local/camel-maildir-folder.c:319
+#: ../camel/camel-folder.c:907
+#: ../camel/providers/local/camel-maildir-folder.c:322
 msgid "Moving messages"
 msgstr "ããããããçåä"
 
-#: ../camel/camel-folder.c:899
+#: ../camel/camel-folder.c:910
 msgid "Copying messages"
 msgstr "ãããããããããä"
 
-#: ../camel/camel-folder.c:1146
+#: ../camel/camel-folder.c:1157
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr ""
 
-#: ../camel/camel-folder.c:3249
+#: ../camel/camel-folder.c:3278
 #, fuzzy, c-format
 #| msgid "Retrieving message '%s'"
 msgid "Retrieving message '%s' in %s"
 msgstr "ããããã '%s' ãååä"
 
-#: ../camel/camel-folder.c:3395
+#: ../camel/camel-folder.c:3424
 #, fuzzy, c-format
 #| msgid "Fetching summary information for new messages in %s"
 msgid "Retrieving quota information for '%s'"
 msgstr "%s ãããæçãããããããããæåãåæä"
 
-#: ../camel/camel-folder-search.c:348 ../camel/camel-folder-search.c:459
-#: ../camel/camel-folder-search.c:630
+#: ../camel/camel-folder-search.c:348 ../camel/camel-folder-search.c:458
+#: ../camel/camel-folder-search.c:629
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1979,8 +2030,8 @@ msgstr ""
 "æèèçãææãèæããããã: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:360 ../camel/camel-folder-search.c:471
-#: ../camel/camel-folder-search.c:642
+#: ../camel/camel-folder-search.c:360 ../camel/camel-folder-search.c:470
+#: ../camel/camel-folder-search.c:641
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1990,47 +2041,47 @@ msgstr ""
 "%s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:856 ../camel/camel-folder-search.c:899
+#: ../camel/camel-folder-search.c:855 ../camel/camel-folder-search.c:898
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ããèççæãåèãã"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:960
+#: ../camel/camel-folder-search.c:959
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ã %s ãäãåãããããããããã"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:967 ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:966 ../camel/camel-folder-search.c:974
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ããæçãçéãèãæååãåèãã"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1003
+#: ../camel/camel-folder-search.c:1002
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ãéåãçæãæåããã"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:1013
+#: ../camel/camel-folder-search.c:1012
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) ããããããããçãåèãã"
 
-#: ../camel/camel-gpg-context.c:657 ../camel/camel-gpg-context.c:662
-#: ../camel/camel-gpg-context.c:1288
+#: ../camel/camel-gpg-context.c:659 ../camel/camel-gpg-context.c:664
+#: ../camel/camel-gpg-context.c:1323
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "GPG ãåèãåæãããã: %s"
 
-#: ../camel/camel-gpg-context.c:662
-#: ../camel/providers/smtp/camel-smtp-transport.c:813
+#: ../camel/camel-gpg-context.c:664
+#: ../camel/providers/smtp/camel-smtp-transport.c:824
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../camel/camel-gpg-context.c:727
+#: ../camel/camel-gpg-context.c:729
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2041,17 +2092,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:744
+#: ../camel/camel-gpg-context.c:765
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "GnuPG ããããã ID ããããèæãåæããããã"
 
-#: ../camel/camel-gpg-context.c:769 ../camel/camel-gpg-context.c:784
+#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:805
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "GnuPG ãããããããèæãèæãåæããããã"
 
-#: ../camel/camel-gpg-context.c:805
+#: ../camel/camel-gpg-context.c:826
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2060,7 +2111,7 @@ msgstr ""
 "ãäãããããããããããããèéãããã\n"
 "PIN ãåèãã: \"%s\""
 
-#: ../camel/camel-gpg-context.c:809
+#: ../camel/camel-gpg-context.c:830
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2069,49 +2120,52 @@ msgstr ""
 "æãããããããããèéãããããããããããåèãã:\n"
 " \"%s\""
 
-#: ../camel/camel-gpg-context.c:815
+#: ../camel/camel-gpg-context.c:836
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "'%s' ãåãã GnuPG ããæååãèæãããããã"
 
-#: ../camel/camel-gpg-context.c:844 ../camel/camel-net-utils.c:523
-#: ../camel/camel-tcp-stream-raw.c:260
-#: ../camel/providers/imapx/camel-imapx-server.c:4997
-#: ../camel/providers/imapx/camel-imapx-server.c:5014
-#: ../camel/providers/imapx/camel-imapx-store.c:164
-#: ../camel/providers/nntp/camel-nntp-summary.c:406
+#: ../camel/camel-gpg-context.c:846
+msgid ""
+"Note the encrypted content doesn't contain information about a recipient, "
+"thus there will be a password prompt for each of stored private key."
+msgstr ""
+
+#: ../camel/camel-gpg-context.c:875 ../camel/camel-net-utils.c:523
+#: ../camel/camel-tcp-stream-raw.c:268
+#: ../camel/providers/nntp/camel-nntp-summary.c:368
 #: ../libedataserver/e-client.c:136 ../libedataserverui/e-book-auth-util.c:227
 #, c-format
 msgid "Cancelled"
 msgstr "ãããããæã"
 
-#: ../camel/camel-gpg-context.c:862
+#: ../camel/camel-gpg-context.c:896
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "çåéãèéãåæãããã: æåããäãããããããããããããããã"
 
-#: ../camel/camel-gpg-context.c:874
+#: ../camel/camel-gpg-context.c:909
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG ããæååãåçãããããã: %s"
 
-#: ../camel/camel-gpg-context.c:1005
+#: ../camel/camel-gpg-context.c:1040
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "æååãåæãããã: æããååãæåãããããããã"
 
-#: ../camel/camel-gpg-context.c:1552 ../camel/camel-smime-context.c:827
+#: ../camel/camel-gpg-context.c:1587 ../camel/camel-smime-context.c:827
 msgid "Could not generate signing data: "
 msgstr "çåããããçæãããããããã: "
 
-#: ../camel/camel-gpg-context.c:1601 ../camel/camel-gpg-context.c:1805
-#: ../camel/camel-gpg-context.c:1915 ../camel/camel-gpg-context.c:2062
-#: ../camel/camel-gpg-context.c:2162 ../camel/camel-gpg-context.c:2210
+#: ../camel/camel-gpg-context.c:1636 ../camel/camel-gpg-context.c:1840
+#: ../camel/camel-gpg-context.c:1950 ../camel/camel-gpg-context.c:2097
+#: ../camel/camel-gpg-context.c:2197 ../camel/camel-gpg-context.c:2245
 msgid "Failed to execute gpg."
 msgstr "GPG ãåèãåæããããã"
 
-#: ../camel/camel-gpg-context.c:1680 ../camel/camel-gpg-context.c:1688
-#: ../camel/camel-gpg-context.c:1696 ../camel/camel-gpg-context.c:1716
+#: ../camel/camel-gpg-context.c:1715 ../camel/camel-gpg-context.c:1723
+#: ../camel/camel-gpg-context.c:1731 ../camel/camel-gpg-context.c:1751
 #: ../camel/camel-smime-context.c:953 ../camel/camel-smime-context.c:967
 #: ../camel/camel-smime-context.c:976
 #, c-format
@@ -2120,34 +2174,34 @@ msgstr ""
 "ãããããããçåãæåæãçèããããã: ããããããæåãæãããããã"
 "ã"
 
-#: ../camel/camel-gpg-context.c:1758
+#: ../camel/camel-gpg-context.c:1793
 msgid "Cannot verify message signature: "
 msgstr "ãããããããçåãæåæãçèããããã: "
 
-#: ../camel/camel-gpg-context.c:1881
+#: ../camel/camel-gpg-context.c:1916
 msgid "Could not generate encrypting data: "
 msgstr "æååãããããããçæãããããããã: "
 
-#: ../camel/camel-gpg-context.c:1934
+#: ../camel/camel-gpg-context.c:1969
 msgid "This is a digitally encrypted message part"
 msgstr "ãããããããçåãããéåãã"
 
-#: ../camel/camel-gpg-context.c:1992 ../camel/camel-gpg-context.c:2001
-#: ../camel/camel-gpg-context.c:2024
+#: ../camel/camel-gpg-context.c:2027 ../camel/camel-gpg-context.c:2036
+#: ../camel/camel-gpg-context.c:2059
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ããããããèèããããã: ããããããæåãæããããããã"
 
-#: ../camel/camel-gpg-context.c:2012
+#: ../camel/camel-gpg-context.c:2047
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME åãæåèèãåæãããã: ããããããããã"
 
-#: ../camel/camel-gpg-context.c:2103 ../camel/camel-smime-context.c:1264
+#: ../camel/camel-gpg-context.c:2138 ../camel/camel-smime-context.c:1264
 msgid "Encrypted content"
 msgstr "æååããåå"
 
-#: ../camel/camel-http-stream.c:542 ../camel/camel-stream-null.c:78
+#: ../camel/camel-http-stream.c:545 ../camel/camel-stream-null.c:78
 msgid "Only reset to beginning is supported with CamelHttpStream"
 msgstr ""
 
@@ -2288,7 +2342,7 @@ msgstr "ååãæçãåæãããã"
 msgid "Name lookup failed: %s"
 msgstr "ååãæçãåæãããã: %s"
 
-#: ../camel/camel-network-service.c:110
+#: ../camel/camel-network-service.c:112
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "%s ãæçãããããããã: "
@@ -2328,7 +2382,7 @@ msgstr "%s ãèãèããããããã: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ãèãèããããããã: ããããããããããåæåãããããããã"
 
-#: ../camel/camel-provider.c:394 ../camel/camel-session.c:389
+#: ../camel/camel-provider.c:395 ../camel/camel-session.c:384
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "'%s' ãããããããããåçããããããããããããããã"
@@ -2373,11 +2427,11 @@ msgstr ""
 "çåãããããæå:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:41
+#: ../camel/camel-sasl-cram-md5.c:42
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:43
+#: ../camel/camel-sasl-cram-md5.c:44
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -2385,11 +2439,11 @@ msgstr ""
 "ãããããããããããããååãããããããããããããããäèããã CRAM-"
 "MD5 èèãäãããããããæçãããã"
 
-#: ../camel/camel-sasl-digest-md5.c:54
+#: ../camel/camel-sasl-digest-md5.c:55
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:56
+#: ../camel/camel-sasl-digest-md5.c:57
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2397,47 +2451,47 @@ msgstr ""
 "ãããããããããããããååãããããããããããããããäèããã "
 "DIGEST-MD5 ãäãããããããæçãããã"
 
-#: ../camel/camel-sasl-digest-md5.c:834
+#: ../camel/camel-sasl-digest-md5.c:846
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "ããããèæãéãããã (2048 octet ääãã)"
 
-#: ../camel/camel-sasl-digest-md5.c:845
+#: ../camel/camel-sasl-digest-md5.c:857
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "çåãã\n"
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:865
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr ""
 "ããããèæããããã \"äèåè (QOP: Quality of Protection)\" ãããããã"
 "åãããããã"
 
-#: ../camel/camel-sasl-digest-md5.c:887
+#: ../camel/camel-sasl-digest-md5.c:898
 #, c-format
 msgid "Server response did not contain authorization data"
 msgstr "ãããããåçãèèããããããããã"
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:919
 #, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "ãããããåçãäååãèèãããããããã"
 
-#: ../camel/camel-sasl-digest-md5.c:921
+#: ../camel/camel-sasl-digest-md5.c:932
 #, c-format
 msgid "Server response does not match"
 msgstr "ãããããåçãäèãããã"
 
-#: ../camel/camel-sasl-gssapi.c:86
+#: ../camel/camel-sasl-gssapi.c:87
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:88
+#: ../camel/camel-sasl-gssapi.c:89
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "ãããããããã Kerberos 5 èèãäãããããããæçãããã"
 
-#: ../camel/camel-sasl-gssapi.c:129
+#: ../camel/camel-sasl-gssapi.c:130
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2445,11 +2499,11 @@ msgstr ""
 "æåããããããããæäãããèææããããããããããããããããåèãè"
 "èãããããããã"
 
-#: ../camel/camel-sasl-gssapi.c:134
+#: ../camel/camel-sasl-gssapi.c:135
 msgid "The provided target_name parameter was ill-formed."
 msgstr "æåããåæ target_name ãååãééãããããã"
 
-#: ../camel/camel-sasl-gssapi.c:137
+#: ../camel/camel-sasl-gssapi.c:138
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2457,7 +2511,7 @@ msgstr ""
 "æåããåæã target_name ãçåãããããããããããããããçéãååãã"
 "ãããã"
 
-#: ../camel/camel-sasl-gssapi.c:141
+#: ../camel/camel-sasl-gssapi.c:142
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2465,14 +2519,14 @@ msgstr ""
 "input_token ãåæ input_chan_bindings ãäããæåãããåããããããããã"
 "ãããããããããã"
 
-#: ../camel/camel-sasl-gssapi.c:146
+#: ../camel/camel-sasl-gssapi.c:147
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr ""
 "input_token ãäãçåãçåããããããããããçåãæãããããããã"
 
-#: ../camel/camel-sasl-gssapi.c:150
+#: ../camel/camel-sasl-gssapi.c:151
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2480,53 +2534,53 @@ msgstr ""
 "æåããèææããããããããåæåããããããããããèææããããããä"
 "æãèææãåçãããããããããã"
 
-#: ../camel/camel-sasl-gssapi.c:155
+#: ../camel/camel-sasl-gssapi.c:156
 msgid "The supplied context handle did not refer to a valid context."
 msgstr ""
 "æåããããããããããããããæãããããããããåçãããããããããã"
 
-#: ../camel/camel-sasl-gssapi.c:158
+#: ../camel/camel-sasl-gssapi.c:159
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_token ãåæããæåæããããããåæããããã"
 
-#: ../camel/camel-sasl-gssapi.c:161
+#: ../camel/camel-sasl-gssapi.c:162
 msgid "The consistency checks performed on the credential failed."
 msgstr "èææãåæããæåæããããããåæããããã"
 
-#: ../camel/camel-sasl-gssapi.c:164
+#: ../camel/camel-sasl-gssapi.c:165
 msgid "The referenced credentials have expired."
 msgstr "åçããããèææãæéãéãããããã"
 
-#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:321
-#: ../camel/camel-sasl-gssapi.c:365 ../camel/camel-sasl-gssapi.c:382
-#: ../camel/providers/smtp/camel-smtp-transport.c:526
+#: ../camel/camel-sasl-gssapi.c:171 ../camel/camel-sasl-gssapi.c:333
+#: ../camel/camel-sasl-gssapi.c:377 ../camel/camel-sasl-gssapi.c:394
+#: ../camel/providers/smtp/camel-smtp-transport.c:537
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "ããããããééããèèåçããããããã"
 
-#: ../camel/camel-sasl-gssapi.c:394
+#: ../camel/camel-sasl-gssapi.c:406
 #, c-format
 msgid "Unsupported security layer."
 msgstr "ããããããããããããããããããããããã"
 
-#: ../camel/camel-sasl-login.c:35
+#: ../camel/camel-sasl-login.c:36
 msgid "Login"
 msgstr "ãããã"
 
-#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
+#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:42
 msgid "This option will connect to the server using a simple password."
 msgstr "ããããããããçåãããããããäãããããããæçãããã"
 
-#: ../camel/camel-sasl-login.c:96
+#: ../camel/camel-sasl-login.c:103
 #, c-format
 msgid "Unknown authentication state."
 msgstr "çåããããèèçæããã"
 
-#: ../camel/camel-sasl-ntlm.c:42
+#: ../camel/camel-sasl-ntlm.c:43
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:44
+#: ../camel/camel-sasl-ntlm.c:45
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2534,7 +2588,7 @@ msgstr ""
 "ãããããããã NTLM/ããããããäèããããããããèèãäãã Windows "
 "ãããããæçãããã"
 
-#: ../camel/camel-sasl-plain.c:39
+#: ../camel/camel-sasl-plain.c:40
 msgid "PLAIN"
 msgstr "PLAIN"
 
@@ -2568,34 +2622,18 @@ msgstr "POP ããããåçããã POP Before SMTP ãã"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "æèèçãçéãåæ: %s: %s"
 
-#: ../camel/camel-service.c:611
-#, fuzzy, c-format
-#| msgid "URL '%s' needs a username component"
-msgid "URL '%s' needs a user component"
-msgstr "URL '%s' ãããããåããããããããåèãã"
-
-#: ../camel/camel-service.c:622
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL '%s' ãããããããããããããåèãã"
-
-#: ../camel/camel-service.c:633
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL '%s' ããããããããããããåèãã"
-
-#: ../camel/camel-session.c:399
+#: ../camel/camel-session.c:393
 #, fuzzy, c-format
 #| msgid "No provider available for protocol '%s'"
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "'%s' ãããããããããåçããããããããããããããã"
 
 #: ../camel/camel-session.c:462
-#: ../camel/providers/imap/camel-imap-store.c:1013
-#: ../camel/providers/imapx/camel-imapx-server.c:3173
-#: ../camel/providers/pop3/camel-pop3-store.c:234
-#: ../camel/providers/pop3/camel-pop3-store.c:510
-#: ../camel/providers/smtp/camel-smtp-transport.c:419
+#: ../camel/providers/imap/camel-imap-store.c:1097
+#: ../camel/providers/imapx/camel-imapx-server.c:3357
+#: ../camel/providers/pop3/camel-pop3-store.c:242
+#: ../camel/providers/pop3/camel-pop3-store.c:538
+#: ../camel/providers/smtp/camel-smtp-transport.c:430
 #, fuzzy, c-format
 #| msgid "No support for authentication type %s"
 msgid "No support for %s authentication"
@@ -2607,7 +2645,7 @@ msgstr "%s ãããèèãããããããããããããã"
 msgid "%s authentication failed"
 msgstr "èèãåæãããã"
 
-#: ../camel/camel-session.c:1182
+#: ../camel/camel-session.c:1186
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "%s%s %s ãããããããååããããããã"
@@ -2802,54 +2840,54 @@ msgstr "ããããããããããããèåãåæãããã"
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME ååå: æååãããååãããããã"
 
-#: ../camel/camel-store.c:1798
+#: ../camel/camel-store.c:1797
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "'%s' ãããããããããäæããããã: æãååããããã"
 
-#: ../camel/camel-store.c:1841
+#: ../camel/camel-store.c:1840
 #, fuzzy, c-format
 #| msgid "Syncing folders"
 msgid "Opening folder '%s'"
 msgstr "ããããããåæä"
 
-#: ../camel/camel-store.c:2026
+#: ../camel/camel-store.c:2025
 #, fuzzy, c-format
 #| msgid "Scanning for changed messages in %s"
 msgid "Scanning folders in '%s'"
 msgstr "%s ãããããããããèæä"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2038 ../camel/camel-store.c:2048
+#: ../camel/camel-store.c:2037 ../camel/camel-store.c:2047
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ããç"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2041 ../camel/camel-store.c:2052
+#: ../camel/camel-store.c:2040 ../camel/camel-store.c:2051
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ãããã"
 
-#: ../camel/camel-store.c:2500
+#: ../camel/camel-store.c:2499
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "ããããããäæããããã: %s: ããããããååããã"
 
-#: ../camel/camel-store.c:2514
+#: ../camel/camel-store.c:2513
 #, fuzzy, c-format
 #| msgid "Cannot get folder '%s': %s"
 msgid "Creating folder '%s'"
 msgstr "'%s' ãããããããããååããããã: %s"
 
-#: ../camel/camel-store.c:2632 ../camel/camel-vee-store.c:352
-#: ../camel/providers/local/camel-maildir-store.c:272
+#: ../camel/camel-store.c:2631 ../camel/camel-vee-store.c:352
+#: ../camel/providers/local/camel-maildir-store.c:300
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "ããããããåéããããã: %s: çåãæäãã"
 
-#: ../camel/camel-store.c:2775 ../camel/camel-vee-store.c:402
-#: ../camel/providers/local/camel-maildir-store.c:712
+#: ../camel/camel-store.c:2774 ../camel/camel-vee-store.c:402
+#: ../camel/providers/local/camel-maildir-store.c:747
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "ãããããåãåæããããã: %s: çåãæäãã"
@@ -2868,122 +2906,138 @@ msgstr "æçãããããããããã"
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ãããã \"%s\" ãæçãããããããã: %s"
 
-#: ../camel/camel-tcp-stream-raw.c:756 ../camel/camel-tcp-stream-raw.c:767
+#: ../camel/camel-tcp-stream-raw.c:303
+#, c-format
+msgid "NSPR error code %d"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-raw.c:640 ../camel/camel-tcp-stream-raw.c:651
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "ãããããããã SOCKS 4 ããããããããããã"
 
-#: ../camel/camel-tcp-stream-raw.c:778
+#: ../camel/camel-tcp-stream-raw.c:662
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr "ããããããããããããããæåãããã: ããã %d"
 
-#: ../camel/camel-tcp-stream-raw.c:874 ../camel/camel-tcp-stream-raw.c:880
+#: ../camel/camel-tcp-stream-raw.c:758 ../camel/camel-tcp-stream-raw.c:764
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "ãããããããã SOCKS 5 ããããããããã"
 
-#: ../camel/camel-tcp-stream-raw.c:886
+#: ../camel/camel-tcp-stream-raw.c:770
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "éåããèèååãèããããããããã: ããã 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:898
+#: ../camel/camel-tcp-stream-raw.c:782
 msgid "General SOCKS server failure"
 msgstr "SOCKS ãããããäèçãåæãã"
 
-#: ../camel/camel-tcp-stream-raw.c:899
+#: ../camel/camel-tcp-stream-raw.c:783
 msgid "SOCKS server's rules do not allow connection"
 msgstr "SOCKS ããããããããèåãããæçãèåããããã"
 
-#: ../camel/camel-tcp-stream-raw.c:900
+#: ../camel/camel-tcp-stream-raw.c:784
 msgid "Network is unreachable from SOCKS server"
 msgstr "SOCKS ãããããããããããããåéããããã"
 
-#: ../camel/camel-tcp-stream-raw.c:901
+#: ../camel/camel-tcp-stream-raw.c:785
 msgid "Host is unreachable from SOCKS server"
 msgstr "SOCKS ããããããããããåéããããã"
 
-#: ../camel/camel-tcp-stream-raw.c:902
+#: ../camel/camel-tcp-stream-raw.c:786
 msgid "Connection refused"
 msgstr "æçãæåããããã"
 
-#: ../camel/camel-tcp-stream-raw.c:903
+#: ../camel/camel-tcp-stream-raw.c:787
 msgid "Time-to-live expired"
 msgstr "Time-to-live ãæéãåãããã"
 
-#: ../camel/camel-tcp-stream-raw.c:904
+#: ../camel/camel-tcp-stream-raw.c:788
 msgid "Command not supported by SOCKS server"
 msgstr "SOCKSããããããããããããããããããã"
 
-#: ../camel/camel-tcp-stream-raw.c:905
+#: ../camel/camel-tcp-stream-raw.c:789
 msgid "Address type not supported by SOCKS server"
 msgstr "SOCKSãããããããããããããããããååãã"
 
-#: ../camel/camel-tcp-stream-raw.c:906
+#: ../camel/camel-tcp-stream-raw.c:790
 msgid "Unknown error from SOCKS server"
 msgstr "SOCKSãããããããäæãããããã"
 
-#: ../camel/camel-tcp-stream-raw.c:939
+#: ../camel/camel-tcp-stream-raw.c:823
 #, c-format
 msgid "Got unknown address type from SOCKS server"
 msgstr "SOCKS ããããããäæãããããååãååãããã"
 
-#: ../camel/camel-tcp-stream-raw.c:957
+#: ../camel/camel-tcp-stream-raw.c:841
 #, c-format
 msgid "Incomplete reply from SOCKS server"
 msgstr "SOCKS ãããããããåçãäååãã"
 
-#: ../camel/camel-tcp-stream-raw.c:977
+#: ../camel/camel-tcp-stream-raw.c:861
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "ãããåãéãããã (255 æåääãããããããããã)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:1009 ../camel/camel-tcp-stream-raw.c:1019
+#: ../camel/camel-tcp-stream-raw.c:893 ../camel/camel-tcp-stream-raw.c:903
 #, c-format
 msgid "Invalid reply from proxy server"
 msgstr "ãããããããããããåçãçåãã"
 
-#: ../camel/camel-tcp-stream-ssl.c:460
-#, c-format
+#: ../camel/camel-tcp-stream-ssl.c:470
+#, fuzzy, c-format
+#| msgid ""
+#| "Issuer:            %s\n"
+#| "Subject:           %s\n"
+#| "Fingerprint:       %s\n"
+#| "Signature:         %s"
 msgid ""
-"Issuer:            %s\n"
-"Subject:           %s\n"
-"Fingerprint:       %s\n"
-"Signature:         %s"
+"   Issuer:       %s\n"
+"   Subject:      %s\n"
+"   Fingerprint:  %s\n"
+"   Signature:    %s"
 msgstr ""
 "çèè:            %s\n"
 "ãããã:          %s\n"
 "æç:              %s\n"
 "çå:              %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:466
+#: ../camel/camel-tcp-stream-ssl.c:476
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-ssl.c:466
+#: ../camel/camel-tcp-stream-ssl.c:476
 msgid "BAD"
 msgstr "BAD"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:470
+#: ../camel/camel-tcp-stream-ssl.c:480
 #, c-format
 msgid ""
-"SSL Certificate check for %s:\n"
+"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
 "\n"
-"%s\n"
-"\n"
-"Do you wish to accept?"
+"Detailed information about the certificate:\n"
+"%s"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-ssl.c:484
+msgid "_Reject"
 msgstr ""
-"%s ã SSL èææããããã:\n"
-"\n"
-"%s\n"
-"\n"
-"åèãããããã?"
 
-#: ../camel/camel-tcp-stream-ssl.c:514
+#: ../camel/camel-tcp-stream-ssl.c:485
+msgid "Accept _Temporarily"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-ssl.c:486
+msgid "_Accept Permanently"
+msgstr ""
+
+#: ../camel/camel-tcp-stream-ssl.c:544
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2992,7 +3046,7 @@ msgstr ""
 "èèåé: %s\n"
 "çèè: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:566
+#: ../camel/camel-tcp-stream-ssl.c:596
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -3001,7 +3055,7 @@ msgstr ""
 "ããããèèãããã: %s\n"
 "çèè: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:584
+#: ../camel/camel-tcp-stream-ssl.c:614
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -3010,7 +3064,7 @@ msgstr ""
 "èææãæåæéåã: %s\n"
 "çèè: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:601
+#: ../camel/camel-tcp-stream-ssl.c:631
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -3024,7 +3078,7 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "'%s' ããã URL ãèæãããããããã"
 
-#: ../camel/camel-vee-folder.c:1286 ../camel/camel-vee-folder.c:1445
+#: ../camel/camel-vee-folder.c:1286 ../camel/camel-vee-folder.c:1443
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "ããããããäæãããããããããããããçåããããããã"
@@ -3063,24 +3117,36 @@ msgstr "ããçãããããããããããããããããããã"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "ããããããããããããããããããããããããã"
 
-#: ../camel/providers/imap/camel-imap-command.c:198
-#: ../camel/providers/imap/camel-imap-command.c:293
+#: ../camel/providers/imap/camel-imap-command.c:200
+#: ../camel/providers/imap/camel-imap-command.c:297
 #, c-format
 msgid "No output stream"
 msgstr "ååããããããããããã"
 
-#: ../camel/providers/imap/camel-imap-command.c:206
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/providers/imap/camel-imap-command.c:208
+#: ../camel/providers/imap/camel-imap-command.c:305
 #, c-format
 msgid "No input stream"
 msgstr "ååããããããããããã"
 
-#: ../camel/providers/imap/camel-imap-command.c:365
+#: ../camel/providers/imap/camel-imap-command.c:382
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "ççãããããæçãåãããã: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:395
+#: ../camel/providers/imap/camel-imap-command.c:415
+#, fuzzy, c-format
+#| msgid ""
+#| "Alert from IMAP server %s %s:\n"
+#| "%s"
+msgid ""
+"Alert from IMAP server %s %s in folder %s:\n"
+"%s"
+msgstr ""
+"IMAP ãããã %s %s ãããèå:\n"
+"%s"
+
+#: ../camel/providers/imap/camel-imap-command.c:419
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -3089,92 +3155,92 @@ msgstr ""
 "IMAP ãããã %s %s ãããèå:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:471
+#: ../camel/providers/imap/camel-imap-command.c:497
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP ããããããæååãåçãããããã: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:483
+#: ../camel/providers/imap/camel-imap-command.c:509
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ãããããåæãããã: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:563
+#: ../camel/providers/imap/camel-imap-command.c:589
 #, c-format
 msgid "Server response ended too soon."
 msgstr "ãããããããããããããããçãããããã"
 
-#: ../camel/providers/imap/camel-imap-command.c:775
+#: ../camel/providers/imap/camel-imap-command.c:801
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ãããããåçã %s æåãåãããããã"
 
-#: ../camel/providers/imap/camel-imap-command.c:813
+#: ../camel/providers/imap/camel-imap-command.c:839
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ããããããæååã OK åçãããããã: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:304
+#: ../camel/providers/imap/camel-imap-folder.c:307
 msgid "Always check for new mail in this folder"
 msgstr "åãããããããããããæçãããããããããã"
 
-#: ../camel/providers/imap/camel-imap-folder.c:380
+#: ../camel/providers/imap/camel-imap-folder.c:383
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "ããããã %s ãäæãããããããã: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:403
+#: ../camel/providers/imap/camel-imap-folder.c:404
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s ãããããããããããããããã"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1078
-#: ../camel/providers/imapx/camel-imapx-server.c:4053
+#: ../camel/providers/imap/camel-imap-folder.c:1074
+#: ../camel/providers/imapx/camel-imapx-server.c:4236
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s ãããããããããèæä"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3419
+#: ../camel/providers/imap/camel-imap-folder.c:3422
 msgid "Unable to retrieve message: "
 msgstr "ããããããååããããã: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3456
-#: ../camel/providers/imapx/camel-imapx-server.c:5327
+#: ../camel/providers/imap/camel-imap-folder.c:3459
+#: ../camel/providers/imapx/camel-imapx-server.c:5484
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "%s ããã ID ãããããããååããããã: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3457
-#: ../camel/providers/imapx/camel-imapx-server.c:5328
+#: ../camel/providers/imap/camel-imap-folder.c:3460
+#: ../camel/providers/imapx/camel-imapx-server.c:5485
 msgid "No such message available."
 msgstr "ãããããããããããåçãããããã"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3532
-#: ../camel/providers/imap/camel-imap-folder.c:4415
+#: ../camel/providers/imap/camel-imap-folder.c:3535
+#: ../camel/providers/imap/camel-imap-folder.c:4411
 #: ../camel/providers/nntp/camel-nntp-folder.c:446
 #, c-format
 msgid "This message is not currently available"
 msgstr "ããããããããçååçããããã"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3996
-#: ../camel/providers/imap/camel-imap-folder.c:4079
-#: ../camel/providers/imapx/camel-imapx-server.c:4011
-#: ../camel/providers/imapx/camel-imapx-server.c:4161
+#: ../camel/providers/imap/camel-imap-folder.c:3992
+#: ../camel/providers/imap/camel-imap-folder.c:4075
+#: ../camel/providers/imapx/camel-imapx-server.c:4194
+#: ../camel/providers/imapx/camel-imapx-server.c:4344
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "%s ãããæçãããããããããæåãåæä"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4213
+#: ../camel/providers/imap/camel-imap-folder.c:4209
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "äååããããããåç: ããããã %d ãæåãæäãããããããã"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4223
+#: ../camel/providers/imap/camel-imap-folder.c:4219
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "äååããããããåç: ããããã %d ã UID ãæäãããããããã"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4455
+#: ../camel/providers/imap/camel-imap-folder.c:4451
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH åçããããããæäãããããããããã"
@@ -3205,12 +3271,12 @@ msgid "Checking for New Mail"
 msgstr "æçãããããããã"
 
 #: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "C_heck for new messages in all folders"
 msgstr "ããããããããããæçãããããããããã(_H)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "èèããããããããããæçãããããããããã(_E)"
 
@@ -3311,140 +3377,140 @@ msgstr ""
 "ããã"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:224
-#: ../camel/providers/imap/camel-imap-store.c:2582
-#: ../camel/providers/imapx/camel-imapx-store.c:368
-#: ../camel/providers/imapx/camel-imapx-store.c:824
-#: ../camel/providers/local/camel-maildir-folder.c:464
-#: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:619
-#: ../camel/providers/local/camel-maildir-store.c:625
-#: ../camel/providers/local/camel-maildir-store.c:713
-#: ../camel/providers/local/camel-spool-store.c:328
+#: ../camel/providers/imap/camel-imap-store.c:268
+#: ../camel/providers/imap/camel-imap-store.c:2646
+#: ../camel/providers/imapx/camel-imapx-store.c:367
+#: ../camel/providers/imapx/camel-imapx-store.c:823
+#: ../camel/providers/local/camel-maildir-folder.c:471
+#: ../camel/providers/local/camel-maildir-store.c:301
+#: ../camel/providers/local/camel-maildir-store.c:658
+#: ../camel/providers/local/camel-maildir-store.c:664
+#: ../camel/providers/local/camel-maildir-store.c:748
+#: ../camel/providers/local/camel-spool-store.c:378
 msgid "Inbox"
 msgstr "åäç"
 
-#: ../camel/providers/imap/camel-imap-store.c:355
-#: ../camel/providers/imap/camel-imap-store.c:402
-#: ../camel/providers/imapx/camel-imapx-server.c:3060
+#: ../camel/providers/imap/camel-imap-store.c:401
+#: ../camel/providers/imap/camel-imap-store.c:449
+#: ../camel/providers/imapx/camel-imapx-server.c:3235
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "ããããããäèããããããã IMAP ãããã %s ããæçãåæãããã: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:356
-#: ../camel/providers/imapx/camel-imapx-server.c:3061
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/imap/camel-imap-store.c:402
+#: ../camel/providers/imapx/camel-imapx-server.c:3236
+#: ../camel/providers/smtp/camel-smtp-transport.c:189
 msgid "STARTTLS not supported"
 msgstr "STARTTLS æåãããããããããããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:375
-#: ../camel/providers/imapx/camel-imapx-server.c:3099
+#: ../camel/providers/imap/camel-imap-store.c:422
+#: ../camel/providers/imapx/camel-imapx-server.c:3276
 #, fuzzy, c-format
 #| msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr ""
 "ããããããäèããããããã IMAP ãããã %s ããæçãåæãããã: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:636
-#: ../camel/providers/imapx/camel-imapx-server.c:3163
+#: ../camel/providers/imap/camel-imap-store.c:704
+#: ../camel/providers/imapx/camel-imapx-server.c:3347
 #, fuzzy, c-format
 #| msgid "IMAP server %s does not support requested authentication type %s"
 msgid "IMAP server %s does not support %s authentication"
 msgstr "IMAP ããããã %s ãã %s ãããèèãããããããããããããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:693
-#: ../camel/providers/imapx/camel-imapx-store.c:147
+#: ../camel/providers/imap/camel-imap-store.c:771
+#: ../camel/providers/imapx/camel-imapx-store.c:154
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP ãããã %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:696
-#: ../camel/providers/imapx/camel-imapx-store.c:150
+#: ../camel/providers/imap/camel-imap-store.c:774
+#: ../camel/providers/imapx/camel-imapx-store.c:157
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s ã %s ããã IMAP ãããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:984
-#: ../camel/providers/imapx/camel-imapx-server.c:3192
-#: ../camel/providers/nntp/camel-nntp-store.c:481
+#: ../camel/providers/imap/camel-imap-store.c:1068
+#: ../camel/providers/imapx/camel-imapx-server.c:3376
+#: ../camel/providers/nntp/camel-nntp-store.c:497
 #, fuzzy
 #| msgid "Cannot authenticate to server: %s"
 msgid "Cannot authenticate without a username"
 msgstr "ãããããèèãèãããã: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:992
-#: ../camel/providers/imapx/camel-imapx-server.c:3200
-#: ../camel/providers/nntp/camel-nntp-store.c:489
-#: ../camel/providers/pop3/camel-pop3-store.c:440
-#: ../camel/providers/pop3/camel-pop3-store.c:459
+#: ../camel/providers/imap/camel-imap-store.c:1076
+#: ../camel/providers/imapx/camel-imapx-server.c:3384
+#: ../camel/providers/nntp/camel-nntp-store.c:505
+#: ../camel/providers/pop3/camel-pop3-store.c:468
+#: ../camel/providers/pop3/camel-pop3-store.c:487
 #, fuzzy
 #| msgid "Authentication Failed"
 msgid "Authentication password not available"
 msgstr "èèãåæãããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:1953
-#: ../camel/providers/imap/camel-imap-store.c:2157
-#: ../camel/providers/imapx/camel-imapx-store.c:343
+#: ../camel/providers/imap/camel-imap-store.c:2017
+#: ../camel/providers/imap/camel-imap-store.c:2221
+#: ../camel/providers/imapx/camel-imapx-store.c:342
 #, c-format
 msgid "No such folder %s"
 msgstr "ãããããããããã %s ãããããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:1967
-#: ../camel/providers/imap/camel-imap-store.c:2426
-#: ../camel/providers/imapx/camel-imapx-store.c:1355
+#: ../camel/providers/imap/camel-imap-store.c:2031
+#: ../camel/providers/imap/camel-imap-store.c:2490
+#: ../camel/providers/imapx/camel-imapx-store.c:1354
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "\"%s\" ããããããããåã \"%c\" ãããæåãåãããããããããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:2031
-#: ../camel/providers/imap/camel-imap-store.c:2490
-#: ../camel/providers/imapx/camel-imapx-store.c:1376
+#: ../camel/providers/imap/camel-imap-store.c:2095
+#: ../camel/providers/imap/camel-imap-store.c:2554
+#: ../camel/providers/imapx/camel-imapx-store.c:1375
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "èãããããããèæãããããããããåãããããããããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:2084
-#: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:424
-#: ../camel/providers/local/camel-mh-store.c:550
+#: ../camel/providers/imap/camel-imap-store.c:2148
+#: ../camel/providers/local/camel-maildir-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:421
+#: ../camel/providers/local/camel-mh-store.c:557
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "'%s' ãããããããããäæããããã: æãååãããããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:2439
-#: ../camel/providers/imapx/camel-imapx-store.c:1366
+#: ../camel/providers/imap/camel-imap-store.c:2503
+#: ../camel/providers/imapx/camel-imapx-store.c:1365
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "èããããããçåããããã: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3195
+#: ../camel/providers/imap/camel-imap-store.c:3275
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "ççãããããæçãåãããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:3198
+#: ../camel/providers/imap/camel-imap-store.c:3278
 msgid "Server unexpectedly disconnected: "
 msgstr "ççããããããåæããããã: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:91
+#: ../camel/providers/imapx/camel-imapx-folder.c:90
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "%s ããããããããããäæãããããããã"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:99
+#: ../camel/providers/imapx/camel-imapx-folder.c:98
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "%s ãããããããçæãããããããã: "
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "Use _Quick Resync if the server supports it"
 msgstr "ãããããããããããããã Quick Resync ãäçãã(_Q)"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Use I_dle if the server supports it"
-msgstr "ãããããããããããããã Idle ãäçãã(_D)"
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
+msgid "_Listen for server change notifications"
+msgstr ""
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "Command:"
@@ -3466,26 +3532,26 @@ msgstr ""
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1517
+#: ../camel/providers/imapx/camel-imapx-server.c:1542
 msgid "Error writing to cache stream: "
 msgstr "ãããããããããããæãèãäãããã: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2227
+#: ../camel/providers/imapx/camel-imapx-server.c:2345
 #, c-format
 msgid "Not authenticated"
 msgstr "èèããããããã"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3447
+#: ../camel/providers/imapx/camel-imapx-server.c:3630
 msgid "Closing tmp stream failed: "
 msgstr "äæçãããããããããããåæãããã: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5473
-#: ../camel/providers/imapx/camel-imapx-server.c:5488
+#: ../camel/providers/imapx/camel-imapx-server.c:5630
+#: ../camel/providers/imapx/camel-imapx-server.c:5645
 msgid "Cannot create spool file: "
 msgstr "ãããããããããäæããããã: "
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1143
-#: ../camel/providers/nntp/camel-nntp-store.c:1756
+#: ../camel/providers/imapx/camel-imapx-store.c:1142
+#: ../camel/providers/nntp/camel-nntp-store.c:1772
 #, c-format
 msgid "No such folder: %s"
 msgstr "ãããããããããããããããã: %s"
@@ -3500,27 +3566,27 @@ msgstr "ãããããããããããããèããããããã"
 msgid "Source stream unavailable"
 msgstr "ãããããããããåçããããã"
 
-#: ../camel/providers/local/camel-local-folder.c:178
+#: ../camel/providers/local/camel-local-folder.c:187
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:188
 #: ../camel/providers/local/camel-local-folder.c:197
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "mailbox: %s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:206
+#: ../camel/providers/local/camel-local-folder.c:215
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:473
+#: ../camel/providers/local/camel-local-folder.c:479
 msgid "Index message body data"
 msgstr "ãããææããããããããäæãã"
 
-#: ../camel/providers/local/camel-local-folder.c:704
+#: ../camel/providers/local/camel-local-folder.c:710
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3588,228 +3654,228 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "ææçã UNIX ã mbox ååããããããããããã"
 
-#: ../camel/providers/local/camel-local-store.c:92
+#: ../camel/providers/local/camel-local-store.c:98
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "ãããããã %s ãã %s ãåååæãããããããã: %s"
 
-#: ../camel/providers/local/camel-local-store.c:184
+#: ../camel/providers/local/camel-local-store.c:177
 #, c-format
 msgid "Local mail file %s"
 msgstr "ããããããããããããã %s"
 
-#: ../camel/providers/local/camel-local-store.c:215
-#: ../camel/providers/local/camel-local-store.c:357
-#: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:542
-#: ../camel/providers/local/camel-spool-store.c:574
+#: ../camel/providers/local/camel-local-store.c:212
+#: ../camel/providers/local/camel-local-store.c:363
+#: ../camel/providers/local/camel-maildir-store.c:101
+#: ../camel/providers/local/camel-mbox-store.c:547
+#: ../camel/providers/local/camel-spool-store.c:85
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "äåããããã %s ãçåããããããããã"
 
-#: ../camel/providers/local/camel-local-store.c:224
+#: ../camel/providers/local/camel-local-store.c:221
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "äåããããã %s ãéåããããããããããããã"
 
-#: ../camel/providers/local/camel-local-store.c:235
-#: ../camel/providers/local/camel-local-store.c:245
-#: ../camel/providers/local/camel-local-store.c:370
-#: ../camel/providers/local/camel-maildir-store.c:124
+#: ../camel/providers/local/camel-local-store.c:232
+#: ../camel/providers/local/camel-local-store.c:242
+#: ../camel/providers/local/camel-local-store.c:376
+#: ../camel/providers/local/camel-maildir-store.c:133
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "ããããããååããããã: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:277
+#: ../camel/providers/local/camel-local-store.c:274
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "ããããããäåããåäçãæãããã"
 
-#: ../camel/providers/local/camel-local-store.c:415
-#: ../camel/providers/local/camel-mbox-store.c:716
+#: ../camel/providers/local/camel-local-store.c:431
+#: ../camel/providers/local/camel-mbox-store.c:721
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "'%s' ãããããããããããããããåéãããããããã: %s"
 
-#: ../camel/providers/local/camel-local-store.c:443
-#: ../camel/providers/local/camel-mbox-store.c:746
+#: ../camel/providers/local/camel-local-store.c:459
+#: ../camel/providers/local/camel-mbox-store.c:751
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "'%s' ãããããããããããåéãããããããã: %s"
 
-#: ../camel/providers/local/camel-local-store.c:529
+#: ../camel/providers/local/camel-local-store.c:565
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' ãååãåæãããããããã: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:534
+#: ../camel/providers/local/camel-local-summary.c:527
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ããããããããããèåããããã: ååãäæãã"
 
 #: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:333
+#: ../camel/providers/local/camel-maildir-folder.c:336
 #: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:325
-#: ../camel/providers/local/camel-mh-folder.c:156
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mh-folder.c:160
 msgid "No such message"
 msgstr "ãããããããããããããããã"
 
-#: ../camel/providers/local/camel-maildir-folder.c:223
+#: ../camel/providers/local/camel-maildir-folder.c:226
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
 msgstr "Maildir ååãããããããããããããèåããããã: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:271
-#: ../camel/providers/local/camel-maildir-folder.c:281
-#: ../camel/providers/local/camel-mbox-folder.c:386
-#: ../camel/providers/local/camel-mh-folder.c:168
-#: ../camel/providers/local/camel-mh-folder.c:178
+#: ../camel/providers/local/camel-maildir-folder.c:274
+#: ../camel/providers/local/camel-maildir-folder.c:284
+#: ../camel/providers/local/camel-mbox-folder.c:390
+#: ../camel/providers/local/camel-mh-folder.c:172
+#: ../camel/providers/local/camel-mh-folder.c:182
 #, c-format
 msgid "Cannot get message %s from folder %s: "
 msgstr "ããããã %s ãããããã %s ããååããããã: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:351
+#: ../camel/providers/local/camel-maildir-folder.c:354
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
 msgstr "æåãããããããããããããèéããããã: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:100
+#: ../camel/providers/local/camel-maildir-store.c:109
 #, c-format
 msgid "Cannot create folder: %s : Folder name cannot contain a dot"
 msgstr ""
 "ããããããäæããããã: %s: ãããããåãããããåããããããããã"
 
-#: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:730
+#: ../camel/providers/local/camel-maildir-store.c:118
+#: ../camel/providers/local/camel-maildir-store.c:765
 #, c-format
 msgid "Folder %s already exists"
 msgstr "æãããããã %s ããããã"
 
-#: ../camel/providers/local/camel-maildir-store.c:191
-#: ../camel/providers/local/camel-maildir-store.c:222
-#: ../camel/providers/local/camel-mbox-store.c:392
-#: ../camel/providers/local/camel-mbox-store.c:406
+#: ../camel/providers/local/camel-maildir-store.c:209
+#: ../camel/providers/local/camel-maildir-store.c:240
+#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:403
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "'%s' ãããããããããäæããããã: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:206
-#: ../camel/providers/local/camel-mbox-store.c:358
-#: ../camel/providers/local/camel-mh-store.c:505
+#: ../camel/providers/local/camel-maildir-store.c:224
+#: ../camel/providers/local/camel-mbox-store.c:355
+#: ../camel/providers/local/camel-mh-store.c:512
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "'%s' ãããããããããååããããã: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:368
-#: ../camel/providers/local/camel-mh-store.c:514
+#: ../camel/providers/local/camel-maildir-store.c:230
+#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../camel/providers/local/camel-mh-store.c:521
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "'%s' ãããããããããååããããã: ããããããååããããã"
 
-#: ../camel/providers/local/camel-maildir-store.c:239
+#: ../camel/providers/local/camel-maildir-store.c:257
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr ""
 "'%s' ãããããããããååããããã: maildir ããããããååããããã"
 
-#: ../camel/providers/local/camel-maildir-store.c:293
-#: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:652
+#: ../camel/providers/local/camel-maildir-store.c:321
+#: ../camel/providers/local/camel-maildir-store.c:361
+#: ../camel/providers/local/camel-mh-store.c:664
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "'%s' ãããããããããåéãããããããã: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:295
+#: ../camel/providers/local/camel-maildir-store.c:323
 msgid "not a maildir directory"
 msgstr "maildir ååããããããããããããã"
 
-#: ../camel/providers/local/camel-maildir-store.c:510
-#: ../camel/providers/local/camel-maildir-store.c:887
-#: ../camel/providers/local/camel-spool-store.c:161
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-maildir-store.c:556
+#: ../camel/providers/local/camel-maildir-store.c:952
+#: ../camel/providers/local/camel-spool-store.c:204
+#: ../camel/providers/local/camel-spool-store.c:223
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "'%s' ããããããããããããããããããããã: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:721
+#: ../camel/providers/local/camel-maildir-store.c:756
 #, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
 msgstr ""
 "ããããããååãåæããããã: %s: ãããããåãããããåããããããã"
 "ãã"
 
-#: ../camel/providers/local/camel-maildir-summary.c:438
-#: ../camel/providers/local/camel-maildir-summary.c:571
+#: ../camel/providers/local/camel-maildir-summary.c:413
+#: ../camel/providers/local/camel-maildir-summary.c:546
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir ãããããããããéããããããã: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:562
+#: ../camel/providers/local/camel-maildir-summary.c:537
 msgid "Checking folder consistency"
 msgstr "ããããããæåæãçèä"
 
-#: ../camel/providers/local/camel-maildir-summary.c:655
+#: ../camel/providers/local/camel-maildir-summary.c:630
 msgid "Checking for new messages"
 msgstr "æãããããããããããã"
 
-#: ../camel/providers/local/camel-maildir-summary.c:750
-#: ../camel/providers/local/camel-mbox-summary.c:486
-#: ../camel/providers/local/camel-mbox-summary.c:717
-#: ../camel/providers/local/camel-mbox-summary.c:863
+#: ../camel/providers/local/camel-maildir-summary.c:725
+#: ../camel/providers/local/camel-mbox-summary.c:418
+#: ../camel/providers/local/camel-mbox-summary.c:649
+#: ../camel/providers/local/camel-mbox-summary.c:795
 #: ../camel/providers/local/camel-spool-summary.c:130
 msgid "Storing folder"
 msgstr "ããããããæçãã"
 
-#: ../camel/providers/local/camel-mbox-folder.c:183
+#: ../camel/providers/local/camel-mbox-folder.c:187
 #, c-format
 msgid "Cannot open mailbox: %s: "
 msgstr "mailbox ãéãããã: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:249
+#: ../camel/providers/local/camel-mbox-folder.c:253
 #, c-format
 msgid "Cannot append message to mbox file: %s: "
 msgstr "mbox ãããããããããããèåããããã: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:378
+#: ../camel/providers/local/camel-mbox-folder.c:382
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ããããããååããããããããççããããããã"
 
-#: ../camel/providers/local/camel-mbox-folder.c:436
-#: ../camel/providers/local/camel-spool-folder.c:71
+#: ../camel/providers/local/camel-mbox-folder.c:439
+#: ../camel/providers/local/camel-spool-folder.c:70
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "%s ãããããããããããçæããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:380
-#: ../camel/providers/local/camel-mbox-store.c:550
+#: ../camel/providers/local/camel-mbox-store.c:377
+#: ../camel/providers/local/camel-mbox-store.c:555
 #, c-format
 msgid "Cannot create a folder by this name."
 msgstr "ãããããååãããããããäæãããããã"
 
-#: ../camel/providers/local/camel-mbox-store.c:417
+#: ../camel/providers/local/camel-mbox-store.c:414
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "'%s' ãããããããããååããããã: éåããããããããããããã"
 
-#: ../camel/providers/local/camel-mbox-store.c:566
+#: ../camel/providers/local/camel-mbox-store.c:571
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "'%s' ãããããããããäæããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:582
+#: ../camel/providers/local/camel-mbox-store.c:587
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ããããããäæããããã: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:584
+#: ../camel/providers/local/camel-mbox-store.c:589
 msgid "Folder already exists"
 msgstr "æããããããããããã"
 
-#: ../camel/providers/local/camel-mbox-store.c:627
-#: ../camel/providers/local/camel-mbox-store.c:640
-#: ../camel/providers/local/camel-mbox-store.c:669
+#: ../camel/providers/local/camel-mbox-store.c:632
+#: ../camel/providers/local/camel-mbox-store.c:645
+#: ../camel/providers/local/camel-mbox-store.c:674
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3818,89 +3884,89 @@ msgstr ""
 "'%s' ãããããããããåéãããããããã:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:650
+#: ../camel/providers/local/camel-mbox-store.c:655
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' ãéåããããããããããããã"
 
-#: ../camel/providers/local/camel-mbox-store.c:659
+#: ../camel/providers/local/camel-mbox-store.c:664
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "'%s' ãããããããããçããããããåéããããã"
 
-#: ../camel/providers/local/camel-mbox-store.c:686
-#: ../camel/providers/local/camel-mbox-store.c:701
+#: ../camel/providers/local/camel-mbox-store.c:691
+#: ../camel/providers/local/camel-mbox-store.c:706
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "'%s' ããããããããããããåéãããããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:783
+#: ../camel/providers/local/camel-mbox-store.c:788
 #, c-format
 msgid "The new folder name is illegal."
 msgstr "æããããããããååãæãããããããã"
 
-#: ../camel/providers/local/camel-mbox-store.c:799
+#: ../camel/providers/local/camel-mbox-store.c:804
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "'%s' ãååãåæãããããããã: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:882
+#: ../camel/providers/local/camel-mbox-store.c:887
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s' ãã %s ãååãåæãããããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:496
+#: ../camel/providers/local/camel-mbox-summary.c:428
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "ããããããéããããããã: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:558
+#: ../camel/providers/local/camel-mbox-summary.c:490
 #, c-format
 msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "ããããã %2$s ã %1$s äèãèåçããããææèæããããã"
 
-#: ../camel/providers/local/camel-mbox-summary.c:642
+#: ../camel/providers/local/camel-mbox-summary.c:574
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "ããããããããããããããã: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:730
-#: ../camel/providers/local/camel-mbox-summary.c:872
+#: ../camel/providers/local/camel-mbox-summary.c:662
+#: ../camel/providers/local/camel-mbox-summary.c:804
 #: ../camel/providers/local/camel-spool-summary.c:137
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ãããããéããããããã: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:744
+#: ../camel/providers/local/camel-mbox-summary.c:676
 #: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "äæçã mailbox ãéããããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:761
-#: ../camel/providers/local/camel-mbox-summary.c:988
+#: ../camel/providers/local/camel-mbox-summary.c:693
+#: ../camel/providers/local/camel-mbox-summary.c:920
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "åãããããã %s ãéããããããããããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:772
+#: ../camel/providers/local/camel-mbox-summary.c:704
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "äæçããããããéããããããããããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:789
+#: ../camel/providers/local/camel-mbox-summary.c:721
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "ãããããåãåæãããããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:1154
+#: ../camel/providers/local/camel-mbox-summary.c:818
+#: ../camel/providers/local/camel-mbox-summary.c:1086
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "ããããããäåãããããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:925
-#: ../camel/providers/local/camel-mbox-summary.c:1185
+#: ../camel/providers/local/camel-mbox-summary.c:857
+#: ../camel/providers/local/camel-mbox-summary.c:1117
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -3909,65 +3975,81 @@ msgstr ""
 "MBOX ãããããåããããã (ååäãèãåããããããããããããããã)ã"
 "äæããããããã"
 
-#: ../camel/providers/local/camel-mbox-summary.c:934
-#: ../camel/providers/local/camel-mbox-summary.c:1194
+#: ../camel/providers/local/camel-mbox-summary.c:866
+#: ../camel/providers/local/camel-mbox-summary.c:1126
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "ããããããããããäèããããããã (åæããã)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1099
+#: ../camel/providers/local/camel-mbox-summary.c:1031
 #: ../camel/providers/local/camel-spool-summary.c:345
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ååäæãããã: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1252
-#: ../camel/providers/local/camel-mbox-summary.c:1282
+#: ../camel/providers/local/camel-mbox-summary.c:1184
+#: ../camel/providers/local/camel-mbox-summary.c:1214
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "äæçã mailbox ãæãèããããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1271
+#: ../camel/providers/local/camel-mbox-summary.c:1203
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "äæçã mailbox ãæãèããããããã: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:115
+#: ../camel/providers/local/camel-mh-folder.c:119
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
 msgstr "MH ååããããããããããããèåããããã: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:525
+#: ../camel/providers/local/camel-mh-store.c:532
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "'%s' ãããããããããäæãããããããã: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:542
+#: ../camel/providers/local/camel-mh-store.c:549
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "'%s' ãããããããããååããããã: ããããããããããããã"
 
-#: ../camel/providers/local/camel-mh-summary.c:227
+#: ../camel/providers/local/camel-mh-summary.c:226
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "MH ãããããããããéãããã: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:350
+#: ../camel/providers/local/camel-spool-store.c:94
+#, c-format
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "'%s' ããããããããéãããã: %s"
+
+#: ../camel/providers/local/camel-spool-store.c:108
+#, c-format
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "'%s' ããããããããéåãããããããããããããããããããã"
+
+#: ../camel/providers/local/camel-spool-store.c:407
 #, c-format
 msgid "Spool mail file %s"
 msgstr "ããããããããããããã %s"
 
-#: ../camel/providers/local/camel-spool-store.c:353
+#: ../camel/providers/local/camel-spool-store.c:411
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "ãããããããããããããã %s"
 
-#: ../camel/providers/local/camel-spool-store.c:394
+#: ../camel/providers/local/camel-spool-store.c:414
+#, fuzzy
+#| msgid "Invalid source"
+msgid "Invalid spool"
+msgstr "ããããçåãã"
+
+#: ../camel/providers/local/camel-spool-store.c:469
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "'%s/%s' ãããããããããååããããã"
 
-#: ../camel/providers/local/camel-spool-store.c:408
+#: ../camel/providers/local/camel-spool-store.c:482
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3976,12 +4058,12 @@ msgstr ""
 "'%s' ãããããããããéããããããã:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:414
+#: ../camel/providers/local/camel-spool-store.c:488
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "'%s' ãããããããããååããããã"
 
-#: ../camel/providers/local/camel-spool-store.c:421
+#: ../camel/providers/local/camel-spool-store.c:495
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3990,36 +4072,26 @@ msgstr ""
 "'%s' ãããããããããäæãããããããã:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:433
+#: ../camel/providers/local/camel-spool-store.c:507
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' ããããããããããããããããããããã"
 
-#: ../camel/providers/local/camel-spool-store.c:481
+#: ../camel/providers/local/camel-spool-store.c:569
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "åäçããæçããããããããããã"
 
-#: ../camel/providers/local/camel-spool-store.c:495
+#: ../camel/providers/local/camel-spool-store.c:588
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "ãããããããããããåéããããã"
 
-#: ../camel/providers/local/camel-spool-store.c:510
+#: ../camel/providers/local/camel-spool-store.c:603
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "ãããããããããããååãåæããããã"
 
-#: ../camel/providers/local/camel-spool-store.c:583
-#, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "'%s' ããããããããéãããã: %s"
-
-#: ../camel/providers/local/camel-spool-store.c:599
-#, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "'%s' ããããããããéåãããããããããããããããããããã"
-
 #: ../camel/providers/local/camel-spool-summary.c:168
 #: ../camel/providers/local/camel-spool-summary.c:180
 #: ../camel/providers/local/camel-spool-summary.c:192
@@ -4052,17 +4124,17 @@ msgstr "åéããã: UID ãæåãçåãã: %s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:271
 #: ../camel/providers/nntp/camel-nntp-folder.c:275
-#: ../camel/providers/pop3/camel-pop3-folder.c:434
-#: ../camel/providers/pop3/camel-pop3-folder.c:699
+#: ../camel/providers/pop3/camel-pop3-folder.c:443
+#: ../camel/providers/pop3/camel-pop3-folder.c:724
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "ããããã %s ãååããããã: %s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:282
 #: ../camel/providers/nntp/camel-nntp-folder.c:457
-#: ../camel/providers/pop3/camel-pop3-folder.c:372
-#: ../camel/providers/pop3/camel-pop3-folder.c:424
-#: ../camel/providers/pop3/camel-pop3-folder.c:443
+#: ../camel/providers/pop3/camel-pop3-folder.c:381
+#: ../camel/providers/pop3/camel-pop3-folder.c:433
+#: ../camel/providers/pop3/camel-pop3-folder.c:452
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "ããããã %s ãååããããã: "
@@ -4122,22 +4194,22 @@ msgstr ""
 "ããããããããããããããããããããããããäãã NNTP ãããããèèã"
 "ããã"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:278
+#: ../camel/providers/nntp/camel-nntp-store.c:285
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "%s ãããææãèãããããããããããã: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:291
+#: ../camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP ãããã %s ããããããã %d ãèãããã: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:453
+#: ../camel/providers/nntp/camel-nntp-store.c:464
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s ççã USENET ãããã"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1038
+#: ../camel/providers/nntp/camel-nntp-store.c:1054
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4148,26 +4220,26 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1131
+#: ../camel/providers/nntp/camel-nntp-store.c:1147
 #, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "ãããããããããããããããçæããããã: äãããèèãçèããããã"
 "ãã"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1147
+#: ../camel/providers/nntp/camel-nntp-store.c:1163
 #, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "ããããæçåæããããããåãåæãããããã"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1170
+#: ../camel/providers/nntp/camel-nntp-store.c:1186
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "ããããæçåæãããããããåéããããã: äãããèèãåæããããã"
 "ãã"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1368
+#: ../camel/providers/nntp/camel-nntp-store.c:1384
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4179,7 +4251,7 @@ msgstr ""
 "ããããããããããããããããããããéæãããããããèãããããããã"
 "ãããããããã"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1419
+#: ../camel/providers/nntp/camel-nntp-store.c:1435
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4190,68 +4262,68 @@ msgstr ""
 "\n"
 "ãããããããããããããã!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1613
+#: ../camel/providers/nntp/camel-nntp-store.c:1629
 msgid "NNTP Command failed: "
 msgstr "NNTP ãããããåæãããã: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1698
+#: ../camel/providers/nntp/camel-nntp-store.c:1714
 #, c-format
 msgid "Not connected."
 msgstr "æçããããããã"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:237
-#: ../camel/providers/nntp/camel-nntp-summary.c:350
+#: ../camel/providers/nntp/camel-nntp-summary.c:192
+#: ../camel/providers/nntp/camel-nntp-summary.c:312
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: æããããããããèæä"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:253
+#: ../camel/providers/nntp/camel-nntp-summary.c:208
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover ããæååãåçãããããã: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:366
+#: ../camel/providers/nntp/camel-nntp-summary.c:328
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "head ããæååãåçãããããã: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:411
+#: ../camel/providers/nntp/camel-nntp-summary.c:373
 #, c-format
 msgid "Operation failed: %s"
 msgstr "æäãåæãããã: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:289
-#: ../camel/providers/pop3/camel-pop3-folder.c:348
+#: ../camel/providers/pop3/camel-pop3-folder.c:290
+#: ../camel/providers/pop3/camel-pop3-folder.c:349
 #, c-format
 msgid "No message with UID %s"
 msgstr "UID %s ãããããããããããã"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:356
+#: ../camel/providers/pop3/camel-pop3-folder.c:365
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "ããããã %d ã POP ãååä"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:435
+#: ../camel/providers/pop3/camel-pop3-folder.c:444
 msgid "Unknown reason"
 msgstr "ååäæ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:475
+#: ../camel/providers/pop3/camel-pop3-folder.c:492
 msgid "Retrieving POP summary"
 msgstr "POP ããããååä"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:490
+#: ../camel/providers/pop3/camel-pop3-folder.c:507
 #, fuzzy
 #| msgid "Cannot get POP summary: %s"
 msgid "Cannot get POP summary: "
 msgstr "POP ããããååããããã: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:560
+#: ../camel/providers/pop3/camel-pop3-folder.c:576
 msgid "Expunging old messages"
-msgstr "åéæãããããããææä"
+msgstr "åãããããããææä"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:572
+#: ../camel/providers/pop3/camel-pop3-folder.c:596
 msgid "Expunging deleted messages"
-msgstr "åéæããããããããææä"
+msgstr "ãããããåéæããããããããææä"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
 #, fuzzy
@@ -4310,63 +4382,63 @@ msgid ""
 "claim to support it."
 msgstr ""
 "ãããããããã APOP ãããããççãæååãããããããããäãã POP ãã"
-"ãããæçãããããããååããããããèæãããããããããããããããã"
-"ãæåãåäãããããããããããã"
+"ãããæçããããããããããã APOP ååãèããããããããããããããã"
+"ããããããããæåãåäãããããããããããã"
 
 #. Translators: This is the separator between an error and an explanation
 #: ../camel/providers/pop3/camel-pop3-store.c:83
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:130
+#: ../camel/providers/pop3/camel-pop3-store.c:133
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "POP ãããã %s ããååãææãèãèããåæãããã"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:149
+#: ../camel/providers/pop3/camel-pop3-store.c:152
 #, 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:150
+#: ../camel/providers/pop3/camel-pop3-store.c:153
 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:168
+#: ../camel/providers/pop3/camel-pop3-store.c:171
 #, 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:181
+#: ../camel/providers/pop3/camel-pop3-store.c:184
 #, fuzzy, c-format
 #| msgid "Failed to connect to POP server %s in secure mode: %s"
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr ""
 "ããããããäèããããããã POP ãããã %s ããæçãåæãããã: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:272
+#: ../camel/providers/pop3/camel-pop3-store.c:280
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP ãããã %s ãããããããããã: SASL ããããããããããã"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:295
+#: ../camel/providers/pop3/camel-pop3-store.c:302
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "POP ãããã %s ãèèãåæãããã: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:334
+#: ../camel/providers/pop3/camel-pop3-store.c:347
 #, c-format
 msgid "POP3 server %s"
 msgstr "POP ãããã %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:337
+#: ../camel/providers/pop3/camel-pop3-store.c:350
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "%s ã %s ããã POP ãããã"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:472
+#: ../camel/providers/pop3/camel-pop3-store.c:500
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4375,7 +4447,7 @@ msgstr ""
 "POP ãããã %s ãæçããããã:\tçåã APOP ID ãåãåãããã; èçææ"
 "ãåèæãããããççèãéçããããããã"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:520
+#: ../camel/providers/pop3/camel-pop3-store.c:548
 #, fuzzy, c-format
 #| msgid ""
 #| "Unable to connect to POP server %s.\n"
@@ -4389,7 +4461,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:535
+#: ../camel/providers/pop3/camel-pop3-store.c:563
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4398,17 +4470,17 @@ msgstr ""
 "POP ãããã %s ãæçãããããã\n"
 "ããããåãéääãããã%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:584
+#: ../camel/providers/pop3/camel-pop3-store.c:617
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "POP ãããã %s ãæçãããããããã"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:611
+#: ../camel/providers/pop3/camel-pop3-store.c:643
 #, c-format
 msgid "No such folder '%s'."
 msgstr "'%s' ãããããããããååããããã"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:628
+#: ../camel/providers/pop3/camel-pop3-store.c:660
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "POP3 ããããããããããéåæéãæãããã"
@@ -4488,226 +4560,226 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "SMTP ãäãããããããããããããæçãããããããããéäãããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:145
-#: ../camel/providers/smtp/camel-smtp-transport.c:152
+#: ../camel/providers/smtp/camel-smtp-transport.c:147
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
 msgid "Welcome response error: "
 msgstr "Welcome åçããã: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:188
 #, 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:195
-#: ../camel/providers/smtp/camel-smtp-transport.c:208
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:217
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS ãããããåæãããã: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:225
+#: ../camel/providers/smtp/camel-smtp-transport.c:228
 #, fuzzy, c-format
 #| msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr ""
 "ããããããäèããããããã SMTP ãããã %s ããæçãåæãããã: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
+#: ../camel/providers/smtp/camel-smtp-transport.c:279
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ãããã %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:275
+#: ../camel/providers/smtp/camel-smtp-transport.c:282
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s ççã SMTP ããããéäããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:335
+#: ../camel/providers/smtp/camel-smtp-transport.c:346
 #, fuzzy, c-format
 #| msgid "SMTP server %s does not support requested authentication type %s."
 msgid "SMTP server %s does not support %s authentication"
 msgstr "SMTP ãããã %s ãèæããèèæå %s ãããããããããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:410
+#: ../camel/providers/smtp/camel-smtp-transport.c:421
 #, c-format
 msgid "No SASL mechanism was specified"
 msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:423
+#: ../camel/providers/smtp/camel-smtp-transport.c:434
 msgid "SMTP Authentication"
 msgstr "SMTP èè"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:442
 #: ../camel/providers/smtp/camel-smtp-transport.c:453
-#: ../camel/providers/smtp/camel-smtp-transport.c:466
+#: ../camel/providers/smtp/camel-smtp-transport.c:464
+#: ../camel/providers/smtp/camel-smtp-transport.c:477
 msgid "AUTH command failed: "
 msgstr "AUTH ãããããåæãããã: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:607
+#: ../camel/providers/smtp/camel-smtp-transport.c:618
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "ããããããéäããããã: ãããããæçãããããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:614
+#: ../camel/providers/smtp/camel-smtp-transport.c:625
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ããããããéäããããã: ååäããããããæãããããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:618
+#: ../camel/providers/smtp/camel-smtp-transport.c:629
 msgid "Sending message"
 msgstr "ããããããéää"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:643
+#: ../camel/providers/smtp/camel-smtp-transport.c:654
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "ããããããéäããããã: ååãåçãããããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:656
+#: ../camel/providers/smtp/camel-smtp-transport.c:667
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "ããããããéäããããã: çåãåçãäãääãããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:760
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
 msgid "Syntax error, command unrecognized"
 msgstr "ææèæããã: ããããããããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:762
+#: ../camel/providers/smtp/camel-smtp-transport.c:773
 msgid "Syntax error in parameters or arguments"
 msgstr "ããããããããããåæãææèæããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:764
+#: ../camel/providers/smtp/camel-smtp-transport.c:775
 msgid "Command not implemented"
 msgstr "ãããããåèããããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:766
+#: ../camel/providers/smtp/camel-smtp-transport.c:777
 msgid "Command parameter not implemented"
 msgstr "ãããããããããããåèããããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:768
+#: ../camel/providers/smtp/camel-smtp-transport.c:779
 msgid "System status, or system help reply"
 msgstr "ããããããããããããããããããããããåç"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:770
+#: ../camel/providers/smtp/camel-smtp-transport.c:781
 msgid "Help message"
 msgstr "ããããããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:772
+#: ../camel/providers/smtp/camel-smtp-transport.c:783
 msgid "Service ready"
 msgstr "ãããããåçãããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:774
+#: ../camel/providers/smtp/camel-smtp-transport.c:785
 msgid "Service closing transmission channel"
 msgstr "ãããããéäããããããéããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:776
+#: ../camel/providers/smtp/camel-smtp-transport.c:787
 msgid "Service not available, closing transmission channel"
 msgstr "ãããããåçããããã, éäããããããéããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:778
+#: ../camel/providers/smtp/camel-smtp-transport.c:789
 msgid "Requested mail action okay, completed"
 msgstr "èæãããããããåäãOK, åäãããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:780
+#: ../camel/providers/smtp/camel-smtp-transport.c:791
 msgid "User not local; will forward to <forward-path>"
 msgstr "ãããããããããããããããã; <forward-path> ãèéããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:782
+#: ../camel/providers/smtp/camel-smtp-transport.c:793
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "èæãããããããåäãåäãããã: ããããããããåçããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:784
+#: ../camel/providers/smtp/camel-smtp-transport.c:795
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "èæãããåäãåäãããã: ããããããããåçããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:786
+#: ../camel/providers/smtp/camel-smtp-transport.c:797
 msgid "Requested action aborted: error in processing"
 msgstr "èæãããåäãäæãããã: åçäãããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:788
+#: ../camel/providers/smtp/camel-smtp-transport.c:799
 msgid "User not local; please try <forward-path>"
 msgstr "ãããããããããããããããã; <forward-path> ãèããããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:790
+#: ../camel/providers/smtp/camel-smtp-transport.c:801
 msgid "Requested action not taken: insufficient system storage"
 msgstr "èæãããåäãåäãããã: ãããããäåéåãèãããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:792
+#: ../camel/providers/smtp/camel-smtp-transport.c:803
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "èæãããããããåäãäæãããã: éååãåããèãããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:794
+#: ../camel/providers/smtp/camel-smtp-transport.c:805
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "èæãããåäãåäãããã: ãããããããåãèãããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:796
+#: ../camel/providers/smtp/camel-smtp-transport.c:807
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ããããååãéåããã; <CRLF>.<CRLF> ãçäããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:798
+#: ../camel/providers/smtp/camel-smtp-transport.c:809
 msgid "Transaction failed"
 msgstr "åçãåæãããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:802
+#: ../camel/providers/smtp/camel-smtp-transport.c:813
 msgid "A password transition is needed"
 msgstr "ããããããåæãåèãã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:804
+#: ../camel/providers/smtp/camel-smtp-transport.c:815
 msgid "Authentication mechanism is too weak"
 msgstr "èèããããããäååéããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:806
+#: ../camel/providers/smtp/camel-smtp-transport.c:817
 msgid "Encryption required for requested authentication mechanism"
 msgstr "èæããèèãããããããããæååãåèãã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:808
+#: ../camel/providers/smtp/camel-smtp-transport.c:819
 msgid "Temporary authentication failure"
 msgstr "äæçãèèãåæãããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1059
+#: ../camel/providers/smtp/camel-smtp-transport.c:1070
 msgid "SMTP Greeting"
 msgstr "SMTP ãæçä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1086
-#: ../camel/providers/smtp/camel-smtp-transport.c:1103
-#: ../camel/providers/smtp/camel-smtp-transport.c:1111
+#: ../camel/providers/smtp/camel-smtp-transport.c:1097
+#: ../camel/providers/smtp/camel-smtp-transport.c:1114
+#: ../camel/providers/smtp/camel-smtp-transport.c:1122
 msgid "HELO command failed: "
 msgstr "HELO ãããããåæãããã: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1186
-#: ../camel/providers/smtp/camel-smtp-transport.c:1200
-#: ../camel/providers/smtp/camel-smtp-transport.c:1209
+#: ../camel/providers/smtp/camel-smtp-transport.c:1197
+#: ../camel/providers/smtp/camel-smtp-transport.c:1211
+#: ../camel/providers/smtp/camel-smtp-transport.c:1220
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM ãããããåæãããã: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1236
+#: ../camel/providers/smtp/camel-smtp-transport.c:1247
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO ãããããåæãããã: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1252
-#: ../camel/providers/smtp/camel-smtp-transport.c:1261
+#: ../camel/providers/smtp/camel-smtp-transport.c:1263
+#: ../camel/providers/smtp/camel-smtp-transport.c:1272
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> ãããããåæãããã: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1303
-#: ../camel/providers/smtp/camel-smtp-transport.c:1313
-#: ../camel/providers/smtp/camel-smtp-transport.c:1323
-#: ../camel/providers/smtp/camel-smtp-transport.c:1382
-#: ../camel/providers/smtp/camel-smtp-transport.c:1401
-#: ../camel/providers/smtp/camel-smtp-transport.c:1414
-#: ../camel/providers/smtp/camel-smtp-transport.c:1422
+#: ../camel/providers/smtp/camel-smtp-transport.c:1314
+#: ../camel/providers/smtp/camel-smtp-transport.c:1324
+#: ../camel/providers/smtp/camel-smtp-transport.c:1334
+#: ../camel/providers/smtp/camel-smtp-transport.c:1393
+#: ../camel/providers/smtp/camel-smtp-transport.c:1412
+#: ../camel/providers/smtp/camel-smtp-transport.c:1425
+#: ../camel/providers/smtp/camel-smtp-transport.c:1433
 msgid "DATA command failed: "
 msgstr "DATA ãããããåæãããã: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1447
-#: ../camel/providers/smtp/camel-smtp-transport.c:1461
-#: ../camel/providers/smtp/camel-smtp-transport.c:1469
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1472
+#: ../camel/providers/smtp/camel-smtp-transport.c:1480
 msgid "RSET command failed: "
 msgstr "RSET ãããããåæãããã: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1494
-#: ../camel/providers/smtp/camel-smtp-transport.c:1508
-#: ../camel/providers/smtp/camel-smtp-transport.c:1515
+#: ../camel/providers/smtp/camel-smtp-transport.c:1505
+#: ../camel/providers/smtp/camel-smtp-transport.c:1519
+#: ../camel/providers/smtp/camel-smtp-transport.c:1526
 msgid "QUIT command failed: "
 msgstr "QUIT ãããããåæãããã: "
 
@@ -4985,11 +5057,11 @@ msgstr "ååã LDAP ãããããããããä"
 msgid "Failed to authenticate.\n"
 msgstr "èèãåæããããã\n"
 
-#: ../libedataserverui/e-categories-editor.c:221
+#: ../libedataserverui/e-categories-editor.c:224
 msgid "Currently _used categories:"
 msgstr "æèäçãããããã(_U):"
 
-#: ../libedataserverui/e-categories-editor.c:230
+#: ../libedataserverui/e-categories-editor.c:233
 msgid "_Available Categories:"
 msgstr "åçåèããããã(_A):"
 
@@ -5075,20 +5147,6 @@ msgstr "%s (ãããã %s) ãããããããååãããããã"
 msgid "Enter password for memo list %s (user %s)"
 msgstr "%s (ãããã %s) ãããããããååãããããã"
 
-#: ../libedataserverui/e-client-utils.c:875
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid ""
-"Enter password for address book %s (user %s)\n"
-"Reason: %s"
-msgstr "%s (ãããã %s) ãããããããååãããããã"
-
-#: ../libedataserverui/e-client-utils.c:877
-#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for address book %s (user %s)"
-msgstr "%s (ãããã %s) ãããããããååãããããã"
-
 #: ../libedataserverui/e-client-utils.c:981
 #, fuzzy
 #| msgid "Enter password"
@@ -5227,6 +5285,38 @@ msgstr "èéå(_D)"
 msgid "Keep running after the last client is closed"
 msgstr ""
 
+#: ../services/evolution-addressbook-factory/evolution-addressbook-factory.c:49
+#: ../services/evolution-calendar-factory/evolution-calendar-factory.c:53
+msgid "Wait running until at least one client is connected"
+msgstr ""
+
+#~ 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)"
+
+#, fuzzy
+#~| msgid "URL '%s' needs a username component"
+#~ msgid "URL '%s' needs a user component"
+#~ msgstr "URL '%s' ãããããåããããããããåèãã"
+
+#~ 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 ãã"
 



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