[evolution-data-server] Updated Japanese translation



commit 022a1ddb029d69f9286665cef86e80425049fb47
Author: Jiro Matsuzawa <jmatsuzawa src gnome org>
Date:   Sat Sep 17 11:24:43 2011 +0900

    Updated Japanese translation

 po/ja.po | 4510 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 2412 insertions(+), 2098 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index aace594..592a667 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,1390 +8,1547 @@
 # Takayuki KUSANO <AE5T-KSN asahi-net or jp>, 2009-2011.
 # Kiyotaka NISHIBORI <nl nishibori kiyotaka gmail com>, 2010.
 # Takayoshi OKANO <kano na rim or jp>, 2011.
-# Jiro Matsuzawa <matsuzawa jr gmail com>, 2011.
+# Jiro Matsuzawa <jmatsuzawa src gnome org>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server gnome-3-0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution-data-server&keywords=I18N+L10N&component=Misc.\n"
-"POT-Creation-Date: 2011-04-03 15:09+0000\n"
-"PO-Revision-Date: 2011-04-04 01:13+0900\n"
-"Last-Translator: Jiro Matsuzawa <matsuzawa jr gmail com>\n"
+"POT-Creation-Date: 2011-09-15 17:19+0000\n"
+"PO-Revision-Date: 2011-09-11 00:28+0900\n"
+"Last-Translator: Jiro Matsuzawa <jmatsuzawa src gnome org>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:570
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
+#: ../addressbook/backends/file/e-book-backend-file.c:828
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:478
 msgid "Loading..."
 msgstr "èãèãä..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:573
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
+#: ../addressbook/backends/file/e-book-backend-file.c:831
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4807
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:480
 msgid "Searching..."
 msgstr "æçä..."
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:589
+#: ../addressbook/backends/google/e-book-backend-google.c:832
 msgid "Querying for updated contactsâ"
 msgstr "ææãããéçåãåãåããäâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:624
+#: ../addressbook/backends/google/e-book-backend-google.c:883
+#: ../addressbook/libebook/e-book.c:3549 ../calendar/libecal/e-cal.c:1381
+#: ../libedataserver/e-client.c:1951
 msgid "Personal"
 msgstr "åä"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:626
+#: ../addressbook/backends/google/e-book-backend-google.c:885
 msgid "Friends"
 msgstr "åä"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:628
+#: ../addressbook/backends/google/e-book-backend-google.c:887
 msgid "Family"
 msgstr "åæ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:630
+#: ../addressbook/backends/google/e-book-backend-google.c:889
 msgid "Coworkers"
 msgstr "åå"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:707
+#: ../addressbook/backends/google/e-book-backend-google.c:973
 msgid "Querying for updated groupsâ"
 msgstr "ææããããããããåãåããäâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:891
+#. Insert the entry on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1392
 msgid "Creating new contactâ"
 msgstr "æããéçåãäæäâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:984
+#: ../addressbook/backends/google/e-book-backend-google.c:1502
 msgid "Deleting contactâ"
 msgstr "éçåãåéäâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1092
+#. Update the contact on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1780
 msgid "Modifying contactâ"
 msgstr "éçåãææäâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1199
+#: ../addressbook/backends/google/e-book-backend-google.c:1987
 msgid "Loadingâ"
 msgstr "èãèãäâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1346
+#: ../addressbook/backends/google/e-book-backend-google.c:2145
 msgid "Authenticating with the serverâ"
-msgstr "ããããèèäâ"
-
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
-#, c-format
-msgid "Downloading contacts (%d)... "
-msgstr "éçå (%d åç) ãããããããä... "
-
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2849
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3030
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3077
-#, c-format
-msgid "Updating contacts cache (%d)... "
-msgstr "éçåããããããæå (%d åç) ãææä... "
+msgstr "ãããããèèäâ"
 
 #. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
 msgid "Not connected"
 msgstr "æçãããããã"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:784
 msgid "Using Distinguished Name (DN)"
 msgstr "èåå (DN) ãäçãã"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:787
 msgid "Using Email Address"
 msgstr "E-ãããããããããäçãã"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1058
 msgid "Reconnecting to LDAP server..."
-msgstr "LDAP ããããåæçä..."
+msgstr "LDAP ãããããåæçä..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1187
 msgid "Invalid DN syntax"
 msgstr "çåãèåå (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1712
 msgid "Adding contact to LDAP server..."
-msgstr "LDAP ããããéçåãèåä..."
+msgstr "LDAP ãããããéçåãèåä..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1843
 msgid "Removing contact from LDAP server..."
-msgstr "LDAP ãããããéçåãåéä..."
+msgstr "LDAP ããããããéçåãåéä..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2278
 msgid "Modifying contact from LDAP server..."
-msgstr "LDAP ããããããéçåãäæä..."
+msgstr "LDAP ãããããããéçåãäæä..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4658
 msgid "Receiving LDAP search results..."
-msgstr "LDAP ãããæççæãååä..."
+msgstr "LDAP ããããæççæãååä..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4828
 msgid "Error performing search"
 msgstr "æçäãããããççãããã"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
-#: ../addressbook/libedata-book/e-data-book.c:441
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
-#: ../calendar/backends/http/e-cal-backend-http.c:435
-#: ../calendar/libecal/e-cal.c:4177
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
-#: ../camel/providers/imap/camel-imap-command.c:481
-#: ../camel/providers/imap/camel-imap-store.c:425
-#: ../camel/providers/pop3/camel-pop3-store.c:495
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
-#: ../servers/groupwise/e-gw-connection.c:243
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4949
+#, c-format
+msgid "Downloading contacts (%d)... "
+msgstr "éçå (%d åç) ãããããããä... "
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:906
+#: ../addressbook/libebook/e-book-client.c:103
+#: ../addressbook/libedata-book/e-data-book.c:452
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:530
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:559
+#: ../calendar/backends/http/e-cal-backend-http.c:433
+#: ../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:411
+#: ../camel/providers/imapx/camel-imapx-server.c:2280
+#: ../camel/providers/smtp/camel-smtp-transport.c:442
+#: ../libedataserver/e-client.c:159
 msgid "Unknown error"
 msgstr "ããããçåããããã"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:343
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "ãããã '%s' ãäæãåæãããããHTTP ããããã: %d (%s)"
 
-#: ../addressbook/libebook/e-book.c:3160
+#: ../addressbook/libebook/e-book.c:3216
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%s: GConf ã UID '%s' ããããããããããã"
 
-#: ../addressbook/libebook/e-book.c:3516
-#: ../addressbook/libedata-book/e-data-book.c:183
+#: ../addressbook/libebook/e-book.c:3532 ../calendar/libecal/e-cal.c:1361
+#: ../libedataserver/e-client.c:1946
+msgid "On This Computer"
+msgstr "ããããããããã"
+
+#: ../addressbook/libebook/e-book.c:3658
+#: ../addressbook/libebook/e-book-client.c:678
+#: ../addressbook/libedata-book/e-data-book.c:315
 msgid "Address book does not exist"
 msgstr "ããããåãããããã"
 
+#: ../addressbook/libebook/e-book-client.c:92
+#, fuzzy
+#| msgid "No such folder %s"
+msgid "No such book"
+msgstr "ãããããããããã %s ãããããã"
+
+#: ../addressbook/libebook/e-book-client.c:94
+#: ../addressbook/libedata-book/e-data-book.c:308
+msgid "Contact not found"
+msgstr "éçåãèãããããã"
+
+#: ../addressbook/libebook/e-book-client.c:96
+#: ../addressbook/libedata-book/e-data-book.c:309
+msgid "Contact ID already exists"
+msgstr "éçå ID ãæãååããããã"
+
+#: ../addressbook/libebook/e-book-client.c:98
+#, fuzzy
+#| msgid "No such message"
+msgid "No such source"
+msgstr "ãããããããããããããããã"
+
+#: ../addressbook/libebook/e-book-client.c:100
+#: ../addressbook/libedata-book/e-data-book.c:325
+msgid "No space"
+msgstr "ãããããããããã"
+
+#: ../addressbook/libebook/e-book-client.c:491
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to run book factory"
+msgstr "ããããããããããåæãããã"
+
+#: ../addressbook/libebook/e-book-client.c:501
+#: ../addressbook/libedata-book/e-data-book-factory.c:379
+#: ../addressbook/libedata-book/e-data-book-factory.c:437
+#: ../calendar/libecal/e-cal-client.c:610
+#: ../calendar/libedata-cal/e-data-cal-factory.c:399
+#, c-format
+msgid "Invalid source"
+msgstr "ããããçåãã"
+
+#: ../addressbook/libebook/e-book-client.c:603
+#: ../calendar/libecal/e-cal-client.c:725
+#, c-format
+msgid "Incorrect uri '%s'"
+msgstr ""
+
+#: ../addressbook/libebook/e-book-client.c:641
+#, fuzzy
+#| msgid "Failed on message %d"
+msgid "Failed to find system book"
+msgstr "ããããã %d ãåæãããã"
+
+#: ../addressbook/libebook/e-book-client.c:750
+#: ../calendar/libecal/e-cal-client.c:878
+#, fuzzy, c-format
+#| msgid "%s: there was no source for UID '%s' stored in GConf."
+msgid "There was no source for UID '%s' stored in a source list."
+msgstr "%s: GConf ã UID '%s' ããããããããããã"
+
+#: ../addressbook/libebook/e-book-client.c:2280
+#: ../calendar/libecal/e-cal-client.c:4475
+#, 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:115
+#: ../addressbook/libebook/e-contact.c:116
 msgid "Unique ID"
 msgstr "éèããã ID"
 
-#: ../addressbook/libebook/e-contact.c:116
+#. 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
 msgid "File Under"
 msgstr "FILE UNDER"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:118
+#: ../addressbook/libebook/e-contact.c:121
 msgid "Book URI"
 msgstr "ããããåã URI"
 
 #. Name fields
 #. FN isn't really a structured field - we use a getter/setter
-#. so we can set the N property (since evo 1.4 works fine with
-#. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:124
+#. * 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
 msgid "Full Name"
 msgstr "æå"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Given Name"
 msgstr "å"
 
-#: ../addressbook/libebook/e-contact.c:126
+#: ../addressbook/libebook/e-contact.c:129
 msgid "Family Name"
 msgstr "å"
 
-#: ../addressbook/libebook/e-contact.c:127
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Nickname"
 msgstr "ããå"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 1"
 msgstr "E-ããã 1"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Email 2"
 msgstr "E-ããã 2"
 
-#: ../addressbook/libebook/e-contact.c:132
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Email 3"
 msgstr "E-ããã 3"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Email 4"
 msgstr "E-ããã 4"
 
-#: ../addressbook/libebook/e-contact.c:135
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Mailer"
 msgstr "ãããããããããã"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Home Address Label"
 msgstr "èåãäæããã"
 
-#: ../addressbook/libebook/e-contact.c:139
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Work Address Label"
 msgstr "åååãäæããã"
 
-#: ../addressbook/libebook/e-contact.c:140
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Other Address Label"
 msgstr "ããäãäæããã"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Assistant Phone"
 msgstr "ãããããããéèçå"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Business Phone"
 msgstr "ääãéèçå"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Business Phone 2"
 msgstr "ääãéèçå 2"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Business Fax"
 msgstr "ääã FAX çå"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Callback Phone"
 msgstr "åæåãéèçå"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Car Phone"
 msgstr "èèéèãçå"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Company Phone"
 msgstr "äçãéèçå"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Home Phone"
 msgstr "èåãéèçå"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Home Phone 2"
 msgstr "èåãéèçå 2"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Home Fax"
 msgstr "èåã FAX çå"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:156
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Mobile Phone"
 msgstr "æåéèãçå"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Other Phone"
 msgstr "ããäãéèçå"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Other Fax"
 msgstr "ããäã FAX çå"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Pager"
 msgstr "ãããããçå"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Primary Phone"
 msgstr "éèçå"
 
-#: ../addressbook/libebook/e-contact.c:159
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Radio"
 msgstr "ããã"
 
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Telex"
 msgstr "ããããã"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:162
+#: ../addressbook/libebook/e-contact.c:165
 msgid "TTY"
 msgstr "ããããããããã"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Organization"
 msgstr "çç"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Organizational Unit"
 msgstr "çç"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Office"
 msgstr "äåæ"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Title"
 msgstr "æç (åãã)"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:172
 msgid "Role"
 msgstr "åå"
 
-#: ../addressbook/libebook/e-contact.c:170
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Manager"
-msgstr "ããããã"
+msgstr "ãããããã"
 
-#: ../addressbook/libebook/e-contact.c:171
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Assistant"
 msgstr "ãããããã"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:174
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Homepage URL"
 msgstr "ããããããã URL"
 
-#: ../addressbook/libebook/e-contact.c:175
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Weblog URL"
 msgstr "ãããã URL"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:757
+#: ../addressbook/libebook/e-contact.c:181
+#: ../libedataserverui/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "ãããã"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Calendar URI"
-msgstr "ããããã URI"
+msgstr "ãããããã URI"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Free/Busy URL"
 msgstr "äåãæçã URL"
 
-#: ../addressbook/libebook/e-contact.c:183
+#: ../addressbook/libebook/e-contact.c:186
 msgid "ICS Calendar"
-msgstr "ICS ãããã"
+msgstr "ICS ããããã"
 
-#: ../addressbook/libebook/e-contact.c:184
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Video Conferencing URL"
 msgstr "ãããäèçã URL"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:187
+#: ../addressbook/libebook/e-contact.c:190
 msgid "Spouse's Name"
 msgstr "éåèãåå"
 
-#: ../addressbook/libebook/e-contact.c:188
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Note"
 msgstr "ããã"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Home Screen Name 1"
 msgstr "èåã AIM ãããããå 1"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Home Screen Name 2"
 msgstr "èåã AIM ãããããå 2"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Home Screen Name 3"
 msgstr "èåã AIM ãããããå 3"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:197
 msgid "AIM Work Screen Name 1"
 msgstr "åååã AIM ãããããå 1"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:198
 msgid "AIM Work Screen Name 2"
 msgstr "åååã AIM ãããããå 2"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Work Screen Name 3"
 msgstr "åååã AIM ãããããå 3"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Home Screen Name 1"
 msgstr "èåã GroupWise ãããããå 1"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Home Screen Name 2"
 msgstr "èåã GroupWise ãããããå 2"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Home Screen Name 3"
 msgstr "èåã GroupWise ãããããå 3"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:203
 msgid "GroupWise Work Screen Name 1"
 msgstr "åååã GroupWise ãããããå 1"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:204
 msgid "GroupWise Work Screen Name 2"
 msgstr "åååã GroupWise ãããããå 2"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Work Screen Name 3"
 msgstr "åååã GroupWise ãããããå 3"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Jabber Home ID 1"
 msgstr "èåã Jabber ID 1"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Home ID 2"
 msgstr "èåã Jabber ID 2"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Home ID 3"
 msgstr "èåã Jabber ID 3"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Jabber Work ID 1"
 msgstr "åååã Jabber ID 1"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Jabber Work ID 2"
 msgstr "åååã Jabber ID 2"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Jabber Work ID 3"
 msgstr "åååã Jabber ID 3"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Home Screen Name 1"
 msgstr "èåã Yahoo! ãããããå 1"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Home Screen Name 2"
 msgstr "èåã Yahoo! ãããããå 2"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Home Screen Name 3"
 msgstr "èåã Yahoo! ãããããå 3"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Yahoo! Work Screen Name 1"
 msgstr "åååã Yahoo! ãããããå 1"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Yahoo! Work Screen Name 2"
 msgstr "åååã Yahoo! ãããããå 2"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Work Screen Name 3"
 msgstr "åååã Yahoo! ãããããå 3"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Home Screen Name 1"
 msgstr "èåã MSN ãããããå 1"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Home Screen Name 2"
 msgstr "èåã MSN ãããããå 2"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Home Screen Name 3"
 msgstr "èåã MSN ãããããå 3"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:221
 msgid "MSN Work Screen Name 1"
 msgstr "åååã MSN ãããããå 1"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:222
 msgid "MSN Work Screen Name 2"
 msgstr "åååã MSN ãããããå 2"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Work Screen Name 3"
 msgstr "åååã MSN ãããããå 3"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:224
 msgid "ICQ Home ID 1"
 msgstr "èåã ICQ ID 1"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Home ID 2"
 msgstr "èåã ICQ ID 2"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Home ID 3"
 msgstr "èåã ICQ ID 3"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:227
 msgid "ICQ Work ID 1"
 msgstr "åååã ICQ ID 1"
 
-#: ../addressbook/libebook/e-contact.c:225
+#: ../addressbook/libebook/e-contact.c:228
 msgid "ICQ Work ID 2"
 msgstr "åååã ICQ ID 2"
 
-#: ../addressbook/libebook/e-contact.c:226
+#: ../addressbook/libebook/e-contact.c:229
 msgid "ICQ Work ID 3"
 msgstr "åååã ICQ ID 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:229
+#: ../addressbook/libebook/e-contact.c:232
 msgid "Last Revision"
 msgstr "æçææææ"
 
-#: ../addressbook/libebook/e-contact.c:230
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Name or Org"
 msgstr "ååãããçç"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Address List"
 msgstr "äæãäè"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Home Address"
 msgstr "èåãäæ"
 
-#: ../addressbook/libebook/e-contact.c:235
+#: ../addressbook/libebook/e-contact.c:238
 msgid "Work Address"
 msgstr "åååãäæ"
 
-#: ../addressbook/libebook/e-contact.c:236
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Other Address"
 msgstr "ããäãäæ"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:239
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Category List"
 msgstr "ãããããäè"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:242
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Photo"
 msgstr "åç"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Logo"
 msgstr "ãã"
 
-#: ../addressbook/libebook/e-contact.c:245
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Name"
 msgstr "åå"
 
-#: ../addressbook/libebook/e-contact.c:246
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Email List"
 msgstr "E-ãããäè"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:252
 msgid "AIM Screen Name List"
 msgstr "AIM ãããããåãäè"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:253
 msgid "GroupWise ID List"
 msgstr "GroupWise ID ãäè"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:254
 msgid "Jabber ID List"
 msgstr "Jabber ID ãäè"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Yahoo! Screen Name List"
 msgstr "Yahoo! ãããããåãäè"
 
-#: ../addressbook/libebook/e-contact.c:253
+#: ../addressbook/libebook/e-contact.c:256
 msgid "MSN Screen Name List"
 msgstr "MSN ãããããåãäè"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:257
 msgid "ICQ ID List"
 msgstr "ICQ ã ID äèãã"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:259
 msgid "Wants HTML Mail"
 msgstr "HTML ååãããããåæãã"
 
-#: ../addressbook/libebook/e-contact.c:258
+#: ../addressbook/libebook/e-contact.c:261
 msgid "List"
 msgstr "äè"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:262
 msgid "List Show Addresses"
 msgstr "äæãèçããäèãã"
 
-#: ../addressbook/libebook/e-contact.c:261
+#: ../addressbook/libebook/e-contact.c:264
 msgid "Birth Date"
 msgstr "èçæ"
 
-#: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
+#: ../addressbook/libebook/e-contact.c:265
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:756
 msgid "Anniversary"
 msgstr "èåæ"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:268
 msgid "X.509 Certificate"
 msgstr "X.509 èè"
 
-#: ../addressbook/libebook/e-contact.c:267
+#: ../addressbook/libebook/e-contact.c:270
 msgid "Gadu-Gadu Home ID 1"
 msgstr "èåã Gadu-Gadu ID 1"
 
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Home ID 2"
 msgstr "èåã Gadu-Gadu ID 2"
 
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Home ID 3"
 msgstr "èåã Gadu-Gadu ID 3"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Work ID 1"
 msgstr "åååã Gadu-Gadu ID 1"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:274
 msgid "Gadu-Gadu Work ID 2"
 msgstr "åååã Gadu-Gadu ID 2"
 
-#: ../addressbook/libebook/e-contact.c:272
+#: ../addressbook/libebook/e-contact.c:275
 msgid "Gadu-Gadu Work ID 3"
 msgstr "åååã Gadu-Gadu ID 3"
 
-#: ../addressbook/libebook/e-contact.c:273
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu ID ãäè"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:279
 msgid "Geographic Information"
 msgstr "åçæå"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Telephone"
 msgstr "éè"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Home Name 1"
 msgstr "èåã Skype å 1"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Home Name 2"
 msgstr "èåã Skype å 2"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Home Name 3"
 msgstr "èåã Skype å 3"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Work Name 1"
 msgstr "åååã Skype å 1"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:287
 msgid "Skype Work Name 2"
 msgstr "åååã Skype å 2"
 
-#: ../addressbook/libebook/e-contact.c:285
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Work Name 3"
 msgstr "åååã Skype å 3"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Name List"
 msgstr "Skype åãäè"
 
-#: ../addressbook/libebook/e-contact.c:288
+#: ../addressbook/libebook/e-contact.c:291
 msgid "SIP address"
 msgstr "SIP ãããã"
 
-#: ../addressbook/libebook/e-contact.c:1517
-#: ../addressbook/libebook/e-destination.c:739
+#: ../addressbook/libebook/e-contact.c:293
+#, fuzzy
+#| msgid "Skype Home Name 1"
+msgid "Google Talk Home Name 1"
+msgstr "èåã Skype å 1"
+
+#: ../addressbook/libebook/e-contact.c:294
+#, fuzzy
+#| msgid "Skype Home Name 2"
+msgid "Google Talk Home Name 2"
+msgstr "èåã Skype å 2"
+
+#: ../addressbook/libebook/e-contact.c:295
+#, fuzzy
+#| msgid "Skype Home Name 3"
+msgid "Google Talk Home Name 3"
+msgstr "èåã Skype å 3"
+
+#: ../addressbook/libebook/e-contact.c:296
+#, fuzzy
+#| msgid "Skype Work Name 1"
+msgid "Google Talk Work Name 1"
+msgstr "åååã Skype å 1"
+
+#: ../addressbook/libebook/e-contact.c:297
+#, fuzzy
+#| msgid "Skype Work Name 2"
+msgid "Google Talk Work Name 2"
+msgstr "åååã Skype å 2"
+
+#: ../addressbook/libebook/e-contact.c:298
+#, fuzzy
+#| msgid "Skype Work Name 3"
+msgid "Google Talk Work Name 3"
+msgstr "åååã Skype å 3"
+
+#: ../addressbook/libebook/e-contact.c:299
+#, fuzzy
+#| msgid "Skype Name List"
+msgid "Google Talk Name List"
+msgstr "Skype åãäè"
+
+#: ../addressbook/libebook/e-contact.c:1580
+#: ../addressbook/libebook/e-destination.c:884
 msgid "Unnamed List"
 msgstr "ååãããäè"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:301
-#: ../addressbook/libedata-book/e-data-book-factory.c:334
-#: ../calendar/libedata-cal/e-data-cal-factory.c:362
-#, c-format
-msgid "Empty URI"
-msgstr "çã URI"
+#: ../addressbook/libedata-book/e-book-backend.c:19
+msgid "Cannot process, book backend is opening"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-book-backend.c:96
+#, fuzzy, c-format
+#| msgid "Unknown error: %s"
+msgid "Unknown book property '%s'"
+msgstr "ååäæãããã: %s"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:320
-#: ../addressbook/libedata-book/e-data-book-factory.c:370
-#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#: ../addressbook/libedata-book/e-book-backend.c:113
+#, fuzzy, c-format
+#| msgid "Cannot create folder '%s': %s"
+msgid "Cannot change value of book property '%s'"
+msgstr "'%s' ãããããããããäæããããã: %s"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:470
+#: ../camel/camel-db.c:481
 #, c-format
-msgid "Invalid source"
-msgstr "ããããçåãã"
+msgid "Insufficient memory"
+msgstr "ããããèãããã"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:199
+#: ../addressbook/libedata-book/e-data-book.c:212
+#: ../addressbook/libedata-book/e-data-book.c:744
+#, fuzzy
+#| msgid "Invalid query: %s"
+msgid "Invalid query: "
+msgstr "åãåããååãçåãã: %s"
 
-#: ../addressbook/libedata-book/e-data-book.c:173
-#: ../calendar/libedata-cal/e-data-cal.c:108
+#: ../addressbook/libedata-book/e-data-book.c:304
+#: ../calendar/libedata-cal/e-data-cal.c:419
 msgid "Success"
 msgstr "æåãããã"
 
-#: ../addressbook/libedata-book/e-data-book.c:174
-#: ../calendar/libedata-cal/e-data-cal.c:109
+#: ../addressbook/libedata-book/e-data-book.c:305
+#: ../calendar/libecal/e-cal.c:4563 ../calendar/libedata-cal/e-data-cal.c:420
+#: ../libedataserver/e-client.c:118
+msgid "Backend is busy"
+msgstr "ãããããããåçäãã"
+
+#: ../addressbook/libedata-book/e-data-book.c:306
+#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:128
 msgid "Repository offline"
 msgstr "ããããããããããããã"
 
-#: ../addressbook/libedata-book/e-data-book.c:175
-#: ../calendar/libecal/e-cal.c:4159 ../calendar/libedata-cal/e-data-cal.c:110
+#: ../addressbook/libedata-book/e-data-book.c:307
+#: ../calendar/libecal/e-cal.c:4577 ../calendar/libedata-cal/e-data-cal.c:422
+#: ../libedataserver/e-client.c:132
 msgid "Permission denied"
 msgstr "æéãããããã"
 
-#: ../addressbook/libedata-book/e-data-book.c:176
-msgid "Contact not found"
-msgstr "éçåãèãããããã"
-
-#: ../addressbook/libedata-book/e-data-book.c:177
-msgid "Contact ID already exists"
-msgstr "éçå ID ãæãååããããã"
-
-#: ../addressbook/libedata-book/e-data-book.c:178
-#: ../calendar/libedata-cal/e-data-cal.c:115
+#: ../addressbook/libedata-book/e-data-book.c:310
+#: ../calendar/libedata-cal/e-data-cal.c:427
 msgid "Authentication Failed"
 msgstr "èèãåæãããã"
 
-#: ../addressbook/libedata-book/e-data-book.c:179
-#: ../calendar/libedata-cal/e-data-cal.c:116
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:428
 msgid "Authentication Required"
 msgstr "èèãåèãã"
 
-#: ../addressbook/libedata-book/e-data-book.c:180
-#: ../calendar/libedata-cal/e-data-cal.c:117
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libedata-cal/e-data-cal.c:429
 msgid "Unsupported field"
 msgstr "ãããããããããéçãã"
 
-#: ../addressbook/libedata-book/e-data-book.c:181
-#: ../calendar/libedata-cal/e-data-cal.c:119
+#: ../addressbook/libedata-book/e-data-book.c:313
+#: ../calendar/libedata-cal/e-data-cal.c:431 ../libedataserver/e-client.c:140
 msgid "Unsupported authentication method"
 msgstr "ãããããããããèèææãã"
 
-#: ../addressbook/libedata-book/e-data-book.c:182
-#: ../calendar/libedata-cal/e-data-cal.c:120
+#: ../addressbook/libedata-book/e-data-book.c:314
+#: ../calendar/libedata-cal/e-data-cal.c:432 ../libedataserver/e-client.c:142
 msgid "TLS not available"
 msgstr "TLS ãåçããããã"
 
-#: ../addressbook/libedata-book/e-data-book.c:184
+#: ../addressbook/libedata-book/e-data-book.c:316
 msgid "Book removed"
 msgstr "ãããããããåéããããã"
 
-#: ../addressbook/libedata-book/e-data-book.c:185
-#: ../calendar/libedata-cal/e-data-cal.c:123
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:435
 msgid "Not available in offline mode"
 msgstr "ããããããããããåçããããã"
 
-#: ../addressbook/libedata-book/e-data-book.c:186
-#: ../calendar/libedata-cal/e-data-cal.c:124
+#: ../addressbook/libedata-book/e-data-book.c:318
+#: ../calendar/libedata-cal/e-data-cal.c:436 ../libedataserver/e-client.c:144
 msgid "Search size limit exceeded"
 msgstr "æçããããäéãèãããã"
 
-#: ../addressbook/libedata-book/e-data-book.c:187
-#: ../calendar/libedata-cal/e-data-cal.c:125
+#: ../addressbook/libedata-book/e-data-book.c:319
+#: ../calendar/libedata-cal/e-data-cal.c:437 ../libedataserver/e-client.c:146
 msgid "Search time limit exceeded"
 msgstr "æçæéãäéãèãããã"
 
