vi.po: Updated Vietnamese translation.
authorClytie Siddall <clyties@src.gnome.org>
Wed, 28 Dec 2005 07:20:56 +0000 (07:20 +0000)
committerClytie Siddall <clyties@src.gnome.org>
Wed, 28 Dec 2005 07:20:56 +0000 (07:20 +0000)
po/ChangeLog
po/vi.po

index df52957..8e7dec4 100644 (file)
@@ -1,3 +1,7 @@
+2005-12-28  Clytie Siddall <clytie@riverland.net.au>
+
+       * vi.po: Updated Vietnamese translation.
+
 2005-12-26  Ankit Patel  <ankit644@yahoo.com>
 
         * gu.po: Updated Gujarati Translation.
index c8c5e5c..dab3de8 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
 # This file is distributed under the same license as the evolution-data-server package.
 # Nguyễn Thái Ngọc Duy <pclouds@gmx.net>, 2002-2004.
 # Clytie Siddall <clytie@riverland.net.au>, 2005.
-#
+# 
 msgid ""
-msgstr ""
-"Project-Id-Version: evolution-data-server Gnome 2.12\n"
+""
+msgstr "Project-Id-Version: evolution-data-server Gnome HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-30 05:49+0000\n"
-"PO-Revision-Date: 2005-09-16 15:13+0930\n"
+"POT-Creation-Date: 2005-12-28 05:48+0100\n"
+"PO-Revision-Date: 2005-12-28 17:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: LocFactoryEditor 1.2.2\n"
+"X-Generator: LocFactoryEditor 1.5.1b\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:533
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2174
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:478
+#:../addressbook/backends/file/e-book-backend-file.c:536
+#:../addressbook/backends/groupwise/e-book-backend-groupwise.c:2213
+#:../addressbook/backends/vcf/e-book-backend-vcf.c:484
 msgid "Loading..."
-msgstr "Tải..."
-
-#: ../addressbook/backends/file/e-book-backend-file.c:535
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2133
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2153
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2172
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:3417
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:480
+msgstr "Đang tải..."
+
+#:../addressbook/backends/file/e-book-backend-file.c:538
+#:../addressbook/backends/groupwise/e-book-backend-groupwise.c:2172
+#:../addressbook/backends/groupwise/e-book-backend-groupwise.c:2192
+#:../addressbook/backends/groupwise/e-book-backend-groupwise.c:2211
+#:../addressbook/backends/ldap/e-book-backend-ldap.c:3739
+#:../addressbook/backends/vcf/e-book-backend-vcf.c:486
 msgid "Searching..."
-msgstr "m..."
+msgstr "Đang tìm kiếm..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2448
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:3551
-#, c-format
+#:../addressbook/backends/groupwise/e-book-backend-groupwise.c:2496
+#:../addressbook/backends/ldap/e-book-backend-ldap.c:3903
+#,c-format
 msgid "Downloading contacts (%d)... "
-msgstr "Đang tải về các liên hệ (%d)..."
+msgstr "Đang tải về các liên lạc (%d)... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2597
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2764
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2800
-#, c-format
+#:../addressbook/backends/groupwise/e-book-backend-groupwise.c:2645
+#:../addressbook/backends/groupwise/e-book-backend-groupwise.c:2812
+#:../addressbook/backends/groupwise/e-book-backend-groupwise.c:2848
+#,c-format
 msgid "Updating contacts cache (%d)... "
-msgstr "Đang cập nhật bộ nhớ tạm liên hệ (%d)..."
+msgstr "Đang cập nhật bộ nhớ tạm liên lạc (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:659
+#:../addressbook/backends/ldap/e-book-backend-ldap.c:702
 msgid "Using Distinguished Name (DN)"
 msgstr "Dùng tên phân biệt (TB)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:662
+#:../addressbook/backends/ldap/e-book-backend-ldap.c:705
 msgid "Using Email Address"
 msgstr "Dùng địa chỉ thư điện tử"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:832
+#:../addressbook/backends/ldap/e-book-backend-ldap.c:924
 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:1380
+#:../addressbook/backends/ldap/e-book-backend-ldap.c:1503
 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:1505
+#:../addressbook/backends/ldap/e-book-backend-ldap.c:1637
 msgid "Removing contact from LDAP server..."
 msgstr "Đang loại bỏ liên lạc khỏi máy phục vụ LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1762
+#:../addressbook/backends/ldap/e-book-backend-ldap.c:1919
 msgid "Modifying contact from LDAP server..."
 msgstr "Đang hiệu chỉnh liên lạc trong máy phục vụ LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:3307
+#:../addressbook/backends/ldap/e-book-backend-ldap.c:3601
 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:3437
+#:../addressbook/backends/ldap/e-book-backend-ldap.c:3761
 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:257 ../addressbook/libebook/e-book.c:261
-#: ../addressbook/libebook/e-book.c:473 ../addressbook/libebook/e-book.c:477
-#: ../addressbook/libebook/e-book.c:618 ../addressbook/libebook/e-book.c:622
-#: ../addressbook/libebook/e-book.c:711 ../addressbook/libebook/e-book.c:715
-#: ../addressbook/libebook/e-book.c:1029 ../addressbook/libebook/e-book.c:1034
-#: ../addressbook/libebook/e-book.c:1221 ../addressbook/libebook/e-book.c:1225
-#: ../addressbook/libebook/e-book.c:1382 ../addressbook/libebook/e-book.c:1386
-#: ../addressbook/libebook/e-book.c:1595 ../addressbook/libebook/e-book.c:1599
-#: ../addressbook/libebook/e-book.c:1836 ../addressbook/libebook/e-book.c:1840
-#: ../addressbook/libebook/e-book.c:2076 ../addressbook/libebook/e-book.c:2080
-#: ../addressbook/libebook/e-book.c:2292 ../addressbook/libebook/e-book.c:2296
-#: ../addressbook/libebook/e-book.c:3392
-#, c-format
+#.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:257 ../addressbook/libebook/e-book.c:261
+#:../addressbook/libebook/e-book.c:473 ../addressbook/libebook/e-book.c:477
+#:../addressbook/libebook/e-book.c:618 ../addressbook/libebook/e-book.c:622
+#:../addressbook/libebook/e-book.c:711 ../addressbook/libebook/e-book.c:715
+#:../addressbook/libebook/e-book.c:1029 ../addressbook/libebook/e-book.c:1034
+#:../addressbook/libebook/e-book.c:1221 ../addressbook/libebook/e-book.c:1225
+#:../addressbook/libebook/e-book.c:1382 ../addressbook/libebook/e-book.c:1386
+#:../addressbook/libebook/e-book.c:1595 ../addressbook/libebook/e-book.c:1599
+#:../addressbook/libebook/e-book.c:1836 ../addressbook/libebook/e-book.c:1840
+#:../addressbook/libebook/e-book.c:2076 ../addressbook/libebook/e-book.c:2080
+#:../addressbook/libebook/e-book.c:2292 ../addressbook/libebook/e-book.c:2296
+#:../addressbook/libebook/e-book.c:3392
+#,c-format
 msgid "\"%s\" on book before \"%s\""
 msgstr "\"%s\" trong sổ trước \"%s\""
 
-#: ../addressbook/libebook/e-book.c:270 ../addressbook/libebook/e-book.c:486
-#: ../addressbook/libebook/e-book.c:631 ../addressbook/libebook/e-book.c:724
-#: ../addressbook/libebook/e-book.c:1044 ../addressbook/libebook/e-book.c:1235
-#: ../addressbook/libebook/e-book.c:1396 ../addressbook/libebook/e-book.c:1608
-#: ../addressbook/libebook/e-book.c:1849 ../addressbook/libebook/e-book.c:2090
-#: ../addressbook/libebook/e-book.c:2305 ../addressbook/libebook/e-book.c:2641
-#: ../addressbook/libebook/e-book.c:2847
+#:../addressbook/libebook/e-book.c:270 ../addressbook/libebook/e-book.c:486
+#:../addressbook/libebook/e-book.c:631 ../addressbook/libebook/e-book.c:724
+#:../addressbook/libebook/e-book.c:1044 ../addressbook/libebook/e-book.c:1235
+#:../addressbook/libebook/e-book.c:1396 ../addressbook/libebook/e-book.c:1608
+#:../addressbook/libebook/e-book.c:1849 ../addressbook/libebook/e-book.c:2090
+#:../addressbook/libebook/e-book.c:2305 ../addressbook/libebook/e-book.c:2641
+#:../addressbook/libebook/e-book.c:2847
 msgid "book busy"
 msgstr "sổ quá bận"
 
-#: ../addressbook/libebook/e-book.c:303 ../addressbook/libebook/e-book.c:307
-#: ../addressbook/libebook/e-book.c:519 ../addressbook/libebook/e-book.c:523
-#: ../addressbook/libebook/e-book.c:660 ../addressbook/libebook/e-book.c:664
-#: ../addressbook/libebook/e-book.c:753 ../addressbook/libebook/e-book.c:757
-#: ../addressbook/libebook/e-book.c:1073 ../addressbook/libebook/e-book.c:1076
-#: ../addressbook/libebook/e-book.c:1267 ../addressbook/libebook/e-book.c:1270
-#: ../addressbook/libebook/e-book.c:1425 ../addressbook/libebook/e-book.c:1429
-#: ../addressbook/libebook/e-book.c:1644 ../addressbook/libebook/e-book.c:1648
-#: ../addressbook/libebook/e-book.c:1896 ../addressbook/libebook/e-book.c:1900
-#: ../addressbook/libebook/e-book.c:2122 ../addressbook/libebook/e-book.c:2126
-#: ../addressbook/libebook/e-book.c:2333 ../addressbook/libebook/e-book.c:2337
-#: ../addressbook/libebook/e-book.c:2582 ../addressbook/libebook/e-book.c:2669
-#: ../addressbook/libebook/e-book.c:2673 ../addressbook/libebook/e-book.c:2875
-#: ../addressbook/libebook/e-book.c:2879 ../addressbook/libebook/e-book.c:3401
-#, c-format
+#:../addressbook/libebook/e-book.c:303 ../addressbook/libebook/e-book.c:307
+#:../addressbook/libebook/e-book.c:519 ../addressbook/libebook/e-book.c:523
+#:../addressbook/libebook/e-book.c:660 ../addressbook/libebook/e-book.c:664
+#:../addressbook/libebook/e-book.c:753 ../addressbook/libebook/e-book.c:757
+#:../addressbook/libebook/e-book.c:1073 ../addressbook/libebook/e-book.c:1076
+#:../addressbook/libebook/e-book.c:1267 ../addressbook/libebook/e-book.c:1270
+#:../addressbook/libebook/e-book.c:1425 ../addressbook/libebook/e-book.c:1429
+#:../addressbook/libebook/e-book.c:1644 ../addressbook/libebook/e-book.c:1648
+#:../addressbook/libebook/e-book.c:1896 ../addressbook/libebook/e-book.c:1900
+#:../addressbook/libebook/e-book.c:2122 ../addressbook/libebook/e-book.c:2126
+#:../addressbook/libebook/e-book.c:2333 ../addressbook/libebook/e-book.c:2337
+#:../addressbook/libebook/e-book.c:2582 ../addressbook/libebook/e-book.c:2669
+#:../addressbook/libebook/e-book.c:2673 ../addressbook/libebook/e-book.c:2875
+#:../addressbook/libebook/e-book.c:2879 ../addressbook/libebook/e-book.c:3401
+#,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\""
+msgstr "Gặp lỗi ngoại lệ CORBA khi làm việc gọi « %s »"
 
-#: ../addressbook/libebook/e-book.c:2563
-#, c-format
+#:../addressbook/libebook/e-book.c:2563
+#,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:2598
-#, c-format
+#:../addressbook/libebook/e-book.c:2598
+#,c-format
 msgid "%s: couldn't cancel"
 msgstr "%s: không thể thôi"
 
-#: ../addressbook/libebook/e-book.c:2627 ../addressbook/libebook/e-book.c:2631
-#, c-format
+#:../addressbook/libebook/e-book.c:2627 ../addressbook/libebook/e-book.c:2631
+#,c-format
 msgid "\"%s\" on book after \"%s\""
 msgstr "\"%s\" trong sổ sau \"%s\""
 
-#: ../addressbook/libebook/e-book.c:2697
-#, c-format
+#:../addressbook/libebook/e-book.c:2697
+#,c-format
 msgid "%s: cancelled"
 msgstr "%s: đã thôi rồì"
 
-#: ../addressbook/libebook/e-book.c:3258
-#, c-format
+#:../addressbook/libebook/e-book.c:3258
+#,c-format
 msgid "%s: Invalid source."
 msgstr "%s: mục nguồn không hợp lệ"
 
-#: ../addressbook/libebook/e-book.c:3266 ../addressbook/libebook/e-book.c:3330
-#, c-format
+#:../addressbook/libebook/e-book.c:3266 ../addressbook/libebook/e-book.c:3330
+#,c-format
 msgid "%s: no factories available for uri `%s'"
 msgstr "%s: không có bộ xưởng sẵn sằng cho địa chỉ Mạng `%s'"
 
-#: ../addressbook/libebook/e-book.c:3278
-#, c-format
+#:../addressbook/libebook/e-book.c:3278
+#,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:3541
-#, c-format
+#:../addressbook/libebook/e-book.c:3541
+#,c-format
 msgid "%s: there was no self contact uid stored in gconf"
 msgstr "%s: không có UID liên lạc mình được lưu vào gconf"
 
-#: ../addressbook/libebook/e-book.c:3671
-#, c-format
+#:../addressbook/libebook/e-book.c:3671
+#,c-format
 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-contact.c:102
+#:../addressbook/libebook/e-contact.c:108
 msgid "Unique ID"
 msgstr "ID duy nhất"
 
-#: ../addressbook/libebook/e-contact.c:103
+#:../addressbook/libebook/e-contact.c:109
 msgid "File Under"
 msgstr "Ghi lưu là"
 
-#. 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:109
+#.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:115
 msgid "Full Name"
 msgstr "Tên đầy đủ"
 
-#: ../addressbook/libebook/e-contact.c:110
+#:../addressbook/libebook/e-contact.c:116
 msgid "Name"
 msgstr "Tên"
 
-#: ../addressbook/libebook/e-contact.c:111
+#:../addressbook/libebook/e-contact.c:117
 msgid "Given Name"
 msgstr "Tên"
 
-#: ../addressbook/libebook/e-contact.c:112
+#:../addressbook/libebook/e-contact.c:118
 msgid "Family Name"
 msgstr "Họ"
 
-#: ../addressbook/libebook/e-contact.c:113
+#:../addressbook/libebook/e-contact.c:119
 msgid "Nickname"
 msgstr "Tên hiệu"
 
-#: ../addressbook/libebook/e-contact.c:114
+#:../addressbook/libebook/e-contact.c:120
 msgid "Name or Org"
 msgstr "Tên hoặc Tổ chức"
 
-#. Address fields
-#: ../addressbook/libebook/e-contact.c:117
+#.Address fields
+#:../addressbook/libebook/e-contact.c:123
 msgid "Address List"
 msgstr "Danh sách địa chỉ"
 
-#: ../addressbook/libebook/e-contact.c:118
+#:../addressbook/libebook/e-contact.c:124
 msgid "Home Address"
 msgstr "Địa chỉ nhà"
 
-#: ../addressbook/libebook/e-contact.c:119
+#:../addressbook/libebook/e-contact.c:125
 msgid "Work Address"
 msgstr "Địa chỉ làm việc"
 
-#: ../addressbook/libebook/e-contact.c:120
+#:../addressbook/libebook/e-contact.c:126
 msgid "Other Address"
 msgstr "Địa chỉ khác"
 
-#: ../addressbook/libebook/e-contact.c:122
+#:../addressbook/libebook/e-contact.c:128
 msgid "Home Address Label"
 msgstr "Nhãn địa chỉ nhà"
 
-#: ../addressbook/libebook/e-contact.c:123
+#:../addressbook/libebook/e-contact.c:129
 msgid "Work Address Label"
 msgstr "Nhãn địa chỉ làm việc"
 
-#: ../addressbook/libebook/e-contact.c:124
+#:../addressbook/libebook/e-contact.c:130
 msgid "Other Address Label"
 msgstr "Nhãn địa chỉ khác"
 
-#: ../addressbook/libebook/e-contact.c:126
+#:../addressbook/libebook/e-contact.c:132
 msgid "Assistant Phone"
 msgstr "Điện thoại phụ tá"
 
-#: ../addressbook/libebook/e-contact.c:127
+#:../addressbook/libebook/e-contact.c:133
 msgid "Business Phone"
 msgstr "Điện thoại kinh doanh"
 
-#: ../addressbook/libebook/e-contact.c:128
+#:../addressbook/libebook/e-contact.c:134
 msgid "Business Phone 2"
 msgstr "Điện thoại kinh doanh 2"
 
-#: ../addressbook/libebook/e-contact.c:129
+#:../addressbook/libebook/e-contact.c:135
 msgid "Business Fax"
 msgstr "Điện thư kinh doanh"
 
-#: ../addressbook/libebook/e-contact.c:130
+#:../addressbook/libebook/e-contact.c:136
 msgid "Callback Phone"
 msgstr "Số gọi lại"
 
-#: ../addressbook/libebook/e-contact.c:131
+#:../addressbook/libebook/e-contact.c:137
 msgid "Car Phone"
 msgstr "Điện thoại xe"
 
-#: ../addressbook/libebook/e-contact.c:132
+#:../addressbook/libebook/e-contact.c:138
 msgid "Company Phone"
 msgstr "Điện thoại công ty"
 
-#: ../addressbook/libebook/e-contact.c:133
+#:../addressbook/libebook/e-contact.c:139
 msgid "Home Phone"
 msgstr "Điện thoại nhà"
 
-#: ../addressbook/libebook/e-contact.c:134
+#:../addressbook/libebook/e-contact.c:140
 msgid "Home Phone 2"
 msgstr "Điện thoại nhà 2"
 
-#: ../addressbook/libebook/e-contact.c:135
+#:../addressbook/libebook/e-contact.c:141
 msgid "Home Fax"
 msgstr "Điện thư ở nhà"
 
-#: ../addressbook/libebook/e-contact.c:136
+#:../addressbook/libebook/e-contact.c:142
 msgid "ISDN"
 msgstr "ISDN"
 
-#: ../addressbook/libebook/e-contact.c:137
+#:../addressbook/libebook/e-contact.c:143
 msgid "Mobile Phone"
 msgstr "Điện thoại di động"
 
-#: ../addressbook/libebook/e-contact.c:138
+#:../addressbook/libebook/e-contact.c:144
 msgid "Other Phone"
 msgstr "Điện thoại khác"
 
-#: ../addressbook/libebook/e-contact.c:139
+#:../addressbook/libebook/e-contact.c:145
 msgid "Other Fax"
 msgstr "Điện thư khác"
 
-#: ../addressbook/libebook/e-contact.c:140
+#:../addressbook/libebook/e-contact.c:146
 msgid "Pager"
 msgstr "Số nhắn tin"
 
-#: ../addressbook/libebook/e-contact.c:141
+#:../addressbook/libebook/e-contact.c:147
 msgid "Primary Phone"
 msgstr "Điện thoại chính"
 
-#: ../addressbook/libebook/e-contact.c:142
+#:../addressbook/libebook/e-contact.c:148
 msgid "Radio"
 msgstr "Rađiô"
 
-#: ../addressbook/libebook/e-contact.c:143
+#:../addressbook/libebook/e-contact.c:149
 msgid "Telex"
 msgstr "Telex"
 
-#: ../addressbook/libebook/e-contact.c:144
+#:../addressbook/libebook/e-contact.c:150
 msgid "TTY"
 msgstr "TTY"
 
-#. Email fields
-#: ../addressbook/libebook/e-contact.c:147
+#.Email fields
+#:../addressbook/libebook/e-contact.c:153
 msgid "Email List"
 msgstr "Danh sách thư điện từ"
 
-#: ../addressbook/libebook/e-contact.c:148
+#:../addressbook/libebook/e-contact.c:154
 msgid "Email 1"
 msgstr "Thư điện tử 1"
 
-#: ../addressbook/libebook/e-contact.c:149
+#:../addressbook/libebook/e-contact.c:155
 msgid "Email 2"
 msgstr "Thư điện tử 2"
 
-#: ../addressbook/libebook/e-contact.c:150
+#:../addressbook/libebook/e-contact.c:156
 msgid "Email 3"
 msgstr "Thư điện tử 3"
 
-#: ../addressbook/libebook/e-contact.c:151
+#:../addressbook/libebook/e-contact.c:157
 msgid "Email 4"
 msgstr "Thư điện tử 4"
 
-#: ../addressbook/libebook/e-contact.c:152
+#:../addressbook/libebook/e-contact.c:158
 msgid "Mailer"
 msgstr "Trình thư"
 
-#: ../addressbook/libebook/e-contact.c:153
+#:../addressbook/libebook/e-contact.c:159
 msgid "Wants HTML Mail"
 msgstr "Muốn thư dạng HTML"
 
-#. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:156
+#.Instant messaging fields
+#:../addressbook/libebook/e-contact.c:162
 msgid "AIM Screen Name List"
 msgstr "Danh sách tên màn hình AIM"
 
-#: ../addressbook/libebook/e-contact.c:157
+#:../addressbook/libebook/e-contact.c:163
 msgid "GroupWise Id List"
 msgstr "Danh sách ID GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:158
+#:../addressbook/libebook/e-contact.c:164
 msgid "Jabber Id List"
 msgstr "Danh sách ID Jabber"
 
-#: ../addressbook/libebook/e-contact.c:159
+#:../addressbook/libebook/e-contact.c:165
 msgid "Yahoo! Screen Name List"
 msgstr "Danh sách tên màn hình Yahoo"
 
-#: ../addressbook/libebook/e-contact.c:160
+#:../addressbook/libebook/e-contact.c:166
 msgid "MSN Screen Name List"
 msgstr "Danh sách tên màn hình MSN"
 
-#: ../addressbook/libebook/e-contact.c:161
+#:../addressbook/libebook/e-contact.c:167
 msgid "ICQ Id List"
 msgstr "Danh sách ID ICQ"
 
-#: ../addressbook/libebook/e-contact.c:163
+#:../addressbook/libebook/e-contact.c:169
 msgid "AIM Home Screen Name 1"
 msgstr "Tên màn hình AIM ở nhà 1"
 
-#: ../addressbook/libebook/e-contact.c:164
+#:../addressbook/libebook/e-contact.c:170
 msgid "AIM Home Screen Name 2"
 msgstr "Tên màn hình AIM ở nhà 2"
 
-#: ../addressbook/libebook/e-contact.c:165
+#:../addressbook/libebook/e-contact.c:171
 msgid "AIM Home Screen Name 3"
 msgstr "Tên màn hình AIM ở nhà 3"
 
-#: ../addressbook/libebook/e-contact.c:166
+#:../addressbook/libebook/e-contact.c:172
 msgid "AIM Work Screen Name 1"
 msgstr "Tên màn hình AIM ở chỗ làm 1"
 
-#: ../addressbook/libebook/e-contact.c:167
+#:../addressbook/libebook/e-contact.c:173
 msgid "AIM Work Screen Name 2"
 msgstr "Tên màn hình AIM ở chỗ làm 2"
 
-#: ../addressbook/libebook/e-contact.c:168
+#:../addressbook/libebook/e-contact.c:174
 msgid "AIM Work Screen Name 3"
 msgstr "Tên màn hình AIM ở chỗ làm 3"
 
-#: ../addressbook/libebook/e-contact.c:169
+#:../addressbook/libebook/e-contact.c:175
 msgid "GroupWise Home Screen Name 1"
 msgstr "Tên màn hình GroupWise ở nhà 1"
 
-#: ../addressbook/libebook/e-contact.c:170
+#:../addressbook/libebook/e-contact.c:176
 msgid "GroupWise Home Screen Name 2"
 msgstr "Tên màn hình GroupWise ở nhà 2"
 
-#: ../addressbook/libebook/e-contact.c:171
+#:../addressbook/libebook/e-contact.c:177
 msgid "GroupWise Home Screen Name 3"
 msgstr "Tên màn hình GroupWise ở nhà 3"
 
-#: ../addressbook/libebook/e-contact.c:172
+#:../addressbook/libebook/e-contact.c:178
 msgid "GroupWise Work Screen Name 1"
 msgstr "Tên màn hình GroupWise ở chỗ làm 1"
 
-#: ../addressbook/libebook/e-contact.c:173
+#:../addressbook/libebook/e-contact.c:179
 msgid "GroupWise Work Screen Name 2"
 msgstr "Tên màn hình Groupwise ở chỗ làm 2"
 
-#: ../addressbook/libebook/e-contact.c:174
+#:../addressbook/libebook/e-contact.c:180
 msgid "GroupWise Work Screen Name 3"
 msgstr "Tên màn hình GroupWise ở chỗ làm 3"
 
-#: ../addressbook/libebook/e-contact.c:175
+#:../addressbook/libebook/e-contact.c:181
 msgid "Jabber Home Id 1"
 msgstr "ID Jabber ở nhà 1"
 
-#: ../addressbook/libebook/e-contact.c:176
+#:../addressbook/libebook/e-contact.c:182
 msgid "Jabber Home Id 2"
 msgstr "ID Jabber ở nhà 2"
 
-#: ../addressbook/libebook/e-contact.c:177
+#:../addressbook/libebook/e-contact.c:183
 msgid "Jabber Home Id 3"
 msgstr "ID Jabber ở nhà 3"
 
-#: ../addressbook/libebook/e-contact.c:178
+#:../addressbook/libebook/e-contact.c:184
 msgid "Jabber Work Id 1"
 msgstr "ID Jabber ở chỗ làm 1"
 
-#: ../addressbook/libebook/e-contact.c:179
+#:../addressbook/libebook/e-contact.c:185
 msgid "Jabber Work Id 2"
 msgstr "ID Jabber ở chỗ làm 2"
 
-#: ../addressbook/libebook/e-contact.c:180
+#:../addressbook/libebook/e-contact.c:186
 msgid "Jabber Work Id 3"
 msgstr "ID Jabber ở chỗ làm 3"
 
-#: ../addressbook/libebook/e-contact.c:181
+#:../addressbook/libebook/e-contact.c:187
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Tên màn hình Yahoo ở nhà 1"
 
-#: ../addressbook/libebook/e-contact.c:182
+#:../addressbook/libebook/e-contact.c:188
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Tên màn hình Yahoo ở nhà 2"
 
-#: ../addressbook/libebook/e-contact.c:183
+#:../addressbook/libebook/e-contact.c:189
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Tên màn hình Yahoo ở nhà 3"
 
-#: ../addressbook/libebook/e-contact.c:184
+#:../addressbook/libebook/e-contact.c:190
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Tên màn hình Yahoo ở chỗ làm 1"
 
-#: ../addressbook/libebook/e-contact.c:185
+#:../addressbook/libebook/e-contact.c:191
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Tên màn hình Yahoo ở chỗ làm 2"
 
-#: ../addressbook/libebook/e-contact.c:186
+#:../addressbook/libebook/e-contact.c:192
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Tên màn hình Yahoo ở chỗ làm 3"
 
-#: ../addressbook/libebook/e-contact.c:187
+#:../addressbook/libebook/e-contact.c:193
 msgid "MSN Home Screen Name 1"
 msgstr "Tên màn hình MSN ở nhà 1"
 
