[evolution-data-server/gnome-3-2] vi.po: import from Damned Lies

From: Nguyen Thai Ngoc Duy <pclouds src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server/gnome-3-2] vi.po: import from Damned Lies
Date: Mon, 10 Oct 2011 08:32:07 +0000 (UTC)
commit b92f160fe82c0f4ab7c032955113b0e54087961d
Author: Nguyán ThÃi Ngác Duy <pclouds gmail com>
Date:   Fri Oct 7 22:51:44 2011 +1100

    vi.po: import from Damned Lies

 po/vi.po | 7156 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 4062 insertions(+), 3094 deletions(-)
---
diff --git a/po/vi.po b/po/vi.po
index 8b98183..312ce4a 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,9 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server GNOME TRUNK\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=general\n";
-"POT-Creation-Date: 2009-02-02 00:57+0000\n"
-"PO-Revision-Date: 2009-02-06 23:00+0930\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-09-26 10:49+0000\n"
+"PO-Revision-Date: 2011-10-07 22:52+1100\n"
 "Last-Translator: Clytie Siddall <clytie riverland net au>\n"
 "Language-Team: Vietnamese <vi-VN googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -17,1332 +18,1829 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2389
-#: ../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 "Äang náp..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2320
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2342
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2387
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4288
-#: ../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 "Äang tÃm kiám..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2757
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4452
-#, c-format
-msgid "Downloading contacts (%d)... "
-msgstr "Äang tái vá cÃc liÃn lác (%d)... "
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:842
+msgid "Querying for updated contactsâ"
+msgstr ""
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2906
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3091
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3135
-#, c-format
-msgid "Updating contacts cache (%d)... "
-msgstr "Äang cáp nhát bá nhá tám liÃn lác (%d)... "
+#: ../addressbook/backends/google/e-book-backend-google.c:893
+#: ../addressbook/libebook/e-book.c:3506 ../calendar/libecal/e-cal.c:1381
+#: ../libedataserver/e-client.c:1951
+msgid "Personal"
+msgstr "CÃ nhÃn"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:895
+#, fuzzy
+#| msgid "Favorites"
+msgid "Friends"
+msgstr "Æa thÃch"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:897
+#, fuzzy
+#| msgid "Family Name"
+msgid "Family"
+msgstr "Há"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:899
+msgid "Coworkers"
+msgstr ""
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:983
+msgid "Querying for updated groupsâ"
+msgstr ""
+
+#. Insert the entry on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1402
+msgid "Creating new contactâ"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1512
+msgid "Deleting contactâ"
+msgstr ""
+
+#. Update the contact on the server asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:1793
+msgid "Modifying contactâ"
+msgstr ""
+
+#: ../addressbook/backends/google/e-book-backend-google.c:2000
+#, fuzzy
+#| msgid "Loading..."
+msgid "Loadingâ"
+msgstr "Äang náp..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:2158
+#, fuzzy
+#| msgid "Authentication required"
+msgid "Authenticating with the serverâ"
+msgstr "Cán thiát xÃc thác"
+
+#. 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
+#, fuzzy
+#| msgid "Not connected."
+msgid "Not connected"
+msgstr "ChÆa kát nái."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:751
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:784
 msgid "Using Distinguished Name (DN)"
 msgstr "DÃng tÃn phÃn biát (TB)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:754
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:787
 msgid "Using Email Address"
 msgstr "DÃng Äáa chá thÆ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1019
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1058
 msgid "Reconnecting to LDAP server..."
 msgstr "Äang tÃi kát nái tái mÃy phác vá LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1617
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1187
+#, fuzzy
+#| msgid "Invalid argument"
+msgid "Invalid DN syntax"
+msgstr "Äái sá khÃng háp lá"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1712
 msgid "Adding contact to LDAP server..."
 msgstr "Äang thÃm liÃn lác vÃo mÃy phác vá LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1752
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1843
 msgid "Removing contact from LDAP server..."
 msgstr "Äang gá bá liÃn lác khái mÃy phác vá LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2064
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2278
 msgid "Modifying contact from LDAP server..."
 msgstr "Äang sáa Äái liÃn lác tá mÃy phác vá LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4148
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4658
 msgid "Receiving LDAP search results..."
 msgstr "Äang nhán kát quá tÃm kiám LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4310
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4828
 msgid "Error performing search"
 msgstr "Gáp lái khi tÃm kiám"
 
-#. translators: the placeholders will be filled by
-#. * function names, e.g.
-#. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: ../addressbook/libebook/e-book.c:260
-#: ../addressbook/libebook/e-book.c:264
-#: ../addressbook/libebook/e-book.c:469
-#: ../addressbook/libebook/e-book.c:473
-#: ../addressbook/libebook/e-book.c:612
-#: ../addressbook/libebook/e-book.c:616
-#: ../addressbook/libebook/e-book.c:703
-#: ../addressbook/libebook/e-book.c:707
-#: ../addressbook/libebook/e-book.c:1003
-#: ../addressbook/libebook/e-book.c:1008
-#: ../addressbook/libebook/e-book.c:1187
-#: ../addressbook/libebook/e-book.c:1191
-#: ../addressbook/libebook/e-book.c:1346
-#: ../addressbook/libebook/e-book.c:1350
-#: ../addressbook/libebook/e-book.c:1552
-#: ../addressbook/libebook/e-book.c:1556
-#: ../addressbook/libebook/e-book.c:1795
-#: ../addressbook/libebook/e-book.c:1799
-#: ../addressbook/libebook/e-book.c:2033
-#: ../addressbook/libebook/e-book.c:2037
-#: ../addressbook/libebook/e-book.c:2242
-#: ../addressbook/libebook/e-book.c:2246
-#: ../addressbook/libebook/e-book.c:3405
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "\"%s\" trong sá trÆác \"%s\""
-
-#: ../addressbook/libebook/e-book.c:273
-#: ../addressbook/libebook/e-book.c:482
-#: ../addressbook/libebook/e-book.c:625
-#: ../addressbook/libebook/e-book.c:716
-#: ../addressbook/libebook/e-book.c:1018
-#: ../addressbook/libebook/e-book.c:1201
-#: ../addressbook/libebook/e-book.c:1360
-#: ../addressbook/libebook/e-book.c:1565
-#: ../addressbook/libebook/e-book.c:1808
-#: ../addressbook/libebook/e-book.c:2047
-#: ../addressbook/libebook/e-book.c:2255
-#: ../addressbook/libebook/e-book.c:2634
-#: ../addressbook/libebook/e-book.c:2833
-#, c-format
-msgid "book busy"
-msgstr "sá quÃ bán"
-
-#: ../addressbook/libebook/e-book.c:304
-#: ../addressbook/libebook/e-book.c:308
-#: ../addressbook/libebook/e-book.c:513
-#: ../addressbook/libebook/e-book.c:517
-#: ../addressbook/libebook/e-book.c:652
-#: ../addressbook/libebook/e-book.c:656
-#: ../addressbook/libebook/e-book.c:743
-#: ../addressbook/libebook/e-book.c:747
-#: ../addressbook/libebook/e-book.c:1045
-#: ../addressbook/libebook/e-book.c:1048
-#: ../addressbook/libebook/e-book.c:1231
-#: ../addressbook/libebook/e-book.c:1234
-#: ../addressbook/libebook/e-book.c:1387
-#: ../addressbook/libebook/e-book.c:1391
-#: ../addressbook/libebook/e-book.c:1601
-#: ../addressbook/libebook/e-book.c:1605
-#: ../addressbook/libebook/e-book.c:1855
-#: ../addressbook/libebook/e-book.c:1859
-#: ../addressbook/libebook/e-book.c:2077
-#: ../addressbook/libebook/e-book.c:2081
-#: ../addressbook/libebook/e-book.c:2281
-#: ../addressbook/libebook/e-book.c:2285
-#: ../addressbook/libebook/e-book.c:2518
-#: ../addressbook/libebook/e-book.c:2660
-#: ../addressbook/libebook/e-book.c:2664
-#: ../addressbook/libebook/e-book.c:2859
-#: ../addressbook/libebook/e-book.c:2863
-#: ../addressbook/libebook/e-book.c:3414
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "Gáp lái ngoái lá CORBA khi lÃm viác gái Â %s Â"
-
-#: ../addressbook/libebook/e-book.c:2507
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: khÃng cÃ tÃc vá hián thái"
-
-#: ../addressbook/libebook/e-book.c:2532
-#, c-format
-msgid "%s: could not cancel"
-msgstr "%s: khÃng thá thÃi"
-
-#: ../addressbook/libebook/e-book.c:2620
-#: ../addressbook/libebook/e-book.c:2624
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4949
 #, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "\"%s\" trong sá sau \"%s\""
+msgid "Downloading contacts (%d)... "
+msgstr "Äang tái vá cÃc liÃn lác (%d)... "
 
-#: ../addressbook/libebook/e-book.c:2688
-#, c-format
-msgid "%s: canceled"
-msgstr "%s: bá huá"
+#: ../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 "KhÃng biát lái"
 
-#: ../addressbook/libebook/e-book.c:3269
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:343
 #, c-format
-msgid "%s: Invalid source."
-msgstr "%s: mác nguán khÃng háp lá"
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr ""
 
-#: ../addressbook/libebook/e-book.c:3277
-#: ../addressbook/libebook/e-book.c:3343
-#, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: khÃng cÃ bá táo sán sÃng cho Äáa chá URI Â %s Â"
+#: ../addressbook/libebook/e-book.c:3173
+#, fuzzy, c-format
+#| msgid "%s: there was no source for uid `%s' stored in gconf."
+msgid "%s: there was no source for UID '%s' stored in GConf."
+msgstr "%s: khÃng cÃ nguán UID `%s' ÄÆác lÆu vÃo gconf"
 
-#: ../addressbook/libebook/e-book.c:3289
-#, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: khÃng thá táo EBookListener (trÃnh nghe cuán sÃch Äián)"
+#: ../addressbook/libebook/e-book.c:3489 ../calendar/libecal/e-cal.c:1361
+#: ../libedataserver/e-client.c:1946
+msgid "On This Computer"
+msgstr "TrÃn mÃy nÃy"
 
-#: ../addressbook/libebook/e-book.c:3556
-#, c-format
-msgid "%s: there was no self contact UID stored in gconf"
-msgstr "%s: khÃng cÃ UID tá liÃn lác ÄÆác lÆu vÃo gconf"
+#: ../addressbook/libebook/e-book.c:3615
+#: ../addressbook/libebook/e-book-client.c:678
+#: ../addressbook/libedata-book/e-data-book.c:315
+#, fuzzy
+#| msgid "Folder '%s/%s' does not exist."
+msgid "Address book does not exist"
+msgstr "ThÆ mác Â %s/%s Â khÃng tán tái"
+
+#: ../addressbook/libebook/e-book-client.c:92
+#, fuzzy
+#| msgid "No such folder %s"
+msgid "No such book"
+msgstr "KhÃng cÃ thÆ mác %s"
 
-#: ../addressbook/libebook/e-book.c:3689
+#: ../addressbook/libebook/e-book-client.c:94
+#: ../addressbook/libedata-book/e-data-book.c:308
+#, fuzzy
+#| msgid "Object not found"
+msgid "Contact not found"
+msgstr "KhÃng tÃm tháy Äái tÆáng"
+
+#: ../addressbook/libebook/e-book-client.c:96
+#: ../addressbook/libedata-book/e-data-book.c:309
+#, fuzzy
+#| msgid "Object ID already exists"
+msgid "Contact ID already exists"
+msgstr "ID ÄáÃ tÆáng ÄÃ tán tái"
+
+#: ../addressbook/libebook/e-book-client.c:98
+#, fuzzy
+#| msgid "No such message"
+msgid "No such source"
+msgstr "KhÃng cÃ thÆ nhÆ váy"
+
+#: ../addressbook/libebook/e-book-client.c:100
+#: ../addressbook/libedata-book/e-data-book.c:325
+#, fuzzy
+#| msgid "Namespace"
+msgid "No space"
+msgstr "Bá tÃn Äác nhát"
+
+#: ../addressbook/libebook/e-book-client.c:491
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to run book factory"
+msgstr "Lái biÃn mÃ dá liáu"
+
+#: ../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
+#, fuzzy, c-format
+#| msgid "%s: Invalid source."
+msgid "Invalid source"
+msgstr "%s: mác nguán khÃng háp lá"
+
+#: ../addressbook/libebook/e-book-client.c:603
+#: ../calendar/libecal/e-cal-client.c:725
 #, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
+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 "Lái trÃn thÆ %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: khÃng cÃ nguán UID `%s' ÄÆác lÆu vÃo gconf"
 
+#: ../addressbook/libebook/e-book-client.c:2280
+#: ../calendar/libecal/e-cal-client.c:4482
+#, fuzzy
+#| msgid "Connection to Server"
+msgid "Cannot get connection to view"
+msgstr "Kát nái Äán mÃy phác vá"
+
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:116
 msgid "Unique ID"
 msgstr "ID duy nhát"
 
-#: ../addressbook/libebook/e-contact.c:114
+#. 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 "Ghi lÆu lÃ"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:121
 msgid "Book URI"
 msgstr "URI SÃch"
 
 #. 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:122
+#. * 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 "TÃn Äáy Äá"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:128
 msgid "Given Name"
 msgstr "TÃn"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:129
 msgid "Family Name"
 msgstr "Há"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Nickname"
 msgstr "TÃn hiáu"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 1"
 msgstr "ThÆ Äián tá 1"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:134
 msgid "Email 2"
 msgstr "ThÆ Äián tá 2"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Email 3"
 msgstr "ThÆ Äián tá 3"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:136
 msgid "Email 4"
 msgstr "ThÆ Äián tá 4"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Mailer"
 msgstr "TrÃnh thÆ"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:141
 msgid "Home Address Label"
 msgstr "NhÃn Äáa chá nhÃ"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:142
 msgid "Work Address Label"
 msgstr "NhÃn Äáa chá lÃm viác"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Other Address Label"
 msgstr "NhÃn Äáa chá khÃc"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Assistant Phone"
 msgstr "Äián thoái phá tÃ"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Business Phone"
 msgstr "Äián thoái kinh doanh"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Business Phone 2"
 msgstr "Äián thoái kinh doanh 2"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Business Fax"
 msgstr "Äián thÆ kinh doanh"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Callback Phone"
 msgstr "Sá gái lái"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Car Phone"
 msgstr "Äián thoái xe"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Company Phone"
 msgstr "Äián thoái cÃng ty"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:153
 msgid "Home Phone"
 msgstr "Äián thoái nhÃ"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Home Phone 2"
 msgstr "Äián thoái nhÃ 2"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Home Fax"
 msgstr "Äián thÆ á nhÃ"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:156
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Mobile Phone"
 msgstr "Äián thoái di Äáng"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Other Phone"
 msgstr "Äián thoái khÃc"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Other Fax"
 msgstr "Äián thÆ khÃc"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Pager"
 msgstr "Sá nhán tin"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:161
 msgid "Primary Phone"
 msgstr "Äián thoái chÃnh"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:162
 msgid "Radio"
 msgstr "RaÄiÃ"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:163
 msgid "Telex"
 msgstr "Telex"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:165
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Organization"
 msgstr "Tá chác"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Organizational Unit"
 msgstr "ÄÆn vá tá chác"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Office"
 msgstr "VÄn phÃng"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Title"
 msgstr "Táa Äá"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:172
 msgid "Role"
 msgstr "Vai trÃ"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:173
 msgid "Manager"
 msgstr "Quán lÃ"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Assistant"
 msgstr "Phá tÃ"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:177
 msgid "Homepage URL"
 msgstr "Äáa chá trang chá Máng"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:178
 msgid "Weblog URL"
 msgstr "Äáa chá sá kÃ sá Máng"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:517
+#: ../addressbook/libebook/e-contact.c:181
+#: ../libedataserverui/e-categories-dialog.c:85
 msgid "Categories"
 msgstr "PhÃn loái"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Calendar URI"
 msgstr "URI lách"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:185
 msgid "Free/Busy URL"
 msgstr "Äáa chá Máng Ránh/Bán"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:186
 msgid "ICS Calendar"
 msgstr "Lách ICS"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Video Conferencing URL"
 msgstr "Äáa chá hái tháo trác tuyán"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:190
 msgid "Spouse's Name"
 msgstr "TÃn vá/cháng"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:191
 msgid "Note"
 msgstr "Ghi chÃ"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Home Screen Name 1"
 msgstr "TÃn mÃn hÃnh AIM á nhÃ 1"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Home Screen Name 2"
 msgstr "TÃn mÃn hÃnh AIM á nhÃ 2"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Home Screen Name 3"
 msgstr "TÃn mÃn hÃnh AIM á nhÃ 3"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:197
 msgid "AIM Work Screen Name 1"
 msgstr "TÃn mÃn hÃnh AIM á chá lÃm 1"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:198
 msgid "AIM Work Screen Name 2"
 msgstr "TÃn mÃn hÃnh AIM á chá lÃm 2"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:199
 msgid "AIM Work Screen Name 3"
 msgstr "TÃn mÃn hÃnh AIM á chá lÃm 3"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Home Screen Name 1"
 msgstr "TÃn mÃn hÃnh GroupWise á nhÃ 1"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Home Screen Name 2"
 msgstr "TÃn mÃn hÃnh GroupWise á nhÃ 2"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Home Screen Name 3"
 msgstr "TÃn mÃn hÃnh GroupWise á nhÃ 3"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:203
 msgid "GroupWise Work Screen Name 1"
 msgstr "TÃn mÃn hÃnh GroupWise á chá lÃm 1"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:204
 msgid "GroupWise Work Screen Name 2"
 msgstr "TÃn mÃn hÃnh Groupwise á chá lÃm 2"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:205
 msgid "GroupWise Work Screen Name 3"
 msgstr "TÃn mÃn hÃnh GroupWise á chá lÃm 3"
 
-#: ../addressbook/libebook/e-contact.c:201
-msgid "Jabber Home Id 1"
+#: ../addressbook/libebook/e-contact.c:206
+#, fuzzy
+#| msgid "Jabber Home Id 1"
+msgid "Jabber Home ID 1"
 msgstr "ID Jabber á nhÃ 1"
 
-#: ../addressbook/libebook/e-contact.c:202
-msgid "Jabber Home Id 2"
+#: ../addressbook/libebook/e-contact.c:207
+#, fuzzy
+#| msgid "Jabber Home Id 2"
+msgid "Jabber Home ID 2"
 msgstr "ID Jabber á nhÃ 2"
 
-#: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 3"
+#: ../addressbook/libebook/e-contact.c:208
+#, fuzzy
+#| msgid "Jabber Home Id 3"
+msgid "Jabber Home ID 3"
 msgstr "ID Jabber á nhÃ 3"
 
-#: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Work Id 1"
+#: ../addressbook/libebook/e-contact.c:209
+#, fuzzy
+#| msgid "Jabber Work Id 1"
+msgid "Jabber Work ID 1"
 msgstr "ID Jabber á chá lÃm 1"
 
-#: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Work Id 2"
+#: ../addressbook/libebook/e-contact.c:210
+#, fuzzy
+#| msgid "Jabber Work Id 2"
+msgid "Jabber Work ID 2"
 msgstr "ID Jabber á chá lÃm 2"
 
-#: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 3"
+#: ../addressbook/libebook/e-contact.c:211
+#, fuzzy
+#| msgid "Jabber Work Id 3"
+msgid "Jabber Work ID 3"
 msgstr "ID Jabber á chá lÃm 3"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Home Screen Name 1"
 msgstr "TÃn mÃn hÃnh Yahoo á nhÃ 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Home Screen Name 2"
 msgstr "TÃn mÃn hÃnh Yahoo á nhÃ 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Home Screen Name 3"
 msgstr "TÃn mÃn hÃnh Yahoo á nhÃ 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:215
 msgid "Yahoo! Work Screen Name 1"
 msgstr "TÃn mÃn hÃnh Yahoo á chá lÃm 1"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:216
 msgid "Yahoo! Work Screen Name 2"
 msgstr "TÃn mÃn hÃnh Yahoo á chá lÃm 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:217
 msgid "Yahoo! Work Screen Name 3"
 msgstr "TÃn mÃn hÃnh Yahoo á chá lÃm 3"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Home Screen Name 1"
 msgstr "TÃn mÃn hÃnh MSN á nhÃ 1"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Home Screen Name 2"
 msgstr "TÃn mÃn hÃnh MSN á nhÃ 2"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Home Screen Name 3"
 msgstr "TÃn mÃn hÃnh MSN á nhÃ 3"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:221
 msgid "MSN Work Screen Name 1"
 msgstr "TÃn mÃn hÃnh MSN á chá lÃm 1"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:222
 msgid "MSN Work Screen Name 2"
 msgstr "TÃn mÃn hÃnh MSN á chá lÃm 2"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:223
 msgid "MSN Work Screen Name 3"
 msgstr "TÃn mÃn hÃnh MSN á chá lÃm 3"
 
-#: ../addressbook/libebook/e-contact.c:219
-msgid "ICQ Home Id 1"
+#: ../addressbook/libebook/e-contact.c:224
+#, fuzzy
+#| msgid "ICQ Home Id 1"
+msgid "ICQ Home ID 1"
 msgstr "ID ICQ á nhÃ 1"
 
-#: ../addressbook/libebook/e-contact.c:220
-msgid "ICQ Home Id 2"
+#: ../addressbook/libebook/e-contact.c:225
+#, fuzzy
+#| msgid "ICQ Home Id 2"
+msgid "ICQ Home ID 2"
 msgstr "ID ICQ á nhÃ 2"
 
-#: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 3"
+#: ../addressbook/libebook/e-contact.c:226
+#, fuzzy
+#| msgid "ICQ Home Id 3"
+msgid "ICQ Home ID 3"
 msgstr "ID ICQ á nhÃ 3"
 
-#: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Work Id 1"
+#: ../addressbook/libebook/e-contact.c:227
+#, fuzzy
+#| msgid "ICQ Work Id 1"
+msgid "ICQ Work ID 1"
 msgstr "ID ICQ á chá lÃm 1"
 
-#: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Work Id 2"
+#: ../addressbook/libebook/e-contact.c:228
+#, fuzzy
+#| msgid "ICQ Work Id 2"
+msgid "ICQ Work ID 2"
 msgstr "ID ICQ á chá lÃm 2\t"
 
-#: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 3"
+#: ../addressbook/libebook/e-contact.c:229
+#, fuzzy
+#| msgid "ICQ Work Id 3"
+msgid "ICQ Work ID 3"
 msgstr "ID ICQ á chá lÃm 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:232
 msgid "Last Revision"
 msgstr "Sáa Äái mái nhát"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Name or Org"
 msgstr "TÃn hoác Tá chác"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Address List"
 msgstr "Danh sÃch Äáa chá"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:237
 msgid "Home Address"
 msgstr "Äáa chá nhÃ"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:238
 msgid "Work Address"
 msgstr "Äáa chá lÃm viác"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Other Address"
 msgstr "Äáa chá khÃc"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Category List"
 msgstr "Danh sÃch phÃn loái"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Photo"
 msgstr "ánh"
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Logo"
 msgstr "Biáu hÃnh"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:248
 msgid "Name"
 msgstr "TÃn"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:249
 msgid "Email List"
 msgstr "Danh sÃch thÆ Äián tá"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:252
 msgid "AIM Screen Name List"
 msgstr "Danh sÃch tÃn mÃn hÃnh AIM"
 
-#: ../addressbook/libebook/e-contact.c:248
-msgid "GroupWise Id List"
+#: ../addressbook/libebook/e-contact.c:253
+#, fuzzy
+#| msgid "GroupWise Id List"
+msgid "GroupWise ID List"
 msgstr "Danh sÃch ID GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:249
-msgid "Jabber Id List"
+#: ../addressbook/libebook/e-contact.c:254
+#, fuzzy
+#| msgid "Jabber Id List"
+msgid "Jabber ID List"
 msgstr "Danh sÃch ID Jabber"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:255
 msgid "Yahoo! Screen Name List"
 msgstr "Danh sÃch tÃn mÃn hÃnh Yahoo"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:256
 msgid "MSN Screen Name List"
 msgstr "Danh sÃch tÃn mÃn hÃnh MSN"
 
-#: ../addressbook/libebook/e-contact.c:252
-msgid "ICQ Id List"
+#: ../addressbook/libebook/e-contact.c:257
+#, fuzzy
+#| msgid "ICQ Id List"
+msgid "ICQ ID List"
 msgstr "Danh sÃch ID ICQ"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:259
 msgid "Wants HTML Mail"
 msgstr "Muán thÆ dáng HTML"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:261
 msgid "List"
 msgstr "Danh sÃch"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:262
 msgid "List Show Addresses"
 msgstr "Danh sÃch: hián Äáa chá"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:264
 msgid "Birth Date"
 msgstr "NgÃy sinh"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
-#: ../libedataserver/e-categories.c:43
+#: ../addressbook/libebook/e-contact.c:265
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:756
 msgid "Anniversary"
 msgstr "Ká niám"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook/e-contact.c:268
 msgid "X.509 Certificate"
 msgstr "Cháng nhán X.509"
 
-#: ../addressbook/libebook/e-contact.c:265
-msgid "Gadu-Gadu Home Id 1"
+#: ../addressbook/libebook/e-contact.c:270
+#, fuzzy
+#| msgid "Gadu-Gadu Home Id 1"
+msgid "Gadu-Gadu Home ID 1"
 msgstr "ID Gadu-Gadu á nhÃ 1"
 
-#: ../addressbook/libebook/e-contact.c:266
-msgid "Gadu-Gadu Home Id 2"
+#: ../addressbook/libebook/e-contact.c:271
+#, fuzzy
+#| msgid "Gadu-Gadu Home Id 2"
+msgid "Gadu-Gadu Home ID 2"
 msgstr "ID Gadu-Gadu á nhÃ 2"
 
-#: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 3"
+#: ../addressbook/libebook/e-contact.c:272
+#, fuzzy
+#| msgid "Gadu-Gadu Home Id 3"
+msgid "Gadu-Gadu Home ID 3"
 msgstr "ID Gadu-Gadu á nhÃ 3"
 
-#: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Work Id 1"
+#: ../addressbook/libebook/e-contact.c:273
+#, fuzzy
+#| msgid "Gadu-Gadu Work Id 1"
+msgid "Gadu-Gadu Work ID 1"
 msgstr "ID Gadu-Gadu á chá lÃm 1"
 
-#: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Work Id 2"
+#: ../addressbook/libebook/e-contact.c:274
+#, fuzzy
+#| msgid "Gadu-Gadu Work Id 2"
+msgid "Gadu-Gadu Work ID 2"
 msgstr "ID Gadu-Gadu á chá lÃm 2"
 
-#: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 3"
+#: ../addressbook/libebook/e-contact.c:275
+#, fuzzy
+#| msgid "Gadu-Gadu Work Id 3"
+msgid "Gadu-Gadu Work ID 3"
 msgstr "ID Gadu-Gadu á chá lÃm 3"
 
-#: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Id List"
+#: ../addressbook/libebook/e-contact.c:276
+#, fuzzy
+#| msgid "Gadu-Gadu Id List"
+msgid "Gadu-Gadu ID List"
 msgstr "Danh sÃch ID Gadu-Gadu"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:279
 msgid "Geographic Information"
 msgstr "ThÃng tin Äáa lÃ"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Telephone"
 msgstr "Äián thoái"
 
-#: ../addressbook/libebook/e-contact.c:278
-#| msgid "MSN Home Screen Name 1"
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Home Name 1"
 msgstr "TÃn Skype á nhÃ 1"
 
-#: ../addressbook/libebook/e-contact.c:279
-#| msgid "MSN Home Screen Name 2"
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Home Name 2"
 msgstr "TÃn Skype á nhÃ 2"
 
-#: ../addressbook/libebook/e-contact.c:280
-#| msgid "MSN Home Screen Name 3"
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Home Name 3"
 msgstr "TÃn Skype á nhÃ 3"
 
-#: ../addressbook/libebook/e-contact.c:281
-#| msgid "MSN Work Screen Name 1"
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Work Name 1"
 msgstr "TÃn Skype á chá lÃm 1"
 
-#: ../addressbook/libebook/e-contact.c:282
-#| msgid "MSN Work Screen Name 2"
+#: ../addressbook/libebook/e-contact.c:287
 msgid "Skype Work Name 2"
 msgstr "TÃn Skype á chá lÃm 2"
 
-#: ../addressbook/libebook/e-contact.c:283
-#| msgid "MSN Work Screen Name 3"
+#: ../addressbook/libebook/e-contact.c:288
 msgid "Skype Work Name 3"
 msgstr "TÃn Skype á chá lÃm 3"
 
-#: ../addressbook/libebook/e-contact.c:284
-#| msgid "AIM Screen Name List"
+#: ../addressbook/libebook/e-contact.c:289
 msgid "Skype Name List"
 msgstr "Danh sÃch tÃn Skype"
 
-#: ../addressbook/libebook/e-contact.c:1507
-#: ../addressbook/libebook/e-destination.c:761
-msgid "Unnamed List"
-msgstr "Danh sÃch vÃ danh"
+#: ../addressbook/libebook/e-contact.c:291
+#, fuzzy
+#| msgid "Home Address"
+msgid "SIP address"
+msgstr "Äáa chá nhÃ"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
-#: ../libedataserver/e-categories.c:44
-msgid "Birthday"
-msgstr "NgÃy sinh"
+#: ../addressbook/libebook/e-contact.c:293
+#, fuzzy
+#| msgid "Skype Home Name 1"
+msgid "Google Talk Home Name 1"
+msgstr "TÃn Skype á nhÃ 1"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
-#, c-format
-msgid "Birthday: %s"
-msgstr "NgÃy sinh: %s"
+#: ../addressbook/libebook/e-contact.c:294
+#, fuzzy
+#| msgid "Skype Home Name 2"
+msgid "Google Talk Home Name 2"
+msgstr "TÃn Skype á nhÃ 2"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
-#, c-format
-msgid "Anniversary: %s"
-msgstr "Ká niám: %s"
+#: ../addressbook/libebook/e-contact.c:295
+#, fuzzy
+#| msgid "Skype Home Name 3"
+msgid "Google Talk Home Name 3"
+msgstr "TÃn Skype á nhÃ 3"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:212
-msgid "Cannot save calendar data: Malformed URI."
-msgstr "KhÃng thá lÆu dá liáu lách: URI dáng sai."
+#: ../addressbook/libebook/e-contact.c:296
+#, fuzzy
+#| msgid "Skype Work Name 1"
+msgid "Google Talk Work Name 1"
+msgstr "TÃn Skype á chá lÃm 1"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:219
-#: ../calendar/backends/file/e-cal-backend-file.c:225
-msgid "Cannot save calendar data"
-msgstr "KhÃng thá lÆu dá liáu lách"
+#: ../addressbook/libebook/e-contact.c:297
+#, fuzzy
+#| msgid "Skype Work Name 2"
+msgid "Google Talk Work Name 2"
+msgstr "TÃn Skype á chá lÃm 2"
+
+#: ../addressbook/libebook/e-contact.c:298
+#, fuzzy
+#| msgid "Skype Work Name 3"
+msgid "Google Talk Work Name 3"
+msgstr "TÃn Skype á chá lÃm 3"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:337
-msgid "Could not create thread for getting deltas"
-msgstr "KhÃng thá táo mách Äá láy cÃc delta"
+#: ../addressbook/libebook/e-contact.c:299
+#, fuzzy
+#| msgid "Skype Name List"
+msgid "Google Talk Name List"
+msgstr "Danh sÃch tÃn Skype"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:369
-#: ../calendar/backends/google/e-cal-backend-google.c:1192
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1053
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1352
-#: ../calendar/backends/http/e-cal-backend-http.c:587
-#: ../calendar/backends/weather/e-cal-backend-weather.c:484
-msgid "Could not create cache file"
-msgstr "KhÃng thá táo táp tin nhá tám"
+#: ../addressbook/libebook/e-contact.c:1580
+#: ../addressbook/libebook/e-destination.c:884
+msgid "Unnamed List"
+msgstr "Danh sÃch vÃ danh"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:382
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1065
-msgid "Could not create thread for populating cache"
-msgstr "KhÃng thá táo mách Äá Äá Ãn bá nhá tám"
+#: ../addressbook/libedata-book/e-book-backend.c:19
+msgid "Cannot process, book backend is opening"
+msgstr ""
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1055
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1899
-msgid "Reply Requested: by "
-msgstr "Trá lái ÄÆác yÃu cáu: do "
+#: ../addressbook/libedata-book/e-book-backend.c:96
+#, fuzzy, c-format
+#| msgid "Unknown error: %s"
+msgid "Unknown book property '%s'"
+msgstr "Lái khÃng rÃ : %s"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1060
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1904
-msgid "Reply Requested: When convenient"
-msgstr "Trá lái ÄÆác yÃu cáu: khi tián"
+#: ../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 "KhÃng thá táo thÆ mác Â %s Â: %s"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:277
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:470
+#: ../camel/camel-db.c:481
 #, c-format
-msgid "Loading %s items"
-msgstr "Äang tái %s mác"
+msgid "Insufficient memory"
+msgstr "KhÃng Äá bá nhá"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:889
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
-msgid "Calendar"
-msgstr "Lách"
+#. 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"
+msgid "Invalid query: "
+msgstr "Truy ván khÃng háp lá"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:947
-msgid "Invalid server URI"
-msgstr "URI mÃy phác vá khÃng háp lá"
+#: ../addressbook/libedata-book/e-data-book.c:304
+#: ../calendar/libedata-cal/e-data-cal.c:419
+msgid "Success"
+msgstr ""
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:966
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1071
-#: ../calendar/libecal/e-cal.c:5098
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1131
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1163
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1201
-#: ../camel/providers/groupwise/camel-groupwise-store.c:588
-#: ../camel/providers/groupwise/camel-groupwise-store.c:753
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:184
-msgid "Authentication failed"
+#: ../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 "Háu phÆÆng quÃ bán"
+
+#: ../addressbook/libedata-book/e-data-book.c:306
+#: ../calendar/libedata-cal/e-data-cal.c:421 ../libedataserver/e-client.c:128
+#, fuzzy
+#| msgid "Repository is offline"
+msgid "Repository offline"
+msgstr "Kho ngoái tuyán"
+
+#: ../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 "KhÃng Äá quyán truy cáp"
+
+#: ../addressbook/libedata-book/e-data-book.c:310
+#: ../calendar/libedata-cal/e-data-cal.c:427
+#, fuzzy
+#| msgid "Authentication failed"
+msgid "Authentication Failed"
 msgstr "XÃc thác thát bái"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:267