-#: ../addressbook/libedata-book/e-data-book.c:188
-#: ../calendar/libedata-cal/e-data-cal.c:126
+#: ../addressbook/libedata-book/e-data-book.c:320
+#: ../calendar/libedata-cal/e-data-cal.c:438 ../libedataserver/e-client.c:148
 msgid "Invalid query"
 msgstr "åãåãããååãçåãã"
 
-#: ../addressbook/libedata-book/e-data-book.c:189
-#: ../calendar/libedata-cal/e-data-cal.c:127
+#: ../addressbook/libedata-book/e-data-book.c:321
+#: ../calendar/libedata-cal/e-data-cal.c:439 ../libedataserver/e-client.c:150
 msgid "Query refused"
 msgstr "åãåãããæåãããã"
 
-#: ../addressbook/libedata-book/e-data-book.c:190
-#: ../calendar/libedata-cal/e-data-cal.c:128
+#: ../addressbook/libedata-book/e-data-book.c:322
+#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:136
 msgid "Could not cancel"
 msgstr "ããããããããããããã"
 
 #. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
 #. { OtherError,			N_("Other error") },
-#: ../addressbook/libedata-book/e-data-book.c:192
-#: ../calendar/libedata-cal/e-data-cal.c:130
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:442
 msgid "Invalid server version"
-msgstr "ããããããããããçåãã"
-
-#: ../addressbook/libedata-book/e-data-book.c:193
-msgid "No space"
-msgstr "ãããããããããã"
+msgstr "ãããããããããããçåãã"
 
-#: ../addressbook/libedata-book/e-data-book.c:194
-#: ../calendar/libecal/e-cal.c:4143 ../calendar/libedata-cal/e-data-cal.c:131
+#: ../addressbook/libedata-book/e-data-book.c:326
+#: ../calendar/libecal/e-cal.c:4561 ../calendar/libedata-cal/e-data-cal.c:443
+#: ../libedataserver/e-client.c:116
 msgid "Invalid argument"
 msgstr "çåãåæ"
 
 #. Translators: The string for NOT_SUPPORTED error
-#: ../addressbook/libedata-book/e-data-book.c:196
-#: ../calendar/libecal/e-cal.c:4182 ../calendar/libedata-cal/e-data-cal.c:133
+#: ../addressbook/libedata-book/e-data-book.c:328
+#: ../calendar/libecal/e-cal.c:4600 ../calendar/libedata-cal/e-data-cal.c:445
+#: ../libedataserver/e-client.c:138
 msgid "Not supported"
 msgstr "ããããããããããã"
 
-#: ../addressbook/libedata-book/e-data-book.c:204
-#: ../calendar/libedata-cal/e-data-cal.c:141
+#: ../addressbook/libedata-book/e-data-book.c:329
+#: ../calendar/libedata-cal/e-data-cal.c:446 ../libedataserver/e-client.c:156
+#, fuzzy
+#| msgid "Backend is busy"
+msgid "Backend is not opened yet"
+msgstr "ãããããããåçäãã"
+
+#: ../addressbook/libedata-book/e-data-book.c:337
+#: ../calendar/libecal/e-cal-client.c:618
+#: ../calendar/libedata-cal/e-data-cal.c:454 ../libedataserver/e-client.c:154
 msgid "Other error"
 msgstr "ããäãããã"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:325
-#, c-format
-msgid "Cannot open book: %s"
-msgstr "ãããããããéãããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:347
-#, c-format
-msgid "Cannot remove book: %s"
-msgstr "ãããããããåéããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:364
-#: ../addressbook/libedata-book/e-data-book.c:383
-#, c-format
-msgid "Cannot get contact: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:562
+#: ../addressbook/libedata-book/e-data-book.c:954
+#, fuzzy
+#| msgid "Cannot get contact: %s"
+msgid "Cannot get contact: "
 msgstr "éçåãååããããã: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:402
-#, c-format
-msgid "Empty query: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:587
+#: ../addressbook/libedata-book/e-data-book.c:612
+#, fuzzy
+#| msgid "Empty query: %s"
+msgid "Empty query: "
 msgstr "åãåããååãçãã: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:418
-#, c-format
-msgid "Cannot get contact list: %s"
-msgstr "éçåãäèãååããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:457
-#, c-format
-msgid "Cannot authenticate user: %s"
-msgstr "ããããèèããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:472
-#: ../addressbook/libedata-book/e-data-book.c:491
-#, c-format
-msgid "Cannot add contact: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:637
+#: ../addressbook/libedata-book/e-data-book.c:1036
+#, fuzzy
+#| msgid "Cannot add contact: %s"
+msgid "Cannot add contact: "
 msgstr "éçåãèåããããã: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:513
-#: ../addressbook/libedata-book/e-data-book.c:532
-#, c-format
-msgid "Cannot modify contact: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:662
+#: ../addressbook/libedata-book/e-data-book.c:1058
+#, fuzzy
+#| msgid "Cannot modify contact: %s"
+msgid "Cannot modify contact: "
 msgstr "éçåãåæããããã: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:571
-#, c-format
-msgid "Cannot remove contacts: %s"
-msgstr "éçåãåéããããã: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:770
+#: ../calendar/libedata-cal/e-data-cal.c:893
+#, fuzzy
+#| msgid "Cannot authenticate user: %s"
+msgid "Cannot authenticate user: "
+msgstr "ããããèèããããã: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:610
-#, c-format
-msgid "Cannot get supported fields: %s"
-msgstr "ååããéçãååããããã: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:841
+#, fuzzy
+#| msgid "Cannot open book: %s"
+msgid "Cannot open book: "
+msgstr "ãããããããéãããã: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:625
-#, c-format
-msgid "Cannot get required fields: %s"
-msgstr "èæãããéçãååããããã: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:857
+#, fuzzy
+#| msgid "Cannot remove book: %s"
+msgid "Cannot remove book: "
+msgstr "ãããããããåéããããã: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:640
-#, c-format
-msgid "Cannot get supported authentication methods: %s"
-msgstr "ååããèèææãååããããã: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:884
+#, fuzzy
+#| msgid "Cannot refresh calendar: %s"
+msgid "Cannot refresh address book: "
+msgstr "ããããããææããããã: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:910
+#, fuzzy
+#| msgid "Cannot create calendar object: %s"
+msgid "Cannot get backend property: "
+msgstr "ããããããããããããäæããããã: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:935
+#: ../calendar/libedata-cal/e-data-cal.c:1096
+#, fuzzy
+#| msgid "Cannot send calendar objects: %s"
+msgid "Cannot set backend property: "
+msgstr "ããããããããããããéäããããã: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:972
+#, fuzzy
+#| msgid "Cannot get contact list: %s"
+msgid "Cannot get contact list: "
+msgstr "éçåãäèãååããããã: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:666
-#: ../addressbook/libedata-book/e-data-book.c:677
-#, c-format
-msgid "Invalid query: %s"
-msgstr "åãåããååãçåãã: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1006
+#, fuzzy
+#| msgid "Cannot get contact list: %s"
+msgid "Cannot get contact list uids: "
+msgstr "éçåãäèãååããããã: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:713
-#, c-format
-msgid "Cannot get changes: %s"
-msgstr "åæãååããããã: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1079
+#, fuzzy
+#| msgid "Cannot remove contacts: %s"
+msgid "Cannot remove contacts: "
+msgstr "éçåãåéããããã: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../addressbook/libedata-book/e-data-book.c:755
+#: ../addressbook/libedata-book/e-data-book-factory.c:363
+#: ../addressbook/libedata-book/e-data-book-factory.c:396
+#: ../calendar/libedata-cal/e-data-cal-factory.c:414
 #, c-format
-msgid "Cancel operation failed: %s"
-msgstr "æäãããããããåæãããã: %s"
+msgid "Empty URI"
+msgstr "çã URI"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:528
 #, c-format
 msgid "Server is unreachable (%s)"
-msgstr "ããããæçããããã (%s)"
+msgstr "ãããããæçããããã (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:556
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "äæåã HTTP ãããããããã %d ãèããããã (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2096
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2496
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2183
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2540
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
 "Error message: %s"
 msgstr ""
-"ããããæçããããããããããããèãèãåçããããéãããã\n"
+"ãããããæçãããããããããããããèãèãåçããããéãããã\n"
 "ãããããããã: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4476
 msgid "Calendar doesn't support Free/Busy"
-msgstr "ãããããäåãæçãååãããã"
+msgstr "ããããããäåãæçãååãããã"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:758
 msgid "Birthday"
 msgstr "èçæ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:788
 #, c-format
 msgid "Birthday: %s"
 msgstr "èçæ: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:813
 #, c-format
 msgid "Anniversary: %s"
 msgstr "èåæ: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:251
+#: ../calendar/backends/file/e-cal-backend-file.c:241
 msgid "Cannot save calendar data: Malformed URI."
-msgstr "ãããããããããäåããããã: URI ãééãããããã"
+msgstr "ããããããããããäåããããã: URI ãééãããããã"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:258
-#: ../calendar/backends/file/e-cal-backend-file.c:264
+#: ../calendar/backends/file/e-cal-backend-file.c:248
+#: ../calendar/backends/file/e-cal-backend-file.c:254
 msgid "Cannot save calendar data"
-msgstr "ãããããããããäåããããã"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2101
-msgid "Reply Requested: by "
-msgstr "èäèæ: by "
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2106
-msgid "Reply Requested: When convenient"
-msgstr "èäèæ: When convenient"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
-msgid "Loading Appointment items"
-msgstr "äåãããããèãèãä"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
-msgid "Loading Task items"
-msgstr "ããããããããèãèãä"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
-msgid "Loading Note items"
-msgstr "ããããããããèãèãä"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
-msgid "Loading items"
-msgstr "ãããããèãèãä"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
-msgid "Calendar"
-msgstr "ãããã"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
-msgid "Invalid server URI"
-msgstr "çåãããã URI ãã"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
-#: ../calendar/backends/http/e-cal-backend-http.c:783
-#: ../calendar/backends/weather/e-cal-backend-weather.c:520
-msgid "Could not create cache file"
-msgstr "ãããããããããããçæãããããããã"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
-msgid "Could not create thread for populating cache"
-msgstr "ããããããçæããããããããããçæãããããããã"
+msgstr "ããããããããããäåããããã"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:423
+#: ../calendar/backends/http/e-cal-backend-http.c:416
 msgid "Redirected to Invalid URI"
 msgstr "URI ãããããããããçåãã"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:456
+#: ../calendar/backends/http/e-cal-backend-http.c:454
 msgid "Bad file format."
 msgstr "ããããããããããããééãããããã"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:463
+#: ../calendar/backends/http/e-cal-backend-http.c:461
 msgid "Not a calendar."
-msgstr "ãããããããããããã"
+msgstr "ããããããããããããã"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:780
+#: ../calendar/backends/http/e-cal-backend-http.c:781
+#: ../calendar/backends/weather/e-cal-backend-weather.c:527
+msgid "Could not create cache file"
+msgstr "ãããããããããããçæãããããããã"
 
 #: ../calendar/backends/weather/e-cal-backend-weather.c:186
 msgid "Could not retrieve weather data"
 msgstr "åæãããããååãããããããã"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:286
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
 msgid "Weather: Fog"
 msgstr "åæ: é"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:287
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Cloudy Night"
 msgstr "åæ: æãããåç"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:288
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Cloudy"
 msgstr "åæ: æã"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:289
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Overcast"
 msgstr "åæ: ææã"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Showers"
 msgstr "åæ: é"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:291
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
 msgid "Weather: Snow"
 msgstr "åæ: é"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:292
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
 msgid "Weather: Clear Night"
 msgstr "åæ: æããåç"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:293
+#: ../calendar/backends/weather/e-cal-backend-weather.c:295
 msgid "Weather: Sunny"
 msgstr "åæ: æããåæ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:294
+#: ../calendar/backends/weather/e-cal-backend-weather.c:296
 msgid "Weather: Thunderstorms"
 msgstr "åæ: éé"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:440
+#: ../calendar/backends/weather/e-cal-backend-weather.c:444
 msgid "Forecast"
 msgstr "åæäå"
 
-#: ../calendar/libecal/e-cal-component.c:1299
+#: ../calendar/libecal/e-cal.c:892 ../libedataserverui/e-book-auth-util.c:204
+#: ../libedataserverui/e-book-auth-util.c:428
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "%s (ãããã %s) ãããããããååãããããã"
+
+#.
+#. * This password prompt will be prompted rarely. Since the key that is passed to
+#. * the auth_func corresponds to the parent user.
+#.
+#: ../calendar/libecal/e-cal.c:906
+#, c-format
+msgid "Enter password for %s to enable proxy for user %s"
+msgstr "%s ãããããããååããããããã %s ããããããæåããããããã"
+
+#: ../calendar/libecal/e-cal.c:4565
+msgid "Repository is offline"
+msgstr "ããããããããããããã"
+
+#: ../calendar/libecal/e-cal.c:4567 ../calendar/libecal/e-cal-client.c:134
+msgid "No such calendar"
+msgstr "ãããããããããããããããã"
+
+#: ../calendar/libecal/e-cal.c:4569 ../calendar/libecal/e-cal-client.c:136
+#: ../calendar/libedata-cal/e-data-cal.c:424
+msgid "Object not found"
+msgstr "ãããããããèãããããã"
+
+#: ../calendar/libecal/e-cal.c:4571 ../calendar/libecal/e-cal-client.c:138
+#: ../calendar/libedata-cal/e-data-cal.c:425
+msgid "Invalid object"
+msgstr "çåããããããããã"
+
+#: ../calendar/libecal/e-cal.c:4573
+msgid "URI not loaded"
+msgstr "URI ãèãèãããããã"
+
+#: ../calendar/libecal/e-cal.c:4575
+msgid "URI already loaded"
+msgstr "URL ãæãèãèãæããã"
+
+#: ../calendar/libecal/e-cal.c:4579
+msgid "Unknown User"
+msgstr "ãããããçåããããã"
+
+#: ../calendar/libecal/e-cal.c:4581 ../calendar/libecal/e-cal-client.c:142
+#: ../calendar/libedata-cal/e-data-cal.c:426
+msgid "Object ID already exists"
+msgstr "æããããããã ID ãååããããã"
+
+#: ../calendar/libecal/e-cal.c:4583
+msgid "Protocol not supported"
+msgstr "ããããããããããããããããã"
+
+#: ../calendar/libecal/e-cal.c:4585
+msgid "Operation has been canceled"
+msgstr "æäãããããããããã"
+
+#: ../calendar/libecal/e-cal.c:4587
+msgid "Could not cancel operation"
+msgstr "æäãããããããããããããã"
+
+#: ../calendar/libecal/e-cal.c:4589 ../libedataserver/e-client.c:124
+msgid "Authentication failed"
+msgstr "èèãåæãããã"
+
+#: ../calendar/libecal/e-cal.c:4591
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
+#: ../libedataserver/e-client.c:126
+msgid "Authentication required"
+msgstr "èèãåèãããããã"
+
+#: ../calendar/libecal/e-cal.c:4593
+msgid "A D-Bus exception has occurred"
+msgstr "D-Bus äåãççãããã"
+
+#: ../calendar/libecal/e-cal.c:4597
+msgid "No error"
+msgstr "ããããããããã"
+
+#: ../calendar/libecal/e-cal-client.c:140
+#: ../calendar/libedata-cal/e-data-cal.c:434
+msgid "Unknown user"
+msgstr "ãããããçåããããã"
+
+#: ../calendar/libecal/e-cal-client.c:144
+#: ../calendar/libedata-cal/e-data-cal.c:423
+msgid "Invalid range"
+msgstr "æåçåãçåãã"
+
+#: ../calendar/libecal/e-cal-client.c:600
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to run calendar factory"
+msgstr "ããããããããããåæãããã"
+
+#: ../calendar/libecal/e-cal-client.c:765
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to find system calendar"
+msgstr "ããããããããããåæãããã"
+
+#: ../calendar/libecal/e-cal-client.c:804
+#: ../calendar/libedata-cal/e-data-cal.c:433
+msgid "Calendar does not exist"
+msgstr "ããããããååãããã"
+
+#: ../calendar/libecal/e-cal-client.c:919
+#, fuzzy
+#| msgid "Invalid source"
+msgid "Invalid source type"
+msgstr "ããããçåãã"
+
+#: ../calendar/libecal/e-cal-component.c:1326
 msgid "Untitled appointment"
 msgstr "ãããããããäå"
 
-#: ../calendar/libecal/e-cal-recur.c:3986
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "1st"
 msgstr "1æ"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:3982
 msgid "2nd"
 msgstr "2æ"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:3983
 msgid "3rd"
 msgstr "3æ"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:3984
 msgid "4th"
 msgstr "4æ"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "5th"
 msgstr "5æ"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "6th"
 msgstr "6æ"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "7th"
 msgstr "7æ"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "8th"
 msgstr "8æ"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "9th"
 msgstr "9æ"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "10th"
 msgstr "10æ"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "11th"
 msgstr "11æ"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "12th"
 msgstr "12æ"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "13th"
 msgstr "13æ"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "14th"
 msgstr "14æ"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "15th"
 msgstr "15æ"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "16th"
 msgstr "16æ"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "17th"
 msgstr "17æ"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "18th"
 msgstr "18æ"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "19th"
 msgstr "19æ"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "20th"
 msgstr "20æ"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "21st"
 msgstr "21æ"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "22nd"
 msgstr "22æ"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "23rd"
 msgstr "23æ"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "24th"
 msgstr "24æ"
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "25th"
 msgstr "25æ"
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "26th"
 msgstr "26æ"
 
-#: ../calendar/libecal/e-cal-recur.c:4012
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "27th"
 msgstr "27æ"
 
-#: ../calendar/libecal/e-cal-recur.c:4013
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "28th"
 msgstr "28æ"
 
-#: ../calendar/libecal/e-cal-recur.c:4014
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "29th"
 msgstr "29æ"
 
-#: ../calendar/libecal/e-cal-recur.c:4015
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "30th"
 msgstr "30æ"
 
-#: ../calendar/libecal/e-cal-recur.c:4016
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "31st"
 msgstr "31æ"
 
-#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
+#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
+#, fuzzy
+#| msgid "High"
+msgctxt "Priority"
 msgid "High"
 msgstr "éã"
 
-#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
+#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
+#, fuzzy
+#| msgid "Normal"
+msgctxt "Priority"
 msgid "Normal"
 msgstr "æé"
 
-#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
+#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722
+#, fuzzy
+#| msgid "Low"
+msgctxt "Priority"
 msgid "Low"
 msgstr "äã"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:703
+#: ../calendar/libecal/e-cal-util.c:716
+#, fuzzy
+#| msgid "Undefined"
+msgctxt "Priority"
 msgid "Undefined"
 msgstr "æåç"
 
-#: ../calendar/libecal/e-cal.c:1236 ../libedataserverui/e-book-auth-util.c:206
-#: ../libedataserverui/e-book-auth-util.c:440
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "%s (ããã %s) ãããããããååãããããã"
-
-#.
-#. This password prompt will be prompted rarely. Since the key that is passed to
-#. the auth_func corresponds to the parent user.
-#.
-#: ../calendar/libecal/e-cal.c:1250
-#, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "%s ãããããããååãããããã %s ããããããæåããããããã"
-
-#: ../calendar/libecal/e-cal.c:4145
-msgid "Backend is busy"
-msgstr "ãããããããåçäãã"
-
-#: ../calendar/libecal/e-cal.c:4147
-msgid "Repository is offline"
-msgstr "ããããããããããããã"
-
-#: ../calendar/libecal/e-cal.c:4149
-msgid "No such calendar"
-msgstr "ããããããããããããããã"
-
-#: ../calendar/libecal/e-cal.c:4151 ../calendar/libedata-cal/e-data-cal.c:112
-#: ../servers/groupwise/e-gw-connection.c:235
-msgid "Object not found"
-msgstr "ãããããããèãããããã"
-
-#: ../calendar/libecal/e-cal.c:4153 ../calendar/libedata-cal/e-data-cal.c:113
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid object"
-msgstr "çåããããããããã"
-
-#: ../calendar/libecal/e-cal.c:4155
-msgid "URI not loaded"
-msgstr "URI ãèãèãããããã"
-
-#: ../calendar/libecal/e-cal.c:4157
-msgid "URI already loaded"
-msgstr "URL ãæãèãèãæããã"
-
-#: ../calendar/libecal/e-cal.c:4161 ../servers/groupwise/e-gw-connection.c:237
-msgid "Unknown User"
-msgstr "ããããçåããããã"
-
-#: ../calendar/libecal/e-cal.c:4163 ../calendar/libedata-cal/e-data-cal.c:114
-msgid "Object ID already exists"
-msgstr "æããããããã ID ãååããããã"
-
-#: ../calendar/libecal/e-cal.c:4165
-msgid "Protocol not supported"
-msgstr "ããããããããããããããããã"
-
-#: ../calendar/libecal/e-cal.c:4167
-msgid "Operation has been canceled"
-msgstr "æäãããããããããã"
-
-#: ../calendar/libecal/e-cal.c:4169
-msgid "Could not cancel operation"
-msgstr "æäãããããããããããããã"
-
-#: ../calendar/libecal/e-cal.c:4171
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1306
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1324
-#: ../camel/providers/groupwise/camel-groupwise-store.c:628
-#: ../camel/providers/groupwise/camel-groupwise-store.c:810
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
-#, c-format
-msgid "Authentication failed"
-msgstr "èèãåæãããã"
-
-#: ../calendar/libecal/e-cal.c:4173
-#: ../camel/providers/smtp/camel-smtp-transport.c:775
-msgid "Authentication required"
-msgstr "èèãåèãããããã"
+#: ../calendar/libedata-cal/e-cal-backend.c:34
+#, fuzzy
+#| msgid "Cannot remove calendar object: %s"
+msgid "Cannot process, calendar backend is opening"
+msgstr "ããããããããããããåéããããã: %s"
 
-#: ../calendar/libecal/e-cal.c:4175
-msgid "A D-Bus exception has occurred"
-msgstr "D-Bus äåãççãããã"
+#: ../calendar/libedata-cal/e-cal-backend.c:212
+#, fuzzy, c-format
+#| msgid "Unknown error: %s"
+msgid "Unknown calendar property '%s'"
+msgstr "ååäæãããã: %s"
 
-#: ../calendar/libecal/e-cal.c:4179
-msgid "No error"
-msgstr "ããããããããã"
+#: ../calendar/libedata-cal/e-cal-backend.c:229
+#, fuzzy, c-format
+#| msgid "Cannot create calendar object: %s"
+msgid "Cannot change value of calendar property '%s'"
+msgstr "ããããããããããããäæããããã: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:72
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:714
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:736
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:851
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:882
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1082
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1112
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" ãåæãåèããããã"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:224
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:269
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:308
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1153
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" ãåæãäãåèãããã"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:114
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:314
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:781
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" ãæåãåæãããæååãåèãããã"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:129
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr ""
 "\"%s\" ãæåãåæããã \"ISO 8601 æä/æå\" ãæååãåèãããã"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:171
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:388
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:441
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:917
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" ãåæãäãåèãããã"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:177
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:230
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:275
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:394
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:447
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:923
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1159
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" ãæåãåæããã time_t åãåãåèãããã"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:185
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\" ãäççãåæãããææåãåèãããã"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:402
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:456
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:931
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" ãäççãåæããã time_t åãåãåèãããã"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:789
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" ãäççãåæãããæååãåèãããã"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:819
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
 "\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
 "\"classification\""
 msgstr ""
-"\"%s\" ãæåãåæããã \"any\", \"summary\" ããã \"description"
-"\"ã\"location\"ã\"attendee\"ã\"organizer\"ã\"classification\" ããããã"
-"äããåèãã"
+"\"%s\" ãæåãåæããã \"any\", \"summary\" ããã \"description\"ã"
+"\"location\"ã\"attendee\"ã\"organizer\"ã\"classification\" ãããããäã"
+"ãåèãã"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:981
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" ãåããããåæãäãåèãããã"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:995
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1399,171 +1556,146 @@ msgid ""
 msgstr ""
 "\"%s\" ãããããããäããæååããèçå FALSE (#f) ãäãããåèãããã"
 
-#: ../calendar/libedata-cal/e-data-cal.c:111
-msgid "Invalid range"
-msgstr "æåçåãçåãã"
-
-#: ../calendar/libedata-cal/e-data-cal.c:118
+#: ../calendar/libedata-cal/e-data-cal.c:430
 msgid "Unsupported method"
 msgstr "ãããããããããææãã"
 
-#: ../calendar/libedata-cal/e-data-cal.c:121
-msgid "Calendar does not exist"
-msgstr "ãããããååãããã"
-
-#: ../calendar/libedata-cal/e-data-cal.c:122
-msgid "Unknown user"
-msgstr "ããããçåããããã"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:608
-#, c-format
-msgid "Cannot retrieve calendar address: %s"
-msgstr "ããããããããããååããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:633
-#, c-format
-msgid "Cannot retrieve calendar alarm e-mail address: %s"
-msgstr "ããããããããããéäãã E-ããããããããååããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:658
-#, c-format
-msgid "Cannot retrieve calendar's LDAP attribute: %s"
-msgstr "ããããã LDAP åæãååããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:683
-#, c-format
-msgid "Cannot retrieve calendar scheduling information: %s"
-msgstr "ãããããäåæåãååããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:707
-#, c-format
-msgid "Cannot open calendar: %s"
-msgstr "ãããããéãããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:728
-#, c-format
-msgid "Cannot refresh calendar: %s"
-msgstr "ãããããææããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:747
-#, c-format
-msgid "Cannot remove calendar: %s"
-msgstr "ãããããåéããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:768
-#, c-format
-msgid "Cannot create calendar object: %s"
-msgstr "ãããããããããããäæããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:796
-#, c-format
-msgid "Cannot modify calendar object: %s"
-msgstr "ãããããããããããåæããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:822
-#, c-format
-msgid "Cannot remove calendar object: %s"
-msgstr "ãããããããããããåéããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:843
-#, c-format
-msgid "Cannot receive calendar objects: %s"
-msgstr "ãããããããããããåäããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:862
-#, c-format
-msgid "Cannot discard calendar alarm: %s"
-msgstr "ããããããããããçæããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:883
-#, c-format
-msgid "Cannot send calendar objects: %s"
-msgstr "ãããããããããããéäããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:910
-#, c-format
-msgid "Cannot retrieve default calendar object path: %s"
-msgstr "ããããããããããããæåããããååããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:935
-#, c-format
-msgid "Cannot retrieve calendar object path: %s"
-msgstr "ãããããããããããããããååããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:960
-#, c-format
-msgid "Cannot retrieve calendar object list: %s"
-msgstr "ãããããããããããäèãååããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:988
-#, c-format
-msgid "Could not retrieve attachment list: %s"
-msgstr "æäãããããäèãååãããããããã: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:989
+#, fuzzy
+#| msgid "Cannot open calendar: %s"
+msgid "Cannot open calendar: "
+msgstr "ããããããéãããã: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
+#. Translators: This is prefix to a detailed error message
 #: ../calendar/libedata-cal/e-data-cal.c:1014