-#: ../addressbook/libebook/e-contact.c:188
+#:../addressbook/libebook/e-contact.c:194
 msgid "MSN Home Screen Name 2"
 msgstr "Tên màn hình MSN ở nhà 2"
 
-#: ../addressbook/libebook/e-contact.c:189
+#:../addressbook/libebook/e-contact.c:195
 msgid "MSN Home Screen Name 3"
 msgstr "Tên màn hình MSN ở nhà 3"
 
-#: ../addressbook/libebook/e-contact.c:190
+#:../addressbook/libebook/e-contact.c:196
 msgid "MSN Work Screen Name 1"
 msgstr "Tên màn hình MSN ở chỗ làm 1"
 
-#: ../addressbook/libebook/e-contact.c:191
+#:../addressbook/libebook/e-contact.c:197
 msgid "MSN Work Screen Name 2"
 msgstr "Tên màn hình MSN ở chỗ làm 2"
 
-#: ../addressbook/libebook/e-contact.c:192
+#:../addressbook/libebook/e-contact.c:198
 msgid "MSN Work Screen Name 3"
 msgstr "Tên màn hình MSN ở chỗ làm 3"
 
-#: ../addressbook/libebook/e-contact.c:193
+#:../addressbook/libebook/e-contact.c:199
 msgid "ICQ Home Id 1"
 msgstr "ID ICQ ở nhà 1"
 
-#: ../addressbook/libebook/e-contact.c:194
+#:../addressbook/libebook/e-contact.c:200
 msgid "ICQ Home Id 2"
 msgstr "ID ICQ ở nhà 2"
 
-#: ../addressbook/libebook/e-contact.c:195
+#:../addressbook/libebook/e-contact.c:201
 msgid "ICQ Home Id 3"
 msgstr "ID ICQ ở nhà 3"
 
-#: ../addressbook/libebook/e-contact.c:196
+#:../addressbook/libebook/e-contact.c:202
 msgid "ICQ Work Id 1"
 msgstr "ID ICQ ở chỗ làm 1"
 
-#: ../addressbook/libebook/e-contact.c:197
+#:../addressbook/libebook/e-contact.c:203
 msgid "ICQ Work Id 2"
 msgstr "ID ICQ ở chỗ làm 2\t"
 
-#: ../addressbook/libebook/e-contact.c:198
+#:../addressbook/libebook/e-contact.c:204
 msgid "ICQ Work Id 3"
 msgstr "ID ICQ ở chỗ làm 3"
 
-#. Organizational fields
-#: ../addressbook/libebook/e-contact.c:201
+#.Organizational fields
+#:../addressbook/libebook/e-contact.c:207
 msgid "Organization"
 msgstr "Tổ chức"
 
-#: ../addressbook/libebook/e-contact.c:202
+#:../addressbook/libebook/e-contact.c:208
 msgid "Organizational Unit"
 msgstr "Đơn vị tổ chức"
 
-#: ../addressbook/libebook/e-contact.c:203
+#:../addressbook/libebook/e-contact.c:209
 msgid "Office"
 msgstr "Văn phòng"
 
-#: ../addressbook/libebook/e-contact.c:205
+#:../addressbook/libebook/e-contact.c:211
 msgid "Title"
 msgstr "Tựa đề"
 
-#: ../addressbook/libebook/e-contact.c:206
+#:../addressbook/libebook/e-contact.c:212
 msgid "Role"
 msgstr "Vai trò"
 
-#: ../addressbook/libebook/e-contact.c:207
+#:../addressbook/libebook/e-contact.c:213
 msgid "Manager"
 msgstr "Quản lý"
 
-#: ../addressbook/libebook/e-contact.c:208
+#:../addressbook/libebook/e-contact.c:214
 msgid "Assistant"
 msgstr "Phụ tá"
 
-#. Web fields
-#: ../addressbook/libebook/e-contact.c:211
+#.Web fields
+#:../addressbook/libebook/e-contact.c:217
 msgid "Homepage URL"
 msgstr "Địa chỉ trang chủ Mạng"
 
-#: ../addressbook/libebook/e-contact.c:212
+#:../addressbook/libebook/e-contact.c:218
 msgid "Weblog URL"
 msgstr "Địa chỉ sổ ký sự Mạng"
 
-#: ../addressbook/libebook/e-contact.c:213
+#:../addressbook/libebook/e-contact.c:219
 msgid "Video Conferencing URL"
 msgstr "Địa chỉ hội thảo trực tuyến"
 
-#. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:216
+#.Photo/Logo
+#:../addressbook/libebook/e-contact.c:222
 msgid "Photo"
 msgstr "Ảnh"
 
-#: ../addressbook/libebook/e-contact.c:217
+#:../addressbook/libebook/e-contact.c:223
 msgid "Logo"
 msgstr "Biểu hình"
 
-#. Security fields
-#: ../addressbook/libebook/e-contact.c:220
+#.Security fields
+#:../addressbook/libebook/e-contact.c:226
 msgid "X.509 Certificate"
 msgstr "Chứng nhận X.509"
 
-#. Contact categories
-#: ../addressbook/libebook/e-contact.c:223
+#.Contact categories
+#:../addressbook/libebook/e-contact.c:229
 msgid "Category List"
 msgstr "Danh sách phân loại"
 
-#: ../addressbook/libebook/e-contact.c:224
-#: ../libedataserverui/e-categories-dialog.c:397
+#:../addressbook/libebook/e-contact.c:230
+#:../libedataserverui/e-categories-dialog.c:410
 msgid "Categories"
 msgstr "Phân loại"
 
-#. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:227
+#.Collaboration fields
+#:../addressbook/libebook/e-contact.c:233
 msgid "Calendar URI"
 msgstr "URI lịch"
 
-#: ../addressbook/libebook/e-contact.c:228
+#:../addressbook/libebook/e-contact.c:234
 msgid "Free/Busy URL"
 msgstr "Địa chỉ Mạng Rảnh/Bận"
 
-#: ../addressbook/libebook/e-contact.c:229
+#:../addressbook/libebook/e-contact.c:235
 msgid "ICS Calendar"
 msgstr "Lịch ICS"
 
-#. Misc fields
-#: ../addressbook/libebook/e-contact.c:232
+#.Misc fields
+#:../addressbook/libebook/e-contact.c:238
 msgid "Spouse's Name"
 msgstr "Tên vợ/chồng"
 
-#: ../addressbook/libebook/e-contact.c:233
+#:../addressbook/libebook/e-contact.c:239
 msgid "Note"
 msgstr "Ghi chú"
 
-#: ../addressbook/libebook/e-contact.c:235
+#:../addressbook/libebook/e-contact.c:241
 msgid "Birth Date"
 msgstr "Ngày sinh"
 
-#. Make sure we have all categories
-#: ../addressbook/libebook/e-contact.c:236
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:453
-#: ../libedataserver/e-categories.c:236
+#.Add default categories only if gconf doesn't contain any category list
+#.Make sure we have all categories
+#:../addressbook/libebook/e-contact.c:242
+#:../calendar/backends/contacts/e-cal-backend-contacts.c:460
+#:../libedataserver/e-categories.c:240
 msgid "Anniversary"
 msgstr "Kỷ niệm"
 
-#: ../addressbook/libebook/e-contact.c:238
+#:../addressbook/libebook/e-contact.c:244
 msgid "List"
 msgstr "Danh sách"
 
-#: ../addressbook/libebook/e-contact.c:239
+#:../addressbook/libebook/e-contact.c:245
 msgid "List Show Addresses"
 msgstr "Danh sách: hiện địa chỉ"
 
-#. Last modified time
-#: ../addressbook/libebook/e-contact.c:242
+#.Last modified time
+#:../addressbook/libebook/e-contact.c:248
 msgid "Last Revision"
 msgstr "Sửa đổi mới nhất"
 
-#. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:244
+#.URI of the book to which the contact belongs to
+#:../addressbook/libebook/e-contact.c:250
 msgid "Book URI"
 msgstr "URI Sách"
 
-#: ../addressbook/libebook/e-contact.c:1232
-#: ../addressbook/libebook/e-destination.c:751
+#:../addressbook/libebook/e-contact.c:1238
+#:../addressbook/libebook/e-destination.c:751
 msgid "Unnamed List"
 msgstr "Danh sách vô danh"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:455
-#: ../libedataserver/e-categories.c:237
+#:../calendar/backends/contacts/e-cal-backend-contacts.c:462
+#:../libedataserver/e-categories.c:241
 msgid "Birthday"
 msgstr "Ngày sinh"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:481
-#, c-format
+#:../calendar/backends/contacts/e-cal-backend-contacts.c:488
+#,c-format
 msgid "Birthday: %s"
 msgstr "Ngày sinh: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:505
-#, c-format
+#:../calendar/backends/contacts/e-cal-backend-contacts.c:512
+#,c-format
 msgid "Anniversary: %s"
 msgstr "Kỷ niệm: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:193
+#:../calendar/backends/file/e-cal-backend-file.c:203
 msgid "Can't save calendar data: Malformed URI."
 msgstr "Không thể lưu dữ liệu lịch: URI sai."
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:860
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1319
+#:../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:871
+#:../camel/providers/groupwise/camel-groupwise-folder.c:1437
 msgid "Reply Requested: by "
-msgstr "Trả lời được yêu cầu: do"
+msgstr "Trả lời được yêu cầu: do "
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:865
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1324
+#:../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:876
+#:../camel/providers/groupwise/camel-groupwise-folder.c:1442
 msgid "Reply Requested: When convenient"
 msgstr "Trả lời được yêu cầu: khi tiện"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:177
-#, c-format
+#:../calendar/backends/groupwise/e-cal-backend-groupwise.c:191
+#,c-format
 msgid "Loading %s items"
 msgstr "Đang tải %s mục"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:723
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:254
+#:../calendar/backends/groupwise/e-cal-backend-groupwise.c:715
+#:../servers/exchange/storage/exchange-hierarchy-foreign.c:257
 msgid "Calendar"
 msgstr "Lịch"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:779
+#:../calendar/backends/groupwise/e-cal-backend-groupwise.c:771
 msgid "Invalid server URI"
 msgstr "URI máy phục vụ không hợp lệ"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:795
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:804
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:886
-#: ../calendar/libecal/e-cal.c:5040
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:805
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:824
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:852
-#: ../camel/providers/groupwise/camel-groupwise-store.c:484
-#: ../camel/providers/groupwise/camel-groupwise-store.c:499
-#: ../camel/providers/groupwise/camel-groupwise-store.c:531
-#: ../camel/providers/groupwise/camel-groupwise-store.c:707
-#: ../camel/providers/groupwise/camel-groupwise-store.c:930
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:178
+#:../calendar/backends/groupwise/e-cal-backend-groupwise.c:787
+#:../calendar/backends/groupwise/e-cal-backend-groupwise.c:796
+#:../calendar/backends/groupwise/e-cal-backend-groupwise.c:881
+#:../calendar/libecal/e-cal.c:5131
+#:../camel/providers/groupwise/camel-groupwise-folder.c:891
+#:../camel/providers/groupwise/camel-groupwise-folder.c:911
+#:../camel/providers/groupwise/camel-groupwise-folder.c:939
+#:../camel/providers/groupwise/camel-groupwise-store.c:517
+#:../camel/providers/groupwise/camel-groupwise-store.c:532
+#:../camel/providers/groupwise/camel-groupwise-store.c:574
+#:../camel/providers/groupwise/camel-groupwise-store.c:1061
+#:../camel/providers/groupwise/camel-groupwise-transport.c:178
 msgid "Authentication failed"
 msgstr "Xác thực thất bại"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:845
+#:../calendar/backends/groupwise/e-cal-backend-groupwise.c:837
 msgid "Could not create thread for getting deltas"
 msgstr "Không thể tạo mạch để lấy các delta"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:870
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1113
-#: ../calendar/backends/http/e-cal-backend-http.c:495
-#: ../calendar/backends/weather/e-cal-backend-weather.c:444
+#:../calendar/backends/groupwise/e-cal-backend-groupwise.c:862
+#:../calendar/backends/groupwise/e-cal-backend-groupwise.c:1109
+#:../calendar/backends/http/e-cal-backend-http.c:504
+#:../calendar/backends/weather/e-cal-backend-weather.c:452
 msgid "Could not create cache file"
 msgstr "Không thể tạo tập tin nhớ tạm"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:880
+#:../calendar/backends/groupwise/e-cal-backend-groupwise.c:875
 msgid "Could not create thread for populating cache"
 msgstr "Không thể tạo mạch để đồ án bộ nhớ tạm"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:240
+#:../calendar/backends/http/e-cal-backend-http.c:248
 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:264
+#:../calendar/backends/http/e-cal-backend-http.c:272
 msgid "Bad file format."
 msgstr "Dạng thức tập tin sai."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:270
+#:../calendar/backends/http/e-cal-backend-http.c:278
 msgid "Not a calendar."
 msgstr "Không phải lịch."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:140
+#:../calendar/backends/weather/e-cal-backend-weather.c:142
 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:194
+#:../calendar/backends/weather/e-cal-backend-weather.c:200
 msgid "Fair"
 msgstr "Đẹp"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:195
+#:../calendar/backends/weather/e-cal-backend-weather.c:201
 msgid "Snow showers"
 msgstr "Mưa tuyết"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:196
+#:../calendar/backends/weather/e-cal-backend-weather.c:202
 msgid "Snow"
 msgstr "Tuyết"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:197
+#:../calendar/backends/weather/e-cal-backend-weather.c:203
 msgid "Partly cloudy"
 msgstr "Phần mây"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:198
+#:../calendar/backends/weather/e-cal-backend-weather.c:204
 msgid "Smoke"
 msgstr "Khói"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:199
+#:../calendar/backends/weather/e-cal-backend-weather.c:205
 msgid "Thunderstorms"
 msgstr "Bão kèm sấm"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:200
+#:../calendar/backends/weather/e-cal-backend-weather.c:206
 msgid "Cloudy"
 msgstr "Đầy mây"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:201
+#:../calendar/backends/weather/e-cal-backend-weather.c:207
 msgid "Drizzle"
 msgstr "Mưa phùn"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:202
+#:../calendar/backends/weather/e-cal-backend-weather.c:208
 msgid "Sunny"
 msgstr "Trời có nắng"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:203
+#:../calendar/backends/weather/e-cal-backend-weather.c:209
 msgid "Dust"
 msgstr "Bụi"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:204
+#:../calendar/backends/weather/e-cal-backend-weather.c:210
 msgid "Clear"
 msgstr "Trong sáng"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:205
+#:../calendar/backends/weather/e-cal-backend-weather.c:211
 msgid "Mostly cloudy"
 msgstr "Gần đầy mây"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:206
+#:../calendar/backends/weather/e-cal-backend-weather.c:212
 msgid "Windy"
 msgstr "Gió to"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:207
+#:../calendar/backends/weather/e-cal-backend-weather.c:213
 msgid "Rain showers"
 msgstr "Mưa rào"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:208
+#:../calendar/backends/weather/e-cal-backend-weather.c:214
 msgid "Foggy"
 msgstr "Sương mù"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:209
+#:../calendar/backends/weather/e-cal-backend-weather.c:215
 msgid "Rain/snow mixed"
 msgstr "Mưa/tuyết lẫn nhau"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:210
+#:../calendar/backends/weather/e-cal-backend-weather.c:216
 msgid "Sleet"
 msgstr "Mưa tuyết"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:211
+#:../calendar/backends/weather/e-cal-backend-weather.c:217
 msgid "Very hot/humid"
 msgstr "Nóng lắm/ẩm ướt"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:212
+#:../calendar/backends/weather/e-cal-backend-weather.c:218
 msgid "Blizzard"
 msgstr "Trận bão tuyết"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:213
+#:../calendar/backends/weather/e-cal-backend-weather.c:219
 msgid "Freezing rain"
 msgstr "Mưa ớn lạnh"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:214
+#:../calendar/backends/weather/e-cal-backend-weather.c:220
 msgid "Haze"
 msgstr "Mù"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:215
+#:../calendar/backends/weather/e-cal-backend-weather.c:221
 msgid "Blowing snow"
 msgstr "Gió tuyết"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:216
+#:../calendar/backends/weather/e-cal-backend-weather.c:222
 msgid "Freezing drizzle"
 msgstr "Mưa phùn ớn lạnh"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:217
+#:../calendar/backends/weather/e-cal-backend-weather.c:223
 msgid "Very cold/wind chill"
 msgstr "Lạnh lắm/gió giảm nhiệt độ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:218
+#:../calendar/backends/weather/e-cal-backend-weather.c:224
 msgid "Rain"
 msgstr "Mưa"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:228
-#: ../calendar/backends/weather/e-cal-backend-weather.c:236
-#: ../calendar/backends/weather/e-cal-backend-weather.c:238
-#: ../calendar/backends/weather/e-cal-backend-weather.c:245
+#:../calendar/backends/weather/e-cal-backend-weather.c:234
+#:../calendar/backends/weather/e-cal-backend-weather.c:242
+#:../calendar/backends/weather/e-cal-backend-weather.c:244
+#:../calendar/backends/weather/e-cal-backend-weather.c:251
 msgid "Weather: Sunny"
 msgstr "Thời tiết: trời nắng"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:229
-#: ../calendar/backends/weather/e-cal-backend-weather.c:230
-#: ../calendar/backends/weather/e-cal-backend-weather.c:246
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#:../calendar/backends/weather/e-cal-backend-weather.c:235
+#:../calendar/backends/weather/e-cal-backend-weather.c:236
+#:../calendar/backends/weather/e-cal-backend-weather.c:252
+#:../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Snow"
 msgstr "Thời tiết: tuyết"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:231
+#:../calendar/backends/weather/e-cal-backend-weather.c:237
 msgid "Weather: Partly Cloudy"
 msgstr "Thời tiết: phần mây"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:232
-#: ../calendar/backends/weather/e-cal-backend-weather.c:237
-#: ../calendar/backends/weather/e-cal-backend-weather.c:242
-#: ../calendar/backends/weather/e-cal-backend-weather.c:248
+#:../calendar/backends/weather/e-cal-backend-weather.c:238
+#:../calendar/backends/weather/e-cal-backend-weather.c:243
+#:../calendar/backends/weather/e-cal-backend-weather.c:248
+#:../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Fog"
 msgstr "Thời tiết: sương mù"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:233
+#:../calendar/backends/weather/e-cal-backend-weather.c:239
 msgid "Weather: Thunderstorms"
 msgstr "Thời tiết: bão kèm sấm"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:234
-#: ../calendar/backends/weather/e-cal-backend-weather.c:239
+#:../calendar/backends/weather/e-cal-backend-weather.c:240
+#:../calendar/backends/weather/e-cal-backend-weather.c:245
 msgid "Weather: Cloudy"
 msgstr "Thời tiết: đầy mây"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:235
-#: ../calendar/backends/weather/e-cal-backend-weather.c:241
-#: ../calendar/backends/weather/e-cal-backend-weather.c:243
-#: ../calendar/backends/weather/e-cal-backend-weather.c:244
-#: ../calendar/backends/weather/e-cal-backend-weather.c:247
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#:../calendar/backends/weather/e-cal-backend-weather.c:241
+#:../calendar/backends/weather/e-cal-backend-weather.c:247
+#:../calendar/backends/weather/e-cal-backend-weather.c:249
+#:../calendar/backends/weather/e-cal-backend-weather.c:250
+#:../calendar/backends/weather/e-cal-backend-weather.c:253
+#:../calendar/backends/weather/e-cal-backend-weather.c:256
+#:../calendar/backends/weather/e-cal-backend-weather.c:258
 msgid "Weather: Rain"
 msgstr "Thời tiết: mưa"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:327
-#, c-format
+#:../calendar/backends/weather/e-cal-backend-weather.c:333
+#,c-format
 msgid "%.1f°C - %s"
 msgstr "%.1f°C - %s"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:329
-#, c-format
+#:../calendar/backends/weather/e-cal-backend-weather.c:335
+#,c-format
 msgid "%.1f°F - %s"
 msgstr "%.1f°F - %s"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:332
-#, c-format
+#:../calendar/backends/weather/e-cal-backend-weather.c:338
+#,c-format
 msgid "%.1f/%.1f°C - %s"
 msgstr "%.1f/%.1f°C - %s"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:334
-#, c-format
+#:../calendar/backends/weather/e-cal-backend-weather.c:340
+#,c-format
 msgid "%.1f/%.1f°F - %s"
 msgstr "%.1f/%.1f°F - %s"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:340
-#, c-format
+#:../calendar/backends/weather/e-cal-backend-weather.c:346
+#,c-format
 msgid "%d%% chance of precipitation\n"
 msgstr "%d%% có thể mưa\n"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:347
-#, c-format
+#:../calendar/backends/weather/e-cal-backend-weather.c:353
+#,c-format
 msgid "%.1fcm snow\n"
 msgstr "%.1fcm tuyết\n"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:349
-#, c-format
+#:../calendar/backends/weather/e-cal-backend-weather.c:355
+#,c-format
 msgid "%.1fin snow\n"
 msgstr "%.1fin tuyết\n"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:352
-#, c-format
+#:../calendar/backends/weather/e-cal-backend-weather.c:358
+#,c-format
 msgid "%.1f-%.1fcm snow\n"
 msgstr "%.1f-%.1fcm tuyết\n"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:354
-#, c-format
+#:../calendar/backends/weather/e-cal-backend-weather.c:360
+#,c-format
 msgid "%.1f-%.1fin snow\n"
 msgstr "%.1f-%.1fin tuyết\n"
 
-#: ../calendar/libecal/e-cal-component.c:1314
+#:../calendar/libecal/e-cal-component.c:1322
 msgid "Untitled appointment"
 msgstr "Cuộc hẹn không tên"
 
-#: ../calendar/libecal/e-cal-recur.c:4014
+#:../calendar/libecal/e-cal-recur.c:4026
 msgid "1st"
 msgstr "Ngày 1"
 
-#: ../calendar/libecal/e-cal-recur.c:4015
+#:../calendar/libecal/e-cal-recur.c:4027
 msgid "2nd"
 msgstr "Ngày 2"
 
-#: ../calendar/libecal/e-cal-recur.c:4016
+#:../calendar/libecal/e-cal-recur.c:4028
 msgid "3rd"
 msgstr "Ngày 3"
 
-#: ../calendar/libecal/e-cal-recur.c:4017
+#:../calendar/libecal/e-cal-recur.c:4029
 msgid "4th"
 msgstr "Ngày 4"
 
-#: ../calendar/libecal/e-cal-recur.c:4018
+#:../calendar/libecal/e-cal-recur.c:4030
 msgid "5th"
 msgstr "Ngày 5"
 
-#: ../calendar/libecal/e-cal-recur.c:4019
+#:../calendar/libecal/e-cal-recur.c:4031
 msgid "6th"
 msgstr "Ngày 6"
 
-#: ../calendar/libecal/e-cal-recur.c:4020
+#:../calendar/libecal/e-cal-recur.c:4032
 msgid "7th"
 msgstr "Ngày 7"
 
-#: ../calendar/libecal/e-cal-recur.c:4021
+#:../calendar/libecal/e-cal-recur.c:4033
 msgid "8th"
 msgstr "Ngày 8"
 
-#: ../calendar/libecal/e-cal-recur.c:4022
+#:../calendar/libecal/e-cal-recur.c:4034
 msgid "9th"
 msgstr "Ngày 9"
 
-#: ../calendar/libecal/e-cal-recur.c:4023
+#:../calendar/libecal/e-cal-recur.c:4035
 msgid "10th"
 msgstr "Ngày 10"
 
-#: ../calendar/libecal/e-cal-recur.c:4024
+#:../calendar/libecal/e-cal-recur.c:4036
 msgid "11th"
 msgstr "Ngày 11"
 
-#: ../calendar/libecal/e-cal-recur.c:4025
+#:../calendar/libecal/e-cal-recur.c:4037
 msgid "12th"
 msgstr "Ngày 12"
 
-#: ../calendar/libecal/e-cal-recur.c:4026
+#:../calendar/libecal/e-cal-recur.c:4038
 msgid "13th"
 msgstr "Ngày 13"
 
-#: ../calendar/libecal/e-cal-recur.c:4027
+#:../calendar/libecal/e-cal-recur.c:4039
 msgid "14th"
 msgstr "Ngày 14"
 
-#: ../calendar/libecal/e-cal-recur.c:4028
+#:../calendar/libecal/e-cal-recur.c:4040
 msgid "15th"
 msgstr "Ngày 15"
 
-#: ../calendar/libecal/e-cal-recur.c:4029
+#:../calendar/libecal/e-cal-recur.c:4041
 msgid "16th"
 msgstr "Ngày 16"
 
-#: ../calendar/libecal/e-cal-recur.c:4030
+#:../calendar/libecal/e-cal-recur.c:4042
 msgid "17th"
 msgstr "Ngày 17"
 
-#: ../calendar/libecal/e-cal-recur.c:4031
+#:../calendar/libecal/e-cal-recur.c:4043
 msgid "18th"
 msgstr "Ngày 18"
 
-#: ../calendar/libecal/e-cal-recur.c:4032
+#:../calendar/libecal/e-cal-recur.c:4044
 msgid "19th"
 msgstr "Ngày 19"
 
-#: ../calendar/libecal/e-cal-recur.c:4033
+#:../calendar/libecal/e-cal-recur.c:4045
 msgid "20th"
 msgstr "Ngày 20"
 
-#: ../calendar/libecal/e-cal-recur.c:4034
+#:../calendar/libecal/e-cal-recur.c:4046
 msgid "21st"
 msgstr "Ngày 21"
 
-#: ../calendar/libecal/e-cal-recur.c:4035
+#:../calendar/libecal/e-cal-recur.c:4047
 msgid "22nd"
 msgstr "Ngày 22"
 
-#: ../calendar/libecal/e-cal-recur.c:4036
+#:../calendar/libecal/e-cal-recur.c:4048
 msgid "23rd"
 msgstr "Ngày 23"
 
-#: ../calendar/libecal/e-cal-recur.c:4037
+#:../calendar/libecal/e-cal-recur.c:4049
 msgid "24th"
 msgstr "Ngày 24"
 
-#: ../calendar/libecal/e-cal-recur.c:4038
+#:../calendar/libecal/e-cal-recur.c:4050
 msgid "25th"
 msgstr "Ngày 25"
 
-#: ../calendar/libecal/e-cal-recur.c:4039
+#:../calendar/libecal/e-cal-recur.c:4051
 msgid "26th"
 msgstr "Ngày 26"
 
-#: ../calendar/libecal/e-cal-recur.c:4040
+#:../calendar/libecal/e-cal-recur.c:4052
 msgid "27th"
 msgstr "Ngày 27"
 
-#: ../calendar/libecal/e-cal-recur.c:4041
+#:../calendar/libecal/e-cal-recur.c:4053
 msgid "28th"
 msgstr "Ngày 28"
 
-#: ../calendar/libecal/e-cal-recur.c:4042
+#:../calendar/libecal/e-cal-recur.c:4054
 msgid "29th"
 msgstr "Ngày 29"
 
-#: ../calendar/libecal/e-cal-recur.c:4043
+#:../calendar/libecal/e-cal-recur.c:4055
 msgid "30th"
 msgstr "Ngày 30"
 
-#: ../calendar/libecal/e-cal-recur.c:4044
+#:../calendar/libecal/e-cal-recur.c:4056
 msgid "31st"
 msgstr "Ngày 31"
 
-#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:708
+#:../calendar/libecal/e-cal-util.c:681 ../calendar/libecal/e-cal-util.c:709
 msgid "High"
 msgstr "Cao"
 
