bump version and gal, e-d-s and gtkhtml requirements

2003-12-29  JP Rosevear <jpr@ximian.com>

	* configure.in: bump version and gal, e-d-s and gtkhtml
	requirements

svn path=/trunk/; revision=24014

1 files changed, 1671 insertions, 1483 deletions

diff --git a/po/vi.po b/po/vi.po
index cc81165350..9e730f1ed7 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2003-12-07 17:06-0500\n"
+"POT-Creation-Date: 2003-12-29 12:04-0500\n"
 "PO-Revision-Date: 2003-02-23 08:29+0700\n"
 "Last-Translator: pclouds <pclouds@gmx.net>\n"
 "Language-Team: GnomeVI <gnomevi-list@lists.sourceforge.net>\n"
@@ -89,7 +89,6 @@ msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Thành phần tóm tắt thư của Evolution."
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
 #, fuzzy
 msgid "Evolution folder settings configuration control"
 msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
@@ -98,19 +97,19 @@ msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
 msgid "Manager your S/Mime certificates here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/addressbook-component.c:211
 #: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "New Addressbook"
 msgstr "Sổ địa chỉ"
 
-#: addressbook/gui/component/addressbook-component.c:146
+#: addressbook/gui/component/addressbook-component.c:212
 msgid "Properties..."
 msgstr "Thuộc tính..."
 
-#: addressbook/gui/component/addressbook-component.c:147
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: addressbook/gui/component/addressbook-component.c:213
+#: addressbook/gui/widgets/e-addressbook-view.c:1017
+#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:418
 #: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -118,62 +117,62 @@ msgstr "Thuộc tính..."
 msgid "Delete"
 msgstr "Xoá"
 
-#: addressbook/gui/component/addressbook-component.c:148
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
+#: addressbook/gui/component/addressbook-component.c:214
+#: calendar/gui/calendar-component.c:435 calendar/gui/tasks-component.c:416
 #, fuzzy
 msgid "Rename"
 msgstr "Đổi tên"
 
-#: addressbook/gui/component/addressbook-component.c:217
+#: addressbook/gui/component/addressbook-component.c:285
 #, fuzzy
 msgid "New Contact"
 msgstr "Liên lạc mới:"
 
-#: addressbook/gui/component/addressbook-component.c:218
+#: addressbook/gui/component/addressbook-component.c:286
 msgid "_Contact"
 msgstr "_Liên lạc"
 
-#: addressbook/gui/component/addressbook-component.c:219
+#: addressbook/gui/component/addressbook-component.c:287
 msgid "Create a new contact"
 msgstr "Tạo liên lạc mới"
 
-#: addressbook/gui/component/addressbook-component.c:224
+#: addressbook/gui/component/addressbook-component.c:292
 msgid "New Contact List"
 msgstr "Danh sách liên lạc mới"
 
-#: addressbook/gui/component/addressbook-component.c:225
+#: addressbook/gui/component/addressbook-component.c:293
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Danh sách liên lạc mới"
 
-#: addressbook/gui/component/addressbook-component.c:226
+#: addressbook/gui/component/addressbook-component.c:294
 msgid "Create a new contact list"
 msgstr "Tạo danh sách liên lạc mới"
 
-#: addressbook/gui/component/addressbook-component.c:375
-#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
+#: addressbook/gui/component/addressbook-component.c:443
+#: calendar/gui/calendar-component.c:831 calendar/gui/tasks-component.c:772
 msgid "On This Computer"
 msgstr ""
 
 #. orange
-#: addressbook/gui/component/addressbook-component.c:385
-#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
-#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
+#: addressbook/gui/component/addressbook-component.c:453
+#: calendar/gui/calendar-component.c:839 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:780
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:88
 #: shell/e-config-upgrade.c:1456
 msgid "Personal"
 msgstr "Cá nhân"
 
 #. red
-#: addressbook/gui/component/addressbook-component.c:392
-#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
-#: mail/mail-config.c:64 mail/mail-config.glade.h:133
+#: addressbook/gui/component/addressbook-component.c:460
+#: calendar/gui/calendar-component.c:846 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:135
 #: shell/e-config-upgrade.c:1455
 msgid "Work"
 msgstr "Công việc"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-component.c:400
+#: addressbook/gui/component/addressbook-component.c:468
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP Server"
@@ -212,7 +211,42 @@ msgstr "Lỗi nhận thông tin schema"
 msgid "Server did not respond with valid schema information"
 msgstr "Server không trả lời bằng schema hợp lệ"
 
-#: addressbook/gui/component/addressbook.c:500
+#: addressbook/gui/component/addressbook.c:273
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"Quá nhiều các khớp với truy vấn, nhiều hơn cấu hình của server\n"
+"hoặc cấu hình hiển thị của Evolution. Vui lòng tìm kiếm chính\n"
+"xác hơn hoặc tăng giới hạn kết quả trong Thông số server thư\n"
+"mục cho sổ địa chỉ này."
+
+#: addressbook/gui/component/addressbook.c:279
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"Thời gian thực hiện truy vấn này vượt quá giới hạn server hoặc giới hạn\n"
+"do bạn cấu hình cho sổ địa chỉ này. Vui lòng tìm kiếm chính xác hơn hoặc\n"
+"tăng giới hạn thời gian trong thông số server thư mục cho sổ địa chỉ này."
+
+#: addressbook/gui/component/addressbook.c:285
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "Backend cho sổ địa chỉ này không thể phân tích truy vấn này."
+
+#: addressbook/gui/component/addressbook.c:288
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "Backend cho sổ địa chỉ này không thể thực hiện truy vấn này."
+
+#: addressbook/gui/component/addressbook.c:291
+msgid "This query did not complete successfully."
+msgstr "Truy vấn không hoàn tất."
+
+#: addressbook/gui/component/addressbook.c:592
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -220,7 +254,7 @@ msgstr ""
 "Không thể mở sổ địa chỉ này. Vui lòng kiểm tra lại đường dẫn có tồn tại\n"
 "hay không và bạn có quyền truy cập vào đường dẫn đó hay không."
 
-#: addressbook/gui/component/addressbook.c:507
+#: addressbook/gui/component/addressbook.c:599
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -230,7 +264,7 @@ msgstr ""
 "do bạn đã nhập sai URI, hoặc là do LDAP server \n"
 "không hoạt động."
 
-#: addressbook/gui/component/addressbook.c:512
+#: addressbook/gui/component/addressbook.c:604
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -242,7 +276,7 @@ msgstr ""
 "lại chương trình từ mã nguồn sau khi nhận OpenLDAP từ địa chỉ\n"
 "dưới đây.\n"
 
-#: addressbook/gui/component/addressbook.c:521
+#: addressbook/gui/component/addressbook.c:613
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -252,88 +286,24 @@ msgstr ""
 "do bạn đã nhập sai URI, hoặc là do server không\n"
 "hoạt động."
 
-#: addressbook/gui/component/addressbook.c:539
+#: addressbook/gui/component/addressbook.c:630
 msgid "Unable to open addressbook"
 msgstr "Không thể mở sổ địa chỉ"
 
-#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:700
 msgid "Accessing LDAP Server anonymously"
 msgstr "Truy cập vô danh tới LDAP server"
 
-#: addressbook/gui/component/addressbook.c:670
+#: addressbook/gui/component/addressbook.c:770
 msgid "Failed to authenticate.\n"
 msgstr "Lỗi xác thực.\n"
 
-#: addressbook/gui/component/addressbook.c:676
+#: addressbook/gui/component/addressbook.c:776
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sNhập mật khẩu cho %s (người dùng %s)"
 
-#: addressbook/gui/component/addressbook.c:802
-msgid "Name begins with"
-msgstr "Tên bắt đầu bằng"
-
-#: addressbook/gui/component/addressbook.c:803
-msgid "Email begins with"
-msgstr "Thư bắt đầu bằng"
-
-#: addressbook/gui/component/addressbook.c:804
-#: calendar/gui/cal-search-bar.c:52
-msgid "Category is"
-msgstr "Phân loại "
-
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:805
-#: calendar/gui/cal-search-bar.c:48
-msgid "Any field contains"
-msgstr "Bất kỳ trường nào chứa"
-
-#: addressbook/gui/component/addressbook.c:806
-msgid "Advanced..."
-msgstr "Nâng cao..."
-
-#: addressbook/gui/component/addressbook.c:927
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"Quá nhiều các khớp với truy vấn, nhiều hơn cấu hình của server\n"
-"hoặc cấu hình hiển thị của Evolution. Vui lòng tìm kiếm chính\n"
-"xác hơn hoặc tăng giới hạn kết quả trong Thông số server thư\n"
-"mục cho sổ địa chỉ này."
-
-#: addressbook/gui/component/addressbook.c:933
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"Thời gian thực hiện truy vấn này vượt quá giới hạn server hoặc giới hạn\n"
-"do bạn cấu hình cho sổ địa chỉ này. Vui lòng tìm kiếm chính xác hơn hoặc\n"
-"tăng giới hạn thời gian trong thông số server thư mục cho sổ địa chỉ này."
-
-#: addressbook/gui/component/addressbook.c:939
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "Backend cho sổ địa chỉ này không thể phân tích truy vấn này."
-
-#: addressbook/gui/component/addressbook.c:942
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "Backend cho sổ địa chỉ này không thể thực hiện truy vấn này."
-
-#: addressbook/gui/component/addressbook.c:945
-msgid "This query did not complete successfully."
-msgstr "Truy vấn không hoàn tất."
-
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:982
-#: calendar/gui/cal-search-bar.c:353
-msgid "Any Category"
-msgstr "Bất kỳ phân loại nào"
-
-#: addressbook/gui/component/addressbook.c:1063
+#: addressbook/gui/component/addressbook.c:1030
 #, fuzzy
 msgid "UID of the contacts source that the view will display"
 msgstr "URI mà lịch sẽ hiển thị"
@@ -368,12 +338,12 @@ msgstr "  _Hiện cơ sở được hỗ trợ "
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:2
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
 #: calendar/gui/dialogs/new-task-list.glade.h:1
-#: calendar/gui/dialogs/task-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:2
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
@@ -415,7 +385,7 @@ msgid "Addressbook Sources"
 msgstr "Nguồn sổ địa chỉ"
 
 #: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Luôn luôn"
 
@@ -468,7 +438,7 @@ msgid "Finished"
 msgstr "Hoàn tất"
 
 #: addressbook/gui/component/ldap-config.glade.h:25
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Chung"
@@ -479,7 +449,7 @@ msgid "Group:"
 msgstr "Nhóm"
 
 #: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Never"
 msgstr "Không bao giờ"
 
@@ -506,8 +476,8 @@ msgid "S_earch scope: "
 msgstr "_Phạm vị tìm: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
-#: calendar/gui/gnome-cal.c:585
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:605
+#: calendar/gui/gnome-cal.c:586
 msgid "Searching"
 msgstr "Đang tìm"
 
@@ -716,7 +686,7 @@ msgid "Using email address"
 msgstr "Dùng địa chỉ email"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Bất cứ khi nào có thể"
 
@@ -742,8 +712,8 @@ msgid "_Download limit:"
 msgstr "_Ngưỡng tải về:"
 
 #: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
+#: mail/mail-config.glade.h:148 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -834,6 +804,7 @@ msgstr "Tên"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
+#: addressbook/gui/widgets/e-addressbook-view.c:213
 msgid "Source"
 msgstr "Nguồn"
 
@@ -888,57 +859,62 @@ msgid "A_ssistant's name:"
 msgstr "Tên p_hụ tá:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
+#, fuzzy
+msgid "Addressbook:"
+msgstr "Sổ địa chỉ"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "Anni_versary:"
 msgstr "_Kỷ niệm"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "Birthda_y:"
 msgstr "Ngày _sinh:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
 #, fuzzy
 msgid "Blog address:"
 msgstr "Địa chỉ _email:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 #, fuzzy
 msgid "Business fa_x:"
 msgstr "Fax Kinh doanh"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "Collaboration"
 msgstr "Hợp tác"
 
 #. Construct the app
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1343
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/e-contact-editor.c:1520
 msgid "Contact Editor"
 msgstr "Bộ hiệu chỉnh liên lạc"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "D_epartment:"
 msgstr "Cơ _quan:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Chi tiết"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "F_ree/Busy URL:"
 msgstr "URL rảnh/bận:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "File a_s:"
 msgstr "Tập tin _là:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Full _Name..."
 msgstr "Tên đầ_y đủ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid ""
 "If this person publishes free/busy or other calendar information on the "
 "Internet, enter the address\n"
@@ -947,97 +923,97 @@ msgstr ""
 "Nếu người này công bố thông tin rảnh/bận hoặc thông tin lịch khác trên\n"
 "Internet, hãy nhập địa chỉ của thông tin đó vào đây."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "New phone type"
 msgstr "Kiểu điện thoại mới"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "No_tes:"
 msgstr "_Ghi chú:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Organi_zation:"
 msgstr "Tổ _chức:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "P_rofession:"
 msgstr "_Nghề nghiệp:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #, fuzzy
 msgid "Primary _email:"
 msgstr "Email chính"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "S_pouse:"
 msgstr "_Vợ/Chồng:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "Wants to receive _HTML mail"
 msgstr "Muốn nhậm _HTML mail"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Add"
 msgstr "_Thêm"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "_Business:"
 msgstr "Kinh doanh"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "_Categories..."
 msgstr "_Phân loại.."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
-#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
-#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
-#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: calendar/gui/dialogs/meeting-page.c:649 calendar/gui/e-cal-view.c:1236
+#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-calendar-table.c:1043
+#: calendar/gui/e-calendar-table.c:1061 mail/em-folder-tree.c:1502
+#: mail/em-folder-view.c:706 ui/evolution-addressbook.xml.h:33
+#: ui/evolution-calendar.xml.h:35 ui/evolution-comp-editor.xml.h:17
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
 #: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Xóa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "_Home:"
 msgstr "Nhà"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Job title:"
 msgstr "Tên n_ghề:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "_Manager's name:"
 msgstr "Tên người _quản lý:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #, fuzzy
 msgid "_Mobile:"
 msgstr "Di động"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Nickname:"
 msgstr "Tên _hiệu:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Office:"
 msgstr "_Văn phòng:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Public Calendar URL:"
 msgstr "URL Lịch _công cộng:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "_This is the mailing address"
 msgstr "Đây là địa chỉ gửi _mail"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "_Web page address:"
 msgstr "Địa chỉ _Web:"
 