-#, c-format
-msgid "Could not complete calendar query: %s"
-msgstr "ãããããæçãåäãããããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1039
-#, c-format
-msgid "Could not retrieve calendar time zone: %s"
-msgstr "ããããããããããããååãããããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1064
-#, c-format
-msgid "Could not add calendar time zone: %s"
-msgstr "ããããããããããããèåãããããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1083
-#, c-format
-msgid "Could not set default calendar time zone: %s"
-msgstr "ãããããæåããããããããèåãããããããã: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1106
-#, c-format
-msgid "Cannot retrieve calendar changes: %s"
-msgstr "ãããããåæãååãããããããã: %s"
+#, fuzzy
+#| msgid "Cannot remove calendar: %s"
+msgid "Cannot remove calendar: "
+msgstr "ããããããåéããããã: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1041
+#, fuzzy
+#| msgid "Cannot refresh calendar: %s"
+msgid "Cannot refresh calendar: "
+msgstr "ããããããææããããã: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1070
+#, fuzzy
+#| msgid "Cannot retrieve calendar address: %s"
+msgid "Cannot retrieve backend property: "
+msgstr "ãããããããããããååããããã: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1125
+#, fuzzy
+#| msgid "Cannot retrieve calendar object path: %s"
+msgid "Cannot retrieve calendar object path: "
+msgstr "ããããããããããããããããååããããã: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1155
+#, fuzzy
+#| msgid "Cannot retrieve calendar object list: %s"
+msgid "Cannot retrieve calendar object list: "
+msgstr "ããããããããããããäèãååããããã: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1184
+#, fuzzy
+#| msgid "Cannot retrieve calendar free/busy list: %s"
+msgid "Cannot retrieve calendar free/busy list: "
+msgstr "ããããããäåãæçãäèãååããããã: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1215
+#, fuzzy
+#| msgid "Cannot create calendar object: %s"
+msgid "Cannot create calendar object: "
+msgstr "ããããããããããããäæããããã: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1247
+#, fuzzy
+#| msgid "Cannot modify calendar object: %s"
+msgid "Cannot modify calendar object: "
+msgstr "ããããããããããããåæããããã: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1281
+#, fuzzy
+#| msgid "Cannot remove calendar object: %s"
+msgid "Cannot remove calendar object: "
+msgstr "ããããããããããããåéããããã: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1308
+#, fuzzy
+#| msgid "Cannot receive calendar objects: %s"
+msgid "Cannot receive calendar objects: "
+msgstr "ããããããããããããåäããããã: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1339
+#, fuzzy
+#| msgid "Cannot send calendar objects: %s"
+msgid "Cannot send calendar objects: "
+msgstr "ããããããããããããéäããããã: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1371
+#, fuzzy
+#| msgid "Could not retrieve attachment list: %s"
+msgid "Could not retrieve attachment uris: "
+msgstr "æäãããããäèãååãããããããã: %s"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/libedata-cal/e-data-cal.c:1137
-#, c-format
-msgid "Cannot retrieve calendar free/busy list: %s"
-msgstr "ãããããäåãæçãäèãååããããã: %s"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1399
+#, fuzzy
+#| msgid "Could not store folder: %s"
+msgid "Could not discard reminder: "
+msgstr "ããããããäåãããããããã: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1428
+#, fuzzy
+#| msgid "Could not retrieve calendar time zone: %s"
+msgid "Could not get calendar view path: "
+msgstr "ãããããããããããããååãããããããã: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1458
+#, fuzzy
+#| msgid "Could not retrieve calendar time zone: %s"
+msgid "Could not retrieve calendar time zone: "
+msgstr "ãããããããããããããååãããããããã: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1484
+#, fuzzy
+#| msgid "Could not add calendar time zone: %s"
+msgid "Could not add calendar time zone: "
+msgstr "ãããããããããããããèåãããããããã: %s"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:387
+#, fuzzy, c-format
+#| msgid "Invalid range"
+msgid "Invalid call"
+msgstr "æåçåãçåãã"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:375
+#: ../calendar/libedata-cal/e-data-cal-factory.c:428
 #, c-format
 msgid "Invalid URI"
 msgstr "çåã URI ãã"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:393
+#: ../calendar/libedata-cal/e-data-cal-factory.c:446
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "'%2$s' ã '%1$s' ããããããããããããã"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:443
+#: ../calendar/libedata-cal/e-data-cal-factory.c:489
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "ããããããããããããããçæãããããããã"
@@ -1615,22 +1747,12 @@ msgstr "ããããããæåãèéããããã"
 msgid "Unable to create cache path"
 msgstr "ããããããããããçæããããã"
 
-#: ../camel/camel-data-cache.c:496
+#: ../camel/camel-data-cache.c:504
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "ãããããããããããéããããããã: %s: %s"
 
-#: ../camel/camel-data-wrapper.c:143
-#, c-format
-msgid "No stream available"
-msgstr "åçãããããããããããããã"
-
-#: ../camel/camel-db.c:455
-#, c-format
-msgid "Insufficient memory"
-msgstr "ããããèãããã"
-
-#: ../camel/camel-disco-diary.c:195
+#: ../camel/camel-disco-diary.c:201
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1638,11 +1760,11 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 "ãããæãèããããããã: %s\n"
-"ãããããããåæçããããããããããåãã\n"
+"ãããããããåæçãããããããããããåãã\n"
 "ããäéãæäãåçãããããã"
 
-#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:300
+#: ../camel/camel-disco-diary.c:266
+#: ../camel/providers/imap/camel-imap-journal.c:309
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1651,132 +1773,175 @@ msgid ""
 msgstr ""
 "'%s' ãéããããããã:\n"
 "%s\n"
-"ãããããããåããåæãåãåæãããããããããããã"
+"ããããããããåããåæãåãåæãããããããããããã"
 
-#: ../camel/camel-disco-diary.c:304
+#: ../camel/camel-disco-diary.c:310
 msgid "Resynchronizing with server"
-msgstr "ããããååæä"
+msgstr "ãããããååæä"
 
-#: ../camel/camel-disco-folder.c:63 ../camel/camel-offline-folder.c:79
+#: ../camel/camel-disco-folder.c:72 ../camel/camel-offline-folder.c:89
 msgid "Downloading new messages for offline mode"
 msgstr "ãããããããããããæçããããããããããä"
 
-#: ../camel/camel-disco-folder.c:398
+#: ../camel/camel-disco-folder.c:410
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "ããããããåãæããæåä: %s"
 
-#: ../camel/camel-disco-folder.c:464 ../camel/camel-offline-folder.c:312
+#: ../camel/camel-disco-folder.c:476 ../camel/camel-offline-folder.c:325
 msgid "Copy folder content locally for offline operation"
-msgstr "ãããããååããããããããããã (ãããããç)"
-
-#: ../camel/camel-disco-store.c:420
-#: ../camel/providers/groupwise/camel-groupwise-store.c:228
-#: ../camel/providers/imap/camel-imap-store.c:1250
-#: ../camel/providers/imap/camel-imap-store.c:1771
-#: ../camel/providers/imap/camel-imap-store.c:2244
-#: ../camel/providers/imap/camel-imap-store.c:3094
-#: ../camel/providers/imapx/camel-imapx-folder.c:298
-#: ../camel/providers/imapx/camel-imapx-folder.c:331
-#: ../camel/providers/imapx/camel-imapx-folder.c:385
-#: ../camel/providers/imapx/camel-imapx-folder.c:431
-#: ../camel/providers/imapx/camel-imapx-folder.c:465
-#: ../camel/providers/imapx/camel-imapx-folder.c:505
-#: ../camel/providers/imapx/camel-imapx-folder.c:541
-#: ../camel/providers/imapx/camel-imapx-store.c:276
-#: ../camel/providers/imapx/camel-imapx-store.c:1298
-#: ../camel/providers/imapx/camel-imapx-store.c:1386
-#: ../camel/providers/imapx/camel-imapx-store.c:1421
+msgstr "ããããããååããããããããããã (ãããããç)"
+
+#: ../camel/camel-disco-store.c:456
+#: ../camel/providers/imap/camel-imap-store.c:1157
+#: ../camel/providers/imap/camel-imap-store.c:1935
+#: ../camel/providers/imap/camel-imap-store.c:2430
+#: ../camel/providers/imap/camel-imap-store.c:3192
+#: ../camel/providers/imapx/camel-imapx-folder.c:324
+#: ../camel/providers/imapx/camel-imapx-folder.c:357
+#: ../camel/providers/imapx/camel-imapx-folder.c:411
+#: ../camel/providers/imapx/camel-imapx-folder.c:457
+#: ../camel/providers/imapx/camel-imapx-folder.c:491
+#: ../camel/providers/imapx/camel-imapx-folder.c:531
+#: ../camel/providers/imapx/camel-imapx-folder.c:567
+#: ../camel/providers/imapx/camel-imapx-store.c:242
+#: ../camel/providers/imapx/camel-imapx-store.c:1306
+#: ../camel/providers/imapx/camel-imapx-store.c:1394
+#: ../camel/providers/imapx/camel-imapx-store.c:1440
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "ããåäãåäãããããããããããäæãããããã"
 
-#: ../camel/camel-file-utils.c:722
+#: ../camel/camel-file-utils.c:732
 #, c-format
 msgid "Canceled"
 msgstr "ãããããæã"
 
-#: ../camel/camel-filter-driver.c:817 ../camel/camel-filter-search.c:582
+#: ../camel/camel-filter-driver.c:878 ../camel/camel-filter-search.c:697
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "åãããã '%s' ãçæãåæãããã: %s"
 
-#: ../camel/camel-filter-driver.c:864
+#: ../camel/camel-filter-driver.c:926
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s ããåäããããããããããããããæããããããã: %s"
 
-#: ../camel/camel-filter-driver.c:1051 ../camel/camel-filter-driver.c:1060
+#: ../camel/camel-filter-driver.c:1131 ../camel/camel-filter-driver.c:1140
 msgid "Syncing folders"
-msgstr "ãããããåæä"
+msgstr "ããããããåæä"
 
-#: ../camel/camel-filter-driver.c:1148 ../camel/camel-filter-driver.c:1598
+#: ../camel/camel-filter-driver.c:1235 ../camel/camel-filter-driver.c:1681
 #, c-format
 msgid "Error parsing filter: %s: %s"
-msgstr "ãããããææèæäãããã: %s: %s"
+msgstr "ããããããææèæäãããã: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1159 ../camel/camel-filter-driver.c:1609
+#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1692
 #, c-format
 msgid "Error executing filter: %s: %s"
-msgstr "ããããåèäãããã: %s: %s"
+msgstr "ãããããåèäãããã: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1256
+#: ../camel/camel-filter-driver.c:1344
 #, c-format
 msgid "Unable to open spool folder"
-msgstr "ããããããããããéãããã"
+msgstr "ãããããããããããéãããã"
 
-#: ../camel/camel-filter-driver.c:1267
+#: ../camel/camel-filter-driver.c:1355
 #, c-format
 msgid "Unable to process spool folder"
-msgstr "ããããããããããåçããããã"
+msgstr "ãããããããããããåçããããã"
 
-#: ../camel/camel-filter-driver.c:1285
+#: ../camel/camel-filter-driver.c:1373
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "ããããã %d ãååä (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1292 ../camel/camel-filter-driver.c:1314
+#: ../camel/camel-filter-driver.c:1380 ../camel/camel-filter-driver.c:1402
 #, c-format
 msgid "Failed on message %d"
 msgstr "ããããã %d ãåæãããã"
 
-#: ../camel/camel-filter-driver.c:1329 ../camel/camel-filter-driver.c:1434
+#: ../camel/camel-filter-driver.c:1417 ../camel/camel-filter-driver.c:1518
 msgid "Syncing folder"
-msgstr "ãããããåæä"
+msgstr "ããããããåæä"
 
-#: ../camel/camel-filter-driver.c:1334 ../camel/camel-filter-driver.c:1440
+#: ../camel/camel-filter-driver.c:1422 ../camel/camel-filter-driver.c:1524
 msgid "Complete"
 msgstr "åäãããã"
 
-#: ../camel/camel-filter-driver.c:1398
+#: ../camel/camel-filter-driver.c:1482
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "ããããã %d / %d ãååä"
 
-#: ../camel/camel-filter-driver.c:1416
+#: ../camel/camel-filter-driver.c:1500
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "ããããã %d / %d ãåæãããã"
 
-#: ../camel/camel-filter-search.c:135
+#: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
 msgstr "ããããããååãåæãããã"
 
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:447
 msgid "Invalid arguments to (system-flag)"
 msgstr "(system-flag) ãåããçåãåæ"
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:465
 msgid "Invalid arguments to (user-tag)"
 msgstr "(user-tag) ãåããçåãåæ"
 
-#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
+#: ../camel/camel-filter-search.c:874 ../camel/camel-filter-search.c:883
 #, c-format
 msgid "Error executing filter search: %s: %s"
-msgstr "ããããæçåèäãããã: %s: %s"
+msgstr "ãããããæçåèäãããã: %s: %s"
+
+#: ../camel/camel-folder.c:243
+#, 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
+#, 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
+#, c-format
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "'%s' ãããæããããããããããããããããä"
+
+#: ../camel/camel-folder.c:902
+#: ../camel/providers/local/camel-maildir-folder.c:319
+msgid "Moving messages"
+msgstr "ããããããçåä"
+
+#: ../camel/camel-folder.c:905
+msgid "Copying messages"
+msgstr "ãããããããããä"
 
-#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:624
+#: ../camel/camel-folder.c:1160
+#, c-format
+msgid "Quota information not supported for folder '%s'"
+msgstr ""
+
+#: ../camel/camel-folder.c:3271
+#, fuzzy, c-format
+#| msgid "Retrieving message '%s'"
+msgid "Retrieving message '%s' in %s"
+msgstr "ããããã '%s' ãååä"
+
+#: ../camel/camel-folder.c:3404
+#, 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
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1785,8 +1950,8 @@ msgstr ""
 "æèèçãææãèæããããã: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:354 ../camel/camel-folder-search.c:465
-#: ../camel/camel-folder-search.c:636
+#: ../camel/camel-folder-search.c:360 ../camel/camel-folder-search.c:471
+#: ../camel/camel-folder-search.c:642
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1795,76 +1960,48 @@ msgstr ""
 "æèèçããæçãåèäãããã: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:840 ../camel/camel-folder-search.c:882
+#. 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
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) ããèççæãåèãã"
 
-#: ../camel/camel-folder-search.c:935
+#. Translators: Each '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:960
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ã %s ãäãåãããããããããã"
 
-#: ../camel/camel-folder-search.c:941 ../camel/camel-folder-search.c:948
+#. 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
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) ããæçãçéãèãæååãåèãã"
 
-#: ../camel/camel-folder-search.c:975
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:1003
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) ãéåãçæãæåããã"
 
-#: ../camel/camel-folder-search.c:984
+#. Translators: The '%s' is an element type name, part of an expressing language
+#: ../camel/camel-folder-search.c:1013
 #, c-format
 msgid "(%s) requires the folder set"
-msgstr "(%s) ãããããããçãåèãã"
-
-#: ../camel/camel-folder.c:216
-#, c-format
-msgid "Learning new spam message in '%s'"
-msgid_plural "Learning new spam messages in '%s'"
-msgstr[0] "'%s' ãããæããããããããããããåçä"
-
-#: ../camel/camel-folder.c:240
-#, c-format
-msgid "Learning new ham message in '%s'"
-msgid_plural "Learning new ham messages in '%s'"
-msgstr[0] "'%s' ãããæãããããããããããåçä"
-
-#: ../camel/camel-folder.c:266
-#, c-format
-msgid "Filtering new message in '%s'"
-msgid_plural "Filtering new messages in '%s'"
-msgstr[0] "'%s' ãããæãããããããããããããããä"
-
-#: ../camel/camel-folder.c:875
-#: ../camel/providers/local/camel-maildir-folder.c:293
-msgid "Moving messages"
-msgstr "ããããããçåä"
+msgstr "(%s) ããããããããçãåèãã"
 
-#: ../camel/camel-folder.c:878
-msgid "Copying messages"
-msgstr "ãããããããããä"
-
-#: ../camel/camel-folder.c:3247
-#, c-format
-msgid "Retrieving message '%s'"
-msgstr "ããããã '%s' ãååä"
-
-#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
-#: ../camel/camel-gpg-context.c:1272
+#: ../camel/camel-gpg-context.c:657 ../camel/camel-gpg-context.c:662
+#: ../camel/camel-gpg-context.c:1288
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "GPG ãåèãåæãããã: %s"
 
-#: ../camel/camel-gpg-context.c:647
-#: ../camel/providers/smtp/camel-smtp-transport.c:723
-#: ../camel/providers/smtp/camel-smtp-transport.c:778
+#: ../camel/camel-gpg-context.c:662
+#: ../camel/providers/smtp/camel-smtp-transport.c:762
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../camel/camel-gpg-context.c:711
+#: ../camel/camel-gpg-context.c:727
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1875,17 +2012,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:728
+#: ../camel/camel-gpg-context.c:744
 #, c-format
 msgid "Failed to parse gpg userid hint."
-msgstr "GnuPG ãããã ID ããããèæãåæããããã"
+msgstr "GnuPG ããããã ID ããããèæãåæããããã"
 
-#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
+#: ../camel/camel-gpg-context.c:769 ../camel/camel-gpg-context.c:784
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "GnuPG ãããããããèæãèæãåæããããã"
 
-#: ../camel/camel-gpg-context.c:789
+#: ../camel/camel-gpg-context.c:805
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1894,116 +2031,96 @@ msgstr ""
 "ãäãããããããããããããèéãããã\n"
 "PIN ãåèãã: \"%s\""
 
-#: ../camel/camel-gpg-context.c:793
+#: ../camel/camel-gpg-context.c:809
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
-"æããããããããèéãããããããããããåèãã:\n"
+"æãããããããããèéãããããããããããåèãã:\n"
 " \"%s\""
 
-#: ../camel/camel-gpg-context.c:799
+#: ../camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "'%s' ãåãã GnuPG ããæååãèæãããããã"
 
-#: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
-#: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:4892
-#: ../camel/providers/imapx/camel-imapx-server.c:4909
-#: ../camel/providers/imapx/camel-imapx-store.c:198
-#: ../camel/providers/nntp/camel-nntp-summary.c:405
-#: ../camel/providers/pop3/camel-pop3-folder.c:366
-#: ../camel/providers/pop3/camel-pop3-folder.c:431
-#: ../camel/providers/pop3/camel-pop3-folder.c:506
-#: ../camel/providers/pop3/camel-pop3-store.c:487
-#: ../libedataserverui/e-book-auth-util.c:229
+#: ../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:5014
+#: ../camel/providers/imapx/camel-imapx-server.c:5031
+#: ../camel/providers/imapx/camel-imapx-store.c:161
+#: ../camel/providers/nntp/camel-nntp-summary.c:414
+#: ../libedataserver/e-client.c:134 ../libedataserverui/e-book-auth-util.c:227
 #, c-format
 msgid "Cancelled"
 msgstr "ãããããæã"
 
-#: ../camel/camel-gpg-context.c:846
+#: ../camel/camel-gpg-context.c:862
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "çåéãèéãåæãããã: æåããäãããããããããããããããã"
 
-#: ../camel/camel-gpg-context.c:858
+#: ../camel/camel-gpg-context.c:874
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG ããæååãåçãããããã: %s"
 
-#: ../camel/camel-gpg-context.c:989
+#: ../camel/camel-gpg-context.c:1005
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "æååãåæãããã: æããååãæåãããããããã"
 
-#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
+#: ../camel/camel-gpg-context.c:1552 ../camel/camel-smime-context.c:827
 msgid "Could not generate signing data: "
 msgstr "çåããããçæãããããããã: "
 
-#: ../camel/camel-gpg-context.c:1582 ../camel/camel-gpg-context.c:1782
-#: ../camel/camel-gpg-context.c:1892 ../camel/camel-gpg-context.c:2038
-#: ../camel/camel-gpg-context.c:2137 ../camel/camel-gpg-context.c:2185
+#: ../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
 msgid "Failed to execute gpg."
 msgstr "GPG ãåèãåæããããã"
 
-#: ../camel/camel-gpg-context.c:1662 ../camel/camel-gpg-context.c:1670
-#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1697
-#: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
-#: ../camel/camel-smime-context.c:971
+#: ../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-smime-context.c:953 ../camel/camel-smime-context.c:967
+#: ../camel/camel-smime-context.c:976
 #, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "ãããããããçåãæåæãçèããããã: ããããããæåãæãããããã"
 "ã"
 
-#: ../camel/camel-gpg-context.c:1737
+#: ../camel/camel-gpg-context.c:1758
 msgid "Cannot verify message signature: "
 msgstr "ãããããããçåãæåæãçèããããã: "
 
-#: ../camel/camel-gpg-context.c:1858
+#: ../camel/camel-gpg-context.c:1881
 msgid "Could not generate encrypting data: "
 msgstr "æååãããããããçæãããããããã: "
 
-#: ../camel/camel-gpg-context.c:1911
+#: ../camel/camel-gpg-context.c:1934
 msgid "This is a digitally encrypted message part"
 msgstr "ãããããããçåãããéåãã"
 
-#: ../camel/camel-gpg-context.c:1969 ../camel/camel-gpg-context.c:1978
-#: ../camel/camel-gpg-context.c:2001
+#: ../camel/camel-gpg-context.c:1992 ../camel/camel-gpg-context.c:2001
+#: ../camel/camel-gpg-context.c:2024
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "ããããããèèããããã: ããããããæåãæããããããã"
 
-#: ../camel/camel-gpg-context.c:1989
+#: ../camel/camel-gpg-context.c:2012
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME åãæåèèãåæãããã: ããããããããã"
 
-#: ../camel/camel-gpg-context.c:2078 ../camel/camel-smime-context.c:1255
+#: ../camel/camel-gpg-context.c:2103 ../camel/camel-smime-context.c:1264
 msgid "Encrypted content"
 msgstr "æååããåå"
 
-#: ../camel/camel-lock-client.c:106
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "ãããããããããããããããæçããããã: %s"
-
-#: ../camel/camel-lock-client.c:130
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "ããããããããããããããããäæããããã: %s"
-
-#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "'%s' ãããããããããããã: lock-helper ãããããããããããã"
-
-#: ../camel/camel-lock-client.c:227
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "'%s' ããããããããã"
+#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr ""
 
 #: ../camel/camel-lock.c:102
 #, c-format
@@ -2026,6 +2143,26 @@ msgstr "fcntl(2) ãäããããããåæãããã: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) ãäããããããåæãããã: %s"
 
+#: ../camel/camel-lock-client.c:106
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "ãããããããããããããããæçããããã: %s"
+
+#: ../camel/camel-lock-client.c:130
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "ããããããããããããããããäæããããã: %s"
+
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "'%s' ãããããããããããã: lock-helper ãããããããããããã"
+
+#: ../camel/camel-lock-client.c:227
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "'%s' ããããããããã"
+
 #: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -2075,92 +2212,106 @@ msgstr "ãããããããããèãèãäãããã: %s"
 msgid "Error writing mail temp file: %s"
 msgstr "ãããäæãããããæãèãäãããã: %s"
 
-#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
+#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "ãããäæããããããããäãããã: %s"
 
-#: ../camel/camel-multipart-signed.c:327
+#: ../camel/camel-multipart-signed.c:297
 #, c-format
 msgid "No content available"
 msgstr "åçãããããããããããããã"
 
-#: ../camel/camel-multipart-signed.c:335
+#: ../camel/camel-multipart-signed.c:305
 #, c-format
 msgid "No signature available"
 msgstr "åçãããçåãããããã"
 
-#: ../camel/camel-multipart-signed.c:663
+#: ../camel/camel-multipart-signed.c:689
 #, c-format
 msgid "parse error"
 msgstr "èæããã"
 
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-network-service.c:99
+#, c-format
+msgid "Could not connect to %s: %s"
+msgstr "%s ãæçãããããããã: %s"
+
+#: ../camel/camel-network-service.c:100
+msgid "SSL unavailable"
+msgstr "SSL ãçåãã"
+
+#: ../camel/camel-network-service.c:123
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "%s ãæçãããããããã: "
+
+#: ../camel/camel-net-utils.c:703
 #, c-format
 msgid "Resolving: %s"
 msgstr "èæä: %s"
 
-#: ../camel/camel-net-utils.c:718
+#: ../camel/camel-net-utils.c:726
 msgid "Host lookup failed"
 msgstr "ããããæçãåæãããã"
 
-#: ../camel/camel-net-utils.c:724
+#: ../camel/camel-net-utils.c:732
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "ããããæçãåæãããã: %s: %s"
 
-#: ../camel/camel-net-utils.c:845
+#: ../camel/camel-net-utils.c:853
 msgid "Resolving address"
 msgstr "ãããããèæä"
 
-#: ../camel/camel-net-utils.c:866
+#: ../camel/camel-net-utils.c:874
 msgid "Name lookup failed"
 msgstr "ååãæçãåæãããã"
 
-#: ../camel/camel-net-utils.c:872
+#: ../camel/camel-net-utils.c:880
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "ååãæçãåæãããã: %s"
 
-#: ../camel/camel-offline-folder.c:189
+#: ../camel/camel-offline-folder.c:202
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
-msgstr "ãããã '%s' ãããããããããåæããäåä"
+msgstr "ããããã '%s' ãããããããããåæããäåä"
 
-#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
+#: ../camel/camel-offline-journal.c:147 ../camel/camel-offline-journal.c:177
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
-msgstr "ãããã '%s' ãããããããããããããæãèãããã: %s"
+msgstr "ããããã '%s' ãããããããããããããæãèãããã: %s"
 
 #: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
-msgstr "äæãããããããããããããã"
+msgstr "äæãããããããããããããããã"
 
 #: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
-msgstr "ããäããããããããããããããããããããèã"
+msgstr "ããäãããããããããããããããããããããèã"
 
-#: ../camel/camel-provider.c:188
+#: ../camel/camel-provider.c:192
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "%s ãèãèããããããã: ããããããããããããããèãèãããããããã"
 "ããããã"
 
-#: ../camel/camel-provider.c:197
+#: ../camel/camel-provider.c:201
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "%s ãèãèããããããã: %s"
 
-#: ../camel/camel-provider.c:206
+#: ../camel/camel-provider.c:210
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ãèãèããããããã: ããããããããããåæåãããããããã"
 
-#: ../camel/camel-provider.c:388 ../camel/camel-session.c:202
+#: ../camel/camel-provider.c:394 ../camel/camel-session.c:351
 #, c-format
 msgid "No provider available for protocol '%s'"
-msgstr "'%s' ãããããããããåçãããããããããããããã"
+msgstr "'%s' ãããããããããåçããããããããããããããã"
 
 #: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
@@ -2168,7 +2319,7 @@ msgstr "åå"
 
 #: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
-msgstr "ããããããããååãããããäããããããæçãããã"
+msgstr "ããããããããååãããããäãããããããæçãããã"
 
 #: ../camel/camel-sasl-anonymous.c:70
 #, c-format
@@ -2211,8 +2362,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"ããããããããããããååãããããããããããããããäèããã CRAM-"
-"MD5 èèãäããããããæçãããã"
+"ãããããããããããããååãããããããããããããããäèããã CRAM-"
+"MD5 èèãäãããããããæçãããã"
 
 #: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
@@ -2223,40 +2374,40 @@ msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"ããããããããããããååãããããããããããããããäèããã DIGEST-"
-"MD5 ãäããããããæçãããã"
+"ãããããããããããããååãããããããããããããããäèããã "
+"DIGEST-MD5 ãäãããããããæçãããã"
 
-#: ../camel/camel-sasl-digest-md5.c:817
+#: ../camel/camel-sasl-digest-md5.c:830
 #, c-format
 msgid "Server challenge too long (>2048 octets)"
-msgstr "ãããèæãéãããã (2048 octet ääãã)"
+msgstr "ããããèæãéãããã (2048 octet ääãã)"
 
-#: ../camel/camel-sasl-digest-md5.c:828
+#: ../camel/camel-sasl-digest-md5.c:841
 #, c-format
 msgid "Server challenge invalid\n"
 msgstr "çåãã\n"
 
-#: ../camel/camel-sasl-digest-md5.c:836
+#: ../camel/camel-sasl-digest-md5.c:849
 #, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr ""
-"ãããèæããããã \"äèåè (QOP: Quality of Protection)\" ããããããå"
-"ãããããã"
+"ããããèæããããã \"äèåè (QOP: Quality of Protection)\" ãããããã"
+"åãããããã"
 
-#: ../camel/camel-sasl-digest-md5.c:871
+#: ../camel/camel-sasl-digest-md5.c:883
 #, c-format
 msgid "Server response did not contain authorization data"
-msgstr "ããããåçãèèããããããããã"
+msgstr "ãããããåçãèèããããããããã"
 
-#: ../camel/camel-sasl-digest-md5.c:892
+#: ../camel/camel-sasl-digest-md5.c:904
 #, c-format
 msgid "Server response contained incomplete authorization data"
-msgstr "ããããåçãäååãèèãããããããã"
+msgstr "ãããããåçãäååãèèãããããããã"
 
-#: ../camel/camel-sasl-digest-md5.c:905
+#: ../camel/camel-sasl-digest-md5.c:917
 #, c-format
 msgid "Server response does not match"
-msgstr "ããããåçãäèãããã"
+msgstr "ãããããåçãäèãããã"
 
 #: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
@@ -2264,7 +2415,7 @@ msgstr "GSSAPI"
 
 #: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr "ãããããããã Kerberos 5 èèãäããããããæçãããã"
+msgstr "ãããããããã Kerberos 5 èèãäãããããããæçãããã"
 
 #: ../camel/camel-sasl-gssapi.c:129
 msgid ""