-#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:710
+#:../calendar/libecal/e-cal-util.c:683 ../calendar/libecal/e-cal-util.c:711
 msgid "Normal"
 msgstr "Bình thường"
 
-#: ../calendar/libecal/e-cal-util.c:684 ../calendar/libecal/e-cal-util.c:712
+#:../calendar/libecal/e-cal-util.c:685 ../calendar/libecal/e-cal-util.c:713
 msgid "Low"
 msgstr "Thấp"
 
-#. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:706
+#.An empty string is the same as 'None'.
+#:../calendar/libecal/e-cal-util.c:707
 msgid "Undefined"
 msgstr "Chưa định nghĩa"
 
-#. FIXME: Try to get the parent uri so that we dont have to ask the password again
-#: ../calendar/libecal/e-cal.c:1647
-#, c-format
+#.FIXME: Try to get the parent uri so that we dont have to ask the password again
+#:../calendar/libecal/e-cal.c:1705
+#,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 »."
+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:1650 ../libedataserverui/e-book-auth-util.c:192
-#, c-format
+#:../calendar/libecal/e-cal.c:1708 ../libedataserverui/e-book-auth-util.c:192
+#,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)"
 
-#: ../calendar/libecal/e-cal.c:5012
+#:../calendar/libecal/e-cal.c:5103
 msgid "Invalid argument"
 msgstr "Đối số không hợp lệ"
 
-#: ../calendar/libecal/e-cal.c:5014
+#:../calendar/libecal/e-cal.c:5105
 msgid "Backend is busy"
 msgstr "Hậu phương quá bận"
 
-#: ../calendar/libecal/e-cal.c:5016
+#:../calendar/libecal/e-cal.c:5107
 msgid "Repository is offline"
 msgstr "Kho ngoại tuyến"
 
-#: ../calendar/libecal/e-cal.c:5018
+#:../calendar/libecal/e-cal.c:5109
 msgid "No such calendar"
 msgstr "Không có lịch như vậy."
 
-#: ../calendar/libecal/e-cal.c:5020 ../servers/groupwise/e-gw-connection.c:166
+#:../calendar/libecal/e-cal.c:5111 ../servers/groupwise/e-gw-connection.c:172
 msgid "Object not found"
 msgstr "Không tìm thấy đối tượng"
 
-#: ../calendar/libecal/e-cal.c:5022 ../servers/groupwise/e-gw-connection.c:160
+#:../calendar/libecal/e-cal.c:5113 ../servers/groupwise/e-gw-connection.c:166
 msgid "Invalid object"
 msgstr "Đối tượng không hợp lệ"
 
-#: ../calendar/libecal/e-cal.c:5024
+#:../calendar/libecal/e-cal.c:5115
 msgid "URI not loaded"
 msgstr "URI chưa được tải"
 
-#: ../calendar/libecal/e-cal.c:5026
+#:../calendar/libecal/e-cal.c:5117
 msgid "URI already loaded"
 msgstr "URI đã được tải"
 
-#: ../calendar/libecal/e-cal.c:5028
-#: ../servers/exchange/storage/e-storage.c:572
+#:../calendar/libecal/e-cal.c:5119
+#:../servers/exchange/storage/e-storage.c:572
 msgid "Permission denied"
 msgstr "Không đủ quyền truy cập"
 
-#: ../calendar/libecal/e-cal.c:5030 ../servers/groupwise/e-gw-connection.c:168
+#:../calendar/libecal/e-cal.c:5121 ../servers/groupwise/e-gw-connection.c:174
 msgid "Unknown User"
 msgstr "Không biết người dùng"
 
-#: ../calendar/libecal/e-cal.c:5032
+#:../calendar/libecal/e-cal.c:5123
 msgid "Object ID already exists"
 msgstr "ID đốí tượng đã tồn tại"
 
-#: ../calendar/libecal/e-cal.c:5034
+#:../calendar/libecal/e-cal.c:5125
 msgid "Protocol not supported"
 msgstr "Chưa hỗ trợ giao thức này"
 
-#: ../calendar/libecal/e-cal.c:5036
+#:../calendar/libecal/e-cal.c:5127
 msgid "Operation has been cancelled"
 msgstr "Thao tác đã bị hủy bỏ"
 
-#: ../calendar/libecal/e-cal.c:5038
+#:../calendar/libecal/e-cal.c:5129
 msgid "Could not cancel operation"
 msgstr "Không thể hủy bỏ tác vụ"
 
-#: ../calendar/libecal/e-cal.c:5042
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#:../calendar/libecal/e-cal.c:5133
+#:../camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Authentication required"
 msgstr "Cần thiết xác thực"
 
-#: ../calendar/libecal/e-cal.c:5044
+#:../calendar/libecal/e-cal.c:5135
 msgid "A CORBA exception has occurred"
 msgstr "Một lỗi ngoại lệ CORBA đã xảy ra"
 
-#: ../calendar/libecal/e-cal.c:5046
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:211
-#: ../camel/providers/imap/camel-imap-command.c:310
-#: ../camel/providers/imap/camel-imap-command.c:410
-#: ../camel/providers/imap4/camel-imap4-store.c:376
-#: ../camel/providers/pop3/camel-pop3-store.c:535
-#: ../camel/providers/pop3/camel-pop3-store.c:542
-#: ../camel/providers/pop3/camel-pop3-store.c:548
-#: ../servers/exchange/storage/e-storage.c:586
-#: ../servers/groupwise/e-gw-connection.c:174
+#:../calendar/libecal/e-cal.c:5137
+#:../camel/providers/groupwise/camel-groupwise-transport.c:217
+#:../camel/providers/imap/camel-imap-command.c:310
+#:../camel/providers/imap/camel-imap-command.c:410
+#:../camel/providers/imap4/camel-imap4-store.c:380
+#:../camel/providers/pop3/camel-pop3-store.c:533
+#:../camel/providers/pop3/camel-pop3-store.c:540
+#:../camel/providers/pop3/camel-pop3-store.c:546
+#:../servers/exchange/storage/e-storage.c:586
+#:../servers/groupwise/e-gw-connection.c:180
 msgid "Unknown error"
 msgstr "Không biết lỗi"
 
-#: ../calendar/libecal/e-cal.c:5048
-#: ../servers/exchange/storage/e-storage.c:554
+#:../calendar/libecal/e-cal.c:5139
+#:../servers/exchange/storage/e-storage.c:554
 msgid "No error"
 msgstr "Không có lỗi"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:65
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:576
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:769
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:796
-#, c-format
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:65
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:576
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:769
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:796
+#,c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" không cần đến có tham số"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:98
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:208
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:250
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:286
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:834
-#, c-format
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:98
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:208
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:250
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:286
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:834
+#,c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" cần đến một tham số"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:104
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:111
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:292
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:520
-#, c-format
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:104
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:111
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:292
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:520
+#,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/libedata-cal/e-cal-backend-sexp.c:119
-#, c-format
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:119
+#,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/libedata-cal/e-cal-backend-sexp.c:158
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:359
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:514
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:608
-#, c-format
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:158
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:359
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:514
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:608
+#,c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" cần đến hai tham số"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:164
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:214
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:256
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:365
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:614
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:840
-#, c-format
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:164
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:214
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:256
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:365
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:614
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:840
+#,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/libedata-cal/e-cal-backend-sexp.c:172
-#, c-format
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:172
+#,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/libedata-cal/e-cal-backend-sexp.c:373
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:622
-#, c-format
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:373
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:622
+#,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/libedata-cal/e-cal-backend-sexp.c:528
-#, c-format
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:528
+#,c-format
 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:548
-#, c-format
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:548
+#,c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
 "\"description\", or \"location\""
-msgstr ""
-"\"%s\" cần đến đối số thứ nhất là \"any\" (bất kỳ), \"summary\" (tóm tắt), "
+msgstr "\"%s\" cần đến đối số thứ nhất là \"any\" (bất kỳ), \"summary\" (tóm tắt), "
 "\"description\" (mô tả) hoặc \"location\" (vị trí)."
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:671
-#, c-format
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:671
+#,c-format
 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:685
-#, c-format
+#:../calendar/libedata-cal/e-cal-backend-sexp.c:685
+#,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ố đó "
+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)"
 
-#: ../camel/camel-cipher-context.c:103
+#:../camel/camel-cipher-context.c:102
 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:129
+#:../camel/camel-cipher-context.c:128
 msgid "Signing message"
-msgstr "Đang ký thông điệp"
+msgstr "Đang ký thư"
 
-#: ../camel/camel-cipher-context.c:146
+#:../camel/camel-cipher-context.c:145
 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:172
+#:../camel/camel-cipher-context.c:171
 msgid "Verifying message"
-msgstr "Đang xác minh thông điệp"
+msgstr "Đang xác minh thư"
 
-#: ../camel/camel-cipher-context.c:190
+#:../camel/camel-cipher-context.c:189
 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:216
+#:../camel/camel-cipher-context.c:215
 msgid "Encrypting message"
-msgstr "Đang mã hóa thông điệp"
+msgstr "Đang mã hóa thư"
 
-#: ../camel/camel-cipher-context.c:233
+#:../camel/camel-cipher-context.c:232
 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:255
+#:../camel/camel-cipher-context.c:254
 msgid "Decrypting message"
-msgstr "Đang giải mã thông điệp"
+msgstr "Đang giải mã thư"
 
-#: ../camel/camel-cipher-context.c:272
+#:../camel/camel-cipher-context.c:271
 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:302
+#:../camel/camel-cipher-context.c:301
 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:134
+#:../camel/camel-data-cache.c:135
 msgid "Unable to create cache path"
 msgstr "Không thể tạo đường dẫn nhớ tạm"
 
-#: ../camel/camel-data-cache.c:376
-#, c-format
+#:../camel/camel-data-cache.c:382
+#,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-disco-diary.c:195
-#, c-format
+#:../camel/camel-disco-diary.c:197
+#,c-format
 msgid ""
 "Could not write log entry: %s\n"
 "Further operations on this server will not be replayed when you\n"
 "reconnect to the network."
-msgstr ""
-"Không thể ghi mục bản ghi: %s\n"
+msgstr "Không thể ghi mục bản ghi: %s\n"
 "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áí kết nối vào mạng."
 
-#: ../camel/camel-disco-diary.c:258
-#, c-format
+#:../camel/camel-disco-diary.c:260
+#,c-format
 msgid ""
 "Could not open `%s':\n"
 "%s\n"
 "Changes made to this folder will not be resynchronized."
-msgstr ""
-"Không thể mở `%s':\n"
+msgstr "Không thể mở `%s':\n"
 "%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:294
+#:../camel/camel-disco-diary.c:296
 msgid "Resynchronizing with server"
 msgstr "Đang tái đồng bộ với máy phục vụ"
 
-#: ../camel/camel-disco-folder.c:42 ../camel/camel-offline-folder.c:51
+#:../camel/camel-disco-folder.c:42 ../camel/camel-offline-folder.c:50
 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"
+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:104 ../camel/camel-offline-folder.c:110
+#:../camel/camel-disco-folder.c:104 ../camel/camel-offline-folder.c:109
 msgid "Downloading new messages for offline mode"
-msgstr "Đang tải về các thông điệp cho chế độ ngoại tuyến"
+msgstr "Đang tải về các thư cho chế độ ngoại tuyến"
 
-#: ../camel/camel-disco-folder.c:467
-#, c-format
+#:../camel/camel-disco-folder.c:467
+#,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:391
-#: ../camel/providers/imap/camel-imap-store.c:3264
+#:../camel/camel-disco-store.c:401
+#:../camel/providers/groupwise/camel-groupwise-store.c:1252
+#:../camel/providers/imap/camel-imap-store.c:2964
 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-filter-driver.c:701 ../camel/camel-filter-search.c:523
-#, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Lỗi tạo ống dẫn tới '%s': %s"
+#:../camel/camel-exception.c:308
+msgid "No description available"
+msgstr "Không có mô tả"
 
-#: ../camel/camel-filter-driver.c:745
-#, c-format
+#:../camel/camel-filter-driver.c:749
+#,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:788
-#, c-format
+#:../camel/camel-filter-driver.c:791
+#,c-format
 msgid "Invalid message stream received from %s: %s"
-msgstr "Nhận luồng thông điệp không hợp lệ từ %s: %s"
+msgstr "Nhận luồng thư không hợp lệ từ %s: %s"
 
-#: ../camel/camel-filter-driver.c:977 ../camel/camel-filter-driver.c:986
+#:../camel/camel-filter-driver.c:978 ../camel/camel-filter-driver.c:987
 msgid "Syncing folders"
 msgstr "Đang đồng bộ những thư mục"
 
-#: ../camel/camel-filter-driver.c:1075 ../camel/camel-filter-driver.c:1453
-#, c-format
+#:../camel/camel-filter-driver.c:1076 ../camel/camel-filter-driver.c:1454
+#,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:1084 ../camel/camel-filter-driver.c:1462
-#, c-format
+#:../camel/camel-filter-driver.c:1085 ../camel/camel-filter-driver.c:1463
+#,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:1151
+#:../camel/camel-filter-driver.c:1152
 msgid "Unable to open spool folder"
 msgstr "Không thể mở thư mục ống chỉ"
 
-#: ../camel/camel-filter-driver.c:1160
+#:../camel/camel-filter-driver.c:1161
 msgid "Unable to process spool folder"
 msgstr "Không thể xử lý thư mục ống chỉ"
 
-#: ../camel/camel-filter-driver.c:1175
-#, c-format
+#:../camel/camel-filter-driver.c:1176
+#,c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Đang lấy thông diệp %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1179
+#:../camel/camel-filter-driver.c:1180
 msgid "Cannot open message"
-msgstr "Không thể mở thông điệp"
+msgstr "Không thể mở thư"
 
-#: ../camel/camel-filter-driver.c:1180 ../camel/camel-filter-driver.c:1192
-#, c-format
+#:../camel/camel-filter-driver.c:1181 ../camel/camel-filter-driver.c:1193
+#,c-format
 msgid "Failed on message %d"
-msgstr "Lỗi trên thông điệp %d"
+msgstr "Lỗi trên thư %d"
 
-#: ../camel/camel-filter-driver.c:1206 ../camel/camel-filter-driver.c:1297
+#:../camel/camel-filter-driver.c:1207 ../camel/camel-filter-driver.c:1298
 msgid "Syncing folder"
 msgstr "Đang đồng bộ thư mục"
 
-#: ../camel/camel-filter-driver.c:1210 ../camel/camel-filter-driver.c:1302
+#:../camel/camel-filter-driver.c:1211 ../camel/camel-filter-driver.c:1303
 msgid "Complete"
 msgstr "Hoàn tất"
 
-#: ../camel/camel-filter-driver.c:1267
-#, c-format
+#:../camel/camel-filter-driver.c:1268
+#,c-format
 msgid "Getting message %d of %d"
-msgstr "Đang lấy thông điệp %d trên %d"
+msgstr "Đang lấy thư %d trên %d"
 
-#: ../camel/camel-filter-driver.c:1282
-#, c-format
+#:../camel/camel-filter-driver.c:1283
+#,c-format
 msgid "Failed at message %d of %d"
-msgstr "Lỗi tại thông điệp %d trên %d"
+msgstr "Lỗi tại thư %d trên %d"
 
-#: ../camel/camel-filter-search.c:136
+#:../camel/camel-filter-search.c:137
 msgid "Failed to retrieve message"
-msgstr "Lỗi nhận thông điệp"
+msgstr "Lỗi nhận thư"
 
-#: ../camel/camel-filter-search.c:396
+#:../camel/camel-filter-search.c:397
 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:411
+#:../camel/camel-filter-search.c:412
 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:559
-#, c-format
+#:../camel/camel-filter-search.c:577
+#,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:682 ../camel/camel-filter-search.c:690
-#, c-format
+#.A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
+#:../camel/camel-filter-search.c:699 ../camel/camel-filter-search.c:707
+#,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:357 ../camel/camel-folder-search.c:478
-#, c-format
+#:../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:478
+#,c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
-msgstr ""
-"Không thể phân tích biểu thức tìm kiếm: %s:\n"
+msgstr "Không thể phân tích biểu thức tìm kiếm: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:367 ../camel/camel-folder-search.c:488
-#, c-format
+#:../camel/camel-folder-search.c:367 ../camel/camel-folder-search.c:488
+#,c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
-msgstr ""
-"Lỗi thực hiện tìm kiếm theo biểu thức: %s:\n"
+msgstr "Lỗi thực hiện tìm kiếm theo biểu thức: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:674 ../camel/camel-folder-search.c:707
+#:../camel/camel-folder-search.c:674 ../camel/camel-folder-search.c:707
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) [khớp tất cả] cần đến một kết quả Boolean đơn"
 
-#: ../camel/camel-folder-search.c:757
+#:../camel/camel-folder-search.c:757
 msgid "(match-threads) not allowed inside match-all"
-msgstr ""
-"(match-threads) [khớp các mạch] không được phép nằm trong match-all [khớp "
-"tất cả]"
+msgstr "(match-threads) [khớp các mạch] không được phép nằm trong match-all [khớp tất cả]"
 
-#: ../camel/camel-folder-search.c:760 ../camel/camel-folder-search.c:764
+#:../camel/camel-folder-search.c:760 ../camel/camel-folder-search.c:764
 msgid "(match-threads) requires a match type string"
 msgstr "(match-threads) [khớp cac mạch] cần kiểu chuỗi match type [khớp kiểu]"
 
-#: ../camel/camel-folder-search.c:786
+#:../camel/camel-folder-search.c:786
 msgid "(match-threads) expects an array result"
 msgstr "(match-threads) [khớp các mạch] cần đến kết quả array [mảng]"
 
-#: ../camel/camel-folder-search.c:792
+#:../camel/camel-folder-search.c:792
 msgid "(match-threads) requires the folder set"
 msgstr "(match-threads) [khớp các mạch] cần đến đặt thư mục"
 
-#: ../camel/camel-folder-search.c:881
-#, c-format
+#:../camel/camel-folder-search.c:881
+#,c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Đang thực hiện truy vấn trên dòng đầu lạ: %s"
 
-#: ../camel/camel-folder.c:616
-#, c-format
+#:../camel/camel-folder.c:615
+#,c-format
 msgid "Unsupported operation: append message: for %s"
-msgstr "Tháo tác chưa hỗ trợ: phụ thêm thông điệp: cho %s"
+msgstr "Tháo tác chưa hỗ trợ: phụ thêm thư: cho %s"
 
-#: ../camel/camel-folder.c:1238
-#, c-format
+#:../camel/camel-folder.c:1237
+#,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:1279
-#, c-format
+#:../camel/camel-folder.c:1278
+#,c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Thao tác chưa hỗ trợ: tìm bằng UID: cho %s"
 
-#: ../camel/camel-folder.c:1395
+#:../camel/camel-folder.c:1394
 msgid "Moving messages"
-msgstr "Đang di chuyển thông điệp"
+msgstr "Đang di chuyển thư"
 
-#: ../camel/camel-folder.c:1395
+#:../camel/camel-folder.c:1394
 msgid "Copying messages"
-msgstr "Đang sao chép thông điệp"
+msgstr "Đang sao chép thư"
 
-#: ../camel/camel-folder.c:1649
+#:../camel/camel-folder.c:1648
 msgid "Learning junk"
 msgstr "Học là rác"
 
-#: ../camel/camel-folder.c:1666
+#:../camel/camel-folder.c:1665
 msgid "Learning non-junk"
 msgstr "Học không phải là rác"
 
-#: ../camel/camel-folder.c:1685
+#:../camel/camel-folder.c:1684
 msgid "Filtering new message(s)"
-msgstr "Đang lọc thông điệp mới"
+msgstr "Đang lọc thư mới"
 
-#: ../camel/camel-gpg-context.c:734
-#, c-format
+#:../camel/camel-gpg-context.c:753
+#,c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
 "\n"
 "%s"
-msgstr ""
-"Gặp thông điệp trạng thái GnuPG không mong đợi:\n"
+msgstr "Gặp thư trạng thái GnuPG không mong đợi:\n"
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:748
+#:../camel/camel-gpg-context.c:767
 msgid "Failed to parse gpg userid hint."
 msgstr "Lỗi phân tích chỉ dẫn GPG UserID."
 
-#: ../camel/camel-gpg-context.c:772
+#:../camel/camel-gpg-context.c:791
 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:786
-#, c-format
+#:../camel/camel-gpg-context.c:805
+#,c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
-msgstr ""
-"Bạn cần một cụm từ mật khẩu để mở khóa\n"
+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:803 ../camel/camel-gpg-context.c:1000
-#: ../camel/providers/nntp/camel-nntp-store.c:1276
+#:../camel/camel-gpg-context.c:822 ../camel/camel-gpg-context.c:1026
+#:../camel/providers/nntp/camel-nntp-store.c:1272
 msgid "Cancelled."
 msgstr "Đã hủy"
 
-#: ../camel/camel-gpg-context.c:821
+#:../camel/camel-gpg-context.c:840
 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:827
-#, c-format
+#:../camel/camel-gpg-context.c:846
+#,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:879
+#:../camel/camel-gpg-context.c:898
 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:1138 ../camel/camel-gpg-context.c:1262
-#: ../camel/camel-gpg-context.c:1745 ../camel/camel-gpg-context.c:1790
-#, c-format
+#.always called on an i/o error
+#:../camel/camel-gpg-context.c:1164 ../camel/camel-gpg-context.c:1292
+#:../camel/camel-gpg-context.c:1776 ../camel/camel-gpg-context.c:1821
+#,c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Lỗi thực hiện GPG: %s"
 
-#: ../camel/camel-gpg-context.c:1230 ../camel/camel-smime-context.c:389
-#, c-format
+#:../camel/camel-gpg-context.c:1260 ../camel/camel-smime-context.c:387
+#,c-format
 msgid "Could not generate signing data: %s"
 msgstr "Không thể phát sinh dữ liệu ký nhận: %s"
 
-#: ../camel/camel-gpg-context.c:1277 ../camel/camel-gpg-context.c:1464
-#: ../camel/camel-gpg-context.c:1547 ../camel/camel-gpg-context.c:1562
-#: ../camel/camel-gpg-context.c:1667 ../camel/camel-gpg-context.c:1682
-#: ../camel/camel-gpg-context.c:1761 ../camel/camel-gpg-context.c:1806
+#:../camel/camel-gpg-context.c:1307 ../camel/camel-gpg-context.c:1496
+#:../camel/camel-gpg-context.c:1579 ../camel/camel-gpg-context.c:1594
+#:../camel/camel-gpg-context.c:1698 ../camel/camel-gpg-context.c:1713
+#:../camel/camel-gpg-context.c:1792 ../camel/camel-gpg-context.c:1837
 msgid "Failed to execute gpg."
 msgstr "Lỗi thực hiện GPG."
 
-#: ../camel/camel-gpg-context.c:1296
+#:../camel/camel-gpg-context.c:1326
 msgid "This is a digitally signed message part"
-msgstr "Đây là phần thông điệp có chữ ký số"
+msgstr "Đây là phần thư có chữ ký số"
 
-#: ../camel/camel-gpg-context.c:1382 ../camel/camel-gpg-context.c:1388
-#: ../camel/camel-gpg-context.c:1394 ../camel/camel-gpg-context.c:1411
-#: ../camel/camel-smime-context.c:692 ../camel/camel-smime-context.c:703
-#: ../camel/camel-smime-context.c:710
+#:../camel/camel-gpg-context.c:1414 ../camel/camel-gpg-context.c:1420
+#:../camel/camel-gpg-context.c:1426 ../camel/camel-gpg-context.c:1443
+#:../camel/camel-smime-context.c:690 ../camel/camel-smime-context.c:701
+#:../camel/camel-smime-context.c:708
 msgid "Cannot verify message signature: Incorrect message format"
-msgstr "Không thể xác minh chữ ký thông điệp: dạng thức thông điệp không đúng"
+msgstr "Không thể xác minh chữ ký thư: dạng thức thư không đúng"
 
-#: ../camel/camel-gpg-context.c:1449
-#, c-format
+#:../camel/camel-gpg-context.c:1481
+#,c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "Không thể xác minh chữ ký thông điệp: không thể tạo tập tin tạm: %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:1530
-#, c-format
+#:../camel/camel-gpg-context.c:1562
+#,c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Không thể phát sinh dữ liệu mật mã hóa: %s"
 
-#: ../camel/camel-gpg-context.c:1580
+#:../camel/camel-gpg-context.c:1612
 msgid "This is a digitally encrypted message part"
-msgstr "Đây là một phần thông điệp có mật mã hóa số"
+msgstr "Đây là một phần thư có mật mã hóa số"
 
-#: ../camel/camel-gpg-context.c:1637
+#:../camel/camel-gpg-context.c:1669
 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:1649
+#:../camel/camel-gpg-context.c:1680
 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:1703 ../camel/camel-smime-context.c:966
+#:../camel/camel-gpg-context.c:1734 ../camel/camel-smime-context.c:964
 msgid "Encrypted content"
 msgstr "Nội dung bị mật mã hóa"
 
-#: ../camel/camel-gpg-context.c:1722
+#:../camel/camel-gpg-context.c:1753
 msgid "Unable to parse message content"
-msgstr "Không thể phân tách nội dung thông điệp"
-
-#: ../camel/camel-gpg-context.c:1746 ../camel/camel-gpg-context.c:1791
-#: ../camel/camel-tcp-stream-openssl.c:631
-#: ../camel/providers/imap4/camel-imap4-engine.c:1550
-#: ../camel/providers/imap4/camel-imap4-engine.c:1589
-#: ../camel/providers/imap4/camel-imap4-engine.c:1634
-#: ../camel/providers/imap4/camel-imap4-engine.c:1690
-#: ../camel/providers/imap4/camel-imap4-store.c:1434
-#: ../camel/providers/imap4/camel-imap4-utils.c:575
-#: ../camel/providers/smtp/camel-smtp-transport.c:163
-#: ../camel/providers/smtp/camel-smtp-transport.c:218
+msgstr "Không thể phân tách nội dung thư"
+
+#:../camel/camel-gpg-context.c:1777 ../camel/camel-gpg-context.c:1822
+#:../camel/camel-tcp-stream-openssl.c:631
+#:../camel/providers/imap4/camel-imap4-engine.c:1550
+#:../camel/providers/imap4/camel-imap4-engine.c:1589
+#:../camel/providers/imap4/camel-imap4-engine.c:1634
+#:../camel/providers/imap4/camel-imap4-engine.c:1690
+#:../camel/providers/imap4/camel-imap4-store.c:883
+#:../camel/providers/imap4/camel-imap4-store.c:1556
+#:../camel/providers/imap4/camel-imap4-utils.c:575
+#:../camel/providers/smtp/camel-smtp-transport.c:160
+#:../camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Unknown"
 msgstr "Không biết"
 
-#: ../camel/camel-lock-client.c:100
-#, c-format
+#:../camel/camel-lock-client.c:100
+#,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:113
-#, c-format
+#:../camel/camel-lock-client.c:113
+#,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:191 ../camel/camel-lock-client.c:214
-#, c-format
+#:../camel/camel-lock-client.c:191 ../camel/camel-lock-client.c:214
+#,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:204
-#, c-format
+#:../camel/camel-lock-client.c:204
+#,c-format
 msgid "Could not lock '%s'"
 msgstr "Không thể khóa '%s'"
 