+#: ../addressbook/libedata-book/e-data-book.c:311
+#: ../calendar/libedata-cal/e-data-cal.c:428
+#, fuzzy
+#| msgid "Authentication required"
+msgid "Authentication Required"
+msgstr "Cán thiát xÃc thác"
+
+#: ../addressbook/libedata-book/e-data-book.c:312
+#: ../calendar/libedata-cal/e-data-cal.c:429
+msgid "Unsupported field"
+msgstr "TrÆáng khÃng ÄÆác há trá"
+
+#: ../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 "PhÆÆng phÃp xÃc thác khÃng ÄÆác há trá"
+
+#: ../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 khÃng sán sÃng"
+
+#: ../addressbook/libedata-book/e-data-book.c:316
+msgid "Book removed"
+msgstr ""
+
+#: ../addressbook/libedata-book/e-data-book.c:317
+#: ../calendar/libedata-cal/e-data-cal.c:435
+#, fuzzy
+#| msgid "This message is not available in offline mode."
+msgid "Not available in offline mode"
+msgstr "ThÆ nÃy hián thái chÆa sán sÃng trong chá Äá ngoái tuyán."
+
+#: ../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 "VÆát quÃ giái hán kÃch cá tÃm kiám"
+
+#: ../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 "VÆát quÃ thái hán tÃm kiám"
+
+#: ../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 "Truy ván khÃng háp lá"
+
+#: ../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 "Truy ván bá tá chái"
+
+#: ../addressbook/libedata-book/e-data-book.c:322
+#: ../calendar/libedata-cal/e-data-cal.c:440 ../libedataserver/e-client.c:136
+#, fuzzy
+#| msgid "%s: could not cancel"
+msgid "Could not cancel"
+msgstr "%s: khÃng thá thÃi"
+
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:324
+#: ../calendar/libedata-cal/e-data-cal.c:442
+msgid "Invalid server version"
+msgstr "PhiÃn bán trÃnh phác vá khÃng háp lá"
+
+#: ../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 "Äái sá khÃng háp lá"
+
+#. Translators: The string for NOT_SUPPORTED error
+#: ../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
+#, fuzzy
+#| msgid "Protocol not supported"
+msgid "Not supported"
+msgstr "ChÆa há trá giao thác nÃy"
+
+#: ../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 "Háu phÆÆng quÃ bán"
+
+#: ../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
+#, fuzzy
+#| msgid "I/O error"
+msgid "Other error"
+msgstr "Lái V/R"
+
+#. 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 folder container %s"
+msgid "Cannot get contact: "
+msgstr "KhÃng thá láy háp thÆ mác %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
+msgid "Empty query: "
+msgstr ""
+
+#. 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 encryption certificate"
+msgid "Cannot add contact: "
+msgstr "KhÃng thá thÃm cháng nhán mÃ hÃa"
+
+#. 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 get folder container %s"
+msgid "Cannot modify contact: "
+msgstr "KhÃng thá láy háp thÆ mác %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 to server: %s"
+msgid "Cannot authenticate user: "
+msgstr "KhÃng thá xÃc thác vái mÃy phác vá: %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:841
+#, fuzzy
+#| msgid "Cannot open mailbox: %s: %s\n"
+msgid "Cannot open book: "
+msgstr "KhÃng thá má háp thÆ: %s: %s\n"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:857
+msgid "Cannot remove book: "
+msgstr ""
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:884
+msgid "Cannot refresh address book: "
+msgstr ""
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:910
+msgid "Cannot get backend property: "
+msgstr ""
+
+#. 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
+msgid "Cannot set backend property: "
+msgstr ""
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:972
+#, fuzzy
+#| msgid "Cannot get folder container %s"
+msgid "Cannot get contact list: "
+msgstr "KhÃng thá láy háp thÆ mác %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1006
+#, fuzzy
+#| msgid "Cannot get folder container %s"
+msgid "Cannot get contact list uids: "
+msgstr "KhÃng thá láy háp thÆ mác %s"
+
+#. Translators: This is prefix to a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:1079
+#, fuzzy
+#| msgid "Cannot create encoder context"
+msgid "Cannot remove contacts: "
+msgstr "KhÃng thá táo ngÅ cánh bá biÃn mÃ"
+
+#: ../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 "Empty URI"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:528
+#, c-format
+msgid "Server is unreachable (%s)"
+msgstr ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:556
+#, fuzzy, c-format
+#| msgid ""
+#| "Unexpected GnuPG status message encountered:\n"
+#| "\n"
+#| "%s"
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr ""
+"Gáp thÆ tráng thÃi GnuPG khÃng mong Äái:\n"
+"\n"
+"%s"
+
+#: ../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 ""
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4476
+msgid "Calendar doesn't support Free/Busy"
+msgstr ""
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:758
+msgid "Birthday"
+msgstr "NgÃy sinh"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:788
+#, c-format
+msgid "Birthday: %s"
+msgstr "NgÃy sinh: %s"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:813
+#, c-format
+msgid "Anniversary: %s"
+msgstr "Ká niám: %s"
+
+#: ../calendar/backends/file/e-cal-backend-file.c:241
+msgid "Cannot save calendar data: Malformed URI."
+msgstr "KhÃng thá lÆu dá liáu lách: URI dáng sai."
+
+#: ../calendar/backends/file/e-cal-backend-file.c:248
+#: ../calendar/backends/file/e-cal-backend-file.c:254
+msgid "Cannot save calendar data"
+msgstr "KhÃng thá lÆu dá liáu lách"
+
+#: ../calendar/backends/http/e-cal-backend-http.c:416
 msgid "Redirected to Invalid URI"
 msgstr "TÃi Äánh hÆáng Äán URI khÃng háp lá"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:288
+#: ../calendar/backends/http/e-cal-backend-http.c:454
 msgid "Bad file format."
 msgstr "Äánh dáng táp tin sai."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:294
+#: ../calendar/backends/http/e-cal-backend-http.c:461
 msgid "Not a calendar."
 msgstr "KhÃng phái lách."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:149
+#: ../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 "KhÃng thá táo táp tin nhá tám"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
 msgid "Could not retrieve weather data"
 msgstr "KhÃng thá gái dá liáu thÆi tiát: %s"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
 msgid "Weather: Fog"
 msgstr "Thái tiát: sÆÆng mÃ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-msgid "Weather: Cloudy"
-msgstr "Thái tiát: Äáy mÃy"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
-#| msgid "Weather: Cloudy"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Cloudy Night"
 msgstr "Thái tiát: ÄÃm Äáy mÃy"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
-#| msgid "Weather: Thunderstorms"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
+msgid "Weather: Cloudy"
+msgstr "Thái tiát: Äáy mÃy"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Overcast"
 msgstr "Thái tiát: u Ãm"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
-#| msgid "Weather: Snow"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Showers"
 msgstr "Thái tiát: mÆa rÃo"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
 msgid "Weather: Snow"
 msgstr "Thái tiát: tuyát"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
-msgid "Weather: Sunny"
-msgstr "Thái tiát: trái náng"
-
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
-#| msgid "Weather: Rain"
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
 msgid "Weather: Clear Night"
 msgstr "Thái tiát: ÄÃm rÃ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:295
+msgid "Weather: Sunny"
+msgstr "Thái tiát: trái náng"
+
+#: ../calendar/backends/weather/e-cal-backend-weather.c:296
 msgid "Weather: Thunderstorms"
 msgstr "Thái tiát: bÃo kÃm sám"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:399
+#: ../calendar/backends/weather/e-cal-backend-weather.c:444
 msgid "Forecast"
 msgstr "Dá bÃo"
 
-#: ../calendar/libecal/e-cal-component.c:1322
+#: ../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 "HÃy nháp mát kháu cho %s (ngÆái dÃng %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 ""
+"HÃy nháp mát kháu cho Â %s Â Äá hiáu lác áy nhiám cho ngÆái dÃng Â %s Â."
+
+#: ../calendar/libecal/e-cal.c:4565
+msgid "Repository is offline"
+msgstr "Kho ngoái tuyán"
+
+#: ../calendar/libecal/e-cal.c:4567 ../calendar/libecal/e-cal-client.c:134
+msgid "No such calendar"
+msgstr "KhÃng cÃ lách nhÆ váy."
+
+#: ../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 "KhÃng tÃm tháy Äái tÆáng"
+
+#: ../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 "Äái tÆáng khÃng háp lá"
+
+#: ../calendar/libecal/e-cal.c:4573
+msgid "URI not loaded"
+msgstr "URI chÆa ÄÆác tái"
+
+#: ../calendar/libecal/e-cal.c:4575
+msgid "URI already loaded"
+msgstr "URI ÄÃ ÄÆác tái"
+
+#: ../calendar/libecal/e-cal.c:4579
+msgid "Unknown User"
+msgstr "KhÃng biát ngÆái dÃng"
+
+#: ../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 ÄáÃ tÆáng ÄÃ tán tái"
+
+#: ../calendar/libecal/e-cal.c:4583
+msgid "Protocol not supported"
+msgstr "ChÆa há trá giao thác nÃy"
+
+#: ../calendar/libecal/e-cal.c:4585
+msgid "Operation has been canceled"
+msgstr "Thao tÃc bá háy bá"
+
+#: ../calendar/libecal/e-cal.c:4587
+msgid "Could not cancel operation"
+msgstr "KhÃng thá háy bá tÃc vá"
+
+#: ../calendar/libecal/e-cal.c:4589 ../libedataserver/e-client.c:124
+msgid "Authentication failed"
+msgstr "XÃc thác thát bái"
+
+#: ../calendar/libecal/e-cal.c:4591
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
+#: ../libedataserver/e-client.c:126
+msgid "Authentication required"
+msgstr "Cán thiát xÃc thác"
+
+#: ../calendar/libecal/e-cal.c:4593
+#, fuzzy
+#| msgid "A CORBA exception has occurred"
+msgid "A D-Bus exception has occurred"
+msgstr "Mát lái ngoái lá CORBA ÄÃ xáy ra"
+
+#: ../calendar/libecal/e-cal.c:4597
+msgid "No error"
+msgstr "KhÃng cÃ lái"
+
+#: ../calendar/libecal/e-cal-client.c:140
+#: ../calendar/libedata-cal/e-data-cal.c:434
+#, fuzzy
+#| msgid "Unknown User"
+msgid "Unknown user"
+msgstr "KhÃng biát ngÆái dÃng"
+
+#: ../calendar/libecal/e-cal-client.c:144
+#: ../calendar/libedata-cal/e-data-cal.c:423
+msgid "Invalid range"
+msgstr "Phám vi khÃng háp lá"
+
+#: ../calendar/libecal/e-cal-client.c:600
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to run calendar factory"
+msgstr "Lái biÃn mÃ dá liáu"
+
+#: ../calendar/libecal/e-cal-client.c:765
+#, fuzzy
+#| msgid "Failed to encode data"
+msgid "Failed to find system calendar"
+msgstr "Lái biÃn mÃ dá liáu"
+
+#: ../calendar/libecal/e-cal-client.c:804
+#: ../calendar/libedata-cal/e-data-cal.c:433
+#, fuzzy
+#| msgid "Folder '%s' does not exist."
+msgid "Calendar does not exist"
+msgstr "ThÆ mác Â %s Â khÃng tán tái."
+
+#: ../calendar/libecal/e-cal-client.c:919
+#, fuzzy
+#| msgid "%s: Invalid source."
+msgid "Invalid source type"
+msgstr "%s: mác nguán khÃng háp lá"
+
+#: ../calendar/libecal/e-cal-component.c:1326
 msgid "Untitled appointment"
 msgstr "Cuác hán khÃng tÃn"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "1st"
 msgstr "NgÃy 1"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#: ../calendar/libecal/e-cal-recur.c:3982
 msgid "2nd"
 msgstr "NgÃy 2"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#: ../calendar/libecal/e-cal-recur.c:3983
 msgid "3rd"
 msgstr "NgÃy 3"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#: ../calendar/libecal/e-cal-recur.c:3984
 msgid "4th"
 msgstr "NgÃy 4"
 
-#: ../calendar/libecal/e-cal-recur.c:4045
+#: ../calendar/libecal/e-cal-recur.c:3985
 msgid "5th"
 msgstr "NgÃy 5"
 
-#: ../calendar/libecal/e-cal-recur.c:4046
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "6th"
 msgstr "NgÃy 6"
 
-#: ../calendar/libecal/e-cal-recur.c:4047
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "7th"
 msgstr "NgÃy 7"
 
-#: ../calendar/libecal/e-cal-recur.c:4048
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "8th"
 msgstr "NgÃy 8"
 
-#: ../calendar/libecal/e-cal-recur.c:4049
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "9th"
 msgstr "NgÃy 9"
 
-#: ../calendar/libecal/e-cal-recur.c:4050
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "10th"
 msgstr "NgÃy 10"
 
-#: ../calendar/libecal/e-cal-recur.c:4051
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "11th"
 msgstr "NgÃy 11"
 
-#: ../calendar/libecal/e-cal-recur.c:4052
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "12th"
 msgstr "NgÃy 12"
 
-#: ../calendar/libecal/e-cal-recur.c:4053
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "13th"
 msgstr "NgÃy 13"
 
-#: ../calendar/libecal/e-cal-recur.c:4054
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "14th"
 msgstr "NgÃy 14"
 
-#: ../calendar/libecal/e-cal-recur.c:4055
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "15th"
 msgstr "NgÃy 15"
 
-#: ../calendar/libecal/e-cal-recur.c:4056
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "16th"
 msgstr "NgÃy 16"
 
-#: ../calendar/libecal/e-cal-recur.c:4057
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "17th"
 msgstr "NgÃy 17"
 
-#: ../calendar/libecal/e-cal-recur.c:4058
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "18th"
 msgstr "NgÃy 18"
 
-#: ../calendar/libecal/e-cal-recur.c:4059
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "19th"
 msgstr "NgÃy 19"
 
-#: ../calendar/libecal/e-cal-recur.c:4060
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "20th"
 msgstr "NgÃy 20"
 
-#: ../calendar/libecal/e-cal-recur.c:4061
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "21st"
 msgstr "NgÃy 21"
 
-#: ../calendar/libecal/e-cal-recur.c:4062
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "22nd"
 msgstr "NgÃy 22"
 
-#: ../calendar/libecal/e-cal-recur.c:4063
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "23rd"
 msgstr "NgÃy 23"
 
-#: ../calendar/libecal/e-cal-recur.c:4064
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "24th"
 msgstr "NgÃy 24"
 
-#: ../calendar/libecal/e-cal-recur.c:4065
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "25th"
 msgstr "NgÃy 25"
 
-#: ../calendar/libecal/e-cal-recur.c:4066
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "26th"
 msgstr "NgÃy 26"
 
-#: ../calendar/libecal/e-cal-recur.c:4067
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "27th"
 msgstr "NgÃy 27"
 
-#: ../calendar/libecal/e-cal-recur.c:4068
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "28th"
 msgstr "NgÃy 28"
 
-#: ../calendar/libecal/e-cal-recur.c:4069
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "29th"
 msgstr "NgÃy 29"
 
-#: ../calendar/libecal/e-cal-recur.c:4070
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "30th"
 msgstr "NgÃy 30"
 
-#: ../calendar/libecal/e-cal-recur.c:4071
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "31st"
 msgstr "NgÃy 31"
 
-#: ../calendar/libecal/e-cal-util.c:685
-#: ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:691 ../calendar/libecal/e-cal-util.c:718
+#, fuzzy
+#| msgid "High"
+msgctxt "Priority"
 msgid "High"
 msgstr "Cao"
 
-#: ../calendar/libecal/e-cal-util.c:687
-#: ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:693 ../calendar/libecal/e-cal-util.c:720
+#, fuzzy
+#| msgid "Normal"
+msgctxt "Priority"
 msgid "Normal"
 msgstr "BÃnh thÆáng"
 
-#: ../calendar/libecal/e-cal-util.c:689
-#: ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:695 ../calendar/libecal/e-cal-util.c:722
+#, fuzzy
+#| msgid "Low"
+msgctxt "Priority"
 msgid "Low"
 msgstr "Tháp"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:711
+#: ../calendar/libecal/e-cal-util.c:716
+#, fuzzy
+#| msgid "Undefined"
+msgctxt "Priority"
 msgid "Undefined"
 msgstr "ChÆa Äánh nghÄa"
 
-#: ../calendar/libecal/e-cal.c:1677
-#: ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libedata-cal/e-cal-backend.c:34
+msgid "Cannot process, calendar backend is opening"
+msgstr ""
+
+#: ../calendar/libedata-cal/e-cal-backend.c:212
+#, fuzzy, c-format
+#| msgid "Unknown error: %s"
+msgid "Unknown calendar property '%s'"
+msgstr "Lái khÃng rÃ : %s"
+
+#: ../calendar/libedata-cal/e-cal-backend.c:229
+#, fuzzy, c-format
+#| msgid "Cannot save calendar data"
+msgid "Cannot change value of calendar property '%s'"
+msgstr "KhÃng thá lÆu dá liáu lách"
+
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:72
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:728
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:750
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:865
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:896
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1126
 #, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "HÃy nháp mát kháu cho %s (ngÆái dÃng %s)"
+msgid "\"%s\" expects no arguments"
+msgstr "\"%s\" khÃng cán Äán cÃ tham 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:1691
+#: ../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:1167
 #, c-format
-msgid "Enter password for %s to enable proxy for user %s"
-msgstr "HÃy nháp mát kháu cho Â %s Â Äá hiáu lác áy nhiám cho ngÆái dÃng Â %s Â."
+msgid "\"%s\" expects one argument"
+msgstr "\"%s\" cán Äán mát tham sá"
 
-#: ../calendar/libecal/e-cal.c:5070
-msgid "Invalid argument"
-msgstr "Äái sá khÃng háp lá"
+#: ../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:795
+#, c-format
+msgid "\"%s\" expects the first argument to be a string"
+msgstr "\"%s\" cán Äán tham sá Äáu tiÃn lÃ chuái"
 
-#: ../calendar/libecal/e-cal.c:5072
-msgid "Backend is busy"
-msgstr "Háu phÆÆng quÃ bán"
+#: ../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\" cán Äán tham sá Äáu tiÃn lÃ chuái ngÃy/giá theo ISO 8601"
 
-#: ../calendar/libecal/e-cal.c:5074
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
-msgid "Repository is offline"
-msgstr "Kho ngoái tuyán"
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:171
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:455
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:789
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:931
+#, c-format
+msgid "\"%s\" expects two arguments"
+msgstr "\"%s\" cán Äán hai tham sá"
 
-#: ../calendar/libecal/e-cal.c:5076
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
-msgid "No such calendar"
-msgstr "KhÃng cÃ lách nhÆ váy."
+#: ../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:396
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:461
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:937
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1173
+#, c-format
+msgid "\"%s\" expects the first argument to be a time_t"
+msgstr "\"%s\" cán Äán tham sá Äáu tiÃn lÃ time_t"
 
-#: ../calendar/libecal/e-cal.c:5078
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
-msgid "Object not found"
-msgstr "KhÃng tÃm tháy Äái tÆáng"
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:185
+#, c-format
+msgid "\"%s\" expects the second argument to be an integer"
+msgstr "\"%s\" cán Äán tham sá thá hai lÃ sá nguyÃn"
 
-#: ../calendar/libecal/e-cal.c:5080
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
-msgid "Invalid object"
-msgstr "Äái tÆáng khÃng háp lá"
-
-#: ../calendar/libecal/e-cal.c:5082
-msgid "URI not loaded"
-msgstr "URI chÆa ÄÆác tái"
-
-#: ../calendar/libecal/e-cal.c:5084
-msgid "URI already loaded"
-msgstr "URI ÄÃ ÄÆác tái"
-
-#: ../calendar/libecal/e-cal.c:5086
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Permission denied"
-msgstr "KhÃng Äá quyán truy cáp"
-
-#: ../calendar/libecal/e-cal.c:5088
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
-msgid "Unknown User"
-msgstr "KhÃng biát ngÆái dÃng"
-
-#: ../calendar/libecal/e-cal.c:5090
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
-msgid "Object ID already exists"
-msgstr "ID ÄáÃ tÆáng ÄÃ tán tái"
-
-#: ../calendar/libecal/e-cal.c:5092
-msgid "Protocol not supported"
-msgstr "ChÆa há trá giao thác nÃy"
-
-#: ../calendar/libecal/e-cal.c:5094
-msgid "Operation has been canceled"
-msgstr "Thao tÃc bá háy bá"
-
-#: ../calendar/libecal/e-cal.c:5096
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
-msgid "Could not cancel operation"
-msgstr "KhÃng thá háy bá tÃc vá"
-
-#: ../calendar/libecal/e-cal.c:5100
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:218
-msgid "Authentication required"
-msgstr "Cán thiát xÃc thác"
-
-#: ../calendar/libecal/e-cal.c:5102
-msgid "A CORBA exception has occurred"
-msgstr "Mát lái ngoái lá CORBA ÄÃ xáy ra"
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:390
+#, fuzzy, c-format
+#| msgid "\"%s\" expects two arguments"
+msgid "\"%s\" expects two or three arguments"
+msgstr "\"%s\" cán Äán hai tham sá"
 
-#: ../calendar/libecal/e-cal.c:5104
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/imap/camel-imap-command.c:434
-#: ../camel/providers/imap/camel-imap-store.c:743
-#: ../camel/providers/imap4/camel-imap4-engine.c:1570
-#: ../camel/providers/imap4/camel-imap4-engine.c:1609
-#: ../camel/providers/imap4/camel-imap4-engine.c:1654
-#: ../camel/providers/imap4/camel-imap4-engine.c:1710
-#: ../camel/providers/imap4/camel-imap4-store.c:315
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-#: ../camel/providers/pop3/camel-pop3-store.c:554
-#: ../camel/providers/pop3/camel-pop3-store.c:561
-#: ../camel/providers/pop3/camel-pop3-store.c:567
-#: ../servers/exchange/storage/e-storage.c:585
-#: ../servers/groupwise/e-gw-connection.c:241
-msgid "Unknown error"
-msgstr "KhÃng biát lái"
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:404
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:470
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:945
+#, c-format
+msgid "\"%s\" expects the second argument to be a time_t"
+msgstr "\"%s\" cán Äán tham sá thá hai lÃ time_t"
 
-#: ../calendar/libecal/e-cal.c:5106
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:553
-msgid "No error"
-msgstr "KhÃng cÃ lái"
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
+#, fuzzy, c-format
+#| msgid "\"%s\" expects the first argument to be a string"
+msgid "\"%s\" expects the third argument to be a string"
+msgstr "\"%s\" cán Äán tham sá Äáu tiÃn lÃ chuái"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:803
 #, c-format
-msgid "\"%s\" expects no arguments"
-msgstr "\"%s\" khÃng cán Äán cÃ tham sá"
+msgid "\"%s\" expects the second argument to be a string"
+msgstr "\"%s\" cán Äán tham sá thá hai lÃ chuái"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:833
 #, c-format
-msgid "\"%s\" expects one argument"
-msgstr "\"%s\" cán Äán mát tham sá"
+msgid ""
+"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
+"\"description\", or \"location\", or \"attendee\", or \"organizer\", or "
+"\"classification\""
+msgstr ""
+"Â %s Â cán Äán Äái sá thá nhát lÃ Â any Â (bát ká), Â summary Â (tÃm tát), Â "
+"description Â (mÃ tá), Â location Â (vá trÃ), Â attendee Â (ngÆái tham dá), "
+"Â organizer Â (ngÆái tá chác) hoác Â classification Â (phÃn loái)."
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:995
 #, c-format
-msgid "\"%s\" expects the first argument to be a string"
-msgstr "\"%s\" cán Äán tham sá Äáu tiÃn lÃ chuái"
+msgid "\"%s\" expects at least one argument"
+msgstr "\"%s\" cán Äán Ãt nhát mát tham sá"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1009
 #, c-format
-msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
-msgstr "\"%s\" cán Äán tham sá Äáu tiÃn lÃ chuái ngÃy/giá theo ISO 8601"
+msgid ""
+"\"%s\" expects all arguments to be strings or one and only one argument to "
+"be a boolean false (#f)"
+msgstr ""
+"\"%s\" cán Äán mái Äái sá Äáu lÃ chuái hoác chá cÃ mát Äái sá vÃ Äái sá ÄÃ "
+"lÃ boolean khÃng thát (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
-#, c-format
-msgid "\"%s\" expects two arguments"
-msgstr "\"%s\" cán Äán hai tham sá"
+#: ../calendar/libedata-cal/e-data-cal.c:430
+msgid "Unsupported method"
+msgstr "PhÆÆng phÃp khÃng ÄÆác há trá"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
-#, c-format
-msgid "\"%s\" expects the first argument to be a time_t"
-msgstr "\"%s\" cán Äán tham sá Äáu tiÃn lÃ time_t"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:989
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot open calendar: "
+msgstr "KhÃng thá lÆu dá liáu lách"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
-#, c-format
-msgid "\"%s\" expects the second argument to be an integer"
-msgstr "\"%s\" cán Äán tham sá thá hai lÃ sá nguyÃn"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1014
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot remove calendar: "
+msgstr "KhÃng thá lÆu dá liáu lách"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
-#, c-format
-msgid "\"%s\" expects the second argument to be a time_t"
-msgstr "\"%s\" cán Äán tham sá thá hai lÃ time_t"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1041
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot refresh calendar: "
+msgstr "KhÃng thá lÆu dá liáu lách"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
-#, c-format
-msgid "\"%s\" expects the second argument to be a string"
-msgstr "\"%s\" cán Äán tham sá thá hai lÃ chuái"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1070
+#, fuzzy
+#| msgid "Cannot create encoder context"
+msgid "Cannot retrieve backend property: "
+msgstr "KhÃng thá táo ngÅ cánh bá biÃn mÃ"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
-#, 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 Â cán Äán Äái sá thá nhát lÃ Â any Â (bát ká), Â summary Â (tÃm tát), Â description Â (mÃ tá), Â location Â (vá trÃ), Â attendee Â (ngÆái tham dá), Â organizer Â (ngÆái tá chác) hoác Â classification Â (phÃn loái)."
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1125
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar object path: "
+msgstr "KhÃng thá lÆu dá liáu lách"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
-#, c-format
-msgid "\"%s\" expects at least one argument"
-msgstr "\"%s\" cán Äán Ãt nhát mát tham sá"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1155
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar object list: "
+msgstr "KhÃng thá lÆu dá liáu lách"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
-#, c-format
-msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
-msgstr "\"%s\" cán Äán mái Äái sá Äáu lÃ chuái hoác chá cÃ mát Äái sá vÃ Äái sá ÄÃ lÃ boolean khÃng thát (#f)"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1184
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot retrieve calendar free/busy list: "
+msgstr "KhÃng thá lÆu dá liáu lách"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
-#| msgid "Invalid argument"
-msgid "Invalid range"
-msgstr "Phám vi khÃng háp lá"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1215
+#, fuzzy
+#| msgid "Cannot create encoder context"
+msgid "Cannot create calendar object: "
+msgstr "KhÃng thá táo ngÅ cánh bá biÃn mÃ"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-#| msgid "Unsupported security layer."
-msgid "Unsupported field"
-msgstr "TrÆáng khÃng ÄÆác há trá"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1247
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot modify calendar object: "
+msgstr "KhÃng thá lÆu dá liáu lách"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
-#| msgid "Unsupported security layer."
-msgid "Unsupported method"
-msgstr "PhÆÆng phÃp khÃng ÄÆác há trá"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1281
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot remove calendar object: "
+msgstr "KhÃng thá lÆu dá liáu lách"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-#| msgid "No support for authentication type %s"
-msgid "Unsupported authentication method"
-msgstr "PhÆÆng phÃp xÃc thác khÃng ÄÆác há trá"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1308
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot receive calendar objects: "
+msgstr "KhÃng thá lÆu dá liáu lách"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-#| msgid "SSL unavailable"
-msgid "TLS not available"
-msgstr "TLS khÃng sán sÃng"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1339
+#, fuzzy
+#| msgid "Cannot save calendar data"
+msgid "Cannot send calendar objects: "
+msgstr "KhÃng thá lÆu dá liáu lách"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-#| msgid "service unavailable"
-msgid "Offline mode unavailable"
-msgstr "Chá Äá ngoái tuyán khÃng sán sÃng"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1371
+#, fuzzy
+#| msgid "Could not retrieve weather data"
+msgid "Could not retrieve attachment uris: "
+msgstr "KhÃng thá gái dá liáu thÆi tiát: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-#| msgid "Path length exceeded"
-msgid "Search size limit exceeded"
-msgstr "VÆát quÃ giái hán kÃch cá tÃm kiám"
+#. 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 "KhÃng thá lÆu thÆ mác: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-#| msgid "Path length exceeded"
-msgid "Search time limit exceeded"
-msgstr "VÆát quÃ thái hán tÃm kiám"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1428
+#, fuzzy
+#| msgid "Could not generate encrypting data: %s"
+msgid "Could not get calendar view path: "
+msgstr "KhÃng thá phÃt sinh dá liáu mát mÃ hÃa: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-#| msgid "Invalid purpose"
-msgid "Invalid query"
-msgstr "Truy ván khÃng háp lá"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1458
+#, fuzzy
+#| msgid "Could not retrieve weather data"
+msgid "Could not retrieve calendar time zone: "
+msgstr "KhÃng thá gái dá liáu thÆi tiát: %s"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "Truy ván bá tá chái"
+#. Translators: This is prefix to a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1484
+#, fuzzy
+#| msgid "Could not rename folder: %s"
+msgid "Could not add calendar time zone: "
+msgstr "KhÃng thá Äái tÃn thÆ mác: %s"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:387
+#, fuzzy, c-format
+#| msgid "Invalid range"
+msgid "Invalid call"
+msgstr "Phám vi khÃng háp lá"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../calendar/libedata-cal/e-data-cal-factory.c:428
+#, fuzzy, c-format
 #| msgid "Invalid server URI"
-msgid "Invalid server version"
-msgstr "PhiÃn bán trÃnh phác vá khÃng háp lá"
+msgid "Invalid URI"
+msgstr "URI mÃy phác vá khÃng háp lá"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:446
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr ""
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:489
+#, fuzzy, c-format
+#| msgid "Could not create cache file"
+msgid "Could not instantiate backend"
+msgstr "KhÃng thá táo táp tin nhá tám"
 
-#: ../camel/camel-cipher-context.c:102
+#: ../camel/camel-cipher-context.c:200
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Loái mÃ nÃy khÃng há trá kÃ tÃn"
 
-#: ../camel/camel-cipher-context.c:128
-msgid "Signing message"
-msgstr "Äang kÃ thÆ"
-
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:213
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Loái mÃ nÃy khÃng há trá xÃc minh"
 
-#: ../camel/camel-cipher-context.c:171
-msgid "Verifying message"
-msgstr "Äang xÃc minh thÆ"
-
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:229
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Loái mÃ nÃy khÃng há trá mÃ hÃa"
 
-#: ../camel/camel-cipher-context.c:215
-msgid "Encrypting message"
-msgstr "Äang mÃ hÃa thÆ"
-
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:243
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Loái mÃ nÃy khÃng há trá giái mÃ"
 
-#: ../camel/camel-cipher-context.c:254
-msgid "Decrypting message"
-msgstr "Äang giái mÃ thÆ"
-
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:256
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "Bán khÃng thá náp khÃa báng loái mÃ nÃy"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:270
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "Bán khÃng thá xuát khÃa báng loái mÃ nÃy"
 
-#: ../camel/camel-data-cache.c:136
+#: ../camel/camel-cipher-context.c:812
+msgid "Signing message"
+msgstr "Äang kÃ thÆ"
+
+#: ../camel/camel-cipher-context.c:1053
+msgid "Encrypting message"
+msgstr "Äang mÃ hÃa thÆ"
+
+#: ../camel/camel-cipher-context.c:1180
+msgid "Decrypting message"
+msgstr "Äang giái mÃ thÆ"
+
+#: ../camel/camel-data-cache.c:178
+#, c-format
 msgid "Unable to create cache path"
 msgstr "KhÃng thá táo ÄÆáng dán nhá tám"
 
-#: ../camel/camel-data-cache.c:403
+#: ../camel/camel-data-cache.c:504
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "KhÃng thá loái bá mác nhá tám: %s: %s"
 
-#: ../camel/camel-db.c:469
-msgid "Insufficient memory"
-msgstr "KhÃng Äá bá nhá"
-
-#: ../camel/camel-disco-diary.c:198
+#: ../camel/camel-disco-diary.c:201
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1353,8 +1851,8 @@ msgstr ""
 "CÃc thao tÃc sau náa trÃn mÃy phác vá nÃy sá khÃng ÄÆác thác hián lái\n"
 "khi bán tÃi kát nái vÃo máng."
 
-#: ../camel/camel-disco-diary.c:261
-#: ../camel/providers/imap/camel-imap-journal.c:318
+#: ../camel/camel-disco-diary.c:266
+#: ../camel/providers/imap/camel-imap-journal.c:309
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1365,104 +1863,108 @@ msgstr ""
 "%s\n"
 "CÃc thay Äái ÄÆác táo ra trong thÆ mác nÃy sá khÃng thá ÄÆác tÃi Äáng bá."
 
-#: ../camel/camel-disco-diary.c:297
+#: ../camel/camel-disco-diary.c:310
 msgid "Resynchronizing with server"
 msgstr "Äang tÃi Äáng bá vái mÃy phác vá"
 
-#: ../camel/camel-disco-folder.c:43
-#: ../camel/camel-offline-folder.c:52
-msgid "Copy folder content locally for offline operation"
-msgstr "Sao chÃp nái dung thÆ mác vá mÃy Äáa phÆÆng Äá phác vá cÃc thao tÃc ngoái tuyán"
-
-#: ../camel/camel-disco-folder.c:105
-#: ../camel/camel-offline-folder.c:111
+#: ../camel/camel-disco-folder.c:72 ../camel/camel-offline-folder.c:89
 msgid "Downloading new messages for offline mode"
 msgstr "Äang tái vá cÃc thÆ cho chá Äá ngoái tuyán"
 
-#: ../camel/camel-disco-folder.c:469
+#: ../camel/camel-disco-folder.c:410
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Äang chuán bá thÆ mác '%s' Äá dÃng ngoái tuyán"
 