@@ -2326,17 +2477,17 @@ msgstr "èææãåæããæåæããããããåæããããã
 msgid "The referenced credentials have expired."
 msgstr "åçããããèææãæéãéãããããã"
 
-#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:310
-#: ../camel/camel-sasl-gssapi.c:354 ../camel/camel-sasl-gssapi.c:371
-#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#: ../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:1232
 #, c-format
 msgid "Bad authentication response from server."
-msgstr "ãããããééããèèåçããããããã"
+msgstr "ããããããééããèèåçããããããã"
 
-#: ../camel/camel-sasl-gssapi.c:383
+#: ../camel/camel-sasl-gssapi.c:394
 #, c-format
 msgid "Unsupported security layer."
-msgstr "ãããããããããããããããããããããã"
+msgstr "ããããããããããããããããããããããã"
 
 #: ../camel/camel-sasl-login.c:35
 msgid "Login"
@@ -2344,24 +2495,24 @@ msgstr "ãããã"
 
 #: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
-msgstr "ããããããããçåãããããããäããããããæçãããã"
+msgstr "ããããããããçåãããããããäãããããããæçãããã"
 
-#: ../camel/camel-sasl-login.c:91
+#: ../camel/camel-sasl-login.c:92
 #, c-format
 msgid "Unknown authentication state."
 msgstr "çåããããèèçæããã"
 
-#: ../camel/camel-sasl-ntlm.c:37
+#: ../camel/camel-sasl-ntlm.c:42
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:39
+#: ../camel/camel-sasl-ntlm.c:44
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
 msgstr ""
 "ãããããããã NTLM/ããããããäèããããããããèèãäãã Windows "
-"ããããæçãããã"
+"ãããããæçãããã"
 
 #: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
@@ -2375,18 +2526,21 @@ msgstr "POP before SMTP"
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "ãããããããã SMTP æçãççããåã POP æçãèèãèããã"
 
-#: ../camel/camel-sasl-popb4smtp.c:79
-msgid "POP Source URI"
+#: ../camel/camel-sasl-popb4smtp.c:80
+#, fuzzy
+#| msgid "POP Source URI"
+msgid "POP Source UID"
 msgstr "POP ããã URI"
 
-#: ../camel/camel-sasl-popb4smtp.c:86
+#: ../camel/camel-sasl-popb4smtp.c:92
 #, c-format
 msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "äæãèéãåçãã POP Before SMTP èèãã"
 
-#: ../camel/camel-sasl-popb4smtp.c:94
-#, c-format
-msgid "POP Before SMTP authentication using a non-POP source"
+#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
+#, fuzzy, c-format
+#| msgid "POP Before SMTP authentication using a non-POP source"
+msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "POP ããããåçããã POP Before SMTP ãã"
 
 #: ../camel/camel-search-private.c:112
@@ -2394,338 +2548,368 @@ msgstr "POP ããããåçããã POP Before SMTP ãã"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "æèèçãçéãåæ: %s: %s"
 
-#: ../camel/camel-service.c:85
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL '%s' ããããåããããããããåèãã"
+#: ../camel/camel-service.c:524
+#, fuzzy, c-format
+#| msgid "URL '%s' needs a username component"
+msgid "URL '%s' needs a user component"
+msgstr "URL '%s' ãããããåããããããããåèãã"
 
-#: ../camel/camel-service.c:89
+#: ../camel/camel-service.c:535
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' ãããããããããããããåèãã"
 
-#: ../camel/camel-service.c:93
+#: ../camel/camel-service.c:546
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' ããããããããããããåèãã"
 
-#: ../camel/camel-session.c:256
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"ãããã %s ãäæãããããããã:\n"
-"%s"
+#: ../camel/camel-session.c:361
+#, fuzzy, c-format
+#| msgid "No provider available for protocol '%s'"
+msgid "Invalid GType registered for protocol '%s'"
+msgstr "'%s' ãããããããããåçããããããããããããããã"
 
-#: ../camel/camel-session.c:753
+#: ../camel/camel-session.c:941
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "%s%s %s ãããããããååããããããã"
 
-#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1048
+#: ../camel/camel-smime-context.c:347 ../camel/camel-smime-context.c:1053
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "'%s' ãèææãèãããããã"
 
-#: ../camel/camel-smime-context.c:372
+#: ../camel/camel-smime-context.c:375
 msgid "Cannot create CMS message"
 msgstr "CMS ããããããäæããããã"
 
-#: ../camel/camel-smime-context.c:377
+#: ../camel/camel-smime-context.c:380
 msgid "Cannot create CMS signed data"
 msgstr "CMS çåããããäæããããã"
 
-#: ../camel/camel-smime-context.c:383
+#: ../camel/camel-smime-context.c:386
 msgid "Cannot attach CMS signed data"
 msgstr "CMS çåããããæäããããã"
 
-#: ../camel/camel-smime-context.c:390
+#: ../camel/camel-smime-context.c:393
 msgid "Cannot attach CMS data"
 msgstr "CMS ããããæäããããã"
 
-#: ../camel/camel-smime-context.c:396
+#: ../camel/camel-smime-context.c:399
 msgid "Cannot create CMS Signer information"
 msgstr "CMS çåèãæåãäæããããã"
 
-#: ../camel/camel-smime-context.c:402
+#: ../camel/camel-smime-context.c:405
 msgid "Cannot find certificate chain"
 msgstr "èèãããããèãããããã"
 
-#: ../camel/camel-smime-context.c:408
+#: ../camel/camel-smime-context.c:411
 msgid "Cannot add CMS Signing time"
 msgstr "CMS çåæåãèåããããã"
 
-#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
+#: ../camel/camel-smime-context.c:435 ../camel/camel-smime-context.c:450
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "'%s' ãæååèææãããããã"
 
-#: ../camel/camel-smime-context.c:454
+#: ../camel/camel-smime-context.c:457
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "åæ SMIMEEncKeyPrefs ãèåããããã"
 
-#: ../camel/camel-smime-context.c:459
+#: ../camel/camel-smime-context.c:462
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "åæ MS SMIMEEncKeyPrefs ãèåããããã"
 
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:467
 msgid "Cannot add encryption certificate"
 msgstr "æååèææãèåããããã"
 
-#: ../camel/camel-smime-context.c:470
+#: ../camel/camel-smime-context.c:473
 msgid "Cannot add CMS Signer information"
 msgstr "CMS çåèæåãèåããããã"
 
 #. Translators: A fallback message when couldn't verify an SMIME signature
-#: ../camel/camel-smime-context.c:503
+#: ../camel/camel-smime-context.c:506
 msgid "Unverified"
 msgstr "ææè"
 
-#: ../camel/camel-smime-context.c:505
+#: ../camel/camel-smime-context.c:508
 msgid "Good signature"
 msgstr "èãçå"
 
-#: ../camel/camel-smime-context.c:507
+#: ../camel/camel-smime-context.c:510
 msgid "Bad signature"
 msgstr "æãçå"
 
-#: ../camel/camel-smime-context.c:509
+#: ../camel/camel-smime-context.c:512
 msgid "Content tampered with or altered in transit"
 msgstr "ããããèéäãäåãæçãããååãã"
 
-#: ../camel/camel-smime-context.c:511
+#: ../camel/camel-smime-context.c:514
 msgid "Signing certificate not found"
 msgstr "çåäãèææãããããããã"
 
-#: ../camel/camel-smime-context.c:513
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not trusted"
 msgstr "çåäãèææãäéããããã"
 
-#: ../camel/camel-smime-context.c:515
+#: ../camel/camel-smime-context.c:518
 msgid "Signature algorithm unknown"
 msgstr "çåãããããããäæãã"
 
-#: ../camel/camel-smime-context.c:517
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unsupported"
 msgstr "çåãããããããæãããããã"
 
-#: ../camel/camel-smime-context.c:519
+#: ../camel/camel-smime-context.c:522
 msgid "Malformed signature"
 msgstr "ããããçåãã"
 
-#: ../camel/camel-smime-context.c:521
+#: ../camel/camel-smime-context.c:524
 msgid "Processing error"
 msgstr "åçããããã"
 
-#: ../camel/camel-smime-context.c:566
+#: ../camel/camel-smime-context.c:569
 msgid "No signed data in signature"
 msgstr "çåãäãçåããããããããããã"
 
-#: ../camel/camel-smime-context.c:571
+#: ../camel/camel-smime-context.c:574
 msgid "Digests missing from enveloped data"
 msgstr "EnvelopedData ããããããããããããããã"
 
-#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
+#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:598
 msgid "Cannot calculate digests"
 msgstr "ãããããããèçããããã"
 
-#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
+#: ../camel/camel-smime-context.c:605 ../camel/camel-smime-context.c:609
 msgid "Cannot set message digests"
 msgstr "ããããããããããããããããããããã"
 
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
+#: ../camel/camel-smime-context.c:619 ../camel/camel-smime-context.c:624
 msgid "Certificate import failed"
 msgstr "èææãããããããåæãããã"
 
-#: ../camel/camel-smime-context.c:631
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "ãããããããèèãããããååæãæèããããã"
 
-#: ../camel/camel-smime-context.c:634
+#: ../camel/camel-smime-context.c:637
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "ãããããããããããæãæèæããèææããèèããã"
 
-#: ../camel/camel-smime-context.c:638
+#: ../camel/camel-smime-context.c:641
 msgid "Cannot find signature digests"
 msgstr "èææããããããããèãããããã"
 
-#: ../camel/camel-smime-context.c:654
+#: ../camel/camel-smime-context.c:657
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "çåè: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1121
+#: ../camel/camel-smime-context.c:838 ../camel/camel-smime-context.c:1126
 msgid "Cannot create encoder context"
-msgstr "ãããããããããããããäæããããã"
+msgstr "ããããããããããããããäæããããã"
 
-#: ../camel/camel-smime-context.c:841
+#: ../camel/camel-smime-context.c:844
 msgid "Failed to add data to CMS encoder"
-msgstr "CMS ãããããããããããèåãåæãããã"
+msgstr "CMS ããããããããããããèåãåæãããã"
 
-#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
+#: ../camel/camel-smime-context.c:849 ../camel/camel-smime-context.c:1143
 msgid "Failed to encode data"
 msgstr "ããããããããããåæãããã"
 
-#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
+#: ../camel/camel-smime-context.c:992 ../camel/camel-smime-context.c:1239
 msgid "Decoder failed"
-msgstr "ãããããããããã"
+msgstr "ããããããããããã"
 
-#: ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:1061
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "åéããããæååãããããããèãããããã"
 
-#: ../camel/camel-smime-context.c:1064
+#: ../camel/camel-smime-context.c:1069
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "æååãããéããããããçäããããã"
 
-#: ../camel/camel-smime-context.c:1075
+#: ../camel/camel-smime-context.c:1080
 msgid "Cannot create CMS Message"
 msgstr "CMS ããããããäæããããã"
 
-#: ../camel/camel-smime-context.c:1081
+#: ../camel/camel-smime-context.c:1086
 msgid "Cannot create CMS Enveloped data"
 msgstr "CMS Enveloped ããããäæããããã"
 
-#: ../camel/camel-smime-context.c:1087
+#: ../camel/camel-smime-context.c:1092
 msgid "Cannot attach CMS Enveloped data"
 msgstr "CMS Enveloped ããããæäããããã"
 
-#: ../camel/camel-smime-context.c:1093
+#: ../camel/camel-smime-context.c:1098
 msgid "Cannot attach CMS data object"
 msgstr "CMS ãããããããããããæäããããã"
 
-#: ../camel/camel-smime-context.c:1102
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot create CMS Recipient information"
 msgstr "CMS åéæåãäæããããã"
 
-#: ../camel/camel-smime-context.c:1107
+#: ../camel/camel-smime-context.c:1112
 msgid "Cannot add CMS Recipient information"
 msgstr "CMS åéæåãèåããããã"
 
-#: ../camel/camel-smime-context.c:1132
+#: ../camel/camel-smime-context.c:1137
 msgid "Failed to add data to encoder"
-msgstr "ãããããããããããèåãåæãããã"
+msgstr "ããããããããããããèåãåæãããã"
 
-#: ../camel/camel-smime-context.c:1240
+#: ../camel/camel-smime-context.c:1246
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME ååå: æååãããååãããããã"
 
-#: ../camel/camel-store.c:2181
+#: ../camel/camel-store.c:1815
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
-msgstr "'%s' ããããããããäæããããã: æãååããããã"
+msgstr "'%s' ãããããããããäæããããã: æãååããããã"
+
+#: ../camel/camel-store.c:1858
+#, fuzzy, c-format
+#| msgid "Syncing folders"
+msgid "Opening folder '%s'"
+msgstr "ããããããåæä"
+
+#: ../camel/camel-store.c:2043
+#, 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:2372 ../camel/camel-store.c:2382
+#: ../camel/camel-store.c:2055 ../camel/camel-store.c:2065
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "ããç"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2375 ../camel/camel-store.c:2386
+#: ../camel/camel-store.c:2058 ../camel/camel-store.c:2069
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ãããã"
 
-#: ../camel/camel-store.c:2829
+#: ../camel/camel-store.c:2520
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
-msgstr "ãããããäæããããã: %s: ãããããååããã"
+msgstr "ããããããäæããããã: %s: ããããããååããã"
+
+#: ../camel/camel-store.c:2534
+#, fuzzy, c-format
+#| msgid "Cannot get folder '%s': %s"
+msgid "Creating folder '%s'"
+msgstr "'%s' ãããããããããååããããã: %s"
 
-#: ../camel/camel-store.c:2956 ../camel/camel-vee-store.c:367
+#: ../camel/camel-store.c:2652 ../camel/camel-vee-store.c:352
 #: ../camel/providers/local/camel-maildir-store.c:272
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "ãããããåéããããã: %s: çåãæäãã"
+msgstr "ããããããåéããããã: %s: çåãæäãã"
 
-#: ../camel/camel-store.c:3097 ../camel/camel-vee-store.c:417
-#: ../camel/providers/local/camel-maildir-store.c:668
+#: ../camel/camel-store.c:2795 ../camel/camel-vee-store.c:402
+#: ../camel/providers/local/camel-maildir-store.c:710
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "ããããåãåæããããã: %s: çåãæäãã"
+msgstr "ãããããåãåæããããã: %s: çåãæäãã"
 
-#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
+#: ../camel/camel-stream-filter.c:327
+msgid "Only reset to beginning is supported with CamelStreamFilter"
+msgstr ""
+
+#: ../camel/camel-stream-process.c:267
+#, c-format
+msgid "Connection cancelled"
+msgstr "æçãããããããããã"
+
+#: ../camel/camel-stream-process.c:272
+#, c-format
+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
 #, c-format
 msgid "The proxy host does not support SOCKS4"
 msgstr "ãããããããã SOCKS 4 ããããããããããã"
 
-#: ../camel/camel-tcp-stream-raw.c:771
+#: ../camel/camel-tcp-stream-raw.c:778
 #, c-format
 msgid "The proxy host denied our request: code %d"
 msgstr "ããããããããããããããæåãããã: ããã %d"
 
-#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
+#: ../camel/camel-tcp-stream-raw.c:874 ../camel/camel-tcp-stream-raw.c:880
 #, c-format
 msgid "The proxy host does not support SOCKS5"
 msgstr "ãããããããã SOCKS 5 ããããããããã"
 
-#: ../camel/camel-tcp-stream-raw.c:879
+#: ../camel/camel-tcp-stream-raw.c:886
 #, c-format
 msgid "Could not find a suitable authentication type: code 0x%x"
 msgstr "éåããèèååãèããããããããã: ããã 0x%x"
 
-#: ../camel/camel-tcp-stream-raw.c:891
+#: ../camel/camel-tcp-stream-raw.c:898
 msgid "General SOCKS server failure"
-msgstr "SOCKS ããããäèçãåæãã"
+msgstr "SOCKS ãããããäèçãåæãã"
 
-#: ../camel/camel-tcp-stream-raw.c:892
+#: ../camel/camel-tcp-stream-raw.c:899
 msgid "SOCKS server's rules do not allow connection"
-msgstr "SOCKS ãããããããèåãããæçãèåããããã"
+msgstr "SOCKS ããããããããèåãããæçãèåããããã"
 
-#: ../camel/camel-tcp-stream-raw.c:893
+#: ../camel/camel-tcp-stream-raw.c:900
 msgid "Network is unreachable from SOCKS server"
-msgstr "SOCKS ããããããããããããåéããããã"
+msgstr "SOCKS ãããããããããããããåéããããã"
 
-#: ../camel/camel-tcp-stream-raw.c:894
+#: ../camel/camel-tcp-stream-raw.c:901
 msgid "Host is unreachable from SOCKS server"
-msgstr "SOCKS ãããããããããåéããããã"
+msgstr "SOCKS ããããããããããåéããããã"
 
-#: ../camel/camel-tcp-stream-raw.c:895
+#: ../camel/camel-tcp-stream-raw.c:902
 msgid "Connection refused"
 msgstr "æçãæåããããã"
 
-#: ../camel/camel-tcp-stream-raw.c:896
+#: ../camel/camel-tcp-stream-raw.c:903
 msgid "Time-to-live expired"
 msgstr "Time-to-live ãæéãåãããã"
 
-#: ../camel/camel-tcp-stream-raw.c:897
+#: ../camel/camel-tcp-stream-raw.c:904
 msgid "Command not supported by SOCKS server"
-msgstr "SOCKSãããããããããããããããããã"
+msgstr "SOCKSããããããããããããããããããã"
 
-#: ../camel/camel-tcp-stream-raw.c:898
+#: ../camel/camel-tcp-stream-raw.c:905
 msgid "Address type not supported by SOCKS server"
-msgstr "SOCKSããããããããããããããããååãã"
+msgstr "SOCKSãããããããããããããããããååãã"
 
-#: ../camel/camel-tcp-stream-raw.c:899
+#: ../camel/camel-tcp-stream-raw.c:906
 msgid "Unknown error from SOCKS server"
-msgstr "SOCKSããããããäæãããããã"
+msgstr "SOCKSãããããããäæãããããã"
 
-#: ../camel/camel-tcp-stream-raw.c:932
+#: ../camel/camel-tcp-stream-raw.c:939
 #, c-format
 msgid "Got unknown address type from SOCKS server"
-msgstr "SOCKS ãããããäæãããããååãååãããã"
+msgstr "SOCKS ããããããäæãããããååãååãããã"
 
-#: ../camel/camel-tcp-stream-raw.c:950
+#: ../camel/camel-tcp-stream-raw.c:957
 #, c-format
 msgid "Incomplete reply from SOCKS server"
-msgstr "SOCKS ããããããåçãäååãã"
+msgstr "SOCKS ãããããããåçãäååãã"
 
-#: ../camel/camel-tcp-stream-raw.c:970
+#: ../camel/camel-tcp-stream-raw.c:977
 #, c-format
 msgid "Hostname is too long (maximum is 255 characters)"
 msgstr "ãããåãéãããã (255 æåääãããããããããã)"
 
 #. SOCKS5
 #. reserved - must be 0
-#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
+#: ../camel/camel-tcp-stream-raw.c:1009 ../camel/camel-tcp-stream-raw.c:1019
 #, c-format
 msgid "Invalid reply from proxy server"
-msgstr "ããããããããããåçãçåãã"
+msgstr "ãããããããããããåçãçåãã"
 
-#: ../camel/camel-tcp-stream-ssl.c:453
+#: ../camel/camel-tcp-stream-ssl.c:462
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2738,16 +2922,16 @@ msgstr ""
 "æç:              %s\n"
 "çå:              %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:459
+#: ../camel/camel-tcp-stream-ssl.c:468
 msgid "GOOD"
 msgstr "GOOD"
 
-#: ../camel/camel-tcp-stream-ssl.c:459
+#: ../camel/camel-tcp-stream-ssl.c:468
 msgid "BAD"
 msgstr "BAD"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:463
+#: ../camel/camel-tcp-stream-ssl.c:472
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2762,7 +2946,7 @@ msgstr ""
 "\n"
 "åèãããããã?"
 
-#: ../camel/camel-tcp-stream-ssl.c:507
+#: ../camel/camel-tcp-stream-ssl.c:516
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2771,7 +2955,7 @@ msgstr ""
 "èèåé: %s\n"
 "çèè: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:559
+#: ../camel/camel-tcp-stream-ssl.c:568
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2780,7 +2964,7 @@ msgstr ""
 "ããããèèãããã: %s\n"
 "çèè: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:577
+#: ../camel/camel-tcp-stream-ssl.c:586
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2789,7 +2973,7 @@ msgstr ""
 "èææãæåæéåã: %s\n"
 "çèè: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:594
+#: ../camel/camel-tcp-stream-ssl.c:603
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2798,425 +2982,182 @@ msgstr ""
 "èææåãæãäèãæéåã: %s\n"
 "çèè: %s"
 
-#: ../camel/camel-url.c:316
+#: ../camel/camel-url.c:333
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "'%s' ããã URL ãèæãããããããã"
 
-#: ../camel/camel-vee-folder.c:1235 ../camel/camel-vee-folder.c:1398
+#: ../camel/camel-vee-folder.c:1310 ../camel/camel-vee-folder.c:1470
 #, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "ããããããäæããããããããããããçåããããããã"
+msgstr "ããããããäæãããããããããããããçåããããããã"
 
-#: ../camel/camel-vee-folder.c:1271
+#: ../camel/camel-vee-folder.c:1343
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%2$s ãããããã %1$s ããããããã"
 
-#: ../camel/camel-vee-folder.c:1339
+#: ../camel/camel-vee-folder.c:1411
 #, c-format
 msgid "Error storing '%s': "
 msgstr "'%s' ãæçäãããã: "
 
-#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
-#: ../camel/camel-vee-store.c:322
+#. Translators: 'Unmatched' is a folder name under Search folders where are shown
+#. * all messages not belonging into any other configured search folder
+#: ../camel/camel-vee-store.c:37
 msgid "Unmatched"
 msgstr "èåããããã"
 
-#: ../camel/camel-vee-store.c:393
+#: ../camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
-msgstr "ãããããåéããããã: %s: ããããããããããããããã"
+msgstr "ããããããåéããããã: %s: ãããããããããããããããã"
 
-#: ../camel/camel-vee-store.c:427
+#: ../camel/camel-vee-store.c:412
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr "ããããåãåæããããã: %s: ããããããããããããããã"
+msgstr "ãããããåãåæããããã: %s: ãããããããããããããããã"
 
 #: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
-msgstr "ããçããããããããããããããããããã"
+msgstr "ããçãããããããããããããããããããã"
 
 #: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
-msgstr "ãããããããããããããããããããããããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:954
-#: ../camel/providers/imap/camel-imap-folder.c:392
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "%s ãããããããããããããããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1030
-#, c-format
-msgid "Checking for deleted messages %s"
-msgstr "åéãããããããã %s ãããããä"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1517
-#: ../camel/providers/groupwise/camel-groupwise-store.c:665
-#: ../camel/providers/groupwise/camel-groupwise-store.c:796
-#: ../camel/providers/imap/camel-imap-folder.c:3962
-#: ../camel/providers/imap/camel-imap-folder.c:4044
-#: ../camel/providers/imapx/camel-imapx-server.c:3871
-#: ../camel/providers/imapx/camel-imapx-server.c:4002
-#, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "%s ãããæçãããããããããæåãåæä"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1987
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2040
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2704
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2714
-#, c-format
-msgid "Could not get message"
-msgstr "ããããããååãããããããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2424
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
-#, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "'%s' ããããããããããããããèåããããã: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2460
-#, c-format
-msgid "Cannot create message: %s"
-msgstr "ããããããäæããããã: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"ããããããååããããã: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
-#: ../camel/providers/local/camel-maildir-folder.c:100
-#: ../camel/providers/local/camel-maildir-folder.c:307
-#: ../camel/providers/local/camel-mbox-folder.c:117
-#: ../camel/providers/local/camel-mbox-folder.c:325
-#: ../camel/providers/local/camel-mh-folder.c:156
-msgid "No such message"
-msgstr "ãããããããããããããããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2659
-#: ../camel/providers/nntp/camel-nntp-folder.c:246
-#: ../camel/providers/nntp/camel-nntp-folder.c:413
-#: ../camel/providers/pop3/camel-pop3-folder.c:457
-#, c-format
-msgid "Cannot get message %s: "
-msgstr "ããããã %s ãååããããã: "
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2677
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2687
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2890
-#, c-format
-msgid "This message is not available in offline mode."
-msgstr "ãããããããããããããããããããåçãããããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
-#, c-format
-msgid "Cannot get folder container %s"
-msgstr "ããããããããã %s ãååããããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
-#, c-format
-msgid "Cannot append message in offline mode: cache unavailable"
-msgstr ""
-"ãããããããããããããããããèåããããã: ããããããåçããããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
-msgid "Cannot append message in offline mode: "
-msgstr "ããããããããããããããããèåããããã: "
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
-msgid "Checking for new mail"
-msgstr "æçãããããããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "C_heck for new messages in all folders"
-msgstr "ãããããããããæçãããããããããã(_H)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:42
-#: ../camel/providers/local/camel-local-provider.c:82
-#: ../camel/providers/local/camel-local-provider.c:102
-msgid "Options"
-msgstr "ããããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "ããããããåäçãããæãããããããããããããéçãã(_A)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-msgid "Check new messages for J_unk contents"
-msgstr "æçããããããããããããããããã(_U)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "åäçããããããããããããããããããããã(_B)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
-msgid "Automatically synchroni_ze account locally"
-msgstr "ãããããããããããèåçãåæãã(_Z)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-msgid "SOAP Settings"
-msgstr "SOAP ãèå"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "Post Office Agent SOAP _Port:"
-msgstr "ãããããããããããããããã SOAP ããã(_P):"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
-msgid "For accessing Novell GroupWise servers"
-msgstr "Novell GroupWise ãããããããããçãã"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
-#: ../camel/providers/imap/camel-imap-provider.c:97
-#: ../camel/providers/imapx/camel-imapx-provider.c:104
-#: ../camel/providers/nntp/camel-nntp-provider.c:72
-#: ../camel/providers/pop3/camel-pop3-provider.c:73
-msgid "Password"
-msgstr "ããããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
-msgid ""
-"This option will connect to the GroupWise server using a plaintext password."
-msgstr ""
-"ããããããããããããããããããããããããäãã GroupWise ããããæç"
-"ãããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:103
-#, c-format
-msgid "Host or user not available in url"
-msgstr "ãããåããããããåã URI ãæåããããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:205
-#: ../camel/providers/imap/camel-imap-store.c:801
-#: ../camel/providers/imapx/camel-imapx-server.c:3085
-#, c-format
-msgid "You did not enter a password."
-msgstr "ããããããååãããããããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:328
-msgid "Some features may not work correctly with your current server version"
-msgstr ""
-"ãäãããããããããããããããããããæèãæããåäããããããããã"
-"ã"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:556
-#: ../camel/providers/imap/camel-imap-store.c:1808
-#: ../camel/providers/imap/camel-imap-store.c:2005
-#: ../camel/providers/imapx/camel-imapx-store.c:341
-#, c-format
-msgid "No such folder %s"
-msgstr "ããããããããã %s ãããããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1217
-#, c-format
-msgid "Cannot create GroupWise folders in offline mode."
-msgstr "ããããããããããã GroupWise ãããããçæãããããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1226
-#, c-format
-msgid "Cannot create a special system folder"
-msgstr "çåããããããããããäæãããããããããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1236
-#: ../camel/providers/imap/camel-imap-store.c:1886
-#: ../camel/providers/imap/camel-imap-store.c:2323
-#: ../camel/providers/imapx/camel-imapx-store.c:1340
-#, c-format
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "èããããããèæããããããããåãããããããããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1321
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1346
-#, c-format
-msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "GroupWise ããããã '%s' ã '%s' ãããååãåæããããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1380
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
-#, c-format
-msgid "GroupWise server %s"
-msgstr "GroupWise ãããã %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
-#, c-format
-msgid "GroupWise service for %s on %s"
-msgstr "%s ã %s ããã GroupWise ããããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
-#, c-format
-msgid "GroupWise mail delivery via %s"
-msgstr "%s ççã GroupWise ãããããéäããã"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
-msgid "Sending Message"
-msgstr "ããããããéä"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
-#, c-format
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "ãããããååããããã: ããããçåãæäãã"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#, c-format
-msgid ""
-"You have exceeded this account's storage limit. Your messages are queued in "
-"your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
-"of your mail.\n"
-msgstr ""
-"ããããããããåçãããããããåéãèãããããéäããããããããéä"
-"çãäåããããããããããããåéãããããããããããããçããããã[é"
-"åä] ããããæããããããããéäããããããã\n"
-
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
-#, c-format
-msgid "Could not send message: %s"
-msgstr "ããããããéäãããããããã: %s"
+msgstr "ããããããããããããããããããããããããã"
 