@@ -1045,9 +1021,9 @@ msgstr "Địa chỉ _Web:"
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor.c:212
+#: addressbook/gui/contact-editor/e-contact-editor.c:226
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:312
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
@@ -1058,1006 +1034,1005 @@ msgstr "Địa chỉ"
 msgid "Editable"
 msgstr "Có thể sửa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "United States"
 msgstr "Mỹ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Albania"
 msgstr "Albani"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Algeria"
 msgstr "Algêri"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "American Samoa"
 msgstr "Samoa (Mỹ)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Angola"
 msgstr "Ăngôla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antarctica"
 msgstr "Antarctica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antigua And Barbuda"
 msgstr "Antigua Và Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Argentina"
 msgstr "Achentina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Armenia"
 msgstr "Armenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Australia"
 msgstr "Úc"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Austria"
 msgstr "Áo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Azerbaijan"
 msgstr "Azerbaijan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bangladesh"
 msgstr "Băngladét"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Belarus"
 msgstr "Belarus"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belgium"
 msgstr "Bỉ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belize"
 msgstr "Belize"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bhutan"
 msgstr "Butan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia Và Herzegowina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bouvet Island"
 msgstr "Đảo Bouvet"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Brazil"
 msgstr "Brazil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "British Indian Ocean Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Brunei Darussalam"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Bulgaria"
 msgstr "Bungari"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cambodia"
 msgstr "Campuchia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cameroon"
 msgstr "Camơrun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Cape Verde"
 msgstr "Cape Verde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cayman Islands"
 msgstr "Đảo cayman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Central African Republic"
 msgstr "Cộng hòa Trung Phi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Chad"
 msgstr "Chad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chile"
 msgstr "Chi Lê"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "China"
 msgstr "Trung Quốc"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Christmas Island"
 msgstr "Đảo Giáng sinh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cocos (Keeling) Islands"
 msgstr "Đảo Cocos (Keeling)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Colombia"
 msgstr "Côlômbia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Comoros"
 msgstr "Comoros"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo"
 msgstr "Côngô"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cook Islands"
 msgstr "Đảo Cook"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Croatia"
 msgstr "Croátia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Cuba"
 msgstr "Cuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cyprus"
 msgstr "Cyprus"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Czech Republic"
 msgstr "Cộng hoà Séc"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Denmark"
 msgstr "Đan Mạch"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Dominica"
 msgstr "Dominica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominican Republic"
 msgstr "Cộng hòa Dominica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "East Timor"
 msgstr "Đông Timo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Egypt"
 msgstr "Ai Cập"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Equatorial Guinea"
 msgstr "Equatorial Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Estonia"
 msgstr "Estonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Ethiopia"
 msgstr "Ethiopia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Falkland Islands"
 msgstr "Đảo Falkland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Faroe Islands"
 msgstr "Đảo Faroe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Fiji"
 msgstr "Fiji"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Finland"
 msgstr "Phần Lan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "France"
 msgstr "Pháp"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Guiana"
 msgstr "Guiana (Pháp)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Polynesia"
 msgstr "Polynesia (Pháp)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "French Southern Territories"
 msgstr "Lãnh thổ Nam Pháp"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Georgia"
 msgstr "Georgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Germany"
 msgstr "Đức"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Ghana"
 msgstr "Gana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greece"
 msgstr "Hy Lạp"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Greenland"
 msgstr "Greenland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea-bissau"
 msgstr "Guinea-bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Haiti"
 msgstr "Haiti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Heard And McDonald Islands"
 msgstr "Đảo Heard Và MacDonald"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Holy See"
 msgstr "Holy See"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Honduras"
 msgstr "Honduras"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Hong Kong"
 msgstr "Hồng Kông"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hungary"
 msgstr "Hungari"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iceland"
 msgstr "Iceland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "India"
 msgstr "Ấn Độ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Ireland"
 msgstr "Ireland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Israel"
 msgstr "Israel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Italy"
 msgstr "Ý"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Japan"
 msgstr "Nhật Bản"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Jordan"
 msgstr "Jordan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kenya"
 msgstr "Kenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Korea, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kuwait"
 msgstr "Cô oét"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Laos"
 msgstr "Lào"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Latvia"
 msgstr "Latvia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lebanon"
 msgstr "Lebanon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Lithuania"
 msgstr "Lithuania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Macau"
 msgstr "Ma Cao"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Maldives"
 msgstr "Maldives"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Marshall Islands"
 msgstr "Đảo Marshall"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Martinique"
 msgstr "Martinique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mexico"
 msgstr "Mexico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Moldova, Republic Of"
 msgstr "Cộng Hòa Moldova"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Morocco"
 msgstr "Morocco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Myanmar"
 msgstr "Mianma"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Nepal"
 msgstr "Nêpan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands"
 msgstr "Hà Lan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Netherlands Antilles"
 msgstr "Netherlands Antilles"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "New Caledonia"
 msgstr "New Caledonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "New Zealand"
 msgstr "Niu Dilân"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Nicaragua"
 msgstr "Nicaragoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nigeria"
 msgstr "Nigiơria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Norfolk Island"
 msgstr "Đảo Norfolk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "Northern Mariana Islands"
 msgstr "Đảo Nam Marian"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Norway"
 msgstr "Na Uy"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Oman"
 msgstr "Ôman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Palestinian Territory"
 msgstr "Lãnh thổ Palestin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Papua New Guinea"
 msgstr "Papua New Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Paraguay"
 msgstr "Paragoay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Peru"
 msgstr "Pêru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Philippines"
 msgstr "Philíppin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Poland"
 msgstr "Ba Lan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Portugal"
 msgstr "Bồ Đào Nha"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Qatar"
 msgstr "Qatar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Reunion"
 msgstr "Reunion"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Romania"
 msgstr "Rumani"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Russian Federation"
 msgstr "Liên Bang Nga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts Và Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Saint Vincent And The Grena-dines"
 msgstr "Saint Vincent Và The Grena-dines"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Sao Tome And Principe"
 msgstr "Sao Tome Và Principe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Saudi Arabia"
 msgstr "Ả Rập Saudi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Singapore"
 msgstr "Singapore"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Solomon Islands"
 msgstr "Đảo Solomon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Somalia"
 msgstr "Xômali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "South Africa"
 msgstr "Nam Phi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Đảo Nam Georgia và Nam Sandwich"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Spain"
 msgstr "Tây Ban Nha"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "St. Pierre And Miquelon"
 msgstr "St. Pierre Và Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Sudan"
 msgstr "Su Đăng"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Suriname"
 msgstr "Suriname"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Đảo Svalbard và Jan Mayen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Sweden"
 msgstr "Thụy Điển"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Switzerland"
 msgstr "Switzerland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Taiwan"
 msgstr "Đài Loan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Tanzania, United Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Thailand"
 msgstr "Thái Lan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Trinidad And Tobago"
 msgstr "Trinidad Và Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Turkey"
 msgstr "Thổ Nhĩ Kỳ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Turks And Caicos Islands"
 msgstr "Đảo Turks và Caicos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Ukraine"
 msgstr "Ucraina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "United Arab Emirates"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "United Kingdom"
 msgstr "Vương Quốc Anh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Viet Nam"
 msgstr "Việt Nam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Virgin Islands, British"
 msgstr "Đảo Virgin, Anh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Virgin Islands, U.S."
 msgstr "Đảo Virgin, Mỹ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Wallis And Futuna Islands"
 msgstr "Đảo Wallis và Futuna"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "Western Sahara"
 msgstr "Tây Sahara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Yemen"
 msgstr "Yemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Yugoslavia"
 msgstr "Nam Tư"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Zambia"
 msgstr "Zambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
-#: addressbook/gui/widgets/e-addressbook-model.c:298
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:177
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
-#: addressbook/gui/widgets/e-minicard-view.c:460
-msgid "Book"
-msgstr "Sách"
-
 #: addressbook/gui/contact-editor/e-contact-editor.c:191
+#, fuzzy
+msgid "Source Book"
+msgstr "Nguồn"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:198
+msgid "Target Book"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:205
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:189
 msgid "Contact"
 msgstr "Liên lạc"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:198
+#: addressbook/gui/contact-editor/e-contact-editor.c:212
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Liên lạc mới"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:205
+#: addressbook/gui/contact-editor/e-contact-editor.c:219
 msgid "Writable Fields"
 msgstr "Trường có thể ghi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:219
+#: addressbook/gui/contact-editor/e-contact-editor.c:233
 msgid "Changed"
 msgstr "Đã thay đổi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:855
+#: addressbook/gui/contact-editor/e-contact-editor.c:976
 msgid "Category editor not available."
 msgstr "Bộ biên soạn phân loại không tồn tại."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:863
+#: addressbook/gui/contact-editor/e-contact-editor.c:984
 msgid "This contact belongs to these categories:"
 msgstr "Liên lạc này thuộc các phân loại này:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1034
+#: addressbook/gui/contact-editor/e-contact-editor.c:1206
 msgid "Save Contact as VCard"
 msgstr "Lưu liên lạc bằng VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1074
+#: addressbook/gui/contact-editor/e-contact-editor.c:1246
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr "Bạn có chắc muốn xoá những liên lạc này không?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1077
+#: addressbook/gui/contact-editor/e-contact-editor.c:1249
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr "Bạn có chắc muốn xoá liên lạc này?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
+#: addressbook/gui/contact-editor/e-contact-editor.c:2028
 msgid "Business"
 msgstr "Kinh doanh"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1781
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
 msgid "Home"
 msgstr "Nhà"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1782
+#: addressbook/gui/contact-editor/e-contact-editor.c:2030
 msgid "Other"
 msgstr "Khác"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2284