-#: ../camel/camel-disco-store.c:403
-#: ../camel/providers/groupwise/camel-groupwise-store.c:226
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:2997
+#: ../camel/camel-disco-folder.c:476 ../camel/camel-offline-folder.c:325
+msgid "Copy folder content locally for offline operation"
+msgstr ""
+"Sao chÃp nái dung thÆ mác vá mÃy Äáa phÆÆng Äá phác vá cÃc thao tÃc ngoái "
+"tuyán"
+
+#: ../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 "Bán phái Äang hoát Äáng trác tuyán mái cÃ thá hoÃn tát thao tÃc nÃy."
 
-#: ../camel/camel-exception.c:262
-msgid "No description available"
-msgstr "KhÃng cÃ mÃ tá"
+#: ../camel/camel-file-utils.c:732
+#, c-format
+msgid "Canceled"
+msgstr "Bá thÃi"
 
-#: ../camel/camel-filter-driver.c:795
+#: ../camel/camel-filter-driver.c:878 ../camel/camel-filter-search.c:697
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Lái táo tián trÃnh con '%s': %s"
 
-#: ../camel/camel-filter-driver.c:837
+#: ../camel/camel-filter-driver.c:926
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Nhán luáng thÆ khÃng háp lá tá %s: %s"
 
-#: ../camel/camel-filter-driver.c:1026
-#: ../camel/camel-filter-driver.c:1035
+#: ../camel/camel-filter-driver.c:1131 ../camel/camel-filter-driver.c:1140
 msgid "Syncing folders"
 msgstr "Äang Äáng bá nháng thÆ mác"
 
-#: ../camel/camel-filter-driver.c:1124
-#: ../camel/camel-filter-driver.c:1530
+#: ../camel/camel-filter-driver.c:1235 ../camel/camel-filter-driver.c:1681
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Lái phÃn tÃch bá lác: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1133
-#: ../camel/camel-filter-driver.c:1539
+#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1692
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Lái thác hián bá lác: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1221
+#: ../camel/camel-filter-driver.c:1344
+#, c-format
 msgid "Unable to open spool folder"
 msgstr "KhÃng thá má thÆ mác hÃng Äái"
 
-#: ../camel/camel-filter-driver.c:1230
+#: ../camel/camel-filter-driver.c:1355
+#, c-format
 msgid "Unable to process spool folder"
 msgstr "KhÃng thá xá lÃ thÆ mác hÃng Äái"
 
-#: ../camel/camel-filter-driver.c:1246
+#: ../camel/camel-filter-driver.c:1373
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Äang láy thÃng diáp %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1250
-msgid "Cannot open message"
-msgstr "KhÃng thá má thÆ"
-
-#: ../camel/camel-filter-driver.c:1251
-#: ../camel/camel-filter-driver.c:1269
+#: ../camel/camel-filter-driver.c:1380 ../camel/camel-filter-driver.c:1402
 #, c-format
 msgid "Failed on message %d"
 msgstr "Lái trÃn thÆ %d"
 
-#: ../camel/camel-filter-driver.c:1283
-#: ../camel/camel-filter-driver.c:1374
+#: ../camel/camel-filter-driver.c:1417 ../camel/camel-filter-driver.c:1518
 msgid "Syncing folder"
 msgstr "Äang Äáng bá thÆ mác"
 
-#: ../camel/camel-filter-driver.c:1287
-#: ../camel/camel-filter-driver.c:1379
+#: ../camel/camel-filter-driver.c:1422 ../camel/camel-filter-driver.c:1524
 msgid "Complete"
 msgstr "HoÃn tát"
 
-#: ../camel/camel-filter-driver.c:1344
+#: ../camel/camel-filter-driver.c:1482
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Äang láy thÆ %d trÃn %d"
 
-#: ../camel/camel-filter-driver.c:1359
+#: ../camel/camel-filter-driver.c:1500
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Lái tái thÆ %d trÃn %d"
@@ -1471,29 +1973,68 @@ msgstr "Lái tái thÆ %d trÃn %d"
 msgid "Failed to retrieve message"
 msgstr "Lái nhán thÆ"
 
-#: ../camel/camel-filter-search.c:401
+#: ../camel/camel-filter-search.c:447
 msgid "Invalid arguments to (system-flag)"
 msgstr "Äái sá khÃng háp lá Äái vái (system-flag: cá há tháng)"
 
-#: ../camel/camel-filter-search.c:416
+#: ../camel/camel-filter-search.c:465
 msgid "Invalid arguments to (user-tag)"
 msgstr "Äái sá khÃng háp lá Äái vái (user-tag: thá ngÆái dÃng)"
 
-#: ../camel/camel-filter-search.c:581
-#, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Lái táo tián trÃnh con '%s': %s"
-
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:737
-#: ../camel/camel-filter-search.c:745
+#: ../camel/camel-filter-search.c:874 ../camel/camel-filter-search.c:883
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Lái thác hián tÃm kiám bá lác: %s: %s"
 
-#: ../camel/camel-folder-search.c:351
-#: ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder.c:243
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "Äang quÃt tÃm cÃc thÆ thay Äái trong %s"
+
+#: ../camel/camel-folder.c:283
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "Äang quÃt tÃm cÃc thÆ thay Äái trong %s"
+
+#: ../camel/camel-folder.c:331
+#, fuzzy, c-format
+#| msgid "Filtering new message(s)"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "Äang lác thÆ mái"
+
+#: ../camel/camel-folder.c:902
+#: ../camel/providers/local/camel-maildir-folder.c:319
+msgid "Moving messages"
+msgstr "Äang di chuyán thÆ"
+
+#: ../camel/camel-folder.c:905
+msgid "Copying messages"
+msgstr "Äang sao chÃp thÆ"
+
+#: ../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 POP message %d"
+msgid "Retrieving message '%s' in %s"
+msgstr "Äang gái thÆ POP %d"
+
+#: ../camel/camel-folder.c:3404
+#, fuzzy, c-format
+#| msgid "Fetching summary information for new messages in %s"
+msgid "Retrieving quota information for '%s'"
+msgstr "Äang láy thÃng tin tÃm tát cho cÃc thÆ mái trong %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"
@@ -1502,9 +2043,8 @@ msgstr ""
 "KhÃng thá phÃn tÃch biáu thác tÃm kiám: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361
-#: ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../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"
@@ -1513,75 +2053,48 @@ msgstr ""
 "Lái thác hián tÃm kiám theo biáu thác: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810
-#: ../camel/camel-folder-search.c:853
+#. 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) cán thiát mát kát quá ÄÃng/sai riÃng lá"
 
-#: ../camel/camel-folder-search.c:906
+#. 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) khÃng ÄÆác phÃp bÃn trong %s"
 
-#: ../camel/camel-folder-search.c:912
-#: ../camel/camel-folder-search.c:919
+#. 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) cán thiát mát chuái kháp kiáu (match type)"
 
-#: ../camel/camel-folder-search.c:946
+#. 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) mong Äái mát kát quá máng"
 
-#: ../camel/camel-folder-search.c:955
+#. 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) cán thiát Äát thÆ mác"
 
-#: ../camel/camel-folder.c:696
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "ThÃo tÃc chÆa há trá: phá thÃm thÆ: cho %s"
-
-#: ../camel/camel-folder.c:1398
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Thao tÃc chÆa há trá: tÃm theo biáu thác: cho %s"
-
-#: ../camel/camel-folder.c:1440
+#: ../camel/camel-gpg-context.c:657 ../camel/camel-gpg-context.c:662
+#: ../camel/camel-gpg-context.c:1288
 #, c-format
-#| msgid "Unsupported operation: search by expression: for %s"
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "Thao tÃc khÃng ÄÆác há trá: Äám theo biáu thác: cho %s"
-
-#: ../camel/camel-folder.c:1480
-#, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "Thao tÃc khÃng ÄÆác há trá: tÃm kiám theo UID: %s"
-
-#: ../camel/camel-folder.c:1596
-msgid "Moving messages"
-msgstr "Äang di chuyán thÆ"
-
-#: ../camel/camel-folder.c:1596
-msgid "Copying messages"
-msgstr "Äang sao chÃp thÆ"
-
-#: ../camel/camel-folder.c:1942
-msgid "Learning junk"
-msgstr "Hác lÃ rÃc"
-
-#: ../camel/camel-folder.c:1959
-msgid "Learning non-junk"
-msgstr "Hác khÃng phái lÃ rÃc"
+msgid "Failed to execute gpg: %s"
+msgstr "Lái thác hián GPG: %s"
 
-#: ../camel/camel-folder.c:1978
-msgid "Filtering new message(s)"
-msgstr "Äang lác thÆ mái"
+#: ../camel/camel-gpg-context.c:662
+#: ../camel/providers/smtp/camel-smtp-transport.c:762
+msgid "Unknown"
+msgstr "KhÃng biát"
 
-#: ../camel/camel-gpg-context.c:755
+#: ../camel/camel-gpg-context.c:727
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1592,16 +2105,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:770
+#: ../camel/camel-gpg-context.c:744
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Lái phÃn tÃch chá dán GPG UserID."
 
-#: ../camel/camel-gpg-context.c:794
-#: ../camel/camel-gpg-context.c:808
+#: ../camel/camel-gpg-context.c:769 ../camel/camel-gpg-context.c:784
+#, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Lái phÃn tÃch yÃu cáu cám tá mát kháu cáa GPG."
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:805
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1610,7 +2124,7 @@ msgstr ""
 "Bán cán mát mÃ PIN Äá má khÃa cho\n"
 "thá thÃng minh cáa bán: Â %s Â"
 
-#: ../camel/camel-gpg-context.c:832
+#: ../camel/camel-gpg-context.c:809
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1619,305 +2133,299 @@ msgstr ""
 "Bán cán mát cám tá mát kháu Äá má khÃa\n"
 "cho ngÆái dÃng: \"%s\""
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Nhán yÃu cáu khÃng mong Äái tá GnuPG cho Â %s Â"
 
-#: ../camel/camel-gpg-context.c:862
-#: ../camel/camel-gpg-context.c:1068
-#: ../camel/providers/nntp/camel-nntp-store.c:1287
-msgid "Canceled."
-msgstr "Bá huá."
+#: ../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
+#, fuzzy, c-format
+#| msgid "Canceled"
+msgid "Cancelled"
+msgstr "Bá thÃi"
 
-#: ../camel/camel-gpg-context.c:876
+#: ../camel/camel-gpg-context.c:862
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Lái má khÃa bÃ mát: ÄÃ cho 3 cám tá mát kháu sai."
 
-#: ../camel/camel-gpg-context.c:884
+#: ../camel/camel-gpg-context.c:874
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "TÃn hiáu trá lái khÃng mong Äái tá GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:937
+#: ../camel/camel-gpg-context.c:1005
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Lái mÃ hÃa: chÆa xÃc Äánh ngÆái nhán."
 
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1206
-#: ../camel/camel-gpg-context.c:1334
-#: ../camel/camel-gpg-context.c:1829
-#: ../camel/camel-gpg-context.c:1874
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "Lái thác hián GPG: %s"
-
-#: ../camel/camel-gpg-context.c:1302
-#: ../camel/camel-smime-context.c:392
-#, c-format
-msgid "Could not generate signing data: %s"
+#: ../camel/camel-gpg-context.c:1552 ../camel/camel-smime-context.c:827
+#, fuzzy
+#| msgid "Could not generate signing data: %s"
+msgid "Could not generate signing data: "
 msgstr "KhÃng thá phÃt sinh dá liáu kÃ nhán: %s"
 
-#: ../camel/camel-gpg-context.c:1349
-#: ../camel/camel-gpg-context.c:1534
-#: ../camel/camel-gpg-context.c:1619
-#: ../camel/camel-gpg-context.c:1634
-#: ../camel/camel-gpg-context.c:1750
-#: ../camel/camel-gpg-context.c:1765
-#: ../camel/camel-gpg-context.c:1845
-#: ../camel/camel-gpg-context.c:1890
+#: ../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 "Lái thác hián GPG."
 
-#: ../camel/camel-gpg-context.c:1368
-msgid "This is a digitally signed message part"
-msgstr "ÄÃy lÃ phán thÆ cÃ chá kÃ sá"
-
-#: ../camel/camel-gpg-context.c:1453
-#: ../camel/camel-gpg-context.c:1459
-#: ../camel/camel-gpg-context.c:1465
-#: ../camel/camel-gpg-context.c:1480
-#: ../camel/camel-smime-context.c:695
-#: ../camel/camel-smime-context.c:706
-#: ../camel/camel-smime-context.c:713
+#: ../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 "KhÃng thá xÃc minh chá kÃ thÆ: dáng thác thÆ khÃng ÄÃng"
 
-#: ../camel/camel-gpg-context.c:1519
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "KhÃng thá xÃc minh chá kÃ thÆ: khÃng thá táo táp tin tám: %s"
+#: ../camel/camel-gpg-context.c:1758
+#, fuzzy
+#| msgid "Cannot verify message signature: Incorrect message format"
+msgid "Cannot verify message signature: "
+msgstr "KhÃng thá xÃc minh chá kÃ thÆ: dáng thác thÆ khÃng ÄÃng"
 
-#: ../camel/camel-gpg-context.c:1602
-#, c-format
-msgid "Could not generate encrypting data: %s"
+#: ../camel/camel-gpg-context.c:1881
+#, fuzzy
+#| msgid "Could not generate encrypting data: %s"
+msgid "Could not generate encrypting data: "
 msgstr "KhÃng thá phÃt sinh dá liáu mát mÃ hÃa: %s"
 
-#: ../camel/camel-gpg-context.c:1652
+#: ../camel/camel-gpg-context.c:1934
 msgid "This is a digitally encrypted message part"
 msgstr "ÄÃy lÃ mát phán thÆ cÃ mát mÃ hÃa sá"
 
-#: ../camel/camel-gpg-context.c:1705
-#: ../camel/camel-gpg-context.c:1713
-#: ../camel/camel-gpg-context.c:1732
+#: ../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 "KhÃng thá giái mát mÃ thÆ: dáng thác thÆ khÃng ÄÃng"
 
-#: ../camel/camel-gpg-context.c:1722
+#: ../camel/camel-gpg-context.c:2012
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Lái giái mát mÃ phán MIME: lái giao thác"
 
-#: ../camel/camel-gpg-context.c:1787
-#: ../camel/camel-smime-context.c:969
+#: ../camel/camel-gpg-context.c:2103 ../camel/camel-smime-context.c:1264
 msgid "Encrypted content"
 msgstr "Nái dung bá mát mÃ hÃa"
 
-#: ../camel/camel-gpg-context.c:1806
-msgid "Unable to parse message content"
-msgstr "KhÃng thá phÃn tÃch nái dung thÆ"
+#: ../camel/camel-http-stream.c:546 ../camel/camel-stream-null.c:78
+msgid "Only reset to beginning is supported with CamelHttpStream"
+msgstr ""
 
-#: ../camel/camel-gpg-context.c:1830
-#: ../camel/camel-gpg-context.c:1875
-#: ../camel/camel-tcp-stream-openssl.c:635
-#: ../camel/providers/imap4/camel-imap4-utils.c:624
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
-#: ../camel/providers/smtp/camel-smtp-transport.c:221
-msgid "Unknown"
-msgstr "KhÃng biát"
+#: ../camel/camel-lock.c:102
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "KhÃng thá táo táp tin khÃa cho %s: %s"
+
+#: ../camel/camel-lock.c:145
+#, fuzzy, c-format
+#| msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Timed out trying to get lock file on %s.  Try again later."
+msgstr "QuÃ hán thá láy táp tin khÃa trÃn %s. Sá thá lái sau."
+
+#: ../camel/camel-lock.c:205
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Lái láy khÃa báng fcntl(2): %s"
+
+#: ../camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Lái láy khÃa báng flock(2): %s"
 
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "KhÃng thá xÃy dáng áng dán há trá khoÃ: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "KhÃng thá táo tián trÃnh há trá khÃa: %s"
 
-#: ../camel/camel-lock-client.c:204
-#: ../camel/camel-lock-client.c:227
+#: ../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 "KhÃng thá khÃa '%s': lái giao thác vái bá há trá khÃa (lock-helper)"
 
-#: ../camel/camel-lock-client.c:217
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "KhÃng thá khÃa '%s'"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-movemail.c:105
 #, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "KhÃng thá táo táp tin khÃa cho %s: %s"
+msgid "Could not check mail file %s: %s"
+msgstr "KhÃng thá kiám tra táp tin thÆ %s: %s"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-movemail.c:119
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "QuÃ hán thá láy táp tin khÃa trÃn %s. Sá thá lái sau."
+msgid "Could not open mail file %s: %s"
+msgstr "KhÃng thá má táp tin thÆ %s: %s"
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-movemail.c:129
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Lái láy khÃa báng fcntl(2): %s"
+msgid "Could not open temporary mail file %s: %s"
+msgstr "KhÃng thá má táp tin thÆ tám %s: %s"
 
-#: ../camel/camel-lock.c:262
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Lái láy khÃa báng flock(2): %s"
-
-#: ../camel/camel-movemail.c:106
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "KhÃng thá kiám tra táp tin thÆ %s: %s"
-
-#: ../camel/camel-movemail.c:119
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "KhÃng thá má táp tin thÆ %s: %s"
-
-#: ../camel/camel-movemail.c:127
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "KhÃng thá má táp tin thÆ tám %s: %s"
-
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Lái lÆu thÆ vÃo táp tin tám %s: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "KhÃng thá táo áng dán: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
 msgstr "KhÃng thá táo tián trÃnh: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Lái chÆÆng trÃnh movemail (chuyán di thÆ): %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(Lái lá)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Lái Äác táp tin thÆ: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Lái ghi táp tin thÆ tám: %s"
 
-#: ../camel/camel-movemail.c:464
-#: ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:491 ../camel/camel-movemail.c:560
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Lái sao chÃp táp tin thÆ tám: %s"
 
-#: ../camel/camel-multipart-signed.c:593
+#: ../camel/camel-multipart-signed.c:297
+#, fuzzy, c-format
+#| msgid "No description available"
+msgid "No content available"
+msgstr "KhÃng cÃ mÃ tá"
+
+#: ../camel/camel-multipart-signed.c:305
+#, fuzzy, c-format
+#| msgid "No description available"
+msgid "No signature available"
+msgstr "KhÃng cÃ mÃ tá"
+
+#: ../camel/camel-multipart-signed.c:689
+#, c-format
 msgid "parse error"
 msgstr "lái phÃn tÃch"
 
-#: ../camel/camel-net-utils.c:505
-#: ../camel/camel-net-utils.c:667
-#: ../camel/camel-net-utils.c:799
-#: ../camel/providers/pop3/camel-pop3-store.c:448
-#: ../camel/providers/pop3/camel-pop3-store.c:548
-msgid "Canceled"
-msgstr "Bá thÃi"
+#: ../camel/camel-network-service.c:99
+#, c-format
+msgid "Could not connect to %s: %s"
+msgstr "KhÃng thá kát nái tái %s: %s"
+
+#: ../camel/camel-network-service.c:100
+msgid "SSL unavailable"
+msgstr "KhÃng cÃ SSL"
 
-#: ../camel/camel-net-utils.c:524
-msgid "cannot create thread"
-msgstr "KhÃng thá táo mách"
+#: ../camel/camel-network-service.c:123
+#, fuzzy, c-format
+#| msgid "Could not connect to %s: %s"
+msgid "Could not connect to %s: "
+msgstr "KhÃng thá kát nái tái %s: %s"
 
-#: ../camel/camel-net-utils.c:671
+#: ../camel/camel-net-utils.c:703
 #, c-format
 msgid "Resolving: %s"
 msgstr "Äang phÃn giái: %s"
 
-#: ../camel/camel-net-utils.c:693
+#: ../camel/camel-net-utils.c:726
 msgid "Host lookup failed"
 msgstr "Lái tra cáu mÃy phác vá: khÃng tÃm tháy mÃy phác vá"
 
-#: ../camel/camel-net-utils.c:695
+#: ../camel/camel-net-utils.c:732
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "Lái tra cáu mÃy phác vá: %s: %s (khÃng tÃm tháy mÃy phác vá)"
 
-#: ../camel/camel-net-utils.c:803
+#: ../camel/camel-net-utils.c:853
 msgid "Resolving address"
 msgstr "Äang phÃn giái Äáa chá"
 
-#: ../camel/camel-net-utils.c:823
+#: ../camel/camel-net-utils.c:874
 msgid "Name lookup failed"
 msgstr "Lái tra cáu mÃy phác vá tÃn"
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:880
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Lái tra cáu mÃy phác vá tÃn: %s"
 
-#: ../camel/camel-offline-folder.c:253
+#: ../camel/camel-offline-folder.c:202
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Äang Äáng bá thÆ trong thÆ mác `%s' vÃo ÄÄa"
 
-#: ../camel/camel-offline-journal.c:164
-#: ../camel/camel-offline-journal.c:187
+#: ../camel/camel-offline-journal.c:147 ../camel/camel-offline-journal.c:177
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "KhÃng thá táo thÆ mác '%s': %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
 msgstr "Bá cung cáp thÆ mác áo"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "Äá Äác thÆ nhÆ lÃ mát truy ván cáa mát táp cÃc thÆ mác khÃc"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:192
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "KhÃng thá tái %s: há tháng nÃy chÆa há trá tÃnh nÄng tái mÃ Äun."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:201
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "KhÃng thá tái %s: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:210
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "KhÃng thá tái %s: khÃng cÃ mÃ khái Äáng trong mÃ Äun"
 
-#: ../camel/camel-provider.c:373
-#: ../camel/camel-session.c:182
+#: ../camel/camel-provider.c:394 ../camel/camel-session.c:351
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "KhÃng cÃ bÃn nÃo cung cáp giao thác `%s'"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "VÃ danh"
 
-#: ../camel/camel-sasl-anonymous.c:39
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "TÃy chán nÃy sá kát nái tái mÃy phác vá báng cÃch Äang nháp vÃ danh."
 
-#: ../camel/camel-sasl-anonymous.c:124
-#: ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:70
+#, c-format
 msgid "Authentication failed."
 msgstr "XÃc thác thát bái."
 
-#: ../camel/camel-sasl-anonymous.c:133
+#: ../camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1926,7 +2434,7 @@ msgstr ""
 "ThÃng tin truy tÃm Äáa chá thÆ khÃng háp lá:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:145
+#: ../camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1935,7 +2443,7 @@ msgstr ""
 "ThÃng tin truy tÃm Äáa chá bÃ hiám khÃng háp lá:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:157
+#: ../camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1944,580 +2452,578 @@ msgstr ""
 "ThÃng tin truy tÃm khÃng háp lá:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
-msgstr "TÃy chán nÃy sá kát nái tái mÃy phác vá dÃng mát kháu an toÃn CRAM-MD5, náu mÃy chá cÃ há trá."
+#: ../camel/camel-sasl-cram-md5.c:43
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"TÃy chán nÃy sá kát nái tái mÃy phác vá dÃng mát kháu an toÃn CRAM-MD5, náu "
+"mÃy chá cÃ há trá."
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
-msgstr "TÃy chán nÃy sá kát nái tái mÃy phác vá báng mát kháu an toÃn DIGEST-MD5, náu mÃy phác vá cÃ há trá."
+#: ../camel/camel-sasl-digest-md5.c:56
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"TÃy chán nÃy sá kát nái tái mÃy phác vá báng mát kháu an toÃn DIGEST-MD5, "
+"náu mÃy phác vá cÃ há trá."
 
-#: ../camel/camel-sasl-digest-md5.c:845
+#: ../camel/camel-sasl-digest-md5.c:830
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Lánh thÃch thác mÃy phác vá quÃ dÃi (trÃn 2048 octet)."
 
-#: ../camel/camel-sasl-digest-md5.c:854
+#: ../camel/camel-sasl-digest-md5.c:841
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "Lánh thÃch thác mÃy phác vá khÃng háp lá.\n"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:849
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
-msgstr "Lánh thÃch thác mÃy phác vá cháa hiáu bÃi Â Quality of Protection Â (mác báo vá) khÃng háp lá."
+msgstr ""
+"Lánh thÃch thác mÃy phác vá cháa hiáu bÃi Â Quality of Protection Â (mác báo "
+"vá) khÃng háp lá."
 
-#: ../camel/camel-sasl-digest-md5.c:890
+#: ../camel/camel-sasl-digest-md5.c:883
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Hái ÄÃp cáa mÃy phác vá khÃng cháa dá liáu Äá xÃc thác."
 
-#: ../camel/camel-sasl-digest-md5.c:908
+#: ../camel/camel-sasl-digest-md5.c:904
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Hái ÄÃp cáa mÃy phác vá cháa dá liáu xÃc thác khÃng hoÃn chánh."
 
-#: ../camel/camel-sasl-digest-md5.c:918
+#: ../camel/camel-sasl-digest-md5.c:917
+#, c-format
 msgid "Server response does not match"
 msgstr "Hái ÄÃp cáa mÃy phác vá khÃng kháp."
 
-#: ../camel/camel-sasl-gssapi.c:64
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:66
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "TÃy chán nÃy sá kát nái tái mÃy chu báng cÆ chá xÃc minh Kerberos 5."
 
-#: ../camel/camel-sasl-gssapi.c:164
-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
-msgstr "CÆ chá xÃc Äánh khÃng ÄÆác há trá do thÃng tin xÃc thác ÄÃ cung cáp, hoác khÃng ÄÆác cháp nhán do cÃch thác hián."
+#: ../camel/camel-sasl-gssapi.c:129
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+"CÆ chá xÃc Äánh khÃng ÄÆác há trá do thÃng tin xÃc thác ÄÃ cung cáp, hoác "
+"khÃng ÄÆác cháp nhán do cÃch thác hián."
 
-#: ../camel/camel-sasl-gssapi.c:169
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 msgstr "Tham sá target_name (tÃn ÄÃch) ÄÆác cung cáp cÃ dáng thác sai."
 
-#: ../camel/camel-sasl-gssapi.c:172
-msgid "The provided target_name parameter contained an invalid or unsupported type of name."
-msgstr "Tham sá target_name (tÃn ÄÃch) cháa loái tÃn khÃng há trá hoác khÃng háp lá."
+#: ../camel/camel-sasl-gssapi.c:137
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+"Tham sá target_name (tÃn ÄÃch) cháa loái tÃn khÃng há trá hoác khÃng háp lá."
 
-#: ../camel/camel-sasl-gssapi.c:176
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
-msgstr "Tham sá input-token (hiáu bÃi gÃ) cháa thá ÄÃng kát kÃnh khÃc vái Äiáu do tham sá input-chan-bindings (thá ÄÃng kát kÃnh gÃ) xÃc Äánh."
+#: ../camel/camel-sasl-gssapi.c:141
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+"Tham sá input-token (hiáu bÃi gÃ) cháa thá ÄÃng kát kÃnh khÃc vái Äiáu do "
+"tham sá input-chan-bindings (thá ÄÃng kát kÃnh gÃ) xÃc Äánh."
 
-#: ../camel/camel-sasl-gssapi.c:181
-msgid "The input_token contains an invalid signature, or a signature that could not be verified."
-msgstr "Tham sá input_token (hiáu bÃi gÃ cháa chá kÃ khÃng háp lá, hoác chá kÃ khÃng ÄÆác xÃc nhán."
+#: ../camel/camel-sasl-gssapi.c:146
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+"Tham sá input_token (hiáu bÃi gÃ cháa chá kÃ khÃng háp lá, hoác chá kÃ khÃng "
+"ÄÆác xÃc nhán."
 
-#: ../camel/camel-sasl-gssapi.c:185
-msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
-msgstr "ThÃng tin xÃc thác khÃng háp lá Äá khái Äáng ngá cánh, hoác mÃc nÃ khÃng tham chiáu Äán thÃng tin xÃc thác nÃo."
+#: ../camel/camel-sasl-gssapi.c:150
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+"ThÃng tin xÃc thác khÃng háp lá Äá khái Äáng ngá cánh, hoác mÃc nÃ khÃng "
+"tham chiáu Äán thÃng tin xÃc thác nÃo."
 
-#: ../camel/camel-sasl-gssapi.c:190
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "MÃc ngá cánh ÄÆác cung cáp khÃng tham chiáu Äán mát ngá cánh háp lá."
 
-#: ../camel/camel-sasl-gssapi.c:193
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
-msgstr "Thao tÃc kiám tra Äáng bá ÄÆác thác hián trÃn input_token (hiáu bÃi gÃ) ÄÃ thát bái."
+msgstr ""
+"Thao tÃc kiám tra Äáng bá ÄÆác thác hián trÃn input_token (hiáu bÃi gÃ) ÄÃ "
+"thát bái."
 
-#: ../camel/camel-sasl-gssapi.c:196
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
-msgstr "Thao tÃc kiám tra Äáng bá ÄÆác thác hián trÃn thÃng tin xÃc thác ÄÃ thát bái."
+msgstr ""
+"Thao tÃc kiám tra Äáng bá ÄÆác thác hián trÃn thÃng tin xÃc thác ÄÃ thát bái."
 
-#: ../camel/camel-sasl-gssapi.c:199
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The referenced credentials have expired."
 msgstr "ÄÃ tham chiáu Äán thÃng tin xÃc thác ÄÃ hát hán."
 
-#: ../camel/camel-sasl-gssapi.c:205
-#: ../camel/camel-sasl-gssapi.c:253
-#: ../camel/camel-sasl-gssapi.c:289
-#: ../camel/camel-sasl-gssapi.c:304
-#: ../camel/camel-sasl-kerberos4.c:231
-#: ../camel/providers/imap/camel-imap-store.c:1273
+#: ../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 "Trá lái xÃc thác sai tá mÃy phác vá."
 
-#: ../camel/camel-sasl-gssapi.c:314
+#: ../camel/camel-sasl-gssapi.c:394
+#, c-format
 msgid "Unsupported security layer."
 msgstr "Táng báo mát chÆa ÄÆác há trá."
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "TÃy chán nÃy sá kát nái Äán mÃy phác vá báng cÆ chá xÃc minh Kerberos 4."
-
-#: ../camel/camel-sasl-kerberos4.c:174
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"KhÃng thá láy vÃ Kerberos:\n"
-"%s"
-
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "ÄÄng nháp"
 
-#: ../camel/camel-sasl-login.c:38
-#: ../camel/camel-sasl-plain.c:38
+#: ../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 "TÃy chán nÃy sá kát nái tái mÃy phác vá báng mát kháu ÄÆn gián."
 
-#: ../camel/camel-sasl-login.c:135
+#: ../camel/camel-sasl-login.c:92
+#, c-format
 msgid "Unknown authentication state."
 msgstr "Tráng thÃi xÃc thác lá."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:42
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
-msgstr "TÃy chán nÃy sá kát nái tái mÃy phác vá dáa vÃo Windows dÃng NTLM / SPA"
+#: ../camel/camel-sasl-ntlm.c:44
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
+msgstr ""
+"TÃy chán nÃy sá kát nái tái mÃy phác vá dáa vÃo Windows dÃng NTLM / SPA"
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "THÃ"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "POP trÆác SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "TÃy chán nÃy sá xÃc thác kát nái POP trÆác khi thá SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
-msgid "POP Source URI"
+#: ../camel/camel-sasl-popb4smtp.c:80
+#, fuzzy
+#| msgid "POP Source URI"
+msgid "POP Source UID"
 msgstr "URI cÃ nguán POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
+#: ../camel/camel-sasl-popb4smtp.c:92
+#, fuzzy, c-format
+#| msgid "POP Before SMTP auth using an unknown transport"
+msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "XÃc thác POP trÆác SMTP dÃng truyán tái lá"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "XÃc thác POP trÆác SMTP dÃng nguán khÃng phái POP"
+#: ../camel/camel-sasl-popb4smtp.c:104 ../camel/camel-sasl-popb4smtp.c:114
+#, c-format
+msgid "POP Before SMTP authentication attempted with a %s service"
+msgstr ""
 
-#: ../camel/camel-search-private.c:149
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "BiÃn dách biáu thác chÃnh quy thát bái: %s: %s"
 
-#: ../camel/camel-service.c:270
-#, c-format
-msgid "URL '%s' needs a username component"
+#: ../camel/camel-service.c:524
+#, fuzzy, c-format
+#| msgid "URL '%s' needs a username component"
+msgid "URL '%s' needs a user component"
 msgstr "Äáa chá Máng '%s' cán phán tÃn ngÆái dÃng"
 
-#: ../camel/camel-service.c:274
+#: ../camel/camel-service.c:535
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "Äáa chá Máng '%s' cán phán mÃy phác vá"
 
-#: ../camel/camel-service.c:278
+#: ../camel/camel-service.c:546
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "Äáa chá Máng '%s' cán phán ÄÆáng dán"
 