-#: ../camel/providers/imap/camel-imap-command.c:197
-#: ../camel/providers/imap/camel-imap-command.c:301
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:293
 #, c-format
 msgid "No output stream"
 msgstr "ååããããããããããã"
 
-#: ../camel/providers/imap/camel-imap-command.c:205
-#: ../camel/providers/imap/camel-imap-command.c:309
+#: ../camel/providers/imap/camel-imap-command.c:206
+#: ../camel/providers/imap/camel-imap-command.c:301
 #, c-format
 msgid "No input stream"
 msgstr "ååããããããããããã"
 
-#: ../camel/providers/imap/camel-imap-command.c:255
-#, c-format
-msgid "Operation cancelled"
-msgstr "åçããããããããããã"
-
-#: ../camel/providers/imap/camel-imap-command.c:373
+#: ../camel/providers/imap/camel-imap-command.c:365
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
-msgstr "ççããããæçãåãããã: %s"
+msgstr "ççãããããæçãåãããã: %s"
 
-#. for imap ALERT codes, account user host
-#. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:394
+#: ../camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
 "%s"
 msgstr ""
-"IMAP ããã %s %s ãããèå:\n"
+"IMAP ãããã %s %s ãããèå:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:468
+#: ../camel/providers/imap/camel-imap-command.c:471
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
-msgstr "IMAP ãããããæååãåçãããããã: %s"
+msgstr "IMAP ããããããæååãåçãããããã: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:480
+#: ../camel/providers/imap/camel-imap-command.c:483
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ãããããåæãããã: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:560
+#: ../camel/providers/imap/camel-imap-command.c:563
 #, c-format
 msgid "Server response ended too soon."
-msgstr "ããããããããããããããçãããããã"
+msgstr "ãããããããããããããããçãããããã"
 
-#: ../camel/providers/imap/camel-imap-command.c:771
+#: ../camel/providers/imap/camel-imap-command.c:775
 #, c-format
 msgid "IMAP server response did not contain %s information"
-msgstr "IMAP ããããåçã %s æåãåãããããã"
+msgstr "IMAP ãããããåçã %s æåãåãããããã"
 
-#: ../camel/providers/imap/camel-imap-command.c:809
+#: ../camel/providers/imap/camel-imap-command.c:813
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
-msgstr "IMAP ãããããæååã OK åçãããããã: %s"
+msgstr "IMAP ããããããæååã OK åçãããããã: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:292
+#: ../camel/providers/imap/camel-imap-folder.c:296
 msgid "Always check for new mail in this folder"
-msgstr "åããããããããããæçãããããããããã"
+msgstr "åãããããããããããæçãããããããããã"
 
-#: ../camel/providers/imap/camel-imap-folder.c:369
+#: ../camel/providers/imap/camel-imap-folder.c:372
 #, c-format
 msgid "Could not create directory %s: %s"
-msgstr "ãããã %s ãäæãããããããã: %s"
+msgstr "ããããã %s ãäæãããããããã: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:992
-#: ../camel/providers/imapx/camel-imapx-server.c:3915
+#: ../camel/providers/imap/camel-imap-folder.c:395
+#, c-format
+msgid "Could not load summary for %s"
+msgstr "%s ãããããããããããããããã"
+
+#: ../camel/providers/imap/camel-imap-folder.c:1054
+#: ../camel/providers/imapx/camel-imapx-server.c:4065
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "%s ãããããããããèæä"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3369
+#: ../camel/providers/imap/camel-imap-folder.c:3483
 msgid "Unable to retrieve message: "
 msgstr "ããããããååããããã: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:3404
-#: ../camel/providers/imapx/camel-imapx-server.c:5193
+#: ../camel/providers/imap/camel-imap-folder.c:3520
+#: ../camel/providers/imapx/camel-imapx-server.c:5344
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "%s ããã ID ãããããããååããããã: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3405
-#: ../camel/providers/imapx/camel-imapx-server.c:5194
+#: ../camel/providers/imap/camel-imap-folder.c:3521
+#: ../camel/providers/imapx/camel-imapx-server.c:5345
 msgid "No such message available."
 msgstr "ãããããããããããåçãããããã"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3480
-#: ../camel/providers/imap/camel-imap-folder.c:4375
-#: ../camel/providers/nntp/camel-nntp-folder.c:402
+#: ../camel/providers/imap/camel-imap-folder.c:3596
+#: ../camel/providers/imap/camel-imap-folder.c:4503
+#: ../camel/providers/nntp/camel-nntp-folder.c:438
 #, c-format
 msgid "This message is not currently available"
 msgstr "ããããããããçååçããããã"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4176
+#: ../camel/providers/imap/camel-imap-folder.c:4087
+#: ../camel/providers/imap/camel-imap-folder.c:4170
+#: ../camel/providers/imapx/camel-imapx-server.c:4023
+#: ../camel/providers/imapx/camel-imapx-server.c:4173
+#, c-format
+msgid "Fetching summary information for new messages in %s"
+msgstr "%s ãããæçãããããããããæåãåæä"
+
+#: ../camel/providers/imap/camel-imap-folder.c:4304
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
-msgstr "äååãããããåç: ããããã %d ãæåãæäãããããããã"
+msgstr "äååããããããåç: ããããã %d ãæåãæäãããããããã"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4186
+#: ../camel/providers/imap/camel-imap-folder.c:4314
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
-msgstr "äååãããããåç: ããããã %d ã UID ãæäãããããããã"
+msgstr "äååããããããåç: ããããã %d ã UID ãæäãããããããã"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4415
+#: ../camel/providers/imap/camel-imap-folder.c:4543
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH åçããããããæäãããããããããã"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:193
-#: ../camel/providers/imap/camel-imap-message-cache.c:253
+#: ../camel/providers/imap/camel-imap-message-cache.c:197
+#: ../camel/providers/imap/camel-imap-message-cache.c:257
 msgid "Could not open cache directory: "
-msgstr "ãããããããããããéããããããã: "
+msgstr "ããããããããããããéããããããã: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:326
+#: ../camel/providers/imap/camel-imap-message-cache.c:335
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "%s ãããããããããããããããããããããã: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:391
+#: ../camel/providers/imap/camel-imap-message-cache.c:401
 #, c-format
 msgid "Failed to cache message %s: "
 msgstr "ããããã %s ãããããããåæãããã: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#: ../camel/providers/imap/camel-imap-message-cache.c:543
 #, c-format
 msgid "Failed to cache %s: "
 msgstr "%s ãããããããåæãããã: "
@@ -3226,20 +3167,25 @@ msgstr "%s ãããããããåæãããã: "
 msgid "Checking for New Mail"
 msgstr "æçãããããããã"
 
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+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
 msgid "Ch_eck for new messages in subscribed folders"
-msgstr "èèãããããããããæçãããããããããã(_E)"
+msgstr "èèããããããããããæçãããããããããã(_E)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:48
 #: ../camel/providers/imapx/camel-imapx-provider.c:52
 msgid "Connection to Server"
-msgstr "ããããæç"
+msgstr "ãããããæç"
 
 #: ../camel/providers/imap/camel-imap-provider.c:50
 #: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "_Use custom command to connect to server"
-msgstr "ããããæçããéãããããããããããäçãã(_U)"
+msgstr "ãããããæçããéãããããããããããäçãã(_U)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:52
 msgid "Co_mmand:"
@@ -3249,207 +3195,237 @@ msgstr "ãããã(_M):"
 #: ../camel/providers/imapx/camel-imapx-provider.c:62
 #: ../camel/providers/nntp/camel-nntp-provider.c:42
 msgid "Folders"
-msgstr "ãããã"
+msgstr "ããããã"
 
 #: ../camel/providers/imap/camel-imap-provider.c:58
 #: ../camel/providers/imapx/camel-imapx-provider.c:64
 msgid "_Show only subscribed folders"
-msgstr "èèããããããããããèçãã(_S)"
+msgstr "èèãããããããããããèçãã(_S)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:60
 #: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "O_verride server-supplied folder namespace"
-msgstr "ããããæäãããããããããããããããäæããã(_V)"
+msgstr "ãããããæäããããããããããããããããäæããã(_V)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:62
 msgid "Names_pace:"
 msgstr "ããããããã(_P):"
 
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:72
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:105
+msgid "Options"
+msgstr "ããããã"
+
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
+msgid "_Apply filters to new messages in Inbox on this server"
+msgstr "ãããããããåäçãããæããããããããããããããéçãã(_A)"
+
 #: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
 msgstr "æçããããããããããããããããã(_K)"
 
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
+msgid "Only check for Junk messages in the IN_BOX folder"
+msgstr "åäçããããããããããããããããããããã(_B)"
+
 #: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "ããããããããããããããèåçãåæãã(_Z)"
 
+#: ../camel/providers/imap/camel-imap-provider.c:78
+msgid "IMAP default port"
+msgstr ""
+
 #: ../camel/providers/imap/camel-imap-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:87
+#, fuzzy
+#| msgid "IMAP server %s"
+msgid "IMAP over SSL"
+msgstr "IMAP ãããã %s"
+
+#: ../camel/providers/imap/camel-imap-provider.c:85
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:90
+#: ../camel/providers/imap/camel-imap-provider.c:87
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
 msgid "For reading and storing mail on IMAP servers."
-msgstr "IMAP ããããããããèãããååãããããäåãããã"
+msgstr "IMAP ãããããããããèãããååãããããäåãããã"
+
+#: ../camel/providers/imap/camel-imap-provider.c:105
+#: ../camel/providers/imapx/camel-imapx-provider.c:113
+#: ../camel/providers/nntp/camel-nntp-provider.c:80
+#: ../camel/providers/pop3/camel-pop3-provider.c:81
+msgid "Password"
+msgstr "ããããã"
 
-#: ../camel/providers/imap/camel-imap-provider.c:99
-#: ../camel/providers/imapx/camel-imapx-provider.c:106
+#: ../camel/providers/imap/camel-imap-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:115
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
-"ããããããããããããããããããããããããäãã IMAP ããããæçãã"
-"ãã"
-
-#: ../camel/providers/imap/camel-imap-store.c:243
-#: ../camel/providers/nntp/camel-nntp-store.c:342
-#: ../camel/providers/pop3/camel-pop3-store.c:135
-#: ../camel/providers/smtp/camel-smtp-transport.c:151
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "%s ãæçãããããããã: %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:244
-#: ../camel/providers/nntp/camel-nntp-store.c:343
-#: ../camel/providers/pop3/camel-pop3-store.c:136
-#: ../camel/providers/smtp/camel-smtp-transport.c:152
-msgid "SSL unavailable"
-msgstr "SSL ãçåãã"
+"ããããããããããããããããããããããããäãã IMAP ãããããæçã"
+"ããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:264
-#: ../camel/providers/nntp/camel-nntp-store.c:362
-#, c-format
-msgid "Could not connect to %s: "
-msgstr "%s ãæçãããããããã: "
+#. 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:2601
+#: ../camel/providers/imapx/camel-imapx-store.c:340
+#: ../camel/providers/imapx/camel-imapx-store.c:796
+#: ../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:711
+#: ../camel/providers/local/camel-spool-store.c:328
+msgid "Inbox"
+msgstr "åäç"
 
-#: ../camel/providers/imap/camel-imap-store.c:370
-#: ../camel/providers/imap/camel-imap-store.c:390
-#: ../camel/providers/imap/camel-imap-store.c:397
-#: ../camel/providers/imap/camel-imap-store.c:424
-#: ../camel/providers/imapx/camel-imapx-server.c:2927
-#: ../camel/providers/imapx/camel-imapx-server.c:2967
+#: ../camel/providers/imap/camel-imap-store.c:356
+#: ../camel/providers/imap/camel-imap-store.c:383
+#: ../camel/providers/imap/camel-imap-store.c:410
+#: ../camel/providers/imapx/camel-imapx-server.c:3042
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
-"ããããããäèããããããã IMAP ããã %s ããæçãåæãããã: %s"
+"ããããããäèããããããã IMAP ãããã %s ããæçãåæãããã: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:371
-#: ../camel/providers/imapx/camel-imapx-server.c:2928
-#: ../camel/providers/smtp/camel-smtp-transport.c:238
+#: ../camel/providers/imap/camel-imap-store.c:357
+#: ../camel/providers/imapx/camel-imapx-server.c:3043
+#: ../camel/providers/smtp/camel-smtp-transport.c:192
 msgid "STARTTLS not supported"
 msgstr "STARTTLS æåãããããããããããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:391
-#: ../camel/providers/imapx/camel-imapx-server.c:2968
-msgid "SSL negotiations failed"
-msgstr "SSL æçãåæãããã"
+#: ../camel/providers/imap/camel-imap-store.c:376
+#: ../camel/providers/imapx/camel-imapx-server.c:3081
+#, 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:398
-#: ../camel/providers/smtp/camel-smtp-transport.c:285
+#: ../camel/providers/imap/camel-imap-store.c:384
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 msgid "SSL is not available in this build"
 msgstr "ããããããããã SSL ãåçããããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:549
-#: ../camel/providers/imapx/camel-imapx-server.c:2755
+#: ../camel/providers/imap/camel-imap-store.c:709
+#: ../camel/providers/imapx/camel-imapx-server.c:3176
 #, c-format
-msgid "Connection cancelled"
-msgstr "æçãããããããããã"
+msgid "IMAP server %s does not support requested authentication type %s"
+msgstr "IMAP ããããã %s ãã %s ãããèèãããããããããããããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:554
-#: ../camel/providers/imapx/camel-imapx-server.c:2760
+#: ../camel/providers/imap/camel-imap-store.c:720
+#: ../camel/providers/imapx/camel-imapx-server.c:3189
+#: ../camel/providers/smtp/camel-smtp-transport.c:350
 #, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "ãããã \"%s\" ãæçãããããããã: %s"
+msgid "No support for authentication type %s"
+msgstr "%s ãããèèãããããããããããããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:740
-#: ../camel/providers/imapx/camel-imapx-server.c:3041
+#: ../camel/providers/imap/camel-imap-store.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:363
 #, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "IMAP ãããã %s ãã %s ãããèèãããããããããããããã"
+msgid "Error creating SASL authentication object."
+msgstr "SASL èèãããããããçæäãããããççããããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:752
-#: ../camel/providers/imapx/camel-imapx-server.c:3053
-#: ../camel/providers/smtp/camel-smtp-transport.c:420
+#: ../camel/providers/imap/camel-imap-store.c:779
+#: ../camel/providers/imapx/camel-imapx-server.c:3234
 #, c-format
-msgid "No support for authentication type %s"
-msgstr "%s ãããèèãããããããããããããã"
+msgid "You did not enter a password."
+msgstr "ããããããååãããããããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:836
-#: ../camel/providers/imapx/camel-imapx-server.c:3129
+#: ../camel/providers/imap/camel-imap-store.c:820
+#: ../camel/providers/imapx/camel-imapx-server.c:3279
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"IMAP ããããèèãããããã\n"
+"IMAP ãããããèèãããããã\n"
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:997
-#: ../camel/providers/imapx/camel-imapx-store.c:182
+#: ../camel/providers/imap/camel-imap-store.c:878
+#: ../camel/providers/imapx/camel-imapx-store.c:144
 #, c-format
 msgid "IMAP server %s"
-msgstr "IMAP ããã %s"
+msgstr "IMAP ãããã %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1001
-#: ../camel/providers/imapx/camel-imapx-store.c:184
+#: ../camel/providers/imap/camel-imap-store.c:881
+#: ../camel/providers/imapx/camel-imapx-store.c:147
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s ã %s ããã IMAP ãããã"
 
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1367
-#: ../camel/providers/imap/camel-imap-store.c:2416
-#: ../camel/providers/imapx/camel-imapx-store.c:371
-#: ../camel/providers/imapx/camel-imapx-store.c:793
-#: ../camel/providers/local/camel-maildir-folder.c:409
-#: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:615
-#: ../camel/providers/local/camel-maildir-store.c:621
-#: ../camel/providers/local/camel-maildir-store.c:669
-#: ../camel/providers/local/camel-spool-store.c:289
-msgid "Inbox"
-msgstr "åäç"
+#: ../camel/providers/imap/camel-imap-store.c:1972
+#: ../camel/providers/imap/camel-imap-store.c:2176
+#: ../camel/providers/imapx/camel-imapx-store.c:315
+#, c-format
+msgid "No such folder %s"
+msgstr "ãããããããããã %s ãããããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:1822
-#: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imapx/camel-imapx-store.c:1319
+#: ../camel/providers/imap/camel-imap-store.c:1986
+#: ../camel/providers/imap/camel-imap-store.c:2445
+#: ../camel/providers/imapx/camel-imapx-store.c:1327
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "\"%s\" ãããããããåã \"%c\" ãããæåãåãããããããããã"
+msgstr "\"%s\" ããããããããåã \"%c\" ãããæåãåãããããããããã"
+
+#: ../camel/providers/imap/camel-imap-store.c:2050
+#: ../camel/providers/imap/camel-imap-store.c:2509
+#: ../camel/providers/imapx/camel-imapx-store.c:1348
+#, c-format
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "èãããããããèæãããããããããåãããããããããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../camel/providers/imap/camel-imap-store.c:2103
 #: ../camel/providers/local/camel-maildir-store.c:244
-#: ../camel/providers/local/camel-mbox-store.c:407
-#: ../camel/providers/local/camel-mh-store.c:504
+#: ../camel/providers/local/camel-mbox-store.c:424
+#: ../camel/providers/local/camel-mh-store.c:550
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
-msgstr "'%s' ããããããããäæããããã: æãååãããããã"
+msgstr "'%s' ãããããããããäæããããã: æãååãããããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:2272
-#: ../camel/providers/imapx/camel-imapx-store.c:1330
+#: ../camel/providers/imap/camel-imap-store.c:2458
+#: ../camel/providers/imapx/camel-imapx-store.c:1338
 #, c-format
 msgid "Unknown parent folder: %s"
-msgstr "èãããããçåããããã: %s"
+msgstr "èããããããçåããããã: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3137
+#: ../camel/providers/imap/camel-imap-store.c:3235
 #, c-format
 msgid "Server unexpectedly disconnected"
-msgstr "ççããããæçãåãããã"
+msgstr "ççãããããæçãåãããã"
 
-#: ../camel/providers/imap/camel-imap-store.c:3140
+#: ../camel/providers/imap/camel-imap-store.c:3238
 msgid "Server unexpectedly disconnected: "
-msgstr "ççãããããåæããããã: "
+msgstr "ççããããããåæããããã: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:74
+#: ../camel/providers/imapx/camel-imapx-folder.c:91
 #, c-format
 msgid "Could not create folder summary for %s"
-msgstr "%s ãããããããããäæãããããããã"
+msgstr "%s ããããããããããäæãããããããã"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:82
+#: ../camel/providers/imapx/camel-imapx-folder.c:99
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "%s ãããããããçæãããããããã: "
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Use _Quick Resync if the server supports it"
-msgstr "ããããããããããããã Quick Resync ãäçãã(_Q)"
+msgstr "ãããããããããããããã Quick Resync ãäçãã(_Q)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:44
 msgid "Use I_dle if the server supports it"
-msgstr "ããããããããããããã Idle ãäçãã(_D)"
+msgstr "ãããããããããããããã Idle ãäçãã(_D)"
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:56
 msgid "Command:"
@@ -3463,38 +3439,37 @@ msgstr "ãããããæçãæ(_R)"
 msgid "Namespace:"
 msgstr "ããããããã:"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
+#: ../camel/providers/imapx/camel-imapx-provider.c:86
+msgid "Default IMAP port"
+msgstr ""
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:94
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1404
+#: ../camel/providers/imapx/camel-imapx-server.c:1504
 msgid "Error writing to cache stream: "
 msgstr "ãããããããããããæãèãäãããã: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2083
+#: ../camel/providers/imapx/camel-imapx-server.c:2214
 #, c-format
 msgid "Not authenticated"
 msgstr "èèããããããã"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2850
-#, c-format
-msgid "Could not connect to %s (port %s): "
-msgstr "%s (ããã %s) ãæçãããããããã: "
-
-#: ../camel/providers/imapx/camel-imapx-server.c:3311
+#: ../camel/providers/imapx/camel-imapx-server.c:3452
 msgid "Closing tmp stream failed: "
 msgstr "äæçãããããããããããåæãããã: "
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5343
-#: ../camel/providers/imapx/camel-imapx-server.c:5358
+#: ../camel/providers/imapx/camel-imapx-server.c:5490
+#: ../camel/providers/imapx/camel-imapx-server.c:5505
 msgid "Cannot create spool file: "
 msgstr "ãããããããããäæããããã: "
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1135
-#: ../camel/providers/nntp/camel-nntp-store.c:1666
+#: ../camel/providers/imapx/camel-imapx-store.c:1115
+#: ../camel/providers/nntp/camel-nntp-store.c:1713
 #, c-format
 msgid "No such folder: %s"
-msgstr "ããããããããããããããã: %s"
+msgstr "ãããããããããããããããã: %s"
 
 #: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
@@ -3522,17 +3497,17 @@ msgstr "mailbox: %s (%s)"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:466
+#: ../camel/providers/local/camel-local-folder.c:473
 msgid "Index message body data"
 msgstr "ãããææããããããããäæãã"
 
-#: ../camel/providers/local/camel-local-folder.c:700
+#: ../camel/providers/local/camel-local-folder.c:704
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
 "%s"
 msgstr ""
-"ããããã %s ããããã %s ããååããããã\n"
+"ããããã %s ãããããã %s ããååããããã\n"
 "  %s"
 
 #: ../camel/providers/local/camel-local-provider.c:44
@@ -3541,221 +3516,232 @@ msgstr "'.folders' ããããããããããããäçãã (exmh)(_U)"
 
 #: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
-msgstr "MH ååããããããããã"
+msgstr "MH ååãããããããããã"
 
 #: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
-msgstr "ããããããããã MH ååããããããããããäãäåãããã"
+msgstr "ããããããããã MH ååãããããããããããäãäåãããã"
 
-#: ../camel/providers/local/camel-local-provider.c:69
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid "Local delivery"
 msgstr "ãããããéä"
 
-#: ../camel/providers/local/camel-local-provider.c:70
+#: ../camel/providers/local/camel-local-provider.c:71
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
 msgstr ""
 "ãããããããããåéããææ mbox ååããããããã Evolution ãççãã"
-"ãããããçåãããã"
+"ããããããçåãããã"
 
-#: ../camel/providers/local/camel-local-provider.c:84
-#: ../camel/providers/local/camel-local-provider.c:103
+#: ../camel/providers/local/camel-local-provider.c:86
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "_Apply filters to new messages in INBOX"
-msgstr "åäçãããæçãããããããããéçãã(_A)"
+msgstr "åäçãããæçããããããããããéçãã(_A)"
 
-#: ../camel/providers/local/camel-local-provider.c:91
+#: ../camel/providers/local/camel-local-provider.c:93
 msgid "Maildir-format mail directories"
-msgstr "Maildir ååããããããããã"
+msgstr "Maildir ååãããããããããã"
 
-#: ../camel/providers/local/camel-local-provider.c:92
+#: ../camel/providers/local/camel-local-provider.c:94
 msgid "For storing local mail in maildir directories."
-msgstr "ããããããããã Maildir ååããããããäåãããã"
+msgstr "ããããããããã Maildir ååãããããããäåãããã"
 
-#: ../camel/providers/local/camel-local-provider.c:104
+#: ../camel/providers/local/camel-local-provider.c:108
 msgid "_Store status headers in Elm/Pine/Mutt format"
-msgstr "ãããããããããã Elm/Pine/Mutt ååãæçãã(_S)"
+msgstr "ããããããããããã Elm/Pine/Mutt ååãæçãã(_S)"
 
-#: ../camel/providers/local/camel-local-provider.c:111
+#: ../camel/providers/local/camel-local-provider.c:115
 msgid "Standard Unix mbox spool file"
 msgstr "ææçã UNIX ã mbox ååãããããããããã"
 
-#: ../camel/providers/local/camel-local-provider.c:112
-#: ../camel/providers/local/camel-local-provider.c:123
+#: ../camel/providers/local/camel-local-provider.c:116
+#: ../camel/providers/local/camel-local-provider.c:128
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 "åéãææ mbox ååããããããããããããããããããããããèãèããã"
 "æçããã\n"
-"(ElmãPineãMutt ååããããããèãèãããåå)ã"
+"(ElmãPineãMutt ååãããããããèãèãããåå)ã"
 
-#: ../camel/providers/local/camel-local-provider.c:122
+#: ../camel/providers/local/camel-local-provider.c:127
 msgid "Standard Unix mbox spool directory"
-msgstr "ææçã UNIX ã mbox ååãããããããããã"
+msgstr "ææçã UNIX ã mbox ååããããããããããã"
+
+#: ../camel/providers/local/camel-local-store.c:92
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "ãããããã %s ãã %s ãåååæãããããããã: %s"
+
+#: ../camel/providers/local/camel-local-store.c:204
+#, c-format
+msgid "Local mail file %s"
+msgstr "ããããããããããããã %s"
 
-#: ../camel/providers/local/camel-local-store.c:174
-#: ../camel/providers/local/camel-local-store.c:319
+#: ../camel/providers/local/camel-local-store.c:235
+#: ../camel/providers/local/camel-local-store.c:377
 #: ../camel/providers/local/camel-maildir-store.c:92
-#: ../camel/providers/local/camel-mbox-store.c:526
-#: ../camel/providers/local/camel-spool-store.c:318
+#: ../camel/providers/local/camel-mbox-store.c:542
+#: ../camel/providers/local/camel-spool-store.c:574
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "äåããããã %s ãçåããããããããã"
 
-#: ../camel/providers/local/camel-local-store.c:183
+#: ../camel/providers/local/camel-local-store.c:244
 #, c-format
 msgid "Store root %s is not a regular directory"
-msgstr "äåããããã %s ãéåãããããããããããã"
+msgstr "äåããããã %s ãéåããããããããããããã"
 
-#: ../camel/providers/local/camel-local-store.c:194
-#: ../camel/providers/local/camel-local-store.c:204
-#: ../camel/providers/local/camel-local-store.c:332
+#: ../camel/providers/local/camel-local-store.c:255
+#: ../camel/providers/local/camel-local-store.c:265
+#: ../camel/providers/local/camel-local-store.c:390
 #: ../camel/providers/local/camel-maildir-store.c:124
 #, c-format
 msgid "Cannot get folder: %s: %s"
-msgstr "ãããããååããããã: %s: %s"
+msgstr "ããããããååããããã: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:220
+#: ../camel/providers/local/camel-local-store.c:297
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "ããããããäåããåäçãæãããã"
 
-#: ../camel/providers/local/camel-local-store.c:281
-#, c-format
-msgid "Local mail file %s"
-msgstr "ããããããããããããã %s"
-
-#: ../camel/providers/local/camel-local-store.c:393
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "ããããã %s ãã %s ãåååæãããããããã: %s"
-
-#: ../camel/providers/local/camel-local-store.c:467
-#, c-format
-msgid "Could not rename '%s': %s"
-msgstr "'%s' ãååãåæãããããããã: %s"
-
-#: ../camel/providers/local/camel-local-store.c:498
-#: ../camel/providers/local/camel-mbox-store.c:695
+#: ../camel/providers/local/camel-local-store.c:435
+#: ../camel/providers/local/camel-mbox-store.c:716
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "'%s' ãããããããããããããããåéãããããããã: %s"
 
-#: ../camel/providers/local/camel-local-store.c:526
-#: ../camel/providers/local/camel-mbox-store.c:724
+#: ../camel/providers/local/camel-local-store.c:463
+#: ../camel/providers/local/camel-mbox-store.c:746
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "'%s' ãããããããããããåéãããããããã: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:548
+#: ../camel/providers/local/camel-local-store.c:549
+#, c-format
+msgid "Could not rename '%s': %s"
+msgstr "'%s' ãååãåæãããããããã: %s"
+
+#: ../camel/providers/local/camel-local-summary.c:569
 #, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "ããããããããããèåããããã: ååãäæãã"
 