+#: addressbook/gui/contact-editor/e-contact-editor.c:2569
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Không thể tìm thấy widget cho trường: `%s'"
@@ -2208,6 +2183,15 @@ msgstr "Nhập địa chỉ thư hoặc kéo liên lạc vào danh sách dưới
 msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: addressbook/gui/widgets/e-addressbook-model.c:298
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
+#: addressbook/gui/widgets/e-addressbook-view.c:206
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:460
+msgid "Book"
+msgstr "Sách"
+
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Là danh sách mới"
@@ -2281,7 +2265,7 @@ msgstr "Liên lạc"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:305
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:184
+#: addressbook/gui/widgets/e-addressbook-view.c:220
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
 msgid "Query"
@@ -2299,7 +2283,30 @@ msgstr "Kiểu"
 msgid "Error modifying card"
 msgstr "Lỗi khi sửa đổi card"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:191
+#: addressbook/gui/widgets/e-addressbook-view.c:157
+msgid "Name begins with"
+msgstr "Tên bắt đầu bằng"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:158
+msgid "Email begins with"
+msgstr "Thư bắt đầu bằng"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:159
+#: calendar/gui/cal-search-bar.c:52
+msgid "Category is"
+msgstr "Phân loại "
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:160
+#: calendar/gui/cal-search-bar.c:48
+msgid "Any field contains"
+msgstr "Bất kỳ trường nào chứa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:161
+msgid "Advanced..."
+msgstr "Nâng cao..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:227
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:17
 #: calendar/gui/e-meeting-list-view.c:249
@@ -2307,99 +2314,99 @@ msgstr "Lỗi khi sửa đổi card"
 msgid "Type"
 msgstr "Kiểu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:399
+#: addressbook/gui/widgets/e-addressbook-view.c:459
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Sổ địa chỉ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
-#: addressbook/gui/widgets/e-addressbook-view.c:894
-#: addressbook/gui/widgets/e-addressbook-view.c:1653
+#: addressbook/gui/widgets/e-addressbook-view.c:781
+#: addressbook/gui/widgets/e-addressbook-view.c:1001
+#: addressbook/gui/widgets/e-addressbook-view.c:1928
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Lưu là VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:988
 msgid "New Contact..."
 msgstr "Liên lạc mới..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:989
 msgid "New Contact List..."
 msgstr "Danh sách liên lạc mới..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:992
 msgid "Go to Folder..."
 msgstr "Đi tới thư mục..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:993
 msgid "Import..."
 msgstr "Nhập..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:995
 msgid "Search for Contacts..."
 msgstr "Tìm liên lạc..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/gui/widgets/e-addressbook-view.c:996
 msgid "Addressbook Sources..."
 msgstr "Nguồn sổ địa chỉ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:998
 msgid "Pilot Settings..."
 msgstr "Thiết lập pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:1002
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Chuyển tiếp liên lạc"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:1003
 msgid "Send Message to Contact"
 msgstr "Gửi thông điệp cho liên lạc"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
+#: addressbook/gui/widgets/e-addressbook-view.c:1004 calendar/gui/print.c:2451
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "In"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:1006
 msgid "Print Envelope"
 msgstr "In phong bì"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:1010
 msgid "Copy to folder..."
 msgstr "Chép vào thư mục..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:1011
 msgid "Move to folder..."
 msgstr "Chuyển tới thư mục..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:1014
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cắt"
 
 #. create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:908
-#: calendar/gui/calendar-component.c:429
-#: calendar/gui/dialogs/copy-source-dialog.c:135
-#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1015
+#: calendar/gui/calendar-component.c:433
+#: calendar/gui/dialogs/copy-source-dialog.c:136
+#: calendar/gui/tasks-component.c:414 ui/evolution-addressbook.xml.h:2
 #: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Sao chép"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/gui/widgets/e-addressbook-view.c:1016
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
 msgid "Paste"
 msgstr "Dán"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1192
+#: addressbook/gui/widgets/e-addressbook-view.c:1021
+#: calendar/gui/e-cal-view.c:1205
 msgid "Current View"
 msgstr "Khung xem hiện thời"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
+#: addressbook/gui/widgets/e-addressbook-view.c:1206
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -2410,6 +2417,12 @@ msgstr ""
 "%s\n"
 "đã hỏng. Bạn phải khởi động lại Evolution để dùng lại."
 
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1526
+#: calendar/gui/cal-search-bar.c:353
+msgid "Any Category"
+msgstr "Bất kỳ phân loại nào"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "Assistant"
 msgstr "Phụ tá"
@@ -2700,7 +2713,7 @@ msgstr "Thành công"
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1012
 msgid "Unknown error"
 msgstr "Lỗi lại"
 
@@ -2727,10 +2740,10 @@ msgid "Protocol not supported"
 msgstr "Chưa hỗ trợ giao thức này"
 
 #: addressbook/gui/widgets/eab-gui-util.c:50
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2320 camel/camel-service.c:734
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:601
+#: calendar/gui/e-calendar-table.c:465 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2319 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
@@ -3050,7 +3063,7 @@ msgstr "Biên"
 msgid "Number of columns:"
 msgstr "Số cột:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
 msgid "Options"
 msgstr "Tùy chọn"
 
@@ -3315,9 +3328,9 @@ msgid "Evolution's Tasks component"
 msgstr "Thành phần kiểm tra Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
-#: calendar/gui/tasks-control.c:486
-#: calendar/importers/icalendar-importer.c:716
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1795
+#: calendar/gui/tasks-control.c:490
+#: calendar/importers/icalendar-importer.c:717
 #: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
 msgid "Tasks"
 msgstr "Công việc"
@@ -3363,11 +3376,11 @@ msgstr "Thời gian ngủ (phút)"
 msgid "_Edit appointment"
 msgstr "_Sửa cuộc hẹn"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:871
 msgid "No description available."
 msgstr "Không có mô tả."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:893
+#: calendar/gui/alarm-notify/alarm-queue.c:889
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3376,12 +3389,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:980
-#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:976
+#: calendar/gui/alarm-notify/alarm-queue.c:1000
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:984
+#: calendar/gui/alarm-notify/alarm-queue.c:980
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3393,7 +3406,7 @@ msgstr ""
 "gửi thư. Thay vào đó, Evolution sẽ hiển thị một\n"
 "hộp thoại nhắc nhở thông thường:"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1010
+#: calendar/gui/alarm-notify/alarm-queue.c:1006
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3410,19 +3423,19 @@ msgstr ""
 "\n"
 "Bạn có chắc muốn chạy chương trình này không?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1024
+#: calendar/gui/alarm-notify/alarm-queue.c:1020
 msgid "Do not ask me about this program again."
 msgstr "Đừng hỏi tôi về chương trình này lần nữa."
 
-#: calendar/gui/alarm-notify/notify-main.c:157
+#: calendar/gui/alarm-notify/notify-main.c:159
 msgid "Could not initialize Bonobo"
 msgstr "Không thể khởi động Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:160
+#: calendar/gui/alarm-notify/notify-main.c:162
 msgid "Could not initialize gnome-vfs"
 msgstr "Không thể khởi động gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:169
+#: calendar/gui/alarm-notify/notify-main.c:171
 msgid "Could not create the alarm notify service factory"
 msgstr "Không thể tạo factory Dịch vụ thông báo"
 
@@ -3580,7 +3593,7 @@ msgstr "Ghi chú chứa"
 msgid "Unmatched"
 msgstr "Không khớp"
 
-#: calendar/gui/calendar-commands.c:370
+#: calendar/gui/calendar-commands.c:371
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3592,120 +3605,135 @@ msgstr ""
 "\n"
 "Bạn có thật sự muốn xóa những công việc này không?"
 
-#: calendar/gui/calendar-commands.c:376
+#: calendar/gui/calendar-commands.c:378
 #, fuzzy
 msgid "Purge events older than"
 msgstr "trả về nhỏ hơn"
 
-#: calendar/gui/calendar-commands.c:381
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+#: calendar/gui/calendar-commands.c:383
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
 msgid "days"
 msgstr "ngày"
 
-#: calendar/gui/calendar-commands.c:450
+#: calendar/gui/calendar-commands.c:452
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:455 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
-#: calendar/gui/calendar-commands.c:462
+#: calendar/gui/calendar-commands.c:457 calendar/gui/calendar-commands.c:462
+#: calendar/gui/calendar-commands.c:464
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
-#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
+#: calendar/gui/calendar-commands.c:481 calendar/gui/calendar-commands.c:487
+#: calendar/gui/calendar-commands.c:493 calendar/gui/calendar-commands.c:495
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:483
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
+#: calendar/gui/calendar-commands.c:485
+#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1516
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:368
+#: calendar/gui/calendar-component.c:369
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:408
+#: calendar/gui/calendar-component.c:410
 #, fuzzy
 msgid "Rename this calendar to"
 msgstr "In lịch"
 
-#: calendar/gui/calendar-component.c:428
+#: calendar/gui/calendar-component.c:431
 #, fuzzy
 msgid "New Calendar"
 msgstr "New Caledonia"
 
-#: calendar/gui/calendar-component.c:632
+#: calendar/gui/calendar-component.c:615
 msgid "New appointment"
 msgstr "Cuộc hẹn mới"
 
-#: calendar/gui/calendar-component.c:633
+#: calendar/gui/calendar-component.c:616
 msgid "_Appointment"
 msgstr "_Cuộc hẹn"
 
-#: calendar/gui/calendar-component.c:634
+#: calendar/gui/calendar-component.c:617
 msgid "Create a new appointment"
 msgstr "Tạo cuộc hẹn mới"
 
-#: calendar/gui/calendar-component.c:639
+#: calendar/gui/calendar-component.c:622
 msgid "New meeting"
 msgstr "Cuộc họp mới"
 
-#: calendar/gui/calendar-component.c:640
+#: calendar/gui/calendar-component.c:623
 #, fuzzy
 msgid "M_eeting"
 msgstr "Cuộc họp"
 
-#: calendar/gui/calendar-component.c:641
+#: calendar/gui/calendar-component.c:624
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Tạo yêu cầu cuộc họp mới"
 
-#: calendar/gui/calendar-component.c:646
+#: calendar/gui/calendar-component.c:629
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Cuộc hẹn nguyên ngày mới"
 
-#: calendar/gui/calendar-component.c:647
+#: calendar/gui/calendar-component.c:630
 msgid "All _Day Appointment"
 msgstr "Cuộc hẹn n_guyên ngày"
 
-#: calendar/gui/calendar-component.c:648
+#: calendar/gui/calendar-component.c:631
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Tạo cuộc hẹn mới"
 
-#: calendar/gui/calendar-component.c:715
+#: calendar/gui/calendar-component.c:636
+#, fuzzy
+msgid "New calendar"
+msgstr "New Caledonia"
+
+#: calendar/gui/calendar-component.c:637
+#, fuzzy
+msgid "C_alendar"
+msgstr "_Lịch:"
+
+#: calendar/gui/calendar-component.c:638
+#, fuzzy
+msgid "Create a new calendar"
+msgstr "Tạo thư mục mới"
+
+#: calendar/gui/calendar-component.c:705
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:727
+#: calendar/gui/calendar-component.c:718
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:858
+#: calendar/gui/calendar-component.c:855
 msgid "On The Web"
 msgstr ""
 
-#: calendar/gui/calendar-offline-handler.c:190
+#: calendar/gui/calendar-offline-handler.c:192
 #, c-format
 msgid "backend_go_offline(): %s"
 msgstr ""
 
-#: calendar/gui/calendar-offline-handler.c:212
+#: calendar/gui/calendar-offline-handler.c:215
 #, c-format
 msgid "backend_go_online(): %s"
 msgstr ""
@@ -3731,33 +3759,33 @@ msgstr "Khung tháng"
 msgid "List View"
 msgstr "Khung xem tự chọn"
 
-#: calendar/gui/comp-editor-factory.c:451
+#: calendar/gui/comp-editor-factory.c:452
 msgid "Error while opening the calendar"
 msgstr "Lỗi mở server lịch"
 
-#: calendar/gui/comp-editor-factory.c:462
+#: calendar/gui/comp-editor-factory.c:463
 msgid "Method not supported when opening the calendar"
 msgstr "Phương thức mở lịch không được hỗ trợ"
 
-#: calendar/gui/comp-editor-factory.c:468
+#: calendar/gui/comp-editor-factory.c:469
 msgid "Permission denied to open the calendar"
 msgstr "Không đủ quyền truy cập để mở lịch"
 
-#: calendar/gui/comp-editor-factory.c:516
+#: calendar/gui/comp-editor-factory.c:519
 #, c-format
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:133
+#: calendar/gui/control-factory.c:140
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Không thể mở thư mục trong '%s'"
 
-#: calendar/gui/control-factory.c:179
+#: calendar/gui/control-factory.c:190
 msgid "The URI that the calendar will display"
 msgstr "URI mà lịch sẽ hiển thị"
 
-#: calendar/gui/control-factory.c:186
+#: calendar/gui/control-factory.c:197
 msgid "The type of view to show"
 msgstr "Loại khung xem cần hiển thị"
 
@@ -3782,54 +3810,81 @@ msgstr "Tùy chọn báo động chương trình"
 msgid "Unknown Alarm Options"
 msgstr "Tùy chọn báo động lạ"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Lặp báo động"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#: calendar/gui/dialogs/task-page.glade.h:1
+#, fuzzy
+msgid "    "
+msgstr "      "
 
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 #, fuzzy
-msgid "Message to Display:"
-msgstr "Thông điệp hiển thị"
+msgid "<b>Alarm Action</b>"
+msgstr "Thông tin lịch"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
 #, fuzzy
+msgid "<b>Alarm Email</b>"
+msgstr "<b>Đang gửi email</b>"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+#, fuzzy
+msgid "<b>Alarm Repeat</b>"
+msgstr "Lặp báo động"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "<b>Alarm Sound</b>"
+msgstr "Thông tin lịch"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+#, fuzzy
+msgid "<b>Message to Display</b>"
+msgstr "Thông điệp hiển thị"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+#, fuzzy
 msgid "Message to Send"
 msgstr "Thân thông điệp"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "Play sound:"
 msgstr "Phát âm thanh:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:10
 msgid "Repeat the alarm"
 msgstr "Lặp báo động"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "Run program:"
 msgstr "Chạy chương trình:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8
+#: calendar/gui/dialogs/alarm-options.glade.h:12
 #, fuzzy
 msgid "Send To:"
 msgstr "Gửi"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
+#: calendar/gui/dialogs/alarm-options.glade.h:13
 msgid "With these arguments:"
 msgstr "Với tham số này:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:15 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
+#: calendar/gui/dialogs/alarm-options.glade.h:16
 msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:17 filter/filter.glade.h:18
 msgid "hours"
 msgstr "giờ"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:18 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "phút"
 
@@ -3837,286 +3892,291 @@ msgstr "phút"
 msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:2
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Cơ bản"
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Trạng thái:</b> "
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "<b>Reminders</b>"
+msgstr "Bộ nhắc nhở"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "Date/Time:"
 msgstr "Ngày/Giờ:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:465
 msgid "Display a message"
 msgstr "Hiện thông điệp"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:461
 msgid "Play a sound"
 msgstr "Phát âm thanh"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5
-msgid "Reminders"
-msgstr "Bộ nhắc nhở"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:473
 msgid "Run a program"
 msgstr "Chạy chương trình"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #, fuzzy
 msgid "Send an Email"
 msgstr "Gửi thư"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/e-itip-control.c:933 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Tóm tắt:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/alarm-page.glade.h:10
 msgid "_Options..."
 msgstr "_Tùy chọn..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "after"
 msgstr "sau khi"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr "trước khi"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
 msgid "day(s)"
 msgstr "ngày"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 msgid "end of appointment"
 msgstr "kết thúc cuộc hẹn"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "hour(s)"
 msgstr "giờ"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:182
 msgid "minute(s)"
 msgstr "phút"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-page.glade.h:17
 msgid "start of appointment"
 msgstr "bắt đầu cuộc hẹn"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "05 minutes"
 msgstr "05 phút"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "10 minutes"
 msgstr "10 phút"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 phút"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "30 minutes"
 msgstr "30 phút"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "60 minutes"
 msgstr "60 phút"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
-msgid "Alerts"
-msgstr "Báo động"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Bắt đầu:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "Thông tin lịch"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Tới hạn:</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Tuần làm việc"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Thiết lập Công việc và Lịch"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Màu công việc quá hạn"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Color for tasks due today"
 msgstr "Màu công việc trong ngày"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Ngày _kết thúc:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Ngày"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:557
 msgid "Friday"
 msgstr "Thứ Sáu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Hours"
 msgstr "Giờ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Minutes"
 msgstr "Phút"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:553
 msgid "Monday"
 msgstr "Thứ Hai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "S_un"
 msgstr "_CN"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:558
 msgid "Saturday"
 msgstr "Thứ Bảy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Sh_ow a reminder"
 msgstr "_Hiện bộ nhắc nhở"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Show week _numbers in date navigator"
 msgstr "Hiện số tuần trong bộ duyệt ngày"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:552
 msgid "Sunday"
 msgstr "Chủ nhật"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "T_asks due today:"
 msgstr "_Công việc trong ngày:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "T_hu"
 msgstr "_Năm"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Task List"
-msgstr "Danh sách công việc"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:556
 msgid "Thursday"
 msgstr "Thứ Năm"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Time"
-msgstr "Thời gian"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Time _zone:"
 msgstr "Múi _giờ:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Time format:"
 msgstr "Dạng thức thời gian:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:554
 msgid "Tuesday"
 msgstr "Thứ Ba"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "W_eek starts:"
 msgstr "Tuần _bắt đầu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:555
 msgid "Wednesday"
 msgstr "Thứ Tư"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:33
-msgid "Work Week"
-msgstr "Tuần làm việc"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Work days:"
 msgstr "Ngày làm việc:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "_12 hour (AM/PM)"
 msgstr "_12 giờ (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "_24 hour"
 msgstr "_24 giờ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Ask for confirmation when deleting items"
 msgstr "Hỏi xác thực khi _xóa mục"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Compress weekends in month view"
 msgstr "_Nén ngày nghỉ trong khung tháng"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_Day begins:"
 msgstr "_Ngày bắt đầu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_Display"
 msgstr "_Hiển thị"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Fri"
 msgstr "_Sáu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:151
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: mail/mail-config.glade.h:153
 msgid "_General"
 msgstr "_Chung"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Hide completed tasks after"
 msgstr "Ẩ_n công việc hoàn thành sau"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Mon"
 msgstr "_Hai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_Overdue tasks:"
 msgstr "Công việc _quá hạn:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Sat"
 msgstr "Bả_y"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Show appointment end times in week and month views"
 msgstr "_Hiện thời điểm kết thúc cuộc hẹn trong tuần và trong tháng"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Time divisions:"
 msgstr "_Chia thời gian:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Tue"
 msgstr "_Ba"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Wed"
 msgstr "_Tư"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "before every appointment"
 msgstr "trước khi mỗi cuộc hẹn"
 
@@ -4202,82 +4262,82 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Bạn chưa thay đổi gì, cập nhật bộ biên soạn?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
+#: calendar/gui/dialogs/comp-editor-page.c:441
 #, c-format
 msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2228
 msgid " to "
 msgstr " tới "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2232
 msgid " (Completed "
 msgstr " (Đã hoàn thành "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2234
 msgid "Completed "
 msgstr "Đã hoàn thành "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2239
 msgid " (Due "
 msgstr " (Đến hạn "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2241
 msgid "Due "
 msgstr "Đến hạn "
 
-#: calendar/gui/dialogs/comp-editor.c:335
+#: calendar/gui/dialogs/comp-editor.c:348
 msgid "Could not update object"
 msgstr "Không thể cập nhật đối tượng"
 
-#: calendar/gui/dialogs/comp-editor.c:786
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:818
+#: calendar/gui/dialogs/comp-editor.c:855
 msgid "Edit Appointment"
 msgstr "Sửa cuộc hẹn"
 
-#: calendar/gui/dialogs/comp-editor.c:791
-#: calendar/gui/dialogs/comp-editor.c:828
+#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:860
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cuộc hẹn - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:794
-#: calendar/gui/dialogs/comp-editor.c:831
+#: calendar/gui/dialogs/comp-editor.c:826
+#: calendar/gui/dialogs/comp-editor.c:863
 #, c-format
 msgid "Task - %s"
 msgstr "Công việc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:797
-#: calendar/gui/dialogs/comp-editor.c:834
+#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:866
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Mục nhật ký - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
-#: calendar/gui/dialogs/comp-editor.c:844
+#: calendar/gui/dialogs/comp-editor.c:840
+#: calendar/gui/dialogs/comp-editor.c:876
 msgid "No summary"
 msgstr "Không có tóm tắt"
 
-#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
-#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1313 calendar/gui/e-cal-view.c:992
+#: calendar/gui/e-calendar-table.c:1175 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Lưu là..."
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/dialogs/comp-editor.c:1401
-#: calendar/gui/dialogs/comp-editor.c:1427
+#: calendar/gui/dialogs/comp-editor.c:1416
+#: calendar/gui/dialogs/comp-editor.c:1440
+#: calendar/gui/dialogs/comp-editor.c:1466
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Thay đổi trên mục này có thể bị hủy nếu bản cập nhật đến qua đường email"
 
-#: calendar/gui/dialogs/comp-editor.c:1455
-#: calendar/gui/dialogs/comp-editor.c:1464
+#: calendar/gui/dialogs/comp-editor.c:1506
+#: calendar/gui/dialogs/comp-editor.c:1515
 msgid "Unable to obtain current version!"
 msgstr "Không thể lấy phiên bản hiện thời!"
 
-#: calendar/gui/dialogs/copy-source-dialog.c:141
+#: calendar/gui/dialogs/copy-source-dialog.c:142
 #, fuzzy
 msgid "Select destination source"
 msgstr "Chọn một thư mục đích để nhập dữ liệu này"
@@ -4392,7 +4452,7 @@ msgstr "Ủy nhiệm cho:"
 msgid "Enter Delegate"
 msgstr "Nhập người đại diện"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr "Cuộc hẹn"
 
@@ -4416,113 +4476,132 @@ msgstr "Lập lịch biểu"
 msgid "Meeting"
 msgstr "Cuộc họp"
 
-#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
+#: calendar/gui/dialogs/event-page.c:609 calendar/gui/dialogs/task-page.c:512
 msgid "Start date is wrong"
 msgstr "Ngày bắt đầu sai"
 
-#: calendar/gui/dialogs/event-page.c:609
+#: calendar/gui/dialogs/event-page.c:619
 msgid "End date is wrong"
 msgstr "Ngày kết thúc sai"
 
-#: calendar/gui/dialogs/event-page.c:632
+#: calendar/gui/dialogs/event-page.c:642
 msgid "Start time is wrong"
 msgstr "Thời điểm đầu sai"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:649
 msgid "End time is wrong"
 msgstr "Thời điểm kết thúc sai"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Sự kiện _mọi ngày"
+#: calendar/gui/dialogs/event-page.c:1228
+#, fuzzy, c-format
+msgid "Unable to open the calendar '%s'."
+msgstr "Không đủ quyền truy cập để mở lịch"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Bận"
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<b>Classification</b>"
+msgstr "Phân loại"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "_Phân loại.."
+#: calendar/gui/dialogs/task-page.glade.h:4
+#, fuzzy
+msgid "<b>Date &amp; Time</b>"
+msgstr "Ngày & giờ"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:3
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#: calendar/gui/e-calendar-table.etspec.h:5
-msgid "Classification"
-msgstr "Phân loại"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "<b>Description</b>"
+msgstr "Mô tả"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
 #, fuzzy
-msgid "Co_nfidential"
-msgstr "Tin tưởng"
+msgid "<b>L_ocation</b>"
+msgstr "Đị_a điểm"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Ngày & giờ"
+#, fuzzy
+msgid "<b>Show Time As</b>"
+msgstr "Hiện thời gian là"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-msgid "F_ree"
-msgstr "_Rảnh"
+#: calendar/gui/dialogs/task-page.glade.h:6
+#, fuzzy
+msgid "<b>Su_mmary</b>"
+msgstr "<b>Bắt đầu:</b> "
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "L_ocation:"
-msgstr "Đị_a điểm"
+msgid "A_ll day event"
+msgstr "Sự kiện _mọi ngày"
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Pri_vate"
-msgstr "_Riêng tư"
+msgid "B_usy"
+msgstr "_Bận"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pu_blic"
-msgstr "_Công cộng"
+#: calendar/gui/dialogs/task-page.glade.h:7
+msgid "Ca_tegories..."
+msgstr "_Phân loại.."
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-msgid "Show Time As"
-msgstr "Hiện thời gian là"
+#, fuzzy
+msgid "Calendar:"
+msgstr "_Lịch:"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "Su_mmary:"
-msgstr "Tó_m tắt:"
+#, fuzzy
+msgid "Co_nfidential"
+msgstr "Tin tưởng"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+msgid "F_ree"
+msgstr "_Rảnh"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "Pri_vate"
+msgstr "_Riêng tư"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:11
+msgid "Pu_blic"
+msgstr "_Công cộng"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 msgid "_End time:"
 msgstr "Thời điểm _cuối:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
 msgid "_Start time:"
 msgstr "Thời điểm đầ_u:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:310
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
+#: calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/e-cal-model-tasks.c:593 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:715
 #: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
 #: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Không"
 
-#: calendar/gui/dialogs/meeting-page.c:415
+#: calendar/gui/dialogs/meeting-page.c:416
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:421
+#: calendar/gui/dialogs/meeting-page.c:422
 msgid "An organizer is required."
 msgstr "Cần một tổ chức."
 
-#: calendar/gui/dialogs/meeting-page.c:436
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "At least one attendee is required."
 msgstr "Cần ít nhất một người tham dự."
 
-#: calendar/gui/dialogs/meeting-page.c:629
+#: calendar/gui/dialogs/meeting-page.c:645
 msgid "_Delegate To..."
 msgstr "Ủ_y nhiệm cho..."
 
@@ -4563,7 +4642,7 @@ msgid "Member"
 msgstr "Thành viên"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4576,16 +4655,21 @@ msgstr "RSVP"
 msgid "Status"
 msgstr "Trạng thái"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#, fuzzy
+msgid "Add A_ttendee"
+msgstr "Người tham dự"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Tổ chức:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 msgid "_Change Organizer"
 msgstr "Đổ_i tổ chức"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 #: calendar/gui/e-meeting-time-sel.c:417
 msgid "_Invite Others..."
 msgstr "_Mời người khác..."
@@ -4692,21 +4776,21 @@ msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:72
+#: calendar/gui/dialogs/recur-comp.c:73
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:76
+#: calendar/gui/dialogs/recur-comp.c:77
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Đảo Wallis và Futuna"
 
-#: calendar/gui/dialogs/recur-comp.c:82
+#: calendar/gui/dialogs/recur-comp.c:83
 #, fuzzy
 msgid "This and Future Instances"
 msgstr "Đảo Wallis và Futuna"
 
-#: calendar/gui/dialogs/recur-comp.c:87
+#: calendar/gui/dialogs/recur-comp.c:88
 #, fuzzy
 msgid "All Instances"
 msgstr "Alliance"
@@ -4764,67 +4848,70 @@ msgstr "lần"
 msgid "Date/Time"
 msgstr "Ngày/Giờ:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "T_hêm"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Exceptions</b>"
+msgstr "Ngoại lệ"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Mỗi"
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Xem thử"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
-msgstr "Ngoại lệ"
+#, fuzzy
+msgid "<b>Recurrence Rule</b>"
+msgstr "Quy tắc truy hồi"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Xem thử"
+msgid "A_dd"
+msgstr "T_hêm"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Quy tắc truy hồi"
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Every"
+msgstr "Mỗi"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "_Custom recurrence"
 msgstr "Truy hồi tự _chọn"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "_Modify"
 msgstr "_Thay đổi"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "_No recurrence"
 msgstr "_Không truy hồi"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "_Remove"
 msgstr "_Loại bỏ"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "_Simple recurrence"
 msgstr "Truy hồi đơ_n"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
 msgid "for"
 msgstr "cho"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
 msgid "forever"
 msgstr "mãi mãi"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "month(s)"
 msgstr "tháng"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "until"
 msgstr "tới khi"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
 msgid "week(s)"
 msgstr "tuần"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:21
 msgid "year(s)"
 msgstr "năm"
 
@@ -4839,11 +4926,11 @@ msgstr ""
 "\n"
 "Bạn có muốn lưu các thay đổi không?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Hủy thay đổi"
 
-#: calendar/gui/dialogs/save-comp.c:62
+#: calendar/gui/dialogs/save-comp.c:63
 #, fuzzy
 msgid "Save Event"
 msgstr "Sự kiện lịch"
@@ -4868,79 +4955,80 @@ msgstr "Thông tin công việc đã thay đổi. Gửi bản cập nhật?"
 msgid "Completed date is wrong"
 msgstr "Ngày hoàn thành sai"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:3
 #, fuzzy, no-c-format
 msgid "% _Complete"
 msgstr "% hoàn tất"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
+#, fuzzy
+msgid "<b>Progress</b>"
+msgstr "Tiến trình"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "<b>Web Page</b>"
+msgstr "<b>Đang gửi email</b>"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:599
+#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
-#: calendar/gui/print.c:2317
+#: calendar/gui/print.c:2316
 msgid "Completed"
 msgstr "Hoàn thành"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:916
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:389 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:919
 msgid "High"
 msgstr "Cao"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
-#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
-#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:597
+#: calendar/gui/e-cal-model-tasks.c:659 calendar/gui/e-calendar-table.c:463
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "Đang làm"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
-#: mail/message-list.c:914
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:917
 msgid "Low"
 msgstr "Thấp"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
-#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:390
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:918
 msgid "Normal"
 msgstr "Bình thường"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
-#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
-#: calendar/gui/print.c:2311
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:595
+#: calendar/gui/e-calendar-table.c:462 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr "Chưa bắt đầu"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Tiến trình"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:392
 msgid "Undefined"
 msgstr "Chưa biết"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #, fuzzy
 msgid "_Date Completed:"
 msgstr "Ngày hoàn thành:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "Độ ư_u tiên:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Trạng thái:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
-#, fuzzy
-msgid "_Web Page:"
-msgstr "Địa chỉ _Web:"
-
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Cơ bản"
@@ -4951,29 +5039,33 @@ msgstr "Cơ bản"
 msgid "Assignment"
 msgstr "Phân công"
 
-#: calendar/gui/dialogs/task-page.c:476
+#: calendar/gui/dialogs/task-page.c:485
 msgid "Due date is wrong"
 msgstr "Ngày đến hạn sai"
 
-#: calendar/gui/dialogs/task-page.c:536
+#: calendar/gui/dialogs/task-page.c:545
 msgid "Due date is before start date!"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.c:810
+#, fuzzy, c-format
+msgid "Unable to open tasks in '%s'."
+msgstr "Không thể mở sổ địa chỉ"
+
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Con_fidential"
 msgstr "Tin tưởn_g"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
-msgid "Description:"
-msgstr "Mô tả"
-
 #: calendar/gui/dialogs/task-page.glade.h:9
+#, fuzzy
+msgid "Folder:"
+msgstr "_thư mục:"
+
+#: calendar/gui/dialogs/task-page.glade.h:12
 msgid "Sta_rt Date:"
 msgstr "Ngày _bắt đầu:"
 
-#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "_Due Date:"
 msgstr "N_gày đến hạn:"
 
@@ -5071,20 +5163,25 @@ msgid "%s for an unknown trigger type"
 msgstr "%s cho loại trigger lạ"
 
 #: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:367
 msgid "Public"
 msgstr "Công cộng"
 
 #: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:368
 msgid "Private"
 msgstr "Riêng tư"
 
 #: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:369
 msgid "Confidential"
 msgstr "Tin tưởng"
 
+#: calendar/gui/e-cal-list-view.etspec.h:2
+#: calendar/gui/e-calendar-table.etspec.h:5
+msgid "Classification"
+msgstr "Phân loại"
+
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
@@ -5102,7 +5199,7 @@ msgstr "Ngày bắt đầu"
 msgid "Summary"
 msgstr "Tóm tắt"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:180
 msgid "color"
 msgstr "màu"
 
@@ -5111,11 +5208,11 @@ msgstr "màu"
 msgid "component"
 msgstr "Cuộc hẹn"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:441
 msgid "Free"
 msgstr "Rảnh"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:442
 #: calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Bận"
@@ -5146,7 +5243,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:934 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -5154,7 +5251,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Có"
 
-#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:934 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -5162,16 +5259,16 @@ msgstr "Không"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1664
+#: camel/camel-gpg-context.c:1715 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2003
 #: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Lạ"
@@ -5184,179 +5281,179 @@ msgstr "Đệ quy"
 msgid "Assigned"
 msgstr "Đã gán"
 
-#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
+#: calendar/gui/e-cal-view.c:626 calendar/gui/e-calendar-table.c:686
 msgid "Deleting selected objects"
 msgstr "Đang xóa đối tượng được chọn"
 
-#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+#: calendar/gui/e-cal-view.c:730 calendar/gui/e-calendar-table.c:847
 msgid "Updating objects"
 msgstr "Đang cập nhật đối tượng"
 
-#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
+#: calendar/gui/e-cal-view.c:1190 calendar/gui/e-cal-view.c:1275
 msgid "New _Appointment..."
 msgstr "Cuộc hẹn mớ_i..."
 
-#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
+#: calendar/gui/e-cal-view.c:1191 calendar/gui/e-cal-view.c:1277
 msgid "New All Day _Event"
 msgstr "Sự _kiện mọi ngày mới"
 
-#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
+#: calendar/gui/e-cal-view.c:1192 calendar/gui/e-cal-view.c:1279
 msgid "New Meeting"
 msgstr "Cuộc họp mới"
 
-#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
+#: calendar/gui/e-cal-view.c:1193 calendar/gui/e-cal-view.c:1281
 msgid "New Task"
 msgstr "Công việc mới"
 
-#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
-#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
-#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-cal-view.c:1197 calendar/gui/e-cal-view.c:1220
+#: calendar/gui/e-cal-view.c:1287 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-calendar-table.c:1068 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_In..."
 
-#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
-#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
-#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-cal-view.c:1201 calendar/gui/e-cal-view.c:1227
+#: calendar/gui/e-cal-view.c:1285 calendar/gui/e-calendar-table.c:1032
+#: calendar/gui/e-calendar-table.c:1066 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Dán"
 
-#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
-#: ui/evolution-calendar.xml.h:14
+#: calendar/gui/e-cal-view.c:1207 calendar/gui/e-cal-view.c:1271
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "Đi tới ngày _hôm nay"
 
-#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
+#: calendar/gui/e-cal-view.c:1208 calendar/gui/e-cal-view.c:1273
 msgid "_Go to Date..."
 msgstr "Đi tới _ngày..."
 
-#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1212 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Công bố thông tin bận/rảnh"
 
-#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
-#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
-#: ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-cal-view.c:1218 calendar/gui/e-cal-view.c:1283
+#: calendar/gui/e-calendar-table.c:1023 calendar/gui/e-calendar-table.c:1064
+#: mail/em-folder-view.c:681 shell/e-shortcuts-view.c:422
+#: ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Mở"
 
-#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
-#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: calendar/gui/e-cal-view.c:1219 calendar/gui/e-cal-view.c:1289
+#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1070
+#: mail/em-folder-view.c:683 mail/em-popup.c:597 mail/em-popup.c:712
 #: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "Lư_u là..."
 
-#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
-#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1059
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Cắt"
 
-#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
-#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: calendar/gui/e-cal-view.c:1226 calendar/gui/e-cal-view.c:1263
+#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1057
+#: mail/em-folder-tree.c:1497 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:34 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Sao chép"
 
-#: calendar/gui/e-cal-view.c:1218
+#: calendar/gui/e-cal-view.c:1231
 msgid "_Schedule Meeting..."
 msgstr "Lập lịch _cuộc họp..."
 
-#: calendar/gui/e-cal-view.c:1219
+#: calendar/gui/e-cal-view.c:1232
 msgid "_Forward as iCalendar..."
 msgstr "_Chuyển như iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
+#: calendar/gui/e-cal-view.c:1237 calendar/gui/e-cal-view.c:1268
 msgid "Delete this _Occurrence"
 msgstr "_Xóa lần này"
 
-#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
+#: calendar/gui/e-cal-view.c:1238 calendar/gui/e-cal-view.c:1269
 msgid "Delete _All Occurrences"
 msgstr "Xóa _mọi lần"
 
-#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+#: calendar/gui/e-cal-view.c:1291 ui/evolution.xml.h:30
 msgid "_Settings..."
 msgstr "T_hiết lập..."
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:411
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:412
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:413
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:414
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:415
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:416
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:417
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:418
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:419
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:420
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:421
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:990
+#: calendar/gui/e-calendar-table.c:1024
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Mở thông điệp"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:1036
 msgid "_Assign Task"
 msgstr "_Gán công việc"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1037
 msgid "_Forward as iCalendar"
 msgstr "_Chuyển như iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1038
 msgid "_Mark as Complete"
 msgstr "Đánh dấu _hoàn tất"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1039
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Đánh _dấu công việc hoàn tất"
 
-#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
+#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1062
 msgid "_Delete Selected Tasks"
 msgstr "Xóa côn_g việc được chọn"
 
-#: calendar/gui/e-calendar-table.c:1430
+#: calendar/gui/e-calendar-table.c:1355
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Nhấn để thêm công việc"
@@ -5430,14 +5527,14 @@ msgstr "lệch %02i phút"
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
+#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1532
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1375
-#: calendar/gui/e-week-view-main-item.c:339
+#: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -5453,146 +5550,141 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:139
-#, c-format
-msgid "start_calendar_server(): %s"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:636
+#: calendar/gui/e-itip-control.c:586
 msgid "Yes. (Complex Recurrence)"
 msgstr "Có. (Truy hồi phức)"
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:598
 msgid "Every day"
 msgstr "Mỗi ngày"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:600
 #, c-format
 msgid "Every %d days"
 msgstr "Mỗi %d ngày"
 
-#: calendar/gui/e-itip-control.c:656
+#: calendar/gui/e-itip-control.c:606
 msgid "Every week"
 msgstr "Mỗi tuần"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:608
 #, c-format
 msgid "Every %d weeks"
 msgstr "Mỗi %d tuần"
 
-#: calendar/gui/e-itip-control.c:661
+#: calendar/gui/e-itip-control.c:611
 msgid "Every week on "
 msgstr "Mỗi tuần lúc "
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:613
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Mỗi %d tuần lúc "
 
-#: calendar/gui/e-itip-control.c:671
+#: calendar/gui/e-itip-control.c:621
 msgid " and "
 msgstr " và "
 
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:628
 #, c-format
 msgid "The %s day of "
 msgstr "%s ngày của "
 
-#: calendar/gui/e-itip-control.c:691
+#: calendar/gui/e-itip-control.c:641
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s của "
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:646
 msgid "every month"
 msgstr "mỗi tháng"
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:651
 #, c-format
 msgid "every %d months"
 msgstr "mỗi %d tháng"
 
-#: calendar/gui/e-itip-control.c:707
+#: calendar/gui/e-itip-control.c:657
 msgid "Every year"
 msgstr "mỗi năm"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:659
 #, c-format
 msgid "Every %d years"
 msgstr "Mỗi %d năm"
 
-#: calendar/gui/e-itip-control.c:721
+#: calendar/gui/e-itip-control.c:671
 #, c-format
 msgid " a total of %d times"
 msgstr " tổng cộng %d lần"
 
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:680
 msgid ", ending on "
 msgstr ", kết thúc lúc "
 
-#: calendar/gui/e-itip-control.c:754
+#: calendar/gui/e-itip-control.c:704
 msgid "<b>Starts:</b> "
 msgstr "<b>Bắt đầu:</b> "
 
-#: calendar/gui/e-itip-control.c:764
+#: calendar/gui/e-itip-control.c:714
 msgid "<b>Ends:</b> "
 msgstr "<b>Kết thúc:</b>"
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:734
 msgid "<b>Completed:</b> "
 msgstr "<b>Hoàn tất:</b>"
 
-#: calendar/gui/e-itip-control.c:794
+#: calendar/gui/e-itip-control.c:744
 msgid "<b>Due:</b> "
 msgstr "<b>Tới hạn:</b>"
 
-#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
+#: calendar/gui/e-itip-control.c:781 calendar/gui/e-itip-control.c:834
 msgid "iCalendar Information"
 msgstr "Thông tin iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:846
+#: calendar/gui/e-itip-control.c:796
 msgid "iCalendar Error"
 msgstr "Lỗi iCalendar"
 
-#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
-#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:865 calendar/gui/e-itip-control.c:881
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.c:909
 msgid "An unknown person"
 msgstr "Người lạ"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:966
+#: calendar/gui/e-itip-control.c:916
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Vui lòng xem lại các chỉ dẫn sau và chọn một hành động từ menu bên dưới."
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:931
 msgid "<i>None</i>"
 msgstr "<i>Không</i>"
 
-#: calendar/gui/e-itip-control.c:992
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Địa điểm:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Trạng thái:"
 
-#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
 #: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Chấp nhận"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Tạm chấp nhận"
 
-#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
 #: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
@@ -5600,300 +5692,298 @@ msgstr "Tạm chấp nhận"
 msgid "Declined"
 msgstr "Từ chối"
 
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
-#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-tasks.c:247 composer/e-msg-composer-attachment.glade.h:3
+#: mail/mail-config.glade.h:45
+msgid "Description:"
+msgstr "Mô tả"
+
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Chọn hành động:"
 
-#: calendar/gui/e-itip-control.c:1079
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Cập nhật"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
-#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1002 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Đồng ý"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Chấp nhận"
 
-#: calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Tạm chấp nhận"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Từ chối"
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Gửi thông tin Rảnh/Bận"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Cập nhật trạng thái trả lời"
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Gửi thông tin mới nhất"
 
-#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:438
 #: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
 #: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Bỏ"
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> đã công bố thông tin cuộc họp."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Thông tin cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> yêu cầu sự hiện diện của %s tại cuộc họp."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> yêu cầu sự hiện diện của bạn tại cuộc họp."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Đề nghị cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b? muốn được dự cuộc họp đã có."
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Cập nhật cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> muốn nhận thông tin mới nhất về cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Yêu cầu cập nhật cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> đã trả lời yêu cầu họp."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Trả lời họp"
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> đã hủy bỏ cuộc họp."
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Hủy bỏ cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> đã gửi một thông điệp khó hiểu."
 
-#: calendar/gui/e-itip-control.c:1304
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Thông điệp lạ về cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> đã công bố thông tin công việc."
 
-#: calendar/gui/e-itip-control.c:1329
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Thông tin công việc"
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> yêu cầu %s để thực hiện công việc."
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> yêu cầu thực hiện công việc."
 
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Đề nghị công việc"
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> muốn thêm vào công việc đã có."
 
-#: calendar/gui/e-itip-control.c:1342
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Cập nhật công việc"
 
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> muốn nhận thông tin mới nhất về công việc."
 
-#: calendar/gui/e-itip-control.c:1347
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Yêu cầu cập nhật công việc"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> đã trả lời việc gán công việc."
 
-#: calendar/gui/e-itip-control.c:1355
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Trả lời công việc"
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> đã hủy bỏ công việc."
 
-#: calendar/gui/e-itip-control.c:1363
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Hủy bỏ công việc"
 
-#: calendar/gui/e-itip-control.c:1371
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Thông điệp lạ về công việc"
 
-#: calendar/gui/e-itip-control.c:1390
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> đã công bố thông tin bận/rảnh."
 
-#: calendar/gui/e-itip-control.c:1391
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> yêu cầu thông tin bận/rảnh của bạn."
 
-#: calendar/gui/e-itip-control.c:1396
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Yêu cầu thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1400
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> đã trả lời yêu cầu thông tin bận/rảnh."
 
-#: calendar/gui/e-itip-control.c:1401
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Trả lời thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Thông điệp bận/rảnh sai"
 
-#: calendar/gui/e-itip-control.c:1482
+#: calendar/gui/e-itip-control.c:1417
 msgid "The message does not appear to be properly formed"
 msgstr "Thông điệp có lẽ không đúng hình thức"
 
-#: calendar/gui/e-itip-control.c:1550
+#: calendar/gui/e-itip-control.c:1476
 msgid "The message contains only unsupported requests."
 msgstr "Thông điệp chỉ chứa yêu cầu chưa được hỗ trợ."
 
-#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
+#: calendar/gui/e-itip-control.c:1507 calendar/gui/e-itip-control.c:1513
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Đồ đính kèm không chứa thông điệp lịch hợp lệ"
 
-#: calendar/gui/e-itip-control.c:1612
+#: calendar/gui/e-itip-control.c:1538
 msgid "The attachment has no viewable calendar items"
 msgstr "Đồ đính kèm không chứa mục lịch nào có thể xem được"
 
-#: calendar/gui/e-itip-control.c:1851
+#: calendar/gui/e-itip-control.c:1769
 msgid "Calendar file could not be updated!\n"
 msgstr "Không thể cập nhật tập tin lịch!\n"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1771
 msgid "Update complete\n"
 msgstr "Hoàn tất cập nhật\n"
 
-#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
+#: calendar/gui/e-itip-control.c:1801 calendar/gui/e-itip-control.c:1873
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Không thể cập nhật trạng thái người tham dự vì chưa có người nào tham dự"
 
-#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
+#: calendar/gui/e-itip-control.c:1817 calendar/gui/e-itip-control.c:1855
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Đối tượng không hợp lệ và không thể được cập nhật\n"
 
-#: calendar/gui/e-itip-control.c:1909
+#: calendar/gui/e-itip-control.c:1827
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Hồi đáp này đến từ một người dự hiện thời. Thêm người này như là người tham "
 "dự nhé?"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1839
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Không thể cập nhật trạng thái người tham dự vì trạng thái không hợp lệ!\n"
 
-#: calendar/gui/e-itip-control.c:1940
+#: calendar/gui/e-itip-control.c:1858
 msgid "There was an error on the CORBA system\n"
 msgstr "Lỗi trong hệ thống CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1943
+#: calendar/gui/e-itip-control.c:1861
 msgid "Object could not be found\n"
 msgstr "Không thể tìm thấy đối tượng\n"
 
-#: calendar/gui/e-itip-control.c:1946
+#: calendar/gui/e-itip-control.c:1864
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Bạn không có đủ quyền để cập nhật lịch\n"
 
-#: calendar/gui/e-itip-control.c:1949
+#: calendar/gui/e-itip-control.c:1867
 msgid "Attendee status updated\n"
 msgstr "Đã cập nhật trạng thái người tham dự\n"
 
-#: calendar/gui/e-itip-control.c:1952
+#: calendar/gui/e-itip-control.c:1870
 msgid "Attendee status could not be updated!\n"
 msgstr "Không thể cập nhật trạng thái người tham dự!\n"
 
-#: calendar/gui/e-itip-control.c:1990
+#: calendar/gui/e-itip-control.c:1901
 msgid "Removal Complete"
 msgstr "Hoàn tất loại bỏ"
 
-#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1972
 msgid "Item sent!\n"
 msgstr "Đã gửi!\n"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
+#: calendar/gui/e-itip-control.c:1926 calendar/gui/e-itip-control.c:1976
 msgid "The item could not be sent!\n"
 msgstr "Không thể gửi!\n"
 
-#: calendar/gui/e-itip-control.c:2170
-msgid "Select Calendar Folder"
-msgstr "Chọn thư mục lịch"
-
-#: calendar/gui/e-itip-control.c:2176
-msgid "Select Tasks Folder"
-msgstr "Chọn thư mục công việc"
-
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -5936,7 +6026,7 @@ msgid "Chair Persons"
 msgstr "Người chủ trì"
 
 #: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:456 calendar/gui/e-meeting-model.c:78
+#: calendar/gui/e-meeting-list-view.c:479 calendar/gui/e-meeting-model.c:78
 #: calendar/gui/e-meeting-model.c:1635
 msgid "Required Participants"
 msgstr "Người tham dự yêu cầu"
@@ -6143,7 +6233,7 @@ msgstr "Chưa hỗ trợ phương thức yêu cầu để nạp `%s'"
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Bạn không có đủ quyền để mở thư mục trong '%s'"
 