-#: ../camel/camel-session.c:308
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"KhÃng thá táo thÆ mác %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 "KhÃng cÃ bÃn nÃo cung cáp giao thác `%s'"
 
-#: ../camel/camel-session.c:483
+#: ../camel/camel-session.c:941
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "%sHÃy gÃ mát kháu POP cho %s trÃn mÃy %s"
 
-#: ../camel/camel-session.c:822
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "PhiÃn cháy Camel khÃng há trá chác nÄng chuyán tiáp thÃng Äiáp."
-
-#: ../camel/camel-smime-context.c:234
-#: ../camel/camel-smime-context.c:778
+#: ../camel/camel-smime-context.c:347 ../camel/camel-smime-context.c:1053
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "KhÃng thá tÃm cháng nhán cho '%s'"
 
-#: ../camel/camel-smime-context.c:240
+#: ../camel/camel-smime-context.c:375
 msgid "Cannot create CMS message"
 msgstr "KhÃng thá táo thÆ CMS"
 
-#: ../camel/camel-smime-context.c:245
+#: ../camel/camel-smime-context.c:380
 msgid "Cannot create CMS signed data"
 msgstr "KhÃng thá táo dá liáu cÃ chá kÃ CMS"
 
-#: ../camel/camel-smime-context.c:251
+#: ../camel/camel-smime-context.c:386
 msgid "Cannot attach CMS signed data"
 msgstr "KhÃng thá ÄÃnh kÃm dá liáu cÃ chá kÃ CMS"
 
-#: ../camel/camel-smime-context.c:258
+#: ../camel/camel-smime-context.c:393
 msgid "Cannot attach CMS data"
 msgstr "KhÃng thá ÄÃnh kÃm dá liáu CMS"
 
-#: ../camel/camel-smime-context.c:264
+#: ../camel/camel-smime-context.c:399
 msgid "Cannot create CMS Signer information"
 msgstr "KhÃng thá táo thÃng tin Chá kÃ CMS"
 
-#: ../camel/camel-smime-context.c:270
+#: ../camel/camel-smime-context.c:405
 msgid "Cannot find certificate chain"
 msgstr "KhÃng thá tÃm dÃy cháng nhán"
 
-#: ../camel/camel-smime-context.c:276
+#: ../camel/camel-smime-context.c:411
 msgid "Cannot add CMS Signing time"
 msgstr "KhÃng thá thÃm thái gian kÃ nhán CMS"
 
-#: ../camel/camel-smime-context.c:298
-#: ../camel/camel-smime-context.c:310
+#: ../camel/camel-smime-context.c:435 ../camel/camel-smime-context.c:450
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Cháng nhán mÃ hÃa cho \"%s\" khÃng tán tái"
 
-#: ../camel/camel-smime-context.c:317
+#: ../camel/camel-smime-context.c:457
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
-msgstr "KhÃng thá thÃm thuác tÃnh SMIMEEncKeyPrefs (sá thÃch khÃa mÃ hÃa S/MIME)"
+msgstr ""
+"KhÃng thá thÃm thuác tÃnh SMIMEEncKeyPrefs (sá thÃch khÃa mÃ hÃa S/MIME)"
 
-#: ../camel/camel-smime-context.c:322
+#: ../camel/camel-smime-context.c:462
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
-msgstr "KhÃng thá thÃm thuác tÃnh MS SMIMEEncKeyPrefs (sá thÃch khÃa mÃ hÃa S/MIME MS)"
+msgstr ""
+"KhÃng thá thÃm thuác tÃnh MS SMIMEEncKeyPrefs (sá thÃch khÃa mÃ hÃa S/MIME "
+"MS)"
 
-#: ../camel/camel-smime-context.c:327
+#: ../camel/camel-smime-context.c:467
 msgid "Cannot add encryption certificate"
 msgstr "KhÃng thá thÃm cháng nhán mÃ hÃa"
 
-#: ../camel/camel-smime-context.c:333
+#: ../camel/camel-smime-context.c:473
 msgid "Cannot add CMS Signer information"
 msgstr "KhÃng thá thÃm thÃng tin Chá kÃ CMS"
 
-#: ../camel/camel-smime-context.c:403
-#: ../camel/camel-smime-context.c:851
-msgid "Cannot create encoder context"
-msgstr "KhÃng thá táo ngÅ cánh bá biÃn mÃ"
-
-#: ../camel/camel-smime-context.c:409
-msgid "Failed to add data to CMS encoder"
-msgstr "Lái thÃm dá liáu vÃo bá biÃn mÃ CMS"
-
-#: ../camel/camel-smime-context.c:414
-#: ../camel/camel-smime-context.c:868
-msgid "Failed to encode data"
-msgstr "Lái biÃn mÃ dá liáu"
-
-#: ../camel/camel-smime-context.c:487
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:506
 msgid "Unverified"
 msgstr "ChÆa thám tra"
 
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:508
 msgid "Good signature"
 msgstr "Chá kÃ tát"
 
-#: ../camel/camel-smime-context.c:491
+#: ../camel/camel-smime-context.c:510
 msgid "Bad signature"
 msgstr "Chá kÃ sai"
 
-#: ../camel/camel-smime-context.c:493
+#: ../camel/camel-smime-context.c:512
 msgid "Content tampered with or altered in transit"
 msgstr "Nái dung bá giá máo hay bá thay Äái trong khi truyán"
 
-#: ../camel/camel-smime-context.c:495
+#: ../camel/camel-smime-context.c:514
 msgid "Signing certificate not found"
 msgstr "KhÃng tÃm tháy cháng nhán kÃ tÃn"
 
-#: ../camel/camel-smime-context.c:497
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not trusted"
 msgstr "Cháng nhán kÃ tÃn khÃng ÄÃng tin"
 
-#: ../camel/camel-smime-context.c:499
+#: ../camel/camel-smime-context.c:518
 msgid "Signature algorithm unknown"
 msgstr "KhÃng biát thuát toÃn chá kÃ"
 
-#: ../camel/camel-smime-context.c:501
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unsupported"
 msgstr "KhÃng há trá thuát toÃn chá kÃ"
 
-#: ../camel/camel-smime-context.c:503
+#: ../camel/camel-smime-context.c:522
 msgid "Malformed signature"
 msgstr "Chá kÃ dáng thác sai"
 
-#: ../camel/camel-smime-context.c:505
+#: ../camel/camel-smime-context.c:524
 msgid "Processing error"
 msgstr "Lái xá lÃ"
 
-#: ../camel/camel-smime-context.c:542
+#: ../camel/camel-smime-context.c:569
 msgid "No signed data in signature"
 msgstr "KhÃng cÃ dá liáu cÃ kÃ tÃn trong chá kÃ"
 
-#: ../camel/camel-smime-context.c:549
+#: ../camel/camel-smime-context.c:574
 msgid "Digests missing from enveloped data"
 msgstr "Thiáu Äiáu tÃm tát thÆ trong dá liáu ÄÆác bao"
 
-#: ../camel/camel-smime-context.c:562
-#: ../camel/camel-smime-context.c:572
+#: ../camel/camel-smime-context.c:587 ../camel/camel-smime-context.c:598
 msgid "Cannot calculate digests"
 msgstr "KhÃng thá tÃnh nháng Äiáu tÃm tát"
 
-#: ../camel/camel-smime-context.c:577
+#: ../camel/camel-smime-context.c:605 ../camel/camel-smime-context.c:609
 msgid "Cannot set message digests"
 msgstr "KhÃng thá Äát nháng Äiáu tÃm tát thÆ"
 
-#: ../camel/camel-smime-context.c:587
-#: ../camel/camel-smime-context.c:592
+#: ../camel/camel-smime-context.c:619 ../camel/camel-smime-context.c:624
 msgid "Certificate import failed"
 msgstr "Lái náp cháng nhán"
 
-#: ../camel/camel-smime-context.c:602
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "Cháng nhán lÃ toÃn thÆ; khÃng thá thám tra cháng nhán"
 
-#: ../camel/camel-smime-context.c:605
+#: ../camel/camel-smime-context.c:637
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "Cháng nhán lÃ toÃn thÆ; cÃc cháng nhán ÄÆác náp vÃ ÄÆác thám tra"
 
-#: ../camel/camel-smime-context.c:609
+#: ../camel/camel-smime-context.c:641
 msgid "Cannot find signature digests"
 msgstr "KhÃng tÃm tháy Äiáu tÃm tát chá kÃ"
 
-#: ../camel/camel-smime-context.c:625
+#: ../camel/camel-smime-context.c:657
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "KÃ tÃn do : %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:726
+#: ../camel/camel-smime-context.c:838 ../camel/camel-smime-context.c:1126
+msgid "Cannot create encoder context"
+msgstr "KhÃng thá táo ngÅ cánh bá biÃn mÃ"
+
+#: ../camel/camel-smime-context.c:844
+msgid "Failed to add data to CMS encoder"
+msgstr "Lái thÃm dá liáu vÃo bá biÃn mÃ CMS"
+
+#: ../camel/camel-smime-context.c:849 ../camel/camel-smime-context.c:1143
+msgid "Failed to encode data"
+msgstr "Lái biÃn mÃ dá liáu"
+
+#: ../camel/camel-smime-context.c:992 ../camel/camel-smime-context.c:1239
 msgid "Decoder failed"
 msgstr "Lái bá giái mÃ"
 
-#: ../camel/camel-smime-context.c:785
+#: ../camel/camel-smime-context.c:1061
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "KhÃng tÃm tháy thuát toÃn mÃ hÃa hÃng loát chung"
 
-#. PORT_GetError(); ??
-#: ../camel/camel-smime-context.c:794
+#: ../camel/camel-smime-context.c:1069
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "KhÃng thá gÃn vá trÃ cho khÃa hÃng loát mÃ hÃa"
 
-#: ../camel/camel-smime-context.c:805
+#: ../camel/camel-smime-context.c:1080
 msgid "Cannot create CMS Message"
 msgstr "KhÃng thá táo thÆ CMS"
 
-#: ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:1086
 msgid "Cannot create CMS Enveloped data"
 msgstr "KhÃng thá táo dá liáu ÄÆác bao CMS"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:1092
 msgid "Cannot attach CMS Enveloped data"
 msgstr "KhÃng ÄÃnh kÃm dá liáu ÄÆác bao CMS"
 
-#: ../camel/camel-smime-context.c:823
+#: ../camel/camel-smime-context.c:1098
 msgid "Cannot attach CMS data object"
 msgstr "KhÃng thá ÄÃnh kÃm Äái tÆáng dá liáu CMS"
 
-#: ../camel/camel-smime-context.c:832
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot create CMS Recipient information"
 msgstr "KhÃng thá táo thÃng tin ngÆái nhán CMS"
 
-#: ../camel/camel-smime-context.c:837
+#: ../camel/camel-smime-context.c:1112
 msgid "Cannot add CMS Recipient information"
 msgstr "KhÃng thá thÃm thÃng tin ngÆái nhán CMS"
 
-#: ../camel/camel-smime-context.c:862
+#: ../camel/camel-smime-context.c:1137
 msgid "Failed to add data to encoder"
 msgstr "Lái thÃm dá liáu vÃo bá biÃn mÃ"
 
-#: ../camel/camel-smime-context.c:949
-#, c-format
-msgid "Decoder failed, error %d"
-msgstr "Lái bá giái mÃ: %d"
-
-#: ../camel/camel-smime-context.c:956
+#: ../camel/camel-smime-context.c:1246
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME giái mÃ: khÃng tÃm tháy nái dung ÄÆác mÃ hÃa"
 
-#: ../camel/camel-smime-context.c:983
-msgid "import keys: unimplemented"
-msgstr "náp khoÃ: chÆa há trá"
-
-#: ../camel/camel-smime-context.c:991
-msgid "export keys: unimplemented"
-msgstr "xuát khoÃ: chÆa há trá"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:174
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "KhÃng thá láy thÆ mác: thao tÃc khÃng háp lá trÃn thiát bá lÆu trá"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:1815
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "KhÃng thá táo thÆ mác '%s': thÆ mác ÄÃ cÃ"
 
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "KhÃng thá táo thÆ mác: thao tÃc khÃng háp lá trÃn thiát bá lÆu trá"
-
-#: ../camel/camel-store.c:423
-#, c-format
-msgid "Cannot create folder: %s: folder exists"
-msgstr "KhÃng thá táo thÆ mác: %s: thÆ mác ÄÃ cÃ"
-
-#: ../camel/camel-store.c:487
-#: ../camel/camel-vee-store.c:384
-#: ../camel/providers/local/camel-maildir-store.c:219
-#, c-format
-msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "KhÃng thá xoÃ thÆ mác: %s: thao tÃc khÃng háp lá"
+#: ../camel/camel-store.c:1858
+#, fuzzy, c-format
+#| msgid "Syncing folders"
+msgid "Opening folder '%s'"
+msgstr "Äang Äáng bá nháng thÆ mác"
 
-#: ../camel/camel-store.c:544
-#: ../camel/camel-vee-store.c:421
-#: ../camel/providers/local/camel-maildir-store.c:291
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "KhÃng thá Äái tÃn thÆ mác: %s: thao tÃc khÃng háp lá"
+#: ../camel/camel-store.c:2043
+#, fuzzy, c-format
+#| msgid "Scanning for changed messages in %s"
+msgid "Scanning folders in '%s'"
+msgstr "Äang quÃt tÃm cÃc thÆ thay Äái trong %s"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:899
-#: ../camel/camel-vtrash-folder.c:54
-#: ../camel/providers/imap/camel-imap-store.c:1061
+#: ../camel/camel-store.c:2055 ../camel/camel-store.c:2065
+#: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "RÃc"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:902
-#: ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:2058 ../camel/camel-store.c:2069
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "ThÆ rÃc"
 
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to get issuer's certificate"
-msgstr "KhÃng thá gái cháng nhán cáa ngÆái phÃt hÃnh"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Unable to get Certificate Revocation List"
-msgstr "KhÃng thá gái danh sÃch háy bá cháng nhán (DHC)"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Unable to decrypt certificate signature"
-msgstr "KhÃng thá giái mÃ chá kÃ cháng nhán"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "KhÃng thá giái mÃ chá kÃ cáa danh sÃch háy bá cháng nhán"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Unable to decode issuer's public key"
-msgstr "KhÃng thá giái mÃ khÃa cÃng cáa ngÆái phÃt hÃnh"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate signature failure"
-msgstr "Lái chá kÃ cháng nhán"
+#: ../camel/camel-store.c:2520
+#, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "KhÃng thá táo thÆ mác: %s: thÆ mác ÄÃ cÃ"
 
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List signature failure"
-msgstr "Lái chá kÃ danh sÃch háy bá cháng nhán"
+#: ../camel/camel-store.c:2534
+#, fuzzy, c-format
+#| msgid "Cannot get folder '%s': %s"
+msgid "Creating folder '%s'"
+msgstr "KhÃng thá láy thÆ mác Â %s Â: %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:586
-msgid "Certificate not yet valid"
-msgstr "Cháng nhán chÆa háp lá"
+#: ../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 "KhÃng thá xoÃ thÆ mác: %s: thao tÃc khÃng háp lá"
 
-#: ../camel/camel-tcp-stream-openssl.c:588
-msgid "Certificate has expired"
-msgstr "Cháng nhán quÃ hán"
+#: ../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 "KhÃng thá Äái tÃn thÆ mác: %s: thao tÃc khÃng háp lá"
 
-#: ../camel/camel-tcp-stream-openssl.c:590
-msgid "CRL not yet valid"
-msgstr "Danh sÃch háy bá cháng nhán chÆa háp lá"
+#: ../camel/camel-stream-filter.c:327
+msgid "Only reset to beginning is supported with CamelStreamFilter"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:592
-msgid "CRL has expired"
-msgstr "Danh sÃch háy bá cháng nhán quÃ hán"
+#: ../camel/camel-stream-process.c:267
+#, c-format
+msgid "Connection cancelled"
+msgstr "Kát nái bá háy bá"
 
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Error in CRL"
-msgstr "Lái trong danh sÃch háy bá cháng nhán"
+#: ../camel/camel-stream-process.c:272
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "KhÃng thá kát nái báng lánh \"%s\": %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Out of memory"
-msgstr "Hát bá nhá"
+#: ../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 ""
 
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Zero-depth self-signed certificate"
-msgstr "Cháng nhán tá kÃ cÃ Äá sÃu 0"
+#: ../camel/camel-tcp-stream-raw.c:778
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Self-signed certificate in chain"
-msgstr "Cháng nhán tá kÃ trong chuái"
+#: ../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 ""
 
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Unable to get issuer's certificate locally"
-msgstr "KhÃng thá gái cháng nhán cáa ngÆái phÃt hÃnh mát cÃch Äáa phÆÆng"
+#: ../camel/camel-tcp-stream-raw.c:886
+#, fuzzy, c-format
+#| msgid "No support for authentication type %s"
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "KhÃng há trá kiáu xÃc thác %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Unable to verify leaf signature"
-msgstr "KhÃng thá thám tra chá kÃ lÃ"
+#: ../camel/camel-tcp-stream-raw.c:898
+msgid "General SOCKS server failure"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Certificate chain too long"
-msgstr "DÃy cháng nhán quÃ dÃi"
+#: ../camel/camel-tcp-stream-raw.c:899
+msgid "SOCKS server's rules do not allow connection"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate Revoked"
-msgstr "Cháng nhán bá háy bá"
+#: ../camel/camel-tcp-stream-raw.c:900
+msgid "Network is unreachable from SOCKS server"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid Certificate Authority (CA)"
-msgstr "NhÃ cám quyán cháng nhán khÃng háp lá"
+#: ../camel/camel-tcp-stream-raw.c:901
+msgid "Host is unreachable from SOCKS server"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:615
-msgid "Path length exceeded"
-msgstr "ÄÆáng dán quÃ dÃi"
+#: ../camel/camel-tcp-stream-raw.c:902
+#, fuzzy
+#| msgid "Connection canceled"
+msgid "Connection refused"
+msgstr "Kát nái bá thÃi"
 
-#: ../camel/camel-tcp-stream-openssl.c:617
-msgid "Invalid purpose"
-msgstr "Mác ÄÃch khÃng háp lá"
+#: ../camel/camel-tcp-stream-raw.c:903
+msgid "Time-to-live expired"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:619
-msgid "Certificate untrusted"
-msgstr "Cháng nhán khÃng ÄÃng tin"
+#: ../camel/camel-tcp-stream-raw.c:904
+#, fuzzy
+#| msgid "STLS not supported by server"
+msgid "Command not supported by SOCKS server"
+msgstr "MÃy phác vá khÃng há trá STLS"
 
-#: ../camel/camel-tcp-stream-openssl.c:621
-msgid "Certificate rejected"
-msgstr "Cháng nhán bá tá chái"
+#: ../camel/camel-tcp-stream-raw.c:905
+#, fuzzy
+#| msgid "STLS not supported by server"
+msgid "Address type not supported by SOCKS server"
+msgstr "MÃy phác vá khÃng há trá STLS"
 
-#: ../camel/camel-tcp-stream-openssl.c:624
-msgid "Subject/Issuer mismatch"
-msgstr "KhÃng kháp Chá Äá/NhÃ phÃt hÃnh"
+#: ../camel/camel-tcp-stream-raw.c:906
+#, fuzzy
+#| msgid "Unknown error: %s"
+msgid "Unknown error from SOCKS server"
+msgstr "Lái khÃng rÃ : %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:626
-msgid "AKID/SKID mismatch"
-msgstr "KhÃng kháp AKID/SKID"
+#: ../camel/camel-tcp-stream-raw.c:939
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:628
-msgid "AKID/Issuer serial mismatch"
-msgstr "KhÃng kháp AKID/NhÃ phÃt hÃnh"
+#: ../camel/camel-tcp-stream-raw.c:957
+#, fuzzy, c-format
+#| msgid "Invalid response from server"
+msgid "Incomplete reply from SOCKS server"
+msgstr "Hái ÄÃp khÃng háp lá tá mÃy phác vá"
 
-#: ../camel/camel-tcp-stream-openssl.c:630
-msgid "Key usage does not support certificate signing"
-msgstr "CÃch sá dáng khÃa khÃng há trá kÃ cháng nhán"
+#: ../camel/camel-tcp-stream-raw.c:977
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr ""
 
-#: ../camel/camel-tcp-stream-openssl.c:633
-msgid "Error in application verification"
-msgstr "Gáp lái khi thám tra áng dáng"
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:1009 ../camel/camel-tcp-stream-raw.c:1019
+#, fuzzy, c-format
+#| msgid "Invalid response from server"
+msgid "Invalid reply from proxy server"
+msgstr "Hái ÄÃp khÃng háp lá tá mÃy phác vá"
 
-#: ../camel/camel-tcp-stream-openssl.c:700
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:462
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2530,37 +3036,16 @@ msgstr ""
 "Dáu Äiám chá:       %s\n"
 "Chá kÃ:         %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:706
-#: ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:468
 msgid "GOOD"
 msgstr "TáT"
 
-#: ../camel/camel-tcp-stream-openssl.c:706
-#: ../camel/camel-tcp-stream-ssl.c:886
+#: ../camel/camel-tcp-stream-ssl.c:468
 msgid "BAD"
 msgstr "SAI"
 
-#: ../camel/camel-tcp-stream-openssl.c:708
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"Cháng nhán sai tá %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Bán cÃ muán cháp nhán dÃ bát cá giÃ nÃo?"
-
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:890
+#: ../camel/camel-tcp-stream-ssl.c:472
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2575,7 +3060,7 @@ msgstr ""
 "\n"
 "Bán cÃ muán cháp nhán khÃng?"
 
-#: ../camel/camel-tcp-stream-ssl.c:934
+#: ../camel/camel-tcp-stream-ssl.c:516
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2584,7 +3069,7 @@ msgstr ""
 "Ván Äá cháng nhán: %s\n"
 "NhÃ phÃt hÃnh: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:986
+#: ../camel/camel-tcp-stream-ssl.c:568
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2593,7 +3078,7 @@ msgstr ""
 "VÃng cháng nhán sai: %s\n"
 "NhÃ phÃt hÃnh: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1004
+#: ../camel/camel-tcp-stream-ssl.c:586
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2602,7 +3087,7 @@ msgstr ""
 "Cháng nhán quÃ hán: %s\n"
 "NhÃ phÃt hÃnh: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1021
+#: ../camel/camel-tcp-stream-ssl.c:603
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2611,634 +3096,377 @@ msgstr ""
 "Danh sÃch háy bá cháng nhán quÃ hán: %s\n"
 "NhÃ phÃt hÃnh: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:333
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "KhÃng thá phÃn tÃch Äáa chá Máng `%s'"
 
-#: ../camel/camel-vee-folder.c:582
+#: ../camel/camel-vee-folder.c:1310 ../camel/camel-vee-folder.c:1470
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "Lái lÆu `%s': %s"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "KhÃng thá sao chÃp hoác di chuyán thÆ vÃo thÆ mác áo"
 
-#: ../camel/camel-vee-folder.c:660
+#: ../camel/camel-vee-folder.c:1343
 #, c-format
 msgid "No such message %s in %s"
 msgstr "KhÃng cÃ thÆ %s trong %s"
 
-#: ../camel/camel-vee-folder.c:820
-#: ../camel/camel-vee-folder.c:826
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "KhÃng thá sao chÃp hoác di chuyán thÆ vÃo thÆ mác áo"
+#: ../camel/camel-vee-folder.c:1411
+#, fuzzy, c-format
+#| msgid "Error storing '%s': %s"
+msgid "Error storing '%s': "
+msgstr "Lái lÆu `%s': %s"
 
-#: ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:115
-#: ../camel/camel-vee-store.c:360
+#. 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 "KhÃng kháp"
 
-#: ../camel/camel-vee-store.c:407
+#: ../camel/camel-vee-store.c:378
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "KhÃng thá xÃa bá thÆ mác: %s: khÃng cÃ thÆ mác nhÆ váy"
 
-#: ../camel/camel-vee-store.c:429
+#: ../camel/camel-vee-store.c:412
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "KhÃng thá Äái tÃn thÆ mác: %s: khÃng cÃ thÆ mác nhÆ váy"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "KhÃng thá sao chÃp cÃc thÆ vÃo thÆ mác RÃc"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "KhÃng thá sao chÃp cÃc thÆ vÃo thÆ mác ThÆ rÃc"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:129
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:293
+#, c-format
+msgid "No output stream"
+msgstr "KhÃng cÃ luáng kát xuát"
+
+#: ../camel/providers/imap/camel-imap-command.c:206
+#: ../camel/providers/imap/camel-imap-command.c:301
+#, c-format
+msgid "No input stream"
+msgstr "KhÃng cÃ luáng nháp liáu"
+
+#: ../camel/providers/imap/camel-imap-command.c:365
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "MÃy chá ÄÃ ngát kát nái bát ngá: %s"
+
+#: ../camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid ""
-"Cannot get message: %s\n"
-"  %s"
+"Alert from IMAP server %s %s:\n"
+"%s"
 msgstr ""
-"KhÃng thá láy thÆ: %s\n"
-"  %s"
+"BÃo Äáng tá mÃy phác vá IMAP %s %s:\n"
+"%s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:129
-#: ../camel/providers/local/camel-maildir-folder.c:248
-#: ../camel/providers/local/camel-maildir-folder.c:275
-#: ../camel/providers/local/camel-mbox-folder.c:347
-#: ../camel/providers/local/camel-mbox-folder.c:399
-#: ../camel/providers/local/camel-mh-folder.c:214
-msgid "No such message"
-msgstr "KhÃng cÃ thÆ nhÆ váy"
+#: ../camel/providers/imap/camel-imap-command.c:471
+#, c-format
+msgid "Unexpected response from IMAP server: %s"
+msgstr "TÃnh hiáu trá lái khÃng mong Äái tá mÃy phác vá IMAP: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:141
-#: ../camel/providers/imap4/camel-imap4-folder.c:821
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:251
-#: ../camel/providers/nntp/camel-nntp-folder.c:411
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "NgÆái dÃng ÄÃ thÃi"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
-#: ../camel/providers/imap4/camel-imap4-folder.c:826
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:168
-#: ../camel/providers/nntp/camel-nntp-folder.c:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:253
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/imap/camel-imap-command.c:483
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "KhÃng thá láy thÆ %s: %s"
+msgid "IMAP command failed: %s"
+msgstr "Lái lánh IMAP: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:165
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2277
-#: ../camel/providers/imap4/camel-imap4-folder.c:844
-msgid "This message is not available in offline mode."
-msgstr "ThÆ nÃy hián thái chÆa sán sÃng trong chá Äá ngoái tuyán."
+#: ../camel/providers/imap/camel-imap-command.c:563
+#, c-format
+msgid "Server response ended too soon."
+msgstr "TÃnh hiáu trá lái cáa mÃy phác vá kát thÃc quÃ sám."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:185
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:192
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1800
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1851
-msgid "Could not get message"
-msgstr "KhÃng thá gái thÆ."
+#: ../camel/providers/imap/camel-imap-command.c:775
+#, c-format
+msgid "IMAP server response did not contain %s information"
+msgstr "TÃn hiáu trá lái cáa mÃy phác vá IMAP khÃng cháa thÃng tin %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:867
-#: ../camel/providers/imap/camel-imap-folder.c:264
+#: ../camel/providers/imap/camel-imap-command.c:813
 #, c-format
-msgid "Could not load summary for %s"
-msgstr "KhÃng thá tái tÃm tát cho %s"
+msgid "Unexpected OK response from IMAP server: %s"
+msgstr "TÃn hiáu trá lái ÂÄáng ÃÂ khÃng mong Äái tá mÃy phác vá IMAP: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1127
-msgid "Trash Folder Full. Please Empty."
-msgstr "ThÆ mác RÃc Äáy. Xin hÃy Äá."
+#: ../camel/providers/imap/camel-imap-folder.c:296
+msgid "Always check for new mail in this folder"
+msgstr "LuÃn luÃn kiám tra tÃm thÆ mái trong thÆ mác nÃy"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1335
-#: ../camel/providers/groupwise/camel-groupwise-store.c:617
-#: ../camel/providers/groupwise/camel-groupwise-store.c:743
-#: ../camel/providers/imap/camel-imap-folder.c:3333
-#: ../camel/providers/imap/camel-imap-folder.c:3409
+#: ../camel/providers/imap/camel-imap-folder.c:372
 #, c-format
-msgid "Fetching summary information for new messages in %s"
-msgstr "Äang láy thÃng tin tÃm tát cho cÃc thÆ mái trong %s"
+msgid "Could not create directory %s: %s"
+msgstr "KhÃng thá táo thÆ mác %s: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2135
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2177
+#: ../camel/providers/imap/camel-imap-folder.c:395
 #, c-format
-msgid "Cannot append message to folder '%s': %s"
-msgstr "KhÃng thá phá thÃm thÆ vÃo thÆ mác dáng MH `%s': %s"
+msgid "Could not load summary for %s"
+msgstr "KhÃng thá tái tÃm tát cho %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2165
+#: ../camel/providers/imap/camel-imap-folder.c:1057
+#: ../camel/providers/imapx/camel-imapx-server.c:4065
 #, c-format
-msgid "Cannot create message: %s"
-msgstr "KhÃng thá táo thÆ: %s"
+msgid "Scanning for changed messages in %s"
+msgstr "Äang quÃt tÃm cÃc thÆ thay Äái trong %s"
+
+#: ../camel/providers/imap/camel-imap-folder.c:3486
+#, fuzzy
+#| msgid "Unable to retrieve message: %s"
+msgid "Unable to retrieve message: "
+msgstr "KhÃng thá gái thÆ: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:285
+#: ../camel/providers/imap/camel-imap-folder.c:3523
+#: ../camel/providers/imapx/camel-imapx-server.c:5344
 #, c-format
-msgid "Cannot get folder container %s"
-msgstr "KhÃng thá láy háp thÆ mác %s"
+msgid "Cannot get message with message ID %s: %s"
+msgstr "KhÃng thá láy thÆ cÃ mÃ sá thÆ %s: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:349
-#: ../camel/providers/imap4/camel-imap4-journal.c:319
-msgid "Cannot append message in offline mode: cache unavailable"
-msgstr "KhÃng thá phá thÃm thÆ trong chá Äá ngoái tuyán: khÃng cÃ bá nhá tám sán sÃng"
+#: ../camel/providers/imap/camel-imap-folder.c:3524
+#: ../camel/providers/imapx/camel-imapx-server.c:5345
+msgid "No such message available."
+msgstr "KhÃng cÃ thÆ nhÆ váy."
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:365
-#: ../camel/providers/imap4/camel-imap4-journal.c:335
+#: ../camel/providers/imap/camel-imap-folder.c:3599
+#: ../camel/providers/imap/camel-imap-folder.c:4506
+#: ../camel/providers/nntp/camel-nntp-folder.c:438
 #, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "KhÃng thá phá thÃm thÆ trong chá Äá ngoái tuyán: %s"
+msgid "This message is not currently available"
+msgstr "ThÆ nÃy hián thái chÆa sán sÃng"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
-#: ../camel/providers/imap4/camel-imap4-provider.c:39
-msgid "Checking for new mail"
-msgstr "Äang kiám tra tÃm thÆ mái"
+#: ../camel/providers/imap/camel-imap-folder.c:4090
+#: ../camel/providers/imap/camel-imap-folder.c:4173
+#: ../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 "Äang láy thÃng tin tÃm tát cho cÃc thÆ mái trong %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
-#: ../camel/providers/hula/camel-hula-provider.c:51
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
-msgid "C_heck for new messages in all folders"
-msgstr "_Kiám tra tÃm thÆ mái trÃn mái thÆ mác"
+#: ../camel/providers/imap/camel-imap-folder.c:4307
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr "TÃn hiáu trá lái chÆa hoÃn tát: chÆa nhán thÃng tin cho thÆ %d"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
-msgid "Options"
-msgstr "TÃy chán"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
-msgid "_Apply filters to new messages in Inbox on this server"
-msgstr "Ã_p dáng bá lác cho nháng thÆ mái nám trong thÆ mác INBOX (háp Äán) trÃn mÃy phác vá nÃy"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
-msgid "Check new messages for J_unk contents"
-msgstr "Kiám tra thÆ mái tÃm nái d_ung rÃc"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
-#: ../camel/providers/imap/camel-imap-provider.c:74
-msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "Chá kiám tra thÆ rÃc trong thÆ mác IN_BOX (háp Äán)"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:68
-msgid "Automatically synchroni_ze account locally"
-msgstr "Tá Äáng Äáng _bá hÃa tÃi khoán mát cÃch Äáa phÆÆng"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:73
-msgid "SOAP Settings"
-msgstr "Thiát láp SOAP"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:76
-#| msgid "Post Office Agent SOAP Port:"
-msgid "Post Office Agent SOAP _Port:"
-msgstr "Cáng SOAP tÃc nhán _bÆu Äián:"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:91
-msgid "For accessing Novell GroupWise servers"
-msgstr "Äá truy cáp mÃy phác vá Novell Groupwise"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
-#: ../camel/providers/hula/camel-hula-provider.c:95
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:84
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
-msgid "Password"
-msgstr "Mát kháu"
-
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:108
-msgid "This option will connect to the GroupWise server using a plaintext password."
-msgstr "TÃy chán nÃy sá kát nái tái mÃy phác vá GroupWise báng mát kháu thÃ (khÃng mát mÃ)."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:104
-msgid "Host or user not available in url"
-msgstr "MÃy phác vá hay ngÆái dÃng khÃng sán sÃng trong Äáa chá Máng."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:207
-#: ../camel/providers/imap/camel-imap-store.c:1357
-msgid "You did not enter a password."
-msgstr "Bán chÆa nháp mát kháu."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:303
-msgid "Some features may not work correctly with your current server version"
-msgstr "CÃ lá mát sá tÃnh nÄng khÃng thao tÃc cho ÄÃng vái phiÃn bán mÃy phác vá hián thái cáa bán"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:524
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/imap/camel-imap-folder.c:4317
 #, c-format
-msgid "No such folder %s"
-msgstr "KhÃng cÃ thÆ mác %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1241
-msgid "Cannot create GroupWise folders in offline mode."
-msgstr "KhÃng thá táo thÆ mác GroupWise trong chá Äá ngoái tuyán."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1255
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "ThÆ mác má khÃng ÄÆác phÃp cháa cÃc thÆ mác con"
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr "TÃn hiáu trá lái chÆa hoÃn tát: chÆa nhán UID cho thÆ %d"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1333
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
+#: ../camel/providers/imap/camel-imap-folder.c:4546
 #, c-format
-#| msgid "Cannot rename Groupwise folder '%s' to '%s'"
-msgid "Cannot rename GroupWise folder '%s' to '%s'"
-msgstr "KhÃng thá Äái tÃn thÆ mác GroupWise Â %s Â thÃnh Â %s Â"
+msgid "Could not find message body in FETCH response."
+msgstr "KhÃng thá tÃm tháy phán thÃn thÆ trong tÃn hiáu trá lái FETCH (gái)"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1391
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
-#, c-format
-msgid "GroupWise server %s"
-msgstr "MÃy phác vá GroupWise %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:197
+#: ../camel/providers/imap/camel-imap-message-cache.c:257
+#, fuzzy
+#| msgid "Could not open cache directory: %s"
+msgid "Could not open cache directory: "
+msgstr "KhÃng thá má thÆ mác nhá tám: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1393
+#: ../camel/providers/imap/camel-imap-message-cache.c:335
 #, c-format
-msgid "GroupWise service for %s on %s"
-msgstr "Dách vá GroupWise cho %s trÃn %s"
+msgid "Failed to cache message %s: %s"
+msgstr "Lái lÆu tám thÆ %s: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
-#, c-format
-msgid "GroupWise mail delivery via %s"
-msgstr "Gái thÆ (GroupWise) thÃng qua Â %s Â."
+#: ../camel/providers/imap/camel-imap-message-cache.c:401
+#, fuzzy, c-format
+#| msgid "Failed to cache message %s: %s"
+msgid "Failed to cache message %s: "
+msgstr "Lái lÆu tám thÆ %s: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:167
-msgid "Sending Message"
-msgstr "Äang gái thÆ"
+#: ../camel/providers/imap/camel-imap-message-cache.c:543
+#, fuzzy, c-format
+#| msgid "Failed to cache %s: %s"
+msgid "Failed to cache %s: "
+msgstr "Lái lÆu tám %s: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:221
-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 "Bán ÄÃ vÆát trái hán chá lÆu cáa tÃi khoán nÃy. CÃc thÆ cáa bán Äang Äái gái trong Háp Äi. HÃy cá gái lái báng nhán nÃt Gái/Nhán sau khi xÃa bá/lÆu trá mát sá thÆ.\n"
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
+msgid "Checking for New Mail"
+msgstr "Kiám tra tÃm thÆ mái"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:223
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:209
-#, c-format
-msgid "Could not send message: %s"
-msgstr "KhÃng thá gái thÆ: %s"
+#: ../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 "_Kiám tra tÃm thÆ mái trÃn mái thÆ mác"
 