-#: ../camel/providers/local/camel-maildir-folder.c:198
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:333
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
+msgid "No such message"
+msgstr "ãããããããããããããããã"
+
+#: ../camel/providers/local/camel-maildir-folder.c:223
 #, c-format
 msgid "Cannot append message to maildir folder: %s: "
-msgstr "Maildir ååããããããããããããèåããããã: %s: "
+msgstr "Maildir ååãããããããããããããèåããããã: %s: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:246
-#: ../camel/providers/local/camel-maildir-folder.c:256
+#: ../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
 #, c-format
 msgid "Cannot get message %s from folder %s: "
-msgstr "ããããã %s ããããã %s ããååããããã: "
+msgstr "ããããã %s ãããããã %s ããååããããã: "
 
-#: ../camel/providers/local/camel-maildir-folder.c:326
+#: ../camel/providers/local/camel-maildir-folder.c:351
 #, c-format
 msgid "Cannot transfer message to destination folder: %s"
-msgstr "æåããããããããããããèéããããã: %s"
+msgstr "æåãããããããããããããèéããããã: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:100
 #, c-format
 msgid "Cannot create folder: %s : Folder name cannot contain a dot"
-msgstr "ãããããäæããããã: %s: ããããåãããããåããããããããã"
+msgstr ""
+"ããããããäæããããã: %s: ãããããåãããããåããããããããã"
 
 #: ../camel/providers/local/camel-maildir-store.c:109
-#: ../camel/providers/local/camel-maildir-store.c:686
+#: ../camel/providers/local/camel-maildir-store.c:728
 #, c-format
 msgid "Folder %s already exists"
-msgstr "æããããã %s ããããã"
+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:375
-#: ../camel/providers/local/camel-mbox-store.c:389
+#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:406
 #, c-format
 msgid "Cannot create folder '%s': %s"
-msgstr "'%s' ããããããããäæããããã: %s"
+msgstr "'%s' ãããããããããäæããããã: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:206
-#: ../camel/providers/local/camel-mbox-store.c:341
-#: ../camel/providers/local/camel-mh-store.c:464
+#: ../camel/providers/local/camel-mbox-store.c:358
+#: ../camel/providers/local/camel-mh-store.c:505
 #, c-format
 msgid "Cannot get folder '%s': %s"
-msgstr "'%s' ããããããããååããããã: %s"
+msgstr "'%s' ãããããããããååããããã: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:212
-#: ../camel/providers/local/camel-mbox-store.c:351
-#: ../camel/providers/local/camel-mh-store.c:473
+#: ../camel/providers/local/camel-mbox-store.c:368
+#: ../camel/providers/local/camel-mh-store.c:514
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
-msgstr "'%s' ããããããããååããããã: ãããããååããããã"
+msgstr "'%s' ãããããããããååããããã: ããããããååããããã"
 
 #: ../camel/providers/local/camel-maildir-store.c:239
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
-msgstr "'%s' ããããããããååããããã: maildir ãããããååããããã"
+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:584
+#: ../camel/providers/local/camel-mh-store.c:652
 #, c-format
 msgid "Could not delete folder '%s': %s"
-msgstr "'%s' ããããããããåéãããããããã: %s"
+msgstr "'%s' ãããããããããåéãããããããã: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:295
 msgid "not a maildir directory"
-msgstr "maildir ååãããããããããããã"
+msgstr "maildir ååããããããããããããã"
 
-#: ../camel/providers/local/camel-maildir-store.c:508
-#: ../camel/providers/local/camel-maildir-store.c:825
-#: ../camel/providers/local/camel-spool-store.c:143
-#: ../camel/providers/local/camel-spool-store.c:159
+#: ../camel/providers/local/camel-maildir-store.c:510
+#: ../camel/providers/local/camel-maildir-store.c:885
+#: ../camel/providers/local/camel-spool-store.c:161
+#: ../camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "Could not scan folder '%s': %s"
-msgstr "'%s' ãããããããããããããããããããã: %s"
+msgstr "'%s' ããããããããããããããããããããã: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:677
+#: ../camel/providers/local/camel-maildir-store.c:719
 #, c-format
 msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
 msgstr ""
-"ãããããååãåæããããã: %s: ããããåãããããåããããããããã"
+"ããããããååãåæããããã: %s: ãããããåãããããåããããããã"
+"ãã"
 
-#: ../camel/providers/local/camel-maildir-summary.c:436
-#: ../camel/providers/local/camel-maildir-summary.c:566
+#: ../camel/providers/local/camel-maildir-summary.c:439
+#: ../camel/providers/local/camel-maildir-summary.c:571
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
-msgstr "maildir ããããããããéããããããã: %s: %s"
+msgstr "maildir ãããããããããéããããããã: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:557
+#: ../camel/providers/local/camel-maildir-summary.c:562
 msgid "Checking folder consistency"
-msgstr "ãããããæåæãçèä"
+msgstr "ããããããæåæãçèä"
 
-#: ../camel/providers/local/camel-maildir-summary.c:650
+#: ../camel/providers/local/camel-maildir-summary.c:655
 msgid "Checking for new messages"
 msgstr "æãããããããããããã"
 
-#: ../camel/providers/local/camel-maildir-summary.c:743
-#: ../camel/providers/local/camel-mbox-summary.c:468
-#: ../camel/providers/local/camel-mbox-summary.c:690
-#: ../camel/providers/local/camel-mbox-summary.c:826
+#: ../camel/providers/local/camel-maildir-summary.c:748
+#: ../camel/providers/local/camel-mbox-summary.c:485
+#: ../camel/providers/local/camel-mbox-summary.c:717
+#: ../camel/providers/local/camel-mbox-summary.c:863
 #: ../camel/providers/local/camel-spool-summary.c:131
 msgid "Storing folder"
-msgstr "ãããããæçãã"
+msgstr "ããããããæçãã"
 
 #: ../camel/providers/local/camel-mbox-folder.c:183
 #, c-format
@@ -3769,133 +3755,133 @@ msgstr "mbox ãããããããããããèåããããã: %s: "
 
 #: ../camel/providers/local/camel-mbox-folder.c:378
 msgid "The folder appears to be irrecoverably corrupted."
-msgstr "ãããããååããããããããççããããããã"
+msgstr "ããããããååããããããããççããããããã"
 
 #: ../camel/providers/local/camel-mbox-folder.c:436
-#: ../camel/providers/local/camel-spool-folder.c:70
+#: ../camel/providers/local/camel-spool-folder.c:71
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
-msgstr "%s ããããããããããçæããããã: %s"
+msgstr "%s ãããããããããããçæããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:363
-#: ../camel/providers/local/camel-mbox-store.c:534
+#: ../camel/providers/local/camel-mbox-store.c:380
+#: ../camel/providers/local/camel-mbox-store.c:550
 #, c-format
 msgid "Cannot create a folder by this name."
-msgstr "ãããããååããããããäæãããããã"
+msgstr "ãããããååãããããããäæãããããã"
 
-#: ../camel/providers/local/camel-mbox-store.c:400
+#: ../camel/providers/local/camel-mbox-store.c:417
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
-msgstr "'%s' ããããããããååããããã: éåããããããããããããã"
+msgstr "'%s' ãããããããããååããããã: éåããããããããããããã"
 
-#: ../camel/providers/local/camel-mbox-store.c:550
+#: ../camel/providers/local/camel-mbox-store.c:566
 #, c-format
 msgid "Cannot create directory '%s': %s."
-msgstr "'%s' ããããããããäæããããã: %s"
+msgstr "'%s' ãããããããããäæããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:566
+#: ../camel/providers/local/camel-mbox-store.c:582
 #, c-format
 msgid "Cannot create folder: %s: %s"
-msgstr "ãããããäæããããã: %s: %s"
+msgstr "ããããããäæããããã: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:568
+#: ../camel/providers/local/camel-mbox-store.c:584
 msgid "Folder already exists"
-msgstr "æãããããããããã"
+msgstr "æããããããããããã"
 
-#: ../camel/providers/local/camel-mbox-store.c:609
-#: ../camel/providers/local/camel-mbox-store.c:622
-#: ../camel/providers/local/camel-mbox-store.c:651
+#: ../camel/providers/local/camel-mbox-store.c:627
+#: ../camel/providers/local/camel-mbox-store.c:640
+#: ../camel/providers/local/camel-mbox-store.c:669
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
 "%s"
 msgstr ""
-"'%s' ããããããããåéãããããããã:\n"
+"'%s' ãããããããããåéãããããããã:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:632
+#: ../camel/providers/local/camel-mbox-store.c:650
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' ãéåããããããããããããã"
 
-#: ../camel/providers/local/camel-mbox-store.c:641
+#: ../camel/providers/local/camel-mbox-store.c:659
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
-msgstr "'%s' ããããããããçããããããåéããããã"
+msgstr "'%s' ãããããããããçããããããåéããããã"
 
-#: ../camel/providers/local/camel-mbox-store.c:667
-#: ../camel/providers/local/camel-mbox-store.c:681
+#: ../camel/providers/local/camel-mbox-store.c:686
+#: ../camel/providers/local/camel-mbox-store.c:701
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "'%s' ããããããããããããåéãããããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:761
+#: ../camel/providers/local/camel-mbox-store.c:783
 #, c-format
 msgid "The new folder name is illegal."
-msgstr "æãããããããååãæãããããããã"
+msgstr "æããããããããååãæãããããããã"
 
-#: ../camel/providers/local/camel-mbox-store.c:776
+#: ../camel/providers/local/camel-mbox-store.c:799
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "'%s' ãååãåæãããããããã: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:859
+#: ../camel/providers/local/camel-mbox-store.c:882
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s' ãã %s ãååãåæãããããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:476
+#: ../camel/providers/local/camel-mbox-summary.c:495
 #, c-format
 msgid "Could not open folder: %s: %s"
-msgstr "ãããããéããããããã: %s: %s"
+msgstr "ããããããéããããããã: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:537
+#: ../camel/providers/local/camel-mbox-summary.c:556
 #, c-format
 msgid "Fatal mail parser error near position %s in folder %s"
-msgstr "ãããã %2$s ã %1$s äèãèåçããããææèæããããã"
+msgstr "ããããã %2$s ã %1$s äèãèåçããããææèæããããã"
 
-#: ../camel/providers/local/camel-mbox-summary.c:622
+#: ../camel/providers/local/camel-mbox-summary.c:645
 #, c-format
 msgid "Cannot check folder: %s: %s"
-msgstr "ãããããããããããããã: %s: %s"
+msgstr "ããããããããããããããã: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:697
-#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../camel/providers/local/camel-mbox-summary.c:730
+#: ../camel/providers/local/camel-mbox-summary.c:872
 #: ../camel/providers/local/camel-spool-summary.c:138
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "ãããããéããããããã: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../camel/providers/local/camel-mbox-summary.c:744
 #: ../camel/providers/local/camel-spool-summary.c:153
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "äæçã mailbox ãéããããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:728
-#: ../camel/providers/local/camel-mbox-summary.c:949
+#: ../camel/providers/local/camel-mbox-summary.c:761
+#: ../camel/providers/local/camel-mbox-summary.c:988
 #, c-format
 msgid "Could not close source folder %s: %s"
-msgstr "åããããã %s ãéããããããããããããã: %s"
+msgstr "åãããããã %s ãéããããããããããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:739
+#: ../camel/providers/local/camel-mbox-summary.c:772
 #, c-format
 msgid "Could not close temporary folder: %s"
-msgstr "äæçãããããéããããããããããããã: %s"
+msgstr "äæçããããããéããããããããããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:756
+#: ../camel/providers/local/camel-mbox-summary.c:789
 #, c-format
 msgid "Could not rename folder: %s"
-msgstr "ããããåãåæãããããããã: %s"
+msgstr "ãããããåãåæãããããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:846
-#: ../camel/providers/local/camel-mbox-summary.c:1099
+#: ../camel/providers/local/camel-mbox-summary.c:886
+#: ../camel/providers/local/camel-mbox-summary.c:1153
 #, c-format
 msgid "Could not store folder: %s"
-msgstr "ãããããäåãããããããã: %s"
+msgstr "ããããããäåãããããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:1131
+#: ../camel/providers/local/camel-mbox-summary.c:925
+#: ../camel/providers/local/camel-mbox-summary.c:1184
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -3904,25 +3890,25 @@ msgstr ""
 "MBOX ãããããåããããã (ååäãèãåããããããããããããããã)ã"
 "äæããããããã"
 
-#: ../camel/providers/local/camel-mbox-summary.c:895
-#: ../camel/providers/local/camel-mbox-summary.c:1140
+#: ../camel/providers/local/camel-mbox-summary.c:934
+#: ../camel/providers/local/camel-mbox-summary.c:1193
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
-msgstr "ãããããããããäèããããããã (åæããã)"
+msgstr "ããããããããããäèããããããã (åæããã)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1052
+#: ../camel/providers/local/camel-mbox-summary.c:1099
 #: ../camel/providers/local/camel-spool-summary.c:343
 #, c-format
 msgid "Unknown error: %s"
 msgstr "ååäæãããã: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1210
-#: ../camel/providers/local/camel-mbox-summary.c:1240
+#: ../camel/providers/local/camel-mbox-summary.c:1263
+#: ../camel/providers/local/camel-mbox-summary.c:1293
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "äæçã mailbox ãæãèããããããã: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1229
+#: ../camel/providers/local/camel-mbox-summary.c:1282
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "äæçã mailbox ãæãèããããããã: %s: %s"
@@ -3930,102 +3916,102 @@ msgstr "äæçã mailbox ãæãèããããããã: %s: %s"
 #: ../camel/providers/local/camel-mh-folder.c:115
 #, c-format
 msgid "Cannot append message to mh folder: %s: "
-msgstr "MH ååãããããããããããèåããããã: %s: "
+msgstr "MH ååããããããããããããèåããããã: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:483
+#: ../camel/providers/local/camel-mh-store.c:525
 #, c-format
 msgid "Could not create folder '%s': %s"
-msgstr "'%s' ããããããããäæãããããããã: %s"
+msgstr "'%s' ãããããããããäæãããããããã: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:497
+#: ../camel/providers/local/camel-mh-store.c:542
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
-msgstr "'%s' ããããããããååããããã: ãããããããããããã"
+msgstr "'%s' ãããããããããååããããã: ããããããããããããã"
 
 #: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
-msgstr "MH ããããããããéãããã: %s: %s"
-
-#: ../camel/providers/local/camel-spool-store.c:327
-#, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "'%s' ããããããããéãããã: %s"
-
-#: ../camel/providers/local/camel-spool-store.c:341
-#, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "'%s' ããããããããéåããããããããããããããããããã"
+msgstr "MH ãããããããããéãããã: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:350
 #, c-format
 msgid "Spool mail file %s"
 msgstr "ããããããããããããã %s"
 
-#: ../camel/providers/local/camel-spool-store.c:357
+#: ../camel/providers/local/camel-spool-store.c:353
 #, c-format
 msgid "Spool folder tree %s"
-msgstr "ããããããããããããã %s"
+msgstr "ãããããããããããããã %s"
 
-#: ../camel/providers/local/camel-spool-store.c:391
+#: ../camel/providers/local/camel-spool-store.c:394
 #, c-format
 msgid "Folder '%s/%s' does not exist."
-msgstr "'%s/%s' ããããããããååããããã"
+msgstr "'%s/%s' ãããããããããååããããã"
 
-#: ../camel/providers/local/camel-spool-store.c:403
+#: ../camel/providers/local/camel-spool-store.c:408
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
 "%s"
 msgstr ""
-"'%s' ããããããããéããããããã:\n"
+"'%s' ãããããããããéããããããã:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:409
+#: ../camel/providers/local/camel-spool-store.c:414
 #, c-format
 msgid "Folder '%s' does not exist."
-msgstr "'%s' ããããããããååããããã"
+msgstr "'%s' ãããããããããååããããã"
 
-#: ../camel/providers/local/camel-spool-store.c:416
+#: ../camel/providers/local/camel-spool-store.c:421
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
 "%s"
 msgstr ""
-"'%s' ããããããããäæãããããããã:\n"
+"'%s' ãããããããããäæãããããããã:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:426
+#: ../camel/providers/local/camel-spool-store.c:433
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' ããããããããããããããããããããã"
 
-#: ../camel/providers/local/camel-spool-store.c:462
+#: ../camel/providers/local/camel-spool-store.c:481
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "åäçããæçããããããããããã"
 
-#: ../camel/providers/local/camel-spool-store.c:476
+#: ../camel/providers/local/camel-spool-store.c:495
 #, c-format
 msgid "Spool folders cannot be deleted"
-msgstr "ããããããããããåéããããã"
+msgstr "ãããããããããããåéããããã"
 
-#: ../camel/providers/local/camel-spool-store.c:491
+#: ../camel/providers/local/camel-spool-store.c:510
 #, c-format
 msgid "Spool folders cannot be renamed"
-msgstr "ããããããããããååãåæããããã"
+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:169
 #: ../camel/providers/local/camel-spool-summary.c:181
 #: ../camel/providers/local/camel-spool-summary.c:193
 #, c-format
 msgid "Could not synchronize temporary folder %s: %s"
-msgstr "äæçãããã %s ãåæãããããããã: %s"
+msgstr "äæçããããã %s ãåæãããããããã: %s"
 
 #: ../camel/providers/local/camel-spool-summary.c:211
 #, c-format
 msgid "Could not synchronize spool folder %s: %s"
-msgstr "ããããããããã %s ãåæãããããããã: %s"
+msgstr "ãããããããããã %s ãåæãããããããã: %s"
 
 #: ../camel/providers/local/camel-spool-summary.c:243
 #: ../camel/providers/local/camel-spool-summary.c:262
@@ -4035,98 +4021,114 @@ msgid ""
 "Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
-"%s ãããããããããããããåæãããããããã: %s\n"
-"ãããããåããããåèæãããããããããããã '%s' ãäåããããã"
+"%s ããããããããããããããåæãããããããã: %s\n"
+"ããããããåããããåèæãããããããããããã '%s' ãäåããããã"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:274
-#: ../camel/providers/nntp/camel-nntp-folder.c:388
+#: ../camel/providers/nntp/camel-nntp-folder.c:213
+#: ../camel/providers/nntp/camel-nntp-folder.c:302
+#: ../camel/providers/nntp/camel-nntp-folder.c:424
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "åéããã: UID ãæåãçåãã: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:236
-#: ../camel/providers/nntp/camel-nntp-folder.c:240
-#: ../camel/providers/pop3/camel-pop3-folder.c:371
-#: ../camel/providers/pop3/camel-pop3-folder.c:436
-#: ../camel/providers/pop3/camel-pop3-folder.c:448
-#: ../camel/providers/pop3/camel-pop3-folder.c:697
+#: ../camel/providers/nntp/camel-nntp-folder.c:263
+#: ../camel/providers/nntp/camel-nntp-folder.c:267
+#: ../camel/providers/pop3/camel-pop3-folder.c:431
+#: ../camel/providers/pop3/camel-pop3-folder.c:696
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "ããããã %s ãååããããã: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:472
-#: ../camel/providers/nntp/camel-nntp-folder.c:478
-#: ../camel/providers/nntp/camel-nntp-folder.c:525
+#: ../camel/providers/nntp/camel-nntp-folder.c:274
+#: ../camel/providers/nntp/camel-nntp-folder.c:449
+#: ../camel/providers/pop3/camel-pop3-folder.c:368
+#: ../camel/providers/pop3/camel-pop3-folder.c:420
+#: ../camel/providers/pop3/camel-pop3-folder.c:440
+#, c-format
+msgid "Cannot get message %s: "
+msgstr "ããããã %s ãååããããã: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:508
+#: ../camel/providers/nntp/camel-nntp-folder.c:514
+#: ../camel/providers/nntp/camel-nntp-folder.c:561
 #, c-format
 msgid "Posting failed: %s"
 msgstr "æçãåæãããã: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:520
+#: ../camel/providers/nntp/camel-nntp-folder.c:556
 msgid "Posting failed: "
 msgstr "æçãåæãããã: "
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:549
+#: ../camel/providers/nntp/camel-nntp-folder.c:585
 #, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "ãããããçæãéã NNTP ããããããæçããããã!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:569
+#: ../camel/providers/nntp/camel-nntp-folder.c:605
 #, c-format
 msgid "You cannot copy messages from a NNTP folder!"
-msgstr "NNTP ããããããããããããããããããããã!"
+msgstr "NNTP ãããããããããããããããããããããã!"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "ããããåãçãèèãã (ä: \"comp.os.linux\" => \"c.o.linux\")(_S)"
+msgstr ""
+"ãããããåãçãèèãã (ä: \"comp.os.linux\" => \"c.o.linux\")(_S)"
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
-msgstr "ééããããããåãèèããããããèçãã(_D)"
+msgstr "ééãããããããåãèèããããããèçãã(_D)"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:52
+msgid "Default NNTP port"
+msgstr ""
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:53
+msgid "NNTP over SSL"
+msgstr ""
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:59
 msgid "USENET news"
 msgstr "USENET ãããã"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:61
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "USENET ããããããããããèèãããæçãããã"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
+#: ../camel/providers/nntp/camel-nntp-provider.c:82
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
-"ããããããããããããããããããããããããäãã NNTP ããããèèãã"
-"ãã"
+"ããããããããããããããããããããããããäãã NNTP ãããããèèã"
+"ããã"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:73
+#: ../camel/providers/nntp/camel-nntp-store.c:97
 #, c-format
 msgid "Authentication requested but no username provided"
-msgstr "èèãåèãããããããããããåãæåããããããã"
+msgstr "èèãåèããããããããããããåãæåããããããã"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:85
+#: ../camel/providers/nntp/camel-nntp-store.c:109
 #, c-format
 msgid "Cannot authenticate to server: %s"
-msgstr "ããããèèãèãããã: %s"
+msgstr "ãããããèèãèãããã: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:375
+#: ../camel/providers/nntp/camel-nntp-store.c:357
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "%s ãããææãèãããããããããããã: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:388
+#: ../camel/providers/nntp/camel-nntp-store.c:370
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
-msgstr "NNTP ããã %s ããããããã %d ãèãããã: %s"
+msgstr "NNTP ãããã %s ããããããã %d ãèãããã: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:582
+#: ../camel/providers/nntp/camel-nntp-store.c:528
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s ççã USENET ãããã"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1100
+#: ../camel/providers/nntp/camel-nntp-store.c:1060
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4137,7 +4139,26 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1215
+#: ../camel/providers/nntp/camel-nntp-store.c:1153
+#, c-format
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr ""
+"ãããããããããããããããçæããããã: äãããèèãçèããããã"
+"ãã"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1169
+#, c-format
+msgid "You cannot rename a folder in a News store."
+msgstr "ããããæçåæããããããåãåæãããããã"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#, c-format
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr ""
+"ããããæçåæãããããããåéããããã: äãããèèãåæããããã"
+"ãã"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1338
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4146,10 +4167,10 @@ msgid ""
 msgstr ""
 "ãããããããããããèèããããã:\n"
 "\n"
-"ããããããããããããããããããããéæãããããããèãããããããã"
-"ããããããã"
+"ããããããããããããããããããããéæãããããããèãããããããã"
+"ãããããããã"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1257
+#: ../camel/providers/nntp/camel-nntp-store.c:1389
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4160,92 +4181,78 @@ msgstr ""
 "\n"
 "ãããããããããããããã!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1290
-#, c-format
-msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr ""
-"ããããããããããããããçæããããã: äãããèèãçèããããããã"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1306
-#, c-format
-msgid "You cannot rename a folder in a News store."
-msgstr "ããããæçåæãããããåãåæãããããã"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1323
-#, c-format
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
-"ããããæçåæããããããåéããããã: äãããèèãåæããããããã"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1535
+#: ../camel/providers/nntp/camel-nntp-store.c:1582
 msgid "NNTP Command failed: "
 msgstr "NNTP ãããããåæãããã: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1609
+#: ../camel/providers/nntp/camel-nntp-store.c:1656
 #, c-format
 msgid "Not connected."
 msgstr "æçããããããã"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:232
-#: ../camel/providers/nntp/camel-nntp-summary.c:348
+#: ../camel/providers/nntp/camel-nntp-summary.c:240
+#: ../camel/providers/nntp/camel-nntp-summary.c:358
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: æããããããããèæä"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:249
+#: ../camel/providers/nntp/camel-nntp-summary.c:256
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "xover ããæååãåçãããããã: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:365
+#: ../camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "head ããæååãåçãããããã: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:410
+#: ../camel/providers/nntp/camel-nntp-summary.c:419
 #, c-format
 msgid "Operation failed: %s"
 msgstr "æäãåæãããã: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:277
-#: ../camel/providers/pop3/camel-pop3-folder.c:336
+#: ../camel/providers/pop3/camel-pop3-folder.c:285
+#: ../camel/providers/pop3/camel-pop3-folder.c:344
 #, c-format
 msgid "No message with UID %s"
 msgstr "UID %s ãããããããããããã"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:344
+#: ../camel/providers/pop3/camel-pop3-folder.c:352
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "ããããã %d ã POP ãååä"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:449
+#: ../camel/providers/pop3/camel-pop3-folder.c:432
 msgid "Unknown reason"
 msgstr "ååäæ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:488
+#: ../camel/providers/pop3/camel-pop3-folder.c:472
 msgid "Retrieving POP summary"
 msgstr "POP ããããååä"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:511
-#, c-format
-msgid "Cannot get POP summary: %s"
+#: ../camel/providers/pop3/camel-pop3-folder.c:487
+#, fuzzy
+#| msgid "Cannot get POP summary: %s"
+msgid "Cannot get POP summary: "
 msgstr "POP ããããååããããã: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:563
+#: ../camel/providers/pop3/camel-pop3-folder.c:557
 msgid "Expunging old messages"
 msgstr "åéæãããããããææä"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:577
+#: ../camel/providers/pop3/camel-pop3-folder.c:569
 msgid "Expunging deleted messages"
 msgstr "åéæããããããããææä"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
-msgid "Message storage"
+#, fuzzy
+#| msgid "Message storage"
+msgid "Message Storage"
 msgstr "ããããããæç"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
-msgstr "ããããããããããæã(_L)"
+msgstr "ãããããããããããæã(_L)"
 
 #. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
 #: ../camel/providers/pop3/camel-pop3-provider.c:44
@@ -4261,155 +4268,170 @@ msgstr "ãããããåäçãæããããããåéãã(_E)"
 msgid "Disable _support for all POP3 extensions"
 msgstr "ãããã POP3 æåãããããçåããã(_S)"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:56
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Default POP3 port"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
+#, fuzzy
+#| msgid "POP3 server %s"
+msgid "POP3 over SSL"
+msgstr "POP ãããã %s"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:58
+#: ../camel/providers/pop3/camel-pop3-provider.c:64
 msgid "For connecting to and downloading mail from POP servers."
-msgstr "POP ããããæçãããããããèããããããã"
+msgstr "POP ãããããæçãããããããèããããããã"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:75
+#: ../camel/providers/pop3/camel-pop3-provider.c:83
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"ããããããããããããããããããããããããäãã POP ããããæçãã"
-"ãããããåãã POP ããããããããããããããããããã"
+"ããããããããããããããããããããããããäãã POP ãããããæçãã"
+"ãããããåãã POP ãããããããããããããããããããã"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:85
+#: ../camel/providers/pop3/camel-pop3-provider.c:93
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 "ãããããããã APOP ãããããççãæååãããããããããäãã POP ãã"
-"ããæçãããããããååããããããèæãããããããããããããããæå"
-"ãåäãããããããããããã"
+"ãããæçãããããããååããããããèæãããããããããããããããã"
+"ãæåãåäãããããããããããã"
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:98
+#: ../camel/providers/pop3/camel-pop3-store.c:83
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/pop3/camel-pop3-store.c:130
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr "POP ããã %s ããååãææãèãèããåæãããã"
+msgstr "POP ãããã %s ããååãææãèãèããåæãããã"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:199
-#: ../camel/providers/pop3/camel-pop3-store.c:230
-#: ../camel/providers/pop3/camel-pop3-store.c:237
+#: ../camel/providers/pop3/camel-pop3-store.c:150
+#: ../camel/providers/pop3/camel-pop3-store.c:189
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
-"ããããããäèããããããã POP ããã %s ããæçãåæãããã: %s"
+"ããããããäèããããããã POP ãããã %s ããæçãåæãããã: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:200
+#: ../camel/providers/pop3/camel-pop3-store.c:151
 msgid "STLS not supported by server"