-#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1978
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6180,11 +6270,11 @@ msgid "The method required to open `%s' is not supported"
 msgstr "Chưa hỗ trợ phương thức yêu cầu để mở `%s'"
 
 #: calendar/gui/gnome-cal.c:1808
-#, c-format
-msgid "Adding alarms for %s"
-msgstr "Đang thêm báo động cho %s"
+#, fuzzy, c-format
+msgid "Adding %s"
+msgstr "Đang gửi \"%s\""
 
-#: calendar/gui/gnome-cal.c:2000
+#: calendar/gui/gnome-cal.c:1999
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -6195,7 +6285,7 @@ msgstr ""
 "%s\n"
 "đã hỏng. Bạn sẽ cần phải khởi động lại Evolution để dùng nó lần sau."
 
-#: calendar/gui/gnome-cal.c:2008
+#: calendar/gui/gnome-cal.c:2007
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -6206,7 +6296,7 @@ msgstr ""
 "%s\n"
 "đã hỏng. Bạn sẽ cần phải khởi động lại Evolution để dùng nó lần sau."
 
-#: calendar/gui/gnome-cal.c:2848
+#: calendar/gui/gnome-cal.c:2867
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
@@ -6474,117 +6564,132 @@ msgid "Sa"
 msgstr "Bảy"
 
 #. Day