-#: ../camel/providers/hula/camel-hula-provider.c:49
 #: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "Kiám tra tÃm thÆ mái"
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
+msgid "Ch_eck for new messages in subscribed folders"
+msgstr "Kiám tr_a tÃm thÆ mái trÃn mái thÆ mác ÄÃ ÄÄng kÃ"
 
-#: ../camel/providers/hula/camel-hula-provider.c:54
-#: ../camel/providers/imap/camel-imap-provider.c:52
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
 msgid "Connection to Server"
 msgstr "Kát nái Äán mÃy phác vá"
 
-#: ../camel/providers/hula/camel-hula-provider.c:56
-#: ../camel/providers/imap/camel-imap-provider.c:54
+#: ../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 "_DÃng lánh tá chán Äá kát nái Äán mÃy phác vá"
 
-#: ../camel/providers/hula/camel-hula-provider.c:58
-#: ../camel/providers/imap/camel-imap-provider.c:56
-msgid "Command:"
+#: ../camel/providers/imap/camel-imap-provider.c:52
+#, fuzzy
+#| msgid "Command:"
+msgid "Co_mmand:"
 msgstr "Lánh:"
 
-#: ../camel/providers/hula/camel-hula-provider.c:61
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:44
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
 msgid "Folders"
 msgstr "ThÆ mác"
 
-#: ../camel/providers/hula/camel-hula-provider.c:63
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:46
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
 msgid "_Show only subscribed folders"
 msgstr "Chá _hián nháng thÆ mác ÄÄng kÃ"
 
-#: ../camel/providers/hula/camel-hula-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "O_verride server-supplied folder namespace"
 msgstr "CÃ quyán cao hÆn bá tÃn Äác nhát thÆ mác do mÃy phác vá cung cáp"
 
-#: ../camel/providers/hula/camel-hula-provider.c:67
-msgid "Namespace"
-msgstr "Bá tÃn Äác nhát"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "Hula"
-msgstr "Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:80
-msgid "For accessing Hula servers"
-msgstr "Äá truy cáp mÃy phác vá Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:97
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr "TÃy chán nÃy sá kát nái tái mÃy phác vá Hula báng mát kháu thÃ (khÃng mát mÃ)."
-
-#: ../camel/providers/imap/camel-imap-command.c:183
-#: ../camel/providers/imap/camel-imap-command.c:267
-msgid "No output stream"
-msgstr "KhÃng cÃ luáng kát xuát"
-
-#: ../camel/providers/imap/camel-imap-command.c:188
-#: ../camel/providers/imap/camel-imap-command.c:272
-msgid "No input stream"
-msgstr "KhÃng cÃ luáng nháp liáu"
-
-#: ../camel/providers/imap/camel-imap-command.c:231
-#: ../camel/providers/imap/camel-imap-command.c:280
-#: ../camel/providers/imap/camel-imap-command.c:494
-#: ../camel/providers/imap/camel-imap-store.c:3037
-msgid "Operation cancelled"
-msgstr "Thao tÃc bá háy bá"
+#: ../camel/providers/imap/camel-imap-provider.c:62
+#, fuzzy
+#| msgid "Namespace:"
+msgid "Names_pace:"
+msgstr "Mián tÃn:"
 
-#: ../camel/providers/imap/camel-imap-command.c:333
-#: ../camel/providers/imap/camel-imap-store.c:3040
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "MÃy chá ÄÃ ngát kát nái bát ngá: %s"
+#: ../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 "TÃy chán"
 
-#. 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:354
-#, c-format
-msgid ""
-"Alert from IMAP server %s %s:\n"
-"%s"
+#: ../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 ""
-"BÃo Äáng tá mÃy phác vá IMAP %s %s:\n"
-"%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:423
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "TÃnh hiáu trá lái khÃng mong Äái tá mÃy phác vá IMAP: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:433
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "Lái lánh IMAP: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:508
-msgid "Server response ended too soon."
-msgstr "TÃnh hiáu trá lái cáa mÃy phác vá kát thÃc quÃ sám."
-
-#: ../camel/providers/imap/camel-imap-command.c:715
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "TÃn hiáu trá lái cáa mÃy phác vá IMAP khÃng cháa thÃng tin %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:751
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "TÃn hiáu trá lái ÂÄáng ÃÂ khÃng mong Äái tá mÃy phác vá IMAP: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:89
-msgid "Always check for new mail in this folder"
-msgstr "LuÃn luÃn kiám tra tÃm thÆ mái trong thÆ mác nÃy"
-
-#: ../camel/providers/imap/camel-imap-folder.c:245
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "KhÃng thá táo thÆ mác %s: %s"
-
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:888
-#, c-format
-msgid "Scanning for changed messages in %s"
-msgstr "Äang quÃt tÃm cÃc thÆ thay Äái trong %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1926
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "Tráng thÃi ÄÃp áng bát thÆáng Â %s Â xáy ra sau lánh APPEND (phá thÃm)"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1941
-msgid "No response on continuation after APPEND command"
-msgstr "KhÃng cÃ ÄÃp áng khi tiáp tác sau lánh APPEND (phá thÃm)"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1983
-msgid "Unknown error occurred during APPEND command!"
-msgstr "Gáp lái khÃng rÃ trong khi cháy lánh APPEND (phá thÃm)"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2813
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "KhÃng thá gái thÆ: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2848
-#, c-format
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get message with message ID %s: %s"
-msgstr "KhÃng thá láy thÆ cÃ mÃ sá thÆ %s: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2849
-#| msgid "No such message"
-msgid "No such message available."
-msgstr "KhÃng cÃ thÆ nhÆ váy."
-
-#: ../camel/providers/imap/camel-imap-folder.c:2903
-#: ../camel/providers/imap/camel-imap-folder.c:3712
-#: ../camel/providers/nntp/camel-nntp-folder.c:239
-msgid "This message is not currently available"
-msgstr "ThÆ nÃy hián thái chÆa sán sÃng"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3538
-#, c-format
-msgid "Incomplete server response: no information provided for message %d"
-msgstr "TÃn hiáu trá lái chÆa hoÃn tát: chÆa nhán thÃng tin cho thÆ %d"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3546
-#, c-format
-msgid "Incomplete server response: no UID provided for message %d"
-msgstr "TÃn hiáu trá lái chÆa hoÃn tát: chÆa nhán UID cho thÆ %d"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3750
-msgid "Could not find message body in FETCH response."
-msgstr "KhÃng thá tÃm tháy phán thÃn thÆ trong tÃn hiáu trá lái FETCH (gái)"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:182
-#: ../camel/providers/imap/camel-imap-message-cache.c:246
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "KhÃng thá má thÆ mác nhá tám: %s"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:333
-#: ../camel/providers/imap/camel-imap-message-cache.c:390
-#: ../camel/providers/imap/camel-imap-message-cache.c:421
-#: ../camel/providers/imap/camel-imap-message-cache.c:453
-#, c-format
-msgid "Failed to cache message %s: %s"
-msgstr "Lái lÆu tám thÆ %s: %s"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:533
-#, c-format
-msgid "Failed to cache %s: %s"
-msgstr "Lái lÆu tám %s: %s"
-
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#| msgid "C_heck for new messages in all folders"
-msgid "Ch_eck for new messages in subscribed folders"
-msgstr "Kiám tr_a tÃm thÆ mái trÃn mái thÆ mác ÄÃ ÄÄng kÃ"
+"Ã_p dáng bá lác cho nháng thÆ mái nám trong thÆ mác INBOX (háp Äán) trÃn mÃy "
+"phác vá nÃy"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:50
-msgid "Namespace:"
-msgstr "Mián tÃn:"
+#: ../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 "_Kiám tra thÆ mái tÃm nái dung rÃc"
 
 #: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "Ã_p dáng bá lác vÃo nháng thÆ mái trong Háp Nhán trÃn mÃy phác vá nÃy"
+#: ../camel/providers/imapx/camel-imapx-provider.c:78
+msgid "Only check for Junk messages in the IN_BOX folder"
+msgstr "Chá kiám tra thÆ rÃc trong thÆ mác IN_BOX (háp Äán)"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
-msgid "Check new messages for Jun_k contents"
-msgstr "_Kiám tra thÆ mái tÃm nái dung rÃc"
-
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "_Tá Äáng Äáng bá hÃa thÆ tá xa mát cÃch Äáa phÆÆng"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../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 "MÃy phác vá IMAP %s"
+
+#: ../camel/providers/imap/camel-imap-provider.c:85
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
+#: ../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 "Äá Äác vÃ lÆu thÆ trÃn mÃy phác vá IMAP."
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "TÃy chán nÃy sá kát nái tái mÃy phác vá IMAP báng mát kháu thÃ (khÃng mát mÃ)."
-
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:214
-#, c-format
-msgid "IMAP server %s"
-msgstr "MÃy phác vá IMAP %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:439
-#: ../camel/providers/imap4/camel-imap4-store.c:216
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Dách vá IMAP cho %s trÃn %s"
-
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
-#: ../camel/providers/imap4/camel-imap4-store.c:251
-#: ../camel/providers/imap4/camel-imap4-store.c:266
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/nntp/camel-nntp-store.c:198
-#: ../camel/providers/pop3/camel-pop3-store.c:172
-#: ../camel/providers/pop3/camel-pop3-store.c:186
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
-#: ../camel/providers/smtp/camel-smtp-transport.c:275
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "KhÃng thá kát nái tái %s: %s"
+#: ../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 "Mát kháu"
 
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:252
-#: ../camel/providers/nntp/camel-nntp-store.c:184
-#: ../camel/providers/pop3/camel-pop3-store.c:173
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
-msgid "SSL unavailable"
-msgstr "KhÃng cÃ SSL"
+#: ../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 ""
+"TÃy chán nÃy sá kát nái tái mÃy phác vá IMAP báng mát kháu thÃ (khÃng mát "
+"mÃ)."
 
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
-msgid "Connection cancelled"
-msgstr "Kát nái bá háy bá"
+#. 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 "Háp nhán"
 
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
-#: ../camel/providers/imap4/camel-imap4-store.c:314
-#: ../camel/providers/imap4/camel-imap4-store.c:329
-#: ../camel/providers/imap4/camel-imap4-store.c:338
+#: ../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 "Lái kát nái tái mÃy phác vá IMAP %s trong chá Äá an toÃn: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/smtp/camel-smtp-transport.c:333
+#: ../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 "ChÆa há trá STARTTLS"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
-msgid "SSL negotiations failed"
-msgstr "ThÆÆng lÆáng SSL thát bái"
+#: ../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 "Lái kát nái tái mÃy phác vá IMAP %s trong chá Äá an toÃn: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:717
-#: ../camel/providers/imap4/camel-imap4-store.c:339
-#: ../camel/providers/smtp/camel-smtp-transport.c:372
+#: ../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 "PhiÃn bán xÃy dáng nÃy khÃng há trá giao thác SSL"
 
-#: ../camel/providers/imap/camel-imap-store.c:865
-#, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "KhÃng thá kát nái báng lánh \"%s\": %s"
-
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1408
-#: ../camel/providers/local/camel-maildir-folder.c:78
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:464
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
-msgid "Inbox"
-msgstr "Háp nhán"
-
-#: ../camel/providers/imap/camel-imap-store.c:1055
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "NhÃp"
-
-#: ../camel/providers/imap/camel-imap-store.c:1057
-msgid "Sent"
-msgstr "ÄÃ gái"
-
-#: ../camel/providers/imap/camel-imap-store.c:1059
-msgid "Templates"
-msgstr "Máu"
-
-#: ../camel/providers/imap/camel-imap-store.c:1304
+#: ../camel/providers/imap/camel-imap-store.c:709
+#: ../camel/providers/imapx/camel-imapx-server.c:3176
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "MÃy phác vá IMAP %s khÃng há trá kiáu xÃc thác ÄÆác yÃu cáu %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1314
-#: ../camel/providers/smtp/camel-smtp-transport.c:507
+#: ../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 "No support for authentication type %s"
 msgstr "KhÃng há trá kiáu xÃc thác %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1388
+#: ../camel/providers/imap/camel-imap-store.c:731
+#: ../camel/providers/smtp/camel-smtp-transport.c:363
+#, c-format
+msgid "Error creating SASL authentication object."
+msgstr "Lái táo Äái tÆáng xÃc thác SASL."
+
+#: ../camel/providers/imap/camel-imap-store.c:779
+#: ../camel/providers/imapx/camel-imapx-server.c:3234
+#, c-format
+msgid "You did not enter a password."
+msgstr "Bán chÆa nháp mát kháu."
+
+#: ../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"
@@ -3249,419 +3477,215 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
-#: ../camel/providers/imap4/camel-imap4-store.c:959
+#: ../camel/providers/imap/camel-imap-store.c:878
+#: ../camel/providers/imapx/camel-imapx-store.c:144
 #, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "TÃn thÆ mác Â %s Â khÃng háp lá vÃ cháa kÃ tá Â %c Â."
+msgid "IMAP server %s"
+msgstr "MÃy phác vá IMAP %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1978
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:204
-#: ../camel/providers/local/camel-mh-store.c:249
+#: ../camel/providers/imap/camel-imap-store.c:881
+#: ../camel/providers/imapx/camel-imapx-store.c:147
 #, c-format
-msgid "Cannot create folder '%s': folder exists."
-msgstr "KhÃng thá táo thÆ mác Â %s Â: thÆ mác ÄÃ cÃ."
+msgid "IMAP service for %s on %s"
+msgstr "Dách vá IMAP cho %s trÃn %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:2253
+#: ../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 "Unknown parent folder: %s"
-msgstr "ThÆ mác cha lá: %s"
+msgid "No such folder %s"
+msgstr "KhÃng cÃ thÆ mác %s"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:576
-#: ../camel/providers/imap4/camel-imap4-command.c:583
+#: ../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 "Failed sending command to IMAP server %s: %s"
-msgstr "Lái gái lánh Äán mÃy phác vá IMAP %s: %s"
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "TÃn thÆ mác Â %s Â khÃng háp lá vÃ cháa kÃ tá Â %c Â."
 
-#: ../camel/providers/imap4/camel-imap4-command.c:686
+#: ../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 "Unexpected response from IMAP4 server %s: %s"
-msgstr "TÃn hiáu trá lái khÃng mong Äái tá mÃy phác vá IMAP4 %s: %s"
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "ThÆ mác má khÃng ÄÆác phÃp cháa cÃc thÆ mác con"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:221
+#: ../camel/providers/imap/camel-imap-store.c:2103
+#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-mbox-store.c:424
+#: ../camel/providers/local/camel-mh-store.c:550
 #, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Lái chÃo máng khÃng mong Äái tá mÃy phác vá IMAP %s."
+msgid "Cannot create folder '%s': folder exists."
+msgstr "KhÃng thá táo thÆ mác Â %s Â: thÆ mác ÄÃ cÃ."
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:450
+#: ../camel/providers/imap/camel-imap-store.c:2458
+#: ../camel/providers/imapx/camel-imapx-store.c:1338
 #, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "KhÃng thá chán thÆ mác Â %s Â: tÃn háp thÆ sai"
+msgid "Unknown parent folder: %s"
+msgstr "ThÆ mác cha lá: %s"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:456
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "KhÃng thá chán thÆ mác Â %s Â: lánh sai"
+#: ../camel/providers/imap/camel-imap-store.c:3235
+#, fuzzy, c-format
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server unexpectedly disconnected"
+msgstr "MÃy chá ÄÃ ngát kát nái bát ngá: %s"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1433
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "Lái gái lánh Äán mÃy phác vá IMAP %s: %s"
+#: ../camel/providers/imap/camel-imap-store.c:3238
+#, fuzzy
+#| msgid "Server unexpectedly disconnected: %s"
+msgid "Server unexpectedly disconnected: "
+msgstr "MÃy chá ÄÃ ngát kát nái bát ngá: %s"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1435
-msgid "service unavailable"
-msgstr "dách vá khÃng sán sÃng"
+#: ../camel/providers/imapx/camel-imapx-folder.c:91
+#, fuzzy, c-format
+#| msgid "Could not load summary for %s"
+msgid "Could not create folder summary for %s"
+msgstr "KhÃng thá tái tÃm tát cho %s"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1569
-#: ../camel/providers/imap4/camel-imap4-engine.c:1608
-#: ../camel/providers/imap4/camel-imap4-engine.c:1653
-#: ../camel/providers/imap4/camel-imap4-engine.c:1709
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "MÃy phác vá IMAP4 %s ngát kát nái bát ngá: %s"
+#: ../camel/providers/imapx/camel-imapx-folder.c:99
+#, fuzzy, c-format
+#| msgid "Could not create cache file"
+msgid "Could not create cache for %s: "
+msgstr "KhÃng thá táo táp tin nhá tám"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Enable extended Mailing-List detection required for some filter and vFolder rules"
-msgstr "Hiáu lác khá nÄng phÃt hián Háp thÆ chung ÄÃ má ráng ÄÃi hái cho mát sá quy tác lác vÃ ThÆ mác áo"
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
+msgid "Use _Quick Resync if the server supports it"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:90
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "MÃn hán cÃc thÆ ÄÃ lÆu tám mÃ khÃng ÄÆác Äác trong vÃng X giÃy"
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use I_dle if the server supports it"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:91
-msgid "Expire cached messages older than X seconds"
-msgstr "MÃn hán cÃc thÆ ÄÃ lÆu tám mÃ cÅ hÆn X giÃy"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Command:"
+msgstr "Lánh:"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:432
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "KhÃng thá truy cáp Äán thÆ mác Â %s Â: %s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:491
-#, c-format
-#| msgid "Cannot sync flags to folder '%s': Unknown"
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "KhÃng thá Äáng bá cá vái thÆ mác Â %s Â: lái khÃng rÃ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:497
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "KhÃng thá Äáng bá cá vái thÆ mác Â %s Â: lánh sai"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:637
-#, c-format
-#| msgid "Cannot expunge folder '%s': Unknown"
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "KhÃng thá xoÃ hán thÆ mác Â %s Â: lái khÃng rÃ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:642
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "KhÃng thá xoÃ hán thÆ mác Â %s Â: lánh sai"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:898
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "KhÃng thá láy thÆ %s tá thÆ mác Â %s Â: khÃng co thÆ nhÆ váy"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:903
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "KhÃng thá láy thÆ Â %s Â tá thÆ mác Â %s Â: lánh sai"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:947
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "KhÃng thá phá thÃm thÆ vÃo thÆ mác Â %s Â vÃ thÆ mác chá cho phÃp Äác"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1040
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "KhÃng thá phá thÃm thÆ vÃo thÆ mác Â %s Â: khÃng biát sao"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1070
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "KhÃng thá phá thÃm thÆ vÃo thÆ mác Â %s Â: lánh sai"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1190
-#, c-format
-#| msgid "Cannot move messages from folder '%s' to folder '%s': Unknown"
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "KhÃng thá di chuyán thÆ tá thÆ mác Â %s Â sang thÆ mác Â %s Â: lái khÃng rÃ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-#| msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown"
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "KhÃng thá sao chÃp thÆ tá thÆ mác Â %s Â sang thÆ mác Â %s Â: lái khÃng rÃ"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1202
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "KhÃng thá di chuyán thÆ tá thÆ mác Â %s Â sang thÆ mác Â %s Â: lánh sai"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1206
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "KhÃng thá sao chÃp thÆ tá thÆ mác Â %s Â sang thÆ mác Â %s Â: lánh sai"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:56
-msgid "Check new messages for _Junk contents"
-msgstr "Kiám tra thÆ mái tÃm nái dung _rÃc"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "Chá kiám tra tÃm thÆ rÃc trong thÆ mác Háp nhán"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:67
-msgid "IMAP4rev1"
-msgstr "IMAPv4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:69
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "Äá Äác vÃ lÆu thÆ trÃn mÃy chá loái  IMAPv4rev1."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:86
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "TÃy chán nÃy sá kát nái tái mÃy phác vá IMAPv4rev1 báng mát kháu thÃ (khÃng mát mÃ)."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:263
-#: ../camel/providers/imapp/camel-imapp-store.c:249
-#: ../camel/providers/nntp/camel-nntp-store.c:195
-#: ../camel/providers/nntp/camel-nntp-store.c:214
-#: ../camel/providers/pop3/camel-pop3-store.c:183
-#: ../camel/providers/smtp/camel-smtp-transport.c:272
-msgid "Connection canceled"
-msgstr "Kát nái bá thÃi"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:300
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: Server does not support STARTTLS"
-msgstr "Lái kát nái tái mÃy phác vá IMAP %s trong chá Äá báo mát: mÃy phác vá khÃng há trá giao thác STARTTLS."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:330
-#: ../camel/providers/pop3/camel-pop3-store.c:251
-msgid "TLS negotiations failed"
-msgstr "Lái dÃn xáp TLS"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:415
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "KhÃng thá xÃc thác vái mÃy phác vá IMAP %s dÃng cÆ chá xÃc thác %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:538
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "KhÃng thá xÃc thác vái mÃy phác vá IMAP %s dÃng %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:701
-#: ../camel/providers/imap4/camel-imap4-store.c:969
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "KhÃng thá táo thÆ mác IMAP trong chá Äá ngoái tuyán."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:740
-#, c-format
-#| msgid "Cannot get folder '%s' on IMAP server %s: Unknown"
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "KhÃng thá láy thÆ mác Â %s Â trÃn mÃy phác vá IMAP %s: lái khÃng rÃ"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:821
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "KhÃng thá láy thÃng tin LIST (danh sÃch) cho Â %s Â trÃn mÃy phác vá IMAP %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:823
-#: ../camel/providers/imap4/camel-imap4-store.c:1579
-msgid "Bad command"
-msgstr "CÃu lánh sai"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "KhÃng thá táo thÆ mác Â %s Â: tÃn háp thÆ sai"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:907
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "KhÃng thá táo thÆ mác Â %s Â: lánh sai"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1013
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "KhÃng thá xoÃ thÆ mác Â %s Â: thÆ mác Äác biát"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1020
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "KhÃng thá xoÃ thÆ mác IMAP trong chá Äá ngoái tuyán."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "KhÃng thá xoÃ thÆ mác Â %s Â: tÃn háp thÆ khÃng háp lá"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1084
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "KhÃng thá xoÃ thÆ mác Â %s Â: lánh sai"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1104
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "KhÃng thá Äái tÃn thÆ mác Â %s Â sang Â %s Â: thÆ mác Äác biát"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1111
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "KhÃng thá Äái tÃn thÆ mác IMAP trong chá Äá ngoái tuyán"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "KhÃng thá Äái tÃn thÆ mác Â %s Â sang Â %s Â: tÃn háp thÆ khÃng háp lá"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1147
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "KhÃng thá Äái tÃn thÆ mác Â %s Â sang Â %s Â: lánh sai"
-
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1577
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "KhÃng thá gái thÃng tin %s cho máu Â %s Â trÃn mÃy phác vá IMAP %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1638
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "KhÃng thá ÄÄng kÃ vái thÆ mác IMAP trong chá Äá ngoái tuyán."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "KhÃng thá ÄÄng kÃ vái thÆ mác Â %s Â: tÃn háp thÆ khÃng háp lá"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1688
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "KhÃng thá ÄÄng kÃ vái thÆ mác Â %s Â: lánh sai"
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
+msgid "Namespace:"
+msgstr "Mián tÃn:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1710
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "KhÃng thá háy ÄÄng kÃ thÆ mác IMAP trong chá Äá ngoái tuyán."
+#: ../camel/providers/imapx/camel-imapx-provider.c:86
+msgid "Default IMAP port"
+msgstr ""
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "KhÃng thá háy ÄÄng kÃ vái thÆ mác Â %s Â: tÃn háp thÆ khÃng háp lá"
+#: ../camel/providers/imapx/camel-imapx-provider.c:94
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1760
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "KhÃng thá háy ÄÄng kÃ vái thÆ mác Â %s Â: lánh sai"
+#: ../camel/providers/imapx/camel-imapx-server.c:1504
+#, fuzzy
+#| msgid "Error writing mail temp file: %s"
+msgid "Error writing to cache stream: "
+msgstr "Lái ghi táp tin thÆ tám: %s"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1596
-msgid "Scanning for changed messages"
-msgstr "Äang quÃt tÃm cÃc thÆ thay Äái"
+#: ../camel/providers/imapx/camel-imapx-server.c:2214
+#, fuzzy, c-format
+#| msgid "Failed to authenticate.\n"
+msgid "Not authenticated"
+msgstr "Lái xÃc thác.\n"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1617
-#, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "MÃy phác vá IMAP %s á trong tÃnh tráng khÃng án Äánh."
+#: ../camel/providers/imapx/camel-imapx-server.c:3452
+#, fuzzy
+#| msgid "Posting failed: %s"
+msgid "Closing tmp stream failed: "
+msgstr "Gái thát bái: %s"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1644
-msgid "Fetching envelopes of new messages"
-msgstr "Äang láy cÃc bao cháa thÆ mái"
+#: ../camel/providers/imapx/camel-imapx-server.c:5490
+#: ../camel/providers/imapx/camel-imapx-server.c:5505
+#, fuzzy
+#| msgid "Cannot create message: %s"
+msgid "Cannot create spool file: "
+msgstr "KhÃng thá táo thÆ: %s"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:437
+#: ../camel/providers/imapx/camel-imapx-store.c:1115
+#: ../camel/providers/nntp/camel-nntp-store.c:1713
 #, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Hiáu bÃi khÃng mong Äái trong tÃn hiáu trá lái tá mÃy phác vá IMAP %s: "
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:460
-msgid "No data"
-msgstr "KhÃng cÃ dá liáu"
+msgid "No such folder: %s"
+msgstr "KhÃng cÃ thÆ mác nhÆ váy: %s"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:623
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "MÃy phác vá IMAP %s ÄÃ ngát kát nái bát ngá: %s"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
-msgid "Message storage"
-msgstr "Kho lÆu thÆ"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgid "Source stream returned no data"
 msgstr ""
-"áng dáng khÃch IMAP 4(.1) dáa trÃn thÃ nghiám\n"
-"ChÆa thá ra hay há trá mÃ nguán nÃy: bán hÃy sá dáng phiÃn bán IMAP thÆáng, thay vÃo Äiáu nÃy.\n"
-"\n"
-" !!! ÄáNG Sá DáNG TRÃNH NÃY Äá GáI/NHáN THÆ THáT !!!\n"
-
-#: ../camel/providers/imapp/camel-imapp-store.c:252
-#, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "KhÃng thá kát nái tái %s (cáng %s): %s"
-
-#: ../camel/providers/imapp/camel-imapp-store.c:349
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "KhÃng thá kát nái tái mÃy phác vá POP trÃn %s"
 