-msgstr "ãããã STLS æåããããããããããã"
+msgstr "ããããã STLS æåããããããããããã"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:218
+#: ../camel/providers/pop3/camel-pop3-store.c:169
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
-msgstr "ããããããäèããããã POP ããã %s ããæçãåæãããã%s"
+msgstr "ããããããäèããããã POP ãããã %s ããæçãåæãããã%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:231
-msgid "TLS negotiations failed"
-msgstr "TLS æçãåæãããã"
+#: ../camel/providers/pop3/camel-pop3-store.c:182
+#, 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:238
+#: ../camel/providers/pop3/camel-pop3-store.c:190
 msgid "TLS is not available in this build"
 msgstr "ããããããããã TLS ãåçããããã"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:317
-#: ../camel/providers/pop3/camel-pop3-store.c:472
+#: ../camel/providers/pop3/camel-pop3-store.c:241
+#: ../camel/providers/pop3/camel-pop3-store.c:414
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr ""
-"POP ããã %s ãæçããããã: èæãããèèæåãããããããããããã"
+"POP ãããã %s ãæçããããã: èæãããèèæåãããããããããããã"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:340
+#: ../camel/providers/pop3/camel-pop3-store.c:269
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
-msgstr "POP ããã %2$s ãã SASL '%1$s' èèãããããåæãããã: %3$s"
+msgstr "POP ãããã %2$s ãã SASL '%1$s' èèãããããåæãããã: %3$s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:357
+#: ../camel/providers/pop3/camel-pop3-store.c:286
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "POP ããã %s ãããããããããã: SASL ããããããããããã"
+msgstr "POP ãããã %s ãããããããããã: SASL ããããããããããã"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:374
+#: ../camel/providers/pop3/camel-pop3-store.c:308
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
-msgstr "POP ããã %s ãèèãåæãããã: "
+msgstr "POP ãããã %s ãèèãåæãããã: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:439
+#: ../camel/providers/pop3/camel-pop3-store.c:380
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
 "attack suspected. Please contact your admin."
 msgstr ""
-"POP ããã %s ãæçããããã:\tçåã APOP ID ãåãåãããã; èçææã"
-"åèæãããããççèãéçããããããã"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:492
-#, c-format
+"POP ãããã %s ãæçããããã:\tçåã APOP ID ãåãåãããã; èçææ"
+"ãåèæãããããççèãéçããããããã"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:427
+#, fuzzy, c-format
+#| msgid ""
+#| "Unable to connect to POP server %s.\n"
+#| "Error sending password: %s"
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending password: %s"
+"Error sending password: "
 msgstr ""
-"POP ããã %s ãæçãããããã\n"
+"POP ãããã %s ãæçãããããã\n"
 "ããããããéääãããã: %s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:505
+#: ../camel/providers/pop3/camel-pop3-store.c:437
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending username%s"
 msgstr ""
-"POP ããã %s ãæçãããããã\n"
-"ãããåãéääãããã%s"
+"POP ãããã %s ãæçãããããã\n"
+"ããããåãéääãããã%s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:518
+#: ../camel/providers/pop3/camel-pop3-store.c:449
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password%s"
 msgstr ""
-"POP ããã %s ãæçãããããã\n"
+"POP ãããã %s ãæçãããããã\n"
 "ããããããéääãããã%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid "POP3 server %s"
-msgstr "POP ããã %s"
+msgstr "POP ãããã %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../camel/providers/pop3/camel-pop3-store.c:495
 #, c-format
 msgid "POP3 server for %s on %s"
-msgstr "%s ã %s ããã POP ããã"
+msgstr "%s ã %s ããã POP ãããã"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:693
+#: ../camel/providers/pop3/camel-pop3-store.c:626
 #, c-format
 msgid "Could not connect to POP server %s"
-msgstr "POP ããã %s ãæçãããããããã"
+msgstr "POP ãããã %s ãæçãããããããã"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:720
+#: ../camel/providers/pop3/camel-pop3-store.c:653
 #, c-format
 msgid "No such folder '%s'."
-msgstr "'%s' ããããããããååããããã"
+msgstr "'%s' ãããããããããååããããã"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:737
+#: ../camel/providers/pop3/camel-pop3-store.c:670
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
-msgstr "POP3 ãããããããããéåæéãæãããã"
+msgstr "POP3 ããããããããããéåæéãæãããã"
 
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
@@ -4464,239 +4486,254 @@ msgstr "%s ãåèãããããããã: ããããéäãããã"
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail ãããããã %d ãçäãããã: ããããéäããããã"
 
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
+msgid "Default SMTP port"
+msgstr ""
+
 #: ../camel/providers/smtp/camel-smtp-provider.c:43
+#, fuzzy
+#| msgid "SMTP server %s"
+msgid "SMTP over SSL"
+msgstr "SMTP ãããã %s"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:44
+msgid "Message submission port"
+msgstr ""
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:45
+#: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "SMTP ãäãããããããããããããæçãããããããããéäãããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:149
+#: ../camel/providers/smtp/camel-smtp-transport.c:156
 msgid "Welcome response error: "
 msgstr "Welcome åçããã: "
 
+#: ../camel/providers/smtp/camel-smtp-transport.c:191
 #: ../camel/providers/smtp/camel-smtp-transport.c:237
-#: ../camel/providers/smtp/camel-smtp-transport.c:277
-#: ../camel/providers/smtp/camel-smtp-transport.c:284
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
-"ããããããäèããããããã SMTP ããã %s ããæçãåæãããã: %s"
+"ããããããäèããããããã SMTP ãããã %s ããæçãåæãããã: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:246
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:266
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:220
 msgid "STARTTLS command failed: "
 msgstr "STARTTLS ãããããåæãããã: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:230
+#, 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:283
 #, c-format
 msgid "SMTP server %s"
-msgstr "SMTP ããã %s"
+msgstr "SMTP ãããã %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#: ../camel/providers/smtp/camel-smtp-transport.c:287
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s ççã SMTP ããããéäããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#: ../camel/providers/smtp/camel-smtp-transport.c:338
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "SMTP ããã %s ãèæããèèæå %s ãããããããããããã"
+msgstr "SMTP ãããã %s ãèæããèèæå %s ãããããããããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:440
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
 "%s\n"
 "\n"
 msgstr ""
-"SMTP ããããèèãããããã\n"
+"SMTP ãããããèèãããããã\n"
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#: ../camel/providers/smtp/camel-smtp-transport.c:557
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "ããããããéäããããã: ãããããæçãããããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:620
+#: ../camel/providers/smtp/camel-smtp-transport.c:564
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "ããããããéäããããã: ååäããããããæãããããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:624
+#: ../camel/providers/smtp/camel-smtp-transport.c:568
 msgid "Sending message"
 msgstr "ããããããéää"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#: ../camel/providers/smtp/camel-smtp-transport.c:593
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "ããããããéäããããã: ååãåçãããããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:662
+#: ../camel/providers/smtp/camel-smtp-transport.c:606
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "ããããããéäããããã: çåãåçãäãääãããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:725
+#: ../camel/providers/smtp/camel-smtp-transport.c:709
 msgid "Syntax error, command unrecognized"
 msgstr "ææèæããã: ããããããããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
+#: ../camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Syntax error in parameters or arguments"
-msgstr "ãããããããããåæãææèæããã"
+msgstr "ããããããããããåæãææèæããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Command not implemented"
 msgstr "ãããããåèããããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:715
 msgid "Command parameter not implemented"
-msgstr "ããããããããããåèããããããã"
+msgstr "ãããããããããããåèããããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:733
+#: ../camel/providers/smtp/camel-smtp-transport.c:717
 msgid "System status, or system help reply"
 msgstr "ããããããããããããããããããããããåç"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:735
+#: ../camel/providers/smtp/camel-smtp-transport.c:719
 msgid "Help message"
 msgstr "ããããããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:737
+#: ../camel/providers/smtp/camel-smtp-transport.c:721
 msgid "Service ready"
 msgstr "ãããããåçãããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:739
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
 msgid "Service closing transmission channel"
 msgstr "ãããããéäããããããéããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:741
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
 msgid "Service not available, closing transmission channel"
 msgstr "ãããããåçããããã, éäããããããéããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:743
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
 msgid "Requested mail action okay, completed"
 msgstr "èæãããããããåäãOK, åäãããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:729
 msgid "User not local; will forward to <forward-path>"
-msgstr "ããããããããããããããã; <forward-path> ãèéããã"
+msgstr "ãããããããããããããããã; <forward-path> ãèéããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:747
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "èæãããããããåäãåäãããã: ããããããããåçããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:749
+#: ../camel/providers/smtp/camel-smtp-transport.c:733
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "èæãããåäãåäãããã: ããããããããåçããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:751
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
 msgid "Requested action aborted: error in processing"
 msgstr "èæãããåäãäæãããã: åçäãããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:753
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
 msgid "User not local; please try <forward-path>"
-msgstr "ããããããããããããããã; <forward-path> ãèããããããã"
+msgstr "ãããããããããããããããã; <forward-path> ãèããããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:755
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
 msgid "Requested action not taken: insufficient system storage"
 msgstr "èæãããåäãåäãããã: ãããããäåéåãèãããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
+#: ../camel/providers/smtp/camel-smtp-transport.c:741
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "èæãããããããåäãäæãããã: éååãåããèãããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:759
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "èæãããåäãåäãããã: ãããããããåãèãããããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:761
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "ããããååãéåããã; <CRLF>.<CRLF> ãçäããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:763
+#: ../camel/providers/smtp/camel-smtp-transport.c:747
 msgid "Transaction failed"
 msgstr "åçãåæãããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:767
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
 msgid "A password transition is needed"
 msgstr "ããããããåæãåèãã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:769
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
 msgid "Authentication mechanism is too weak"
 msgstr "èèããããããäååéããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:771
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
 msgid "Encryption required for requested authentication mechanism"
 msgstr "èæããèèãããããããããæååãåèãã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:773
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
 msgid "Temporary authentication failure"
 msgstr "äæçãèèãåæãããã"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1030
+#: ../camel/providers/smtp/camel-smtp-transport.c:1008
 msgid "SMTP Greeting"
 msgstr "SMTP ãæçä"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1057
-#: ../camel/providers/smtp/camel-smtp-transport.c:1074
-#: ../camel/providers/smtp/camel-smtp-transport.c:1082
+#: ../camel/providers/smtp/camel-smtp-transport.c:1035
+#: ../camel/providers/smtp/camel-smtp-transport.c:1052
+#: ../camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "HELO command failed: "
 msgstr "HELO ãããããåæãããã: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1150
+#: ../camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "SMTP Authentication"
 msgstr "SMTP èè"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1157
-#, c-format
-msgid "Error creating SASL authentication object."
-msgstr "SASL èèãããããããçæäãããããççããããã"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1176
-#: ../camel/providers/smtp/camel-smtp-transport.c:1187
-#: ../camel/providers/smtp/camel-smtp-transport.c:1196
+#: ../camel/providers/smtp/camel-smtp-transport.c:1148
+#: ../camel/providers/smtp/camel-smtp-transport.c:1159
+#: ../camel/providers/smtp/camel-smtp-transport.c:1172
 msgid "AUTH command failed: "
 msgstr "AUTH ãããããåæãããã: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1304
-#: ../camel/providers/smtp/camel-smtp-transport.c:1318
-#: ../camel/providers/smtp/camel-smtp-transport.c:1327
+#: ../camel/providers/smtp/camel-smtp-transport.c:1280
+#: ../camel/providers/smtp/camel-smtp-transport.c:1294
+#: ../camel/providers/smtp/camel-smtp-transport.c:1303
 msgid "MAIL FROM command failed: "
 msgstr "MAIL FROM ãããããåæãããã: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+#: ../camel/providers/smtp/camel-smtp-transport.c:1330
 msgid "RCPT TO command failed: "
 msgstr "RCPT TO ãããããåæãããã: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1370
-#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#: ../camel/providers/smtp/camel-smtp-transport.c:1346
+#: ../camel/providers/smtp/camel-smtp-transport.c:1355
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "RCPT TO <%s> ãããããåæãããã: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1421
-#: ../camel/providers/smtp/camel-smtp-transport.c:1431
-#: ../camel/providers/smtp/camel-smtp-transport.c:1441
-#: ../camel/providers/smtp/camel-smtp-transport.c:1500
-#: ../camel/providers/smtp/camel-smtp-transport.c:1519
-#: ../camel/providers/smtp/camel-smtp-transport.c:1532
-#: ../camel/providers/smtp/camel-smtp-transport.c:1540
+#: ../camel/providers/smtp/camel-smtp-transport.c:1397
+#: ../camel/providers/smtp/camel-smtp-transport.c:1407
+#: ../camel/providers/smtp/camel-smtp-transport.c:1417
+#: ../camel/providers/smtp/camel-smtp-transport.c:1476
+#: ../camel/providers/smtp/camel-smtp-transport.c:1495
+#: ../camel/providers/smtp/camel-smtp-transport.c:1508
+#: ../camel/providers/smtp/camel-smtp-transport.c:1516
 msgid "DATA command failed: "
 msgstr "DATA ãããããåæãããã: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1565
-#: ../camel/providers/smtp/camel-smtp-transport.c:1579
-#: ../camel/providers/smtp/camel-smtp-transport.c:1587
+#: ../camel/providers/smtp/camel-smtp-transport.c:1541
+#: ../camel/providers/smtp/camel-smtp-transport.c:1555
+#: ../camel/providers/smtp/camel-smtp-transport.c:1563
 msgid "RSET command failed: "
 msgstr "RSET ãããããåæãããã: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1612
-#: ../camel/providers/smtp/camel-smtp-transport.c:1626
-#: ../camel/providers/smtp/camel-smtp-transport.c:1633
+#: ../camel/providers/smtp/camel-smtp-transport.c:1588
+#: ../camel/providers/smtp/camel-smtp-transport.c:1602
+#: ../camel/providers/smtp/camel-smtp-transport.c:1609
 msgid "QUIT command failed: "
 msgstr "QUIT ãããããåæãããã: "
 
@@ -4812,188 +4849,181 @@ msgctxt "CategoryName"
 msgid "Waiting"
 msgstr "åã"
 
+#: ../libedataserver/e-client.c:120
+#, fuzzy
+#| msgid "URI not loaded"
+msgid "Source not loaded"
+msgstr "URI ãèãèãããããã"
+
+#: ../libedataserver/e-client.c:122
+#, fuzzy
+#| msgid "URI already loaded"
+msgid "Source already loaded"
+msgstr "URL ãæãèãèãæããã"
+
+#: ../libedataserver/e-client.c:130
+#, fuzzy
+#| msgid "Offline mode unavailable"
+msgid "Offline unavailable"
+msgstr "ããããããããããåãæãããããã"
+
+#: ../libedataserver/e-client.c:152
+#, fuzzy
+#| msgid "parse error"
+msgid "D-Bus error"
+msgstr "èæããã"
+
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1931
+#. * time, in 12-hour format.
+#: ../libedataserver/e-time-utils.c:1646 ../libedataserver/e-time-utils.c:1944
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p%l:%M:%S"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1922
+#. * time, in 24-hour format.
+#: ../libedataserver/e-time-utils.c:1651 ../libedataserver/e-time-utils.c:1935
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %k:%M:%S"
 
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
+#. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1927
+#. * time, in 12-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1656 ../libedataserver/e-time-utils.c:1940
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d (%a) %p%l:%M"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
+#. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1918
+#. * time, in 24-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1931
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%Y/%m/%d (%a) %k:%M"
 
 #. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1655
+#. * in 12-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1666
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%Y/%m/%d (%a) %p%læ"
 
 #. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1660
+#. * in 24-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1671
 msgid "%a %m/%d/%Y %H"
 msgstr "%Y/%m/%d (%a) %kæ"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1783
-#: ../libedataserver/e-time-utils.c:1913
+#: ../libedataserver/e-time-utils.c:1674 ../libedataserver/e-time-utils.c:1794
+#: ../libedataserver/e-time-utils.c:1926
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1670
+#: ../libedataserver/e-time-utils.c:1681
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d %p%l:%M:%S"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1674
+#: ../libedataserver/e-time-utils.c:1685
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d %k:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1679
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1690
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d %p%l:%M"
 
 #. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1684
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1695
 msgid "%m/%d/%Y %H:%M"
 msgstr "%Y/%m/%d %k:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1689
+#. * without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1700
 msgid "%m/%d/%Y %I %p"
 msgstr "%Y/%m/%d %p%læ"
 
 #. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#. * without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1705
 msgid "%m/%d/%Y %H"
 msgstr "%Y/%m/%d %kæ"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1786
+#: ../libedataserver/e-time-utils.c:1708 ../libedataserver/e-time-utils.c:1797
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1855 ../libedataserver/e-time-utils.c:1975
+#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1988
 msgid "%I:%M:%S %p"
 msgstr "%p%l:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1859 ../libedataserver/e-time-utils.c:1967
+#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1980
 msgid "%H:%M:%S"
 msgstr "%k:%M:%S"
 
 #. strptime format for time of day, without seconds,
-#. in 12-hour format.
+#. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1864 ../libedataserver/e-time-utils.c:1972
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1877 ../libedataserver/e-time-utils.c:1985
 msgid "%I:%M %p"
 msgstr "%p%l:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1964
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1977
 msgid "%H:%M"
 msgstr "%k:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1871
+#: ../libedataserver/e-time-utils.c:1884
 msgid "%H%M"
 msgstr "%k%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1875
+#: ../libedataserver/e-time-utils.c:1888
 msgid "%I %p"
 msgstr "%p%læ"
 
-#: ../libedataserverui/e-book-auth-util.c:93
-#: ../libedataserverui/e-book-auth-util.c:673
+#: ../libedataserverui/e-book-auth-util.c:96
+#: ../libedataserverui/e-book-auth-util.c:662
 msgid "Accessing LDAP Server anonymously"
-msgstr "ååã LDAP ããããããããä"
+msgstr "ååã LDAP ãããããããããä"
 
-#: ../libedataserverui/e-book-auth-util.c:199
-#: ../libedataserverui/e-book-auth-util.c:435
+#: ../libedataserverui/e-book-auth-util.c:197
+#: ../libedataserverui/e-book-auth-util.c:423
 msgid "Failed to authenticate.\n"
 msgstr "èèãåæããããã\n"
 
-#: ../libedataserverui/e-categories-dialog.c:127
-msgid "Category Properties"
-msgstr "ãããããããããã"
-
-#: ../libedataserverui/e-categories-dialog.c:138
-msgid "Category _Name"
-msgstr "ãããããåå(_N)"
-
-#: ../libedataserverui/e-categories-dialog.c:144
-msgid "Category _Icon"
-msgstr "ããããããããã(_I)"
-
-#: ../libedataserverui/e-categories-dialog.c:185
-msgid "Category Icon"
-msgstr "ããããããããã"
-
-#: ../libedataserverui/e-categories-dialog.c:191
-msgid "_No Image"
-msgstr "çåãã(_N)"
-
-#: ../libedataserverui/e-categories-dialog.c:406
-#, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
-msgstr "èåãäããããã '%s' ãååããããåãååãæåããããããã"
-
-#: ../libedataserverui/e-categories-dialog.c:661
+#: ../libedataserverui/e-categories-editor.c:221
 msgid "Currently _used categories:"
 msgstr "æèäçãããããã(_U):"
 
-#: ../libedataserverui/e-categories-dialog.c:668
+#: ../libedataserverui/e-categories-editor.c:230
 msgid "_Available Categories:"
 msgstr "åçåèããããã(_A):"
 
-#: ../libedataserverui/e-categories-dialog.c:711
-msgid "_Edit"
-msgstr "çé(_E)"
-
-#: ../libedataserverui/e-categories-dialog.c:768
+#: ../libedataserverui/e-categories-selector.c:320
 msgid "Icon"
 msgstr "ãããã"
 
-#: ../libedataserverui/e-categories-dialog.c:773
+#: ../libedataserverui/e-categories-selector.c:325
 msgid "Category"
 msgstr "ãããã"
 
@@ -5002,149 +5032,439 @@ msgstr "ãããã"
 msgid "Create category \"%s\""
 msgstr "\"%s\" ããããããããçæ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:176
+#: ../libedataserverui/e-category-editor.c:132
+msgid "Category Icon"
+msgstr "ããããããããã"
+
+#: ../libedataserverui/e-category-editor.c:136
+msgid "_No Image"
+msgstr "çåãã(_N)"
+
+#: ../libedataserverui/e-category-editor.c:173
+msgid "Category _Name"
+msgstr "ãããããåå(_N)"
+
+#: ../libedataserverui/e-category-editor.c:181
+msgid "Category _Icon"
+msgstr "ããããããããã(_I)"
+
+#: ../libedataserverui/e-category-editor.c:221
+msgid "Category Properties"
+msgstr "ãããããããããã"
+
+#: ../libedataserverui/e-category-editor.c:282
+#, c-format
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
+msgstr "èåãäããããã '%s' ãååããããåãååãæåããããããã"
+
+#: ../libedataserverui/e-client-utils.c:856
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for calendar %s (user %s)\n"
+"Reason: %s"
+msgstr "%s (ãããã %s) ãããããããååãããããã"
+
+#: ../libedataserverui/e-client-utils.c:858
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for calendar %s (user %s)"
+msgstr "%s (ãããã %s) ãããããããååãããããã"
+
+#: ../libedataserverui/e-client-utils.c:862
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for task list %s (user %s)\n"
+"Reason: %s"
+msgstr "%s (ãããã %s) ãããããããååãããããã"
+
+#: ../libedataserverui/e-client-utils.c:864
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for task list %s (user %s)"
+msgstr "%s (ãããã %s) ãããããããååãããããã"
+
+#: ../libedataserverui/e-client-utils.c:868
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid ""
+"Enter password for memo list %s (user %s)\n"
+"Reason: %s"
+msgstr "%s (ãããã %s) ãããããããååãããããã"
+
+#: ../libedataserverui/e-client-utils.c:870
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for memo list %s (user %s)"
+msgstr "%s (ãããã %s) ãããããããååãããããã"
+
+#: ../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"
+msgid "Enter Passphrase"
+msgstr "ããããããåå"
+
+#: ../libedataserverui/e-client-utils.c:983
+#, fuzzy
+#| msgid "Enter password"
+msgid "Enter Password"
+msgstr "ããããããåå"
+
+#: ../libedataserverui/e-name-selector-dialog.c:184
 msgid "Show Contacts"
 msgstr "éçåãèç"
 
-#: ../libedataserverui/e-name-selector-dialog.c:198
+#: ../libedataserverui/e-name-selector-dialog.c:206
 msgid "Address B_ook:"
 msgstr "ããããå(_O):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:206
+#: ../libedataserverui/e-name-selector-dialog.c:214
 msgid "Cate_gory:"
 msgstr "ãããã(_G):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:224
+#: ../libedataserverui/e-name-selector-dialog.c:232
 msgid "_Search:"
 msgstr "æç(_S):"
 
-#: ../libedataserverui/e-name-selector-dialog.c:242
-#: ../libedataserverui/e-name-selector-dialog.c:977
+#: ../libedataserverui/e-name-selector-dialog.c:250
+#: ../libedataserverui/e-name-selector-dialog.c:1035
 msgid "Any Category"
 msgstr "äæããããã"
 
-#: ../libedataserverui/e-name-selector-dialog.c:244
+#: ../libedataserverui/e-name-selector-dialog.c:252
 msgid "Co_ntacts"
 msgstr "éçå(_N)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:289
+#: ../libedataserverui/e-name-selector-dialog.c:307
 msgid "Search"
 msgstr "æç"
 
-#: ../libedataserverui/e-name-selector-dialog.c:292
+#: ../libedataserverui/e-name-selector-dialog.c:310
 msgid "Address Book"
 msgstr "ããããå"
 
-#: ../libedataserverui/e-name-selector-dialog.c:295
+#: ../libedataserverui/e-name-selector-dialog.c:313
 msgid "Contacts"
 msgstr "éçå"
 
-#: ../libedataserverui/e-name-selector-dialog.c:412
+#: ../libedataserverui/e-name-selector-dialog.c:430
 msgid "Select Contacts from Address Book"
 msgstr "ããããåããéçåãéæ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:747
+#: ../libedataserverui/e-name-selector-dialog.c:778
 msgid "_Add"
 msgstr "èå(_A)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:751
+#: ../libedataserverui/e-name-selector-dialog.c:782
 msgid "_Remove"
 msgstr "åé(_R)"
 
-#: ../libedataserverui/e-name-selector-dialog.c:891
+#: ../libedataserverui/e-name-selector-dialog.c:954
 #, c-format
 msgid "Error loading address book: %s"
 msgstr "ããããåãèãèãäãããã: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2661
+#: ../libedataserverui/e-name-selector-entry.c:2816
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "%s ãããããããåéãã(_X)"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2676
+#: ../libedataserverui/e-name-selector-entry.c:2831
 #, c-format
 msgid "Cop_y %s"
 msgstr "%s ãããã(_Y)"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2686
+#: ../libedataserverui/e-name-selector-entry.c:2841
 #, c-format
 msgid "C_ut %s"
 msgstr "%s ãåãåã(_U)"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2703
+#: ../libedataserverui/e-name-selector-entry.c:2858
 #, c-format
 msgid "_Edit %s"
 msgstr "%s ãçé(_E)"
 
-#: ../libedataserverui/e-name-selector-list.c:509
+#: ../libedataserverui/e-name-selector-list.c:520
 #, c-format
 msgid "_Delete %s"
 msgstr "%s ãåé(_D)"
 
-#: ../libedataserverui/e-passwords.c:127
-#, c-format
+#: ../libedataserverui/e-passwords.c:126
 msgid "Keyring key is unusable: no user or host name"
-msgstr "ãããããããããäçããããã: ãããããããããåãååãããã"
+msgstr "ãããããããããäçããããã: ããããããããããåãååãããã"
 
 #: ../libedataserverui/e-passwords.c:701
-#: ../libedataserverui/e-passwords-win32.c:612
+#: ../libedataserverui/e-passwords-win32.c:614
 msgid "You have the Caps Lock key on."
 msgstr "\"[Caps Lock] ããã ON çæããã"
 
 #: ../libedataserverui/e-passwords.c:821
-#: ../libedataserverui/e-passwords-win32.c:735
+#: ../libedataserverui/e-passwords-win32.c:737
 msgid "_Remember this passphrase"
 msgstr "ãããããããããèæãã(_R)"
 
 #: ../libedataserverui/e-passwords.c:822
-#: ../libedataserverui/e-passwords-win32.c:736
+#: ../libedataserverui/e-passwords-win32.c:738
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "ããããããããããããããããçãäåãã(_R)"
 
 #: ../libedataserverui/e-passwords.c:827
-#: ../libedataserverui/e-passwords-win32.c:741
+#: ../libedataserverui/e-passwords-win32.c:743
 msgid "_Remember this password"
 msgstr "ããããããããèæãã(_R)"
 
 #: ../libedataserverui/e-passwords.c:828
-#: ../libedataserverui/e-passwords-win32.c:742
+#: ../libedataserverui/e-passwords-win32.c:744
 msgid "_Remember this password for the remainder of this session"
 msgstr "ãããããããããããããããçãäåãã(_R)"
 
 #. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:100
+#: ../libedataserverui/e-source-selector-dialog.c:99
 msgid "Select destination"
 msgstr "èéåãéæ"
 
-#: ../libedataserverui/e-source-selector-dialog.c:170
+#: ../libedataserverui/e-source-selector-dialog.c:174
 msgid "_Destination"
 msgstr "èéå(_D)"
 