-#: ../camel/camel-lock.c:92 ../camel/camel-lock.c:113
-#, c-format
+#:../camel/camel-lock.c:95 ../camel/camel-lock.c:116
+#,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:154
-#, c-format
+#:../camel/camel-lock.c:157
+#,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."
 
-#: ../camel/camel-lock.c:209
-#, c-format
+#:../camel/camel-lock.c:212
+#,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
+#:../camel/camel-lock.c:275
+#,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:104
-#, c-format
+#:../camel/camel-movemail.c:104
+#,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:117
-#, c-format
+#:../camel/camel-movemail.c:117
+#,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:125
-#, c-format
+#:../camel/camel-movemail.c:125
+#,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:154
-#, c-format
+#:../camel/camel-movemail.c:154
+#,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:184
-#, c-format
+#:../camel/camel-movemail.c:184
+#,c-format
 msgid "Could not create pipe: %s"
 msgstr "Không thể tạo ống dẫn: %s"
 
-#: ../camel/camel-movemail.c:196
-#, c-format
+#:../camel/camel-movemail.c:196
+#,c-format
 msgid "Could not fork: %s"
 msgstr "Không thể tạo tiến trình: %s"
 
-#: ../camel/camel-movemail.c:234
-#, c-format
+#:../camel/camel-movemail.c:234
+#,c-format
 msgid "Movemail program failed: %s"
 msgstr "Lỗi chương trình movemail (chuyển di thư): %s"
 
-#: ../camel/camel-movemail.c:235
+#:../camel/camel-movemail.c:235
 msgid "(Unknown error)"
 msgstr "(Lỗi lạ)"
 
-#: ../camel/camel-movemail.c:258
-#, c-format
+#:../camel/camel-movemail.c:258
+#,c-format
 msgid "Error reading mail file: %s"
 msgstr "Lỗi đọc tập tin thư: %s"
 
-#: ../camel/camel-movemail.c:269
-#, c-format
+#:../camel/camel-movemail.c:269
+#,c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Lỗi ghi tập tin thư tạm: %s"
 
-#: ../camel/camel-movemail.c:462 ../camel/camel-movemail.c:529
-#, c-format
+#:../camel/camel-movemail.c:462 ../camel/camel-movemail.c:529
+#,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:598
+#:../camel/camel-multipart-signed.c:596
 msgid "parse error"
 msgstr "lỗi phân tích"
 
-#: ../camel/camel-net-utils.c:446 ../camel/camel-net-utils.c:608
-#: ../camel/camel-net-utils.c:739
-#: ../camel/providers/pop3/camel-pop3-store.c:448
-#: ../camel/providers/pop3/camel-pop3-store.c:529
+#:../camel/camel-net-utils.c:495 ../camel/camel-net-utils.c:657
+#:../camel/camel-net-utils.c:788
+#:../camel/providers/pop3/camel-pop3-store.c:446
+#:../camel/providers/pop3/camel-pop3-store.c:527
 msgid "Cancelled"
 msgstr "Bị hủy bỏ"
 
-#: ../camel/camel-net-utils.c:465
+#:../camel/camel-net-utils.c:514
 msgid "cannot create thread"
 msgstr "Không thể tạo mạch"
 
-#: ../camel/camel-net-utils.c:612
-#, c-format
+#:../camel/camel-net-utils.c:661
+#,c-format
 msgid "Resolving: %s"
 msgstr "Đang phân giải: %s"
 
-#: ../camel/camel-net-utils.c:634
+#:../camel/camel-net-utils.c:683
 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:636
-#, c-format
+#:../camel/camel-net-utils.c:685
+#,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:743
+#:../camel/camel-net-utils.c:792
 msgid "Resolving address"
 msgstr "Đang phân giải địa chỉ"
 
-#: ../camel/camel-net-utils.c:763
+#:../camel/camel-net-utils.c:812
 msgid "Name lookup failed"
 msgstr "Lỗi tra cứu máy phục vụ tên"
 
-#: ../camel/camel-net-utils.c:766
-#, c-format
+#:../camel/camel-net-utils.c:815
+#,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
-#, c-format
+#:../camel/camel-offline-folder.c:252
+#,c-format
 msgid "Syncing messages in folder '%s' to disk"
-msgstr "Đang đồng bộ thông điệp trong thư mục `%s' vào đĩa"
+msgstr "Đang đồng bộ thư trong thư mục `%s' vào đĩa"
 
-#: ../camel/camel-offline-journal.c:165 ../camel/camel-offline-journal.c:188
-#, c-format
+#:../camel/camel-offline-journal.c:163 ../camel/camel-offline-journal.c:186
+#,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:59
+#:../camel/camel-provider.c:62
 msgid "Virtual folder email provider"
 msgstr "Bộ cung cấp thư mục ảo"
 
-#: ../camel/camel-provider.c:61
+#:../camel/camel-provider.c:64
 msgid "For reading mail as a query of another set of folders"
 msgstr "Để đọc mail như là một truy vấn của một tập các thư mục khác"
 
-#: ../camel/camel-provider.c:185
-#, c-format
+#:../camel/camel-provider.c:188
+#,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:194
-#, c-format
+#:../camel/camel-provider.c:197
+#,c-format
 msgid "Could not load %s: %s"
 msgstr "Không thể tải %s: %s"
 
-#: ../camel/camel-provider.c:202
-#, c-format
+#:../camel/camel-provider.c:205
+#,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:374 ../camel/camel-session.c:163
-#, c-format
+#:../camel/camel-provider.c:377 ../camel/camel-session.c:165
+#,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:35
+#:../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Vô danh"
 
-#: ../camel/camel-sasl-anonymous.c:37
+#:../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:122 ../camel/camel-sasl-plain.c:88
+#:../camel/camel-sasl-anonymous.c:122 ../camel/camel-sasl-plain.c:89
 msgid "Authentication failed."
 msgstr "Xác thực thất bại."
 
-#: ../camel/camel-sasl-anonymous.c:131
-#, c-format
+#:../camel/camel-sasl-anonymous.c:131
+#,c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
-msgstr ""
-"Thông tin truy tìm địa chỉ thư không hợp lệ:\n"
+msgstr "Thông tin truy tìm địa chỉ thư không hợp lệ:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:143
-#, c-format
+#:../camel/camel-sasl-anonymous.c:143
+#,c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
-msgstr ""
-"Thông tin truy tìm địa chỉ bí hiểm không hợp lệ:\n"
+msgstr "Thông tin truy tìm địa chỉ bí hiểm không hợp lệ:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:155
-#, c-format
+#:../camel/camel-sasl-anonymous.c:155
+#,c-format
 msgid ""
 "Invalid trace information:\n"
 "%s"
-msgstr ""
-"Thông tin truy tìm không hợp lệ:\n"
+msgstr "Thông tin truy tìm không hợp lệ:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:36
+#:../camel/camel-sasl-cram-md5.c:38
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#:../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 "
+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:49
+#:../camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:51
+#:../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, "
+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:819
+#:../camel/camel-sasl-digest-md5.c:818
 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:828
+#:../camel/camel-sasl-digest-md5.c:827
 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:834
+#:../camel/camel-sasl-digest-md5.c:833
 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:864
+#:../camel/camel-sasl-digest-md5.c:863
 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:882
+#:../camel/camel-sasl-digest-md5.c:881
 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:892
+#:../camel/camel-sasl-digest-md5.c:891
 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:57
+#:../camel/camel-sasl-gssapi.c:57
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:59
+#:../camel/camel-sasl-gssapi.c:59
 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áý chu bằng cơ chế xác minh Kerberos 5."
 
-#: ../camel/camel-sasl-gssapi.c:157
+#:../camel/camel-sasl-gssapi.c:157
 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 "
+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:162
+#:../camel/camel-sasl-gssapi.c:162
 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:165
+#:../camel/camel-sasl-gssapi.c:165
 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ệ."
+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:169
+#:../camel/camel-sasl-gssapi.c:169
 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 "
+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:174
+#:../camel/camel-sasl-gssapi.c:174
 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 "
+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:178
+#:../camel/camel-sasl-gssapi.c:178
 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 "
+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:183
+#:../camel/camel-sasl-gssapi.c:183
 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:186
+#:../camel/camel-sasl-gssapi.c:186
 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:189
+#:../camel/camel-sasl-gssapi.c:189
 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:192
+#:../camel/camel-sasl-gssapi.c:192
 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:198 ../camel/camel-sasl-gssapi.c:246
-#: ../camel/camel-sasl-gssapi.c:282 ../camel/camel-sasl-gssapi.c:297
-#: ../camel/camel-sasl-kerberos4.c:226
-#: ../camel/providers/imap/camel-imap-store.c:1247
+#:../camel/camel-sasl-gssapi.c:198 ../camel/camel-sasl-gssapi.c:246
+#:../camel/camel-sasl-gssapi.c:282 ../camel/camel-sasl-gssapi.c:297
+#:../camel/camel-sasl-kerberos4.c:229
+#:../camel/providers/imap/camel-imap-store.c:1278
 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:307
+#:../camel/camel-sasl-gssapi.c:307
 msgid "Unsupported security layer."
 msgstr "Tầng bảo mật chưa được hỗ trợ."
 
-#: ../camel/camel-sasl-kerberos4.c:42
+#:../camel/camel-sasl-kerberos4.c:45
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: ../camel/camel-sasl-kerberos4.c:44
+#:../camel/camel-sasl-kerberos4.c:47
 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."
+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:169
-#, c-format
+#:../camel/camel-sasl-kerberos4.c:172
+#,c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
-msgstr ""
-"Không thể lấy vé Kerberos:\n"
+msgstr "Không thể lấy vé Kerberos:\n"
 "%s"
 
-#: ../camel/camel-sasl-login.c:33
+#:../camel/camel-sasl-login.c:34
 msgid "Login"
 msgstr "Đăng nhập"
 
-#: ../camel/camel-sasl-login.c:35 ../camel/camel-sasl-plain.c:35
+#:../camel/camel-sasl-login.c:36 ../camel/camel-sasl-plain.c:36
 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:132
+#:../camel/camel-sasl-login.c:133
 msgid "Unknown authentication state."
 msgstr "Trạng thái xác thực lạ."
 
-#: ../camel/camel-sasl-ntlm.c:32
+#:../camel/camel-sasl-ntlm.c:32
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:34
+#:../camel/camel-sasl-ntlm.c:34
 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ụ đựa vào Windows dùng NTLM / SPA"
+msgstr "Tùy chọn này sẽ kết nối tới máy phục vụ đựa vào Windows dùng NTLM / SPA"
 
-#: ../camel/camel-sasl-plain.c:33
+#:../camel/camel-sasl-plain.c:34
 msgid "PLAIN"
 msgstr "THÔ"
 
-#: ../camel/camel-sasl-popb4smtp.c:37
+#:../camel/camel-sasl-popb4smtp.c:37
 msgid "POP before SMTP"
 msgstr "POP trước SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#:../camel/camel-sasl-popb4smtp.c:39
 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:104
+#:../camel/camel-sasl-popb4smtp.c:104
 msgid "POP Source URI"
 msgstr "URI có nguồn POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:107
+#:../camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth 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:112
+#:../camel/camel-sasl-popb4smtp.c:112
 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-search-private.c:151
-#, c-format
+#:../camel/camel-search-private.c:152
+#,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:272
-#, c-format
+#:../camel/camel-service.c:270
+#,c-format
 msgid "URL '%s' needs a username component"
 msgstr "Địa chỉ Mạng '%s' cần phần tên người dùng"
 
-#: ../camel/camel-service.c:276
-#, c-format
+#:../camel/camel-service.c:274
+#,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:280
-#, c-format
+#:../camel/camel-service.c:278
+#,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:285
-#, c-format
+#:../camel/camel-session.c:291
+#,c-format
 msgid ""
 "Could not create directory %s:\n"
 "%s"
-msgstr ""
-"Không thể tạo thư mục %s:\n"
+msgstr "Không thể tạo thư mục %s:\n"
 "%s"
 
-#: ../camel/camel-smime-context.c:231
-#, c-format
+#:../camel/camel-smime-context.c:229
+#,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:237
+#:../camel/camel-smime-context.c:235
 msgid "Cannot create CMS message"
-msgstr "Không thể tạo thông điệp CMS"
+msgstr "Không thể tạo thư CMS"
 
-#: ../camel/camel-smime-context.c:242
+#:../camel/camel-smime-context.c:240
 msgid "Cannot create CMS signed data"
 msgstr "Không thể tạo dữ liệu có chữ ký CMS"
 
-#: ../camel/camel-smime-context.c:248
+#:../camel/camel-smime-context.c:246
 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:255
+#:../camel/camel-smime-context.c:253
 msgid "Cannot attach CMS data"
 msgstr "Không thể đính kèm dữ liệu CMS"
 
-#: ../camel/camel-smime-context.c:261
+#:../camel/camel-smime-context.c:259
 msgid "Cannot create CMS Signer information"
 msgstr "Không thể tạo thông tin Chữ ký CMS"
 
-#: ../camel/camel-smime-context.c:267
+#:../camel/camel-smime-context.c:265
 msgid "Cannot find certificate chain"
 msgstr "Không thể tìm dây chứng nhận"
 
-#: ../camel/camel-smime-context.c:273
+#:../camel/camel-smime-context.c:271
 msgid "Cannot add CMS Signing time"
 msgstr "Không thể thêm thời gian ký nhận CMS"
 
-#: ../camel/camel-smime-context.c:295 ../camel/camel-smime-context.c:307
-#, c-format
+#:../camel/camel-smime-context.c:293 ../camel/camel-smime-context.c:305
+#,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:314
+#:../camel/camel-smime-context.c:312
 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:319
+#:../camel/camel-smime-context.c:317
 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:324
+#:../camel/camel-smime-context.c:322
 msgid "Cannot add encryption certificate"
 msgstr "Không thể thêm chứng nhận mã hóa"
 
-#: ../camel/camel-smime-context.c:330
+#:../camel/camel-smime-context.c:328
 msgid "Cannot add CMS Signer information"
 msgstr "Không thể thêm thông tin Chữ ký CMS"
 
-#: ../camel/camel-smime-context.c:400 ../camel/camel-smime-context.c:848
+#:../camel/camel-smime-context.c:398 ../camel/camel-smime-context.c:846
 msgid "Cannot create encoder context"
 msgstr "Không thể tạo ngũ cảnh bộ biên mã"
 
-#: ../camel/camel-smime-context.c:406
+#:../camel/camel-smime-context.c:404
 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:411 ../camel/camel-smime-context.c:865
+#:../camel/camel-smime-context.c:409 ../camel/camel-smime-context.c:863
 msgid "Failed to encode data"
 msgstr "Lỗi biên mã dữ liệu"
 
-#: ../camel/camel-smime-context.c:484
+#:../camel/camel-smime-context.c:482
 msgid "Unverified"
 msgstr "Chưa thẩm tra"
 
-#: ../camel/camel-smime-context.c:486
+#:../camel/camel-smime-context.c:484
 msgid "Good signature"
 msgstr "Chữ ký tốt"
 
-#: ../camel/camel-smime-context.c:488
+#:../camel/camel-smime-context.c:486
 msgid "Bad signature"
 msgstr "Chữ ký sai"
 
-#: ../camel/camel-smime-context.c:490
+#:../camel/camel-smime-context.c:488
 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:492
+#:../camel/camel-smime-context.c:490
 msgid "Signing certificate not found"
 msgstr "Không tìm thấy chứng nhận ký tên"
 
-#: ../camel/camel-smime-context.c:494
+#:../camel/camel-smime-context.c:492
 msgid "Signing certificate not trusted"
 msgstr "Chứng nhận ký tên không đáng tin"
 
-#: ../camel/camel-smime-context.c:496
+#:../camel/camel-smime-context.c:494
 msgid "Signature algorithm unknown"
 msgstr "Không biết thuật toán chữ ký"
 
-#: ../camel/camel-smime-context.c:498
+#:../camel/camel-smime-context.c:496
 msgid "Signature algorithm unsupported"
 msgstr "Không hỗ trợ thuật toán chữ ký"
 
-#: ../camel/camel-smime-context.c:500
+#:../camel/camel-smime-context.c:498
 msgid "Malformed signature"
 msgstr "Chữ ký dạng thức sai"
 
-#: ../camel/camel-smime-context.c:502
+#:../camel/camel-smime-context.c:500
 msgid "Processing error"
 msgstr "Lỗi xử lý"
 
-#: ../camel/camel-smime-context.c:539
+#:../camel/camel-smime-context.c:537
 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:546
+#:../camel/camel-smime-context.c:544
 msgid "Digests missing from enveloped data"
 msgstr "Thiếu số trong dữ liệu được bao"
 
-#: ../camel/camel-smime-context.c:559 ../camel/camel-smime-context.c:569
+#:../camel/camel-smime-context.c:557 ../camel/camel-smime-context.c:567
 msgid "Cannot calculate digests"
 msgstr "Không thể tính những điều tóm tắt (digest)"
 
-#: ../camel/camel-smime-context.c:574
+#:../camel/camel-smime-context.c:572
 msgid "Cannot set message digests"
 msgstr "Không thể đặt những điều tóm tắt thư"
 
-#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:589
+#:../camel/camel-smime-context.c:582 ../camel/camel-smime-context.c:587
 msgid "Certificate import failed"
 msgstr "Lỗi nạp chứng nhận"
 
-#: ../camel/camel-smime-context.c:599
+#:../camel/camel-smime-context.c:597
 msgid "Certificate is the only message, cannot verify certificates"
-msgstr "Chứng nhận là toàn thông điệp; không thể thẩm tra chứng nhận"
+msgstr "Chứng nhận là toàn thư; không thể thẩm tra chứng nhận"
 
-#: ../camel/camel-smime-context.c:602
+#:../camel/camel-smime-context.c:600
 msgid "Certificate is the only message, certificates imported and verified"
-msgstr ""
-"Chứng nhận là toàn thông điệp; các chứng nhận được nạp và được thẩm tra"
+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:606
+#:../camel/camel-smime-context.c:604
 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:622
-#, c-format
+#:../camel/camel-smime-context.c:620
+#,c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Ký tên do : %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:723
+#:../camel/camel-smime-context.c:721
 msgid "Decoder failed"
 msgstr "Lỗi bộ giải mã"
 
-#: ../camel/camel-smime-context.c:775
-#, c-format
+#:../camel/camel-smime-context.c:773
+#,c-format
 msgid "Cannot find certificate for `%s'"
 msgstr "Không tìm thấy chứng nhận cho '%s'"
 
-#: ../camel/camel-smime-context.c:782
+#:../camel/camel-smime-context.c:780
 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:791
+#.PORT_GetError(); ??
+#:../camel/camel-smime-context.c:789
 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:802
+#:../camel/camel-smime-context.c:800
 msgid "Cannot create CMS Message"
-msgstr "Không thể tạo thông điệp CMS"
+msgstr "Không thể tạo thư CMS"
 
-#: ../camel/camel-smime-context.c:808
+#:../camel/camel-smime-context.c:806
 msgid "Cannot create CMS Enveloped data"
 msgstr "Không thể tạo dữ liệu được bao CMS"
 
-#: ../camel/camel-smime-context.c:814
+#:../camel/camel-smime-context.c:812
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Không đính kèm dữ liệu được bao CMS"
 
-#: ../camel/camel-smime-context.c:820
+#:../camel/camel-smime-context.c:818
 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:829
+#:../camel/camel-smime-context.c:827
 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:834
+#:../camel/camel-smime-context.c:832
 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:859
+#:../camel/camel-smime-context.c:857
 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:946
-#, c-format
+#:../camel/camel-smime-context.c:944
+#,c-format
 msgid "Decoder failed, error %d"
 msgstr "Lỗi bộ giải mã: %d"
 
-#: ../camel/camel-smime-context.c:953
+#:../camel/camel-smime-context.c:951
 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:980
+#:../camel/camel-smime-context.c:978
 msgid "import keys: unimplemented"
 msgstr "nạp khoá: chưa hỗ trợ"
 
-#: ../camel/camel-smime-context.c:988
+#:../camel/camel-smime-context.c:986
 msgid "export keys: unimplemented"
 msgstr "xuất khoá: chưa hỗ trợ"
 
-#: ../camel/camel-store.c:215
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:168
+#:../camel/camel-store.c:214
+#:../camel/providers/groupwise/camel-groupwise-transport.c:168
 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:247
-#, c-format
+#:../camel/camel-store.c:246
+#,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:301
+#:../camel/camel-store.c:310
 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:329
-#, c-format
+#:../camel/camel-store.c:338
+#,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:393 ../camel/camel-vee-store.c:367
-#: ../camel/providers/local/camel-maildir-store.c:217
-#, c-format
+#:../camel/camel-store.c:402 ../camel/camel-vee-store.c:368
+#:../camel/providers/local/camel-maildir-store.c:217
+#,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:443 ../camel/camel-vee-store.c:404
-#: ../camel/providers/local/camel-maildir-store.c:289
-#, c-format
+#:../camel/camel-store.c:452 ../camel/camel-vee-store.c:405
+#:../camel/providers/local/camel-maildir-store.c:289
+#,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ệ"
 
-#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:784 ../camel/camel-vtrash-folder.c:47
+#.the name of the Trash folder, used for deleted messages
+#:../camel/camel-store.c:793 ../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:787 ../camel/camel-vtrash-folder.c:49
+#.the name of the Junk folder, used for spam messages
+#:../camel/camel-store.c:796 ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Thư rác"
 
-#: ../camel/camel-tcp-stream-openssl.c:568
+#:../camel/camel-tcp-stream-openssl.c:568
 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:570
+#:../camel/camel-tcp-stream-openssl.c:570
 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:572
+#:../camel/camel-tcp-stream-openssl.c:572
 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:574
+#:../camel/camel-tcp-stream-openssl.c:574
 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:576
+#:../camel/camel-tcp-stream-openssl.c:576
 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:578
+#:../camel/camel-tcp-stream-openssl.c:578
 msgid "Certificate signature failure"
 msgstr "Lỗi chữ ký chứng nhận"
 
-#: ../camel/camel-tcp-stream-openssl.c:580
+#:../camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate Revocation List signature failure"
 msgstr "Lỗi chữ ký danh sách hủy bỏ chứng nhận"
 
-#: ../camel/camel-tcp-stream-openssl.c:582
+#:../camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate not yet valid"
 msgstr "Chứng nhận chưa hợp lệ"
 
-#: ../camel/camel-tcp-stream-openssl.c:584
+#:../camel/camel-tcp-stream-openssl.c:584
 msgid "Certificate has expired"
 msgstr "Chứng nhận quá hạn"
 
-#: ../camel/camel-tcp-stream-openssl.c:586
+#:../camel/camel-tcp-stream-openssl.c:586
 msgid "CRL not yet valid"
 msgstr "Danh sách hủy bỏ chứng nhận chưa hợp lệ"
 
-#: ../camel/camel-tcp-stream-openssl.c:588
+#:../camel/camel-tcp-stream-openssl.c:588
 msgid "CRL has expired"
 msgstr "Danh sách hủy bỏ chứng nhận quá hạn"
 
-#: ../camel/camel-tcp-stream-openssl.c:593
+#:../camel/camel-tcp-stream-openssl.c:593
 msgid "Error in CRL"
 msgstr "Lỗi trong danh sách hủy bỏ chứng nhận"
 
-#: ../camel/camel-tcp-stream-openssl.c:595
+#:../camel/camel-tcp-stream-openssl.c:595
 msgid "Out of memory"
 msgstr "Hết bộ nhớ"
 
-#: ../camel/camel-tcp-stream-openssl.c:597
+#:../camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
 msgstr "Chứng nhận tự ký có độ sâu 0"
 
-#: ../camel/camel-tcp-stream-openssl.c:599
+#:../camel/camel-tcp-stream-openssl.c:599
 msgid "Self-signed certificate in chain"
 msgstr "Chứng nhận tự ký trong chuỗi"
 
-#: ../camel/camel-tcp-stream-openssl.c:601
+#:../camel/camel-tcp-stream-openssl.c:601
 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-openssl.c:603
+#:../camel/camel-tcp-stream-openssl.c:603
 msgid "Unable to verify leaf signature"
 msgstr "Không thể thẩm tra chữ ký lá"
 
-#: ../camel/camel-tcp-stream-openssl.c:605
+#:../camel/camel-tcp-stream-openssl.c:605
 msgid "Certificate chain too long"
 msgstr "Dây chứng nhận quá dài"
 
-#: ../camel/camel-tcp-stream-openssl.c:607
+#:../camel/camel-tcp-stream-openssl.c:607
 msgid "Certificate Revoked"
 msgstr "Chứng nhận bị hủy bỏ"
 
-#: ../camel/camel-tcp-stream-openssl.c:609
+#:../camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Nhà cầm quyền chứng nhận không hợp lệ"
 
-#: ../camel/camel-tcp-stream-openssl.c:611
+#:../camel/camel-tcp-stream-openssl.c:611
 msgid "Path length exceeded"
 msgstr "Đường dẫn quá dài"
 
-#: ../camel/camel-tcp-stream-openssl.c:613
+#:../camel/camel-tcp-stream-openssl.c:613
 msgid "Invalid purpose"
 msgstr "Mục đích không hợp lệ"
 
-#: ../camel/camel-tcp-stream-openssl.c:615
+#:../camel/camel-tcp-stream-openssl.c:615
 msgid "Certificate untrusted"
 msgstr "Chứng nhận không đáng tin"
 
-#: ../camel/camel-tcp-stream-openssl.c:617
+#:../camel/camel-tcp-stream-openssl.c:617
 msgid "Certificate rejected"
 msgstr "Chứng nhận bị từ chối"
 
-#: ../camel/camel-tcp-stream-openssl.c:620
+#:../camel/camel-tcp-stream-openssl.c:620
 msgid "Subject/Issuer mismatch"
 msgstr "Không khớp Chủ đề/Nhà phát hành"
 
-#: ../camel/camel-tcp-stream-openssl.c:622
+#:../camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/SKID mismatch"
 msgstr "Không khớp AKID/SKID"
 
-#: ../camel/camel-tcp-stream-openssl.c:624
+#:../camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
 msgstr "Không khớp AKID/Nhà phát hành"
 
-#: ../camel/camel-tcp-stream-openssl.c:626
+#:../camel/camel-tcp-stream-openssl.c:626
 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-openssl.c:629
+#:../camel/camel-tcp-stream-openssl.c:629
 msgid "Error in application verification"
 msgstr "Gặp lỗi khi thẩm tra ứng dụng"
 
-#: ../camel/camel-tcp-stream-openssl.c:696 ../camel/camel-tcp-stream-ssl.c:833
-#, c-format
+#:../camel/camel-tcp-stream-openssl.c:696 ../camel/camel-tcp-stream-ssl.c:886
+#,c-format
 msgid ""
 "Issuer:            %s\n"
 "Subject:           %s\n"
 "Fingerprint:       %s\n"
 "Signature:         %s"
-msgstr ""
-"Nhà phát hành:            %s\n"
+msgstr "Nhà phát hành:            %s\n"
 "Chủ đề:           %s\n"
 "Dấu điềm chỉ:       %s\n"
 "Chữ ký:         %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:702 ../camel/camel-tcp-stream-ssl.c:839
+#:../camel/camel-tcp-stream-openssl.c:702 ../camel/camel-tcp-stream-ssl.c:892
 msgid "GOOD"
 msgstr "TỐT"
 
-#: ../camel/camel-tcp-stream-openssl.c:702 ../camel/camel-tcp-stream-ssl.c:839
+#:../camel/camel-tcp-stream-openssl.c:702 ../camel/camel-tcp-stream-ssl.c:892
 msgid "BAD"
 msgstr "SAI"
 