-#: ../camel/providers/local/camel-local-folder.c:176
-msgid "Index message body data"
-msgstr "Chá mác cÃc dá liáu trong phán thÃn thÆ"
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
+#, fuzzy, c-format
+#| msgid "service unavailable"
+msgid "Source stream unavailable"
+msgstr "dách vá khÃng sán sÃng"
 
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:392
+#: ../camel/providers/local/camel-local-folder.c:178
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:396
-#: ../camel/providers/local/camel-local-folder.c:399
-#, c-format
-msgid "mailbox:%s (%s)"
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
+#, fuzzy, c-format
+#| msgid "mailbox:%s (%s)"
+msgid "mailbox: %s (%s)"
 msgstr "Háp thÆ: %s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:403
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:473
+msgid "Index message body data"
+msgstr "Chá mác cÃc dá liáu trong phán thÃn thÆ"
+
+#: ../camel/providers/local/camel-local-folder.c:704
+#, fuzzy, c-format
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| "  %s"
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"KhÃng thá láy thÆ: %s tá thÆ mác %s\n"
+"  %s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "_DÃng táp tin tÃm tát thÆ mác Â .folders Â (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr "Thá mác thÆ vái dáng thác MH"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Äá lÆu thÆ các bá trong thÆ mác dáng MH."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid "Local delivery"
 msgstr "Gái các bá"
 
-#: ../camel/providers/local/camel-local-provider.c:74
-msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."
-msgstr "Äá gái (di Äáng) thÆ các bá tá hÃng Äái dáng mbox chuán vÃo thÆ mác do Evolution quán lÃ."
+#: ../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 ""
+"Äá gái (di Äáng) thÆ các bá tá hÃng Äái dáng mbox chuán vÃo thÆ mác do "
+"Evolution quán lÃ."
 
-#: ../camel/providers/local/camel-local-provider.c:88
+#: ../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 "Ã_p dáng bá lác vÃo thÆ mái trong háp ThÆ Äán"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:93
 msgid "Maildir-format mail directories"
 msgstr "ThÆ mác thÆ dáng thác Maildir"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:94
 msgid "For storing local mail in maildir directories."
 msgstr "Äá lÆu thÆ các bá trong thÆ mác maildir."
 
@@ -3674,215 +3698,249 @@ msgid "Standard Unix mbox spool file"
 msgstr "Táp tin hÃng Äái mbox UNIX chuán"
 
 #: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../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 ""
-"Äá Äác vÃ lÆu thÆ tÃn các bá trong táp tin hÃng Äái ÄÆác ghi bÃn ngoái theo Äánh dáng mbox.\n"
+"Äá Äác vÃ lÆu thÆ tÃn các bá trong táp tin hÃng Äái ÄÆác ghi bÃn ngoái theo "
+"Äánh dáng mbox.\n"
 "CÅng cÃ thá ÄÆác dÃng Äá Äác mát cÃy cÃc thÆ mác kiáu Elm, Pine, hay Mutt."
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:127
 msgid "Standard Unix mbox spool directory"
 msgstr "ThÆ mác hÃng Äái mbox UNIX chuán"
 
-#: ../camel/providers/local/camel-local-store.c:165
-#: ../camel/providers/local/camel-local-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:359
-#: ../camel/providers/local/camel-spool-store.c:129
+#: ../camel/providers/local/camel-local-store.c:92
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "KhÃng thá Äái tÃn thÆ mác %s thÃnh %s: %s"
+
+#: ../camel/providers/local/camel-local-store.c:204
+#, c-format
+msgid "Local mail file %s"
+msgstr "Táp tin thÆ các bá %s"
+
+#: ../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:542
+#: ../camel/providers/local/camel-spool-store.c:574
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Gác lÆu %s khÃng phái lÃ ÄÆáng dán tuyát Äái"
 
-#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:244
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Gác lÆu %s khÃng phái lÃ thÆ mác bÃnh thÆáng"
 
-#: ../camel/providers/local/camel-local-store.c:181
-#: ../camel/providers/local/camel-local-store.c:189
-#: ../camel/providers/local/camel-local-store.c:287
+#: ../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 "KhÃng thá gái thÆ mác: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:201
+#: ../camel/providers/local/camel-local-store.c:297
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Bá lÆu trá các bá chÆa cÃ thÆ mác Háp nhán"
 
-#: ../camel/providers/local/camel-local-store.c:247
-#, c-format
-msgid "Local mail file %s"
-msgstr "Táp tin thÆ các bá %s"
-
-#: ../camel/providers/local/camel-local-store.c:342
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "KhÃng thá Äái tÃn thÆ mác %s thÃnh %s: %s"
-
-#: ../camel/providers/local/camel-local-store.c:410
-#, c-format
-msgid "Could not rename '%s': %s"
-msgstr "KhÃng thá Äái tÃn '%s': %s"
-
 #: ../camel/providers/local/camel-local-store.c:435
-#: ../camel/providers/local/camel-mbox-store.c:300
+#: ../camel/providers/local/camel-mbox-store.c:716
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "KhÃng thá xoÃ táp tin chá mác thÆ mác Â %s Â: %s"
 
-#: ../camel/providers/local/camel-local-store.c:458
-#: ../camel/providers/local/camel-mbox-store.c:324
+#: ../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 "KhÃng thá xoÃ siÃu táp tin cáa thÆ mác Â %s Â: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:508
+#: ../camel/providers/local/camel-local-store.c:549
+#, c-format
+msgid "Could not rename '%s': %s"
+msgstr "KhÃng thá Äái tÃn '%s': %s"
+
+#: ../camel/providers/local/camel-local-summary.c:569
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "KhÃng thá thÃm thÆ vÃo báng tÃm tát: khÃng biát sao"
 
-#: ../camel/providers/local/camel-maildir-folder.c:222
-msgid "Maildir append message canceled"
-msgstr "ThÆ phá thÃm dáng Maildir bá thÃi"
+#: ../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 "KhÃng cÃ thÆ nhÆ váy"
 
-#: ../camel/providers/local/camel-maildir-folder.c:225
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
+#: ../camel/providers/local/camel-maildir-folder.c:223
+#, fuzzy, c-format
+#| msgid "Cannot append message to maildir folder: %s: %s"
+msgid "Cannot append message to maildir folder: %s: "
 msgstr "KhÃng thá phá thÃm thÆ vÃo thÆ mác Maildir: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:247
-#: ../camel/providers/local/camel-maildir-folder.c:274
-#: ../camel/providers/local/camel-maildir-folder.c:288
-#: ../camel/providers/local/camel-maildir-folder.c:297
-#: ../camel/providers/local/camel-mbox-folder.c:346
-#: ../camel/providers/local/camel-mbox-folder.c:398
-#: ../camel/providers/local/camel-mbox-folder.c:419
-#: ../camel/providers/local/camel-mbox-folder.c:450
-#: ../camel/providers/local/camel-mbox-folder.c:458
-#: ../camel/providers/local/camel-mh-folder.c:213
-#: ../camel/providers/local/camel-mh-folder.c:224
-#: ../camel/providers/local/camel-mh-folder.c:233
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
+#: ../camel/providers/local/camel-maildir-folder.c:271
+#: ../camel/providers/local/camel-maildir-folder.c:281
+#: ../camel/providers/local/camel-mbox-folder.c:386
+#: ../camel/providers/local/camel-mh-folder.c:168
+#: ../camel/providers/local/camel-mh-folder.c:178
+#, fuzzy, c-format
+#| msgid ""
+#| "Cannot get message: %s from folder %s\n"
+#| "  %s"
+msgid "Cannot get message %s from folder %s: "
 msgstr ""
 "KhÃng thá láy thÆ: %s tá thÆ mác %s\n"
 "  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:298
-msgid "Invalid message contents"
-msgstr "Nái dung thÆ khÃng háp lá"
+#: ../camel/providers/local/camel-maildir-folder.c:351
+#, fuzzy, c-format
+#| msgid "Cannot append message to maildir folder: %s: %s"
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "KhÃng thá phá thÃm thÆ vÃo thÆ mác Maildir: %s: %s"
+
+#: ../camel/providers/local/camel-maildir-store.c:100
+#, fuzzy, c-format
+#| msgid "Cannot create folder: %s: folder exists"
+msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+msgstr "KhÃng thá táo thÆ mác: %s: thÆ mác ÄÃ cÃ"
+
+#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../camel/providers/local/camel-maildir-store.c:728
+#, fuzzy, c-format
+#| msgid "Folder already exists"
+msgid "Folder %s already exists"
+msgstr "ThÆ mác ÄÃ cÃ"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:176
-#: ../camel/providers/local/camel-mbox-store.c:188
+#: ../camel/providers/local/camel-maildir-store.c:191
+#: ../camel/providers/local/camel-maildir-store.c:222
+#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:406
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "KhÃng thá táo thÆ mác Â %s Â: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:206
+#: ../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 "KhÃng thá láy thÆ mác Â %s Â: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:155
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:212
+#: ../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 "KhÃng thá láy thÆ mác Â %s Â: thÆ mác khÃng tán tái."
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:239
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "KhÃng thá láy thÆ mác Â %s Â: khÃng phái thÆ mác maildir."
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:293
+#: ../camel/providers/local/camel-maildir-store.c:333
+#: ../camel/providers/local/camel-mh-store.c:652
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "KhÃng thá xoÃ thÆ mác Â %s Â: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:295
 msgid "not a maildir directory"
 msgstr "khÃng phái lÃ thÆ mác dáng Maildir"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:331
-#: ../camel/providers/local/camel-spool-store.c:345
+#: ../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 "KhÃng thá quÃt thÆ mác Â %s Â: %s"
 
+#: ../camel/providers/local/camel-maildir-store.c:719
+#, fuzzy, c-format
+#| msgid "Cannot create folder: %s: folder exists"
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr "KhÃng thá táo thÆ mác: %s: thÆ mác ÄÃ cÃ"
+
 #: ../camel/providers/local/camel-maildir-summary.c:439
-#: ../camel/providers/local/camel-maildir-summary.c:558
+#: ../camel/providers/local/camel-maildir-summary.c:571
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "KhÃng thá má ÄÆáng dán thÆ mác dáng Maildir: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:562
 msgid "Checking folder consistency"
 msgstr "Äang kiám tra tÃnh nhát quÃn cáa thÆ mác"
 
-#: ../camel/providers/local/camel-maildir-summary.c:656
+#: ../camel/providers/local/camel-maildir-summary.c:655
 msgid "Checking for new messages"
 msgstr "Äang kiám tra tÃm thÆ mái"
 
-#: ../camel/providers/local/camel-maildir-summary.c:742
-#: ../camel/providers/local/camel-mbox-summary.c:529
-#: ../camel/providers/local/camel-mbox-summary.c:711
-#: ../camel/providers/local/camel-mbox-summary.c:831
-#: ../camel/providers/local/camel-spool-summary.c:148
+#: ../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 "Äang lÆu thÆ mác"
 
-#: ../camel/providers/local/camel-mbox-folder.c:159
-#: ../camel/providers/local/camel-spool-folder.c:150
-#, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "KhÃng thá táo khÃa thÆ mác trÃn %s: %s"
-
-#: ../camel/providers/local/camel-mbox-folder.c:220
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
+#: ../camel/providers/local/camel-mbox-folder.c:183
+#, fuzzy, c-format
+#| msgid "Cannot open mailbox: %s: %s\n"
+msgid "Cannot open mailbox: %s: "
 msgstr "KhÃng thá má háp thÆ: %s: %s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:281
-msgid "Mail append canceled"
-msgstr "Phá thÃm thÆ bá thÃi"
-
-#: ../camel/providers/local/camel-mbox-folder.c:284
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
+#: ../camel/providers/local/camel-mbox-folder.c:249
+#, fuzzy, c-format
+#| msgid "Cannot append message to mbox file: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
 msgstr "KhÃng thá phá thÃm thÆ vÃo táp tin mbox: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:451
+#: ../camel/providers/local/camel-mbox-folder.c:378
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "ThÆ mác nÃy cÃ vá ÄÃ bá hÆ vÃ khÃng thá ÄÆác phác hái."
 
-#: ../camel/providers/local/camel-mbox-folder.c:459
-#: ../camel/providers/local/camel-mh-folder.c:234
-msgid "Message construction failed."
-msgstr "Lái táo dáng thÆ."
+#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../camel/providers/local/camel-spool-folder.c:71
+#, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "KhÃng thá táo khÃa thÆ mác trÃn %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:166
-#: ../camel/providers/local/camel-mbox-store.c:365
+#: ../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 "KhÃng thá táo thÆ mác vái tÃn ÄÃ"
 
-#: ../camel/providers/local/camel-mbox-store.c:198
+#: ../camel/providers/local/camel-mbox-store.c:417
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "KhÃng thá láy thÆ mác Â %s Â: khÃng phái lÃ táp tin bÃnh thÆáng."
 
-#: ../camel/providers/local/camel-mbox-store.c:228
-#: ../camel/providers/local/camel-mbox-store.c:239
-#: ../camel/providers/local/camel-mbox-store.c:262
+#: ../camel/providers/local/camel-mbox-store.c:566
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "KhÃng thá táo thÆ mác Â %s Â: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:582
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "KhÃng thá táo thÆ mác: %s: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:584
+msgid "Folder already exists"
+msgstr "ThÆ mác ÄÃ cÃ"
+
+#: ../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"
@@ -3891,164 +3949,157 @@ msgstr ""
 "KhÃng thá xoÃ thÆ mác Â %s Â:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:247
+#: ../camel/providers/local/camel-mbox-store.c:650
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "Â %s Â khÃng phái lÃ táp tin bÃnh thÆáng."
 
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:659
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "ThÆ mác Â %s Â khÃng ráng nÃn chÆa xoÃ."
 
-#: ../camel/providers/local/camel-mbox-store.c:276
-#: ../camel/providers/local/camel-mbox-store.c:288
+#: ../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 "KhÃng thá xoÃ táp tin tÃm tát thÆ mác Â %s Â: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:378
-#, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "KhÃng thá táo thÆ mác Â %s Â: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:783
 #, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "KhÃng thá táo thÆ mác: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:394
-msgid "Folder already exists"
-msgstr "ThÆ mác ÄÃ cÃ"
-
-#: ../camel/providers/local/camel-mbox-store.c:485
 msgid "The new folder name is illegal."
 msgstr "TÃn thÆ mác mái khÃng ÄÆác phÃp"
 
-#: ../camel/providers/local/camel-mbox-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:799
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "KhÃng thá Äái tÃn Â %s Â: Â %s Â: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:579
+#: ../camel/providers/local/camel-mbox-store.c:882
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "KhÃng thá Äái tÃn Â %s Â thÃnh %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:535
+#: ../camel/providers/local/camel-mbox-summary.c:495
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "KhÃng thá má thÆ mác: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:585
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
+#: ../camel/providers/local/camel-mbox-summary.c:556
+#, fuzzy, c-format
+#| msgid "Fatal mail parser error near position %ld in folder %s"
+msgid "Fatal mail parser error near position %s in folder %s"
 msgstr "Lái nghiÃm tráng khi phÃn tÃch thÆ gán vá trÃ %ld trong thÆ mác %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:648
+#: ../camel/providers/local/camel-mbox-summary.c:645
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "KhÃng thá kiám tra thÆ mác: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:716
-#: ../camel/providers/local/camel-mbox-summary.c:836
-#: ../camel/providers/local/camel-spool-summary.c:153
+#: ../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 "KhÃng thá má táp tin: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:728
-#: ../camel/providers/local/camel-spool-summary.c:166
+#: ../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 "KhÃng thá má háp thÆ tám: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:741
-#: ../camel/providers/local/camel-mbox-summary.c:945
+#: ../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 "KhÃng thá ÄÃng thÆ mác nguán %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:750
+#: ../camel/providers/local/camel-mbox-summary.c:772
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "KhÃng thá ÄÃng thÆ mác tám: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:765
+#: ../camel/providers/local/camel-mbox-summary.c:789
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "KhÃng thá Äái tÃn thÆ mác: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-mbox-summary.c:1075
+#: ../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 "KhÃng thá lÆu thÆ mác: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:886
-#: ../camel/providers/local/camel-mbox-summary.c:894
-#: ../camel/providers/local/camel-mbox-summary.c:1105
-#: ../camel/providers/local/camel-mbox-summary.c:1113
+#: ../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 "
+"it.)"
+msgstr ""
+
+#: ../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 "Bán tÃm tát vÃ thÆ mác khÃng tÆÆng áng vái nhau, ngay cá sau khi Äáng bá"
+msgstr ""
+"Bán tÃm tát vÃ thÆ mác khÃng tÆÆng áng vái nhau, ngay cá sau khi Äáng bá"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1038
-#: ../camel/providers/local/camel-spool-summary.c:334
+#: ../camel/providers/local/camel-mbox-summary.c:1099
+#: ../camel/providers/local/camel-spool-summary.c:343
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Lái khÃng rÃ : %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1181
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../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 "Lái ghi vÃo háp thÆ tám: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1282
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Lái ghi vÃo háp thÆ tám: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:178
-msgid "MH append message canceled"
-msgstr "ThÆ phá thÃm dáng MH bá thÃi"
-
-#: ../camel/providers/local/camel-mh-folder.c:181
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
+#: ../camel/providers/local/camel-mh-folder.c:115
+#, fuzzy, c-format
+#| msgid "Cannot append message to mh folder: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
 msgstr "KhÃng thá phá thÃm thÆ vÃo thÆ mác dáng MH: %s: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:525
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "KhÃng thá táo thÆ mác Â %s Â: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:542
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "KhÃng thá láy thÆ mác Â %s Â: khÃng phái lÃ thÆ mác."
 
-#: ../camel/providers/local/camel-mh-summary.c:264
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "KhÃng thá má ÄÆáng dán thÆ mác dáng MH: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:135
+#: ../camel/providers/local/camel-spool-store.c:350
 #, c-format
-msgid "Spool '%s' cannot be opened: %s"
-msgstr "KhÃng thá má hÃng Äái ghi Â %s Â: %s"
+msgid "Spool mail file %s"
+msgstr "Táp tin thÆ tÃn hÃng Äái ghi %s"
 
-#: ../camel/providers/local/camel-spool-store.c:147
+#: ../camel/providers/local/camel-spool-store.c:353
 #, c-format
-msgid "Spool '%s' is not a regular file or directory"
-msgstr "HÃng Äái ghi Â %s Â khÃng phái lÃ táp tin hay thÆ mác bÃnh thÆáng"
+msgid "Spool folder tree %s"
+msgstr "CÃy thÆ mác hÃng Äái ghi %s"
 
-#: ../camel/providers/local/camel-spool-store.c:166
+#: ../camel/providers/local/camel-spool-store.c:394
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "ThÆ mác Â %s/%s Â khÃng tán tái"
 
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:408
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4057,12 +4108,12 @@ msgstr ""
 "KhÃng thá má thÆ mác Â %s Â:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:180
+#: ../camel/providers/local/camel-spool-store.c:414
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "ThÆ mác Â %s Â khÃng tán tái."
 
-#: ../camel/providers/local/camel-spool-store.c:185
+#: ../camel/providers/local/camel-spool-store.c:421
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4071,115 +4122,172 @@ msgstr ""
 "KhÃng thá táo thÆ mác Â %s Â\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:193
+#: ../camel/providers/local/camel-spool-store.c:433
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "Â %s Â khÃng phái lÃ táp tin háp thÆ."
 
-#: ../camel/providers/local/camel-spool-store.c:210
+#: ../camel/providers/local/camel-spool-store.c:481
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "Store khÃng há trá háp ThÆ Äán"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:495
 #, c-format
-msgid "Spool mail file %s"
-msgstr "Táp tin thÆ tÃn hÃng Äái ghi %s"
+msgid "Spool folders cannot be deleted"
+msgstr "KhÃng thá xoÃ thÆ mác hÃng Äái ghi"
 
-#: ../camel/providers/local/camel-spool-store.c:222
+#: ../camel/providers/local/camel-spool-store.c:510
 #, c-format
-msgid "Spool folder tree %s"
-msgstr "CÃy thÆ mác hÃng Äái ghi %s"
-
-#: ../camel/providers/local/camel-spool-store.c:230
 msgid "Spool folders cannot be renamed"
 msgstr "KhÃng thá thay Äái tÃn cáa thÆ mác hÃng Äái ghi"
 
-#: ../camel/providers/local/camel-spool-store.c:238
-msgid "Spool folders cannot be deleted"
-msgstr "KhÃng thá xoÃ thÆ mác hÃng Äái ghi"
+#: ../camel/providers/local/camel-spool-store.c:583
+#, c-format
+msgid "Spool '%s' cannot be opened: %s"
+msgstr "KhÃng thá má hÃng Äái ghi Â %s Â: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:179
-#: ../camel/providers/local/camel-spool-summary.c:189
-#: ../camel/providers/local/camel-spool-summary.c:199
+#: ../camel/providers/local/camel-spool-store.c:599
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
+msgid "Spool '%s' is not a regular file or directory"
+msgstr "HÃng Äái ghi Â %s Â khÃng phái lÃ táp tin hay thÆ mác bÃnh thÆáng"
+
+#: ../camel/providers/local/camel-spool-summary.c:169
+#: ../camel/providers/local/camel-spool-summary.c:181
+#: ../camel/providers/local/camel-spool-summary.c:193
+#, fuzzy, c-format
+#| msgid "Could not sync temporary folder %s: %s"
+msgid "Could not synchronize temporary folder %s: %s"
 msgstr "KhÃng thá Äáng bá thÆ mác tám %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:215
-#, c-format
-msgid "Could not sync spool folder %s: %s"
+#: ../camel/providers/local/camel-spool-summary.c:211
+#, fuzzy, c-format
+#| msgid "Could not sync spool folder %s: %s"
+msgid "Could not synchronize spool folder %s: %s"
 msgstr "KhÃng thá Äáng bá hoÃ thÆ mác hÃng Äái ghi: %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:246
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:274
-#, c-format
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
+#, fuzzy, c-format
+#| msgid ""
+#| "Could not sync spool folder %s: %s\n"
+#| "Folder may be corrupt, copy saved in '%s'"
 msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
 "KhÃng thá Äáng bá hoÃ thÆ mác hÃng Äái ghi %s: %s\n"
 "CÃ lá thÆ mác bá hÆ; bán sao ÄÆác lÆu trong Â %s Â"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:137
-#: ../camel/providers/nntp/camel-nntp-folder.c:195
-#: ../camel/providers/nntp/camel-nntp-folder.c:227
+#: ../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 "Lái nái bá : UID cÃ Äánh dáng khÃng háp lá: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:371
-#: ../camel/providers/nntp/camel-nntp-folder.c:413
-#: ../camel/providers/nntp/camel-nntp-folder.c:415
+#: ../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 "KhÃng thá láy thÆ %s: %s"
+
+#: ../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
+#, fuzzy, c-format
+#| msgid "Cannot get message %s: %s"
+msgid "Cannot get message %s: "
+msgstr "KhÃng thá láy thÆ %s: %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 "Gái thát bái: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:433
+#: ../camel/providers/nntp/camel-nntp-folder.c:556
+#, fuzzy
+#| msgid "Posting failed: %s"
+msgid "Posting failed: "
+msgstr "Gái thát bái: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:585
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Bán khÃng thá gái thÆ NNTP (nhÃm tin Máng) khi ngoái tuyán."
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:444
+#: ../camel/providers/nntp/camel-nntp-folder.c:605
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "KhÃng thá sao chÃp thÆ tá thÆ mác NNTP (nhÃm tin Máng)."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
-msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+#: ../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 "_Hián thÆ mác kiáu ngán gán (v.d. c.o.linux thay vÃ comp.os.linux)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "Trong háp thoái ÄÄng _kÃ, hián thá tÃn thÆ mác tÆÆng Äái"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../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 "Tin tác USENET"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:61
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "ÄÃy lÃ bá cung cáp Äác tá vÃ gái thÆ tái cÃc nhÃm tin USENET."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
-msgid "This option will authenticate with the NNTP server using a plaintext password."
-msgstr "TÃy chán nÃy sá xÃc thác vái mÃy phác vá NNTP báng mát kháu thÃ (khÃng mÃ hÃa)"
+#: ../camel/providers/nntp/camel-nntp-provider.c:82
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"TÃy chán nÃy sá xÃc thác vái mÃy phác vá NNTP báng mát kháu thÃ (khÃng mÃ "
+"hÃa)"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:217
+#: ../camel/providers/nntp/camel-nntp-store.c:97
 #, c-format
-msgid "Could not read greeting from %s: %s"
+msgid "Authentication requested but no username provided"
+msgstr "Cán xÃc thác nhÆng khÃng ÄÆác cung cáp tÃn ngÆái dÃng"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:109
+#, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "KhÃng thá xÃc thác vái mÃy phác vá: %s"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:357
+#, fuzzy, c-format
+#| msgid "Could not read greeting from %s: %s"
+msgid "Could not read greeting from %s: "
 msgstr "KhÃng thá Äác lái chÃo máng tá %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:229
+#: ../camel/providers/nntp/camel-nntp-store.c:370
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "MÃy phác vá NNTP Â %s Â trá vá mÃ lái %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:406
+#: ../camel/providers/nntp/camel-nntp-store.c:528
 #, c-format
 msgid "USENET News via %s"
 msgstr "Tin tác USENET thÃng qua %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:798
+#: ../camel/providers/nntp/camel-nntp-store.c:1060
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4190,7 +4298,23 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:892
+#: ../camel/providers/nntp/camel-nntp-store.c:1153
+#, c-format
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr "Bán khÃng thá táo thÆ mác trong kho tin tác: hÃy ÄÄng kÃ thay vÃo ÄÃ."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1169
+#, c-format
+msgid "You cannot rename a folder in a News store."
+msgstr "KhÃng thá Äái tÃn thÆ mác trong kho tin tác."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#, c-format
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr "KhÃng thá loái bá thÆ mác trong kho tin tác: hÃy ÄÄng kÃ thay vÃo ÄÃ."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1338
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4200,7 +4324,8 @@ msgstr ""
 "\n"
 "KhÃng cÃ nhÃm tin nhÆ váy. Mác ÄÆác chán cÃ lá lÃ thÆ mác má."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:924
+#: ../camel/providers/nntp/camel-nntp-store.c:1389
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4210,1108 +4335,1951 @@ msgstr ""
 "\n"
 "KhÃng cÃ nhÃm tin nhÆ váy!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:949
-msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "Bán khÃng thá táo thÆ mác trong kho tin tác: hÃy ÄÄng kÃ thay vÃo ÄÃ."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:957
-msgid "You cannot rename a folder in a News store."
-msgstr "KhÃng thá Äái tÃn thÆ mác trong kho tin tác."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:965
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "KhÃng thá loái bá thÆ mác trong kho tin tác: hÃy ÄÄng kÃ thay vÃo ÄÃ."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1154
-msgid "Authentication requested but no username provided"
-msgstr "Cán xÃc thác nhÆng khÃng ÄÆác cung cáp tÃn ngÆái dÃng"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1166
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "KhÃng thá xÃc thác vái mÃy phác vá: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1289
-#, c-format
-msgid "NNTP Command failed: %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1582
+#, fuzzy
+#| msgid "NNTP Command failed: %s"
+msgid "NNTP Command failed: "
 msgstr "Lái lánh NNTP: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1343
+#: ../camel/providers/nntp/camel-nntp-store.c:1656
+#, c-format
 msgid "Not connected."
 msgstr "ChÆa kát nái."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1396
-#, c-format
-msgid "No such folder: %s"
-msgstr "KhÃng cÃ thÆ mác nhÆ váy: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:271
-#: ../camel/providers/nntp/camel-nntp-summary.c:364
+#: ../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: Äang quÃt tÃm thÆ mái"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:278
+#: ../camel/providers/nntp/camel-nntp-summary.c:256
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "TÃn hiáu trá lái khÃng mong Äái tá xover: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:378
+#: ../camel/providers/nntp/camel-nntp-summary.c:374
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "TÃn hiáu trá lái khÃng mong Äái tá Äáu (head): %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
-msgid "Use cancel"
-msgstr "HÃy sá dáng ThÃi"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:416
+#: ../camel/providers/nntp/camel-nntp-summary.c:419
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Thao tÃc thát bái: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../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 "KhÃng cÃ thÆ vái UID %s"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:352
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "Äang gái thÆ POP %d"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:432
+msgid "Unknown reason"
+msgstr "KhÃng biát sao"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:472
 msgid "Retrieving POP summary"
 msgstr "Äang gái bán tÃm tát POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
-#, 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 "KhÃng thá gái bán tÃm tát POP: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:557
 msgid "Expunging old messages"
 msgstr "Äang xÃa hán cÃc thÆ cÅ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:569
 msgid "Expunging deleted messages"
 msgstr "Äang xÃa hán cÃc thÆ bá xÃa bá"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
-#, c-format
-msgid "No message with UID %s"
-msgstr "KhÃng cÃ thÆ vái UID %s"
-
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Äang gái thÆ POP %d"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-msgid "Unknown reason"
-msgstr "KhÃng biát sao"
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
+#, fuzzy
+#| msgid "Message storage"
+msgid "Message Storage"
+msgstr "Kho lÆu thÆ"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "Äá cÃc thÆ trÃn _mÃy phác vá"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#. 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
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "_XoÃ sau %s ngÃy"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
 msgstr "Tát há trá mái phán má ráng _POP3"
 
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Default POP3 port"
+msgstr ""
+
 #: ../camel/providers/pop3/camel-pop3-provider.c:55
+msgid "POP3 over SSL"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:64
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Äá kát nái vÃ tái thÆ vá tá mÃy phác vá POP."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
-msgstr "TÃy chán nÃy sá kát nái tái mÃy phác vá POP dÃng mát kháu thÃ (khÃng mÃ hÃa). ÄÃy lÃ tÃy chán duy nhát ÄÆác há trá bái nhiáu mÃy phác vá POP."
+#: ../camel/providers/pop3/camel-pop3-provider.c:83
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+"TÃy chán nÃy sá kát nái tái mÃy phác vá POP dÃng mát kháu thÃ (khÃng mÃ "
+"hÃa). ÄÃy lÃ tÃy chán duy nhát ÄÆác há trá bái nhiáu mÃy phác vá POP."
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:93
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+"TÃy chán nÃy sá kát nái tái mÃy phác vá POP dÃng mát kháu ÄÃ mÃ hoÃ thÃng "
+"qua giao thác APOP. CÃ thá sá khÃng hoát Äáng cho mái ngÆái dÃng, ká cá trÃn "
+"mÃy chá tuyÃn bá cÃ há trá."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:84
-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 "TÃy chán nÃy sá kát nái tái mÃy phác vá POP dÃng mát kháu ÄÃ mÃ hoÃ thÃng qua giao thác APOP. CÃ thá sá khÃng hoát Äáng cho mái ngÆái dÃng, ká cá trÃn mÃy chá tuyÃn bá cÃ há trá."
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:83
+msgid ": "
+msgstr ""
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#: ../camel/providers/pop3/camel-pop3-store.c:130
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Lái Äác lái chÃo máng háp lá tá mÃy phác vá POP %s."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:226
-#: ../camel/providers/pop3/camel-pop3-store.c:240
-#: ../camel/providers/pop3/camel-pop3-store.c:250
-#: ../camel/providers/pop3/camel-pop3-store.c:256
+#: ../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 "Lái kát nái tái mÃy phác vá POP %s trong chá Äá an toÃn: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:227
+#: ../camel/providers/pop3/camel-pop3-store.c:151
 msgid "STLS not supported by server"
 msgstr "MÃy phác vá khÃng há trá STLS"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:257
-msgid "TLS is not available in this build"
-msgstr "PhiÃn bán xÃy dáng nÃy khÃng há trá giao thác TLS"
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:169
+#, 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%s"
+msgstr "Lái kát nái tái mÃy phác vá POP %s trong chá Äá an toÃn: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:363
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "KhÃng thá kát nái tái mÃy phác vá POP %s"
+#: ../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 "Lái kát nái tái mÃy phác vá POP %s trong chá Äá an toÃn: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:404
-#: ../camel/providers/pop3/camel-pop3-store.c:537
-#, c-format
-msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
-msgstr "KhÃng thá kát nái tái mÃy phác vá POP %s: KhÃng há trá cÆ chá xÃc thác yÃu cáu."
+#: ../camel/providers/pop3/camel-pop3-store.c:190
+msgid "TLS is not available in this build"
+msgstr "PhiÃn bán xÃy dáng nÃy khÃng há trá giao thác TLS"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:420
+#: ../camel/providers/pop3/camel-pop3-store.c:241
+#: ../camel/providers/pop3/camel-pop3-store.c:414
 #, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
+msgid ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
+msgstr ""
+"KhÃng thá kát nái tái mÃy phác vá POP %s: KhÃng há trá cÆ chá xÃc thác yÃu "
+"cáu."
+
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:269
+#, fuzzy, c-format
+#| msgid "SASL '%s' Login failed for POP server %s: %s"
+msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "ÄÄng nháp SASL Â %s Â thát bái vái mÃy phác vá POP %s: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:432
+#: ../camel/providers/pop3/camel-pop3-store.c:286
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "KhÃng thá ÄÄng nháp vÃo mÃy phác vá POP %s: lái giao thác SASL"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:451
-#, c-format
-msgid "Failed to authenticate on POP server %s: %s"
+#: ../camel/providers/pop3/camel-pop3-store.c:308
+#, fuzzy, c-format
+#| msgid "Failed to authenticate on POP server %s: %s"
+msgid "Failed to authenticate on POP server %s: "
 msgstr "KhÃng thá xÃc thác tái mÃy phác vá POP: %s: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:510
-#, c-format
-msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your admin."
-msgstr "KhÃng thá kát nái tái mÃy phác vá POP %s:\tNhán ÄÆác mÃ nhán dián APOP khÃng háp lá: cÃ thá bá tán cÃng kiáu máo nhán lÃ ngÆái dÃng háp lá. HÃy liÃn lác vái quán trá."
-
-#: ../camel/providers/pop3/camel-pop3-store.c:551
-#: ../camel/providers/pop3/camel-pop3-store.c:564
+#: ../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 ""
+"KhÃng thá kát nái tái mÃy phác vá POP %s:\tNhán ÄÆác mÃ nhán dián APOP khÃng "
+"háp lá: cÃ thá bá tán cÃng kiáu máo nhán lÃ ngÆái dÃng háp lá. HÃy liÃn lác "
+"vái quán trá."
+
+#: ../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 ""
 "KhÃng thá kát nái tái mÃy phác vá POP %s.\n"
 "Lái gái mát kháu: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:558
-#, c-format
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:437
+#, fuzzy, c-format
+#| msgid ""
+#| "Unable to connect to POP server %s.\n"
+#| "Error sending username: %s"
 msgid ""
 "Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending username%s"
 msgstr ""
 "KhÃng thá kát nái tái mÃy phác vá POP %s.\n"
 "Lái gái tÃn ngÆái dÃng: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:671
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:449
+#, 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"
+msgstr ""
+"KhÃng thá kát nái tái mÃy phác vá POP %s.\n"
+"Lái gái mát kháu: %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:492
+#, fuzzy, c-format
+#| msgid "IMAP server %s"
+msgid "POP3 server %s"
+msgstr "MÃy phác vá IMAP %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#, fuzzy, c-format
+#| msgid "IMAP service for %s on %s"
+msgid "POP3 server for %s on %s"
+msgstr "Dách vá IMAP cho %s trÃn %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:626
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "KhÃng thá kát nái tái mÃy phác vá POP %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:653
 #, c-format
 msgid "No such folder '%s'."
 msgstr "KhÃng cÃ thÆ mác nhÆ váy Â %s Â."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:670
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr ""
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
-msgstr "Äá gái thÆ báng cÃch chuyán nÃ cho chÆÆng trÃnh sendmail trÃn há tháng Äáa phÆÆng."
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+"Äá gái thÆ báng cÃch chuyán nÃ cho chÆÆng trÃnh sendmail trÃn há tháng Äáa "
+"phÆÆng."
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "Gái thÆ thÃng qua chÆÆng trÃnh sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:115
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#, c-format
 msgid "Could not parse recipient list"
 msgstr "KhÃng thá phÃn tÃch danh sÃch ngÆái nhán"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:146
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "KhÃng thá táo áng dán tái trÃnh sendmail: %s: chÆa gái thÆ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:167
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "KhÃng thá táo tián trÃnh sendmail mái: %s: chÆa gái thÆ"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:237
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#, fuzzy
+#| msgid "Could not send message: %s"
+msgid "Could not send message: "
+msgstr "KhÃng thá gái thÆ: %s"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "TrÃnh sendmail ÄÃ thoÃt vái tÃn hiáu %s: chÆa gái thÆ."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:244
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "KhÃng thá thác hián %s: chÆa gái thÆ."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:249
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "TrÃnh sendmail ÄÃ thoÃt vái tráng thÃi %d: chÆa gái thÆ."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
-msgid "sendmail"
-msgstr "sendmail"
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
+msgid "Default SMTP port"
+msgstr ""
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:265
-msgid "Mail delivery via the sendmail program"
-msgstr "Gái thÆ thÃng qua chÆÆng trÃnh sendmail"
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#, fuzzy
+#| msgid "SMTP server %s"
+msgid "SMTP over SSL"
+msgstr "MÃy phác vá SMTP %s"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:44
+msgid "Message submission port"
+msgstr ""
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:39
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "Äá gái thÆ báng cÃch kát nái tái thiát bá trung tÃm máng thÆ tá xa dÃng SMTP."
+msgstr ""
+"Äá gái thÆ báng cÃch kát nái tái thiát bá trung tÃm máng thÆ tá xa dÃng SMTP."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:149
+#: ../camel/providers/smtp/camel-smtp-transport.c:156
+#, fuzzy
+#| msgid "Welcome response error"
+msgid "Welcome response error: "
+msgstr "Lái hái ÄÃp chÃo máng"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "KhÃng thá kát nái tái mÃy phác vá SMTP %s trong chá Äá báo mát: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:220
+#, fuzzy
+#| msgid "STARTTLS command failed: %s"
+msgid "STARTTLS command failed: "
+msgstr "Lái lánh STARTTLS: %s"
+
+#: ../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 "KhÃng thá kát nái tái mÃy phác vá SMTP %s trong chá Äá báo mát: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:283
+#, c-format
+msgid "SMTP server %s"
+msgstr "MÃy phác vá SMTP %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:287
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "Gái thÆ (SMTP) thÃng qua %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:338
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
+msgstr "MÃy phác vá SMTP %s khÃng há trá kiáu xÃc thác yÃu cáu %s."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:440
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"KhÃng thá xÃc thác vái mÃy phác vá SMTP.\n"
+"%s\n"
+"\n"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:557
+#, c-format
+msgid "Cannot send message: service not connected."
+msgstr "KhÃng thá gái thÆ: chÆa kát nái dách vá."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:564
+#, c-format
+msgid "Cannot send message: sender address not valid."
+msgstr "KhÃng thá gái thÆ: Äáa chá ngÆái gái khÃng háp lá."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:568
+msgid "Sending message"
+msgstr "Äang gái thÆ"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:593
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "KhÃng thá gái thÆ: chÆa gÃ ngÆái nhán."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:606
+#, c-format
+msgid "Cannot send message: one or more invalid recipients"
+msgstr "KhÃng thá gái thÆ: cÃ mát hoác vÃi ngÆái nhán khÃng háp lá"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:709
 msgid "Syntax error, command unrecognized"
 msgstr "Lái cÃ phÃp, khÃng nhán ra lánh"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Syntax error in parameters or arguments"
 msgstr "Lái cÃ phÃp trong tham sá hoác Äái sá"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Command not implemented"
 msgstr "Lánh chÆa ÄÆác thi cÃng"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:715
 msgid "Command parameter not implemented"
 msgstr "Tham sá lánh chÆa ÄÆác thi cÃng"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:717
 msgid "System status, or system help reply"
 msgstr "Tráng thÃi há tháng, hoác trá lái trá giÃp há tháng"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:719
 msgid "Help message"
 msgstr "ThÆ trá giÃp"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:721
 msgid "Service ready"
 msgstr "Dách vá sán sÃng"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
 msgid "Service closing transmission channel"
 msgstr "Dách vá Äang ÄÃng kÃnh truyán"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
 msgid "Service not available, closing transmission channel"
 msgstr "Dách vá chÆa sán sÃng, Äang ÄÃng kÃnh truyán thÃng"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
 msgid "Requested mail action okay, completed"
 msgstr "HÃnh Äáng thÆ tÃn yÃu cáu ÄÃ xong"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:729
 msgid "User not local; will forward to <forward-path>"
 msgstr "KhÃng phái ngÆái dÃng các bá; Äang chuyán tiáp tái <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "KhÃng thác hián hÃnh Äáng thÆ tÃn yÃu cáu: háp thÆ khÃng sán sÃng"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:733
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "KhÃng thác hián hÃnh Äáng yÃu cáu: háp thÆ khÃng sán sÃng"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:194
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
 msgid "Requested action aborted: error in processing"
 msgstr "ÄÃ ngáng hÃnh Äáng yÃu cáu: lái khi thác hián"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
 msgid "User not local; please try <forward-path>"
 msgstr "KhÃng phái ngÆái dÃng các bá; hÃy thá <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
 msgid "Requested action not taken: insufficient system storage"
 msgstr "KhÃng thác hián hÃnh Äáng yÃu cáu: khÃng Äá chá cháa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:741
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "KhÃng thác hián hÃnh Äáng thÆ tÃn yÃu cáu: quÃ hán sác cháa ÄÆác gÃn"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "KhÃng thác hián hÃnh Äáng yÃu cáu: khÃng cho phÃp tÃn háp thÆ áy"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Bát Äáu gÃ thÆ; kát thÃc báng <Xuáng dÃng>.<Xuáng dÃng>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:206
+#: ../camel/providers/smtp/camel-smtp-transport.c:747
 msgid "Transaction failed"
 msgstr "Giao dách thát bái"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:210
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
 msgid "A password transition is needed"
 msgstr "Cán chuyán tiáp mát kháu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:212
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
 msgid "Authentication mechanism is too weak"
 msgstr "CÆ chá xÃc thác quÃ yáu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:214
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
 msgid "Encryption required for requested authentication mechanism"
 msgstr "CÆ chá xÃc thác yÃu cáu cán phái ÄÆác mÃ hoÃ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:216
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
 msgid "Temporary authentication failure"
 msgstr "Lái xÃc thác tám"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:297
-msgid "Welcome response error"
-msgstr "Lái hái ÄÃp chÃo máng"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1008
+msgid "SMTP Greeting"
+msgstr "ChÃo hái cáa SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
-#: ../camel/providers/smtp/camel-smtp-transport.c:365
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
-#, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "KhÃng thá kát nái tái mÃy phác vá SMTP %s trong chá Äá báo mát: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1035
+#: ../camel/providers/smtp/camel-smtp-transport.c:1052
+#: ../camel/providers/smtp/camel-smtp-transport.c:1060
+#, fuzzy
+#| msgid "HELO command failed: %s"
+msgid "HELO command failed: "
+msgstr "Lái lánh HELO: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:341
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "Lái lánh STARTTLS: %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1129
+msgid "SMTP Authentication"
+msgstr "XÃc thác SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:356
-msgid "STARTTLS command failed"
-msgstr "Lái lánh STARTTLS"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1148
+#: ../camel/providers/smtp/camel-smtp-transport.c:1159
+#: ../camel/providers/smtp/camel-smtp-transport.c:1172
+#, fuzzy
+#| msgid "AUTH command failed: %s"
+msgid "AUTH command failed: "
+msgstr "Lái lánh AUTH: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:497
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "MÃy phác vá SMTP %s khÃng há trá kiáu xÃc thác yÃu cáu %s."
+#: ../camel/providers/smtp/camel-smtp-transport.c:1280
+#: ../camel/providers/smtp/camel-smtp-transport.c:1294
+#: ../camel/providers/smtp/camel-smtp-transport.c:1303
+#, fuzzy
+#| msgid "MAIL FROM command failed"
+msgid "MAIL FROM command failed: "
+msgstr "Lái lánh MAIL FROM"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:568
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"KhÃng thá xÃc thác vái mÃy phác vá SMTP.\n"
-"%s\n"
-"\n"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1330
+#, fuzzy
+#| msgid "RSET command failed: %s"
+msgid "RCPT TO command failed: "
+msgstr "Lái lánh RSET: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:701
-#, c-format
-msgid "SMTP server %s"
-msgstr "MÃy phác vá SMTP %s"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1346
+#: ../camel/providers/smtp/camel-smtp-transport.c:1355
+#, fuzzy, c-format
+#| msgid "RCPT TO <%s> failed"
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> thát bái"
+
+#: ../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
+#, fuzzy
+#| msgid "DATA command failed"
+msgid "DATA command failed: "
+msgstr "Lái lánh DATA"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1541
+#: ../camel/providers/smtp/camel-smtp-transport.c:1555
+#: ../camel/providers/smtp/camel-smtp-transport.c:1563
+#, fuzzy
+#| msgid "RSET command failed: %s"
+msgid "RSET command failed: "
+msgstr "Lái lánh RSET: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1588
+#: ../camel/providers/smtp/camel-smtp-transport.c:1602
+#: ../camel/providers/smtp/camel-smtp-transport.c:1609
+#, fuzzy
+#| msgid "QUIT command failed: %s"
+msgid "QUIT command failed: "
+msgstr "Lái lánh QUIT: %s"
+
+#: ../libedataserver/e-categories.c:47
+#, fuzzy
+#| msgid "Anniversary"
+msgctxt "CategoryName"
+msgid "Anniversary"
+msgstr "Ká niám"
+
+#: ../libedataserver/e-categories.c:48
+#, fuzzy
+#| msgid "Birthday"
+msgctxt "CategoryName"
+msgid "Birthday"
+msgstr "NgÃy sinh"
+
+#: ../libedataserver/e-categories.c:49
+#, fuzzy
+#| msgid "Business"
+msgctxt "CategoryName"
+msgid "Business"
+msgstr "Kinh doanh"
+
+#: ../libedataserver/e-categories.c:50
+#, fuzzy
+#| msgid "Competition"
+msgctxt "CategoryName"
+msgid "Competition"
+msgstr "Tranh Äua"
+
+#: ../libedataserver/e-categories.c:51
+#, fuzzy
+#| msgid "Favorites"
+msgctxt "CategoryName"
+msgid "Favorites"
+msgstr "Æa thÃch"
+
+#: ../libedataserver/e-categories.c:52
+#, fuzzy
+#| msgid "Gifts"
+msgctxt "CategoryName"
+msgid "Gifts"
+msgstr "QuÃ biáu"
+
+#: ../libedataserver/e-categories.c:53
+#, fuzzy
+#| msgid "Goals/Objectives"
+msgctxt "CategoryName"
+msgid "Goals/Objectives"
+msgstr "ÄÃch"
+
+#: ../libedataserver/e-categories.c:54
+#, fuzzy
+#| msgid "Holiday"
+msgctxt "CategoryName"
+msgid "Holiday"
+msgstr "NgÃy nghá"
+
+#: ../libedataserver/e-categories.c:55
+#, fuzzy
+#| msgid "Holiday Cards"
+msgctxt "CategoryName"
+msgid "Holiday Cards"
+msgstr "Thá ngÃy nghá"
+
+#. important people (e.g. new business partners)
+#: ../libedataserver/e-categories.c:57
+#, fuzzy
+#| msgid "Hot Contacts"
+msgctxt "CategoryName"
+msgid "Hot Contacts"
+msgstr "LiÃn lác quan tráng"
+
+#: ../libedataserver/e-categories.c:58
+#, fuzzy
+#| msgid "Ideas"
+msgctxt "CategoryName"
+msgid "Ideas"
+msgstr "Ã kián"
+
+#: ../libedataserver/e-categories.c:59
+#, fuzzy
+#| msgid "International"
+msgctxt "CategoryName"
+msgid "International"
+msgstr "Quác tá"
+
+#: ../libedataserver/e-categories.c:60
+#, fuzzy
+#| msgid "Key Customer"
+msgctxt "CategoryName"
+msgid "Key Customer"
+msgstr "KhÃch hÃng chÃnh"
+
+#: ../libedataserver/e-categories.c:61
+#, fuzzy
+#| msgid "Miscellaneous"
+msgctxt "CategoryName"
+msgid "Miscellaneous"
+msgstr "Linh tinh"
+
+#: ../libedataserver/e-categories.c:62
+#, fuzzy
+#| msgid "Personal"
+msgctxt "CategoryName"
+msgid "Personal"
+msgstr "CÃ nhÃn"
+
+#: ../libedataserver/e-categories.c:63
+#, fuzzy
+#| msgid "Phone Calls"
+msgctxt "CategoryName"
+msgid "Phone Calls"
+msgstr "Äián thoái"
+
+#. Translators: "Status" is a category name; it can mean anything user wants to
+#: ../libedataserver/e-categories.c:65
+#, fuzzy
+#| msgid "Status"
+msgctxt "CategoryName"
+msgid "Status"
+msgstr "Tráng thÃi"
+
+#: ../libedataserver/e-categories.c:66
+#, fuzzy
+#| msgid "Strategies"
+msgctxt "CategoryName"
+msgid "Strategies"
+msgstr "Chián lÆác"
+
+#: ../libedataserver/e-categories.c:67
+#, fuzzy
+#| msgid "Suppliers"
+msgctxt "CategoryName"
+msgid "Suppliers"
+msgstr "NhÃ cung cáp"
+
+#: ../libedataserver/e-categories.c:68
+#, fuzzy
+#| msgid "Time & Expenses"
+msgctxt "CategoryName"
+msgid "Time & Expenses"
+msgstr "Giá vÃ phá phÃ"
+
+#: ../libedataserver/e-categories.c:69
+#, fuzzy
+#| msgid "VIP"
+msgctxt "CategoryName"
+msgid "VIP"
+msgstr "NgÆái rát quan tráng"
+
+#: ../libedataserver/e-categories.c:70
+#, fuzzy
+#| msgid "Waiting"
+msgctxt "CategoryName"
+msgid "Waiting"
+msgstr "Äang chá..."
+
+#: ../libedataserver/e-client.c:120
+#, fuzzy
+#| msgid "URI not loaded"
+msgid "Source not loaded"
+msgstr "URI chÆa ÄÆác tái"
+
+#: ../libedataserver/e-client.c:122
+#, fuzzy
+#| msgid "URI already loaded"
+msgid "Source already loaded"
+msgstr "URI ÄÃ ÄÆác tái"
+
+#: ../libedataserver/e-client.c:130
+#, fuzzy
+#| msgid "Offline mode unavailable"
+msgid "Offline unavailable"
+msgstr "Chá Äá ngoái tuyán khÃng sán sÃng"
+
+#: ../libedataserver/e-client.c:152
+#, fuzzy
+#| msgid "parse error"
+msgid "D-Bus error"
+msgstr "lái phÃn tÃch"
+
+#. strptime format of a weekday, a date and a time,
+#. * in 12-hour format.
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format.
+#: ../libedataserver/e-time-utils.c:1646 ../libedataserver/e-time-utils.c:1944
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#. strptime format of a weekday, a date and a time,
+#. * in 24-hour format.
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format.
+#: ../libedataserver/e-time-utils.c:1651 ../libedataserver/e-time-utils.c:1935
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#. strptime format of a weekday, a date and a time,
+#. * in 12-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. * time, in 12-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1656 ../libedataserver/e-time-utils.c:1940
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#. strptime format of a weekday, a date and a time,
+#. * in 24-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. * time, in 24-hour format, without seconds.
+#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1931
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %d/%m/%Y %H:%M"
+
+#. strptime format of a weekday, a date and a time,
+#. * in 12-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1666
+msgid "%a %m/%d/%Y %I %p"
+msgstr "%a %d/%m/%Y %I %p"
+
+#. strptime format of a weekday, a date and a time,
+#. * in 24-hour format, without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1671
+msgid "%a %m/%d/%Y %H"
+msgstr "%a %d/%m/%Y %H"
+
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
+#: ../libedataserver/e-time-utils.c:1674 ../libedataserver/e-time-utils.c:1794
+#: ../libedataserver/e-time-utils.c:1926
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. strptime format of a date and a time, in 12-hour format.
+#: ../libedataserver/e-time-utils.c:1681
+msgid "%m/%d/%Y %I:%M:%S %p"
+msgstr "%d/%m/%Y %I:%M:%S %p"
+
+#. strptime format of a date and a time, in 24-hour format.
+#: ../libedataserver/e-time-utils.c:1685
+msgid "%m/%d/%Y %H:%M:%S"
+msgstr "%d/%m/%Y %H:%M:%S"
+
+#. strptime format of a date and a time, in 12-hour format,
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1690
+msgid "%m/%d/%Y %I:%M %p"
+msgstr "%d/%m/%Y %I:%M %p"
+
+#. strptime format of a date and a time, in 24-hour format,
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1695
+msgid "%m/%d/%Y %H:%M"
+msgstr "%d/%m/%Y %H:%M"
+
+#. strptime format of a date and a time, in 12-hour format,
+#. * without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1700
+msgid "%m/%d/%Y %I %p"
+msgstr "%d/%m/%Y %I %p"
+
+#. strptime format of a date and a time, in 24-hour format,
+#. * without minutes or seconds.
+#: ../libedataserver/e-time-utils.c:1705
+msgid "%m/%d/%Y %H"
+msgstr "%d/%m/%Y %H"
+
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#: ../libedataserver/e-time-utils.c:1708 ../libedataserver/e-time-utils.c:1797
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#. strptime format for a time of day, in 12-hour format.
+#. strftime format of a time in 12-hour format.
+#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1988
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
+
+#. strptime format for a time of day, in 24-hour format.
+#. strftime format of a time in 24-hour format.
+#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1980
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
+
+#. strptime format for time of day, without seconds,
+#. * in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1877 ../libedataserver/e-time-utils.c:1985
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
+#. strptime format for time of day, without seconds 24-hour format.
+#. strftime format of a time in 24-hour format,
+#. * without seconds.
+#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1977
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. strptime format for time of day, without seconds 24-hour format, and no colon.
+#: ../libedataserver/e-time-utils.c:1884
+msgid "%H%M"
+msgstr "%H:%M"
+
+#. strptime format for hour and AM/PM, 12-hour format.
+#: ../libedataserver/e-time-utils.c:1888
+msgid "%I %p"
+msgstr "%I %p"
+
+#: ../libedataserverui/e-book-auth-util.c:96
+#: ../libedataserverui/e-book-auth-util.c:662
+msgid "Accessing LDAP Server anonymously"
+msgstr "Truy cáp vÃ danh tái mÃy phác vá LDAP"
+
+#: ../libedataserverui/e-book-auth-util.c:197
+#: ../libedataserverui/e-book-auth-util.c:423
+msgid "Failed to authenticate.\n"
+msgstr "Lái xÃc thác.\n"
+
+#: ../libedataserverui/e-categories-editor.c:221
+msgid "Currently _used categories:"
+msgstr ""
+
+#: ../libedataserverui/e-categories-editor.c:230
+msgid "_Available Categories:"
+msgstr "Loái _sán sáng:"
+
+#: ../libedataserverui/e-categories-selector.c:320
+msgid "Icon"
+msgstr "Biáu tÆáng"
+
+#: ../libedataserverui/e-categories-selector.c:325
+msgid "Category"
+msgstr "Loái:"
+
+#: ../libedataserverui/e-category-completion.c:294
+#, c-format
+msgid "Create category \"%s\""
+msgstr "Táo loái Â %s Â"
+
+#: ../libedataserverui/e-category-editor.c:132
+msgid "Category Icon"
+msgstr "Biáu tÆáng loái"
+
+#: ../libedataserverui/e-category-editor.c:136
+msgid "_No Image"
+msgstr ""
+
+#: ../libedataserverui/e-category-editor.c:173
+msgid "Category _Name"
+msgstr "TÃ_n loái"
+
+#: ../libedataserverui/e-category-editor.c:181
+msgid "Category _Icon"
+msgstr "_Biáu tÆáng loái"
+
+#: ../libedataserverui/e-category-editor.c:221
+msgid "Category Properties"
+msgstr "Thuác tÃnh loái"
+
+#: ../libedataserverui/e-category-editor.c:282
+#, c-format
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
+msgstr "Loái Â %s Â ÄÃ cÃ trong cáu hÃnh. HÃy sá dáng tÃn khÃc."
+
+#: ../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 "HÃy nháp mát kháu cho %s (ngÆái dÃng %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 "HÃy nháp mát kháu cho %s (ngÆái dÃng %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 "HÃy nháp mát kháu cho %s (ngÆái dÃng %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 "HÃy nháp mát kháu cho %s (ngÆái dÃng %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 "HÃy nháp mát kháu cho %s (ngÆái dÃng %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 "HÃy nháp mát kháu cho %s (ngÆái dÃng %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 "HÃy nháp mát kháu cho %s (ngÆái dÃng %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 "HÃy nháp mát kháu cho %s (ngÆái dÃng %s)"
+
+#: ../libedataserverui/e-client-utils.c:981
+#, fuzzy
+#| msgid "Enter password"
+msgid "Enter Passphrase"
+msgstr "Nháp mát kháu"
+
+#: ../libedataserverui/e-client-utils.c:983
+#, fuzzy
+#| msgid "Enter password"
+msgid "Enter Password"
+msgstr "Nháp mát kháu"
+
+#: ../libedataserverui/e-name-selector-dialog.c:184
+#, fuzzy
+#| msgid "Hot Contacts"
+msgid "Show Contacts"
+msgstr "LiÃn lác quan tráng"
+
+#: ../libedataserverui/e-name-selector-dialog.c:206
+msgid "Address B_ook:"
+msgstr "_Sá Äáa chá:"
+
+#: ../libedataserverui/e-name-selector-dialog.c:214
+msgid "Cate_gory:"
+msgstr "L_oái:"
+
+#: ../libedataserverui/e-name-selector-dialog.c:232
+msgid "_Search:"
+msgstr "_TÃm:"
+
+#: ../libedataserverui/e-name-selector-dialog.c:250
+#: ../libedataserverui/e-name-selector-dialog.c:1035
+msgid "Any Category"
+msgstr "Bát ká Loái"
+
+#: ../libedataserverui/e-name-selector-dialog.c:252
+#, fuzzy
+#| msgid "Contacts"
+msgid "Co_ntacts"
+msgstr "LiÃn lác"
+
+#: ../libedataserverui/e-name-selector-dialog.c:307
+msgid "Search"
+msgstr "TÃm"
+
+#: ../libedataserverui/e-name-selector-dialog.c:310
+msgid "Address Book"
+msgstr "Sá Äáa chá:"
+
+#: ../libedataserverui/e-name-selector-dialog.c:313
+msgid "Contacts"
+msgstr "LiÃn lác"
+
+#: ../libedataserverui/e-name-selector-dialog.c:430
+msgid "Select Contacts from Address Book"
+msgstr "Chán liÃn lác tá sá Äáa chá"
+
+#: ../libedataserverui/e-name-selector-dialog.c:778
+msgid "_Add"
+msgstr "T_hÃm"
+
+#: ../libedataserverui/e-name-selector-dialog.c:782
+msgid "_Remove"
+msgstr "_Loái bá"
+
+#: ../libedataserverui/e-name-selector-dialog.c:954
+#, fuzzy, c-format
+#| msgid "Error reading mail file: %s"
+msgid "Error loading address book: %s"
+msgstr "Lái Äác táp tin thÆ: %s"
+
+#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
+#: ../libedataserverui/e-name-selector-entry.c:2816
+#, c-format
+msgid "E_xpand %s Inline"
+msgstr "Má _ráng %s trác tiáp"
+
+#. Copy Contact Item
+#: ../libedataserverui/e-name-selector-entry.c:2831
+#, c-format
+msgid "Cop_y %s"
+msgstr "ChÃ_p %s"
+
+#. Cut Contact Item
+#: ../libedataserverui/e-name-selector-entry.c:2841
+#, c-format
+msgid "C_ut %s"
+msgstr "Cá_t %s"
+
+#. Edit Contact item
+#: ../libedataserverui/e-name-selector-entry.c:2858
+#, c-format
+msgid "_Edit %s"
+msgstr "_Sáa %s"
+
+#: ../libedataserverui/e-name-selector-list.c:520
+#, c-format
+msgid "_Delete %s"
+msgstr "_XÃa bá %s"
+
+#: ../libedataserverui/e-passwords.c:126
+msgid "Keyring key is unusable: no user or host name"
+msgstr ""
+"KhÃng thá sá dáng khoÃ cáa vÃng khoÃ, vÃ khÃng cÃ tÃn ngÆái dÃng hay tÃn mÃy"
+
+#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:614
+msgid "You have the Caps Lock key on."
+msgstr "Bán ÄÃ bám phÃm gÃ chá hoa (Caps Lock)."
+
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:737
+msgid "_Remember this passphrase"
+msgstr "_Nhá cám tá mát kháu nÃy"
+
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:738
+msgid "_Remember this passphrase for the remainder of this session"
+msgstr "_Nhá cám tá mát kháu nÃy trong khi phiÃn nÃy"
+
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:743
+msgid "_Remember this password"
+msgstr "_Nhá mát kháu nÃy"
+
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:744
+msgid "_Remember this password for the remainder of this session"
+msgstr "_Nhá mát kháu nÃy trong khi phiÃn nÃy"
+
+#. prepare the dialog
+#: ../libedataserverui/e-source-selector-dialog.c:99
+msgid "Select destination"
+msgstr "Chán ÄÃch"
+
+#: ../libedataserverui/e-source-selector-dialog.c:174
+msgid "_Destination"
+msgstr "ÄÃ_ch"
+
+#~ msgid "Updating contacts cache (%d)... "
+#~ msgstr "Äang cáp nhát bá nhá tám liÃn lác (%d)... "
+
+#~ msgid "\"%s\" on book before \"%s\""
+#~ msgstr "\"%s\" trong sá trÆác \"%s\""
+
+#~ msgid "book busy"
+#~ msgstr "sá quÃ bán"
+
+#~ msgid "CORBA exception making \"%s\" call"
+#~ msgstr "Gáp lái ngoái lá CORBA khi lÃm viác gái Â %s Â"
+
+#~ msgid "%s: there is no current operation"
+#~ msgstr "%s: khÃng cÃ tÃc vá hián thái"
+
+#~ msgid "\"%s\" on book after \"%s\""
+#~ msgstr "\"%s\" trong sá sau \"%s\""
+
+#~ msgid "%s: canceled"
+#~ msgstr "%s: bá huá"
+
+#~ msgid "%s: no factories available for URI `%s'"
+#~ msgstr "%s: khÃng cÃ bá táo sán sÃng cho Äáa chá URI Â %s Â"
+
+#~ msgid "%s: Could not create EBookListener"
+#~ msgstr "%s: khÃng thá táo EBookListener (trÃnh nghe cuán sÃch Äián)"
+
+#~ msgid "%s: there was no self contact UID stored in gconf"
+#~ msgstr "%s: khÃng cÃ UID tá liÃn lác ÄÆác lÆu vÃo gconf"
+
+#~ msgid "Could not create thread for getting deltas"
+#~ msgstr "KhÃng thá táo mách Äá láy cÃc delta"
+
+#~ msgid "Could not create thread for populating cache"
+#~ msgstr "KhÃng thá táo mách Äá Äá Ãn bá nhá tám"
+
+#~ msgid "Reply Requested: by "
+#~ msgstr "Trá lái ÄÆác yÃu cáu: do "
+
+#~ msgid "Reply Requested: When convenient"
+#~ msgstr "Trá lái ÄÆác yÃu cáu: khi tián"
+
+#~ msgid "Loading %s items"
+#~ msgstr "Äang tái %s mác"
+
+#~ msgid "Calendar"
+#~ msgstr "Lách"
+
+#~ msgid "Verifying message"
+#~ msgstr "Äang xÃc minh thÆ"
+
+#~ msgid "Cannot open message"
+#~ msgstr "KhÃng thá má thÆ"
+
+#~ msgid "Failed to create create child process '%s': %s"
+#~ msgstr "Lái táo tián trÃnh con '%s': %s"
+
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "ThÃo tÃc chÆa há trá: phá thÃm thÆ: cho %s"
+
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "Thao tÃc chÆa há trá: tÃm theo biáu thác: cho %s"
+
+#~| msgid "Unsupported operation: search by expression: for %s"
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "Thao tÃc khÃng ÄÆác há trá: Äám theo biáu thác: cho %s"
+
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "Thao tÃc khÃng ÄÆác há trá: tÃm kiám theo UID: %s"
+
+#~ msgid "Learning junk"
+#~ msgstr "Hác lÃ rÃc"
+
+#~ msgid "Learning non-junk"
+#~ msgstr "Hác khÃng phái lÃ rÃc"
+
+#~ msgid "Canceled."
+#~ msgstr "Bá huá."
+
+#~ msgid "This is a digitally signed message part"
+#~ msgstr "ÄÃy lÃ phán thÆ cÃ chá kÃ sá"
+
+#~ msgid "Cannot verify message signature: could not create temp file: %s"
+#~ msgstr "KhÃng thá xÃc minh chá kÃ thÆ: khÃng thá táo táp tin tám: %s"
+
+#~ msgid "Unable to parse message content"
+#~ msgstr "KhÃng thá phÃn tÃch nái dung thÆ"
+
+#~ msgid "cannot create thread"
+#~ msgstr "KhÃng thá táo mách"
+
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
+
+#~ msgid ""
+#~ "This option will connect to the server using Kerberos 4 authentication."
+#~ msgstr ""
+#~ "TÃy chán nÃy sá kát nái Äán mÃy phác vá báng cÆ chá xÃc minh Kerberos 4."
+
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "KhÃng thá láy vÃ Kerberos:\n"
+#~ "%s"
+
+#~ msgid "POP Before SMTP auth using a non-pop source"
+#~ msgstr "XÃc thác POP trÆác SMTP dÃng nguán khÃng phái POP"
+
+#~ msgid ""
+#~ "Could not create directory %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "KhÃng thá táo thÆ mác %s:\n"
+#~ "%s"
+
+#~ msgid "Camel session doesn't support forwarding of a message."
+#~ msgstr "PhiÃn cháy Camel khÃng há trá chác nÄng chuyán tiáp thÃng Äiáp."
+
+#~ msgid "Decoder failed, error %d"
+#~ msgstr "Lái bá giái mÃ: %d"
+
+#~ msgid "import keys: unimplemented"
+#~ msgstr "náp khoÃ: chÆa há trá"
+
+#~ msgid "export keys: unimplemented"
+#~ msgstr "xuát khoÃ: chÆa há trá"
+
+#~ msgid "Cannot get folder: Invalid operation on this store"
+#~ msgstr "KhÃng thá láy thÆ mác: thao tÃc khÃng háp lá trÃn thiát bá lÆu trá"
+
+#~ msgid "Cannot create folder: Invalid operation on this store"
+#~ msgstr "KhÃng thá táo thÆ mác: thao tÃc khÃng háp lá trÃn thiát bá lÆu trá"
+
+#~ msgid "Unable to get issuer's certificate"
+#~ msgstr "KhÃng thá gái cháng nhán cáa ngÆái phÃt hÃnh"
+
+#~ msgid "Unable to get Certificate Revocation List"
+#~ msgstr "KhÃng thá gái danh sÃch háy bá cháng nhán (DHC)"
+
+#~ msgid "Unable to decrypt certificate signature"
+#~ msgstr "KhÃng thá giái mÃ chá kÃ cháng nhán"
+
+#~ msgid "Unable to decrypt Certificate Revocation List signature"
+#~ msgstr "KhÃng thá giái mÃ chá kÃ cáa danh sÃch háy bá cháng nhán"
+
+#~ msgid "Unable to decode issuer's public key"
+#~ msgstr "KhÃng thá giái mÃ khÃa cÃng cáa ngÆái phÃt hÃnh"
+
+#~ msgid "Certificate signature failure"
+#~ msgstr "Lái chá kÃ cháng nhán"
+
+#~ msgid "Certificate Revocation List signature failure"
+#~ msgstr "Lái chá kÃ danh sÃch háy bá cháng nhán"
+
+#~ msgid "Certificate not yet valid"
+#~ msgstr "Cháng nhán chÆa háp lá"
+
+#~ msgid "Certificate has expired"
+#~ msgstr "Cháng nhán quÃ hán"
+
+#~ msgid "CRL not yet valid"
+#~ msgstr "Danh sÃch háy bá cháng nhán chÆa háp lá"
+
+#~ msgid "CRL has expired"
+#~ msgstr "Danh sÃch háy bá cháng nhán quÃ hán"
+
+#~ msgid "Error in CRL"
+#~ msgstr "Lái trong danh sÃch háy bá cháng nhán"
+
+#~ msgid "Out of memory"
+#~ msgstr "Hát bá nhá"
+
+#~ msgid "Zero-depth self-signed certificate"
+#~ msgstr "Cháng nhán tá kÃ cÃ Äá sÃu 0"
+
+#~ msgid "Self-signed certificate in chain"
+#~ msgstr "Cháng nhán tá kÃ trong chuái"
+
+#~ msgid "Unable to get issuer's certificate locally"
+#~ msgstr "KhÃng thá gái cháng nhán cáa ngÆái phÃt hÃnh mát cÃch Äáa phÆÆng"
+
+#~ msgid "Unable to verify leaf signature"
+#~ msgstr "KhÃng thá thám tra chá kÃ lÃ"
+
+#~ msgid "Certificate chain too long"
+#~ msgstr "DÃy cháng nhán quÃ dÃi"
+
+#~ msgid "Certificate Revoked"
+#~ msgstr "Cháng nhán bá háy bá"
+
+#~ msgid "Invalid Certificate Authority (CA)"
+#~ msgstr "NhÃ cám quyán cháng nhán khÃng háp lá"
+
+#~ msgid "Path length exceeded"
+#~ msgstr "ÄÆáng dán quÃ dÃi"
+
+#~ msgid "Invalid purpose"
+#~ msgstr "Mác ÄÃch khÃng háp lá"
+
+#~ msgid "Certificate untrusted"
+#~ msgstr "Cháng nhán khÃng ÄÃng tin"
+
+#~ msgid "Certificate rejected"
+#~ msgstr "Cháng nhán bá tá chái"
+
+#~ msgid "Subject/Issuer mismatch"
+#~ msgstr "KhÃng kháp Chá Äá/NhÃ phÃt hÃnh"
+
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "KhÃng kháp AKID/SKID"
+
+#~ msgid "AKID/Issuer serial mismatch"
+#~ msgstr "KhÃng kháp AKID/NhÃ phÃt hÃnh"
+
+#~ msgid "Key usage does not support certificate signing"
+#~ msgstr "CÃch sá dáng khÃa khÃng há trá kÃ cháng nhán"
+
+#~ msgid "Error in application verification"
+#~ msgstr "Gáp lái khi thám tra áng dáng"
+
+#~ msgid ""
+#~ "Bad certificate from %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept anyway?"
+#~ msgstr ""
+#~ "Cháng nhán sai tá %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Bán cÃ muán cháp nhán dÃ bát cá giÃ nÃo?"
+
+#~ msgid ""
+#~ "Cannot get message: %s\n"
+#~ "  %s"
+#~ msgstr ""
+#~ "KhÃng thá láy thÆ: %s\n"
+#~ "  %s"
+
+#~ msgid "User canceled"
+#~ msgstr "NgÆái dÃng ÄÃ thÃi"
+
+#~ msgid "Could not get message"
+#~ msgstr "KhÃng thá gái thÆ."
+
+#~ msgid "Trash Folder Full. Please Empty."
+#~ msgstr "ThÆ mác RÃc Äáy. Xin hÃy Äá."
+
+#~ msgid "Cannot append message to folder '%s': %s"
+#~ msgstr "KhÃng thá phá thÃm thÆ vÃo thÆ mác dáng MH `%s': %s"
+
+#~ msgid "Cannot append message in offline mode: cache unavailable"
+#~ msgstr ""
+#~ "KhÃng thá phá thÃm thÆ trong chá Äá ngoái tuyán: khÃng cÃ bá nhá tám sán "
+#~ "sÃng"
+
+#~ msgid "Cannot append message in offline mode: %s"
+#~ msgstr "KhÃng thá phá thÃm thÆ trong chá Äá ngoái tuyán: %s"
+
+#~ msgid "Checking for new mail"
+#~ msgstr "Äang kiám tra tÃm thÆ mái"
+
+#~ msgid "Check new messages for J_unk contents"
+#~ msgstr "Kiám tra thÆ mái tÃm nái d_ung rÃc"
+
+#~ msgid "Automatically synchroni_ze account locally"
+#~ msgstr "Tá Äáng Äáng _bá hÃa tÃi khoán mát cÃch Äáa phÆÆng"
+
+#~ msgid "SOAP Settings"
+#~ msgstr "Thiát láp SOAP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:703
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "Gái thÆ (SMTP) thÃng qua %s"
+#~| msgid "Post Office Agent SOAP Port:"
+#~ msgid "Post Office Agent SOAP _Port:"
+#~ msgstr "Cáng SOAP tÃc nhán _bÆu Äián:"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:721
-msgid "Cannot send message: service not connected."
-msgstr "KhÃng thá gái thÆ: chÆa kát nái dách vá."
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell GroupWise"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:727
-msgid "Cannot send message: sender address not valid."
-msgstr "KhÃng thá gái thÆ: Äáa chá ngÆái gái khÃng háp lá."
+#~ msgid "For accessing Novell GroupWise servers"
+#~ msgstr "Äá truy cáp mÃy phác vá Novell Groupwise"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:731
-msgid "Sending message"
-msgstr "Äang gái thÆ"
+#~ msgid ""
+#~ "This option will connect to the GroupWise server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "TÃy chán nÃy sá kát nái tái mÃy phác vá GroupWise báng mát kháu thÃ "
+#~ "(khÃng mát mÃ)."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:746
-msgid "Cannot send message: no recipients defined."
-msgstr "KhÃng thá gái thÆ: chÆa gÃ ngÆái nhán."
+#~ msgid "Host or user not available in url"
+#~ msgstr "MÃy phác vá hay ngÆái dÃng khÃng sán sÃng trong Äáa chá Máng."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:757
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "KhÃng thá gái thÆ: cÃ mát hoác vÃi ngÆái nhán khÃng háp lá"
+#~ msgid ""
+#~ "Some features may not work correctly with your current server version"
+#~ msgstr ""
+#~ "CÃ lá mát sá tÃnh nÄng khÃng thao tÃc cho ÄÃng vái phiÃn bán mÃy phác vá "
+#~ "hián thái cáa bán"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:986
-msgid "SMTP Greeting"
-msgstr "ChÃo hái cáa SMTP"
+#~ msgid "Cannot create GroupWise folders in offline mode."
+#~ msgstr "KhÃng thá táo thÆ mác GroupWise trong chá Äá ngoái tuyán."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1011
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "Lái lánh HELO: %s"
+#~| msgid "Cannot rename Groupwise folder '%s' to '%s'"
+#~ msgid "Cannot rename GroupWise folder '%s' to '%s'"
+#~ msgstr "KhÃng thá Äái tÃn thÆ mác GroupWise Â %s Â thÃnh Â %s Â"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1028
-msgid "HELO command failed"
-msgstr "Lái lánh HELO"
+#~ msgid "GroupWise server %s"
+#~ msgstr "MÃy phác vá GroupWise %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1094
-msgid "SMTP Authentication"
-msgstr "XÃc thác SMTP"
+#~ msgid "GroupWise service for %s on %s"
+#~ msgstr "Dách vá GroupWise cho %s trÃn %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1100
-msgid "Error creating SASL authentication object."
-msgstr "Lái táo Äái tÆáng xÃc thác SASL."
+#~ msgid "GroupWise mail delivery via %s"
+#~ msgstr "Gái thÆ (GroupWise) thÃng qua Â %s Â."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1117
-#: ../camel/providers/smtp/camel-smtp-transport.c:1128
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "Lái lánh AUTH: %s"
+#~ msgid "Sending Message"
+#~ msgstr "Äang gái thÆ"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1134
-msgid "AUTH command failed"
-msgstr "Lái lánh AUTH"
+#~ 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 ""
+#~ "Bán ÄÃ vÆát trái hán chá lÆu cáa tÃi khoán nÃy. CÃc thÆ cáa bán Äang Äái "
+#~ "gái trong Háp Äi. HÃy cá gái lái báng nhán nÃt Gái/Nhán sau khi xÃa bá/"
+#~ "lÆu trá mát sá thÆ.\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1204
-msgid "Bad authentication response from server.\n"
-msgstr "Trá lái xÃc thác sai tá mÃy phác vá.\n"
+#~ msgid "Hula"
+#~ msgstr "Hula"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1231
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "Lái lánh MAIL FROM (thÆ tá): %s: chÆa gái thÆ"
+#~ msgid "For accessing Hula servers"
+#~ msgstr "Äá truy cáp mÃy phác vá Hula"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1248
-msgid "MAIL FROM command failed"
-msgstr "Lái lánh MAIL FROM"
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr ""
+#~ "TÃy chán nÃy sá kát nái tái mÃy phác vá Hula báng mát kháu thÃ (khÃng mát "
+#~ "mÃ)."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1272
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "Lái lánh RCPT TO: %s: chÆa gái thÆ"
+#~ msgid "Operation cancelled"
+#~ msgstr "Thao tÃc bá háy bá"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1291
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> thát bái"
+#~ msgid "Unexpected response status '%s' after APPEND command"
+#~ msgstr ""
+#~ "Tráng thÃi ÄÃp áng bát thÆáng Â %s Â xáy ra sau lánh APPEND (phá thÃm)"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1331
-#: ../camel/providers/smtp/camel-smtp-transport.c:1400
-#: ../camel/providers/smtp/camel-smtp-transport.c:1419
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "Lái lánh DATA: %s: chÆa gái thÆ"
+#~ msgid "No response on continuation after APPEND command"
+#~ msgstr "KhÃng cÃ ÄÃp áng khi tiáp tác sau lánh APPEND (phá thÃm)"
 
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1348
-#: ../camel/providers/smtp/camel-smtp-transport.c:1435
-msgid "DATA command failed"
-msgstr "Lái lánh DATA"
+#~ msgid "Unknown error occurred during APPEND command!"
+#~ msgstr "Gáp lái khÃng rÃ trong khi cháy lánh APPEND (phá thÃm)"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1458
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "Lái lánh RSET: %s"
+#~ msgid "_Apply filters to new messages in INBOX on this server"
+#~ msgstr ""
+#~ "Ã_p dáng bá lác vÃo nháng thÆ mái trong Háp Nhán trÃn mÃy phác vá nÃy"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1474
-msgid "RSET command failed"
-msgstr "Lái lánh RSET"
+#~ msgid "SSL negotiations failed"
+#~ msgstr "ThÆÆng lÆáng SSL thát bái"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "Lái lánh QUIT: %s"
+#~ msgid "Drafts"
+#~ msgstr "NhÃp"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
-msgid "QUIT command failed"
-msgstr "Lái lánh QUIT"
+#~ msgid "Sent"
+#~ msgstr "ÄÃ gái"
 
-#: ../libedataserver/e-categories.c:45
-msgid "Business"
-msgstr "Kinh doanh"
+#~ msgid "Templates"
+#~ msgstr "Máu"
 
-#: ../libedataserver/e-categories.c:46
-msgid "Competition"
-msgstr "Tranh Äua"
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "Lái gái lánh Äán mÃy phác vá IMAP %s: %s"
 
-#: ../libedataserver/e-categories.c:47
-msgid "Favorites"
-msgstr "Æa thÃch"
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "TÃn hiáu trá lái khÃng mong Äái tá mÃy phác vá IMAP4 %s: %s"
 
-#: ../libedataserver/e-categories.c:48
-msgid "Gifts"
-msgstr "QuÃ biáu"
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "Lái chÃo máng khÃng mong Äái tá mÃy phác vá IMAP %s."
 
-#: ../libedataserver/e-categories.c:49
-msgid "Goals/Objectives"
-msgstr "ÄÃch"
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr "KhÃng thá chán thÆ mác Â %s Â: tÃn háp thÆ sai"
 
-#: ../libedataserver/e-categories.c:50
-msgid "Holiday"
-msgstr "NgÃy nghá"
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "KhÃng thá chán thÆ mác Â %s Â: lánh sai"
 
-#: ../libedataserver/e-categories.c:51
-msgid "Holiday Cards"
-msgstr "Thá ngÃy nghá"
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "Lái gái lánh Äán mÃy phác vá IMAP %s: %s"
 
-#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:53
-msgid "Hot Contacts"
-msgstr "LiÃn lác quan tráng"
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "MÃy phác vá IMAP4 %s ngát kát nái bát ngá: %s"
 
-#: ../libedataserver/e-categories.c:54
-msgid "Ideas"
-msgstr "Ã kián"
+#~ msgid ""
+#~ "Enable extended Mailing-List detection required for some filter and "
+#~ "vFolder rules"
+#~ msgstr ""
+#~ "Hiáu lác khá nÄng phÃt hián Háp thÆ chung ÄÃ má ráng ÄÃi hái cho mát sá "
+#~ "quy tác lác vÃ ThÆ mác áo"
 
-#: ../libedataserver/e-categories.c:55
-msgid "International"
-msgstr "Quác tá"
+#~ msgid "Expire cached messages that haven't been read in X seconds"
+#~ msgstr "MÃn hán cÃc thÆ ÄÃ lÆu tám mÃ khÃng ÄÆác Äác trong vÃng X giÃy"
 
-#: ../libedataserver/e-categories.c:56
-msgid "Key Customer"
-msgstr "KhÃch hÃng chÃnh"
+#~ msgid "Expire cached messages older than X seconds"
+#~ msgstr "MÃn hán cÃc thÆ ÄÃ lÆu tám mÃ cÅ hÆn X giÃy"
 
-#: ../libedataserver/e-categories.c:57
-msgid "Miscellaneous"
-msgstr "Linh tinh"
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "KhÃng thá truy cáp Äán thÆ mác Â %s Â: %s"
 
-#: ../libedataserver/e-categories.c:58
-msgid "Personal"
-msgstr "CÃ nhÃn"
+#~| msgid "Cannot sync flags to folder '%s': Unknown"
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr "KhÃng thá Äáng bá cá vái thÆ mác Â %s Â: lái khÃng rÃ"
 
-#: ../libedataserver/e-categories.c:59
-msgid "Phone Calls"
-msgstr "Äián thoái"
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr "KhÃng thá Äáng bá cá vái thÆ mác Â %s Â: lánh sai"
 
-#. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:61
-msgid "Status"
-msgstr "Tráng thÃi"
+#~| msgid "Cannot expunge folder '%s': Unknown"
+#~ msgid "Cannot expunge folder '%s': Unknown error"
+#~ msgstr "KhÃng thá xoÃ hán thÆ mác Â %s Â: lái khÃng rÃ"
 
-#: ../libedataserver/e-categories.c:62
-msgid "Strategies"
-msgstr "Chián lÆác"
+#~ msgid "Cannot expunge folder '%s': Bad command"
+#~ msgstr "KhÃng thá xoÃ hán thÆ mác Â %s Â: lánh sai"
 
-#: ../libedataserver/e-categories.c:63
-msgid "Suppliers"
-msgstr "NhÃ cung cáp"
+#~ msgid "Cannot get message %s from folder '%s': No such message"
+#~ msgstr "KhÃng thá láy thÆ %s tá thÆ mác Â %s Â: khÃng co thÆ nhÆ váy"
 
-#: ../libedataserver/e-categories.c:64
-msgid "Time & Expenses"
-msgstr "Giá vÃ phá phÃ"
+#~ msgid "Cannot get message %s from folder '%s': Bad command"
+#~ msgstr "KhÃng thá láy thÆ Â %s Â tá thÆ mác Â %s Â: lánh sai"
 
-#: ../libedataserver/e-categories.c:65
-msgid "VIP"
-msgstr "NgÆái rát quan tráng"
+#~ msgid "Cannot append message to folder '%s': Folder is read-only"
+#~ msgstr ""
+#~ "KhÃng thá phá thÃm thÆ vÃo thÆ mác Â %s Â vÃ thÆ mác chá cho phÃp Äác"
 
-#: ../libedataserver/e-categories.c:66
-msgid "Waiting"
-msgstr "Äang chá..."
+#~ msgid "Cannot append message to folder '%s': Unknown error"
+#~ msgstr "KhÃng thá phá thÃm thÆ vÃo thÆ mác Â %s Â: khÃng biát sao"
 
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1644
-#: ../libedataserver/e-time-utils.c:1911
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
+#~ msgid "Cannot append message to folder '%s': Bad command"
+#~ msgstr "KhÃng thá phá thÃm thÆ vÃo thÆ mác Â %s Â: lánh sai"
 
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1649
-#: ../libedataserver/e-time-utils.c:1902
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d/%m/%Y %H:%M:%S"
+#~| msgid "Cannot move messages from folder '%s' to folder '%s': Unknown"
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "KhÃng thá di chuyán thÆ tá thÆ mác Â %s Â sang thÆ mác Â %s Â: lái khÃng "
+#~ "rÃ"
 
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1654
-#: ../libedataserver/e-time-utils.c:1907
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
+#~| msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown"
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "KhÃng thá sao chÃp thÆ tá thÆ mác Â %s Â sang thÆ mác Â %s Â: lái khÃng rÃ"
 
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1659
-#: ../libedataserver/e-time-utils.c:1898
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %d/%m/%Y %H:%M"
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "KhÃng thá di chuyán thÆ tá thÆ mác Â %s Â sang thÆ mác Â %s Â: lánh sai"
 
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1664
-msgid "%a %m/%d/%Y %I %p"
-msgstr "%a %d/%m/%Y %I %p"
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "KhÃng thá sao chÃp thÆ tá thÆ mác Â %s Â sang thÆ mác Â %s Â: lánh sai"
 
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1669
-msgid "%a %m/%d/%Y %H"
-msgstr "%a %d/%m/%Y %H"
+#~ msgid "Check new messages for _Junk contents"
+#~ msgstr "Kiám tra thÆ mái tÃm nái dung _rÃc"
 
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1672
-#: ../libedataserver/e-time-utils.c:1773
-#: ../libedataserver/e-time-utils.c:1893
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr "Chá kiám tra tÃm thÆ rÃc trong thÆ mác Háp nhán"
 
-#. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1680
-msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%d/%m/%Y %I:%M:%S %p"
+#~ msgid "IMAP4rev1"
+#~ msgstr "IMAPv4rev1"
 
-#. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1684
-msgid "%m/%d/%Y %H:%M:%S"
-msgstr "%d/%m/%Y %H:%M:%S"
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "Äá Äác vÃ lÆu thÆ trÃn mÃy chá loái  IMAPv4rev1."
 
-#. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1689
-msgid "%m/%d/%Y %I:%M %p"
-msgstr "%d/%m/%Y %I:%M %p"
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "TÃy chán nÃy sá kát nái tái mÃy phác vá IMAPv4rev1 báng mát kháu thÃ "
+#~ "(khÃng mát mÃ)."
 
-#. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1694
-msgid "%m/%d/%Y %H:%M"
-msgstr "%d/%m/%Y %H:%M"
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr ""
+#~ "Lái kát nái tái mÃy phác vá IMAP %s trong chá Äá báo mát: mÃy phác vá "
+#~ "khÃng há trá giao thác STARTTLS."
 
-#. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1699
-msgid "%m/%d/%Y %I %p"
-msgstr "%d/%m/%Y %I %p"
+#~ msgid "TLS negotiations failed"
+#~ msgstr "Lái dÃn xáp TLS"
 
-#. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1704
-msgid "%m/%d/%Y %H"
-msgstr "%d/%m/%Y %H"
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr "KhÃng thá xÃc thác vái mÃy phác vá IMAP %s dÃng cÆ chá xÃc thác %s"
 
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1707
-#: ../libedataserver/e-time-utils.c:1776
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "KhÃng thá xÃc thác vái mÃy phác vá IMAP %s dÃng %s"
 
-#. 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:1834
-#: ../libedataserver/e-time-utils.c:1956
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
+#~ msgid "Cannot create IMAP folders in offline mode."
+#~ msgstr "KhÃng thá táo thÆ mác IMAP trong chá Äá ngoái tuyán."
 
-#. 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:1838
-#: ../libedataserver/e-time-utils.c:1948
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
+#~| msgid "Cannot get folder '%s' on IMAP server %s: Unknown"
+#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+#~ msgstr "KhÃng thá láy thÆ mác Â %s Â trÃn mÃy phác vá IMAP %s: lái khÃng rÃ"
 
-#. strptime format for time of day, without seconds,
-#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1843
-#: ../libedataserver/e-time-utils.c:1953
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
+#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+#~ msgstr ""
+#~ "KhÃng thá láy thÃng tin LIST (danh sÃch) cho Â %s Â trÃn mÃy phác vá IMAP "
+#~ "%s: %s"
 
-#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: ../libedataserver/e-time-utils.c:1847
-#: ../libedataserver/e-time-utils.c:1945
-msgid "%H:%M"
-msgstr "%H:%M"
+#~ msgid "Bad command"
+#~ msgstr "CÃu lánh sai"
 
-#. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1850
-msgid "%H%M"
-msgstr "%H:%M"
+#~ msgid "Cannot create folder '%s': Invalid mailbox name"
+#~ msgstr "KhÃng thá táo thÆ mác Â %s Â: tÃn háp thÆ sai"
 
-#. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1854
-msgid "%I %p"
-msgstr "%I %p"
+#~ msgid "Cannot create folder '%s': Bad command"
+#~ msgstr "KhÃng thá táo thÆ mác Â %s Â: lánh sai"
 
-#: ../libedataserverui/e-book-auth-util.c:90
-msgid "Accessing LDAP Server anonymously"
-msgstr "Truy cáp vÃ danh tái mÃy phác vá LDAP"
+#~ msgid "Cannot delete folder '%s': Special folder"
+#~ msgstr "KhÃng thá xoÃ thÆ mác Â %s Â: thÆ mác Äác biát"
 
-#: ../libedataserverui/e-book-auth-util.c:192
-msgid "Failed to authenticate.\n"
-msgstr "Lái xÃc thác.\n"
+#~ msgid "Cannot delete IMAP folders in offline mode."
+#~ msgstr "KhÃng thá xoÃ thÆ mác IMAP trong chá Äá ngoái tuyán."
 
-#: ../libedataserverui/e-categories-dialog.c:362
-#, c-format
-msgid "There is already a category '%s' in the configuration. Please use another name"
-msgstr "Loái Â %s Â ÄÃ cÃ trong cáu hÃnh. HÃy sá dáng tÃn khÃc."
+#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
+#~ msgstr "KhÃng thá xoÃ thÆ mác Â %s Â: tÃn háp thÆ khÃng háp lá"
 
-#: ../libedataserverui/e-categories-dialog.c:526
-msgid "Icon"
-msgstr "Biáu tÆáng"
+#~ msgid "Cannot delete folder '%s': Bad command"
+#~ msgstr "KhÃng thá xoÃ thÆ mác Â %s Â: lánh sai"
 
-#: ../libedataserverui/e-categories-dialog.c:531
-msgid "Category"
-msgstr "Loái:"
+#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
+#~ msgstr "KhÃng thá Äái tÃn thÆ mác Â %s Â sang Â %s Â: thÆ mác Äác biát"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
-msgid "Category Icon"
-msgstr "Biáu tÆáng loái"
+#~ msgid "Cannot rename IMAP folders in offline mode."
+#~ msgstr "KhÃng thá Äái tÃn thÆ mác IMAP trong chá Äá ngoái tuyán"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:2
-msgid "Category Properties"
-msgstr "Thuác tÃnh loái"
+#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+#~ msgstr ""
+#~ "KhÃng thá Äái tÃn thÆ mác Â %s Â sang Â %s Â: tÃn háp thÆ khÃng háp lá"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:3
-msgid "Category _Icon"
-msgstr "_Biáu tÆáng loái"
+#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
+#~ msgstr "KhÃng thá Äái tÃn thÆ mác Â %s Â sang Â %s Â: lánh sai"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:4
-msgid "Category _Name"
-msgstr "TÃ_n loái"
+#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+#~ msgstr ""
+#~ "KhÃng thá gái thÃng tin %s cho máu Â %s Â trÃn mÃy phác vá IMAP %s: %s"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "Nháng mác thuác cÃc _loái nÃy:"
+#~ msgid "Cannot subscribe to IMAP folders in offline mode."
+#~ msgstr "KhÃng thá ÄÄng kÃ vái thÆ mác IMAP trong chá Äá ngoái tuyán."
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
-msgid "_Available Categories:"
-msgstr "Loái _sán sáng:"
+#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
+#~ msgstr "KhÃng thá ÄÄng kÃ vái thÆ mác Â %s Â: tÃn háp thÆ khÃng háp lá"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
-msgid "_Edit"
-msgstr "_Sáa"
+#~ msgid "Cannot subscribe to folder '%s': Bad command"
+#~ msgstr "KhÃng thá ÄÄng kÃ vái thÆ mác Â %s Â: lánh sai"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
-msgid "categories"
-msgstr "loái"
+#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
+#~ msgstr "KhÃng thá háy ÄÄng kÃ thÆ mác IMAP trong chá Äá ngoái tuyán."
 
-#: ../libedataserverui/e-category-completion.c:290
-#, c-format
-#| msgid "Category List"
-msgid "Create category \"%s\""
-msgstr "Táo loái Â %s Â"
+#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+#~ msgstr "KhÃng thá háy ÄÄng kÃ vái thÆ mác Â %s Â: tÃn háp thÆ khÃng háp lá"
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "ThÃng tin mÃu"
+#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
+#~ msgstr "KhÃng thá háy ÄÄng kÃ vái thÆ mác Â %s Â: lánh sai"
 
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "MÃu cán vá"
+#~ msgid "Scanning for changed messages"
+#~ msgstr "Äang quÃt tÃm cÃc thÆ thay Äái"
 
-#: ../libedataserverui/e-name-selector-dialog.c:278
-msgid "Select Contacts from Address Book"
-msgstr "Chán liÃn lác tá sá Äáa chá"
+#~ msgid "IMAP server %s is in an inconsistent state."
+#~ msgstr "MÃy phác vá IMAP %s á trong tÃnh tráng khÃng án Äánh."
 
-#: ../libedataserverui/e-name-selector-dialog.c:565
-msgid "_Add"
-msgstr "T_hÃm"
+#~ msgid "Fetching envelopes of new messages"
+#~ msgstr "Äang láy cÃc bao cháa thÆ mái"
 
-#: ../libedataserverui/e-name-selector-dialog.c:590
-msgid "_Remove"
-msgstr "_Loái bá"
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr ""
+#~ "Hiáu bÃi khÃng mong Äái trong tÃn hiáu trá lái tá mÃy phác vá IMAP %s: "
 
-#: ../libedataserverui/e-name-selector-dialog.c:767
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
-msgid "Any Category"
-msgstr "Bát ká Loái"
+#~ msgid "No data"
+#~ msgstr "KhÃng cÃ dá liáu"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
-msgid "*"
-msgstr "*"
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "MÃy phác vá IMAP %s ÄÃ ngát kát nái bát ngá: %s"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>LiÃ_n lác</b>"
+#~ msgid ""
+#~ "Experimental IMAP 4(.1) client\n"
+#~ "This is untested and unsupported code, you want to use plain imap "
+#~ "instead.\n"
+#~ "\n"
+#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+#~ msgstr ""
+#~ "áng dáng khÃch IMAP 4(.1) dáa trÃn thÃ nghiám\n"
+#~ "ChÆa thá ra hay há trá mÃ nguán nÃy: bán hÃy sá dáng phiÃn bán IMAP "
+#~ "thÆáng, thay vÃo Äiáu nÃy.\n"
+#~ "\n"
+#~ " !!! ÄáNG Sá DáNG TRÃNH NÃY Äá GáI/NHáN THÆ THáT !!!\n"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>Hián liÃn lác</b>"
+#~ msgid "Could not connect to %s (port %s): %s"
+#~ msgstr "KhÃng thá kát nái tái %s (cáng %s): %s"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
-msgid "Address B_ook:"
-msgstr "_Sá Äáa chá:"
+#~ msgid "Could not connect to POP server on %s"
+#~ msgstr "KhÃng thá kát nái tái mÃy phác vá POP trÃn %s"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
-msgid "Address Book"
-msgstr "Sá Äáa chá:"
+#~ msgid "Maildir append message canceled"
+#~ msgstr "ThÆ phá thÃm dáng Maildir bá thÃi"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
-msgid "Cate_gory:"
-msgstr "L_oái:"
+#~ msgid "Invalid message contents"
+#~ msgstr "Nái dung thÆ khÃng háp lá"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
-msgid "Contacts"
-msgstr "LiÃn lác"
+#~ msgid "Mail append canceled"
+#~ msgstr "Phá thÃm thÆ bá thÃi"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
-msgid "Search"
-msgstr "TÃm"
+#~ msgid "Message construction failed."
+#~ msgstr "Lái táo dáng thÆ."
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
-msgid "_Search:"
-msgstr "_TÃm:"
+#~ msgid "MH append message canceled"
+#~ msgstr "ThÆ phá thÃm dáng MH bá thÃi"
 
-#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2456
-#, c-format
-msgid "E_xpand %s Inline"
-msgstr "Má _ráng %s trác tiáp"
+#~ msgid "Use cancel"
+#~ msgstr "HÃy sá dáng ThÃi"
 
-#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2471
-#, c-format
-msgid "Cop_y %s"
-msgstr "ChÃ_p %s"
+#~ msgid "STARTTLS command failed"
+#~ msgstr "Lái lánh STARTTLS"
 
-#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2481
-#, c-format
-msgid "C_ut %s"
-msgstr "Cá_t %s"
+#~ msgid "HELO command failed"
+#~ msgstr "Lái lánh HELO"
 
-#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2498
-#, c-format
-msgid "_Edit %s"
-msgstr "_Sáa %s"
+#~ msgid "AUTH command failed"
+#~ msgstr "Lái lánh AUTH"
 
-#: ../libedataserverui/e-name-selector-list.c:472
-#, c-format
-msgid "_Delete %s"
-msgstr "_XÃa bá %s"
+#~ msgid "Bad authentication response from server.\n"
+#~ msgstr "Trá lái xÃc thác sai tá mÃy phác vá.\n"
 
-#: ../libedataserverui/e-passwords.c:234
-#, c-format
-msgid "Keyring key is unusable: no user or host name"
-msgstr "KhÃng thá sá dáng khoÃ cáa vÃng khoÃ, vÃ khÃng cÃ tÃn ngÆái dÃng hay tÃn mÃy"
+#~ msgid "MAIL FROM command failed: %s: mail not sent"
+#~ msgstr "Lái lánh MAIL FROM (thÆ tá): %s: chÆa gái thÆ"
 
-#: ../libedataserverui/e-passwords.c:1094
-msgid "You have the Caps Lock key on."
-msgstr "Bán ÄÃ bám phÃm gÃ chá hoa (Caps Lock)."
+#~ msgid "RCPT TO command failed: %s: mail not sent"
+#~ msgstr "Lái lánh RCPT TO: %s: chÆa gái thÆ"
 
-#: ../libedataserverui/e-passwords.c:1216
-msgid "_Remember this passphrase"
-msgstr "_Nhá cám tá mát kháu nÃy"
+#~ msgid "DATA command failed: %s: mail not sent"
+#~ msgstr "Lái lánh DATA: %s: chÆa gái thÆ"
 
-#: ../libedataserverui/e-passwords.c:1217
-msgid "_Remember this passphrase for the remainder of this session"
-msgstr "_Nhá cám tá mát kháu nÃy trong khi phiÃn nÃy"
+#~ msgid "RSET command failed"
+#~ msgstr "Lái lánh RSET"
 
-#: ../libedataserverui/e-passwords.c:1222
-msgid "_Remember this password"
-msgstr "_Nhá mát kháu nÃy"
+#~ msgid "QUIT command failed"
+#~ msgstr "Lái lánh QUIT"
 
-#: ../libedataserverui/e-passwords.c:1223
-msgid "_Remember this password for the remainder of this session"
-msgstr "_Nhá mát kháu nÃy trong khi phiÃn nÃy"
+#~ msgid "Item(s) belong to these _categories:"
+#~ msgstr "Nháng mác thuác cÃc _loái nÃy:"
 
-#. prepare the dialog
-#: ../libedataserverui/e-source-selector-dialog.c:100
-msgid "Select destination"
-msgstr "Chán ÄÃch"
+#~ msgid "_Edit"
+#~ msgstr "_Sáa"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
-msgid "_Destination"
-msgstr "ÄÃ_ch"
+#~ msgid "categories"
+#~ msgstr "loái"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1698
-#: ../servers/exchange/storage/exchange-account.c:959
-#, c-format
-msgid "Enter password for %s"
-msgstr "Nháp mát kháu cho Â %s Â."
+#~ msgid "Color Info"
+#~ msgstr "ThÃng tin mÃu"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1699
-#: ../servers/exchange/storage/exchange-account.c:964
-msgid "Enter password"
-msgstr "Nháp mát kháu"
+#~ msgid "The color to render"
+#~ msgstr "MÃu cán vá"
 
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:847
-msgid "Owner"
-msgstr "NgÆái sá háu"
+#~ msgid "*"
+#~ msgstr "*"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
-msgid "Publishing Editor"
-msgstr "NgÆái sáa Äái cÅng sán xuát"
+#~ msgid "<b>Co_ntacts</b>"
+#~ msgstr "<b>LiÃ_n lác</b>"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
-msgid "Editor"
-msgstr "NgÆái sáa Äái"
+#~ msgid "<b>Show Contacts</b>"
+#~ msgstr "<b>Hián liÃn lác</b>"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
-msgid "Publishing Author"
-msgstr "TÃc giá cÅng sán xuát"
+#~ msgid "Enter password for %s"
+#~ msgstr "Nháp mát kháu cho Â %s Â."
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
-msgid "Author"
-msgstr "TÃc giá"
+#~ msgid "Owner"
+#~ msgstr "NgÆái sá háu"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
-msgid "Non-editing Author"
-msgstr "TÃc giá khÃng sáa Äái"
+#~ msgid "Publishing Editor"
+#~ msgstr "NgÆái sáa Äái cÅng sán xuát"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
-msgid "Reviewer"
-msgstr "NgÆái xem lái"
+#~ msgid "Editor"
+#~ msgstr "NgÆái sáa Äái"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
-msgid "Contributor"
-msgstr "NgÆái ÄÃng gÃp"
+#~ msgid "Publishing Author"
+#~ msgstr "TÃc giá cÅng sán xuát"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
-msgid "None"
-msgstr "KhÃng cÃ"
+#~ msgid "Author"
+#~ msgstr "TÃc giá"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
-msgid "Custom"
-msgstr "Tá chán"
+#~ msgid "Non-editing Author"
+#~ msgstr "TÃc giá khÃng sáa Äái"
 
-#: ../servers/exchange/storage/e-storage.c:555
-msgid "Generic error"
-msgstr "Lái chung chung"
+#~ msgid "Reviewer"
+#~ msgstr "NgÆái xem lái"
 
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "A folder with the same name already exists"
-msgstr "ThÆ mác cÃng tÃn ÄÃ tán tái"
+#~ msgid "Contributor"
+#~ msgstr "NgÆái ÄÃng gÃp"
 
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "The specified folder type is not valid"
-msgstr "Kiáu thÆ mác khÃng háp lá"
+#~ msgid "None"
+#~ msgstr "KhÃng cÃ"
 
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "I/O error"
-msgstr "Lái V/R"
+#~ msgid "Custom"
+#~ msgstr "Tá chán"
 
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "Not enough space to create the folder"
-msgstr "KhÃng Äá chá Äá táp thÆ mác"
+#~ msgid "Generic error"
+#~ msgstr "Lái chung chung"
 
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "The folder is not empty"
-msgstr "ThÆ mác khÃng ráng"
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "ThÆ mác cÃng tÃn ÄÃ tán tái"
 
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The specified folder was not found"
-msgstr "KhÃng tÃm tháy thÆ mác ÄÃ xÃc Äánh"
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Kiáu thÆ mác khÃng háp lá"
 
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "Function not implemented in this storage"
-msgstr "Chác nÄng nÃy chÆa ÄÆác thác hián trong kho lÆu nÃy"
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "KhÃng Äá chá Äá táp thÆ mác"
 
-#: ../servers/exchange/storage/e-storage.c:573
-msgid "Operation not supported"
-msgstr "KhÃng há trá thao tÃc nÃy"
+#~ msgid "The folder is not empty"
+#~ msgstr "ThÆ mác khÃng ráng"
 
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "The specified type is not supported in this storage"
-msgstr "Kho lÆu nÃy chÆa há trá kiáu ÄÃ xÃc Äánh"
+#~ msgid "The specified folder was not found"
+#~ msgstr "KhÃng tÃm tháy thÆ mác ÄÃ xÃc Äánh"
 
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified folder cannot be modified or removed"
-msgstr "ThÆ mác ÄÃ xÃc Äánh khÃng thá bá thay Äái hoác gá bá"
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Chác nÄng nÃy chÆa ÄÆác thác hián trong kho lÆu nÃy"
 
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "KhÃng thá lÃm cho mát thÆ mác lÃ con cáa mát trong nháng con chÃu cáa nÃ"
+#~ msgid "Operation not supported"
+#~ msgstr "KhÃng há trá thao tÃc nÃy"
 
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot create a folder with that name"
-msgstr "KhÃng thá táo thÆ mác vái tÃn ÄÃ"
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Kho lÆu nÃy chÆa há trá kiáu ÄÃ xÃc Äánh"
 
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Thao tÃc nÃy khÃng thá ÄÆác thác hián trong chá Äá ngoái tuyán"
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "ThÆ mác ÄÃ xÃc Äánh khÃng thá bá thay Äái hoác gá bá"
 
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:642
-#, c-format
-msgid "%s's Folders"
-msgstr "ThÆ mác cáa Â %s Â"
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr ""
+#~ "KhÃng thá lÃm cho mát thÆ mác lÃ con cáa mát trong nháng con chÃu cáa nÃ"
 
-#: ../servers/exchange/storage/exchange-account.c:1265
-msgid "Personal Folders"
-msgstr "ThÆ mác cÃ nhÃn"
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "KhÃng thá táo thÆ mác vái tÃn ÄÃ"
 
-#: ../servers/exchange/storage/exchange-account.c:1280
-msgid "Favorite Public Folders"
-msgstr "ThÆ mác cÃng Æa thÃch"
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Thao tÃc nÃy khÃng thá ÄÆác thác hián trong chá Äá ngoái tuyán"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1297
-msgid "All Public Folders"
-msgstr "Mái thÆ mác cÃng"
+#~ msgid "%s's Folders"
+#~ msgstr "ThÆ mác cáa Â %s Â"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1311
-msgid "Global Address List"
-msgstr "Danh sÃch Äáa chá toÃn các"
+#~ msgid "Personal Folders"
+#~ msgstr "ThÆ mác cÃ nhÃn"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "Mác bá xÃa bá"
+#~ msgid "Favorite Public Folders"
+#~ msgstr "ThÆ mác cÃng Æa thÃch"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "Nhát kÃ"
+#~ msgid "All Public Folders"
+#~ msgstr "Mái thÆ mác cÃng"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "Ghi chÃ"
+#~ msgid "Global Address List"
+#~ msgstr "Danh sÃch Äáa chá toÃn các"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "ThÆ Ra"
+#~ msgid "Deleted Items"
+#~ msgstr "Mác bá xÃa bá"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "Mác ÄÃ gái"
+#~ msgid "Journal"
+#~ msgstr "Nhát kÃ"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "TÃc vá"
+#~ msgid "Notes"
+#~ msgstr "Ghi chÃ"
 
-#: ../servers/groupwise/e-gw-connection.c:225
-msgid "Invalid connection"
-msgstr "Kát nái khÃng háp lá"
+#~ msgid "Outbox"
+#~ msgstr "ThÆ Ra"
 
-#: ../servers/groupwise/e-gw-connection.c:229
-msgid "Invalid response from server"
-msgstr "Hái ÄÃp khÃng háp lá tá mÃy phác vá"
+#~ msgid "Sent Items"
+#~ msgstr "Mác ÄÃ gái"
 
-#: ../servers/groupwise/e-gw-connection.c:231
-msgid "No response from the server"
-msgstr "MÃy phác vá khÃng trá lái"
+#~ msgid "Tasks"
+#~ msgstr "TÃc vá"
 
-#: ../servers/groupwise/e-gw-connection.c:237
-msgid "Bad parameter"
-msgstr "Tham sá sai"
+#~ msgid "Invalid connection"
+#~ msgstr "Kát nái khÃng háp lá"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Háu phÆÆng táp tin Sá Äáa chá Evolution"
+#~ msgid "No response from the server"
+#~ msgstr "MÃy phác vá khÃng trá lái"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "Háu phÆÆng lách Máng vÃ táp tin lách Evolution"
+#~ msgid "Bad parameter"
+#~ msgstr "Tham sá sai"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "Dách vá kiám tra giao dián mÃy phác vá dá liáu Evolution"
+#~ msgid "Evolution Addressbook file backend"
+#~ msgstr "Háu phÆÆng táp tin Sá Äáa chá Evolution"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Dách vá ghi lÆu mÃy phác vá dá liáu Evolution"
+#~ msgid "Evolution Calendar file and webcal backend"
+#~ msgstr "Háu phÆÆng lách Máng vÃ táp tin lách Evolution"
 
-#. dialog display isn't working out
-#: ../src/server.c:109
-#, c-format
-msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
-msgstr "Gáp nhiáu lái phÃn Äoán; khÃng thá hián thá háp thoái lái\n"
+#~ msgid "Evolution Data Server interface check service"
+#~ msgstr "Dách vá kiám tra giao dián mÃy phác vá dá liáu Evolution"
 
+#~ msgid "Evolution Data Server logging service"
+#~ msgstr "Dách vá ghi lÆu mÃy phác vá dá liáu Evolution"
 
-#: ../calendar/libecal/e-cal.c:1049
-msgid "On This Computer"
-msgstr "TrÃn mÃy nÃy"
+#~ msgid "Multiple segmentation faults occurred; cannot display error dialog\n"
+#~ msgstr "Gáp nhiáu lái phÃn Äoán; khÃng thá hián thá háp thoái lái\n"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]