-#: ../servers/groupwise/e-gw-connection.c:227
-msgid "Invalid connection"
-msgstr "çåãæçãã"
+#~ msgid "Updating contacts cache (%d)... "
+#~ msgstr "éçåããããããæå (%d åç) ãææä... "
+
+#~ msgid "Cannot get supported fields: %s"
+#~ msgstr "ååããéçãååããããã: %s"
+
+#~ msgid "Cannot get required fields: %s"
+#~ msgstr "èæãããéçãååããããã: %s"
+
+#~ msgid "Cannot get supported authentication methods: %s"
+#~ msgstr "ååããèèææãååããããã: %s"
+
+#~ msgid "Cannot get changes: %s"
+#~ msgstr "åæãååããããã: %s"
+
+#~ msgid "Cancel operation failed: %s"
+#~ msgstr "æäãããããããåæãããã: %s"
+
+#~ msgid "Reply Requested: by "
+#~ msgstr "èäèæ: by "
+
+#~ msgid "Reply Requested: When convenient"
+#~ msgstr "èäèæ: When convenient"
+
+#~ msgid "Loading Appointment items"
+#~ msgstr "äåãããããèãèãä"
+
+#~ msgid "Loading Task items"
+#~ msgstr "ããããããããèãèãä"
+
+#~ msgid "Loading Note items"
+#~ msgstr "ããããããããèãèãä"
+
+#~ msgid "Loading items"
+#~ msgstr "ãããããèãèãä"
+
+#~ msgid "Calendar"
+#~ msgstr "ããããã"
+
+#~ msgid "Invalid server URI"
+#~ msgstr "çåããããã URI ãã"
+
+#~ msgid "Could not create thread for populating cache"
+#~ msgstr "ããããããçæããããããããããçæãããããããã"
+
+#~ msgid "Cannot retrieve calendar alarm e-mail address: %s"
+#~ msgstr "ãããããããããããéäãã E-ããããããããååããããã: %s"
+
+#~ msgid "Cannot retrieve calendar's LDAP attribute: %s"
+#~ msgstr "ãããããã LDAP åæãååããããã: %s"
+
+#~ msgid "Cannot retrieve calendar scheduling information: %s"
+#~ msgstr "ããããããäåæåãååããããã: %s"
+
+#~ msgid "Cannot discard calendar alarm: %s"
+#~ msgstr "ãããããããããããçæããããã: %s"
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "Invalid response from server"
-msgstr "ããããããåçãçåãã"
+#~ msgid "Cannot retrieve default calendar object path: %s"
+#~ msgstr "ãããããããããããããæåããããååããããã: %s"
 
-#: ../servers/groupwise/e-gw-connection.c:233
-msgid "No response from the server"
-msgstr "ãããããåçãããããã"
+#~ msgid "Could not complete calendar query: %s"
+#~ msgstr "ããããããæçãåäãããããããã: %s"
 
-#: ../servers/groupwise/e-gw-connection.c:239
-msgid "Bad parameter"
-msgstr "ããããããçåãã"
+#~ msgid "Could not set default calendar time zone: %s"
+#~ msgstr "ããããããæåããããããããèåãããããããã: %s"
+
+#~ msgid "Cannot retrieve calendar changes: %s"
+#~ msgstr "ããããããåæãååãããããããã: %s"
+
+#~ msgid "No stream available"
+#~ msgstr "åçãããããããããããããã"
+
+#~ msgid ""
+#~ "Could not create directory %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ããããã %s ãäæãããããããã:\n"
+#~ "%s"
+
+#~ msgid "Checking for deleted messages %s"
+#~ msgstr "åéãããããããã %s ãããããä"
+
+#~ msgid "Could not get message"
+#~ msgstr "ããããããååãããããããã"
+
+#~ msgid "Cannot append message to folder '%s': %s"
+#~ msgstr "'%s' ãããããããããããããããèåããããã: %s"
+
+#~ msgid "Cannot create message: %s"
+#~ msgstr "ããããããäæããããã: %s"
+
+#~ msgid ""
+#~ "Cannot get message: %s\n"
+#~ "  %s"
+#~ msgstr ""
+#~ "ããããããååããããã: %s\n"
+#~ "  %s"
+
+#~ msgid "This message is not available in offline mode."
+#~ msgstr "ãããããããããããããããããããåçãããããã"
+
+#~ msgid "Cannot get folder container %s"
+#~ msgstr "ããããããããããã %s ãååããããã"
+
+#~ msgid "Cannot append message in offline mode: cache unavailable"
+#~ msgstr ""
+#~ "ãããããããããããããããããèåããããã: ããããããåçãããã"
+#~ "ã"
+
+#~ msgid "Cannot append message in offline mode: "
+#~ msgstr "ããããããããããããããããèåããããã: "
+
+#~ msgid "Checking for new mail"
+#~ msgstr "æçãããããããã"
+
+#~ msgid "Check new messages for J_unk contents"
+#~ msgstr "æçããããããããããããããããã(_U)"
+
+#~ msgid "Automatically synchroni_ze account locally"
+#~ msgstr "ãããããããããããèåçãåæãã(_Z)"
+
+#~ msgid "SOAP Settings"
+#~ msgstr "SOAP ãèå"
+
+#~ msgid "Post Office Agent SOAP _Port:"
+#~ msgstr "ãããããããããããããããã SOAP ããã(_P):"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell GroupWise"
+
+#~ msgid "For accessing Novell GroupWise servers"
+#~ msgstr "Novell GroupWise ããããããããããçãã"
+
+#~ msgid ""
+#~ "This option will connect to the GroupWise server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "ããããããããããããããããããããããããäãã GroupWise ãããã"
+#~ "ãæçãããã"
+
+#~ msgid "Host or user not available in url"
+#~ msgstr "ãããåãããããããåã URI ãæåããããã"
+
+#~ msgid ""
+#~ "Some features may not work correctly with your current server version"
+#~ msgstr ""
+#~ "ãäããããããããããããããããããããæèãæããåäããããããã"
+#~ "ããã"
+
+#~ msgid "Cannot create GroupWise folders in offline mode."
+#~ msgstr "ããããããããããã GroupWise ããããããçæãããããã"
+
+#~ msgid "Cannot create a special system folder"
+#~ msgstr "çåãããããããããããäæãããããããããã"
+
+#~ msgid "Cannot rename GroupWise folder '%s' to '%s'"
+#~ msgstr "GroupWise ãããããã '%s' ã '%s' ãããååãåæããããã"
+
+#~ msgid "GroupWise server %s"
+#~ msgstr "GroupWise ããããã %s"
+
+#~ msgid "GroupWise service for %s on %s"
+#~ msgstr "%s ã %s ããã GroupWise ããããã"
+
+#~ msgid "GroupWise mail delivery via %s"
+#~ msgstr "%s ççã GroupWise ãããããéäããã"
+
+#~ msgid "Sending Message"
+#~ msgstr "ããããããéä"
+
+#~ msgid "Cannot get folder: Invalid operation on this store"
+#~ msgstr "ããããããååããããã: ããããçåãæäãã"
+
+#~ msgid ""
+#~ "You have exceeded this account's storage limit. Your messages are queued "
+#~ "in your Outbox. Resend by pressing Send/Receive after deleting/archiving "
+#~ "some of your mail.\n"
+#~ msgstr ""
+#~ "ããããããããåçãããããããåéãèãããããéäããããããããé"
+#~ "äçãäåããããããããããããåéãããããããããããããçããã"
+#~ "ãã[éåä] ããããæããããããããéäããããããã\n"
+
+#~ msgid "Could not send message: %s"
+#~ msgstr "ããããããéäãããããããã: %s"
+
+#~ msgid "Operation cancelled"
+#~ msgstr "åçããããããããããã"
+
+#~ msgid "SSL negotiations failed"
+#~ msgstr "SSL æçãåæãããã"
+
+#~ msgid "Could not connect to %s (port %s): "
+#~ msgstr "%s (ããã %s) ãæçãããããããã: "
+
+#~ msgid "TLS negotiations failed"
+#~ msgstr "TLS æçãåæãããã"
+
+#~ msgid "_Edit"
+#~ msgstr "çé(_E)"
+
+#~ msgid "Invalid connection"
+#~ msgstr "çåãæçãã"
+
+#~ msgid "Invalid response from server"
+#~ msgstr "ãããããããåçãçåãã"
+
+#~ msgid "No response from the server"
+#~ msgstr "ããããããåçãããããã"
+
+#~ msgid "Bad parameter"
+#~ msgstr "ãããããããçåãã"
 
 #~ msgid "Verifying message"
 #~ msgstr "ããããããæèä"
 
 #~ msgid "_Apply filters to new messages in INBOX on this server"
-#~ msgstr "ããããããåäçãããæçãããããããããéçãã(_A)"
+#~ msgstr "ãããããããåäçãããæçããããããããããéçãã(_A)"
 
 #~ msgid "Cannot create spool file: %s"
 #~ msgstr "ãããããããããäæããããã: %s"
@@ -5191,9 +5511,6 @@ msgstr "ããããããçåãã"
 #~ msgid "Could not create thread for getting deltas"
 #~ msgstr "ååãååããããããããããçæãããããããã"
 
-#~ msgid "Offline mode unavailable"
-#~ msgstr "ããããããããããåãæãããããã"
-
 #~ msgid "Cannot open message"
 #~ msgstr "ããããããéãããã"
 
@@ -5237,7 +5554,7 @@ msgstr "ããããããçåãã"
 
 #~ msgid ""
 #~ "This option will connect to the server using Kerberos 4 authentication."
-#~ msgstr "ãããããããã Kerberos 4 èèãäããããããæçããã"
+#~ msgstr "ãããããããã Kerberos 4 èèãäãããããããæçããã"
 
 #~ msgid ""
 #~ "Could not get Kerberos ticket:\n"
@@ -5256,7 +5573,7 @@ msgstr "ããããããçåãã"
 #~ msgstr "éããããããã: æãåèããããããã"
 
 #~ msgid "Cannot create folder: Invalid operation on this store"
-#~ msgstr "ãããããäæããããã: ããããçåãæäãã"
+#~ msgstr "ããããããäæããããã: ããããçåãæäãã"
 
 #~ msgid "Unable to get issuer's certificate"
 #~ msgstr "çèèãèææãååããããã"
@@ -5363,22 +5680,22 @@ msgstr "ããããããçåãã"
 #~ "åèãããããã?"
 
 #~ msgid "User canceled"
-#~ msgstr "ããããããããããããã"
+#~ msgstr "ãããããããããããããã"
 
 #~ msgid "Trash Folder Full. Please Empty."
-#~ msgstr "ããçãããããææãããçãããããããã"
+#~ msgstr "ããçããããããææãããçãããããããã"
 
 #~ msgid "Hula"
 #~ msgstr "Hula"
 
 #~ msgid "For accessing Hula servers"
-#~ msgstr "Hula ãããããããããçãã"
+#~ msgstr "Hula ããããããããããçãã"
 
 #~ msgid ""
 #~ "This option will connect to the Hula server using a plaintext password."
 #~ msgstr ""
-#~ "ããããããããããããããããããããããããäãã Hula ããããæçã"
-#~ "ãã"
+#~ "ããããããããããããããããããããããããäãã Hula ãããããæç"
+#~ "ããã"
 
 #~ msgid "Unexpected response status '%s' after APPEND command"
 #~ msgstr "APPEND ãããããåãæååãåçãããããããããã: '%s'"
@@ -5390,32 +5707,32 @@ msgstr "ããããããçåãã"
 #~ msgstr "APPEND ãããããçèäãååäæãããããççãããã!"
 
 #~ msgid "Failed sending command to IMAP server %s: %s"
-#~ msgstr "%s ããã IMAP ãããããããããéäãåæãããã: %s"
+#~ msgstr "%s ããã IMAP ããããããããããéäãåæãããã: %s"
 
 #~ msgid "Unexpected response from IMAP4 server %s: %s"
-#~ msgstr "IMAP ãããã %s ããæååãåçãããããã: %s"
+#~ msgstr "IMAP ããããã %s ããæååãåçãããããã: %s"
 
 #~ msgid "Unexpected greeting from IMAP server %s."
-#~ msgstr "IMAP ãããã %s ããæååãåçãããããã"
+#~ msgstr "IMAP ããããã %s ããæååãåçãããããã"
 
 #~ msgid "Cannot select folder '%s': Invalid mailbox name"
-#~ msgstr "'%s' ããããããããéæããããã: mailbox ãååãçåãã"
+#~ msgstr "'%s' ãããããããããéæããããã: mailbox ãååãçåãã"
 
 #~ msgid "Cannot select folder '%s': Bad command"
-#~ msgstr "'%s' ããããããã ãéæããããã: ãããããééããããã"
+#~ msgstr "'%s' ãããããããã ãéæããããã: ãããããééããããã"
 
 #~ msgid "Failed to send command to IMAP server %s: %s"
-#~ msgstr "%s ããã IMAP ãããããããããéäãåæãããã: %s"
+#~ msgstr "%s ããã IMAP ããããããããããéäãåæãããã: %s"
 
 #~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
-#~ msgstr "çç IMAP4 ãããã %s ãæçãåãããã: %s"
+#~ msgstr "çç IMAP4 ããããã %s ãæçãåãããã: %s"
 
 #~ msgid ""
 #~ "Enable extended Mailing-List detection required for some filter and "
 #~ "vFolder rules"
 #~ msgstr ""
-#~ "ãããããããããäæãããããããããåèãããããããããããæåãæ"
-#~ "åããã"
+#~ "ããããããããããäæããããããããããåèãããããããããããæå"
+#~ "ãæåããã"
 
 #~ msgid "Expire cached messages that haven't been read in X seconds"
 #~ msgstr "Xçéèãããããããããããæãããããããçåãããã"
@@ -5424,41 +5741,42 @@ msgstr "ããããããçåãã"
 #~ msgstr "Xçããåããããããæãããããããçåãããã"
 
 #~ msgid "Cannot access folder '%s': %s"
-#~ msgstr "'%s' ããããããããããããããããã: %s"
+#~ msgstr "'%s' ãããããããããããããããããã: %s"
 
 #~ msgid "Cannot sync flags to folder '%s': Unknown error"
-#~ msgstr "'%s' ããããããããããããåæããããã: ååäæãããã"
+#~ msgstr "'%s' ãããããããããããããåæããããã: ååäæãããã"
 
 #~ msgid "Cannot sync flags to folder '%s': Bad command"
 #~ msgstr ""
-#~ "'%s' ããããããããããããåæããããã: ãããããééããããã"
+#~ "'%s' ãããããããããããããåæããããã: ãããããééããããã"
 
 #~ msgid "Cannot expunge folder '%s': Unknown error"
-#~ msgstr "'%s' ããããããããææããããã: ååäæãããã"
+#~ msgstr "'%s' ãããããããããææããããã: ååäæãããã"
 
 #~ msgid "Cannot expunge folder '%s': Bad command"
-#~ msgstr "'%s' ããããããããææããããã: ãããããééããããã"
+#~ msgstr "'%s' ãããããããããææããããã: ãããããééããããã"
 
 #~ msgid "Cannot get message %s from folder '%s': No such message"
 #~ msgstr ""
-#~ "%s ã '%s' ãããããããããååããããã: ãããããããããããããã"
-#~ "ãã"
+#~ "%s ã '%s' ããããããããããååããããã: ããããããããããããã"
+#~ "ããã"
 
 #~ msgid "Cannot get message %s from folder '%s': Bad command"
 #~ msgstr ""
-#~ "%s ã '%s' ãããããããããååããããã: ãããããééããããã"
+#~ "%s ã '%s' ããããããããããååããããã: ãããããééããããã"
 
 #~ msgid "Cannot append message to folder '%s': Folder is read-only"
 #~ msgstr ""
-#~ "'%s' ããããããããããããããèåããããã: ãããããèãèãåçã"
-#~ "ã"
+#~ "'%s' ãããããããããããããããèåããããã: ããããããèãèãå"
+#~ "çãã"
 
 #~ msgid "Cannot append message to folder '%s': Unknown error"
-#~ msgstr "'%s' ããããããããããããããèåããããã: ååäæãããã"
+#~ msgstr "'%s' ãããããããããããããããèåããããã: ååäæãããã"
 
 #~ msgid "Cannot append message to folder '%s': Bad command"
 #~ msgstr ""
-#~ "'%s' ããããããããããããããèåããããã: ãããããééããããã"
+#~ "'%s' ãããããããããããããããèåããããã: ãããããééãããã"
+#~ "ã"
 
 #~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
 #~ msgstr "'%s' ãã '%s' ãããããããçåããããã: ååäæãããã"
@@ -5484,62 +5802,62 @@ msgstr "ããããããçåãã"
 #~ msgstr "IMAP4rev1"
 
 #~ msgid "For reading and storing mail on IMAPv4rev1 servers."
-#~ msgstr "IMAP ããããããããããèãããäåããã"
+#~ msgstr "IMAP ãããããããããããèãããäåããã"
 
 #~ msgid ""
 #~ "This option will connect to the IMAPv4rev1 server using a plaintext "
 #~ "password."
 #~ msgstr ""
-#~ "ããããããããããããããããããããããããäãã IMAPv4rev1 ãããã"
-#~ "æçããã"
+#~ "ããããããããããããããããããããããããäãã IMAPv4rev1 ãããã"
+#~ "ãæçããã"
 
 #~ msgid ""
 #~ "Failed to connect to IMAP server %s in secure mode: Server does not "
 #~ "support STARTTLS"
 #~ msgstr ""
-#~ "ããããããäèããããããã IMAP ããã %s ããæçãåæãããã: ãã"
-#~ "ãåã STARTTLS ããããããããããããååãã"
+#~ "ããããããäèããããããã IMAP ãããã %s ããæçãåæãããã: "
+#~ "ããããåã STARTTLS ããããããããããããååãã"
 
 #~ msgid ""
 #~ "Cannot authenticate to IMAP server %s using the %s authentication "
 #~ "mechanism"
-#~ msgstr "IMAP ããã %s ãåããèèæå %s ãäããèèãããããããã"
+#~ msgstr "IMAP ãããã %s ãåããèèæå %s ãäããèèãããããããã"
 
 #~ msgid "Cannot authenticate to IMAP server %s using %s"
-#~ msgstr "IMAP ããã %s ã %s ãäããèèãèãããã"
+#~ msgstr "IMAP ãããã %s ã %s ãäããèèãèãããã"
 
 #~ msgid "Cannot create IMAP folders in offline mode."
-#~ msgstr "ããããããããããã IMAP ãããããäæãããããã"
+#~ msgstr "ããããããããããã IMAP ããããããäæãããããã"
 
 #~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-#~ msgstr "'%s' ã IMAP ãããã %s ããååããããã: ååäæãããã"
+#~ msgstr "'%s' ã IMAP ããããã %s ããååããããã: ååäæãããã"
 
 #~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-#~ msgstr "'%s' ã LIST æåã IMAP ãããã %s ããååããããã: %s"
+#~ msgstr "'%s' ã LIST æåã IMAP ããããã %s ããååããããã: %s"
 
 #~ msgid "Bad command"
 #~ msgstr "ãããããééããããã"
 
 #~ msgid "Cannot create folder '%s': Invalid mailbox name"
-#~ msgstr "'%s' ããããããããäæããããã: mailbox ãååãçåãã"
+#~ msgstr "'%s' ãããããããããäæããããã: mailbox ãååãçåãã"
 
 #~ msgid "Cannot create folder '%s': Bad command"
-#~ msgstr "'%s' ããããããããäæããããã: ãããããééããããã"
+#~ msgstr "'%s' ãããããããããäæããããã: ãããããééããããã"
 
 #~ msgid "Cannot delete IMAP folders in offline mode."
-#~ msgstr "ããããããããããã IMAP ãããããåéãããããã"
+#~ msgstr "ããããããããããã IMAP ããããããåéãããããã"
 
 #~ msgid "Cannot delete folder '%s': Invalid mailbox name"
-#~ msgstr "'%s' ããããããããåéããããã: mailbox ãååãçåãã"
+#~ msgstr "'%s' ãããããããããåéããããã: mailbox ãååãçåãã"
 
 #~ msgid "Cannot delete folder '%s': Bad command"
-#~ msgstr "'%s' ããããããããåéããããã: ãããããééããããã"
+#~ msgstr "'%s' ãããããããããåéããããã: ãããããééããããã"
 
 #~ msgid "Cannot rename folder '%s' to '%s': Special folder"
-#~ msgstr "'%s' ãã '%s' ãååãåæããããã: çåããããããã"
+#~ msgstr "'%s' ãã '%s' ãååãåæããããã: çåãããããããã"
 
 #~ msgid "Cannot rename IMAP folders in offline mode."
-#~ msgstr "ããããããããããã IMAP ãããããåãåæãããããã"
+#~ msgstr "ããããããããããã IMAP ããããããåãåæãããããã"
 
 #~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
 #~ msgstr "'%s' ãã '%s' ãååãåæããããã: mailbox ãååãçåãã"
@@ -5548,43 +5866,46 @@ msgstr "ããããããçåãã"
 #~ msgstr "'%s' ãã '%s' ãååãåæããããã: ãããããééããããã"
 
 #~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-#~ msgstr "%s ã '%s' ãããããããã IMAP ãããã %s ããååããããã: %s"
+#~ msgstr ""
+#~ "%s ã '%s' ãããããããã IMAP ããããã %s ããååããããã: %s"
 
 #~ msgid "Cannot subscribe to IMAP folders in offline mode."
-#~ msgstr "ããããããããããã IMAP ãããããèèãããããã"
+#~ msgstr "ããããããããããã IMAP ããããããèèãããããã"
 
 #~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-#~ msgstr "'%s' ããããããããèèããããã: mailbox ãååãçåãã"
+#~ msgstr "'%s' ãããããããããèèããããã: mailbox ãååãçåãã"
 
 #~ msgid "Cannot subscribe to folder '%s': Bad command"
-#~ msgstr "'%s' ããããããããèèããããã: ãããããééããããã"
+#~ msgstr "'%s' ãããããããããèèããããã: ãããããééããããã"
 
 #~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
-#~ msgstr "ããããããããããã IMAP ãããããèèãåæãããããã"
+#~ msgstr "ããããããããããã IMAP ããããããèèãåæãããããã"
 
 #~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-#~ msgstr "'%s' ããããããããèèãåæããããã: mailbox ãååãçåãã"
+#~ msgstr ""
+#~ "'%s' ãããããããããèèãåæããããã: mailbox ãååãçåãã"
 
 #~ msgid "Cannot unsubscribe from folder '%s': Bad command"
-#~ msgstr "'%s' ããããããããèèãåæããããã: ãããããééããããã"
+#~ msgstr ""
+#~ "'%s' ãããããããããèèãåæããããã: ãããããééããããã"
 
 #~ msgid "Scanning for changed messages"
 #~ msgstr "åæããããããèæä"
 
 #~ msgid "IMAP server %s is in an inconsistent state."
-#~ msgstr "IMAP ããã %s ãçæãççããããã"
+#~ msgstr "IMAP ãããã %s ãçæãççããããã"
 
 #~ msgid "Fetching envelopes of new messages"
 #~ msgstr "æãããããããããããããããååä"
 
 #~ msgid "Unexpected token in response from IMAP server %s: "
-#~ msgstr "IMAP ããã %s ããæååãåçãããããã: "
+#~ msgstr "IMAP ãããã %s ããæååãåçãããããã: "
 
 #~ msgid "No data"
 #~ msgstr "ããããã"
 
 #~ msgid "IMAP server %s unexpectedly disconnected: %s"
-#~ msgstr "çç IMAP ããã %s ãæçãåãããã: %s"
+#~ msgstr "çç IMAP ãããã %s ãæçãåãããã: %s"
 
 #~ msgid ""
 #~ "Experimental IMAP 4(.1) client\n"
@@ -5600,7 +5921,7 @@ msgstr "ããããããçåãã"
 #~ " !!! éèããããããåçãããããããã  !!!\n"
 
 #~ msgid "Could not connect to POP server on %s"
-#~ msgstr "%s ã POP ããããæçãããããããã"
+#~ msgstr "%s ã POP ãããããæçãããããããã"
 
 #~ msgid "Maildir append message canceled"
 #~ msgstr "Maildir ååããããããèåãåãæããããã"
@@ -5630,7 +5951,7 @@ msgstr "ããããããçåãã"
 #~ msgstr "AUTH ãããããåæãããã"
 
 #~ msgid "Bad authentication response from server.\n"
-#~ msgstr "ãããããééããèèåçãããããã\n"
+#~ msgstr "ããããããééããèèåçãããããã\n"
 
 #~ msgid "MAIL FROM command failed: %s: mail not sent"
 #~ msgstr "MAIL FROM ãããããåæãããã: %s: ããããéäãããã"
@@ -5659,9 +5980,6 @@ msgstr "ããããããçåãã"
 #~ msgid "Enter password for %s"
 #~ msgstr "%s ãããããããååãããããã"
 
-#~ msgid "Enter password"
-#~ msgstr "ããããããåå"
-
 #~ msgid "Owner"
 #~ msgstr "ææè"
 
@@ -5681,7 +5999,7 @@ msgstr "ããããããçåãã"
 #~ msgstr "Non-editing Author"
 
 #~ msgid "Reviewer"
-#~ msgstr "ããããã"
+#~ msgstr "ãããããã"
 
 #~ msgid "Contributor"
 #~ msgstr "èçè"
@@ -5696,19 +6014,19 @@ msgstr "ããããããçåãã"
 #~ msgstr "äèçãããã"
 
 #~ msgid "A folder with the same name already exists"
-#~ msgstr "æãååããããããååããã"
+#~ msgstr "æãååãããããããååããã"
 
 #~ msgid "The specified folder type is not valid"
-#~ msgstr "æåãããããããçéãééããããã"
+#~ msgstr "æåããããããããçéãééããããã"
 
 #~ msgid "Not enough space to create the folder"
-#~ msgstr "ãããããçæãããããåéãèãããã"
+#~ msgstr "ããããããçæãããããåéãèãããã"
 
 #~ msgid "The folder is not empty"
-#~ msgstr "ãããããããçããããããã"
+#~ msgstr "ããããããããçããããããã"
 
 #~ msgid "The specified folder was not found"
-#~ msgstr "æåãããããããèããããããããã"
+#~ msgstr "æåããããããããèããããããããã"
 
 #~ msgid "Function not implemented in this storage"
 #~ msgstr "ãããããããããåèããããããæèãã"
@@ -5720,28 +6038,28 @@ msgstr "ããããããçåãã"
 #~ msgstr "ãããããããããæåããçéããããããããããã"
 
 #~ msgid "The specified folder cannot be modified or removed"
-#~ msgstr "æåãããããããåæ/åéããããã"
+#~ msgstr "æåããããããããåæ/åéããããã"
 
 #~ msgid "Cannot make a folder a child of one of its descendants"
-#~ msgstr "ãããããããåãçæããããã"
+#~ msgstr "ããããããããåãçæããããã"
 
 #~ msgid "Cannot create a folder with that name"
-#~ msgstr "ãããããååããããããäæããããã"
+#~ msgstr "ãããããååãããããããäæããããã"
 
 #~ msgid "This operation cannot be performed in off-line mode"
 #~ msgstr "ããæäããããããããããããåçãããããã"
 
 #~ msgid "%s's Folders"
-#~ msgstr "%s ããããã"
+#~ msgstr "%s ãããããã"
 
 #~ msgid "Personal Folders"
-#~ msgstr "åäãããã"
+#~ msgstr "åäããããã"
 
 #~ msgid "Favorite Public Folders"
-#~ msgstr "ãæãåãããããããããããã"
+#~ msgstr "ãæãåããããããããããããã"
 
 #~ msgid "All Public Folders"
-#~ msgstr "ãããããããããããããã"
+#~ msgstr "ããããããããããããããã"
 
 #~ msgid "Global Address List"
 #~ msgstr "ããããããäæãäè"
@@ -5771,16 +6089,16 @@ msgstr "ããããããçåãã"
 #~ msgstr "Evolution ããããåããããããããããã"
 
 #~ msgid "Evolution Calendar file and webcal backend"
-#~ msgstr "Evolution ãããããããããã webcal ããããããã"
+#~ msgstr "Evolution ããããããããããã webcal ããããããã"
 
 #~ msgid "Evolution Data Server interface check service"
-#~ msgstr "Evolution ãããããããããããããããçèãããã"
+#~ msgstr "Evolution ãããããããããããããããããçèãããã"
 
 #~ msgid "Evolution Data Server logging service"
-#~ msgstr "Evolution ããããããããããèéãããã"
+#~ msgstr "Evolution ãããããããããããèéãããã"
 
 #~ msgid "Decoder failed, error %d"
-#~ msgstr "ãããããããã (%d)"
+#~ msgstr "ããããããããã (%d)"
 
 #~ msgid "CRL not yet valid"
 #~ msgstr "CRL ãããæããããããã"
@@ -5804,7 +6122,3 @@ msgstr "ããããããçåãã"
 
 #~ msgid "Failed to create create child process '%s': %s"
 #~ msgstr "åãããã '%s' ãçæãåæãããã: %s"
-
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "ãããããããã"



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