-#: ../camel/camel-tcp-stream-openssl.c:704
-#, c-format
+#:../camel/camel-tcp-stream-openssl.c:704
+#,c-format
 msgid ""
 "Bad certificate from %s:\n"
 "\n"
@@ -2461,8 +2425,7 @@ msgid ""
 "%s\n"
 "\n"
 "Do you wish to accept anyway?"
-msgstr ""
-"Chứng nhận sai từ %s:\n"
+msgstr "Chứng nhận sai từ %s:\n"
 "\n"
 "%s\n"
 "\n"
@@ -2470,2643 +2433,2631 @@ msgstr ""
 "\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:843
-#, c-format
+#.construct our user prompt
+#:../camel/camel-tcp-stream-ssl.c:896
+#,c-format
 msgid ""
 "SSL Certificate check for %s:\n"
 "\n"
 "%s\n"
 "\n"
 "Do you wish to accept?"
-msgstr ""
-"Kiểm tra chứng nhận SSL cho %s:\n"
+msgstr "Kiểm tra chứng nhận SSL cho %s:\n"
 "\n"
 "%s\n"
 "\n"
 "Bạn có muốn chấp nhận không?"
 
-#: ../camel/camel-tcp-stream-ssl.c:887
-#, c-format
+#:../camel/camel-tcp-stream-ssl.c:940
+#,c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
-msgstr ""
-"Vấn đề chứng nhận: %s\n"
+msgstr "Vấn đề chứng nhận: %s\n"
 "Nhà phát hành: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:939
-#, c-format
+#:../camel/camel-tcp-stream-ssl.c:992
+#,c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
-msgstr ""
-"Vùng chứng nhận sai: %s\n"
+msgstr "Vùng chứng nhận sai: %s\n"
 "Nhà phát hành: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:957
-#, c-format
+#:../camel/camel-tcp-stream-ssl.c:1010
+#,c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
-msgstr ""
-"Chứng nhận quá hạn: %s\n"
+msgstr "Chứng nhận quá hạn: %s\n"
 "Nhà phát hành: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:974
-#, c-format
+#:../camel/camel-tcp-stream-ssl.c:1027
+#,c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
-msgstr ""
-"Danh sách hủy bỏ chứng nhận quá hạn: %s\n"
+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:293
-#, c-format
+#:../camel/camel-url.c:293
+#,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:476
-#, c-format
+#:../camel/camel-vee-folder.c:475
+#,c-format
 msgid "Error storing `%s': %s"
 msgstr "Lỗi lưu `%s': %s"
 
-#: ../camel/camel-vee-folder.c:518
-#, c-format
+#:../camel/camel-vee-folder.c:517
+#,c-format
 msgid "No such message %s in %s"
-msgstr "Không có thông điệp %s trong %s"
+msgstr "Không có thư %s trong %s"
 
-#: ../camel/camel-vee-folder.c:643 ../camel/camel-vee-folder.c:649
+#:../camel/camel-vee-folder.c:642 ../camel/camel-vee-folder.c:648
 msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "Không thể sao chép hoặc di chuyển thông điệp vào thư mục Ảo"
+msgstr "Không thể sao chép hoặc di chuyển thư vào thư mục Ảo"
 
-#: ../camel/camel-vee-store.c:100 ../camel/camel-vee-store.c:343
+#:../camel/camel-vee-store.c:101 ../camel/camel-vee-store.c:344
 msgid "Unmatched"
 msgstr "Không khớp"
 
-#: ../camel/camel-vee-store.c:390
-#, c-format
+#:../camel/camel-vee-store.c:391
+#,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:412
-#, c-format
+#:../camel/camel-vee-store.c:413
+#,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:48
+#:../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
-msgstr "Không thể sao chép các thông điệp vào thư mục Rác"
+msgstr "Không thể sao chép các thư vào thư mục Rác"
 
-#: ../camel/camel-vtrash-folder.c:50
+#:../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
-msgstr "Không thể sao chép các thông điệp vào thư mục Thư rác"
+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:115
-#: ../camel/providers/imap/camel-imap-folder.c:2010
-#, c-format
+#:../camel/providers/groupwise/camel-groupwise-folder.c:116
+#:../camel/providers/imap/camel-imap-folder.c:2062
+#,c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
-msgstr ""
-"Không thể lấy thông điệp: %s\n"
+msgstr "Không thể lấy thư: %s\n"
 "  %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:115
-#: ../camel/providers/imap/camel-imap-folder.c:2010
-#: ../camel/providers/local/camel-maildir-folder.c:245
-#: ../camel/providers/local/camel-mbox-folder.c:340
-#: ../camel/providers/local/camel-mh-folder.c:203
+#:../camel/providers/groupwise/camel-groupwise-folder.c:116
+#:../camel/providers/imap/camel-imap-folder.c:2062
+#:../camel/providers/local/camel-maildir-folder.c:245
+#:../camel/providers/local/camel-mbox-folder.c:350
+#:../camel/providers/local/camel-mh-folder.c:203
 msgid "No such message"
-msgstr "Không có thông điệp như vậy"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:127
-#: ../camel/providers/imap4/camel-imap4-folder.c:787
-#: ../camel/providers/nntp/camel-nntp-folder.c:157
-#: ../camel/providers/nntp/camel-nntp-folder.c:233
-#: ../camel/providers/nntp/camel-nntp-folder.c:372
-#: ../camel/providers/pop3/camel-pop3-folder.c:263
-#: ../camel/providers/pop3/camel-pop3-folder.c:431
-#: ../camel/providers/pop3/camel-pop3-folder.c:492
-#: ../camel/providers/pop3/camel-pop3-folder.c:510
+msgstr "Không có thư như vậy"
+
+#:../camel/providers/groupwise/camel-groupwise-folder.c:128
+#:../camel/providers/imap4/camel-imap4-folder.c:787
+#:../camel/providers/nntp/camel-nntp-folder.c:154
+#:../camel/providers/nntp/camel-nntp-folder.c:230
+#:../camel/providers/nntp/camel-nntp-folder.c:369
+#:../camel/providers/pop3/camel-pop3-folder.c:263
+#:../camel/providers/pop3/camel-pop3-folder.c:431
+#:../camel/providers/pop3/camel-pop3-folder.c:492
+#:../camel/providers/pop3/camel-pop3-folder.c:510
 msgid "User cancelled"
 msgstr "Người dùng đã hủy bỏ"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:133
-#: ../camel/providers/imap4/camel-imap4-folder.c:792
-#: ../camel/providers/nntp/camel-nntp-folder.c:148
-#: ../camel/providers/nntp/camel-nntp-folder.c:150
-#: ../camel/providers/nntp/camel-nntp-folder.c:159
-#: ../camel/providers/nntp/camel-nntp-folder.c:235
-#: ../camel/providers/pop3/camel-pop3-folder.c:434
-#: ../camel/providers/pop3/camel-pop3-folder.c:495
-#: ../camel/providers/pop3/camel-pop3-folder.c:502
-#: ../camel/providers/pop3/camel-pop3-folder.c:513
-#, c-format
+#:../camel/providers/groupwise/camel-groupwise-folder.c:135
+#:../camel/providers/imap4/camel-imap4-folder.c:792
+#:../camel/providers/nntp/camel-nntp-folder.c:145
+#:../camel/providers/nntp/camel-nntp-folder.c:147
+#:../camel/providers/nntp/camel-nntp-folder.c:156
+#:../camel/providers/nntp/camel-nntp-folder.c:232
+#:../camel/providers/pop3/camel-pop3-folder.c:434
+#:../camel/providers/pop3/camel-pop3-folder.c:495
+#:../camel/providers/pop3/camel-pop3-folder.c:502
+#:../camel/providers/pop3/camel-pop3-folder.c:513
+#,c-format
 msgid "Cannot get message %s: %s"
-msgstr "Không thể lấy thông điệp %s: %s"
+msgstr "Không thể lấy thư %s: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
-#: ../camel/providers/imap4/camel-imap4-folder.c:810
+#:../camel/providers/groupwise/camel-groupwise-folder.c:152
+#:../camel/providers/groupwise/camel-groupwise-folder.c:160
+#:../camel/providers/imap4/camel-imap4-folder.c:810
 msgid "This message is not available in offline mode."
-msgstr "Thông điệp này hiện thời chưa sẵn sàng trong chế độ ngoại tuyến."
+msgstr "Thư này hiện thời chưa sẵn sàng trong chế độ ngoại tuyến."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:159
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:165
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1283
+#:../camel/providers/groupwise/camel-groupwise-folder.c:171
+#:../camel/providers/groupwise/camel-groupwise-folder.c:178
+#:../camel/providers/groupwise/camel-groupwise-folder.c:1400
 msgid "Could not get message"
-msgstr "Không thể gọi thông điệp."
+msgstr "Không thể gọi thư."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:666
-#: ../camel/providers/imap/camel-imap-folder.c:246
-#, c-format
+#:../camel/providers/groupwise/camel-groupwise-folder.c:702
+#:../camel/providers/imap/camel-imap-folder.c:251
+#,c-format
 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:1487
-#, c-format
-msgid "Cannot create message: %s"
-msgstr "Không thể tạo thông điệp: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1499
-#, c-format
+#:../camel/providers/groupwise/camel-groupwise-folder.c:1026
+#:../camel/providers/groupwise/camel-groupwise-store.c:562
+#:../camel/providers/imap/camel-imap-folder.c:2374
+#:../camel/providers/imap/camel-imap-folder.c:2444
+#,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-folder.c:1632
+#:../camel/providers/groupwise/camel-groupwise-folder.c:1678
+#,c-format
 msgid "Cannot append message to folder `%s': %s"
-msgstr "Không thể phụ thêm thông điệp vào thư mục dạng MH `%s': %s"
+msgstr "Không thể phụ thêm thư vào thư mục dạng MH `%s': %s"
+
+#:../camel/providers/groupwise/camel-groupwise-folder.c:1666
+#,c-format
+msgid "Cannot create message: %s"
+msgstr "Không thể tạo thư: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:283
-#, c-format
+#:../camel/providers/groupwise/camel-groupwise-journal.c:283
+#,c-format
 msgid "Cannot get folder container %s"
 msgstr "Không thể lấy hộp thư mục %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:347
-#: ../camel/providers/imap4/camel-imap4-journal.c:320
+#:../camel/providers/groupwise/camel-groupwise-journal.c:347
+#:../camel/providers/imap4/camel-imap4-journal.c:320
 msgid "Cannot append message in offline mode: cache unavailable"
-msgstr ""
-"Không thể phụ thêm thông điệp trong chế độ ngoại tuyến: không có bộ nhớ tạm "
-"sẵn sàng"
+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/groupwise/camel-groupwise-journal.c:363
-#: ../camel/providers/imap4/camel-imap4-journal.c:336
-#, c-format
+#:../camel/providers/groupwise/camel-groupwise-journal.c:363
+#:../camel/providers/imap4/camel-imap4-journal.c:336
+#,c-format
 msgid "Cannot append message in offline mode: %s"
-msgstr "Không thể phụ thêm thông điệp trong chế độ ngoại tuyến: %s"
+msgstr "Không thể phụ thêm thư trong chế độ ngoại tuyến: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:51
-#: ../camel/providers/imap4/camel-imap4-provider.c:36
+#:../camel/providers/groupwise/camel-groupwise-provider.c:51
+#:../camel/providers/imap4/camel-imap4-provider.c:36
 msgid "Checking for new mail"
 msgstr "Đang kiểm tra tìm thư mới"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#:../camel/providers/groupwise/camel-groupwise-provider.c:53
 msgid "Check for new messages in all folders"
 msgstr "Kiểm tra tìm thư mới trên mọi thư mục"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:56
-#: ../camel/providers/local/camel-local-provider.c:43
-#: ../camel/providers/local/camel-local-provider.c:79
-#: ../camel/providers/local/camel-local-provider.c:99
+#:../camel/providers/groupwise/camel-groupwise-provider.c:56
+#:../camel/providers/imap/camel-imap-provider.c:64
+#:../camel/providers/imap4/camel-imap4-provider.c:56
+#:../camel/providers/local/camel-local-provider.c:45
+#:../camel/providers/local/camel-local-provider.c:85
+#:../camel/providers/local/camel-local-provider.c:105
 msgid "Options"
 msgstr "Tùy chọn"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:58
+#:../camel/providers/groupwise/camel-groupwise-provider.c:58
 msgid "Apply filters to new messages in Inbox on this server"
-msgstr ""
-"Áp dụng bộ lọc với những thông điệp mới trong thư mục INBOX (hộp gởi vào) "
-"trên máy phục vụ này"
+msgstr "Áp dụng bộ lọc với những thư mới trong thư mục INBOX (hộp gởi vào) trên máy phục vụnày"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
+#:../camel/providers/groupwise/camel-groupwise-provider.c:60
 msgid "Check new messages for Junk contents"
 msgstr "Kiểm tra thư mới tìm nội dung rác"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
+#:../camel/providers/groupwise/camel-groupwise-provider.c:62
 msgid "Only check for Junk messages in the INBOX folder"
 msgstr "Chỉ kiểm tra thư rác trong thư mục INBOX (hộp gởi vào)"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:64
+#:../camel/providers/groupwise/camel-groupwise-provider.c:64
 msgid "Automatically synchronize 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:69
+#:../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "SOAP Settings"
 msgstr "Thiết lập SOAP"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
+#:../camel/providers/groupwise/camel-groupwise-provider.c:72
 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:85
+#:../camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
+#:../camel/providers/groupwise/camel-groupwise-provider.c:87
 msgid "For accessing Novell GroupWise servers"
 msgstr "Để truy cập máy phục vụ Novell Groupwise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:102
-#: ../camel/providers/imap/camel-imap-provider.c:96
-#: ../camel/providers/imap4/camel-imap4-provider.c:88
-#: ../camel/providers/imapp/camel-imapp-provider.c:66
-#: ../camel/providers/nntp/camel-nntp-provider.c:72
-#: ../camel/providers/pop3/camel-pop3-provider.c:72
+#:../camel/providers/groupwise/camel-groupwise-provider.c:102
+#:../camel/providers/hula/camel-hula-provider.c:92
+#:../camel/providers/imap/camel-imap-provider.c:96
+#:../camel/providers/imap4/camel-imap4-provider.c:88
+#:../camel/providers/imapp/camel-imapp-provider.c:66
+#:../camel/providers/nntp/camel-nntp-provider.c:72
+#:../camel/providers/pop3/camel-pop3-provider.c:72
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
+#:../camel/providers/groupwise/camel-groupwise-provider.c:104
 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ã hóa)."
+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:100
+#:../camel/providers/groupwise/camel-groupwise-store.c:103
 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:192
-#, c-format
+#:../camel/providers/groupwise/camel-groupwise-store.c:202
+#,c-format
 msgid "%sPlease enter the GroupWise password for %s@%s"
 msgstr "%sHãy nhập mật khẩu GroupWise cho « %s@%s »."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:206
-#: ../camel/providers/imap/camel-imap-store.c:1326
+#:../camel/providers/groupwise/camel-groupwise-store.c:216
+#:../camel/providers/imap/camel-imap-store.c:1357
 msgid "You didn't enter a password."
 msgstr "Bạn chưa nhập mật khẩu"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:220
+#:../camel/providers/groupwise/camel-groupwise-store.c:230
 msgid "Unable to authenticate to GroupWise server."
 msgstr "Không thể xác thực với máy phục vụ GroupWise."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:261
+#:../camel/providers/groupwise/camel-groupwise-store.c:297
 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:437
-#: ../camel/providers/imap/camel-imap-store.c:1892
-#: ../camel/providers/imap/camel-imap-store.c:2078
-#, c-format
+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:469
+#:../camel/providers/imap/camel-imap-store.c:1872
+#:../camel/providers/imap/camel-imap-store.c:2064
+#,c-format
 msgid "No such folder %s"
 msgstr "Không có thư mục %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:521
-#: ../camel/providers/imap/camel-imap-folder.c:2315
-#: ../camel/providers/imap/camel-imap-folder.c:2385
-msgid "Fetching summary information for new messages"
-msgstr "Đang lấy thông tin tóm tắt của các thông điệp mới"
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:614
-msgid "Cannot get folder info in offline mode."
-msgstr "Không thể gọi thông tin thư mục trong chế độ ngoại tuyến."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:916
+#:../camel/providers/groupwise/camel-groupwise-store.c:1038
 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:961
-msgid "Cannot delete GroupWise folders in offline mode."
-msgstr "Không thể xóa bỏ thư mục GroupWise trong chế độ ngoại tuyến."
-
-#: ../camel/providers/groupwise/camel-groupwise-store.c:998
-msgid "Cannot rename GroupWise folders in offline mode."
-msgstr "Không thể đổi tên thư mục GroupWise trong chế độ ngoại tuyến."
+#:../camel/providers/groupwise/camel-groupwise-store.c:1052
+#:../camel/providers/imap/camel-imap-store.c:1947
+#:../camel/providers/imap/camel-imap-store.c:2317
+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/groupwise/camel-groupwise-store.c:1012
-#, c-format
+#:../camel/providers/groupwise/camel-groupwise-store.c:1129
+#:../camel/providers/groupwise/camel-groupwise-store.c:1150
+#,c-format
 msgid "Cannot rename Groupwise folder `%s' to `%s'"
 msgstr "Không thể đổi tên thư mục GroupWise `%s' sang `%s'"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1044
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:121
-#, c-format
+#:../camel/providers/groupwise/camel-groupwise-store.c:1182
+#:../camel/providers/groupwise/camel-groupwise-transport.c:121
+#,c-format
 msgid "GroupWise server %s"
 msgstr "Máy phục vụ GroupWise %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1046
-#, c-format
+#:../camel/providers/groupwise/camel-groupwise-store.c:1184
+#,c-format
 msgid "GroupWise service for %s on %s"
 msgstr "Dịch vụ GroupWise cho %s trên %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:123
-#, c-format
+#:../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/groupwise/camel-groupwise-transport.c:161
+#:../camel/providers/groupwise/camel-groupwise-transport.c:161
 msgid "Sending Message"
-msgstr "Đang gửi thông điệp"
+msgstr "Đang gửi thư"
+
+#:../camel/providers/groupwise/camel-groupwise-transport.c:215
+msgid ""
+"You have exceed this account's storage limit. Your messages are queued in "
+"Outbox. Try sending after deleting/archiving some mails.\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 Thư Ra. Hãy cố gởi lại sau khi xóa bỏ/lưu trữ một số thư.\n"
+
+#:../camel/providers/groupwise/camel-groupwise-transport.c:217
+#:../camel/providers/sendmail/camel-sendmail-transport.c:206
+#,c-format
+msgid "Could not send message: %s"
+msgstr "Không thể gửi thư: %s"
+
+#:../camel/providers/hula/camel-hula-provider.c:46
+#:../camel/providers/imap/camel-imap-provider.c:42
+msgid "Checking for New Mail"
+msgstr "Kiểm tra tìm thư mới"
+
+#:../camel/providers/hula/camel-hula-provider.c:48
+#:../camel/providers/imap/camel-imap-provider.c:44
+#:../camel/providers/imap4/camel-imap4-provider.c:38
+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:51
+#:../camel/providers/imap/camel-imap-provider.c:48
+#:../camel/providers/imap4/camel-imap4-provider.c:41
+msgid "Connection to Server"
+msgstr "Kết nối đến máy phục vụ"
+
+#:../camel/providers/hula/camel-hula-provider.c:53
+#:../camel/providers/imap/camel-imap-provider.c:50
+#:../camel/providers/imap4/camel-imap4-provider.c:43
+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:55
+#:../camel/providers/imap/camel-imap-provider.c:52
+#:../camel/providers/imap4/camel-imap4-provider.c:45
+msgid "Command:"
+msgstr "Lệnh:"
+
+#:../camel/providers/hula/camel-hula-provider.c:58
+#:../camel/providers/imap/camel-imap-provider.c:56
+#:../camel/providers/imap4/camel-imap4-provider.c:48
+#:../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "Thư mục"
+
+#:../camel/providers/hula/camel-hula-provider.c:60
+#:../camel/providers/imap/camel-imap-provider.c:58
+#:../camel/providers/imap4/camel-imap4-provider.c:50
+msgid "_Show only subscribed folders"
+msgstr "Chỉ _hiện những thư mục đăng ký"
+
+#:../camel/providers/hula/camel-hula-provider.c:62
+#:../camel/providers/imap/camel-imap-provider.c:60
+#:../camel/providers/imap4/camel-imap4-provider.c:52
+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:64
+#:../camel/providers/imap/camel-imap-provider.c:62
+#:../camel/providers/imap4/camel-imap4-provider.c:54
+msgid "Namespace"
+msgstr "Bộ tên độc nhất"
+
+#:../camel/providers/hula/camel-hula-provider.c:75
+msgid "Hula"
+msgstr "Hula"
+
+#:../camel/providers/hula/camel-hula-provider.c:77
+msgid "For accessing Hula servers"
+msgstr "Để truy cập máy phục vụ Hula"
+
+#:../camel/providers/hula/camel-hula-provider.c:94
+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:222
-#: ../camel/providers/imap/camel-imap-command.c:264
-#: ../camel/providers/imap/camel-imap-command.c:471
-#: ../camel/providers/imap/camel-imap-store.c:3304
+#:../camel/providers/imap/camel-imap-command.c:222
+#:../camel/providers/imap/camel-imap-command.c:264
+#:../camel/providers/imap/camel-imap-command.c:471
+#:../camel/providers/imap/camel-imap-store.c:3004
 msgid "Operation cancelled"
 msgstr "Thao tác bị hủy bỏ"
 
-#: ../camel/providers/imap/camel-imap-command.c:309
-#: ../camel/providers/imap/camel-imap-store.c:3307
-#, c-format
+#:../camel/providers/imap/camel-imap-command.c:309
+#:../camel/providers/imap/camel-imap-store.c:3007
+#,c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Máy chỉ đã ngắt kết nối bất ngờ: %s"
 
-#. for imap ALERT codes, account user@host
-#. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:330
-#, c-format
+#.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:330
+#,c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
-msgstr ""
-"Báo động từ máy phục vụ IMAP %s@%s:\n"
+msgstr "Báo động từ máy phục vụ IMAP %s@%s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:399
-#, c-format
+#:../camel/providers/imap/camel-imap-command.c:399
+#,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:409
-#, c-format
+#:../camel/providers/imap/camel-imap-command.c:409
+#,c-format
 msgid "IMAP command failed: %s"
 msgstr "Lỗi lệnh IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:485
+#:../camel/providers/imap/camel-imap-command.c:485
 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:692
-#, c-format
+#:../camel/providers/imap/camel-imap-command.c:692
+#,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:728
-#, c-format
+#:../camel/providers/imap/camel-imap-command.c:728
+#,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:227
-#, c-format
+#:../camel/providers/imap/camel-imap-folder.c:232
+#,c-format
 msgid "Could not create directory %s: %s"
 msgstr "Không thể tạo thư mục %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:331
+#:../camel/providers/imap/camel-imap-folder.c:336
 msgid "Folder was destroyed and recreated on server."
 msgstr "Thư mục đã bị xóa bỏ và tạo lại trên máy phục vụ."
 
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:596
-#: ../camel/providers/imap4/camel-imap4-summary.c:1472
-msgid "Scanning for changed messages"
-msgstr "Đang quét tìm các thông điệp thay đổi"
+#.Check UIDs and flags of all messages we already know of.
+#:../camel/providers/imap/camel-imap-folder.c:633
+#,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:1970
-#, c-format
+#:../camel/providers/imap/camel-imap-folder.c:2022
+#,c-format
 msgid "Unable to retrieve message: %s"
-msgstr "Không thể gọi thông điệp: %s"
+msgstr "Không thể gọi thư: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2047
-#: ../camel/providers/imap/camel-imap-folder.c:2654
-#: ../camel/providers/nntp/camel-nntp-folder.c:221
+#:../camel/providers/imap/camel-imap-folder.c:2101
+#:../camel/providers/imap/camel-imap-folder.c:2716
+#:../camel/providers/nntp/camel-nntp-folder.c:218
 msgid "This message is not currently available"
-msgstr "Thông điệp này hiện thời chưa sẵn sàng"
+msgstr "Thư này hiện thời chưa sẵn sàng"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2492
-#, c-format
+#:../camel/providers/imap/camel-imap-folder.c:2552
+#,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ông điệp %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:2500
-#, c-format
+#:../camel/providers/imap/camel-imap-folder.c:2560
+#,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ông điệp %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:2513
-#, c-format
+#:../camel/providers/imap/camel-imap-folder.c:2573
+#,c-format
 msgid ""
 "Unexpected server response: Identical UIDs provided for messages %d and %d"
-msgstr "Tín hiệu trả lời chưa hoàn tắt: nhận UID trùng cho thông điệp %d và %d"
+msgstr "Tín hiệu trả lời chưa hoàn tắt: nhận UID trùng cho thư %d và %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2692
+#:../camel/providers/imap/camel-imap-folder.c:2754
 msgid "Could not find message body in FETCH response."
-msgstr ""
-"Không thể tìm thấy phần thân thông điệp trong tín hiệu trả lời FETCH (gọi)"
+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:156
-#, c-format
+#:../camel/providers/imap/camel-imap-message-cache.c:160
+#,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:253
-#: ../camel/providers/imap/camel-imap-message-cache.c:310
-#: ../camel/providers/imap/camel-imap-message-cache.c:341
-#: ../camel/providers/imap/camel-imap-message-cache.c:373
-#, c-format
+#:../camel/providers/imap/camel-imap-message-cache.c:266
+#:../camel/providers/imap/camel-imap-message-cache.c:323
+#:../camel/providers/imap/camel-imap-message-cache.c:354
+#:../camel/providers/imap/camel-imap-message-cache.c:386
+#,c-format
 msgid "Failed to cache message %s: %s"
-msgstr "Lỗi lưu tạm thông điệp %s: %s"
+msgstr "Lỗi lưu tạm thư %s: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:418
-#, c-format
+#:../camel/providers/imap/camel-imap-message-cache.c:436
+#,c-format
 msgid "Failed to cache %s: %s"
 msgstr "Lỗi lưu tạm %s: %s"
 
-#: ../camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "Kiểm tra tìm thư mới"
-
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
-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-provider.c:49
-#: ../camel/providers/imap4/camel-imap4-provider.c:41
-msgid "Connection to Server"
-msgstr "Kết nối đến máy phục vụ"
-
-#: ../camel/providers/imap/camel-imap-provider.c:51
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
-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/imap/camel-imap-provider.c:53
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
-msgid "Command:"
-msgstr "Lệnh:"
-
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imap4/camel-imap4-provider.c:48
-#: ../camel/providers/nntp/camel-nntp-provider.c:42
-msgid "Folders"
-msgstr "Thư mục"
-
-#: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imap4/camel-imap4-provider.c:50
-msgid "_Show only subscribed folders"
-msgstr "Chỉ _hiện những thư mục đăng ký"
-
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:52
-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/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:54
-msgid "Namespace"
-msgstr "Bộ tên độc nhất "
-
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:58
+#:../camel/providers/imap/camel-imap-provider.c:66
+#:../camel/providers/imap4/camel-imap4-provider.c:58
 msgid "_Apply filters to new messages in INBOX on this server"