-#: calendar/gui/print.c:1891
+#: calendar/gui/print.c:1890
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Ngày được chọn (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
+#: calendar/gui/print.c:1915 calendar/gui/print.c:1919
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1917
+#: calendar/gui/print.c:1916
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
-#: calendar/gui/print.c:1924
+#: calendar/gui/print.c:1920 calendar/gui/print.c:1922
+#: calendar/gui/print.c:1923
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1928
+#: calendar/gui/print.c:1927
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Tuần được chọn (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1936
+#: calendar/gui/print.c:1935
 msgid "Selected month (%b %Y)"
 msgstr "Tháng được chọn (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1943
+#: calendar/gui/print.c:1942
 msgid "Selected year (%Y)"
 msgstr "Năm được chọn (%Y)"
 
-#: calendar/gui/print.c:2268
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr "Công việc"
 
-#: calendar/gui/print.c:2327
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "Trạng thái: %s"
 
-#: calendar/gui/print.c:2344
+#: calendar/gui/print.c:2343
 #, c-format
 msgid "Priority: %s"
 msgstr "Độ ưu tiên: %s"
 
-#: calendar/gui/print.c:2356
+#: calendar/gui/print.c:2355
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Phần trăm hoàn thành: %i"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2367
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2382
+#: calendar/gui/print.c:2381
 #, c-format
 msgid "Categories: %s"
 msgstr "Phân loại: %s"
 
-#: calendar/gui/print.c:2393
+#: calendar/gui/print.c:2392
 msgid "Contacts: "
 msgstr "Liên lạc: "
 
-#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
-#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2530 calendar/gui/print.c:2616
+#: calendar/gui/tasks-control.c:567 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Xem thử bản in"
 
-#: calendar/gui/print.c:2565
+#: calendar/gui/print.c:2564
 msgid "Print Item"
 msgstr "In một mục"
 
-#: calendar/gui/print.c:2638
+#: calendar/gui/print.c:2637
 msgid "Print Setup"
 msgstr "Thiết lập in"
 
-#: calendar/gui/tasks-component.c:338
+#: calendar/gui/tasks-component.c:350
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:378
+#: calendar/gui/tasks-component.c:391
 #, fuzzy
 msgid "Rename this task list to"
 msgstr "Đổi tên lối tắt"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:412
 #, fuzzy
 msgid "New Task List"
 msgstr "Danh sách công việc"
 
-#: calendar/gui/tasks-component.c:590
+#: calendar/gui/tasks-component.c:587
 msgid "New task"
 msgstr "Công việc mới"
 
-#: calendar/gui/tasks-component.c:591
+#: calendar/gui/tasks-component.c:588
 msgid "_Task"
 msgstr "Nhiệm _vụ"
 
-#: calendar/gui/tasks-component.c:592
+#: calendar/gui/tasks-component.c:589
 msgid "Create a new task"
 msgstr "Tạo công việc mới"
 
-#: calendar/gui/tasks-component.c:659
+#: calendar/gui/tasks-component.c:594
+#, fuzzy
+msgid "New task list"
+msgstr "Danh sách công việc"
+
+#: calendar/gui/tasks-component.c:595
+#, fuzzy
+msgid "_Task List"
+msgstr "Danh sách công việc"
+
+#: calendar/gui/tasks-component.c:596
+#, fuzzy
+msgid "Create a new task list"
+msgstr "Tạo công việc mới"
+
+#: calendar/gui/tasks-component.c:663
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:671
+#: calendar/gui/tasks-component.c:676
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
@@ -6592,7 +6697,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "URI của thư mục công việc cần hiển thị"
 
-#: calendar/gui/tasks-control.c:447
+#: calendar/gui/tasks-control.c:450
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6604,15 +6709,15 @@ msgstr ""
 "\n"
 "Bạn có thật sự muốn xóa những công việc này không?"
 
-#: calendar/gui/tasks-control.c:450
+#: calendar/gui/tasks-control.c:454
 msgid "Do not ask me again."
 msgstr "Đừng hỏi tôi lần nữa"
 
-#: calendar/gui/tasks-control.c:592
+#: calendar/gui/tasks-control.c:596
 msgid "Print Tasks"
 msgstr "In công việc"
 
-#: calendar/gui/weekday-picker.c:268
+#: calendar/gui/weekday-picker.c:326
 msgid "SMTWTFS"
 msgstr "CHBTNSB"
 
@@ -6640,15 +6745,15 @@ msgstr "Thông điệp lịch"
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:469
+#: calendar/importers/icalendar-importer.c:470
 msgid "Reminder!!"
 msgstr "Bộ nhắc nhở!!"
 
-#: calendar/importers/icalendar-importer.c:709
+#: calendar/importers/icalendar-importer.c:710
 msgid "Calendar Events"
 msgstr "Sự kiện lịch"
 
-#: calendar/importers/icalendar-importer.c:734
+#: calendar/importers/icalendar-importer.c:735
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6656,7 +6761,7 @@ msgstr ""
 "Evolution tìm thấy các tập tin Lịch Gnome.\n"
 "Bạn có muốn nhập chúng vào Evolution?"
 
-#: calendar/importers/icalendar-importer.c:741
+#: calendar/importers/icalendar-importer.c:742
 msgid "Gnome Calendar"
 msgstr "Lịch Gnome"
 
@@ -8400,7 +8505,7 @@ msgstr "Đang chép thông điệp"
 msgid "Filtering new message(s)"
 msgstr "Đang nhận %d thông điệp"
 
-#: camel/camel-gpg-context.c:703
+#: camel/camel-gpg-context.c:709
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8411,15 +8516,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:717
+#: camel/camel-gpg-context.c:723
 msgid "Failed to parse gpg userid hint."
 msgstr "Lỗi phân tích chỉ dẫn GPG UserID."
 
-#: camel/camel-gpg-context.c:742
+#: camel/camel-gpg-context.c:747
 msgid "Failed to parse gpg passphrase request."
 msgstr "Lỗi phân tích yêu cầu passphrase của GPG."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:761
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8428,30 +8533,30 @@ msgstr ""
 "Bạn cần passphrase để mở khóa cho người \n"
 "dùng: \"%s\""
 
-#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
-#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
-#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
+#: camel/camel-gpg-context.c:778 camel/camel-gpg-context.c:1268
+#: camel/camel-gpg-context.c:1427 camel/camel-gpg-context.c:1507
+#: camel/camel-gpg-context.c:1614 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Đã hủy"
 
-#: camel/camel-gpg-context.c:788
+#: camel/camel-gpg-context.c:796
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Lỗi mở khóa khóa mật: 3 passphrase sai."
 
-#: camel/camel-gpg-context.c:794
+#: camel/camel-gpg-context.c:802
 #, 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:806
+#: camel/camel-gpg-context.c:814
 msgid "No data provided"
 msgstr "Chưa cung cấp dữ liệu"
 
-#: camel/camel-gpg-context.c:844
+#: camel/camel-gpg-context.c:852
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Lỗi mã hóa: Chưa xác định người nhận."
 
-#: camel/camel-gpg-context.c:1121
+#: camel/camel-gpg-context.c:1129
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8462,61 +8567,61 @@ msgstr ""
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1126
+#: camel/camel-gpg-context.c:1134
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG gặp lỗi %s: %s\n"
 
-#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
+#: camel/camel-gpg-context.c:1247 camel/camel-smime-context.c:410
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Không thể ghi dữ liệu: %s"
 
-#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
-#: camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1261 camel/camel-gpg-context.c:1663
+#: camel/camel-gpg-context.c:1714
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Lỗi thực hiện GPG: %s"
 
-#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
-#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
-#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
-#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
+#: camel/camel-gpg-context.c:1285 camel/camel-gpg-context.c:1419
+#: camel/camel-gpg-context.c:1500 camel/camel-gpg-context.c:1523
+#: camel/camel-gpg-context.c:1607 camel/camel-gpg-context.c:1631
+#: camel/camel-gpg-context.c:1685 camel/camel-gpg-context.c:1736
 msgid "Failed to execute gpg."
 msgstr "Lỗi thực hiện GPG."
 
-#: camel/camel-gpg-context.c:1296
+#: camel/camel-gpg-context.c:1304
 msgid "This is a digitally signed message part"
 msgstr "Đây là phần thông điệp có chữ ký số"
 
-#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
-#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
-#: camel/camel-smime-context.c:719
+#: camel/camel-gpg-context.c:1386 camel/camel-gpg-context.c:1395
+#: camel/camel-smime-context.c:708 camel/camel-smime-context.c:719
+#: camel/camel-smime-context.c:726
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Không thể xác minh chữ ký thông điệp: không thể tạo tập tin tạm: %s"
 
-#: camel/camel-gpg-context.c:1392
+#: camel/camel-gpg-context.c:1402
 #, 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"
 
-#: camel/camel-gpg-context.c:1473
+#: camel/camel-gpg-context.c:1483
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Không thể ghi dữ liệu: %s"
 
-#: camel/camel-gpg-context.c:1531
+#: camel/camel-gpg-context.c:1541
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Đây là phần thông điệp có chữ ký số"
 
-#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#: camel/camel-gpg-context.c:1638 camel/camel-smime-context.c:981
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Nội dung phần thân index"
 
-#: camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1642
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Không thể nhận thông điệp từ trình biên soạn"
@@ -8953,59 +9058,59 @@ msgstr ""
 "Không thể tạo thư mục %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:96
+#: camel/camel-smime-context.c:98
 #, fuzzy, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Vui lòng nhập passphrase %s của bạn cho %s"
 
-#: camel/camel-smime-context.c:501
+#: camel/camel-smime-context.c:505
 #, fuzzy
 msgid "Unverified"
 msgstr "Chưa biết"
 
-#: camel/camel-smime-context.c:503
+#: camel/camel-smime-context.c:507
 #, fuzzy
 msgid "Good signature"
 msgstr "Sửa chữ ký"
 
-#: camel/camel-smime-context.c:505
+#: camel/camel-smime-context.c:509
 #, fuzzy
 msgid "Bad signature"
 msgstr "Sửa chữ ký"
 
-#: camel/camel-smime-context.c:507
+#: camel/camel-smime-context.c:511
 msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/camel-smime-context.c:509
+#: camel/camel-smime-context.c:513
 #, fuzzy
 msgid "Signing certificate not found"
 msgstr "Chứng nhận tự ký trong chuỗi"
 
-#: camel/camel-smime-context.c:511
+#: camel/camel-smime-context.c:515
 #, fuzzy
 msgid "Signing certificate not trusted"
 msgstr "Chứng nhận không đáng tin"
 
-#: camel/camel-smime-context.c:513
+#: camel/camel-smime-context.c:517
 msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/camel-smime-context.c:515
+#: camel/camel-smime-context.c:519
 msgid "Siganture algorithm unsupported"
 msgstr ""
 
-#: camel/camel-smime-context.c:517
+#: camel/camel-smime-context.c:521
 #, fuzzy
 msgid "Malformed signature"
 msgstr "Lưu chữ ký"
 
-#: camel/camel-smime-context.c:519
+#: camel/camel-smime-context.c:523
 #, fuzzy
 msgid "Processing error"
 msgstr "Lỗi phân tích"
 
-#: camel/camel-smime-context.c:634
+#: camel/camel-smime-context.c:638
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Server: %s, Kiểu: %s"
@@ -9273,12 +9378,12 @@ msgstr "Không thể đổi tên thư mục: %s: Không có thư mục này"
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2816
+#: camel/providers/imap/camel-imap-store.c:2817
 msgid "Operation cancelled"
 msgstr "Thao tác bị hủy bỏ"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2819
+#: camel/providers/imap/camel-imap-store.c:2820
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server đã ngắt kết nối bất ngờ: %s"
@@ -9459,7 +9564,7 @@ msgstr "Để đọc và lưu thư trên IMAP server."
 #: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:87
 msgid "Password"
 msgstr "Mật khẩu"
 
@@ -9682,7 +9787,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:138
 #: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:305
+#: camel/providers/local/camel-mbox-store.c:331
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9715,23 +9820,29 @@ 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:364
-#: camel/providers/local/camel-mbox-store.c:475
+#: camel/providers/local/camel-mbox-store.c:501
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Không thể đổi tên '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:387
-#: camel/providers/local/camel-mbox-store.c:258
+#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Không thể xóa tập tin tóm tắt thư mục `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-local-store.c:399
+#: camel/providers/local/camel-mbox-store.c:272
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Không thể xóa tập tin chỉ mục thư mục `%s': %s"
 
+#: camel/providers/local/camel-local-store.c:421
+#: camel/providers/local/camel-mbox-store.c:295
+#, fuzzy, c-format
+msgid "Could not delete folder meta file `%s': %s"
+msgstr "Không thể xóa tập tin tóm tắt thư mục `%s': %s"
+
 #: camel/providers/local/camel-local-summary.c:398
 #, c-format
 msgid "Could not save summary: %s: %s"
@@ -9897,14 +10008,14 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:188
-#: camel/providers/local/camel-mbox-store.c:229
+#: camel/providers/local/camel-mbox-store.c:231
 #, 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:210
-#: camel/providers/local/camel-mbox-store.c:221
-#: camel/providers/local/camel-mbox-store.c:244
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mbox-store.c:223
+#: camel/providers/local/camel-mbox-store.c:246
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9913,37 +10024,37 @@ msgstr ""
 "Không thể xóa thư mục `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:238
 #, 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:311
+#: camel/providers/local/camel-mbox-store.c:337
 #, fuzzy
 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:324
+#: camel/providers/local/camel-mbox-store.c:350
 #, fuzzy, 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:338
+#: camel/providers/local/camel-mbox-store.c:364
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Không thể lấy thư mục: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:340
+#: camel/providers/local/camel-mbox-store.c:366
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Card ID đã tồn tại"
 
-#: camel/providers/local/camel-mbox-store.c:409
+#: camel/providers/local/camel-mbox-store.c:435
 #, fuzzy, c-format
 msgid "Could not rename %s to %s: %s"
 msgstr "Không thể đổi tên thư mục %s thành %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:428
+#: camel/providers/local/camel-mbox-store.c:454
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Tên thư mục xác định không hợp lệ: %s"
@@ -9987,7 +10098,7 @@ msgstr "Không thể đóng thư mục nguồn %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Không thể đóng thư mục temp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1286
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Không thể đổi tên thư mục: %s"
@@ -10267,7 +10378,7 @@ msgstr "Xoá sau %s ngày"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:86
 msgid "POP"
 msgstr "POP"
 
@@ -10355,7 +10466,7 @@ msgid "No such folder `%s'."
 msgstr "Không có thư mục `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:111
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10408,7 +10519,7 @@ msgstr "sendmail"
 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:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:103
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10582,65 +10693,65 @@ msgstr "Đang gửi thông điệp"
 msgid "Cannot send message: no recipients defined."
 msgstr "Không thể gửi thông điệp: chưa có người nhận."
 
-#: camel/providers/smtp/camel-smtp-transport.c:715
+#: camel/providers/smtp/camel-smtp-transport.c:717
 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ệ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "Chào hỏi của SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:929
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Yêu cầu HELO quá hạn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:956
 msgid "HELO response error"
 msgstr "Lỗi hồi đáp HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1017
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "SMTP Authentication"
 msgstr "xác thực SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:1028
 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:1040
-#: camel/providers/smtp/camel-smtp-transport.c:1052
+#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Yêu cầu AUTH quá hạn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1061
+#: camel/providers/smtp/camel-smtp-transport.c:1066
 msgid "AUTH request failed."
 msgstr "Yêu cầu AUTH thất bại."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1122
+#: camel/providers/smtp/camel-smtp-transport.c:1127
 msgid "Bad authentication response from server.\n"
 msgstr "Trả lời xác thực từ server sai.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1147
+#: camel/providers/smtp/camel-smtp-transport.c:1152
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Quá hạn yêu cầu MAIL FROM: %s: chưa gửi mail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1167
+#: camel/providers/smtp/camel-smtp-transport.c:1172
 msgid "MAIL FROM response error"
 msgstr "Lỗi hồi đáp MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1191
+#: camel/providers/smtp/camel-smtp-transport.c:1196
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Quá hạn yêu cầu RCPT TO: %s: chưa gửi mail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1218
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> thất bại"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
+#: camel/providers/smtp/camel-smtp-transport.c:1257
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Quá hạn yêu cầu DATA: %s: chưa gửi mail"
@@ -10648,35 +10759,35 @@ msgstr "Quá hạn yêu cầu DATA: %s: chưa gửi mail"
 #. 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:1272
+#: camel/providers/smtp/camel-smtp-transport.c:1277
 msgid "DATA response error"
 msgstr "Lỗi hồi đáp DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1318
+#: camel/providers/smtp/camel-smtp-transport.c:1341
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Quá hạn gửi DATA: chấm dứt thông điệp: %s: chưa gửi mail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1361
 msgid "DATA termination response error"
 msgstr "Lỗi hồi đáp kết thúc DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1384
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Quá hạn yêu cầu RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1404
 msgid "RSET response error"
 msgstr "Lỗi hồi đáp RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1427
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Yêu cầu QUIT quá hạn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1447
 msgid "QUIT response error"
 msgstr "Lỗi hồi đáp QUIT"
 
@@ -10695,7 +10806,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1382
 msgid "attachment"
 msgstr "đồ đính kèm"
 
@@ -11381,18 +11492,18 @@ msgstr ""
 "%s"
 
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
-#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
+#: mail/mail-config.glade.h:66 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Quan trọng"
 
 #. forest green
 #: filter/filter-label.c:124 mail/mail-config.c:66
-#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
+#: mail/mail-config.glade.h:125 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Cần làm"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:70
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Sau đó"
@@ -11497,7 +11608,7 @@ msgstr "trước"
 msgid "months"
 msgstr "tháng"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "giây"
 
@@ -11594,7 +11705,7 @@ msgstr "Biểu thức"
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:714
 msgid "Label"
 msgstr "Nhãn"
 
@@ -11676,9 +11787,9 @@ msgstr "Header xác định"
 msgid "Stop Processing"
 msgstr "Dừng tiến trình"
 
-#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
-#: smime/lib/e-cert.c:1074
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1449 mail/em-format.c:678
+#: mail/em-mailer-prefs.c:72 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:305 smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Chủ đề"
 
@@ -11866,7 +11977,7 @@ msgstr "Thành phần hiển thị thư mục của Evolution."
 msgid "Evolution Mail preferences control"
 msgstr "Thành phần tóm tắt thư của Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:804
 #: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
 #: mail/importers/pine-importer.c:572
 msgid "Mail"
@@ -11876,7 +11987,7 @@ msgstr "Thư"
 msgid "Mail Accounts"
 msgstr "Tài khoản thư"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:73
 msgid "Mail Preferences"
 msgstr "Thông số thư"
 
@@ -11997,7 +12108,7 @@ msgstr ""
 "Không thể mở thư mục Nháp cho tài khoản này.\n"
 "Bạn có muốn dùng thư mục Nháp mặc định?"
 
-#: mail/em-folder-browser.c:128
+#: mail/em-folder-browser.c:131
 msgid "Create _Virtual Folder From Search..."
 msgstr "Tạo thư mục ả_o từ kết quả tìm kiếm..."
 
@@ -12021,7 +12132,7 @@ msgstr "Xác định nơi tạo thư mục:"
 msgid "Folder _name:"
 msgstr "Tên thư mục:"
 
-#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1994
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Không thể tạo thư mục tạm: %s"
@@ -12051,7 +12162,7 @@ msgid "%s"
 msgstr ""
 
 #: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
-#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: mail/em-folder-view.c:591 mail/em-folder-view.c:605
 #: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Chọn thư mục"
@@ -12061,270 +12172,272 @@ msgstr "Chọn thư mục"
 msgid "Create folder"
 msgstr "Tạo thư mục mới"
 
-#: mail/em-folder-tree.c:1179
+#: mail/em-folder-tree.c:1182
 #, fuzzy, c-format
 msgid "Could not delete folder: %s"
 msgstr "Không thể xóa thư mục `%s': %s"
 
-#: mail/em-folder-tree.c:1200
+#: mail/em-folder-tree.c:1203
 #, fuzzy, c-format
 msgid "Really delete folder \"%s\" and all of its subfolders?"
 msgstr "Bạn thật sự muốn xóa thư mục \"%s\" chứ?"
 
-#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#: mail/em-folder-tree.c:1213 shell/e-shell-folder-commands.c:416
 #, c-format
 msgid "Delete \"%s\""
 msgstr "Xoá \"%s\""
 
-#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:1247 shell/e-shell-folder-commands.c:534
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Đổi tên thư mục \"%s\" thành:"
 
-#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:1249 shell/e-shell-folder-commands.c:541
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Đổi tên thư mục"
 
-#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#: mail/em-folder-tree.c:1273 shell/e-shell-folder-commands.c:554
 #, c-format
 msgid "A folder named \"%s\" already exists. Please use a different name."
 msgstr ""
 
-#: mail/em-folder-tree.c:1370
+#: mail/em-folder-tree.c:1371
 #, fuzzy
 msgid "Folder properties"
 msgstr "Thuộc tính font"
 
 #. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-tree.c:1376
+#: mail/em-folder-tree.c:1377
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: mail/em-folder-tree.c:1384
+#: mail/em-folder-tree.c:1385
 #, fuzzy
 msgid "Folder Name"
 msgstr "Tên thư _mục:"
 
-#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: mail/em-folder-tree.c:1492 ui/evolution-addressbook.xml.h:45
+#: ui/evolution-mail-global.xml.h:20 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
 msgid "_View"
 msgstr "_Xem"
 
-#: mail/em-folder-tree.c:1492
+#: mail/em-folder-tree.c:1493
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Mở trong cửa sổ mới"
 
-#: mail/em-folder-tree.c:1497
+#: mail/em-folder-tree.c:1498
 #, fuzzy
 msgid "_Move"
 msgstr "Di chuyển"
 
-#: mail/em-folder-tree.c:1500
+#: mail/em-folder-tree.c:1501
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Thư mục mớ_i"
 
-#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+#: mail/em-folder-tree.c:1503 shell/e-shortcuts-view.c:427
 msgid "_Rename"
 msgstr "Đổi tên"
 
-#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:1506 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Thuộc tính..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:681 mail/em-popup.c:589
+#: mail/em-folder-view.c:682 mail/em-popup.c:596
 msgid "_Edit as New Message..."
 msgstr "_Hiệu chỉnh như thông điệp mới..."
 
-#: mail/em-folder-view.c:683
+#: mail/em-folder-view.c:684
 msgid "_Print"
 msgstr "_In"
 
-#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:687 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "T_rả lời người gửi"
 
-#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: mail/em-folder-view.c:688 mail/em-popup.c:716
 #: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Trả lời _danh sách"
 
-#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: mail/em-folder-view.c:689 mail/em-popup.c:717
 #: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Trả lời _mọi người"
 
-#: mail/em-folder-view.c:689 mail/em-popup.c:653
+#: mail/em-folder-view.c:690 mail/em-popup.c:719
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward"
 msgstr "_Chuyển tiếp"
 
-#: mail/em-folder-view.c:692
+#: mail/em-folder-view.c:693
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:693
+#: mail/em-folder-view.c:694
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:695
 msgid "Cl_ear Flag"
 msgstr "Xó_a cờ"
 
-#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:698 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Đánh dấu đã đọ_c"
 
-#: mail/em-folder-view.c:698
+#: mail/em-folder-view.c:699
 msgid "Mark as _Unread"
 msgstr "Đánh dấu c_hưa đọc"
 
-#: mail/em-folder-view.c:699
+#: mail/em-folder-view.c:700
 msgid "Mark as _Important"
 msgstr "Đánh dấu _quan trọng"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:701
 msgid "_Mark as Unimportant"
 msgstr "Đánh dấu _Không quan trọng"
 
-#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Đánh dấu c_hưa đọc"
 
-#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:703 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Đánh dấu _quan trọng"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:707
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:709
+#: mail/em-folder-view.c:710
 msgid "Mo_ve to Folder..."
 msgstr "_Chuyển tới thư mục..."
 
-#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:711 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "C_hép vào thư mục..."
 
-#: mail/em-folder-view.c:718
+#: mail/em-folder-view.c:719
 msgid "Add Sender to Address_book"
 msgstr "Thêm người _gửi vào sổ địa chỉ"
 
-#: mail/em-folder-view.c:721
+#: mail/em-folder-view.c:722
 msgid "Appl_y Filters"
 msgstr "Áp dụng _bộ lọc"
 
-#: mail/em-folder-view.c:724
+#: mail/em-folder-view.c:725
 msgid "Crea_te Rule From Message"
 msgstr "Tạo _quy tắc từ thông điệp"
 
-#: mail/em-folder-view.c:725
+#: mail/em-folder-view.c:726
 msgid "VFolder on _Subject"
 msgstr "VFolder trên _chủ đề"
 
-#: mail/em-folder-view.c:726
+#: mail/em-folder-view.c:727
 msgid "VFolder on Se_nder"
 msgstr "VFolder trên _người gửi"
 
-#: mail/em-folder-view.c:727
+#: mail/em-folder-view.c:728
 msgid "VFolder on _Recipients"
 msgstr "VFolder trên n_gười nhận"
 
-#: mail/em-folder-view.c:728
+#: mail/em-folder-view.c:729
 msgid "VFolder on Mailing _List"
 msgstr "VFolder trên Mailing _List"
 
-#: mail/em-folder-view.c:730
+#: mail/em-folder-view.c:731
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VFolder trên _người gửi"
 
-#: mail/em-folder-view.c:734
+#: mail/em-folder-view.c:735
 msgid "Filter on Sub_ject"
 msgstr "Lọc theo _chủ đề"
 
-#: mail/em-folder-view.c:735
+#: mail/em-folder-view.c:736
 msgid "Filter on Sen_der"
 msgstr "Lọc theo _người gửi"
 
-#: mail/em-folder-view.c:736
+#: mail/em-folder-view.c:737
 msgid "Filter on Re_cipients"
 msgstr "Lọc theo n_gười nhận"
 
-#: mail/em-folder-view.c:737
+#: mail/em-folder-view.c:738
 msgid "Filter on _Mailing List"
 msgstr "Lọc _Mailing list"
 
-#: mail/em-folder-view.c:739
+#: mail/em-folder-view.c:740
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Lọc theo _người gửi"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
-#: mail/mail-config.glade.h:40
+#: mail/em-folder-view.c:1512 mail/em-folder-view.c:1550
+#: mail/mail-config.glade.h:41
 msgid "Default"
 msgstr "Mặc định"
 
-#: mail/em-folder-view.c:1583
+#: mail/em-folder-view.c:1584
 msgid "Print Message"
 msgstr "In thông điệp"
 
-#: mail/em-folder-view.c:1825
+#: mail/em-folder-view.c:1826
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Sao chép vị trí liên kết"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:368
+#: mail/em-format-html-display.c:373
 #, fuzzy, c-format
 msgid "Matches: %d"
 msgstr "Khớp:"
 
-#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:603 mail/em-format-html.c:564
 #, fuzzy
 msgid "Unsigned"
 msgstr "Đã gán"
 
-#: mail/em-format-html-display.c:597
+#: mail/em-format-html-display.c:603
 #, fuzzy
 msgid ""
 "This message is not signed.  There is no guarantee the sender of the message "
 "is authentic."
 msgstr "Thông điệp này dùng chữ ký số nhưng không thể được xác thực."
 
-#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:604 mail/em-format-html.c:565
 #, fuzzy
 msgid "Valid signature"
 msgstr "Sửa chữ ký"
 
-#: mail/em-format-html-display.c:598
+#: mail/em-format-html-display.c:604
 msgid ""
 "This message is signed and is valid, the sender of this message is very "
 "likely who they claim to be."
 msgstr ""
 
-#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#: mail/em-format-html-display.c:605 mail/em-format-html.c:566
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Sửa chữ ký"
 
-#: mail/em-format-html-display.c:599
+#: mail/em-format-html-display.c:605
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:567
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:600
+#: mail/em-format-html-display.c:606
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -12333,72 +12446,82 @@ msgstr ""
 "Tham số input_token chứa chữ ký không hợp lệ, hoặc chữ ký không được xác "
 "nhận."
 
-#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:612 mail/em-format-html.c:573
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Đã ngắt"
 
-#: mail/em-format-html-display.c:606
+#: mail/em-format-html-display.c:612
 msgid ""
 "This message is not encrypted.  It's content may be viewed in transit across "
 "The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:613 mail/em-format-html.c:574
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:607
+#: mail/em-format-html-display.c:613
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#: mail/em-format-html-display.c:614 mail/em-format-html.c:575
 #, fuzzy
 msgid "Encrypted"
 msgstr "Mã hóa PGP"
 
-#: mail/em-format-html-display.c:608
+#: mail/em-format-html-display.c:614
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+#: mail/em-format-html-display.c:615 mail/em-format-html.c:576
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:609
+#: mail/em-format-html-display.c:615
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
+#: mail/em-format-html-display.c:699
+#, fuzzy
+msgid "_View Certificate"
+msgstr "_ID Chứng nhận:"
+
+#: mail/em-format-html-display.c:704
+#, fuzzy
+msgid "This certificate is not viewable"
+msgstr "Chứng nhận chưa hợp lệ"
+
+#: mail/em-format-html-display.c:866 mail/em-format-html.c:645
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Không thể phân tích thông điệp MIME. Đang hiện thị mã thô."
 
-#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
-#: mail/em-format.c:1196
+#: mail/em-format-html-display.c:902 mail/em-format-html.c:1051
+#: mail/em-format.c:1198
 #, fuzzy
 msgid "Unsupported signature format"
 msgstr "Lược đồ không hỗ trợ"
 
-#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#: mail/em-format-html-display.c:910 mail/em-format-html.c:1059
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Không thể giải mã chữ ký chứng nhận"
 
-#: mail/em-format-html-display.c:917
+#: mail/em-format-html-display.c:1007
 #, fuzzy
 msgid "_View Inline"
 msgstr "Xem Inline"
 
-#: mail/em-format-html-display.c:918
+#: mail/em-format-html-display.c:1008
 #, fuzzy
 msgid "_Hide"
 msgstr "Ẩn"
@@ -12413,100 +12536,100 @@ msgstr "Trang %d trên %d"
 msgid "Retrieving `%s'"
 msgstr "Đang nhận thông điệp %s"
 
-#: mail/em-format-html.c:826
+#: mail/em-format-html.c:834
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:856
+#: mail/em-format-html.c:864
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Trỏ tới địa chỉ FTP (%s)"
 
-#: mail/em-format-html.c:867
+#: mail/em-format-html.c:875
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Trỏ tới tập tin cục bộ hợp lệ (%s) tại địa chỉ \"%s\""
 
-#: mail/em-format-html.c:869
+#: mail/em-format-html.c:877
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Trỏ tới tập tin cục bộ (%s)"
 
-#: mail/em-format-html.c:890
+#: mail/em-format-html.c:898
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Trỏ tới tập tin từ xa (%s)"
 
-#: mail/em-format-html.c:901
+#: mail/em-format-html.c:909
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Trỏ tới dữ liệu lạ bên ngoài (kiểu \"%s\")"
 
-#: mail/em-format-html.c:1029
+#: mail/em-format-html.c:1037
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Không thể phân tích thông điệp MIME. Đang hiện thị mã thô."
 
-#: mail/em-format-html.c:1141
+#: mail/em-format-html.c:1152
 #, fuzzy
 msgid "Formatting message"
 msgstr "Đang di chuyển thông điệp"
 
-#: mail/em-format-html.c:1423 mail/em-format.c:673
+#: mail/em-format-html.c:1434 mail/em-format.c:673 mail/em-mailer-prefs.c:67
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Từ"
 
-#: mail/em-format-html.c:1425 mail/em-format.c:674
+#: mail/em-format-html.c:1436 mail/em-format.c:674 mail/em-mailer-prefs.c:68
 msgid "Reply-To"
 msgstr "Trả lời cho"
 
-#: mail/em-format-html.c:1427 mail/em-format.c:675
+#: mail/em-format-html.c:1438 mail/em-format.c:675 mail/em-mailer-prefs.c:69
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Tới"
 
-#: mail/em-format-html.c:1429 mail/em-format.c:676
+#: mail/em-format-html.c:1440 mail/em-format.c:676 mail/em-mailer-prefs.c:70
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/em-format-html.c:1431 mail/em-format.c:677
+#: mail/em-format-html.c:1442 mail/em-format.c:677 mail/em-mailer-prefs.c:71
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/em-format-html.c:1450
+#: mail/em-format-html.c:1458 mail/em-mailer-prefs.c:631
 msgid "Mailer"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1477
+#: mail/em-format-html.c:1485
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1480
+#: mail/em-format-html.c:1488
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1491 mail/em-format.c:679
+#: mail/em-format-html.c:1499 mail/em-format.c:679 mail/em-mailer-prefs.c:73
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Ngày"
 
-#: mail/em-format.c:892
+#: mail/em-format.c:893
 #, c-format
 msgid "%s attachment"
 msgstr "%s đồ đính kèm"
 
-#: mail/em-format.c:1185
+#: mail/em-format.c:1186
 #, fuzzy
 msgid "Session not initialised"
 msgstr "Không thể khởi động GNOME"
 
-#: mail/em-format.c:1210
+#: mail/em-format.c:1212
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Thông điệp này dùng chữ ký số và đã được xác thực."
 
-#: mail/em-format.c:1212
+#: mail/em-format.c:1214
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Thông điệp này dùng chữ ký số nhưng không thể được xác thực."
 
@@ -12532,50 +12655,55 @@ msgstr ""
 msgid "Migrating `%s':"
 msgstr "Đang \"ping\" %s"
 
-#: mail/em-migrate.c:627
+#: mail/em-migrate.c:775
 #, fuzzy, c-format
 msgid "Failed to migrate `%s': %s"
 msgstr "Lỗi cache %s: %s"
 
-#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#: mail/em-migrate.c:801 mail/em-migrate.c:818
 #, fuzzy, c-format
 msgid "Failed to create directory `%s': %s"
 msgstr "Lỗi tạo ống dẫn tới '%s': %s"
 
-#: mail/em-migrate.c:682
+#: mail/em-migrate.c:830
 #, fuzzy, c-format
 msgid "Failed to open store for `%s': %s"
 msgstr "Lỗi tạo ống dẫn tới '%s': %s"
 
-#: mail/em-popup.c:599
+#: mail/em-popup.c:606
 msgid "Save As..."
 msgstr "Lưu là..."
 
-#: mail/em-popup.c:647
+#: mail/em-popup.c:624
+#, fuzzy, c-format
+msgid "untitled_image.%s"
+msgstr "Thông điệp không tựa"
+
+#: mail/em-popup.c:713
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:649
+#: mail/em-popup.c:715
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "T_rả lời người gửi"
 
-#: mail/em-popup.c:697
+#: mail/em-popup.c:763
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Mở liên kết bằng trình duyệt"
 
-#: mail/em-popup.c:698
+#: mail/em-popup.c:764
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Gửi _thông điệp cho danh sách..."
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:765
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Têm sổ địa chỉ"
 
-#: mail/em-popup.c:805
+#: mail/em-popup.c:871
 #, c-format
 msgid "Open in %s..."
 msgstr "Mở bằng %s..."
@@ -12603,11 +12731,11 @@ msgstr "Vui lòng chọn một server."
 msgid "No server has been selected"
 msgstr "Chưa chọn server"
 
-#: mail/em-utils.c:93
+#: mail/em-utils.c:95
 msgid "Don't show this message again."
 msgstr "Đừng hiện thông báo này lần nữa."
 
-#: mail/em-utils.c:275
+#: mail/em-utils.c:277
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12616,27 +12744,27 @@ msgstr ""
 "Lỗi khi nạp thông tin bộ lọc:\n"
 "%s"
 
-#: mail/em-utils.c:284
+#: mail/em-utils.c:286
 msgid "Filters"
 msgstr "Bộ lọc"
 
-#: mail/em-utils.c:491
+#: mail/em-utils.c:493
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Thông điệp chuyển tiếp"
 
-#: mail/em-utils.c:1044
+#: mail/em-utils.c:1046
 msgid "an unknown sender"
 msgstr "người gửi lạ"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1054
+#: mail/em-utils.c:1056
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Vào ngày %a, %d/%m/%Y lúc %H:%M, %s viết rằng:"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1332 mail/em-utils.c:1416 mail/em-utils.c:1425
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12645,7 +12773,7 @@ msgstr ""
 "Không thể lưu vào `%s'\n"
 "  %s"
 
-#: mail/em-utils.c:1335
+#: mail/em-utils.c:1337
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12654,22 +12782,27 @@ msgstr ""
 "`%s' đã tồn tại.\n"
 "Bạn có muốn ghi đè lên nó không?"
 
-#: mail/em-utils.c:1378
+#: mail/em-utils.c:1380
 #, fuzzy
 msgid "message"
 msgstr "Thông báo"
 
-#: mail/em-utils.c:1435
+#: mail/em-utils.c:1432
+#, fuzzy, c-format
+msgid "Error: '%s' exists and is not a regular file"
+msgstr "Tập tin '%s' không tồn tại hoặc không phải là một tập tin bình thường"
+
+#: mail/em-utils.c:1486
 #, fuzzy
 msgid "Save Message..."
 msgstr "Lưu thông điệp là..."
 
-#: mail/em-utils.c:1473
+#: mail/em-utils.c:1524
 #, fuzzy
 msgid "Add address"
 msgstr "Địa chỉ"
 
-#: mail/em-utils.c:2262
+#: mail/em-utils.c:2314
 #, fuzzy, c-format
 msgid ""
 "This operation will permanently remove all deleted messages in the folder `%"
@@ -12682,7 +12815,7 @@ msgstr ""
 "\n"
 "Bạn có thật sự muốn xóa những thông điệp này không?"
 
-#: mail/em-utils.c:2288
+#: mail/em-utils.c:2340
 #, fuzzy
 msgid ""
 "This operation will permanently remove all deleted messages in all folders. "
@@ -12801,275 +12934,287 @@ msgid ""
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:23
+msgid "List of custom headers and whether they are enabled."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:27
+#: mail/evolution-mail.schemas.in.in.h:28
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Thực hiện hành động"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:29
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:30
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:38
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:44
 #, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "_Nhắc khi gửi thư HTML cho các liên lạc không muốn nhận HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:45
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "_Nhắc khi gửi thư mà chỉ có người nhận _Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "S3kr3t 0pt10n"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "S3kr3t 0pt10n."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "Send HTML mail by default"
 msgstr "_Gửi thư mặc định dùng dạng HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "Send HTML mail by default."
 msgstr "_Gửi thư mặc định dùng dạng HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:54
 #, fuzzy
 msgid "Show Animations"
 msgstr "_Hiện hoạt cảnh"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:55
 #, fuzzy
 msgid "Show animated images as animations."
 msgstr "_Hiện hoạt cảnh"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:57
 #, fuzzy
 msgid "Show deleted messages in the message-list"
 msgstr "Hiện thông điệp theo cách bình thường"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:58
 #, fuzzy
 msgid "Show the \"Preview\" pane"
 msgstr "Khung xem thử"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
 msgstr "_Chơi nhạc khi có thư mới"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:62
 #, fuzzy
 msgid "Spell check inline"
 msgstr "_Kiểm tra chính tả"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:63
 #, fuzzy
 msgid "Terminal font"
 msgstr "Liên lạc gốc:"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "The variable width font for mail display"
 msgstr "Chọn font HTML độ rộng thay đổi để in"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:66
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:67
 #, fuzzy
 msgid "Thread the message list."
 msgstr "Danh sách thông điệp theo nhánh"
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Thread the message-list"
 msgstr "Danh sách thông điệp theo nhánh"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:72
 #, fuzzy
 msgid "UID string of the default account."
 msgstr "Chọn làm tài khoản _mặc định"
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Use custom fonts"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:75
 #, fuzzy
 msgid "Variable width font"
 msgstr "Độ rộng _thay đổi:"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:76
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:77
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:79
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:82
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -13274,15 +13419,15 @@ msgstr "Bạn chưa điền đủ các thông tin yêu cầu."
 msgid "Evolution Account Editor"
 msgstr "Bộ hiệu chỉnh tài khoản"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:155
 msgid "_Host:"
 msgstr "_Máy chủ:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Tên người dùng:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "Đường _dẫn:"
 
@@ -13347,14 +13492,14 @@ msgstr "Thông điệp thư"
 msgid "Compose a new mail message"
 msgstr "Biên soạn thông điệp mới"
 
-#: mail/mail-component.c:472
+#: mail/mail-component.c:496
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:65
 msgid "Identity"
 msgstr "Thực thể"
 
@@ -13398,7 +13543,7 @@ msgstr ""
 "Vui lòng nhập thông tin về cách bạn gửi thư. Nếu bạn không chắc, hãy hỏi "
 "quản trị hệ thống hoặc ISP của bạn."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:11
 msgid "Account Management"
 msgstr "Bộ quản lý tài khoản"
 
@@ -13436,100 +13581,108 @@ msgid "(SSL is not supported in this build of evolution)"
 msgstr "(Phiên bản Evolution đang dùng không hỗ trợ SSL)"
 
 #: mail/mail-config.glade.h:7
+msgid "<b>_Displayed Mail Headers</b>"
+msgstr ""
+
+#: mail/mail-config.glade.h:8
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Luôn tự mã hoá khi gửi thư được mã hóa"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
 msgid "Account Editor"
 msgstr "Bộ hiệu chỉnh tài khoản"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:10
 msgid "Account Information"
 msgstr "Thông tin tài khoản"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:12
 msgid "Add Sc_ript"
 msgstr "Thêm _script"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:13
 msgid "Add new signature..."
 msgstr "Lưu chữ ký mới..."
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:14
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Luôn tự mã hoá khi gửi thư được mã hóa"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
+msgid "Alerts"
+msgstr "Báo động"
+
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Luôn gửi (_Bcc) tới:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Luôn gửi (_Cc) tới:"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:19
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Đính kèm thông điệp gốc"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Đồ đính kèm"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "xác thực"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:23
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:25
 msgid "C_haracter set:"
 msgstr "Bảng mã:"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:26
 msgid "C_olors"
 msgstr "_Màu sắc"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:27
 #, fuzzy
 msgid "Check _Incoming Mail"
 msgstr "Kiểm tra thư mới"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Kiểm tra chính tả khi đang _gõ"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Kiểm tra thư mới"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:30
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:31
 msgid "Color for _misspelled words:"
 msgstr "Màu từ gõ _sai:"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:32
 msgid "Composing Messages"
 msgstr "Đang soạn thông điệp"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:33
 msgid "Configuration"
 msgstr "Cấu hình"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:34
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13544,278 +13697,283 @@ msgstr ""
 "\n"
 "Hãu nhấn \"Áp dụng\" để lưu các thiết lập."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:40
 msgid "De_fault"
 msgstr "_Mặc định"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:42
 msgid "Default Behavior"
 msgstr "Hành vi mặc định"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:43
 msgid "Default character _encoding:"
 msgstr "_Bảng mã mặc định:"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:44
 msgid "Deleting Mail"
 msgstr "Đang xóa thư"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Luôn ký tên lên các thư cần gửi khi dùng tài khoản này"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:47
 msgid "Do not quote original message"
 msgstr "Không trích dẫn thông điệp gốc"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:49 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Xong"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 msgid "Drafts _folder:"
 msgstr "Thư mục _nháp:"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 msgid "E_nable"
 msgstr "_Bật"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "Tài khoản email"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "Địa chỉ _email:"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "_Xóa thư mục Rác khi thoát"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_ID Chứng nhận:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 msgid "Evolution Account Assistant"
 msgstr "Phụ tá tài khoản Evolution"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Execute Command..."
 msgstr "Thực hiện lệnh..."
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 msgid "Fi_xed -width:"
 msgstr "Độ rộng _cứng:"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Filter Options"
 msgstr "<< Ít tùy chọn hơn"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Font Properties"
 msgstr "Thuộc tính font"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "Format messages in _HTML"
 msgstr "Định dạng thông điệp bằng _HTML"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:62
+#, fuzzy
+msgid "H_eaders"
+msgstr "Header"
+
+#: mail/mail-config.glade.h:63
 msgid "Highlight _quotations with"
 msgstr "Điểm sang _trích dẫn bằng"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:64
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:68
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Labels and Colors"
 msgstr "Nhãn và màu"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:71
 msgid "Loading Images"
 msgstr "Đang nạp ảnh"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Mail Configuration"
 msgstr "Cấu hình thư"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 msgid "Mailbox location"
 msgstr "Địa điểm hộp thư"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Message Composer"
 msgstr "Bộ soạn thảo thông điệp"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "Message Display"
 msgstr "Hiển thị thông điệp"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Message Fonts"
 msgstr "Thông điệp chứa"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Optional Information"
 msgstr "Thông tin tùy chọn"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Or_ganization:"
 msgstr "Tổ _chức:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "PGP/GPG _Key ID:"
 msgstr "_Khóa ID PGP/GPG:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Pick a color"
 msgstr "Chọn màu"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "_Nhắc khi gửi thư mà chỉ có người nhận _Bcc"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:91
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:92
 msgid "Printed Fonts"
 msgstr "Font in"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:93
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:94
 msgid "Quote original message"
 msgstr "Trích dẫn thông điệp gốc"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:95
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:96
 msgid "Re_member this password"
 msgstr "_Nhớ mật khẩu này"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:97
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:98
 msgid "Receiving Email"
 msgstr "Đang nhận email"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:99
 msgid "Receiving _Options"
 msgstr "Tùy chọn _nhận"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:100
 msgid "Remember this _password"
 msgstr "_Nhớ mật khẩu này"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:101
 msgid "Required Information"
 msgstr "Thông tin yêu cầu"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:102
 msgid "Restore Defaults"
 msgstr "Phục hồi mặc định"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:104
 msgid "S_ecurity"
 msgstr "_Bảo mật"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:105
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME bảo mật (S/MIME)"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:106
 msgid "Select HTML fixed width font"
 msgstr "Chọn font HTML độ rộng cứng"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:107
 msgid "Select HTML fixed width font for printing"
 msgstr "Chọn font html độ rộng cứng để in"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:108
 msgid "Select HTML variable width font"
 msgstr "Chọn font HTML độ rộng thay đổi"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:109
 msgid "Select HTML variable width font for printing"
 msgstr "Chọn font HTML độ rộng thay đổi để in"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:110
 msgid "Sending Email"
 msgstr "Đang gửi email"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:112
 msgid "Sent _messages folder:"
 msgstr "Thư mục thông điệp đã gửi:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:113
 msgid "Sent and Draft Messages"
 msgstr "Thông điệp đã gửi và thông điệp nháp"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:114
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver yêu cầu xác thực"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:115
 msgid "Server Configuration"
 msgstr "Cấu hình server"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:116
 msgid "Server _Type: "
 msgstr "_Kiểu server:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Chứng nhận tự ký trong chuỗi"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Xác định _tên tập tin:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:119
 msgid "Spell _Checking"
 msgstr "_Kiểm tra chính tả"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:120
 msgid "Standard Unix mbox"
 msgstr "Dạng thức Unix mbox chuẩn"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:121
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13825,7 +13983,7 @@ msgstr ""
 "Tên bạn xác định sẽ chỉ được dùng cho mục đích\n"
 "hiển thị."
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:124
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -13834,7 +13992,7 @@ msgstr ""
 "Trang này cho phép bạn cấu hình hành vi kiểm tra chính tả và ngôn ngữ để "
 "kiểm tra. Danh sách ngôn ngữ phản ánh chỉ những ngôn ngữ bạn có cài đặt."
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13842,15 +14000,15 @@ msgstr ""
 "Gõ tên mà bạn muốn dùng cho tài khoản này.\n"
 "Ví dụ: \"Work\" hoặc \"Personal\""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:128
 msgid "Use _Daemon"
 msgstr ""
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "Độ rộng _thay đổi:"
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13860,176 +14018,176 @@ msgstr ""
 "\n"
 "Hãy nhấn \"Kế tiếp\" để bắt đầu."
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:136
 msgid "_Add Signature"
 msgstr "Thêm chữ _ký"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:137
 msgid "_Always load images off the net"
 msgstr "_Luôn nạp ảnh từ mạng"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:138
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Luôn ký tên lên các thư cần gửi khi dùng tài khoản này"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:139
 msgid "_Authentication Type: "
 msgstr "_Loại xác thực: "
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:140
 msgid "_Authentication type: "
 msgstr "_Loại xác thực: "
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Automatically check for new mail every"
 msgstr "_Tự động kiểm tra có thư mới"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:142
 msgid "_Automatically insert smiley images"
 msgstr "_Tự động chèn ảnh smiley"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:143
 msgid "_Beep when new mail arrives"
 msgstr "_Kêu bíp khi có thư mới"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:144
 msgid "_Confirm when expunging a folder"
 msgstr "_Xác nhận khi xóa thư mục"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:145
 msgid "_Default signature:"
 msgstr "_Chữ ký mặc định:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:146
 msgid "_Defaults"
 msgstr "_Mặc định"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:147
 msgid "_Do not notify me when new mail arrives"
 msgstr "Đừn_g thông báo khi có thư mới"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:149
 msgid "_Enable"
 msgstr "_Bật"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:150
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:151
 msgid "_Forward style:"
 msgstr "Phong cách _chuyển tiếp:"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "_Full name:"
 msgstr "_Họ và tên:"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:154
 msgid "_HTML Mail"
 msgstr "Thư _HTML"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:156
 msgid "_Identity"
 msgstr "_Thực thể"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_Junk"
 msgstr "Tháng Sáu"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in addressbook"
 msgstr "_Nạp ảnh nếu người gửi có trong sổ địa chỉ"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Local Tests Only"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Make this my default account"
 msgstr "Chọn làm tài khoản _mặc định"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Mark messages as read after"
 msgstr "Đánh dấu sẽ đọ_c sau"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:162
 msgid "_Name:"
 msgstr "_Tên:"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Never load images off the net"
 msgstr "_Không bao giờ nạp ảnh từ mạng"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Play sound file when new mail arrives"
 msgstr "_Chơi nhạc khi có thư mới"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Nhắc khi gửi thư HTML cho các liên lạc không muốn nhận HTML"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Nhắc khi gửi thư không có chủ đề"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Receiving Mail"
 msgstr "_Nhận thư"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Phong cách trả lời:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:170
 msgid "_Restore defaults"
 msgstr "Phục hồi _mặc định"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:171
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Select..."
 msgstr "Xóa..."
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:173
 msgid "_Sending Mail"
 msgstr "Đan_g gửi thư"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:174
 msgid "_Show animated images"
 msgstr "_Hiện hoạt cảnh"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:175
 msgid "_Signatures"
 msgstr "_Chữ ký"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Standard Font:"
 msgstr "Sand Point"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Terminal Font:"
 msgstr "Liên lạc gốc:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:178
 msgid "_Use secure connection (SSL):"
 msgstr "Dùng kết nối _an toàn (SSL):"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:179
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:181
 msgid "description"
 msgstr "mô tả"
 
-#: mail/mail-folder-cache.c:776
+#: mail/mail-folder-cache.c:786
 #, c-format
 msgid "Pinging %s"
 msgstr "Đang \"ping\" %s"
@@ -14402,67 +14560,67 @@ msgstr "Đang thử hiệu chỉnh thư mục ảo '%s' - không tồn tại."
 msgid "New VFolder"
 msgstr "VFolder mới"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:907
 msgid "Unseen"
 msgstr "Chưa xem"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:908
 msgid "Seen"
 msgstr "Đã xem"
 
-#: mail/message-list.c:906
+#: mail/message-list.c:909
 msgid "Answered"
 msgstr "Đã trả lời"
 
-#: mail/message-list.c:907
+#: mail/message-list.c:910
 msgid "Multiple Unseen Messages"
 msgstr "Nhiều thông điệp chưa xem"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:911
 msgid "Multiple Messages"
 msgstr "Nhiều thông điệp"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:915
 msgid "Lowest"
 msgstr "Thấp nhất"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:916
 msgid "Lower"
 msgstr "Thấp"
 
-#: mail/message-list.c:917
+#: mail/message-list.c:920
 msgid "Higher"
 msgstr "Cao hơn"
 
-#: mail/message-list.c:918
+#: mail/message-list.c:921
 msgid "Highest"
 msgstr "Cao nhất"
 
-#: mail/message-list.c:1241
+#: mail/message-list.c:1244
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1248
+#: mail/message-list.c:1251
 msgid "Today %l:%M %p"
 msgstr "Hôm nay %l:%M %p"
 
-#: mail/message-list.c:1257
+#: mail/message-list.c:1260
 msgid "Yesterday %l:%M %p"
 msgstr "Hôm qua %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1272
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1277
+#: mail/message-list.c:1280
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1282
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3082
+#: mail/message-list.c:3085
 msgid "Generating message list"
 msgstr "Đang tạo danh sách thông điệp"
 
@@ -14576,18 +14734,10 @@ msgid "_Unsubscribe"
 msgstr "_Bỏ đăng ký"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Cấu hình thư mục đặc biệt và hành vi thư mục ngoại tuyến ở đây"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 #, fuzzy
 msgid "Evolution Shell"
 msgstr "Vỏ bọc Evolution"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Thư lập thư mục"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
@@ -15160,19 +15310,19 @@ msgid ""
 msgstr ""
 "Ximian Evolution đang ngoại tuyến. Nhấn nút này để chuyển sang trực tuyến."
 
-#: shell/e-shell.c:1003
+#: shell/e-shell.c:1004
 msgid "Invalid arguments"
 msgstr "Đối số không hợp lệ"
 
-#: shell/e-shell.c:1005
+#: shell/e-shell.c:1006
 msgid "Cannot register on OAF"
 msgstr "Không thể đăng ký với OAF"
 
-#: shell/e-shell.c:1007
+#: shell/e-shell.c:1008
 msgid "Configuration Database not found"
 msgstr "Không tìm thấy cơ sở dữ liệu cấu hình"
 
-#: shell/e-shell.c:1009
+#: shell/e-shell.c:1010
 msgid "Generic error"
 msgstr "Lỗi chung chung"
 
@@ -15310,8 +15460,8 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hoàn tất)"
 
-#: shell/e-user-creatable-items-handler.c:600
-#: shell/e-user-creatable-items-handler.c:641
+#: shell/e-user-creatable-items-handler.c:601
+#: shell/e-user-creatable-items-handler.c:642
 #: widgets/misc/e-charset-picker.c:109
 msgid "New"
 msgstr "Mới"
@@ -16140,7 +16290,7 @@ msgstr "Sao chép vùng chọn"
 msgid "Copy to Folder..."
 msgstr "Chép vào thư mục..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Cắt vùng chọn"
 
@@ -16156,7 +16306,7 @@ msgstr "Chuyển liên lạc tới thư mục khác..."
 msgid "Move to Folder..."
 msgstr "Chuyển tới thư mục..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
 msgid "Paste the clipboard"
 msgstr "Dán vào clipboard"
 
@@ -16164,7 +16314,7 @@ msgstr "Dán vào clipboard"
 msgid "Previews the contacts to be printed"
 msgstr "Xem trước liên lạc cần in"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
 #: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
@@ -16199,18 +16349,23 @@ msgid "Send selected contacts to another person."
 msgstr "Gửi liên lạc được chọn cho người khác"
 
 #: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Show contact preview window"
+msgstr "Hiện khung xem trước"
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Dừng"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "Ngưng nạp"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr "Xem liên lạc hiện thời"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
@@ -16220,142 +16375,150 @@ msgstr "Xem liên lạc hiện thời"
 msgid "_Actions"
 msgstr "_Hành động"
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr "_Chuyển tiếp liên lạc..."
 
-#: ui/evolution-addressbook.xml.h:35
+#: ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
 msgstr "_Chuyển tới thư mục..."
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:19
+msgid "_Preview Pane"
+msgstr "Khung xem thử"
+
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Save as VCard"
 msgstr "Lư_u là VCard"
 
-#: ui/evolution-addressbook.xml.h:40
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Search for Contacts"
 msgstr "_Tìm liên lạc"
 
-#: ui/evolution-addressbook.xml.h:41
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Select All"
 msgstr "Chọn _tất cả"
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:44
 msgid "_Send Message to Contact..."
 msgstr "_Gửi thông điệp tới liên lạc..."
 
-#: ui/evolution-calendar.xml.h:3
-#, fuzzy
-msgid "Create a new calendar"
-msgstr "Tạo thư mục mới"
-
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "Ngày"
 
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:5
 #, fuzzy
 msgid "Delete All Occurrences"
 msgstr "Xóa _mọi lần"
 
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete the appointment"
 msgstr "Xoá cuộc hẹn"
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Delete this Occurrence"
 msgstr "_Xóa lần này"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "_Xóa lần này"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:9
 msgid "Go To"
 msgstr "Đi vào"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back"
 msgstr "Đi lùi"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward"
 msgstr "Đi tới"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to _Date"
 msgstr "Đi tới ngày"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Đi tới ngày xác định"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to today"
 msgstr "Đi tới ngày hôm nay"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:16
 msgid "List"
 msgstr "Danh sách"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:17
 msgid "Month"
 msgstr "Tháng"
 
 #: ui/evolution-calendar.xml.h:19
-#, fuzzy
-msgid "New _Calendar"
-msgstr "New Caledonia"
-
-#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Xem trước lịch cần in"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "In lịch"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "Purg_e"
 msgstr "Bourges"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Purge old appointments and meetings"
 msgstr "Thư mục công cộng chứa các cuộc hẹn và sự kiện"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:25
 #, fuzzy
 msgid "Show as list"
 msgstr "Xem chi tiết"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:26
 msgid "Show one day"
 msgstr "Xem một ngày"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:27
 msgid "Show one month"
 msgstr "Xem một tháng"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one week"
 msgstr "Xem một tuần"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Xem tuần làm việc"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "View the current appointment"
+msgstr "Xem liên lạc hiện thời"
+
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Tuần"
 
+#: ui/evolution-calendar.xml.h:32
+msgid "Work Week"
+msgstr "Tuần làm việc"
+
+#: ui/evolution-calendar.xml.h:37
+#, fuzzy
+msgid "_Open Appointment"
+msgstr "_Cuộc hẹn"
+
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -16591,10 +16754,6 @@ msgstr "Bộ hiệu chỉnh thư mục ảo..."
 msgid "_Filters..."
 msgstr "_Bộ lọc..."
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Preview Pane"
-msgstr "Khung xem thử"
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "Đổi thuộc tính thư mục này"
@@ -16801,7 +16960,8 @@ msgid "Display the previous unread message"
 msgstr "Hiển thị thông điệp chưa đọc trước đó"
 
 #: ui/evolution-mail-message.xml.h:32
-msgid "F_orward"
+#, fuzzy
+msgid "F_orward As..."
 msgstr "_Chuyển tiếp"
 
 #: ui/evolution-mail-message.xml.h:33
@@ -17062,10 +17222,6 @@ msgstr "_Sao chép vào thư mục"
 msgid "_Create Filter From Message"
 msgstr "_Tạo bộ lọc từ thông điệp"
 
-#: ui/evolution-mail-message.xml.h:111
-msgid "_Forward Message"
-msgstr "Chuyển _tiếp thông điệp"
-
 #: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "Đ_i tới"
@@ -17601,21 +17757,21 @@ msgstr ""
 msgid "_Selection:"
 msgstr "Vùng chọn:"
 
-#: widgets/menus/gal-view-menus.c:290
+#: widgets/menus/gal-view-menus.c:292
 msgid "_Current View"
 msgstr "_Khung xem hiện thời"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:349
+#: widgets/menus/gal-view-menus.c:351
 msgid "Custom View"
 msgstr "Khung xem tự chọn"
 
-#: widgets/menus/gal-view-menus.c:358
+#: widgets/menus/gal-view-menus.c:360
 #, fuzzy
 msgid "Save Custom View..."
 msgstr "Lưu khung xem tự chọn"
 
-#: widgets/menus/gal-view-menus.c:371
+#: widgets/menus/gal-view-menus.c:373
 #, fuzzy
 msgid "Define Views..."
 msgstr "Định nghĩa khung xem"
@@ -17781,6 +17937,41 @@ msgstr "Văn bản"
 msgid "Find _Now"
 msgstr "Tìm ngay"
 
+#~ msgid "Basics"
+#~ msgstr "Cơ bản"
+
+#~ msgid "Time"
+#~ msgstr "Thời gian"
+
+#~ msgid "Su_mmary:"
+#~ msgstr "Tó_m tắt:"
+
+#, fuzzy
+#~ msgid "_Web Page:"
+#~ msgstr "Địa chỉ _Web:"
+
+#~ msgid "Select Calendar Folder"
+#~ msgstr "Chọn thư mục lịch"
+
+#~ msgid "Select Tasks Folder"
+#~ msgstr "Chọn thư mục công việc"
+
+#~ msgid "Adding alarms for %s"
+#~ msgstr "Đang thêm báo động cho %s"
+
+#~ msgid "Configure special folders and offline folder behavior here"
+#~ msgstr "Cấu hình thư mục đặc biệt và hành vi thư mục ngoại tuyến ở đây"
+
+#~ msgid "Folder Settings"
+#~ msgstr "Thư lập thư mục"
+
+#, fuzzy
+#~ msgid "New _Calendar"
+#~ msgstr "New Caledonia"
+
+#~ msgid "_Forward Message"
+#~ msgstr "Chuyển _tiếp thông điệp"
+
 #~ msgid "Account Name"
 #~ msgstr "Tên tài khoản"
 
@@ -18782,9 +18973,6 @@ msgstr "Tìm ngay"
 #~ msgid "(Untitled Message)"
 #~ msgstr "(Thông điệp không tựa)"
 
-#~ msgid "Untitled Message"
-#~ msgstr "Thông điệp không tựa"
-
 #~ msgid "Empty Message"
 #~ msgstr "Thông điệp rỗng"