-msgstr ""
-"Á_p dụng bộ lọc vào những thông điệp mới trong Hộp Nhận trên máy phục vụ này"
+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/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:60
+#:../camel/providers/imap/camel-imap-provider.c:68
+#:../camel/providers/imap4/camel-imap4-provider.c:60
 msgid "Check new messages for _Junk 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:62
+#:../camel/providers/imap/camel-imap-provider.c:70
+#:../camel/providers/imap4/camel-imap4-provider.c:62
 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/imap/camel-imap-provider.c:72
-#: ../camel/providers/imap4/camel-imap4-provider.c:64
+#:../camel/providers/imap/camel-imap-provider.c:72
+#:../camel/providers/imap4/camel-imap4-provider.c:64
 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:79
+#:../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:81
+#:../camel/providers/imap/camel-imap-provider.c:81
 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:98
-#: ../camel/providers/imapp/camel-imapp-provider.c:68
+#:../camel/providers/imap/camel-imap-provider.c:98
+#:../camel/providers/imapp/camel-imapp-provider.c:68
 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ã "
-"hóa)."
+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:422
-#: ../camel/providers/imap4/camel-imap4-store.c:215
-#, c-format
+#:../camel/providers/imap/camel-imap-store.c:440
+#:../camel/providers/imap4/camel-imap4-store.c:215
+#,c-format
 msgid "IMAP server %s"
 msgstr "Máy phục vụ IMAP %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:424
-#: ../camel/providers/imap4/camel-imap4-store.c:217
-#, c-format
+#:../camel/providers/imap/camel-imap-store.c:442
+#:../camel/providers/imap4/camel-imap4-store.c:217
+#,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:554
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/imap4/camel-imap4-store.c:322
-#: ../camel/providers/imap4/camel-imap4-store.c:337
-#: ../camel/providers/nntp/camel-nntp-store.c:200
-#: ../camel/providers/nntp/camel-nntp-store.c:215
-#: ../camel/providers/pop3/camel-pop3-store.c:169
-#: ../camel/providers/pop3/camel-pop3-store.c:184
-#: ../camel/providers/smtp/camel-smtp-transport.c:257
-#: ../camel/providers/smtp/camel-smtp-transport.c:272
-#, c-format
+#:../camel/providers/imap/camel-imap-store.c:572
+#:../camel/providers/imap/camel-imap-store.c:587
+#:../camel/providers/imap4/camel-imap4-store.c:326
+#:../camel/providers/imap4/camel-imap4-store.c:341
+#:../camel/providers/nntp/camel-nntp-store.c:185
+#:../camel/providers/nntp/camel-nntp-store.c:200
+#:../camel/providers/pop3/camel-pop3-store.c:167
+#:../camel/providers/pop3/camel-pop3-store.c:182
+#:../camel/providers/smtp/camel-smtp-transport.c:254
+#:../camel/providers/smtp/camel-smtp-transport.c:269
+#,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-store.c:555
-#: ../camel/providers/imap4/camel-imap4-store.c:323
-#: ../camel/providers/nntp/camel-nntp-store.c:201
-#: ../camel/providers/pop3/camel-pop3-store.c:170
-#: ../camel/providers/smtp/camel-smtp-transport.c:258
+#:../camel/providers/imap/camel-imap-store.c:573
+#:../camel/providers/imap4/camel-imap4-store.c:327
+#:../camel/providers/nntp/camel-nntp-store.c:186
+#:../camel/providers/pop3/camel-pop3-store.c:168
+#:../camel/providers/smtp/camel-smtp-transport.c:255
 msgid "SSL unavailable"
 msgstr "Không có SSL"
 
-#: ../camel/providers/imap/camel-imap-store.c:566
-#: ../camel/providers/imap/camel-imap-store.c:836
-#: ../camel/providers/imap4/camel-imap4-store.c:270
-#: ../camel/providers/imap4/camel-imap4-store.c:334
-#: ../camel/providers/imapp/camel-imapp-store.c:248
-#: ../camel/providers/nntp/camel-nntp-store.c:212
-#: ../camel/providers/nntp/camel-nntp-store.c:231
-#: ../camel/providers/pop3/camel-pop3-store.c:181
-#: ../camel/providers/smtp/camel-smtp-transport.c:269
+#:../camel/providers/imap/camel-imap-store.c:584
+#:../camel/providers/imap/camel-imap-store.c:858
+#:../camel/providers/imap4/camel-imap4-store.c:272
+#:../camel/providers/imap4/camel-imap4-store.c:338
+#:../camel/providers/imapp/camel-imapp-store.c:248
+#:../camel/providers/nntp/camel-nntp-store.c:197
+#:../camel/providers/nntp/camel-nntp-store.c:216
+#:../camel/providers/pop3/camel-pop3-store.c:179
+#:../camel/providers/smtp/camel-smtp-transport.c:266
 msgid "Connection cancelled"
 msgstr "Kết nối bị hủy bỏ"
 
-#: ../camel/providers/imap/camel-imap-store.c:674
-#: ../camel/providers/imap/camel-imap-store.c:696
-#: ../camel/providers/imap/camel-imap-store.c:702
-#: ../camel/providers/imap4/camel-imap4-store.c:362
-#: ../camel/providers/imap4/camel-imap4-store.c:375
-#: ../camel/providers/imap4/camel-imap4-store.c:391
-#, c-format
+#:../camel/providers/imap/camel-imap-store.c:692
+#:../camel/providers/imap/camel-imap-store.c:714
+#:../camel/providers/imap/camel-imap-store.c:720
+#:../camel/providers/imap4/camel-imap4-store.c:366
+#:../camel/providers/imap4/camel-imap4-store.c:379
+#:../camel/providers/imap4/camel-imap4-store.c:395
+#,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:675
-#: ../camel/providers/smtp/camel-smtp-transport.c:326
+#:../camel/providers/imap/camel-imap-store.c:693
+#:../camel/providers/smtp/camel-smtp-transport.c:323
 msgid "STARTTLS not supported"
 msgstr "Chưa hỗ trợ STARTTLS"
 
-#: ../camel/providers/imap/camel-imap-store.c:697
-#: ../camel/providers/imap4/camel-imap4-store.c:363
-#: ../camel/providers/pop3/camel-pop3-store.c:246
+#:../camel/providers/imap/camel-imap-store.c:715
+#:../camel/providers/imap4/camel-imap4-store.c:367
+#:../camel/providers/pop3/camel-pop3-store.c:244
 msgid "SSL negotiations failed"
 msgstr "Thương lượng SSL thất bại"
 
-#: ../camel/providers/imap/camel-imap-store.c:703
-#: ../camel/providers/imap4/camel-imap4-store.c:392
-#: ../camel/providers/pop3/camel-pop3-store.c:252
-#: ../camel/providers/smtp/camel-smtp-transport.c:365
+#:../camel/providers/imap/camel-imap-store.c:721
+#:../camel/providers/imap4/camel-imap4-store.c:396
+#:../camel/providers/pop3/camel-pop3-store.c:250
+#:../camel/providers/smtp/camel-smtp-transport.c:362
 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:839
-#: ../camel/providers/imap4/camel-imap4-store.c:273
-#, c-format
+#:../camel/providers/imap/camel-imap-store.c:861
+#:../camel/providers/imap4/camel-imap4-store.c:275
+#,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:1023
-#: ../camel/providers/imap/camel-imap-store.c:2442
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:368
-#: ../camel/providers/imap4/camel-imap4-store.c:1267
-#: ../camel/providers/local/camel-maildir-folder.c:75
-#: ../camel/providers/local/camel-maildir-store.c:217
-#: ../camel/providers/local/camel-maildir-store.c:289
-#: ../camel/providers/local/camel-maildir-store.c:511
-#: ../camel/providers/local/camel-maildir-store.c:524
-#: ../camel/providers/local/camel-spool-store.c:460
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:258
+#.create a dummy "." parent inbox, use to scan, then put back at the top level
+#:../camel/providers/imap/camel-imap-store.c:1050
+#:../camel/providers/imap/camel-imap-store.c:2413
+#:../camel/providers/imap4/camel-imap4-store-summary.c:368
+#:../camel/providers/imap4/camel-imap4-store.c:1389
+#:../camel/providers/local/camel-maildir-folder.c:75
+#:../camel/providers/local/camel-maildir-store.c:217
+#:../camel/providers/local/camel-maildir-store.c:289
+#:../camel/providers/local/camel-maildir-store.c:511
+#:../camel/providers/local/camel-maildir-store.c:524
+#:../camel/providers/local/camel-spool-store.c:460
+#:../servers/exchange/storage/exchange-hierarchy-foreign.c:261
 msgid "Inbox"
 msgstr "Hôp nhận"
 
-#: ../camel/providers/imap/camel-imap-store.c:1279
-#, c-format
+#:../camel/providers/imap/camel-imap-store.c:1310
+#,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:1289
-#: ../camel/providers/smtp/camel-smtp-transport.c:501
-#, c-format
+#:../camel/providers/imap/camel-imap-store.c:1320
+#:../camel/providers/smtp/camel-smtp-transport.c:498
+#,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:1312
-#: ../camel/providers/imapp/camel-imapp-store.c:364
-#, c-format
+#:../camel/providers/imap/camel-imap-store.c:1343
+#:../camel/providers/imapp/camel-imapp-store.c:364
+#,c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sHãy gõ mật khẩu IMAP cho %s@%s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1355
-#, c-format
+#:../camel/providers/imap/camel-imap-store.c:1386
+#,c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
 "%s\n"
 "\n"
-msgstr ""
-"Không thể xác thực với máy phục vụ IMAP.\n"
+msgstr "Không thể xác thực với máy phục vụ IMAP.\n"
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1910
-#: ../camel/providers/imap/camel-imap-store.c:2284
-#: ../camel/providers/imap4/camel-imap4-store.c:856
-#, c-format
+#:../camel/providers/imap/camel-imap-store.c:1884
+#:../camel/providers/imap/camel-imap-store.c:2255
+#:../camel/providers/imap4/camel-imap4-store.c:1019
+#,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\""
 
-#: ../camel/providers/imap/camel-imap-store.c:1968
-#: ../camel/providers/imap/camel-imap-store.c:2346
-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/imap/camel-imap-store.c:2023
-#: ../camel/providers/local/camel-maildir-store.c:190
-#: ../camel/providers/local/camel-mbox-store.c:199
-#: ../camel/providers/local/camel-mh-store.c:237
-#, c-format
+#:../camel/providers/imap/camel-imap-store.c:2001
+#:../camel/providers/local/camel-maildir-store.c:190
+#:../camel/providers/local/camel-mbox-store.c:201
+#:../camel/providers/local/camel-mh-store.c:249
+#,c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Không thể tạo thư mục `%s: thư mục đã có."
 
-#: ../camel/providers/imap/camel-imap-store.c:2295
-#, c-format
+#:../camel/providers/imap/camel-imap-store.c:2266
+#,c-format
 msgid "Unknown parent folder: %s"
 msgstr "Thư mục mẹ lạ: %s"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:550
-#: ../camel/providers/imap4/camel-imap4-command.c:557
-#, c-format
+#:../camel/providers/imap4/camel-imap4-command.c:550
+#:../camel/providers/imap4/camel-imap4-command.c:557
+#,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"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:660
-#, c-format
+#:../camel/providers/imap4/camel-imap4-command.c:660
+#,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"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:222
-#, c-format
+#:../camel/providers/imap4/camel-imap4-engine.c:222
+#,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."
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:432
-#, c-format
+#:../camel/providers/imap4/camel-imap4-engine.c:432
+#,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"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:438
-#, c-format
+#:../camel/providers/imap4/camel-imap4-engine.c:438
+#,c-format
 msgid "Cannot select folder `%s': Bad command"
 msgstr "Không thể chọn thư mục `%s': lệnh sai"
 
-#: ../camel/providers/imap4/camel-imap4-engine.c:1549
-#: ../camel/providers/imap4/camel-imap4-engine.c:1588
-#: ../camel/providers/imap4/camel-imap4-engine.c:1633
-#: ../camel/providers/imap4/camel-imap4-engine.c:1689
-#, c-format
+#:../camel/providers/imap4/camel-imap4-engine.c:1549
+#:../camel/providers/imap4/camel-imap4-engine.c:1588
+#:../camel/providers/imap4/camel-imap4-engine.c:1633
+#:../camel/providers/imap4/camel-imap4-engine.c:1689
+#,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/imap4/camel-imap4-folder.c:85
+#:../camel/providers/imap4/camel-imap4-folder.c:85
 msgid ""
 "Enable 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 (cần đến do một số quy tắc lọc và "
-"Thư mục ảo)"
+msgstr "Hiệu lực khả năng phát hiện Hộp thư chung (cần đến do một số quy tắc lọc và Thư mục ảo)"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:398
-#, c-format
+#:../camel/providers/imap4/camel-imap4-folder.c:398
+#,c-format
 msgid "Cannot access folder `%s': %s"
 msgstr "Không thể truy cập thư mục `%s': %s"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:457
-#, c-format
+#:../camel/providers/imap4/camel-imap4-folder.c:457
+#,c-format
 msgid "Cannot sync flags to folder `%s': Unknown"
 msgstr "Không thể đồng bộ cờ với thư mục `%s': không biết sao"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:463
-#, c-format
+#:../camel/providers/imap4/camel-imap4-folder.c:463
+#,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:603
-#, c-format
+#:../camel/providers/imap4/camel-imap4-folder.c:603
+#,c-format
 msgid "Cannot expunge folder `%s': Unknown"
 msgstr "Không thể xóa hẳn thư mục « %s »: không biết sao."
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:608
-#, c-format
+#:../camel/providers/imap4/camel-imap4-folder.c:608
+#,c-format
 msgid "Cannot expunge folder `%s': Bad command"
 msgstr "Không thể xóa hẳn thư mục « %s »: lệnh sai."
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:864
-#, c-format
+#:../camel/providers/imap4/camel-imap4-folder.c:864
+#,c-format
 msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Không thể lấy thông điệp %s từ thư mục « %s »: không co thông điệp như vậy."
+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:869
-#, c-format
+#:../camel/providers/imap4/camel-imap4-folder.c:869
+#,c-format
 msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "Không thể lấy thông điệp « %s » từ thư mục « %s »: lệnh sai."
+msgstr "Không thể lấy thư « %s » từ thư mục « %s »: lệnh sai."
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:913
-#, c-format
+#:../camel/providers/imap4/camel-imap4-folder.c:913
+#,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 thôi."
+msgstr "Không thể phụ thêm thư vào thư mục « %s » vì thư mục chỉ cho phép đọc thôi."
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1006
-#, c-format
+#:../camel/providers/imap4/camel-imap4-folder.c:1006
+#,c-format
 msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Không thể phụ thêm thông điệp vào thư mục « %s »: không biết sao."
+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:1035
-#, c-format
+#:../camel/providers/imap4/camel-imap4-folder.c:1035
+#,c-format
 msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Không thể phụ thêm thông điệp vào thư mục « %s »: lệnh sai."
+msgstr "Không thể phụ thêm thư vào thư mục « %s »: lệnh sai."
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1155
-#, c-format
+#:../camel/providers/imap4/camel-imap4-folder.c:1155
+#,c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Không thể di chuyển thông điệp từ thư mục « %s » sang thư mục « %s »: "
-"không biết sao."
+msgstr "Không thể di chuyển thư từ thư mục « %s » sang thư mục « %s »: không biết sao."
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1159
-#, c-format
+#:../camel/providers/imap4/camel-imap4-folder.c:1159
+#,c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Không thể sao chép thông điệp từ thư mục « %s » sang thư mục « %s »: không "
-"biết sao"
+msgstr "Không thể sao chép thư từ thư mục « %s » sang thư mục « %s »: không biết sao"
 
-#: ../camel/providers/imap4/camel-imap4-folder.c:1167
-#, c-format
+#:../camel/providers/imap4/camel-imap4-folder.c:1167
+#,c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Không thể di chuyển thông điệp từ thư mục « %s » sang thư mục « %s »: lệnh "
-"sai."
+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:1171
-#, c-format
+#:../camel/providers/imap4/camel-imap4-folder.c:1171
+#,c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Không thể sao chép thông điệp từ thư mục « %s » sang thư mục « %s »: lệnh "
-"sai."
+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:71
+#:../camel/providers/imap4/camel-imap4-provider.c:71
 msgid "IMAP4rev1"
 msgstr "IMAPv4rev1"
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:73
+#:../camel/providers/imap4/camel-imap4-provider.c:73
 msgid "For reading and storing mail on IMAPv4rev1 servers."
 msgstr "Để đọc và lưu thư trên may chủ loại  IMAPv4rev1."
 
-#: ../camel/providers/imap4/camel-imap4-provider.c:90
+#:../camel/providers/imap4/camel-imap4-provider.c:90
 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ã hóa)."
+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:477
-#, c-format
+#:../camel/providers/imap4/camel-imap4-store.c:483
+#,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:522
-#, c-format
+#:../camel/providers/imap4/camel-imap4-store.c:532
+#,c-format
 msgid "%sPlease enter the IMAP password for %s on host %s"
 msgstr "%sHãy gõ mật khẩu IMAP cho « %s » trên máy « %s »."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:592
-#, c-format
+#:../camel/providers/imap4/camel-imap4-store.c:599
+#,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:754
-#: ../camel/providers/imap4/camel-imap4-store.c:866
+#:../camel/providers/imap4/camel-imap4-store.c:761
+#:../camel/providers/imap4/camel-imap4-store.c:1029
 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:793
-#, c-format
+#:../camel/providers/imap4/camel-imap4-store.c:800
+#,c-format
 msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Không thể lấy thư mục `%s' trên máy phục vụ IMAP %s: không biết sao"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:914
-#, c-format
+#:../camel/providers/imap4/camel-imap4-store.c:881
+#,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:883
+#:../camel/providers/imap4/camel-imap4-store.c:1556
+msgid "Bad command"
+msgstr "Lệnh sai"
+
+#:../camel/providers/imap4/camel-imap4-store.c:962
+#,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:920
-#, c-format
+#:../camel/providers/imap4/camel-imap4-store.c:967
+#,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:951
-#, c-format
+#:../camel/providers/imap4/camel-imap4-store.c:1073
+#,c-format
 msgid "Cannot delete folder `%s': Special folder"
 msgstr "Không thể xóa bỏ thư mục `%s': thư mục đặc biệt"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:958
+#:../camel/providers/imap4/camel-imap4-store.c:1080
 msgid "Cannot delete IMAP folders in offline mode."
 msgstr "Không thể xóa bỏ thư mục IMAP trong chế độ ngoại tuyến."
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1017
-#, c-format
+#:../camel/providers/imap4/camel-imap4-store.c:1139
+#,c-format
 msgid "Cannot delete folder `%s': Invalid mailbox name"
 msgstr "Không thể xoá bỏ thư mục `%s': tên hộp thư không hợp lệ"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1022
-#, c-format
+#:../camel/providers/imap4/camel-imap4-store.c:1144
+#,c-format
 msgid "Cannot delete folder `%s': Bad command"
 msgstr "Không thể xoá bỏ thư mục `%s': lệnh sai"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1042
-#, c-format
+#:../camel/providers/imap4/camel-imap4-store.c:1164
+#,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:1049
+#:../camel/providers/imap4/camel-imap4-store.c:1171
 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:1080
-#, c-format
+#:../camel/providers/imap4/camel-imap4-store.c:1202
+#,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:1085
-#, c-format
+#:../camel/providers/imap4/camel-imap4-store.c:1207
+#,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"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1432
-#, c-format
+#:../camel/providers/imap4/camel-imap4-store.c:1554
+#,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:1434
-msgid "Bad command"
-msgstr "Lệnh sai"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1472
+#:../camel/providers/imap4/camel-imap4-store.c:1594
 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:1517
-#, c-format
+#:../camel/providers/imap4/camel-imap4-store.c:1639
+#,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:1522
-#, c-format
+#:../camel/providers/imap4/camel-imap4-store.c:1644
+#,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/imap4/camel-imap4-store.c:1544
+#:../camel/providers/imap4/camel-imap4-store.c:1666
 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/imap4/camel-imap4-store.c:1589
-#, c-format
+#:../camel/providers/imap4/camel-imap4-store.c:1711
+#,c-format
 msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 msgstr "Không thể hủy đăng ký thư mục `%s': tên hộp thư không hợp lệ"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1594
-#, c-format
+#:../camel/providers/imap4/camel-imap4-store.c:1716
+#,c-format
 msgid "Cannot unsubscribe from folder `%s': Bad command"
 msgstr "Không thể hủy đăng ký thư mục `%s': lệnh sai"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1497
+#:../camel/providers/imap4/camel-imap4-summary.c:1472
+msgid "Scanning for changed messages"
+msgstr "Đang quét tìm các thư thay đổi"
+
+#:../camel/providers/imap4/camel-imap4-summary.c:1497
 msgid "Fetching envelopes for new messages"
-msgstr "Đang gọi bao cho thông điệp mới"
+msgstr "Đang gọi bao cho thư mới"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:368
-#, c-format
+#:../camel/providers/imap4/camel-imap4-utils.c:368
+#,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: "
+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:391
+#:../camel/providers/imap4/camel-imap4-utils.c:391
 msgid "No data"
 msgstr "Không có dữ liệu"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:574
-#, c-format
+#:../camel/providers/imap4/camel-imap4-utils.c:574
+#,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:40
-#: ../camel/providers/pop3/camel-pop3-provider.c:39
+#:../camel/providers/imapp/camel-imapp-provider.c:40
+#:../camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Message storage"
-msgstr "Kho lưu thông điệp"
+msgstr "Kho lưu thư"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:48
+#:../camel/providers/imapp/camel-imapp-provider.c:48
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:50
+#:../camel/providers/imapp/camel-imapp-provider.c:50
 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"
+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:251
-#, c-format
+#:../camel/providers/imapp/camel-imapp-store.c:251
+#,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:348
-#, c-format
+#:../camel/providers/imapp/camel-imapp-store.c:348
+#,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:173
+#:../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ông điệp"
+msgstr "Chỉ mục các dữ liệu trong phần thân thư"
 
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:378
-#, c-format
+#.$HOME relative path + protocol string
+#:../camel/providers/local/camel-local-folder.c:384
+#,c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:382
-#: ../camel/providers/local/camel-local-folder.c:385
-#, c-format
+#./var/spool/mail relative path + protocol
+#:../camel/providers/local/camel-local-folder.c:388
+#:../camel/providers/local/camel-local-folder.c:391
+#,c-format
 msgid "mailbox:%s (%s)"
 msgstr "Hộp thư: %s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:389
-#, c-format
+#.a full path + protocol
+#:../camel/providers/local/camel-local-folder.c:395
+#,c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:45
+#:../camel/providers/local/camel-local-provider.c:47
 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:52
+#:../camel/providers/local/camel-local-provider.c:54
 msgid "MH-format mail directories"
 msgstr "Thự mục thư với dạng thức MH"
 
-#: ../camel/providers/local/camel-local-provider.c:53
+#:../camel/providers/local/camel-local-provider.c:55
 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:68
+#:../camel/providers/local/camel-local-provider.c:72
 msgid "Local delivery"
 msgstr "Gửi cục bộ"
 
-#: ../camel/providers/local/camel-local-provider.c:69
+#:../camel/providers/local/camel-local-provider.c:73
 msgid ""
-"For retrieving (moving) local mail from standard mbox formated spools into "
+"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ừ ống chỉ dạng mbox chuẩn vào thư mục được "
-"Evolution quản lý."
+msgstr "Để gọi (di động) thư cục bộ từ ống chỉ dạng mbox chuẩn vào thư mục do Evolution quản lý."
 
-#: ../camel/providers/local/camel-local-provider.c:81
-#: ../camel/providers/local/camel-local-provider.c:100
+#:../camel/providers/local/camel-local-provider.c:87
+#:../camel/providers/local/camel-local-provider.c:106
 msgid "Apply filters to new messages in INBOX"
-msgstr "Áp dụng bộ lọc vào thông điệp mới trong Hộp nhận"
+msgstr "Áp dụng bộ lọc vào thư mới trong Hộp nhận"
 
-#: ../camel/providers/local/camel-local-provider.c:88
+#:../camel/providers/local/camel-local-provider.c:94
 msgid "Maildir-format mail directories"
 msgstr "Thư mục thư dạng thức Maildir"
 
-#: ../camel/providers/local/camel-local-provider.c:89
+#:../camel/providers/local/camel-local-provider.c:95
 msgid "For storing local mail in maildir directories."
 msgstr "Để lưu thư cục bộ trong thư mục maildir."
 
-#: ../camel/providers/local/camel-local-provider.c:101
+#:../camel/providers/local/camel-local-provider.c:107
 msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr "Lưu dòng đầu trạng thái theo dạng thứ Elm/Pine/Mutt"
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#:../camel/providers/local/camel-local-provider.c:114
 msgid "Standard Unix mbox spool or directory"
 msgstr "Ống chỉ hoặc thư mục mbox Unix chuẩn"
 
-#: ../camel/providers/local/camel-local-provider.c:109
+#:../camel/providers/local/camel-local-provider.c:115
 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ư cục bộ trong tập tin ống chỉ bên ngoại theo chuẩn mbox.\n"
+msgstr "Để đọc và lưu thư cục bộ trong tập tin ống chỉ bên ngoại theo chuẩn mbox.\n"
 "Ngoài ra còn có thể được dùng để đọc một cây các thư mục kiểu Elm, Pine, "
 "hoặc Mutt."
 
-#: ../camel/providers/local/camel-local-store.c:150
-#: ../camel/providers/local/camel-local-store.c:261
-#: ../camel/providers/local/camel-mbox-store.c:342
-#: ../camel/providers/local/camel-spool-store.c:125
-#, c-format
+#:../camel/providers/local/camel-local-store.c:155
+#:../camel/providers/local/camel-local-store.c:266
+#:../camel/providers/local/camel-mbox-store.c:344
+#:../camel/providers/local/camel-spool-store.c:125
+#,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:157
-#, c-format
+#:../camel/providers/local/camel-local-store.c:162
+#,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:166
-#: ../camel/providers/local/camel-local-store.c:174
-#: ../camel/providers/local/camel-local-store.c:272
-#, c-format
+#:../camel/providers/local/camel-local-store.c:171
+#:../camel/providers/local/camel-local-store.c:179
+#:../camel/providers/local/camel-local-store.c:277
+#,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:186
+#:../camel/providers/local/camel-local-store.c:191
 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:232
-#, c-format
+#:../camel/providers/local/camel-local-store.c:237
+#,c-format
 msgid "Local mail file %s"
 msgstr "Tập tin thư cục bộ %s"
 
-#: ../camel/providers/local/camel-local-store.c:341
-#, c-format
+#:../camel/providers/local/camel-local-store.c:355
+#,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:406
-#, c-format
+#:../camel/providers/local/camel-local-store.c:420
+#,c-format
 msgid "Could not rename '%s': %s"
 msgstr "Không thể đổi tên '%s': %s"
 
-#: ../camel/providers/local/camel-local-store.c:431
-#: ../camel/providers/local/camel-mbox-store.c:271
-#, c-format
+#:../camel/providers/local/camel-local-store.c:445
+#:../camel/providers/local/camel-mbox-store.c:273
+#,c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Không thể xóa bỏ tập tin tóm tắt thư mục `%s': %s"
 
-#: ../camel/providers/local/camel-local-store.c:441
-#: ../camel/providers/local/camel-mbox-store.c:283
-#, c-format
+#:../camel/providers/local/camel-local-store.c:455
+#:../camel/providers/local/camel-mbox-store.c:285
+#,c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Không thể xóa bỏ tập tin chỉ mục thư mục `%s': %s"
 
-#: ../camel/providers/local/camel-local-store.c:464
-#: ../camel/providers/local/camel-mbox-store.c:307
-#, c-format
+#:../camel/providers/local/camel-local-store.c:478
+#:../camel/providers/local/camel-mbox-store.c:309
+#,c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Không thể xóa bỏ tập tin của tập tin thư mục `%s': %s"
 
-#: ../camel/providers/local/camel-local-summary.c:406
-#, c-format
+#:../camel/providers/local/camel-local-summary.c:409
+#,c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Không thể lưu tóm tắt: %s: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:464
+#:../camel/providers/local/camel-local-summary.c:467
 msgid "Unable to add message to summary: unknown reason"
-msgstr "Không thể thêm thông điệp vào bảng tóm tắt: không biết sao"
+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:215
+#:../camel/providers/local/camel-maildir-folder.c:215
 msgid "Maildir append message cancelled"
-msgstr "Thông điệp phụ thêm dạng Maildir đã bị hủy"
+msgstr "Thư phụ thêm dạng Maildir đã bị hủy"
 
-#: ../camel/providers/local/camel-maildir-folder.c:218
-#, c-format
+#:../camel/providers/local/camel-maildir-folder.c:218
+#,c-format
 msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Không thể phụ thêm thông điệp vào thư mục Maildir: %s: %s"
-
-#: ../camel/providers/local/camel-maildir-folder.c:244
-#: ../camel/providers/local/camel-maildir-folder.c:258
-#: ../camel/providers/local/camel-maildir-folder.c:267
-#: ../camel/providers/local/camel-mbox-folder.c:339
-#: ../camel/providers/local/camel-mbox-folder.c:358
-#: ../camel/providers/local/camel-mbox-folder.c:389
-#: ../camel/providers/local/camel-mbox-folder.c:397
-#: ../camel/providers/local/camel-mh-folder.c:202
-#: ../camel/providers/local/camel-mh-folder.c:213
-#: ../camel/providers/local/camel-mh-folder.c:222
-#, c-format
+msgstr "Không thể phụ thêm thư vào thư mục Maildir: %s: %s"
+
+#:../camel/providers/local/camel-maildir-folder.c:244
+#:../camel/providers/local/camel-maildir-folder.c:258
+#:../camel/providers/local/camel-maildir-folder.c:267
+#:../camel/providers/local/camel-mbox-folder.c:349
+#:../camel/providers/local/camel-mbox-folder.c:368
+#:../camel/providers/local/camel-mbox-folder.c:399
+#:../camel/providers/local/camel-mbox-folder.c:407
+#:../camel/providers/local/camel-mh-folder.c:202
+#:../camel/providers/local/camel-mh-folder.c:213
+#:../camel/providers/local/camel-mh-folder.c:222
+#,c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
-msgstr ""
-"Không thể lấy thông điệp: %s từ thư mục %s\n"
+msgstr "Không thể lấy thư: %s từ thư mục %s\n"
 "  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:268
+#:../camel/providers/local/camel-maildir-folder.c:268
 msgid "Invalid message contents"
-msgstr "Nội dung thông điệp không hợp lệ"
+msgstr "Nội dung thư không hợp lệ"
 
-#: ../camel/providers/local/camel-maildir-store.c:146
-#: ../camel/providers/local/camel-maildir-store.c:171
-#: ../camel/providers/local/camel-mbox-store.c:171
-#: ../camel/providers/local/camel-mbox-store.c:183
-#, c-format
+#:../camel/providers/local/camel-maildir-store.c:146
+#:../camel/providers/local/camel-maildir-store.c:171
+#:../camel/providers/local/camel-mbox-store.c:173
+#:../camel/providers/local/camel-mbox-store.c:185
+#,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:159
-#: ../camel/providers/local/camel-mbox-store.c:141
-#: ../camel/providers/local/camel-mh-store.c:205
-#, c-format
+#:../camel/providers/local/camel-maildir-store.c:159
+#:../camel/providers/local/camel-mbox-store.c:144
+#:../camel/providers/local/camel-mh-store.c:217
+#,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:163
-#: ../camel/providers/local/camel-mbox-store.c:149
-#: ../camel/providers/local/camel-mh-store.c:212
-#, c-format
+#:../camel/providers/local/camel-maildir-store.c:163
+#:../camel/providers/local/camel-mbox-store.c:152
+#:../camel/providers/local/camel-mh-store.c:224
+#,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:187
-#, c-format
+#:../camel/providers/local/camel-maildir-store.c:187
+#,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:232
-#: ../camel/providers/local/camel-maildir-store.c:270
-#: ../camel/providers/local/camel-mh-store.c:261
-#, c-format
+#:../camel/providers/local/camel-maildir-store.c:232
+#:../camel/providers/local/camel-maildir-store.c:270
+#:../camel/providers/local/camel-mh-store.c:273
+#,c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Không thể xóa bỏ thư mục `%s': %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:234
+#:../camel/providers/local/camel-maildir-store.c:234
 msgid "not a maildir directory"
 msgstr "không phải là thư mục dạng Maildir"
 
-#: ../camel/providers/local/camel-maildir-store.c:436
-#: ../camel/providers/local/camel-spool-store.c:327
-#: ../camel/providers/local/camel-spool-store.c:341
-#, c-format
+#:../camel/providers/local/camel-maildir-store.c:436
+#:../camel/providers/local/camel-spool-store.c:327
+#:../camel/providers/local/camel-spool-store.c:341
+#,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-summary.c:425
-#: ../camel/providers/local/camel-maildir-summary.c:556
-#, c-format
+#:../camel/providers/local/camel-maildir-summary.c:425
+#:../camel/providers/local/camel-maildir-summary.c:556
+#,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:549
+#:../camel/providers/local/camel-maildir-summary.c:549
 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:652
+#:../camel/providers/local/camel-maildir-summary.c:652
 msgid "Checking for new messages"
 msgstr "Đang kiểm tra tìm thư mới"
 
-#: ../camel/providers/local/camel-maildir-summary.c:741
-#: ../camel/providers/local/camel-mbox-summary.c:416
-#: ../camel/providers/local/camel-mbox-summary.c:589
-#: ../camel/providers/local/camel-mbox-summary.c:680
-#: ../camel/providers/local/camel-spool-summary.c:140
+#:../camel/providers/local/camel-maildir-summary.c:741
+#:../camel/providers/local/camel-mbox-summary.c:415
+#:../camel/providers/local/camel-mbox-summary.c:588
+#:../camel/providers/local/camel-mbox-summary.c:683
+#:../camel/providers/local/camel-spool-summary.c:139
 msgid "Storing folder"
 msgstr "Đang lưu thư mục"
 
-#: ../camel/providers/local/camel-mbox-folder.c:147
-#: ../camel/providers/local/camel-spool-folder.c:148
-#, c-format
+#:../camel/providers/local/camel-mbox-folder.c:155
+#:../camel/providers/local/camel-spool-folder.c:148
+#,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:206
-#, c-format
+#:../camel/providers/local/camel-mbox-folder.c:216
+#,c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Không thể mở hộp thư: %s: %s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:266
+#:../camel/providers/local/camel-mbox-folder.c:276
 msgid "Mail append cancelled"
 msgstr "Quá trình phụ thêm thư đã bị hủy"
 
-#: ../camel/providers/local/camel-mbox-folder.c:269
-#, c-format
+#:../camel/providers/local/camel-mbox-folder.c:279
+#,c-format
 msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Không thể phụ thêm thông điệp vào tập tin mbox: %s: %s"
+msgstr "Không thể phụ thêm thư vào tập tin mbox: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:390
+#:../camel/providers/local/camel-mbox-folder.c:400
 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:398
-#: ../camel/providers/local/camel-mh-folder.c:223
+#:../camel/providers/local/camel-mbox-folder.c:408
+#:../camel/providers/local/camel-mh-folder.c:223
 msgid "Message construction failed."
-msgstr "Lỗi tạo dựng thông điệp."
+msgstr "Lỗi tạo dựng thư."
 
-#: ../camel/providers/local/camel-mbox-store.c:163
-#: ../camel/providers/local/camel-mbox-store.c:348
+#:../camel/providers/local/camel-mbox-store.c:163
+#:../camel/providers/local/camel-mbox-store.c:350
 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:193
-#, c-format
+#:../camel/providers/local/camel-mbox-store.c:195
+#,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:223
-#: ../camel/providers/local/camel-mbox-store.c:234
-#: ../camel/providers/local/camel-mbox-store.c:257
-#, c-format
+#:../camel/providers/local/camel-mbox-store.c:225
+#:../camel/providers/local/camel-mbox-store.c:236
+#:../camel/providers/local/camel-mbox-store.c:259
+#,c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
-msgstr ""
-"Không thể xóa bỏ thư mục `%s':\n"
+msgstr "Không thể xóa bỏ thư mục `%s':\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:242
-#, c-format
+#:../camel/providers/local/camel-mbox-store.c:244
+#,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:249
-#, c-format
+#:../camel/providers/local/camel-mbox-store.c:251
+#,c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Thư mục `%s' không rỗng. Chưa xóa."
 
-#: ../camel/providers/local/camel-mbox-store.c:361
-#, c-format
+#:../camel/providers/local/camel-mbox-store.c:363
+#,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:375
-#, c-format
+#:../camel/providers/local/camel-mbox-store.c:377
+#,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:377
+#:../camel/providers/local/camel-mbox-store.c:379
 msgid "Folder already exists"
 msgstr "Thư mục đã tồn tại"
 
-#: ../camel/providers/local/camel-mbox-store.c:459
+#:../camel/providers/local/camel-mbox-store.c:470
 msgid "The new folder name is illegal."
 msgstr "Không cho phép tên thư mục mới ấy"
 
-#: ../camel/providers/local/camel-mbox-store.c:472
-#, c-format
+#:../camel/providers/local/camel-mbox-store.c:483
+#,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:547
-#, c-format
+#:../camel/providers/local/camel-mbox-store.c:558
+#,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:422
-#, c-format
+#:../camel/providers/local/camel-mbox-summary.c:421
+#,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:470
-#, c-format
+#:../camel/providers/local/camel-mbox-summary.c:469
+#,c-format
 msgid "Fatal mail parser error near position %ld 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:526
-#, c-format
+#:../camel/providers/local/camel-mbox-summary.c:525
+#,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:594
-#: ../camel/providers/local/camel-mbox-summary.c:685
-#: ../camel/providers/local/camel-spool-summary.c:145
-#, c-format
+#:../camel/providers/local/camel-mbox-summary.c:593
+#:../camel/providers/local/camel-mbox-summary.c:688
+#:../camel/providers/local/camel-spool-summary.c:144
+#,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:606
-#: ../camel/providers/local/camel-spool-summary.c:165
-#, c-format
+#:../camel/providers/local/camel-mbox-summary.c:605
+#:../camel/providers/local/camel-spool-summary.c:164
+#,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:619
-#: ../camel/providers/local/camel-mbox-summary.c:793
-#, c-format
+#:../camel/providers/local/camel-mbox-summary.c:618
+#:../camel/providers/local/camel-mbox-summary.c:794
+#,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:628
-#, c-format
+#:../camel/providers/local/camel-mbox-summary.c:627
+#,c-format
 msgid "Could not close temp folder: %s"
 msgstr "Không thể đóng thư mục tạm: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:639
-#, c-format
+#:../camel/providers/local/camel-mbox-summary.c:642
+#,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:696
-#: ../camel/providers/local/camel-mbox-summary.c:904
-#, c-format
+#:../camel/providers/local/camel-mbox-summary.c:699
+#:../camel/providers/local/camel-mbox-summary.c:905
+#,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:733
-#: ../camel/providers/local/camel-mbox-summary.c:741
-#: ../camel/providers/local/camel-mbox-summary.c:935
-#: ../camel/providers/local/camel-mbox-summary.c:943
+#:../camel/providers/local/camel-mbox-summary.c:736
+#:../camel/providers/local/camel-mbox-summary.c:744
+#:../camel/providers/local/camel-mbox-summary.c:936
+#:../camel/providers/local/camel-mbox-summary.c:944
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Bản tóm tắt và thư mục không khớp, kể cả sau khi đồng bộ"
 
-#: ../camel/providers/local/camel-mbox-summary.c:869
-#: ../camel/providers/local/camel-spool-summary.c:337
-#, c-format
+#:../camel/providers/local/camel-mbox-summary.c:870
+#:../camel/providers/local/camel-spool-summary.c:336
+#,c-format
 msgid "Unknown error: %s"
 msgstr "Lỗi lạ: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:998
-#: ../camel/providers/local/camel-mbox-summary.c:1024
-#, c-format
+#:../camel/providers/local/camel-mbox-summary.c:999
+#:../camel/providers/local/camel-mbox-summary.c:1025
+#,c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Lỗi ghi vào hộp thư tạm: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1015
-#, c-format
+#:../camel/providers/local/camel-mbox-summary.c:1016
+#,c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Lỗi ghi vào hộp thư tạm: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:175
+#:../camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
-msgstr "Quá trình phụ thêm thông điệp dạng MH đã bị hủy"
+msgstr "Quá trình phụ thêm thư dạng MH đã bị hủy"
 
-#: ../camel/providers/local/camel-mh-folder.c:178
-#, c-format
+#:../camel/providers/local/camel-mh-folder.c:178
+#,c-format
 msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Không thể phụ thêm thông điệp vào thư mục dạng MH: %s: %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:220
-#, c-format
+#:../camel/providers/local/camel-mh-store.c:232
+#,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:232
-#, c-format
+#:../camel/providers/local/camel-mh-store.c:244
+#,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:247
-#, c-format
+#:../camel/providers/local/camel-mh-summary.c:246
+#,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:131
-#, c-format
+#:../camel/providers/local/camel-spool-store.c:131
+#,c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Không thể mở ống chỉ `%s': %s"
 
-#: ../camel/providers/local/camel-spool-store.c:143
-#, c-format
+#:../camel/providers/local/camel-spool-store.c:143
+#,c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "Ống chỉ `%s' không phải là tập tin hay thư mục bình thường"
 
-#: ../camel/providers/local/camel-spool-store.c:162
-#, c-format
+#:../camel/providers/local/camel-spool-store.c:162
+#,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:172
-#, c-format
+#:../camel/providers/local/camel-spool-store.c:172
+#,c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
-msgstr ""
-"Không thể mở thư mục `%s':\n"
+msgstr "Không thể mở thư mục `%s':\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:176
-#, c-format
+#:../camel/providers/local/camel-spool-store.c:176
+#,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:181
-#, c-format
+#:../camel/providers/local/camel-spool-store.c:181
+#,c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
-msgstr ""
-"Không thể tạo thư mục `%s':\n"
+msgstr "Không thể tạo thư mục `%s':\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:189
-#, c-format
+#:../camel/providers/local/camel-spool-store.c:189
+#,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:206
+#:../camel/providers/local/camel-spool-store.c:206
 msgid "Store does not support an INBOX"
 msgstr "Store không hỗ trợ Hộp nhận"
 
-#: ../camel/providers/local/camel-spool-store.c:218
-#, c-format
+#:../camel/providers/local/camel-spool-store.c:218
+#,c-format
 msgid "Spool mail file %s"
 msgstr "Tập tin thư ống chỉ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:218
-#, c-format
+#:../camel/providers/local/camel-spool-store.c:218
+#,c-format
 msgid "Spool folder tree %s"
 msgstr "Cây thư mục ống chỉ %s"
 
-#: ../camel/providers/local/camel-spool-store.c:226
+#:../camel/providers/local/camel-spool-store.c:226
 msgid "Spool folders cannot be renamed"
 msgstr "Không thể đổi tên thư mục ống chỉ"
 
-#: ../camel/providers/local/camel-spool-store.c:234
+#:../camel/providers/local/camel-spool-store.c:234
 msgid "Spool folders cannot be deleted"
 msgstr "Không thể xóa bỏ thư mục ống chỉ"
 
-#: ../camel/providers/local/camel-spool-summary.c:178
-#: ../camel/providers/local/camel-spool-summary.c:188
-#: ../camel/providers/local/camel-spool-summary.c:198
-#, c-format
+#:../camel/providers/local/camel-spool-summary.c:177
+#:../camel/providers/local/camel-spool-summary.c:187
+#:../camel/providers/local/camel-spool-summary.c:197
+#,c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Không thể đồng bộ thư mục tạm %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:214
-#, c-format
+#:../camel/providers/local/camel-spool-summary.c:213
+#,c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Không thể đồng bộ thư mục ống chỉ %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:245
-#: ../camel/providers/local/camel-spool-summary.c:264
-#: ../camel/providers/local/camel-spool-summary.c:277
-#, c-format
+#:../camel/providers/local/camel-spool-summary.c:244
+#:../camel/providers/local/camel-spool-summary.c:263
+#:../camel/providers/local/camel-spool-summary.c:276
+#,c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in `%s'"
-msgstr ""
-"Không thể đồng bộ thư mục ống chỉ %s: %s\n"
+msgstr "Không thể đồng bộ thư mục ống chỉ %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:177
-#: ../camel/providers/nntp/camel-nntp-folder.c:209
-#, c-format
+#:../camel/providers/nntp/camel-nntp-folder.c:174
+#:../camel/providers/nntp/camel-nntp-folder.c:206
+#,c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Lỗi nội bộ: UID dạng thức không hợp lệ: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:329
-#: ../camel/providers/nntp/camel-nntp-folder.c:332
-#: ../camel/providers/nntp/camel-nntp-folder.c:374
-#: ../camel/providers/nntp/camel-nntp-folder.c:376
-#, c-format
+#:../camel/providers/nntp/camel-nntp-folder.c:326
+#:../camel/providers/nntp/camel-nntp-folder.c:329
+#:../camel/providers/nntp/camel-nntp-folder.c:371
+#:../camel/providers/nntp/camel-nntp-folder.c:373
+#,c-format
 msgid "Posting failed: %s"
 msgstr "Gửi thất bại: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:394
+#:../camel/providers/nntp/camel-nntp-folder.c:391
 msgid "You cannot post NNTP messages while working offline!"
-msgstr "Bạn không thể gởi thông điệp NNTP (nhóm tin Mạng) khi ngoại tuyến."
+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:405
+#:../camel/providers/nntp/camel-nntp-folder.c:402
 msgid "You cannot copy messages from a NNTP folder!"
-msgstr "Không thể sao chép thông điệp từ thư mục NNTP (nhóm tin Mạng)."
+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:44
+#:../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:46
+#:../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:53
+#:../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "Tin tức USENET"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#:../camel/providers/nntp/camel-nntp-provider.c:55
 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:74
+#:../camel/providers/nntp/camel-nntp-provider.c:74
 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ã "
+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:234
-#, c-format
+#:../camel/providers/nntp/camel-nntp-store.c:219
+#,c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Không thể đọc lời chào mừng từ %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:246
-#, c-format
+#:../camel/providers/nntp/camel-nntp-store.c:231
+#,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:423
-#, c-format
+#:../camel/providers/nntp/camel-nntp-store.c:408
+#,c-format
 msgid "USENET News via %s"
 msgstr "Tin tức USENET thông qua %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:813
-#, c-format
+#:../camel/providers/nntp/camel-nntp-store.c:798
+#,c-format
 msgid ""
 "Error retrieving newsgroups:\n"
 "\n"
 "%s"
-msgstr ""
-"Lỗi nhận nhóm tin:\n"
+msgstr "Lỗi nhận nhóm tin:\n"
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:907
+#:../camel/providers/nntp/camel-nntp-store.c:892
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
-msgstr ""
-"Bạn không thể đăng ký vào nhóm tin này:\n"
+msgstr "Bạn không thể đăng ký vào nhóm tin này:\n"
 "\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:939
+#:../camel/providers/nntp/camel-nntp-store.c:924
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
-msgstr ""
-"Bạn không thể hủy đăng ký nhóm tin này:\n"
+msgstr "Bạn không thể hủy đăng ký nhóm tin này:\n"
 "\n"
 "Không có nhóm tin như vậy!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:964
+#:../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:972
+#:../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:980
+#:../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:1150
+#:../camel/providers/nntp/camel-nntp-store.c:1146
 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:1158
-#, c-format
+#:../camel/providers/nntp/camel-nntp-store.c:1154
+#,c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Hãy gõ mật khẩu NNTP cho %s@%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1162
-#, c-format
+#:../camel/providers/nntp/camel-nntp-store.c:1158
+#,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:1278
-#, c-format
+#:../camel/providers/nntp/camel-nntp-store.c:1274
+#,c-format
 msgid "NNTP Command failed: %s"
 msgstr "Lỗi lệnh NNTP: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1334
+#:../camel/providers/nntp/camel-nntp-store.c:1330
 msgid "Not connected."
 msgstr "Chưa kết nối."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1387
-#, c-format
+#:../camel/providers/nntp/camel-nntp-store.c:1383
+#,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:221
-#: ../camel/providers/nntp/camel-nntp-summary.c:317
-#, c-format
+#:../camel/providers/nntp/camel-nntp-summary.c:220
+#:../camel/providers/nntp/camel-nntp-summary.c:316
+#,c-format
 msgid "%s: Scanning new messages"
-msgstr "%s: Đang quét tìm thông điệp mới"
+msgstr "%s: Đang quét tìm thư mới"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:228
-#, c-format
+#:../camel/providers/nntp/camel-nntp-summary.c:227
+#,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:331
-#, c-format
+#:../camel/providers/nntp/camel-nntp-summary.c:330
+#,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:371
+#:../camel/providers/nntp/camel-nntp-summary.c:370
 msgid "Use cancel"
 msgstr "Hãy sử dụng Thôi"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:373
-#, c-format
+#:../camel/providers/nntp/camel-nntp-summary.c:372
+#,c-format
 msgid "Operation failed: %s"
 msgstr "Thao tác thất bại: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:247
+#:../camel/providers/pop3/camel-pop3-folder.c:247
 msgid "Retrieving POP summary"
 msgstr "Đang gọi bản tóm tắt POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:266
-#, c-format
+#:../camel/providers/pop3/camel-pop3-folder.c:266
+#,c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Không thể gọi bản tóm tắt POP: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:309
+#:../camel/providers/pop3/camel-pop3-folder.c:309
 msgid "Expunging deleted messages"
-msgstr "Đang xóa hẳn các thông điệp bị xóa bỏ"
+msgstr "Đang xóa hẳn các thư bị xóa bỏ"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:405
-#, c-format
+#:../camel/providers/pop3/camel-pop3-folder.c:405
+#,c-format
 msgid "No message with uid %s"
-msgstr "Không có thông điệp nào vời UID %s"
+msgstr "Không có thư nào 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:412
-#, c-format
+#.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:412
+#,c-format
 msgid "Retrieving POP message %d"
-msgstr "Đang gọi thông điệp POP %d"
+msgstr "Đang gọi thư POP %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:502
+#:../camel/providers/pop3/camel-pop3-folder.c:502
 msgid "Unknown reason"
 msgstr "Không biết sao"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:41
+#:../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "Leave messages on server"
-msgstr "Để các thông điệp trên máy phục vụ"
+msgstr "Để các thư trên máy phục vụ"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:44
-#, c-format
+#:../camel/providers/pop3/camel-pop3-provider.c:44
+#,c-format
 msgid "Delete after %s day(s)"
 msgstr "Xoá bỏ sau %s ngày"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#:../camel/providers/pop3/camel-pop3-provider.c:47
 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:55
+#:../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#:../camel/providers/pop3/camel-pop3-provider.c:57
 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
+#:../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ã "
+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:84
+#:../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 "
+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-store.c:204
-#, c-format
+#:../camel/providers/pop3/camel-pop3-store.c:202
+#,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:218
-#: ../camel/providers/pop3/camel-pop3-store.c:235
-#: ../camel/providers/pop3/camel-pop3-store.c:245
-#: ../camel/providers/pop3/camel-pop3-store.c:251
-#, c-format
+#:../camel/providers/pop3/camel-pop3-store.c:216
+#:../camel/providers/pop3/camel-pop3-store.c:233
+#:../camel/providers/pop3/camel-pop3-store.c:243
+#:../camel/providers/pop3/camel-pop3-store.c:249
+#,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:219
+#:../camel/providers/pop3/camel-pop3-store.c:217
 msgid "STLS not supported"
 msgstr "Chưa hỗ trợ STLS"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:363
-#, c-format
+#:../camel/providers/pop3/camel-pop3-store.c:361
+#,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:404
-#: ../camel/providers/pop3/camel-pop3-store.c:518
-#, c-format
+#:../camel/providers/pop3/camel-pop3-store.c:402
+#:../camel/providers/pop3/camel-pop3-store.c:516
+#,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 "
+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:420
-#, c-format
+#:../camel/providers/pop3/camel-pop3-store.c:418
+#,c-format
 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
-#, c-format
+#:../camel/providers/pop3/camel-pop3-store.c:430
+#,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
+#:../camel/providers/pop3/camel-pop3-store.c:449
+#,c-format
 msgid "Failed to authenticate on POP server %s: %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:477
-#, c-format
+#:../camel/providers/pop3/camel-pop3-store.c:475
+#,c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sHãy gõ mật khẩu POP cho %s trên máy %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:532
-#: ../camel/providers/pop3/camel-pop3-store.c:545
-#, c-format
+#:../camel/providers/pop3/camel-pop3-store.c:530
+#:../camel/providers/pop3/camel-pop3-store.c:543
+#,c-format
 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"
+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:539
-#, c-format
+#:../camel/providers/pop3/camel-pop3-store.c:537
+#,c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending username: %s"
-msgstr ""
-"Không thể kết nối tới máy phục vụ POP %s.\n"
+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:645
-#, c-format
+#:../camel/providers/pop3/camel-pop3-store.c:643
+#,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:37
+#:../camel/providers/sendmail/camel-sendmail-provider.c:37
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:39
+#:../camel/providers/sendmail/camel-sendmail-provider.c:39
 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 "
+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:114
+#:../camel/providers/sendmail/camel-sendmail-transport.c:114
 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:145
-#, c-format
+#:../camel/providers/sendmail/camel-sendmail-transport.c:145
+#,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:166
-#, c-format
+#:../camel/providers/sendmail/camel-sendmail-transport.c:166
+#,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:206
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Không thể gửi thông điệp: %s"
-
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
-#, c-format
+#:../camel/providers/sendmail/camel-sendmail-transport.c:234
+#,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:241
-#, c-format
+#:../camel/providers/sendmail/camel-sendmail-transport.c:241
+#,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:246
-#, c-format
+#:../camel/providers/sendmail/camel-sendmail-transport.c:246
+#,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:260
+#:../camel/providers/sendmail/camel-sendmail-transport.c:260
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:262
+#:../camel/providers/sendmail/camel-sendmail-transport.c:262
 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:38
+#:../camel/providers/smtp/camel-smtp-provider.c:38
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:40
+#:../camel/providers/smtp/camel-smtp-provider.c:40
 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:165
+#:../camel/providers/smtp/camel-smtp-transport.c:162
 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:167
+#:../camel/providers/smtp/camel-smtp-transport.c:164
 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:169
+#:../camel/providers/smtp/camel-smtp-transport.c:166
 msgid "Command not implemented"
 msgstr "Lệnh chưa được thi công"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
+#:../camel/providers/smtp/camel-smtp-transport.c:168
 msgid "Command parameter not implemented"
 msgstr "Tham số lệnh chưa được thi công"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
+#:../camel/providers/smtp/camel-smtp-transport.c:170
 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:175
+#:../camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Help message"
-msgstr "Thông điệp trợ giúp"
+msgstr "Thư trợ giúp"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
+#:../camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Service ready"
 msgstr "Dịch vụ sẵn sàng"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
+#:../camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Service closing transmission channel"
 msgstr "Dịch vụ đang đóng kênh truyền"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
+#:../camel/providers/smtp/camel-smtp-transport.c:178
 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:183
+#:../camel/providers/smtp/camel-smtp-transport.c:180
 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:185
+#:../camel/providers/smtp/camel-smtp-transport.c:182
 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:187
+#:../camel/providers/smtp/camel-smtp-transport.c:184
 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:189
+#:../camel/providers/smtp/camel-smtp-transport.c:186
 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:191
+#:../camel/providers/smtp/camel-smtp-transport.c:188
 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:193
+#:../camel/providers/smtp/camel-smtp-transport.c:190
 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:195
+#:../camel/providers/smtp/camel-smtp-transport.c:192
 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:197
+#:../camel/providers/smtp/camel-smtp-transport.c:194
 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:199
+#:../camel/providers/smtp/camel-smtp-transport.c:196
 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:201
+#:../camel/providers/smtp/camel-smtp-transport.c:198
 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:203
+#:../camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Transaction failed"
 msgstr "Giao dịch thất bại"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:207
+#:../camel/providers/smtp/camel-smtp-transport.c:204
 msgid "A password transition is needed"
 msgstr "Cần chuyển tiếp mật khẩu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
+#:../camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Authentication mechanism is too weak"
 msgstr "Cơ chế xác thực quá yếu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
+#:../camel/providers/smtp/camel-smtp-transport.c:208
 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:213
+#:../camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Temporary authentication failure"
 msgstr "Lỗi xác thực tạm"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:294
+#:../camel/providers/smtp/camel-smtp-transport.c:291
 msgid "Welcome response error"
 msgstr "Lỗi hồi đáp chào mừng"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:325
-#: ../camel/providers/smtp/camel-smtp-transport.c:358
-#: ../camel/providers/smtp/camel-smtp-transport.c:364
-#, c-format
+#:../camel/providers/smtp/camel-smtp-transport.c:322
+#:../camel/providers/smtp/camel-smtp-transport.c:355
+#:../camel/providers/smtp/camel-smtp-transport.c:361
+#,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:334
-#, c-format
+#:../camel/providers/smtp/camel-smtp-transport.c:331
+#,c-format
 msgid "STARTTLS command failed: %s"
 msgstr "Lỗi lệnh STARTTLS: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:349
+#:../camel/providers/smtp/camel-smtp-transport.c:346
 msgid "STARTTLS command failed"
 msgstr "Lỗi lệnh STARTTLS"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:491
-#, c-format
+#:../camel/providers/smtp/camel-smtp-transport.c:488
+#,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:529
-#, c-format
+#:../camel/providers/smtp/camel-smtp-transport.c:526
+#,c-format
 msgid "%sPlease enter the SMTP password for %s on host %s"
 msgstr "%sHãy gõ mật khẩu SMTP cho %s trên máy %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:548
-#, c-format
+#:../camel/providers/smtp/camel-smtp-transport.c:545
+#,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"
+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:672
-#, c-format
+#:../camel/providers/smtp/camel-smtp-transport.c:669
+#,c-format
 msgid "SMTP server %s"
 msgstr "Máy phục vụ SMTP %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:674
-#, c-format
+#:../camel/providers/smtp/camel-smtp-transport.c:671
+#,c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Gửi thư (SMTP) thông qua %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:692
+#:../camel/providers/smtp/camel-smtp-transport.c:689
 msgid "Cannot send message: service not connected."
-msgstr "Không thể gửi thông điệp: chưa kết nối dịch vụ."
+msgstr "Không thể gửi thư: chưa kết nối dịch vụ."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:698
+#:../camel/providers/smtp/camel-smtp-transport.c:695
 msgid "Cannot send message: sender address not valid."
-msgstr "Không thể gửi thông điệp: địa chỉ người gửi không hợp lệ."
+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:702
+#:../camel/providers/smtp/camel-smtp-transport.c:699
 msgid "Sending message"
-msgstr "Đang gửi thông điệp"
+msgstr "Đang gửi thư"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:717
+#:../camel/providers/smtp/camel-smtp-transport.c:714
 msgid "Cannot send message: no recipients defined."
-msgstr "Không thể gửi thông điệp: chưa gõ người nhận."
+msgstr "Không thể gửi thư: chưa gõ người nhận."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:728
+#:../camel/providers/smtp/camel-smtp-transport.c:725
 msgid "Cannot send message: one or more invalid recipients"
-msgstr "Không thể gửi thông điệp: có một hoặc vài người nhận không hợp lệ"
+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:897
+#:../camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr "Chào hỏi của SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:923
-#, c-format
+#:../camel/providers/smtp/camel-smtp-transport.c:920
+#,c-format
 msgid "HELO command failed: %s"
 msgstr "Lỗi lệnh HELO: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:940
+#:../camel/providers/smtp/camel-smtp-transport.c:937
 msgid "HELO command failed"
 msgstr "Lỗi lệnh HELO"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1006
+#:../camel/providers/smtp/camel-smtp-transport.c:1003
 msgid "SMTP Authentication"
 msgstr "Xác thực SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1012
+#:../camel/providers/smtp/camel-smtp-transport.c:1009
 msgid "Error creating SASL authentication object."
 msgstr "Lỗi tạo đối tượng xác thực SASL."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1029
-#: ../camel/providers/smtp/camel-smtp-transport.c:1040
-#, c-format
+#:../camel/providers/smtp/camel-smtp-transport.c:1026
+#:../camel/providers/smtp/camel-smtp-transport.c:1037
+#,c-format
 msgid "AUTH command failed: %s"
 msgstr "Lỗi lệnh AUTH: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1046
+#:../camel/providers/smtp/camel-smtp-transport.c:1043
 msgid "AUTH command failed"
 msgstr "Lỗi lệnh AUTH"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1108
+#:../camel/providers/smtp/camel-smtp-transport.c:1105
 msgid "Bad authentication response from server.\n"
 msgstr "Trả lời xác thực sai từ máy phục vụ.\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
-#, c-format
+#:../camel/providers/smtp/camel-smtp-transport.c:1130
+#,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ư"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1150
+#:../camel/providers/smtp/camel-smtp-transport.c:1147
 msgid "MAIL FROM command failed"
 msgstr "Lỗi lệnh MAIL FROM"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1174
-#, c-format
+#:../camel/providers/smtp/camel-smtp-transport.c:1171
+#,c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Lỗi lệnh RCPT TO: %s: chưa gửi thư"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1193
-#, c-format
+#:../camel/providers/smtp/camel-smtp-transport.c:1190
+#,c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> thất bại"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1232
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#: ../camel/providers/smtp/camel-smtp-transport.c:1309
-#, c-format
+#:../camel/providers/smtp/camel-smtp-transport.c:1229
+#:../camel/providers/smtp/camel-smtp-transport.c:1287
+#:../camel/providers/smtp/camel-smtp-transport.c:1306
+#,c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Lỗi lệnh DATA: %s: chưa gửi thưi"
 
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
+#.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:1249
-#: ../camel/providers/smtp/camel-smtp-transport.c:1325
+#:../camel/providers/smtp/camel-smtp-transport.c:1246
+#:../camel/providers/smtp/camel-smtp-transport.c:1322
 msgid "DATA command failed"
 msgstr "Lỗi lệnh DATA"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1348
-#, c-format
+#:../camel/providers/smtp/camel-smtp-transport.c:1345
+#,c-format
 msgid "RSET command failed: %s"
 msgstr "Lỗi lệnh RSET: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1364
+#:../camel/providers/smtp/camel-smtp-transport.c:1361
 msgid "RSET command failed"
 msgstr "Lỗi lệnh RSET"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1387
-#, c-format
+#:../camel/providers/smtp/camel-smtp-transport.c:1384
+#,c-format
 msgid "QUIT command failed: %s"
 msgstr "Lỗi lệnh QUIT: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1401
+#:../camel/providers/smtp/camel-smtp-transport.c:1398
 msgid "QUIT command failed"
 msgstr "Lỗi lệnh QUIT"
 
-#: ../libedataserver/e-categories.c:238
+#:../libedataserver/e-categories.c:242
 msgid "Business"
 msgstr "Kinh doanh"
 
-#: ../libedataserver/e-categories.c:239
+#:../libedataserver/e-categories.c:243
 msgid "Competition"
 msgstr "Tranh đua"
 
-#: ../libedataserver/e-categories.c:240
+#:../libedataserver/e-categories.c:244
 msgid "Favorites"
 msgstr "Ưa thích"
 
-#: ../libedataserver/e-categories.c:241
+#:../libedataserver/e-categories.c:245
 msgid "Gifts"
 msgstr "Quà biếu"
 
-#: ../libedataserver/e-categories.c:242
+#:../libedataserver/e-categories.c:246
 msgid "Goals/Objectives"
 msgstr "Đích"
 
-#: ../libedataserver/e-categories.c:243
+#:../libedataserver/e-categories.c:247
 msgid "Holiday"
 msgstr "Ngày nghỉ"
 
-#: ../libedataserver/e-categories.c:244
+#:../libedataserver/e-categories.c:248
 msgid "Holiday Cards"
 msgstr "Thẻ ngày nghỉ"
 
-#: ../libedataserver/e-categories.c:245
+#.important people (e.g. new business partners) you should pay attention to/observe
+#:../libedataserver/e-categories.c:250
 msgid "Hot Contacts"
 msgstr "Liên lạc quan trọng"
 
-#: ../libedataserver/e-categories.c:246
+#:../libedataserver/e-categories.c:251
 msgid "Ideas"
 msgstr "Ý kiến"
 
-#: ../libedataserver/e-categories.c:247
+#:../libedataserver/e-categories.c:252
 msgid "International"
 msgstr "Quốc tế"
 
-#: ../libedataserver/e-categories.c:248
+#:../libedataserver/e-categories.c:253
 msgid "Key Customer"
 msgstr "Khách hàng chính"
 
-#: ../libedataserver/e-categories.c:249
+#:../libedataserver/e-categories.c:254
 msgid "Miscellaneous"
 msgstr "Linh tinh"
 
-#: ../libedataserver/e-categories.c:250
+#:../libedataserver/e-categories.c:255
 msgid "Personal"
 msgstr "Cá nhân"
 
-#: ../libedataserver/e-categories.c:251
+#:../libedataserver/e-categories.c:256
 msgid "Phone Calls"
 msgstr "Điện thoại"
 
-#: ../libedataserver/e-categories.c:252
+#:../libedataserver/e-categories.c:257
 msgid "Status"
 msgstr "Trạng thái"
 
-#: ../libedataserver/e-categories.c:253
+#:../libedataserver/e-categories.c:258
 msgid "Strategies"
 msgstr "Chiến lược"
 
-#: ../libedataserver/e-categories.c:254
+#:../libedataserver/e-categories.c:259
 msgid "Suppliers"
 msgstr "Nhà cung cấp"
 
-#: ../libedataserver/e-categories.c:255
+#:../libedataserver/e-categories.c:260
 msgid "Time & Expenses"
 msgstr "Giờ và phụ phí"
 
-#: ../libedataserver/e-categories.c:256
+#:../libedataserver/e-categories.c:261
 msgid "VIP"
 msgstr "Người rất quan trọng"
 
-#: ../libedataserver/e-categories.c:257
+#:../libedataserver/e-categories.c:262
 msgid "Waiting"
 msgstr "Đang 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:179 ../libedataserver/e-time-utils.c:422
+#.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:1319 ../libedataserver/e-time-utils.c:1562
 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:184 ../libedataserver/e-time-utils.c:413
+#.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:1324 ../libedataserver/e-time-utils.c:1553
 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:189 ../libedataserver/e-time-utils.c:418
+#.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:1329 ../libedataserver/e-time-utils.c:1558
 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:194 ../libedataserver/e-time-utils.c:409
+#.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:1334 ../libedataserver/e-time-utils.c:1549
 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:199
+#.strptime format of a weekday, a date and a time,
+#.in 12-hour format, without minutes or seconds.
+#:../libedataserver/e-time-utils.c:1339
 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:204
+#.strptime format of a weekday, a date and a time,
+#.in 24-hour format, without minutes or seconds.
+#:../libedataserver/e-time-utils.c:1344
 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:207 ../libedataserver/e-time-utils.c:300
-#: ../libedataserver/e-time-utils.c:404
+#.strptime format of a weekday and a date.
+#.strftime format of a weekday and a date.
+#:../libedataserver/e-time-utils.c:1347 ../libedataserver/e-time-utils.c:1440
+#:../libedataserver/e-time-utils.c:1544
 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:215
+#.strptime format of a date and a time, in 12-hour format.
+#:../libedataserver/e-time-utils.c:1355
 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:219
+#.strptime format of a date and a time, in 24-hour format.
+#:../libedataserver/e-time-utils.c:1359
 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:224
+#.strptime format of a date and a time, in 12-hour format,
+#.without seconds.
+#:../libedataserver/e-time-utils.c:1364
 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:229
+#.strptime format of a date and a time, in 24-hour format,
+#.without seconds.
+#:../libedataserver/e-time-utils.c:1369
 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:234
+#.strptime format of a date and a time, in 12-hour format,
+#.without minutes or seconds.
+#:../libedataserver/e-time-utils.c:1374
 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:239
+#.strptime format of a date and a time, in 24-hour format,
+#.without minutes or seconds.
+#:../libedataserver/e-time-utils.c:1379
 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:242 ../libedataserver/e-time-utils.c:303
+#.strptime format of a weekday and a date.
+#.This is the preferred date format for the locale.
+#:../libedataserver/e-time-utils.c:1382 ../libedataserver/e-time-utils.c:1443
 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:348 ../libedataserver/e-time-utils.c:467
+#.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:1488 ../libedataserver/e-time-utils.c:1607
 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:352 ../libedataserver/e-time-utils.c:459
+#.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:1492 ../libedataserver/e-time-utils.c:1599
 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:357 ../libedataserver/e-time-utils.c:464
+#.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:1497 ../libedataserver/e-time-utils.c:1604
 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:361 ../libedataserver/e-time-utils.c:456
+#.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:1501 ../libedataserver/e-time-utils.c:1596
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:365
+#.strptime format for hour and AM/PM, 12-hour format.
+#:../libedataserver/e-time-utils.c:1505
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:89
+#:../libedataserverui/e-book-auth-util.c:89
 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:185
+#:../libedataserverui/e-book-auth-util.c:185
 msgid "Failed to authenticate.\n"
 msgstr "Lỗi xác thực.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:258
-#, c-format
+#:../libedataserverui/e-categories-dialog.c:265
+#,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-categories-dialog.c:422
+#:../libedataserverui/e-categories-dialog.c:435
 msgid "Category"
 msgstr "Loại:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
+#:../libedataserverui/e-categories-dialog.glade.h:1
 msgid "Category Icon"
-msgstr "Biểu tượng loại "
+msgstr "Biểu tượng loại"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:2
+#:../libedataserverui/e-categories-dialog.glade.h:2
 msgid "Category Properties"
 msgstr "Thuộc tính loại"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:3
+#:../libedataserverui/e-categories-dialog.glade.h:3
 msgid "Category _Color"
-msgstr "Màu loại "
+msgstr "Màu loại"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:4
+#:../libedataserverui/e-categories-dialog.glade.h:4
 msgid "Category _Icon"
-msgstr "_Biểu tượng loại "
+msgstr "_Biểu tượng loại"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
+#:../libedataserverui/e-categories-dialog.glade.h:5
 msgid "Category _Name"
 msgstr "Tên loại "
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
+#:../libedataserverui/e-categories-dialog.glade.h:6
 msgid "Item(s) belong to these _categories:"
 msgstr "Những mục thuộc các _loại này:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
+#:../libedataserverui/e-categories-dialog.glade.h:7
 msgid "_Available Categories:"
 msgstr "Loại _sẵn sằng:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
+#:../libedataserverui/e-categories-dialog.glade.h:8
 msgid "_Edit"
 msgstr "_Sửa"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:9
+#:../libedataserverui/e-categories-dialog.glade.h:9
 msgid "categories"
 msgstr "loại"
 
-#: ../libedataserverui/e-name-selector-dialog.c:211
+#:../libedataserverui/e-name-selector-dialog.c:260
 msgid "Select Contacts from Address Book"
 msgstr "Chọn liên lạc từ sổ địa chỉ"
 
-#: ../libedataserverui/e-name-selector-dialog.c:502
+#:../libedataserverui/e-name-selector-dialog.c:553
 msgid "_Add"
 msgstr "T_hêm"
 
-#: ../libedataserverui/e-name-selector-dialog.c:527
+#:../libedataserverui/e-name-selector-dialog.c:578
 msgid "_Remove"
 msgstr "_Loại bỏ"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
+#:../libedataserverui/e-name-selector-dialog.glade.h:1
 msgid "\t\t\t\t\t\t"
 msgstr "\t\t\t\t\t\t"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
+#:../libedataserverui/e-name-selector-dialog.glade.h:2
 msgid "*"
 msgstr "*"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
+#:../libedataserverui/e-name-selector-dialog.glade.h:3
 msgid "<b>Show Contacts</b>"
 msgstr "<b>Hiện liên lạc</b>"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
+#:../libedataserverui/e-name-selector-dialog.glade.h:4
 msgid "<b>_Contacts</b>"
-msgstr "<b>_Liên lạc</b> "
+msgstr "<b>_Liên lạc</b>"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#:../libedataserverui/e-name-selector-dialog.glade.h:5
 msgid "Address Book"
 msgstr "Sổ địa chỉ:"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#:../libedataserverui/e-name-selector-dialog.glade.h:6
 msgid "Address _Book:"
 msgstr "_Sổ địa chỉ:"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:255
+#:../libedataserverui/e-name-selector-dialog.glade.h:7
+msgid "C_ategory:"
+msgstr "_Loại:"
+
+#:../libedataserverui/e-name-selector-dialog.glade.h:8
+#:../servers/exchange/storage/exchange-hierarchy-foreign.c:258
 msgid "Contacts"
 msgstr "Liên lạc"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
+#:../libedataserverui/e-name-selector-dialog.glade.h:9
 msgid "Search"
 msgstr "Tìm"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
+#:../libedataserverui/e-name-selector-dialog.glade.h:10
 msgid "_Search:"
 msgstr "_Tìm:"
 
-#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:1820
-#, c-format
+#.To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
+#:../libedataserverui/e-name-selector-entry.c:1864
+#,c-format
+msgid "E_xpand %s Inline"
+msgstr "Mở _rộng %s trực tiếp"
+
+#.Edit Contact item
+#:../libedataserverui/e-name-selector-entry.c:1880
+#,c-format
 msgid "_Edit %s"
 msgstr "_Sửa %s"
 
-#: ../libedataserverui/e-passwords.c:471
+#:../libedataserverui/e-passwords.c:471
 msgid "_Remember this password"
 msgstr "_Nhớ mật khẩu này"
 
-#: ../libedataserverui/e-passwords.c:472
+#:../libedataserverui/e-passwords.c:472
 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:101
+#.prepare the dialog
+#:../libedataserverui/e-source-selector-dialog.c:101
 msgid "Select destination"
 msgstr "Chọn đích"
 
-#: ../libedataserverui/e-source-selector-dialog.c:154
+#:../libedataserverui/e-source-selector-dialog.c:154
 msgid "_Destination"
 msgstr "Đí_ch"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1573
-#: ../servers/exchange/storage/exchange-account.c:905
-#, c-format
+#:../servers/exchange/lib/e2k-autoconfig.c:1630
+#:../servers/exchange/storage/exchange-account.c:939
+#,c-format
 msgid "Enter password for %s"
 msgstr "Nhập mật khẩu cho « %s »."
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1574
-#: ../servers/exchange/storage/exchange-account.c:910
+#:../servers/exchange/lib/e2k-autoconfig.c:1631
+#:../servers/exchange/storage/exchange-account.c:944
 msgid "Enter password"
 msgstr "Nhập mật khẩu"
 
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:847
+#.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"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:857
+#:../servers/exchange/lib/e2k-security-descriptor.c:857
 msgid "Publishing Editor"
 msgstr "Người sửa đổi cũng sản xuất"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:865
+#:../servers/exchange/lib/e2k-security-descriptor.c:865
 msgid "Editor"
 msgstr "Người sửa đổi"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:872
+#:../servers/exchange/lib/e2k-security-descriptor.c:872
 msgid "Publishing Author"
 msgstr "Tác giả cũng sản xuất"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:878
+#:../servers/exchange/lib/e2k-security-descriptor.c:878
 msgid "Author"
 msgstr "Tác giả"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:883
+#:../servers/exchange/lib/e2k-security-descriptor.c:883
 msgid "Non-editing Author"
 msgstr "Tác giả không sửa đổi"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:887
+#:../servers/exchange/lib/e2k-security-descriptor.c:887
 msgid "Reviewer"
 msgstr "Người xem lại"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:889
+#:../servers/exchange/lib/e2k-security-descriptor.c:889
 msgid "Contributor"
 msgstr "Người đóng góp"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:891
+#:../servers/exchange/lib/e2k-security-descriptor.c:891
 msgid "None"
 msgstr "Không có"
 
-#: ../servers/exchange/lib/e2k-security-descriptor.c:906
+#:../servers/exchange/lib/e2k-security-descriptor.c:906
 msgid "Custom"
 msgstr "Tự chọn"
 
-#: ../servers/exchange/lib/e2k-user-dialog.c:144
+#:../servers/exchange/lib/e2k-user-dialog.c:144
 msgid "Select User"
 msgstr "Chọn người dùng"
 
-#: ../servers/exchange/lib/e2k-user-dialog.c:182
+#:../servers/exchange/lib/e2k-user-dialog.c:182
 msgid "Addressbook..."
 msgstr "Sổ địa chỉ..."
 
-#: ../servers/exchange/storage/e-storage.c:556
+#:../servers/exchange/storage/e-storage.c:556
 msgid "Generic error"
 msgstr "Lỗi chung chung"
 
-#: ../servers/exchange/storage/e-storage.c:558
+#:../servers/exchange/storage/e-storage.c:558
 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:560
+#:../servers/exchange/storage/e-storage.c:560
 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:562
+#:../servers/exchange/storage/e-storage.c:562
 msgid "I/O error"
 msgstr "Lỗi gõ/xuất"
 
-#: ../servers/exchange/storage/e-storage.c:564
+#:../servers/exchange/storage/e-storage.c:564
 msgid "Not enough space to create the folder"
 msgstr "Không đủ chỗ để tạp thư mục"
 
-#: ../servers/exchange/storage/e-storage.c:566
+#:../servers/exchange/storage/e-storage.c:566
 msgid "The folder is not empty"
 msgstr "Thư mục không rỗng"
 
-#: ../servers/exchange/storage/e-storage.c:568
+#:../servers/exchange/storage/e-storage.c:568
 msgid "The specified folder was not found"
 msgstr "Không tìm thấy thư mục"
 
-#: ../servers/exchange/storage/e-storage.c:570
+#:../servers/exchange/storage/e-storage.c:570
 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 trữ này"
 
-#: ../servers/exchange/storage/e-storage.c:574
+#:../servers/exchange/storage/e-storage.c:574
 msgid "Operation not supported"
 msgstr "Chưa hỗ trợ tác vụ"
 
-#: ../servers/exchange/storage/e-storage.c:576
+#:../servers/exchange/storage/e-storage.c:576
 msgid "The specified type is not supported in this storage"
 msgstr "Kho chứa này chưa hộ trợ kiểu đã cho"
 
-#: ../servers/exchange/storage/e-storage.c:578
+#:../servers/exchange/storage/e-storage.c:578
 msgid "The specified folder cannot be modified or removed"
 msgstr "Thư mục đã cho không thể bị thay đổi hoặc loại bỏ"
 
-#: ../servers/exchange/storage/e-storage.c:580
+#:../servers/exchange/storage/e-storage.c:580
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Không thể tạo một thư mục con của một trong những descendant của nó"
 
-#: ../servers/exchange/storage/e-storage.c:582
+#:../servers/exchange/storage/e-storage.c:582
 msgid "Cannot create a folder with that name"
 msgstr "Không thể tạo thư mục với tên đó"
 
-#: ../servers/exchange/storage/e-storage.c:584
+#:../servers/exchange/storage/e-storage.c:584
 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: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:609
-#, c-format
+#.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 »."
 
-#: ../servers/exchange/storage/exchange-account.c:1263
+#:../servers/exchange/storage/exchange-account.c:1294
 msgid "Personal Folders"
 msgstr "Thư mục cá nhân"
 
-#: ../servers/exchange/storage/exchange-account.c:1278
+#:../servers/exchange/storage/exchange-account.c:1308
 msgid "Favorite Public Folders"
 msgstr "Thư mục công ưa thích"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1295
+#.i18n: Outlookism
+#:../servers/exchange/storage/exchange-account.c:1325
 msgid "All Public Folders"
 msgstr "Mọi thư mục công"
 
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1309
+#.i18n: Outlookism
+#:../servers/exchange/storage/exchange-account.c:1339
 msgid "Global Address List"
 msgstr "Danh sách địa chỉ toàn cục"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:256
+#:../servers/exchange/storage/exchange-hierarchy-foreign.c:259
 msgid "Deleted Items"
 msgstr "Mục bị xóa bỏ"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:257
+#:../servers/exchange/storage/exchange-hierarchy-foreign.c:260
 msgid "Drafts"
 msgstr "Nháp"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:259
+#:../servers/exchange/storage/exchange-hierarchy-foreign.c:262
 msgid "Journal"
 msgstr "Nhật ký"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
+#:../servers/exchange/storage/exchange-hierarchy-foreign.c:263
 msgid "Notes"
 msgstr "Ghi chú"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
+#:../servers/exchange/storage/exchange-hierarchy-foreign.c:264
 msgid "Outbox"
 msgstr "Thư mục gửi"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
+#:../servers/exchange/storage/exchange-hierarchy-foreign.c:265
 msgid "Sent Items"
 msgstr "Mục đã gởi"
 
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
+#:../servers/exchange/storage/exchange-hierarchy-foreign.c:266
 msgid "Tasks"
 msgstr "Công việc"
 
-#: ../servers/groupwise/e-gw-connection.c:158
+#:../servers/groupwise/e-gw-connection.c:164
 msgid "Invalid connection"
 msgstr "Kết nối không hợp lệ"
 
-#: ../servers/groupwise/e-gw-connection.c:162
+#:../servers/groupwise/e-gw-connection.c:168
 msgid "Invalid response from server"
 msgstr "Hồi đáp không hợp lệ từ máy phục vụ"
 
-#: ../servers/groupwise/e-gw-connection.c:164
+#:../servers/groupwise/e-gw-connection.c:170
 msgid "No response from the server"
 msgstr "Máy phục vụ không trả lời"
 
-#: ../servers/groupwise/e-gw-connection.c:170
+#:../servers/groupwise/e-gw-connection.c:176
 msgid "Bad parameter"
 msgstr "Tham số sai"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
+#:../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"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
+#:../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"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
+#:../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"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
+#:../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"
 
-#. dialog display isn't working out
-#: ../src/server.c:101
-#, c-format
+#.dialog display isn't working out
+#:../src/server.c:106
+#,c-format
 msgid "Multiple segmentation faults occurred; can't 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"