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



commit a4b15f667b2c6558660da3a41bcc5c4c1c24b3e4
Author: Nguyán ThÃi Ngác Duy <pclouds gmail com>
Date:   Sat Oct 1 20:38:13 2011 +1000

    po/vi: import from Damned Lies

 po/vi.po |11617 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 5670 insertions(+), 5947 deletions(-)
---
diff --git a/po/vi.po b/po/vi.po
index 7589e6b..fb9b3be 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -3,13 +3,14 @@
 # Nguyán ThÃi Ngác Duy <pclouds gmail com>, 2002-2004,2007,2010.
 # Clytie Siddall <clytie riverland net au>, 2005-2009.
 #
+#: ../shell/main.c:570
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4 GNOME TRUNK\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution\n"
-"POT-Creation-Date: 2010-12-08 13:33+0000\n"
-"PO-Revision-Date: 2011-03-06 19:58+0700\n"
+"product=evolution&keywords=I18N+L10N\n"
+"POT-Creation-Date: 2011-09-25 16:23+0000\n"
+"PO-Revision-Date: 2011-10-01 20:38+1000\n"
 "Last-Translator: Clytie Siddall <clytie riverland net au>\n"
 "Language-Team: Vietnamese <vi-VN googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +25,8 @@ msgid ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
 msgstr ""
-" {0}  là mát sá Äáa chá chá-Äác nÃn khÃng sáa Äái ÄÆác. HÃy chán mát sá Äáa "
-"chá khÃc trong khung lá cáa à Xem LiÃn Lác."
+" {0}  là mát sá Äáa chá chá-Äác nÃn khÃng sáa Äái ÄÆác. HÃy chán mát sá "
+"Äáa chá khÃc trong khung lá cáa à Xem LiÃn Lác."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -36,22 +37,38 @@ msgstr ""
 "chá chá?"
 
 #: ../addressbook/addressbook.error.xml.h:4
+#, fuzzy
+#| msgid ""
+#| "The name or email of this contact already exists in this folder.  Would "
+#| "you like to add it anyway?"
+msgid ""
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
+msgstr ""
+"TÃn hay Äáa chá thÆ Äián tá cáa liÃn lác nÃy ÄÃ tán tái trong thÆ mác nÃy. "
+"Bán ván cÃn muán thÃm nà khÃng?"
+
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Add with duplicates"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Address '{0}' already exists."
 msgstr "Äáa chá '{0}' ÄÃ cÃ."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Cannot add new contact"
 msgstr "KhÃng thá thÃm liÃn lác mái"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Cannot move contact."
 msgstr "KhÃng thá di chuyán liÃn lác."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Category editor not available."
 msgstr "KhÃng cà bá sáa phÃn loái."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:10
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -61,19 +78,15 @@ msgstr ""
 "phÆÆng thác ÄÄng nháp ÄÆác há trá. LÆu à ráng nhiáu mát kháu phÃn biát chá "
 "hoa, chá thÆáng; và hÃy chác Äà tát phÃm Caps Lock cáa bán."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Could not get schema information for LDAP server."
 msgstr "KhÃng thá láy thÃng tin gián Äá cho mÃy chá LDAP."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Could not remove address book."
 msgstr "KhÃng thá gá bá sá Äáa chá."
 
-#: ../addressbook/addressbook.error.xml.h:11
-#| msgid ""
-#| "Currently you can access only GroupWise System Address Book from "
-#| "Evolution. Please use some other GroupWise mail client once, to get your "
-#| "GroupWise Frequent Contacts and GroupWise Personal Contacts folders."
+#: ../addressbook/addressbook.error.xml.h:13
 msgid ""
 "Currently you can only access the GroupWise System Address Book from "
 "Evolution. Please use some other GroupWise mail client once to get your "
@@ -84,53 +97,65 @@ msgstr ""
 "cÃc thÆ mác GroupWise Frequent Contacts (liÃn lác thÆáng gáp) và cÃc thÆ mác "
 "GroupWise Personal Contacts (liÃn lác cà nhÃn)."
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Delete address book '{0}'?"
 msgstr "Xoà sá Äáa chá  {0}  khÃng?"
 
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:49
-#| msgid "Do not delete"
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
 msgid "Do _Not Delete"
 msgstr "Äáng _xoÃ"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Gáp lái khi lÆu {0} vÃo {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Failed to authenticate with LDAP server."
 msgstr "Viác xÃc thác vái mÃy chá LDAP bá lái."
 
-#. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1280
+#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Failed to delete contact"
 msgstr "Lái xoà liÃn lác"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "GroupWise Address book creation:"
 msgstr "Táo Sá Äáa chá GroupWise:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "LDAP server did not respond with valid schema information."
 msgstr "MÃy chá LDAP khÃng trá lái vái thÃng tin gián Äá háp lá."
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
+#, fuzzy
+#| msgid "{0} is already in the list"
+msgid "List '{0}' is already in this contact list."
+msgstr "{0} Äà cà trong danh sÃch."
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "Skip duplicates"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:23
+msgid "Some addresses already exist in this contact list."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "CÃ lá mát sá tÃnh nÄng sá khÃng hoát Äáng vái mÃy chá hián thái cáa bán."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Sá Äáa chá Evolution ÄÃ thoÃt bát thÆáng."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "Cà ánh lán. Bán cà muán thay Äái kÃch cá nÃ, và cát giá nà khÃng?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -140,15 +165,15 @@ msgstr ""
 "hoác bá cáu hÃnh sai. HÃy hái quán trá há tháng vá nháng cÆ sá tÃm kiám ÄÆác "
 "há trá."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This address book could not be opened."
 msgstr "KhÃng thá má sá Äáa chá nÃy."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "This address book server does not have any suggested search bases."
 msgstr "MÃy chá sá Äáa chá nÃy khÃng Äá xuát cÆ sá tÃm kiám nÃo."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -156,31 +181,31 @@ msgstr ""
 "KhÃng thá tiáp cán mÃy chá sá Äáa chá nÃy, hoác tÃn mÃy chá Äà gà sai, hoác "
 "bá ngát kát nái."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "This address book will be removed permanently."
 msgstr "Sá Äáa chá nÃy sá bá gá bá hoÃn toÃn."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "This server does not support LDAPv3 schema information."
 msgstr "MÃy chá nÃy khÃng há trá thÃng tin gián Äá LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "Unable to open address book"
 msgstr "KhÃng thá má sá Äáa chá"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Unable to perform search."
 msgstr "KhÃng thá trác hián tÃm kiám."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Unable to save {0}."
 msgstr "KhÃng thá lÆu  {0} Â."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Would you like to save your changes?"
 msgstr "Bán cà muán lÆu cÃc thay Äái chá?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -189,7 +214,7 @@ msgstr ""
 "nhÆng mà khÃng thá gá bá nà khái nguán. Bán cà muán lÆu mát bán sao Äá thay "
 "thá khÃng?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:38
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -199,50 +224,60 @@ msgstr ""
 "gáp khà khÄn sá dáng trÃnh Evolution. Äá ÄÆác kát quá tát nhát, bán nÃn nÃng "
 "cáp mÃy chá lÃn mát phiÃn bán ÄÆác há trá."
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:39
+#, fuzzy
+#| msgid ""
+#| "The name or email address of this contact already exists\n"
+#| "in this folder.  Would you like to add it anyway?"
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr ""
+"Äà cà tÃn hoác Äáa chá thÆ Äián tá cáa liÃn lác nÃy\n"
+"trong thÆ mác nÃy. Bán ván muán thÃm náa chá?"
+
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Bán khÃng cà Äà quyán Äá xoà liÃn lác khái sá Äáa chá nÃy."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:41
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Bán Äà chánh sáa liÃn lác nÃy, thà cà muán lÆu cÃc thay Äái lái chá?"
 
 #. Translators: {0} is replaced with an address book name which will not be available
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:43
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "CÃc liÃn lác cáa bán cho  {0}  khÃng thá sá dáng cho tái khi khái cháy lái "
 "Evolution."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:603
-#: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:9
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:618
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_ThÃm"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "_Discard"
 msgstr "_Háy"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "_Do not save"
 msgstr "_KhÃng lÆu"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:47
 msgid "_Resize"
 msgstr "Äá_i cá"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:48
 msgid "_Use as it is"
 msgstr "_DÃng nhÆ thá"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2084
+#: ../addressbook/gui/widgets/eab-contact-display.c:715
+#: ../calendar/gui/e-calendar-view.c:2104
 msgid "Anniversary"
 msgstr "Ká niám"
 
@@ -252,53 +287,50 @@ msgstr "Ká niám"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:2083 ../capplet/anjal-settings-main.c:123
-#: ../shell/main.c:133
+#: ../addressbook/gui/widgets/eab-contact-display.c:714
+#: ../calendar/gui/e-calendar-view.c:2103 ../capplet/anjal-settings-main.c:79
+#: ../shell/main.c:140
 msgid "Birthday"
 msgstr "NgÃy sinh"
 
 #. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
-#| msgid "Blog"
 msgid "Blog:"
 msgstr "Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "_Loái.."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#| msgid "_Calendar:"
 msgid "Calendar:"
 msgstr "Lách:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:957
+#: ../addressbook/importers/evolution-vcard-importer.c:991
 msgid "Contact"
 msgstr "LiÃn lác"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:592
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:607
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:654
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:676
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2925
 msgid "Contact Editor"
 msgstr "Bá sáa liÃn lác"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:298
+#: ../addressbook/gui/merging/eab-contact-merging.c:386
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
-#: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:1019
+#: ../smime/lib/e-cert.c:837
 msgid "Email"
 msgstr "ThÆ Äián tá"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
-#| msgid "_Free/Busy:"
 msgid "Free/Busy:"
 msgstr "Ránh/Bán:"
 
@@ -307,13 +339,14 @@ msgid "Full _Name..."
 msgstr "Há tÃ_n..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:70
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:1323
+#: ../widgets/misc/e-contact-map.c:295
 msgid "Home"
 msgstr "NhÃ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-#| msgid "_Home Page:"
 msgid "Home Page:"
 msgstr "Trang chá:"
 
@@ -322,7 +355,6 @@ msgid "Image"
 msgstr "ánh"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-#| msgid "<b>Instant Messaging</b>"
 msgid "Instant Messaging"
 msgstr "Tin nhán"
 
@@ -336,7 +368,6 @@ msgstr "Äáa chá thÆ tÃn"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
-#| msgid "Miscelleneous"
 msgid "Miscellaneous"
 msgstr "Linh tinh"
 
@@ -345,18 +376,14 @@ msgid "Nic_kname:"
 msgstr "TÃn _hiáu:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:260
-#: ../plugins/groupwise-features/camel-gw-listener.c:423
-#: ../plugins/groupwise-features/camel-gw-listener.c:448
-#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "Ghi chÃ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:71
-#: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1789
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../addressbook/gui/widgets/eab-contact-display.c:79
+#: ../addressbook/gui/widgets/eab-contact-display.c:409
+#: ../calendar/gui/e-calendar-view.c:1806
 msgid "Other"
 msgstr "KhÃc"
 
@@ -369,24 +396,23 @@ msgid "Telephone"
 msgstr "Äián thoái"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-#| msgid "_Video Chat:"
 msgid "Video Chat:"
 msgstr "Trà chuyán ánh Äáng:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-#| msgid "<b>Web Addresses</b>"
 msgid "Web Addresses"
 msgstr "Äáa chá Web"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
-#| msgid "addresses"
 msgid "Web addresses"
 msgstr "Äáa chá Web"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:69
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
+#: ../addressbook/gui/widgets/eab-contact-display.c:694
+#: ../addressbook/gui/widgets/eab-contact-display.c:1320
+#: ../widgets/misc/e-contact-map.c:303
 msgid "Work"
 msgstr "Chá lÃm"
 
@@ -407,14 +433,13 @@ msgid "_Birthday:"
 msgstr "NgÃy _sinh:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
-#| msgid "Blog"
 msgid "_Blog:"
 msgstr "_Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:887
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/itip-formatter/itip-view.c:1922
+#: ../calendar/gui/dialogs/event-page.c:710
+#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../plugins/itip-formatter/itip-view.c:1963
 msgid "_Calendar:"
 msgstr "_Lách:"
 
@@ -493,74 +518,74 @@ msgid "_Zip/Postal Code:"
 msgstr "MÃ _bÆu Äián:"
 
 # Name: don't translate / TÃn: Äáng dách
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:539
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:544
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:661
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:543
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:546
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:662
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
+#: ../addressbook/gui/widgets/eab-gui-util.c:469
 msgid "Error adding contact"
 msgstr "Gáp lái khi thÃm liÃn lác"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
 msgid "Error modifying contact"
 msgstr "Gáp lái khi sáa Äái liÃn lác"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Error removing contact"
 msgstr "Gáp lái khi gá bá liÃn lác"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:602
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2602
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:670
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2919
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Bá sáa liÃn lác â %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3025
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3398
 msgid "Please select an image for this contact"
 msgstr "HÃy chán ánh cho liÃn lác nÃy"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3026
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3399
 msgid "_No image"
 msgstr "KhÃ_ng cà ánh"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3299
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3730
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -568,43 +593,43 @@ msgstr ""
 "Dá liáu liÃn lác khÃng háp lá:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3303
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr " %s  cà Äánh dáng khÃng háp lá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3743
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s %s  cà Äánh dáng khÃng háp lá"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3325
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3336
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3756
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3770
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s %s  là ráng"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3785
 msgid "Invalid contact."
 msgstr "LiÃn lác khÃng háp lá."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:437
 msgid "Contact Quick-Add"
 msgstr "ThÃm nhanh liÃn lác"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:440
 msgid "_Edit Full"
 msgstr "_Sáa Äáy"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:488
 msgid "_Full name"
 msgstr "_Há tÃn"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:499
 msgid "E_mail"
 msgstr "_ThÆ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
 msgid "_Select Address Book"
 msgstr "Chán _Sá Äáa chá"
 
@@ -674,12 +699,11 @@ msgid "_Suffix:"
 msgstr "_Háu tá:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:659
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:742
 msgid "Contact List Editor"
 msgstr "Bá sáa danh sÃch liÃn lác"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
-#| msgid "_Members"
 msgid "Members"
 msgstr "ThÃnh viÃn"
 
@@ -692,7 +716,7 @@ msgid "_List name:"
 msgstr "TÃn _danh sÃch:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:163
 msgid "_Select..."
 msgstr "_Chán..."
 
@@ -700,44 +724,48 @@ msgstr "_Chán..."
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Nháp Äáa chá _thÆ hoác kÃo liÃn lác vÃo danh sÃch dÆái ÄÃy:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:865
 msgid "Contact List Members"
 msgstr "ThÃnh viÃn danh sÃch"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:907
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1322
-msgid "_Members"
-msgstr "ThÃnh _viÃn"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1160
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1440
 msgid "Error adding list"
 msgstr "Gáp lái khi thÃm danh sÃch"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1174
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1455
 msgid "Error modifying list"
 msgstr "Gáp lái khi sáa Äái danh sÃch"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1188
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1470
 msgid "Error removing list"
 msgstr "Gáp lái khi gá bá danh sÃch"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1601
+msgid "_Members"
+msgstr "ThÃnh _viÃn"
+
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "LiÃn lác ÄÃ Äái:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
+#. Translators: Heading of the contact which has same name or email address in this folder already.
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
 msgid "Conflicting Contact:"
 msgstr "LiÃn lác xung Äát:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "PhÃt hián liÃn lác trÃng"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
+#, fuzzy
+#| msgid ""
+#| "The name or email of this contact already exists in this folder.  Would "
+#| "you like to add it anyway?"
 msgid ""
-"The name or email of this contact already exists in this folder.  Would you "
-"like to add it anyway?"
+"The name or email of this contact already exists in this folder. Would you "
+"like to save the changes anyway?"
 msgstr ""
 "TÃn hay Äáa chá thÆ Äián tá cáa liÃn lác nÃy ÄÃ tán tái trong thÆ mác nÃy. "
 "Bán ván cÃn muán thÃm nà khÃng?"
@@ -759,141 +787,106 @@ msgstr ""
 "trong thÆ mác nÃy. Bán ván muán thÃm náa chá?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:244
+#: ../addressbook/gui/merging/eab-contact-merging.c:332
 msgid "_Merge"
 msgstr "T_rán"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:169
-#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
-#, c-format
-msgid "Cancelled"
-msgstr "Bá thÃi"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:227
+#: ../addressbook/gui/merging/eab-contact-merging.c:315
 msgid "Merge Contact"
 msgstr "Trán liÃn lác"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
-#: ../modules/calendar/e-cal-shell-view-actions.c:1691
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Any field contains"
 msgstr "TrÆáng nÃo cháa"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Email begins with"
 msgstr "Äáa chá thÆ bát Äáu báng"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
 msgid "Name contains"
 msgstr "TÃn cháa"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:149
+#: ../addressbook/gui/widgets/e-addressbook-model.c:157
 msgid "No contacts"
 msgstr "KhÃng cà liÃn lác"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:161
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d liÃn lác"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:327
+#: ../addressbook/gui/widgets/e-addressbook-model.c:357
 msgid "Error getting book view"
 msgstr "Gáp lái khi gái à xem sá"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:740
-#| msgid "Search Filter"
+#: ../addressbook/gui/widgets/e-addressbook-model.c:771
 msgid "Search Interrupted"
 msgstr "TÃm kiám bá ngát"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:158
 msgid "Error modifying card"
 msgstr "Gáp lái khi sáa Äái thá"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
-#| msgid "Cut selected text to the clipboard"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Cut selected contacts to the clipboard"
 msgstr "Cát liÃn lác ÄÃ chán vÃo báng nhÃp"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#| msgid "Copy selected text to the clipboard"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Copy selected contacts to the clipboard"
 msgstr "ChÃp liÃn lác ÄÃ chán sang báng nhÃp"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
-#| msgid "Paste tasks from the clipboard"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
 msgid "Paste contacts from the clipboard"
 msgstr "DÃn liÃn lác tá báng nhÃp"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:646
-#: ../modules/addressbook/e-book-shell-view-actions.c:745
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "Delete selected contacts"
 msgstr "Xoà cÃc liÃn lác Äà chán"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:652
-#| msgid "Select all contacts"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:648
 msgid "Select all visible contacts"
 msgstr "Chán mái liÃn lác hián dián"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
-#| msgid ""
-#| "Are you sure you want\n"
-#| "to delete these contact lists?"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Bán cà chác muán xoà nháng danh sÃch liÃn lác nÃy khÃng?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
-#| msgid ""
-#| "Are you sure you want\n"
-#| "to delete these contact lists?"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Bán cà chác muán xoà danh sÃch liÃn lác nÃy khÃng?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
 #, c-format
-#| msgid ""
-#| "Are you sure you want\n"
-#| "to delete contact list (%s)?"
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Bán cà chác muán xoà danh sÃch liÃn lác nÃy (%s) khÃng?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
-#| msgid ""
-#| "Are you sure you want\n"
-#| "to delete these contacts?"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1340
 msgid "Are you sure you want 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/widgets/e-addressbook-view.c:1316
-#| msgid ""
-#| "Are you sure you want\n"
-#| "to delete these contacts?"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1344
 msgid "Are you sure you want to delete this contact?"
 msgstr "Bán cà chác muán xoà liÃn lác nÃy khÃng?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1348
 #, c-format
-#| msgid ""
-#| "Are you sure you want\n"
-#| "to delete contact (%s)?"
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Bán cà chác muán xoà liÃn lác nÃy (%s) khÃng?"
 
-#. Translators: This is shown for more than 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#. Translators: This is shown for > 5 contacts.
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1504
 #, c-format
-#| msgid ""
-#| "Opening %d contact will open %d new window as well.\n"
-#| "Do you really want to display this contact?"
-#| msgid_plural ""
-#| "Opening %d contacts will open %d new windows as well.\n"
-#| "Do you really want to display all of these contacts?"
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
@@ -904,16 +897,16 @@ msgstr[0] ""
 "Má %d liÃn lác sá má %d cáa sá mái cÃng lÃc.\n"
 "Bán cà thát sá muán hián thá tát cá liÃn lác nÃy khÃng?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1512
 msgid "_Don't Display"
 msgstr "Äá_ng hián"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
 msgid "Display _All Contacts"
 msgstr "Hián _mái liÃn lác"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
 msgid "Assistant"
 msgstr "Phá tÃ"
 
@@ -942,7 +935,7 @@ msgid "Car Phone"
 msgstr "Äián thoái xe"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -950,7 +943,7 @@ msgid "Categories"
 msgstr "Loái"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
 msgid "Company"
 msgstr "CÃng ty"
 
@@ -999,22 +992,22 @@ msgid "Journal"
 msgstr "Nhát kÃ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
 msgid "Manager"
 msgstr "Quán lÃ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
+#: ../addressbook/gui/widgets/eab-contact-display.c:712
 msgid "Mobile Phone"
 msgstr "Äián thoái di Äáng"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Nickname"
 msgstr "TÃn hiáu"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../addressbook/gui/widgets/eab-contact-display.c:739
 msgid "Note"
 msgstr "Ghi chÃ"
 
@@ -1043,13 +1036,13 @@ msgid "Radio"
 msgstr "RaÄiÃ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:571
+#: ../calendar/gui/e-meeting-list-view.c:610
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Vai trÃ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:584
+#: ../addressbook/gui/widgets/eab-contact-display.c:716
 msgid "Spouse"
 msgstr "Vá/Cháng"
 
@@ -1079,7 +1072,7 @@ msgstr "ÄÆn vá"
 msgid "Web Site"
 msgstr "Chá Web"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1089,7 +1082,7 @@ msgstr ""
 "\n"
 "Äang tÃm kiám cÃc LiÃn lác..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1103,7 +1096,7 @@ msgstr ""
 "\n"
 "hay nháp ÄÃp vÃo ÄÃy Äá táo liÃn lác mái."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:192
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1117,7 +1110,7 @@ msgstr ""
 "\n"
 "Nháp ÄÃp vÃo ÄÃy Äá táo liÃn lác mái."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
 msgid ""
 "\n"
 "\n"
@@ -1127,7 +1120,7 @@ msgstr ""
 "\n"
 "TÃm kiám liÃn lác."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:198
+#: ../addressbook/gui/widgets/e-minicard-view.c:204
 msgid ""
 "\n"
 "\n"
@@ -1137,147 +1130,140 @@ msgstr ""
 "\n"
 "KhÃng cà mác nÃo Äá xem trong khung nhÃn nÃy."
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "Äáa chá thÆ á chá lÃm"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "Äáa chá thÆ á nhÃ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
-#: ../addressbook/gui/widgets/e-minicard.c:808
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:819
 msgid "Other Email"
 msgstr "Äáa chá thÆ khÃc"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:184
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../addressbook/gui/widgets/ea-minicard-view.c:187
 msgid "evolution address book"
 msgstr "sá Äáa chá Evolution"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
 msgid "New Contact"
 msgstr "LiÃn lác mái"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+#: ../addressbook/gui/widgets/ea-minicard-view.c:37
 msgid "New Contact List"
 msgstr "Danh sÃch liÃn lác mái"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:167
+#: ../addressbook/gui/widgets/ea-minicard-view.c:170
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "thÆ mác sá Äáa chá hián thái %s cà %d thá"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:31
+#: ../addressbook/gui/widgets/ea-minicard.c:34
 msgid "Open"
 msgstr "Má"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:153
+#: ../addressbook/gui/widgets/ea-minicard.c:156
 msgid "Contact List: "
 msgstr "Danh sÃch liÃn lác: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:154
+#: ../addressbook/gui/widgets/ea-minicard.c:157
 msgid "Contact: "
 msgstr "LiÃn lác: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:180
+#: ../addressbook/gui/widgets/ea-minicard.c:183
 msgid "evolution minicard"
 msgstr "thá tà tá evolution"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:182
 msgid "Copy _Email Address"
 msgstr "ChÃp Äáa chá _thÆ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:395
-#| msgid "Copy selected messages to the clipboard"
+#: ../addressbook/gui/widgets/eab-contact-display.c:184
+#: ../widgets/misc/e-web-view.c:432
 msgid "Copy the email address to the clipboard"
 msgstr "ChÃp Äáa chá thÆ vÃo báng nhÃp"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:400
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../widgets/misc/e-web-view.c:437
 msgid "_Send New Message To..."
 msgstr "_Gái thÆ mái cho..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:402
-#| msgid "Send e-mail message to mailing list?"
+#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../widgets/misc/e-web-view.c:439
 msgid "Send a mail message to this address"
 msgstr "Gái thÆ Äán Äáa chá nÃy"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:258
-#: ../addressbook/gui/widgets/eab-contact-display.c:260
-msgid "(map)"
-msgstr "(bán Äá)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:278
-#: ../addressbook/gui/widgets/eab-contact-display.c:289
-msgid "map"
-msgstr "bán Äá"
+#: ../addressbook/gui/widgets/eab-contact-display.c:215
+#, fuzzy
+#| msgid "Open"
+msgid "Open map"
+msgstr "Má"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:415
-#: ../addressbook/gui/widgets/eab-contact-display.c:778
-msgid "List Members"
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#, fuzzy
+#| msgid "List Members"
+msgid "List Members:"
 msgstr "ThÃnh viÃn danh sÃch"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
 msgid "Department"
 msgstr "PhÃng ban"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
 msgid "Profession"
 msgstr "Nghá nghiáp"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
 msgid "Position"
 msgstr "Vá trÃ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
 msgid "Video Chat"
 msgstr "Trà chuyán ánh Äáng"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:376
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:497
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:687
+#: ../calendar/gui/dialogs/calendar-setup.c:449
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
+#: ../modules/calendar/e-cal-shell-view.c:513
+#: ../modules/online-accounts/e-online-accounts-google.c:294
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:499
+#: ../widgets/misc/e-send-options.c:528
 msgid "Calendar"
 msgstr "Lách"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:563
-#: ../calendar/gui/dialogs/event-editor.c:127
-#: ../calendar/gui/dialogs/event-editor.c:354
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../addressbook/gui/widgets/eab-contact-display.c:688
+#: ../calendar/gui/dialogs/event-editor.c:123
+#: ../calendar/gui/dialogs/event-editor.c:350
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Ránh/Bán"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:689
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
 msgid "Phone"
 msgstr "Äián thoái"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:565
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
 msgid "Fax"
 msgstr "Äián thÆ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:691
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
 msgid "Address"
 msgstr "Äáa chá"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
 msgid "Home Page"
 msgstr "Trang chá"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
 msgid "Web Log"
 msgstr "Nhát kà Web"
 
@@ -1285,38 +1271,42 @@ msgstr "Nhát kà Web"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:366
-#: ../modules/addressbook/e-book-shell-backend.c:116
-#: ../modules/addressbook/e-book-shell-migrate.c:143
-#: ../modules/calendar/e-cal-shell-backend.c:132
-#: ../modules/calendar/e-cal-shell-migrate.c:159
-#: ../modules/calendar/e-memo-shell-backend.c:116
-#: ../modules/calendar/e-memo-shell-migrate.c:117
-#: ../modules/calendar/e-task-shell-backend.c:116
-#: ../modules/calendar/e-task-shell-migrate.c:126
+#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../capplet/settings/mail-capplet-shell.c:385
+#: ../modules/addressbook/e-book-shell-backend.c:120
+#: ../modules/addressbook/e-book-shell-migrate.c:144
+#: ../modules/calendar/e-cal-shell-backend.c:138
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-memo-shell-backend.c:122
+#: ../modules/calendar/e-memo-shell-migrate.c:120
+#: ../modules/calendar/e-task-shell-backend.c:122
+#: ../modules/calendar/e-task-shell-migrate.c:132
 msgid "Personal"
 msgstr "CÃ nhÃn"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:796
+#: ../addressbook/gui/widgets/eab-contact-display.c:986
+msgid "List Members"
+msgstr "ThÃnh viÃn danh sÃch"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1004
 msgid "Job Title"
 msgstr "TÃn nghá"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:833
+#: ../addressbook/gui/widgets/eab-contact-display.c:1041
 msgid "Home page"
 msgstr "Trang chá"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:842
+#: ../addressbook/gui/widgets/eab-contact-display.c:1050
 msgid "Blog"
 msgstr "Nhát kà Web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1011
-#: ../widgets/misc/e-web-view.c:852
+#: ../addressbook/gui/widgets/eab-contact-display.c:1248
+#: ../widgets/misc/e-web-view.c:980
 #, c-format
 msgid "Click to mail %s"
 msgstr "Nhán Äá gái thÆ cho %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1326,7 +1316,7 @@ msgstr ""
 "dáng ngoái tuyán, hoác chÆa ÄÆác tái vá Äá sá dáng ngoái tuyán. HÃy náp sá "
 "Äáa chá nÃy mát lán trong chá Äá trác tuyán Äá tái vá nái dung cáa nÃ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:98
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1335,7 +1325,7 @@ msgstr ""
 "Sá Äáa chá nÃy khÃng má ÄÆác. HÃy kiám tra ÄÆáng dán %s ván cÃn tán tái và "
 "Äát quyán hán cho phÃp truy cáp."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:111
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1343,7 +1333,7 @@ msgstr ""
 "PhiÃn bán Evolution nÃy khÃng cà há trá LDAP ÄÆác biÃn dách vÃo. Äá sá dáng "
 "LDAP trong Evolution, mát gÃi Evolution hiáu lác LDAP phái ÄÆác cÃi Äát."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:120
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1351,11 +1341,11 @@ msgstr ""
 "Sá Äáa chá nÃy khÃng má ÄÆác. Cà nghÄa là hoác Äáa chá URI bá gà sai, hoác "
 "khÃng thá tiáp cán mÃy chá."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
 msgid "Detailed error message:"
 msgstr "ThÃng Äiáp lái chi tiát:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:209
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1369,7 +1359,7 @@ msgstr ""
 "hoác tÄng giái hán kát quá trong cÃc tÃy chán\n"
 "phác vá sá ghi ngÆái dÃng Äái vái sá Äáa chá nÃy."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#: ../addressbook/gui/widgets/eab-gui-util.c:216
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1383,161 +1373,175 @@ msgstr ""
 "phác vá sá ghi ngÆái dÃng Äái vái sá Äáa chá nÃy."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 #, c-format
-#| msgid "The backend for this address book was unable to parse this query."
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr ""
-"Háu phÆÆng cho sá Äáa chá nÃy khÃng thá phÃn tÃch cà phÃp cáa truy ván nÃy. %"
-"s"
+"Háu phÆÆng cho sá Äáa chá nÃy khÃng thá phÃn tÃch cà phÃp cáa truy ván nÃy. "
+"%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
 #, c-format
-#| msgid "The backend for this address book refused to perform this query."
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "Háu phÆÆng cho sá Äáa chá nÃy ÄÃ tá chái thác hián truy ván nÃy. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:241
 #, c-format
-#| msgid "This query did not complete successfully."
 msgid "This query did not complete successfully. %s"
 msgstr "Truy ván khÃng hoÃn tát. %s"
 
 # Filename: do not translate/ tÃn táp tin: Äáng dách
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:202
+#: ../addressbook/gui/widgets/eab-gui-util.c:263
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:242
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
 msgid "Select Address Book"
 msgstr "Chán Sá Äáa chá"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
 msgid "list"
 msgstr "danh sÃch"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:441
+#: ../addressbook/gui/widgets/eab-gui-util.c:552
 msgid "Move contact to"
 msgstr "Chuyán liÃn lác sang"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:443
+#: ../addressbook/gui/widgets/eab-gui-util.c:554
 msgid "Copy contact to"
 msgstr "ChÃp liÃn lác sang"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:446
+#: ../addressbook/gui/widgets/eab-gui-util.c:557
 msgid "Move contacts to"
 msgstr "Chuyán cÃc liÃn lác sang"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:448
+#: ../addressbook/gui/widgets/eab-gui-util.c:559
 msgid "Copy contacts to"
 msgstr "ChÃp cÃc liÃn lác sang"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
 msgid "Card View"
 msgstr "Xem thá"
 
-#: ../addressbook/importers/evolution-csv-importer.c:721
-#: ../addressbook/importers/evolution-ldif-importer.c:519
-#: ../addressbook/importers/evolution-vcard-importer.c:278
-#: ../calendar/importers/icalendar-importer.c:325
-#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:748
+#: ../addressbook/importers/evolution-ldif-importer.c:546
+#: ../addressbook/importers/evolution-vcard-importer.c:280
+#: ../calendar/importers/icalendar-importer.c:413
+#: ../calendar/importers/icalendar-importer.c:902
+#: ../calendar/importers/icalendar-importer.c:941 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Äang nháp..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1021
+#: ../addressbook/importers/evolution-csv-importer.c:1072
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "CSV hay Tab kiáu Outlook (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1022
+#: ../addressbook/importers/evolution-csv-importer.c:1073
 msgid "Outlook CSV and Tab Importer"
 msgstr "Bá nháp CSV vá Tab Outlook"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1030
+#: ../addressbook/importers/evolution-csv-importer.c:1081
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "CSV hay Tab kiáu Mozilla (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1031
+#: ../addressbook/importers/evolution-csv-importer.c:1082
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Bá Nháp CSV và Tab Mozilla"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1039
+#: ../addressbook/importers/evolution-csv-importer.c:1090
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "CSV hay Tab kiáu Evolution (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1040
+#: ../addressbook/importers/evolution-csv-importer.c:1091
 msgid "Evolution CSV and Tab Importer"
 msgstr "Bá nháp CSV vá Tab Evolution"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:757
+#: ../addressbook/importers/evolution-ldif-importer.c:796
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Äánh dáng chuyán Äái lán nhau dá liáu LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:758
+#: ../addressbook/importers/evolution-ldif-importer.c:797
 msgid "Evolution LDIF importer"
 msgstr "Bá nháp LDIF Evolution"
 
 # Name: do not translate/ tÃn: Äáng dách
-#: ../addressbook/importers/evolution-vcard-importer.c:646
+#: ../addressbook/importers/evolution-vcard-importer.c:658
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:647
+#: ../addressbook/importers/evolution-vcard-importer.c:659
 msgid "Evolution vCard Importer"
 msgstr "Bá nháp vCard Evolution"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:746
+#: ../addressbook/printing/e-contact-print.c:719
 #, c-format
-#| msgid "Page"
 msgid "Page %d"
 msgstr "Trang %d"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
 msgid "Can not open file"
 msgstr "KhÃng thá má táp tin"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
-msgid "Couldn't get list of address books"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#, fuzzy, c-format
+#| msgid "Couldn't get list of address books"
+msgid "Couldn't get list of address books: %s"
 msgstr "KhÃng thá láy danh sÃch cÃc sá Äáa chá"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
-msgid "failed to open book"
-msgstr "viác má sá bá lái"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#: ../calendar/gui/dialogs/event-page.c:2923
+#: ../calendar/gui/dialogs/memo-page.c:938
+#: ../calendar/gui/dialogs/task-page.c:1759 ../em-format/em-format.c:2324
+#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:658
+#: ../plugins/caldav/caldav-browse-server.c:220
+#: ../plugins/caldav/caldav-browse-server.c:1469 ../plugins/face/face.c:174
+#: ../smime/gui/certificate-manager.c:314
+msgid "Unknown error"
+msgstr "Lái lá"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#, fuzzy, c-format
+#| msgid "Failed to load the calendar '%s'"
+msgid "Failed to open client '%s': %s"
+msgstr "Lái náp lách  %s Â"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Specify the output file instead of standard output"
 msgstr "Ghi rà táp tin xuát thay vÃo thiát bá xuát chuán"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "OUTPUTFILE"
 msgstr "TáP_TIN_XUáT"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "List local address book folders"
 msgstr "Liát kà cÃc thÆ mác sá Äáa chá các bá"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "Show cards as vcard or csv file"
 msgstr ""
 "Hián thá mái thá kiáu táp tin vCard (thá áo) hoác .csv (Äánh giái báng dáu "
 "pháy)"
 
 # Format name: do not translate/ tÃn dáng thác: Äáng dách
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:68
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:70
+#: ../addressbook/tools/evolution-addressbook-export.c:71
 msgid "Export in asynchronous mode"
 msgstr "Xuát theo chá Äá khÃng Äáng bá"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:73
+#: ../addressbook/tools/evolution-addressbook-export.c:74
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -1545,58 +1549,33 @@ msgstr ""
 "Sá thá trong mát táp tin kát xuát riÃng lá á chá Äá khÃng Äáng bá: kÃch cá "
 "mác Äánh là 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:75
+#: ../addressbook/tools/evolution-addressbook-export.c:76
 msgid "NUMBER"
 msgstr "Sá"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:137
+#: ../addressbook/tools/evolution-addressbook-export.c:139
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Lái Äái sá dÃng lánh, hÃy dÃng tÃy chán  --help  (trá giÃp) Äá xem cÃch sá "
 "dáng ÄÃng."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:151
+#: ../addressbook/tools/evolution-addressbook-export.c:153
 msgid "Only support csv or vcard format."
 msgstr "Chá há trá Äánh dáng .csv hoác vCard (thá áo)."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:160
+#: ../addressbook/tools/evolution-addressbook-export.c:162
 msgid "In async mode, output must be file."
 msgstr "Trong chá Äá khÃng Äáng bá, kát xuát phái là táp tin."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:168
+#: ../addressbook/tools/evolution-addressbook-export.c:170
 msgid "In normal mode, there is no need for the size option."
 msgstr "Trong chá Äá thÆáng, khÃng cán tÃy chán vá kÃch thÆác."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:199
+#: ../addressbook/tools/evolution-addressbook-export.c:201
 msgid "Unhandled error"
 msgstr "Lái khÃng ÄÆác quán lÃ"
 
-#: ../addressbook/util/addressbook.c:103
-msgid "Accessing LDAP Server anonymously"
-msgstr "Truy cáp và danh tái mÃy chá LDAP"
-
-#: ../addressbook/util/addressbook.c:215
-#: ../plugins/groupwise-features/camel-gw-listener.c:526
-msgid "Failed to authenticate.\n"
-msgstr "Viác xÃc thác bá lái.\n"
-
-#: ../addressbook/util/addressbook.c:222
-#: ../plugins/groupwise-features/camel-gw-listener.c:506
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "HÃy gà mát kháu cho %s (ngÆái dÃng %s)"
-
-#: ../addressbook/util/addressbook.c:230
-#: ../calendar/common/authentication.c:53
-#: ../calendar/gui/e-meeting-store.c:1770
-#: ../plugins/caldav/caldav-browse-server.c:922
-#: ../plugins/google-account-setup/google-source.c:439
-#: ../plugins/publish-calendar/publish-calendar.c:332
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "GÃ mát kháu"
-
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
@@ -1612,13 +1591,10 @@ msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
 msgstr ""
-" {0}  là mát lách chá-Äác thà khÃng sáa Äái ÄÆác. HÃy chán mát lách khÃc mà "
-"cà khá nÄng cháp nhán cuác hán."
+" {0}  là mát lách chá-Äác thà khÃng sáa Äái ÄÆác. HÃy chán mát lách khÃc "
+"mà cà khá nÄng cháp nhán cuác hán."
 
 #: ../calendar/calendar.error.xml.h:5
-#| msgid ""
-#| "Adding a meaningful summary to your appointment will give your recipients "
-#| "an idea of what your appointment is about."
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
@@ -1627,9 +1603,6 @@ msgstr ""
 "sÆ lÆác vá cuác hán nÃy."
 
 #: ../calendar/calendar.error.xml.h:6
-#| msgid ""
-#| "Adding a meaningful summary to your task will give your recipients an "
-#| "idea of what your task is about."
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
@@ -1682,7 +1655,6 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Bán cà chác muán xoà cuác hán tÃn  {0}  khÃng?"
 
 #: ../calendar/calendar.error.xml.h:17
-#| msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgid "Are you sure you want to delete the meeting titled '{0}'?"
 msgstr "Bán cà chác muán xoà cuác háp tÃn '{0}' chá?"
 
@@ -1707,25 +1679,24 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Bán cà chác muán xoà cuác hán nÃy khÃng?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:187
+#: ../calendar/gui/dialogs/delete-comp.c:191
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Bán cà chác muán xoà cuác háp nÃy khÃng?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:193
+#: ../calendar/gui/dialogs/delete-comp.c:197
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Bán cà chác muán xoà bán ghi nhá nÃy khÃng?"
 
 #: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:190
+#: ../calendar/gui/dialogs/delete-comp.c:194
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Bán cà chác muán xoà tÃc vá nÃy khÃng?"
 
 #: ../calendar/calendar.error.xml.h:26
-#| msgid "Are you sure you want to send the appointment without a summary?"
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "Bán cà chác muán lÆu cuác hán mà khÃng cà tÃm tát gà khÃng?"
 
@@ -1734,7 +1705,6 @@ msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Bán cà chác muán lÆu bán ghi nhá khÃng cà tÃm tát khÃng?"
 
 #: ../calendar/calendar.error.xml.h:28
-#| msgid "Are you sure you want to send the task without a summary?"
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "Bán cà chác muán lÆu mát tÃc vá mà khÃng cà tÃm tát gà khÃng?"
 
@@ -1803,7 +1773,6 @@ msgstr "Gáp lái khi náp danh sÃch tÃc vá"
 #. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
 #. {1} is replaced with a calendar/task/memo list name, where the error happened
 #: ../calendar/calendar.error.xml.h:46
-#| msgid "Error on '{0}'"
 msgid "Error on {0}: {1}"
 msgstr "Gáp lái vái {0}: {1}"
 
@@ -1912,7 +1881,6 @@ msgid "Would you like to save your changes to this appointment?"
 msgstr "Bán cà muán lÆu cÃc thay Äái cáa cuác hán nÃy khÃng?"
 
 #: ../calendar/calendar.error.xml.h:66
-#| msgid "Would you like to save your changes to this memo?"
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Bán cà muán lÆu cÃc thay Äái trong ghi nhá nÃy khÃng?"
 
@@ -1964,7 +1932,6 @@ msgid "You have changed this appointment, but not yet saved it."
 msgstr "Bán ÄÃ sáa Äái cuác hán nÃy, nhÆng chÆa lÆu lái."
 
 #: ../calendar/calendar.error.xml.h:77
-#| msgid "You have changed this task, but not yet saved it."
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Bán ÄÃ sáa Äái cuác háp nÃy, nhÆng chÆa lÆu lái."
 
@@ -1993,11 +1960,11 @@ msgstr ""
 "CÃc tÃc vá cáa bán sá khÃng sán sÃng cho Äán khi bán khái Äáng lái Evolution."
 
 #: ../calendar/calendar.error.xml.h:83
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "_Háy thay Äái"
 
-#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:271
+#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
 msgid "_Save"
 msgstr "_LÆu"
 
@@ -2006,7 +1973,7 @@ msgid "_Save Changes"
 msgstr "_LÆu thay Äái"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:156
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Gái"
@@ -2015,24 +1982,32 @@ msgstr "_Gái"
 msgid "_Send Notice"
 msgstr "_Gái thÃng bÃo"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:107
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "phÃt"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
-#| msgid "hours"
-#| msgid_plural "hours"
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "giá"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:286
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:133
+#: ../calendar/gui/dialogs/recurrence-page.c:1190
+#, fuzzy
+#| msgid "day"
+msgid "day"
+msgid_plural "days"
+msgstr[0] "ngÃy"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:313
 msgid "Start time"
 msgstr "Thái Äiám Äáu:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "Cuác hán"
 
@@ -2042,9 +2017,9 @@ msgstr "Háy tát _cá"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
-#: ../plugins/itip-formatter/itip-view.c:1044
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1739
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1749
+#: ../plugins/itip-formatter/itip-view.c:1052
 msgid "Location:"
 msgstr "Äáa Äiám:"
 
@@ -2052,7 +2027,7 @@ msgstr "Äáa Äiám:"
 msgid "Snooze _time:"
 msgstr "_Thái gian chá ngán:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:882
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:919
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "_Háy"
@@ -2061,56 +2036,65 @@ msgstr "_Háy"
 msgid "_Snooze"
 msgstr "_Chá tÃ"
 
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:454
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
+#: ../plugins/google-account-setup/google-contacts-source.c:387
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+msgid "days"
+msgstr "ngÃy"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:427
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:453
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:375
-#| msgid "hours"
-#| msgid_plural "hours"
+#: ../plugins/google-account-setup/google-contacts-source.c:386
 msgid "hours"
 msgstr "giá"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
 msgstr "Äáa Äiám cuác hán"
 
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:426
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:452
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:374
+#: ../plugins/google-account-setup/google-contacts-source.c:385
 msgid "minutes"
 msgstr "phÃt"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
 msgid "No summary available."
 msgstr "KhÃng cà tÃm tát"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
 msgid "No description available."
 msgstr "KhÃng cà mà tá."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1607
 msgid "No location information available."
 msgstr "KhÃng cà thÃng tin vá Äáa Äiám."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
-#, c-format
-#| msgid "You have %d alarms"
-msgid "You have %d alarm"
-msgid_plural "You have %d alarms"
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
+#, fuzzy, c-format
+#| msgid "You have %d alarm"
+#| msgid_plural "You have %d alarms"
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
 msgstr[0] "Bán cà %d bÃo Äáng"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1853
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
 msgid "Warning"
 msgstr "Cánh bÃo"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1857
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2122,7 +2106,7 @@ msgstr ""
 "cáu hÃnh Äá gái thÆ. Thay vÃo ÄÃ, Evolution\n"
 "sá hián thá mát háp thoái nhác nhá thÃng thÆáng."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1894
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2139,25 +2123,25 @@ 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:1752
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1909
 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/util.c:44
+#: ../calendar/gui/alarm-notify/util.c:45
 msgid "invalid time"
 msgstr "Thái gian khÃng háp lá"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
-#: ../calendar/gui/misc.c:116
+#: ../calendar/gui/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/misc.c:118
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d giá"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
-#: ../calendar/gui/misc.c:122
+#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
+#: ../calendar/gui/misc.c:124
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2166,31 +2150,26 @@ msgstr[0] "%d phÃt"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
-#: ../calendar/gui/misc.c:126
+#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:417
+#: ../calendar/gui/misc.c:128
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d giÃy"
 
-#: ../calendar/gui/cal-editor-utils.c:105
-#| msgid "Invalid contact."
-msgid "Invalid object"
-msgstr "Äái tÆáng khÃng háp"
-
-#: ../calendar/gui/calendar-view-factory.c:117
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Day View"
 msgstr "Xem ngÃy"
 
-#: ../calendar/gui/calendar-view-factory.c:120
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Work Week View"
 msgstr "Xem tuán lÃm viác"
 
-#: ../calendar/gui/calendar-view-factory.c:123
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Week View"
 msgstr "Xem tuán"
 
-#: ../calendar/gui/calendar-view-factory.c:126
+#: ../calendar/gui/calendar-view-factory.c:125
 msgid "Month View"
 msgstr "Xem thÃng"
 
@@ -2219,16 +2198,16 @@ msgstr "Loái"
 msgid "Classification"
 msgstr "PhÃn loái"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:780 ../calendar/gui/e-task-table.c:495
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:243
+#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-task-table.c:504
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Mát"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/misc/e-attachment-tree-view.c:524
+#: ../modules/plugin-manager/evolution-plugin-manager.c:71
+#: ../widgets/misc/e-attachment-tree-view.c:526
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "MÃ tá"
@@ -2250,9 +2229,9 @@ msgstr "Tán tái"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:835
+#: ../plugins/publish-calendar/publish-calendar.c:863
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:397
 msgid "Location"
 msgstr "Äáa chá"
 
@@ -2261,21 +2240,21 @@ msgstr "Äáa chá"
 msgid "Organizer"
 msgstr "Bá tá chác:"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
-#: ../calendar/gui/e-cal-model.c:778 ../calendar/gui/e-task-table.c:494
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:503
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "RiÃng tÆ"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
-#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-cal-model.c:776
-#: ../calendar/gui/e-task-table.c:493 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:763 ../calendar/gui/e-cal-model.c:770
+#: ../calendar/gui/e-task-table.c:502 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "CÃng cáng"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:321
-#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../calendar/gui/dialogs/event-editor.c:317
+#: ../calendar/gui/dialogs/event-editor.c:338
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Äánh ká"
@@ -2285,7 +2264,7 @@ msgstr "Äánh ká"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Summary"
 msgstr "TÃm tát"
 
@@ -2314,58 +2293,64 @@ msgstr "báng"
 msgid "is not"
 msgstr "khÃng phái"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:626
-msgid "Edit Alarm"
-msgstr "Sáa BÃo Äáng"
+#: ../calendar/gui/dialogs/alarm-dialog.c:636
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Edit Reminder"
+msgstr "âââ Nhác nhá âââ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:817
-#: ../calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/dialogs/alarm-dialog.c:827
+#: ../calendar/gui/e-alarm-list.c:447
 msgid "Pop up an alert"
 msgstr "Bát lÃn bÃo Äáng"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:818
-#: ../calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/dialogs/alarm-dialog.c:828
+#: ../calendar/gui/e-alarm-list.c:443
 msgid "Play a sound"
 msgstr "PhÃt Ãm thanh"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:819
-#: ../calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/dialogs/alarm-dialog.c:829
+#: ../calendar/gui/e-alarm-list.c:455
 msgid "Run a program"
 msgstr "Cháy chÆÆng trÃnh"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:820
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/dialogs/alarm-dialog.c:830
+#: ../calendar/gui/e-alarm-list.c:451
 msgid "Send an email"
 msgstr "Gái thÆ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Alarm"
-msgstr "ThÃm BÃo Äáng"
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Add Reminder"
+msgstr "âââ Nhác nhá âââ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:364
-#| msgid "Alarms"
-msgid "Alarm"
-msgstr "BÃo Äáng"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "ThÆ tá _chán"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Custom alarm sound"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+#, fuzzy
+#| msgid "Custom alarm sound"
+msgid "Custom reminder sound"
 msgstr "Ãm thanh bÃo Äáng tá chán"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Mes_sage:"
 msgstr "_ThÆ:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:72
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "TÃy chán"
 
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Reminder"
+msgstr "âââ Nhác nhá âââ"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-#| msgid "<b>Repeat</b>"
 msgid "Repeat"
 msgstr "Láp lái"
 
@@ -2386,7 +2371,9 @@ msgid "_Program:"
 msgstr "_ChÆÆng trÃnh:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the alarm"
+#, fuzzy
+#| msgid "_Repeat the alarm"
+msgid "_Repeat the reminder"
 msgstr "_Láp lái bÃo Äáng"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
@@ -2405,20 +2392,11 @@ msgstr "trÆác"
 msgid "day(s)"
 msgstr "ngÃy"
 
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:376
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "days"
-msgstr "ngÃy"
-
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "end of appointment"
 msgstr "kát thÃc cuác hán"
 
-#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "lán thÃm náa mái"
@@ -2435,7 +2413,7 @@ msgstr "phÃt"
 msgid "start of appointment"
 msgstr "bát Äáu cuác hán"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:245
 msgid "Action/Trigger"
 msgstr "HÃnh Äáng/GÃy ra"
 
@@ -2444,468 +2422,479 @@ msgid "A_dd"
 msgstr "_ThÃm"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alarms"
-msgstr "BÃo Äáng"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Reminders"
+msgstr "âââ Nhác nhá âââ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:159
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "Type:"
 msgstr "Kiáu:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:175
-#: ../modules/addressbook/addressbook-config.c:513
+#: ../calendar/gui/dialogs/calendar-setup.c:185
+#: ../modules/addressbook/addressbook-config.c:530
 msgid "_Type:"
 msgstr "_Kiáu:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:150
+#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:155
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:285
+#: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
 msgstr "TÃ_n:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:300
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "ChÃp nái dung lách các bá Äá hoát Äáng ngoái tu_yán"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:278
+#: ../calendar/gui/dialogs/calendar-setup.c:302
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "ChÃp nái dung danh sÃch tÃc vá các bá Äá hoát Äáng ngoái tu_yán"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:280
+#: ../calendar/gui/dialogs/calendar-setup.c:304
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "ChÃp nái dung danh sÃch ghi nhá các bá Äá hoát Äáng ngoái tu_yán"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:352
+#: ../calendar/gui/dialogs/calendar-setup.c:350
+#, fuzzy
+#| msgid "Shared Folder Notification"
+msgid "Sh_ow reminder notifications"
+msgstr "ThÃng bÃo thÆ mác chia sá"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:425
 msgid "Colo_r:"
 msgstr "MÃ_u:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:375
-#: ../calendar/gui/dialogs/calendar-setup.c:386
-#: ../calendar/gui/dialogs/calendar-setup.c:397
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:51
-#: ../modules/addressbook/addressbook-config.c:1015
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2818
+#: ../calendar/gui/dialogs/calendar-setup.c:448
+#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:471
+#: ../mail/em-folder-properties.c:235 ../mail/mail-config.ui.h:52
+#: ../modules/addressbook/addressbook-config.c:1080
+#: ../modules/addressbook/autocompletion-config.c:228
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../plugins/itip-formatter/itip-formatter.c:3045
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "Chung"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:387
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Task List"
 msgstr "Danh sÃch tÃc vá"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:398
+#: ../calendar/gui/dialogs/calendar-setup.c:472
 msgid "Memo List"
 msgstr "Danh sÃch Ghi nhá"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:564
 msgid "Calendar Properties"
 msgstr "Thuác tÃnh Lách"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:564
 msgid "New Calendar"
 msgstr "Lách mái"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "Task List Properties"
 msgstr "Thuác tÃnh Danh sÃch TÃc vá"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "New Task List"
 msgstr "Danh sÃch TÃc vá mái"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:684
 msgid "Memo List Properties"
 msgstr "Thuác tÃnh Danh sÃch Ghi nhá"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:684
 msgid "New Memo List"
 msgstr "Danh sÃch Ghi nhá Mái"
 
-#: ../calendar/gui/dialogs/changed-comp.c:59
+#: ../calendar/gui/dialogs/changed-comp.c:62
 msgid "This event has been deleted."
 msgstr "Sá kián nÃy bá xoÃ."
 
-#: ../calendar/gui/dialogs/changed-comp.c:63
+#: ../calendar/gui/dialogs/changed-comp.c:66
 msgid "This task has been deleted."
 msgstr "TÃc vá nÃy bá xoÃ."
 
-#: ../calendar/gui/dialogs/changed-comp.c:67
+#: ../calendar/gui/dialogs/changed-comp.c:70
 msgid "This memo has been deleted."
 msgstr "Bán ghi nhá nÃy ÄÃ bá xoÃ."
 
-#: ../calendar/gui/dialogs/changed-comp.c:76
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Bán Äà táo ra mát vÃi thay Äái. Bá qua nháng thay Äái nÃy và ÄÃng bá "
 "biÃn soán sao khÃng?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:78
+#: ../calendar/gui/dialogs/changed-comp.c:81
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Bán chÆa thay Äái gÃ, ÄÃng bá sáa khÃng?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:83
+#: ../calendar/gui/dialogs/changed-comp.c:86
 msgid "This event has been changed."
 msgstr "Sá kián nÃy ÄÃ ÄÆác thay Äái."
 
-#: ../calendar/gui/dialogs/changed-comp.c:87
+#: ../calendar/gui/dialogs/changed-comp.c:90
 msgid "This task has been changed."
 msgstr "TÃc vá nÃy ÄÃ ÄÆác thay Äái."
 
-#: ../calendar/gui/dialogs/changed-comp.c:91
+#: ../calendar/gui/dialogs/changed-comp.c:94
 msgid "This memo has been changed."
 msgstr "Bán ghi nhá nÃy ÄÃ bá sáa Äái."
 
-#: ../calendar/gui/dialogs/changed-comp.c:100
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Bán Äà táo ra vÃi thay Äái. Bá qua nháng thay Äái nÃy và cáp nhát bá "
 "biÃn soán khÃng?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:102
+#: ../calendar/gui/dialogs/changed-comp.c:105
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Bán chÆa thay Äái gÃ, cÃn cáp nhát bá sáa khÃng?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:448
+#: ../calendar/gui/dialogs/comp-editor-page.c:461
 #, c-format
 msgid "Validation error: %s"
 msgstr "Lái háp lá hoÃ: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:267
-#| msgid "Save attachments"
+#: ../calendar/gui/dialogs/comp-editor.c:273
 msgid "Could not save attachments"
 msgstr "KhÃng thá lÆu ÄÃnh kÃm"
 
-#: ../calendar/gui/dialogs/comp-editor.c:543
+#: ../calendar/gui/dialogs/comp-editor.c:613
 msgid "Could not update object"
 msgstr "KhÃng thá cáp nhát Äái tÆáng"
 
-#: ../calendar/gui/dialogs/comp-editor.c:658
+#: ../calendar/gui/dialogs/comp-editor.c:741
 msgid "Edit Appointment"
 msgstr "Sáa cuác hán"
 
-#: ../calendar/gui/dialogs/comp-editor.c:665
+#: ../calendar/gui/dialogs/comp-editor.c:748
 #, c-format
 msgid "Meeting - %s"
 msgstr "Cuác háp - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:667
+#: ../calendar/gui/dialogs/comp-editor.c:750
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cuác hán - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:673
+#: ../calendar/gui/dialogs/comp-editor.c:756
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "TÃc vá ÄÃ gÃn - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:675
+#: ../calendar/gui/dialogs/comp-editor.c:758
 #, c-format
 msgid "Task - %s"
 msgstr "TÃc vá - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:680
+#: ../calendar/gui/dialogs/comp-editor.c:763
 #, c-format
 msgid "Memo - %s"
 msgstr "Ghi nhá â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:779
 msgid "No Summary"
 msgstr "KhÃng cà bán tÃm tát"
 
-#: ../calendar/gui/dialogs/comp-editor.c:817
+#: ../calendar/gui/dialogs/comp-editor.c:900
 msgid "Keep original item?"
 msgstr "Giá mác gác ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1013
-msgid "Click here to close the current window"
-msgstr "Nhán ÄÃy Äá ÄÃng cáa sá hián thái"
+#: ../calendar/gui/dialogs/comp-editor.c:1101
+#, fuzzy
+#| msgid "Close the current file"
+msgid "Close the current window"
+msgstr "ÄÃng táp tin hián thái"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1020 ../mail/e-mail-browser.c:139
-#: ../shell/e-shell-window-actions.c:1434
-#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:412 ../widgets/misc/e-web-view.c:1065
+#: ../calendar/gui/dialogs/comp-editor.c:1108 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1455
+#: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
 msgstr "ChÃp vÃng chán"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1027 ../mail/e-mail-browser.c:146
-#: ../shell/e-shell-window-actions.c:1441
-#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:1059
+#: ../calendar/gui/dialogs/comp-editor.c:1115 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1462
+#: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
 msgstr "Cát vÃng chán"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1034
-#: ../shell/e-shell-window-actions.c:1448
-#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:565
-#| msgid "Cut the selection"
+#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../shell/e-shell-window-actions.c:1469
+#: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "Xoà vÃng chán"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1041
-msgid "Click here to view help available"
-msgstr "Nhán ÄÃy Äá xem trá giÃp cà sán"
+#: ../calendar/gui/dialogs/comp-editor.c:1129
+#, fuzzy
+#| msgid "View"
+msgid "View help"
+msgstr "Xem"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1048 ../mail/e-mail-browser.c:153
-#: ../shell/e-shell-window-actions.c:1483
-#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:560
-#: ../widgets/misc/e-web-view.c:1071
+#: ../calendar/gui/dialogs/comp-editor.c:1136 ../mail/e-mail-browser.c:155
+#: ../shell/e-shell-window-actions.c:1497
+#: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
+#: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
 msgstr "DÃn báng nhÃp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1069
-msgid "Click here to save the current window"
-msgstr "Nhán ÄÃy Äá lÆu cáa sá hián thái"
+#: ../calendar/gui/dialogs/comp-editor.c:1157
+#, fuzzy
+#| msgid "Save Current View"
+msgid "Save current changes"
+msgstr "LÆu à xem hián thái"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1076 ../mail/e-mail-browser.c:160
-#: ../shell/e-shell-window-actions.c:1553
-#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:570
+#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1574
+#: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "Chán toÃn bá vÄn bán"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/comp-editor.c:1171
 msgid "_Classification"
 msgstr "_PhÃn loái"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1178
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:174
+#: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1581
+#: ../shell/e-shell-window-actions.c:1602
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Sáa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097 ../mail/e-mail-browser.c:167
-#: ../shell/e-shell-window-actions.c:1588
+#: ../calendar/gui/dialogs/comp-editor.c:1185 ../mail/e-mail-browser.c:169
+#: ../shell/e-shell-window-actions.c:1609
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "_Táp tin"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1104
-#: ../shell/e-shell-window-actions.c:1595
+#: ../calendar/gui/dialogs/comp-editor.c:1192
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Help"
 msgstr "Trá g_iÃp"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1111
+#: ../calendar/gui/dialogs/comp-editor.c:1199
 msgid "_Insert"
 msgstr "C_hÃn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1118
-#: ../composer/e-composer-actions.c:301
+#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../composer/e-composer-actions.c:340
 msgid "_Options"
 msgstr "TÃ_y chán"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125 ../mail/e-mail-browser.c:181
-#: ../shell/e-shell-window-actions.c:1630 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1213 ../mail/e-mail-browser.c:183
+#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_Xem"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1135
-#: ../composer/e-composer-actions.c:257
+#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../composer/e-composer-actions.c:289
 msgid "_Attachment..."
 msgstr "Äá ÄÃnh _kÃm.."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
-msgid "Click here to attach a file"
-msgstr "Nhán ÄÃy Äá ÄÃnh kÃm táp tin"
+#: ../calendar/gui/dialogs/comp-editor.c:1225
+#: ../composer/e-composer-actions.c:291
+#: ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
+msgstr "ÄÃnh kÃm táp tin"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1233
 msgid "_Categories"
 msgstr "_Loái"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1235
 msgid "Toggles whether to display categories"
 msgstr "Bát tát hián thá cÃc loái"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1153
+#: ../calendar/gui/dialogs/comp-editor.c:1241
 msgid "Time _Zone"
 msgstr "_MÃi giá"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1155
+#: ../calendar/gui/dialogs/comp-editor.c:1243
 msgid "Toggles whether the time zone is displayed"
 msgstr "Bát tát hián thá MÃi giá"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "Pu_blic"
 msgstr "_CÃng"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1166
+#: ../calendar/gui/dialogs/comp-editor.c:1254
 msgid "Classify as public"
 msgstr "PhÃn loái là CÃng"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1171
+#: ../calendar/gui/dialogs/comp-editor.c:1259
 msgid "_Private"
 msgstr "_RiÃng"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1173
+#: ../calendar/gui/dialogs/comp-editor.c:1261
 msgid "Classify as private"
 msgstr "PhÃn loái là RiÃng"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../calendar/gui/dialogs/comp-editor.c:1266
 msgid "_Confidential"
 msgstr "_Mát"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1180
+#: ../calendar/gui/dialogs/comp-editor.c:1268
 msgid "Classify as confidential"
 msgstr "PhÃn loái Mát"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "R_ole Field"
 msgstr "TrÆáng _Vai trÃ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1190
+#: ../calendar/gui/dialogs/comp-editor.c:1278
 msgid "Toggles whether the Role field is displayed"
 msgstr "Bát tát hián thá trÆáng Vai trÃ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1196
+#: ../calendar/gui/dialogs/comp-editor.c:1284
 msgid "_RSVP"
 msgstr "_Vui lÃng hái Ãm"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1198
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Bát tát hián thá trÆáng RSVP (Vui lÃng hái Ãm)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1204
+#: ../calendar/gui/dialogs/comp-editor.c:1292
 msgid "_Status Field"
 msgstr "TrÆáng T_ráng thÃi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../calendar/gui/dialogs/comp-editor.c:1294
 msgid "Toggles whether the Status field is displayed"
 msgstr "Bát tát hián thá trÆáng Tráng thÃi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1212
+#: ../calendar/gui/dialogs/comp-editor.c:1300
 msgid "_Type Field"
 msgstr "_TrÆáng Kiáu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1214
+#: ../calendar/gui/dialogs/comp-editor.c:1302
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Bát tát hián thá trÆáng Kiáu ngÆái dá"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1238
-#: ../composer/e-composer-private.c:70
+#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "TÃi liáu _váa má"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1923
-#: ../composer/e-composer-actions.c:461
+#: ../calendar/gui/dialogs/comp-editor.c:2059
+#: ../composer/e-composer-actions.c:508
 msgid "Attach"
 msgstr "ÄÃnh kÃm"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2252
-#: ../calendar/gui/dialogs/comp-editor.c:2415
-#: ../calendar/gui/dialogs/comp-editor.c:3382
+#: ../calendar/gui/dialogs/comp-editor.c:2397
+#: ../calendar/gui/dialogs/comp-editor.c:2560
+#: ../calendar/gui/dialogs/comp-editor.c:3549
 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 vÃo."
 
-#: ../calendar/gui/dialogs/comp-editor.c:3346
-#: ../plugins/prefer-plain/prefer-plain.c:64
+#: ../calendar/gui/dialogs/comp-editor.c:3513
+#: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "ÄÃnh kÃm"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3414
+#: ../calendar/gui/dialogs/comp-editor.c:3581
 msgid "Unable to use current version!"
 msgstr "KhÃng thá dÃng phiÃn bán hián thái."
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:92
-msgid "Could not open source"
-msgstr "KhÃng thá má nguán."
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:100
+#: ../calendar/gui/dialogs/copy-source-dialog.c:114
 msgid "Could not open destination"
 msgstr "KhÃng thá má ÄÃch."
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:109
+#: ../calendar/gui/dialogs/copy-source-dialog.c:130
 msgid "Destination is read only"
 msgstr "ÄÃch chá cho phÃp Äác thÃi."
 
-#: ../calendar/gui/dialogs/delete-comp.c:210
+#: ../calendar/gui/dialogs/copy-source-dialog.c:164
+#, fuzzy
+#| msgid "Cannot create a new event"
+msgid "Cannot create object"
+msgstr "KhÃng thá táo sá kián mái"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:193
+msgid "Could not open source"
+msgstr "KhÃng thá má nguán."
+
+#: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Xoà mác nÃy ra háp thÆ cáa mái ngÆái nhán khÃc khÃng?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:213
-#| msgid "P_ercent complete:"
+#: ../calendar/gui/dialogs/delete-comp.c:217
 msgid "_Retract comment"
 msgstr "_RÃt lái à kián"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:56
+#: ../calendar/gui/dialogs/delete-error.c:57
 #, c-format
-#| msgid "The event could not be deleted due to an error"
 msgid "The event could not be deleted due to a dbus error: %s"
 msgstr "KhÃng thá xoà sá kián và gáp lái dbus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:60
+#: ../calendar/gui/dialogs/delete-error.c:61
 #, c-format
-#| msgid "The task could not be deleted due to an error"
 msgid "The task could not be deleted due to a dbus error: %s"
 msgstr "KhÃng thá xoà tÃc vá và gáp lái dbus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:64
+#: ../calendar/gui/dialogs/delete-error.c:65
 #, c-format
-#| msgid "The memo could not be deleted due to an error"
 msgid "The memo could not be deleted due to a dbus error: %s"
 msgstr "KhÃng thá xoà bán ghi nhá và gáp lái dbus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:68
+#: ../calendar/gui/dialogs/delete-error.c:69
 #, c-format
-#| msgid "The item could not be deleted due to an error"
 msgid "The item could not be deleted due to a dbus error: %s"
 msgstr "KhÃng thá xoà mác và gáp lái dbus: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:75
+#: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The event could not be deleted because permission was denied"
 msgstr "KhÃng thá xoà sá kián và khÃng Äá quyán."
 
-#: ../calendar/gui/dialogs/delete-error.c:78
+#: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The task could not be deleted because permission was denied"
 msgstr "KhÃng thá xoà tÃc vá và khÃng Äá quyán."
 
-#: ../calendar/gui/dialogs/delete-error.c:81
+#: ../calendar/gui/dialogs/delete-error.c:82
 msgid "The memo could not be deleted because permission was denied"
 msgstr "KhÃng thá xoà bán ghi nhá và khÃng Äá quyán."
 
-#: ../calendar/gui/dialogs/delete-error.c:84
+#: ../calendar/gui/dialogs/delete-error.c:85
 msgid "The item could not be deleted because permission was denied"
 msgstr "KhÃng thá xoà mác và khÃng Äá quyán."
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:92
+#: ../calendar/gui/dialogs/delete-error.c:93
 #, c-format
-#| msgid "The event could not be deleted due to an error"
 msgid "The event could not be deleted due to an error: %s"
 msgstr "KhÃng thá xoà sá kián và gáp lái: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:96
+#: ../calendar/gui/dialogs/delete-error.c:97
 #, c-format
-#| msgid "The task could not be deleted due to an error"
 msgid "The task could not be deleted due to an error: %s"
 msgstr "KhÃng thá xoà tÃc vá và gáp lái: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:100
+#: ../calendar/gui/dialogs/delete-error.c:101
 #, c-format
-#| msgid "The memo could not be deleted due to an error"
 msgid "The memo could not be deleted due to an error: %s"
 msgstr "KhÃng thá xoà bán ghi nhá và gáp lái: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:104
+#: ../calendar/gui/dialogs/delete-error.c:105
 #, c-format
-#| msgid "The item could not be deleted due to an error"
 msgid "The item could not be deleted due to an error: %s"
 msgstr "KhÃng thá xoà mác và gáp lái: %s"
 
@@ -2921,231 +2910,233 @@ msgstr "áy nhiám cho:"
 msgid "Enter Delegate"
 msgstr "Nháp ngÆái áy nhiám"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
-msgid "_Alarms"
-msgstr "_BÃo Äáng"
+#: ../calendar/gui/dialogs/event-editor.c:212
+#, fuzzy
+#| msgid "Reminder!"
+msgid "_Reminders"
+msgstr "âââ Nhác nhá âââ"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
-msgid "Click here to set or unset alarms for this event"
+#: ../calendar/gui/dialogs/event-editor.c:214
+#, fuzzy
+#| msgid "Click here to set or unset alarms for this event"
+msgid "Set or unset reminders for this event"
 msgstr "Nhán ÄÃy Äá láp hay bá láp bÃo Äáng cho sá kián nÃy"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
 msgstr "Hián giá là _Bán"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:224
 msgid "Toggles whether to show time as busy"
 msgstr "Bát tát hián thá giá là bán"
 
-#: ../calendar/gui/dialogs/event-editor.c:237
+#: ../calendar/gui/dialogs/event-editor.c:233
 msgid "_Recurrence"
 msgstr "Äánh _ká"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "Make this a recurring event"
 msgstr "Äát là sá kián láp"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
+#: ../calendar/gui/dialogs/event-editor.c:240
 #: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "TÃy chán Gái"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:242
 #: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "ChÃn tÃy chán gái cáp cao"
 
-#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:250
 msgid "All _Day Event"
 msgstr "Sá kián ng_uyÃn ngÃy"
 
-#: ../calendar/gui/dialogs/event-editor.c:256
+#: ../calendar/gui/dialogs/event-editor.c:252
 msgid "Toggles whether to have All Day Event"
 msgstr "Bát tát cà dá kián nguyÃn ngÃy"
 
-#: ../calendar/gui/dialogs/event-editor.c:265
+#: ../calendar/gui/dialogs/event-editor.c:261
 msgid "_Free/Busy"
 msgstr "Ránh/_Bán"
 
-#: ../calendar/gui/dialogs/event-editor.c:267
+#: ../calendar/gui/dialogs/event-editor.c:263
 msgid "Query free / busy information for the attendees"
 msgstr "Truy ván thÃng tin Ránh/Bán cho cÃc ngÆái dá"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3140
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3310
 msgid "Appointment"
 msgstr "Cuác hán"
 
-#: ../calendar/gui/dialogs/event-editor.c:388
-#: ../calendar/gui/dialogs/event-page.ui.h:3
-#: ../calendar/gui/e-meeting-list-view.c:148
+#: ../calendar/gui/dialogs/event-editor.c:384
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/e-meeting-list-view.c:161
 msgid "Attendees"
 msgstr "NgÆái dá"
 
-#: ../calendar/gui/dialogs/event-editor.c:585
-#| msgid "Print this message"
+#: ../calendar/gui/dialogs/event-editor.c:582
 msgid "Print this event"
 msgstr "In sá kián nÃy"
 
-#: ../calendar/gui/dialogs/event-page.c:771
+#: ../calendar/gui/dialogs/event-page.c:558
 msgid "Event's start time is in the past"
 msgstr "Thái Äiám bát Äáu sá kián trong quà khá"
 
-#: ../calendar/gui/dialogs/event-page.c:812
+#: ../calendar/gui/dialogs/event-page.c:635
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "KhÃng thá sáa sá kián và lách ÄÆác chán là chá Äác"
 
-#: ../calendar/gui/dialogs/event-page.c:816
+#: ../calendar/gui/dialogs/event-page.c:639
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "KhÃng thá sáa hoÃn toÃn sá kián và bán khÃng phái ngÆái tá chác"
 
-#: ../calendar/gui/dialogs/event-page.c:828
-#: ../calendar/gui/dialogs/event-page.c:2784
-msgid "This event has alarms"
+#: ../calendar/gui/dialogs/event-page.c:651
+#: ../calendar/gui/dialogs/event-page.c:3080
+#, fuzzy
+#| msgid "This event has alarms"
+msgid "This event has reminders"
 msgstr "Nà cà bÃo Äáng."
 
-#: ../calendar/gui/dialogs/event-page.c:895
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "_Bá tá chác:"
 
-#: ../calendar/gui/dialogs/event-page.c:942
-msgid "_Delegatees"
-msgstr "NgÆái á_y nhiám"
-
-#: ../calendar/gui/dialogs/event-page.c:944
-msgid "Atte_ndees"
-msgstr "NgÆái _dá"
-
-#: ../calendar/gui/dialogs/event-page.c:1159
+#: ../calendar/gui/dialogs/event-page.c:1263
 msgid "Event with no start date"
 msgstr "Sá kián khÃng cà ngÃy bát Äáu"
 
-#: ../calendar/gui/dialogs/event-page.c:1162
+#: ../calendar/gui/dialogs/event-page.c:1266
 msgid "Event with no end date"
 msgstr "Sá kián khÃng cà ngÃy kát thÃc"
 
-#: ../calendar/gui/dialogs/event-page.c:1333
-#: ../calendar/gui/dialogs/memo-page.c:689
-#: ../calendar/gui/dialogs/task-page.c:909
+#: ../calendar/gui/dialogs/event-page.c:1439
+#: ../calendar/gui/dialogs/memo-page.c:708
+#: ../calendar/gui/dialogs/task-page.c:819
 msgid "Start date is wrong"
 msgstr "NgÃy bát Äáu sai"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1449
 msgid "End date is wrong"
 msgstr "NgÃy kát thÃc sai"
 
-#: ../calendar/gui/dialogs/event-page.c:1366
+#: ../calendar/gui/dialogs/event-page.c:1472
 msgid "Start time is wrong"
 msgstr "Thái Äiám Äáu sai"
 
-#: ../calendar/gui/dialogs/event-page.c:1373
+#: ../calendar/gui/dialogs/event-page.c:1479
 msgid "End time is wrong"
 msgstr "Thái Äiám kát thÃc sai"
 
-#: ../calendar/gui/dialogs/event-page.c:1537
-#: ../calendar/gui/dialogs/memo-page.c:730
-#: ../calendar/gui/dialogs/task-page.c:971
-msgid "The organizer selected no longer has an account."
-msgstr "Bá tá chác Äà chán khÃng cÃn cà tÃi khoán lái."
-
-#: ../calendar/gui/dialogs/event-page.c:1543
-#: ../calendar/gui/dialogs/memo-page.c:736
-#: ../calendar/gui/dialogs/task-page.c:977
+#: ../calendar/gui/dialogs/event-page.c:1644
+#: ../calendar/gui/dialogs/memo-page.c:749
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "An organizer is required."
 msgstr "Cán mát bá tá chác."
 
-#: ../calendar/gui/dialogs/event-page.c:1568
-#: ../calendar/gui/dialogs/task-page.c:1001
+#: ../calendar/gui/dialogs/event-page.c:1678
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "At least one attendee is required."
 msgstr "Cán Ãt nhát mát ngÆái dá."
 
-#: ../calendar/gui/dialogs/event-page.c:2658
-#, c-format
-msgid "Unable to open the calendar '%s'."
+#: ../calendar/gui/dialogs/event-page.c:1885
+msgid "_Delegatees"
+msgstr "NgÆái á_y nhiám"
+
+#: ../calendar/gui/dialogs/event-page.c:1887
+msgid "Atte_ndees"
+msgstr "NgÆái _dá"
+
+#: ../calendar/gui/dialogs/event-page.c:2921
+#, fuzzy, c-format
+#| msgid "Unable to open the calendar '%s'."
+msgid "Unable to open the calendar '%s': %s"
 msgstr "KhÃng thá má lách  %s Â."
 
 #. Translators: This string is used when we are creating an Event
-#. (meeting or appointment)  on behalf of some other user
+#. * (meeting or appointment)  on behalf of some other user
 #. Translators: This string is used when we are creating a Memo
-#. on behalf of some other user
+#. * on behalf of some other user
 #. Translators: This string is used when we are creating a Task
-#. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2702
-#: ../calendar/gui/dialogs/memo-page.c:949
-#: ../calendar/gui/dialogs/task-page.c:1791
+#. * on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2998
+#: ../calendar/gui/dialogs/memo-page.c:1012
+#: ../calendar/gui/dialogs/task-page.c:1838
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Bán Äang hoát Äáng thay mát cho %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3013
+#: ../calendar/gui/dialogs/event-page.c:3325
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d ngÃy trÆác cuác hán"
 
-#: ../calendar/gui/dialogs/event-page.c:3019
+#: ../calendar/gui/dialogs/event-page.c:3331
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d giá trÆác cuác hán"
 
-#: ../calendar/gui/dialogs/event-page.c:3025
+#: ../calendar/gui/dialogs/event-page.c:3337
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d phÃt trÆác cuác hán"
 
-#: ../calendar/gui/dialogs/event-page.c:3044
+#: ../calendar/gui/dialogs/event-page.c:3356
 msgid "Customize"
 msgstr "TÃy chánh"
 
-#. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3050
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/dialogs/event-page.c:3362
+#, fuzzy
 #| msgid "None"
-msgctxt "cal-alarms"
+msgctxt "cal-reminders"
 msgid "None"
 msgstr "KhÃng"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:566
+#: ../calendar/gui/e-meeting-time-sel.c:564
 msgid "Atte_ndees..."
 msgstr "NgÆái _dá..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Custom Alarm:"
-msgstr "BÃo Äáng tá chán:"
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+#, fuzzy
+#| msgid "Custom Header"
+msgid "Custom Reminder:"
+msgstr "DÃng Äáu tá chán"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Event Description"
 msgstr "MÃ tá sá kián"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Time _zone:"
 msgstr "MÃi _giá:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgid "_Alarm"
-msgstr "_BÃo Äáng"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:349
+#: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "_MÃ tá:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-#: ../plugins/calendar-weather/calendar-weather.c:361
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../plugins/calendar-weather/calendar-weather.c:381
 msgid "_Location:"
 msgstr "Äáa Äiá_m:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#, fuzzy
+#| msgid "Reminder!"
+msgid "_Reminder"
+msgstr "âââ Nhác nhá âââ"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:14
-#| msgid "Summary:"
 msgid "_Summary:"
 msgstr "_TÃm tát:"
 
@@ -3153,71 +3144,123 @@ msgstr "_TÃm tát:"
 msgid "_Time:"
 msgstr "_Giá:"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
-#| msgid "1 day before appointment"
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "1 ngÃy trÆác cuác hán"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
-#| msgid "1 hour before appointment"
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "1 giá trÆác cuác hán"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
-#| msgid "15 minutes before appointment"
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
 msgstr "15 phÃt trÆác cuác hán"
 
 #. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#| msgid "for"
 msgctxt "eventpage"
 msgid "for"
 msgstr "trong"
 
 #. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
 #: ../calendar/gui/dialogs/event-page.ui.h:25
-#| msgid "until"
 msgctxt "eventpage"
 msgid "until"
 msgstr "tái khi"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3144
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
+msgid "April"
+msgstr "ThÃng TÆ"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
+msgid "August"
+msgstr "ThÃng TÃm"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
+msgid "December"
+msgstr "ThÃng Cháp"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
+msgid "February"
+msgstr "ThÃng Hai"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
+msgid "January"
+msgstr "ThÃng GiÃng"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
+msgid "July"
+msgstr "ThÃng Báy"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "June"
+msgstr "ThÃng SÃu"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
+msgid "March"
+msgstr "ThÃng Ba"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
+msgid "May"
+msgstr "ThÃng NÄm"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
+msgid "November"
+msgstr "ThÃng MÆái Mát"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "October"
+msgstr "ThÃng MÆái"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "Select Date"
+msgstr "Chán ngÃy"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+msgid "Select _Today"
+msgstr "Chán _hÃm nay"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
+msgid "September"
+msgstr "ThÃng ChÃn"
+
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3314
 msgid "Memo"
 msgstr "Ghi nhá"
 
-#: ../calendar/gui/dialogs/memo-editor.c:159
-#| msgid "Print the list of memos"
+#: ../calendar/gui/dialogs/memo-editor.c:156
 msgid "Print this memo"
 msgstr "In bán ghi nhá nÃy"
 
-#: ../calendar/gui/dialogs/memo-page.c:341
+#: ../calendar/gui/dialogs/memo-page.c:405
 msgid "Memo's start date is in the past"
 msgstr "NgÃy bát Äáu bán ghi nhá trong quà khá"
 
-#: ../calendar/gui/dialogs/memo-page.c:379
+#: ../calendar/gui/dialogs/memo-page.c:442
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "KhÃng thá sáa ghi nhá và danh sÃch ghi nhá ÄÆác chán là chá Äác"
 
-#: ../calendar/gui/dialogs/memo-page.c:383
+#: ../calendar/gui/dialogs/memo-page.c:446
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "KhÃng thá sáa hoÃn toÃn ghi nhá và bán khÃng phái ngÆái tá chác"
 
-#: ../calendar/gui/dialogs/memo-page.c:910
-#, c-format
-msgid "Unable to open memos in '%s'."
+#: ../calendar/gui/dialogs/memo-page.c:936
+#, fuzzy, c-format
+#| msgid "Unable to open memos in '%s'."
+msgid "Unable to open memos in '%s': %s"
 msgstr "KhÃng thá má ghi nhá trong  %s Â."
 
-#: ../calendar/gui/dialogs/memo-page.c:1081 ../em-format/em-format-quote.c:282
-#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2401
-#: ../mail/em-format-html.c:2460 ../mail/em-format-html.c:2484
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:75
+#: ../calendar/gui/dialogs/memo-page.c:1144 ../em-format/em-format-quote.c:319
+#: ../em-format/em-format.c:1062 ../mail/em-format-html.c:2592
+#: ../mail/em-format-html.c:2657 ../mail/em-format-html.c:2681
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "Cho"
 
@@ -3236,62 +3279,64 @@ msgid "T_o:"
 msgstr "Äá_n:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:428
+#: ../calendar/gui/dialogs/task-page.c:333
 #: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_Group:"
-msgstr "_NhÃm:"
+#, fuzzy
+#| msgid "_Last:"
+msgid "_List:"
+msgstr "_Há:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Bán Äang sáa Äái sá kián láp, bán muán sáa Äái cÃi nÃo?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:56
+#: ../calendar/gui/dialogs/recur-comp.c:57
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Bán Äang áy nhiám sá kián láp, bán muán áy nhiám cÃi nÃo?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:60
+#: ../calendar/gui/dialogs/recur-comp.c:61
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Bán Äang sáa Äái tÃc vá láp, bán muán sáa Äái cÃi nÃo?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:64
+#: ../calendar/gui/dialogs/recur-comp.c:65
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Bán Äang sáa Äái bán ghi nhá láp: bán muán sáa Äái cÃi nÃo?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This Instance Only"
 msgstr "Chá lán nÃy"
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:95
 msgid "This and Prior Instances"
 msgstr "Lán nÃy và nháng lán trÆác"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:101
 msgid "This and Future Instances"
 msgstr "Lán nÃy và nháng lán sau nÃy"
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:106
 msgid "All Instances"
 msgstr "Mái lán"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:569
+#: ../calendar/gui/dialogs/recurrence-page.c:575
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Cuác hán cháa nhiáu lán láp lái mà Evolution khÃng thá hiáu chánh."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:901
+#: ../calendar/gui/dialogs/recurrence-page.c:964
 msgid "Recurrence date is invalid"
 msgstr "NgÃy láp khÃng háp lá"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:941
+#: ../calendar/gui/dialogs/recurrence-page.c:1004
 msgid "End time of the recurrence was before event's start"
 msgstr "Giá cuái cáa sá kián láp lái nám trÆác giá Äáu"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:971
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "on"
 msgstr "vÃo"
 
@@ -3299,7 +3344,7 @@ msgstr "vÃo"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
 msgid "first"
 msgstr "thá nhát"
 
@@ -3308,7 +3353,7 @@ msgstr "thá nhát"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1103
 msgid "second"
 msgstr "giÃy"
 
@@ -3316,7 +3361,7 @@ msgstr "giÃy"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
 msgid "third"
 msgstr "thá ba"
 
@@ -3324,7 +3369,7 @@ msgstr "thá ba"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 msgid "fourth"
 msgstr "thá tÆ"
 
@@ -3332,8 +3377,7 @@ msgstr "thá tÆ"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
-#| msgid "Width"
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 msgid "fifth"
 msgstr "thá nÄm"
 
@@ -3341,13 +3385,13 @@ msgstr "thá nÄm"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1055
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
 msgid "last"
 msgstr "cuái cÃng"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1079
+#: ../calendar/gui/dialogs/recurrence-page.c:1147
 msgid "Other Date"
 msgstr "NgÃy khÃc"
 
@@ -3355,7 +3399,7 @@ msgstr "NgÃy khÃc"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1153
 msgid "1st to 10th"
 msgstr "ngÃy máng 1 Äán 10"
 
@@ -3363,7 +3407,7 @@ msgstr "ngÃy máng 1 Äán 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/dialogs/recurrence-page.c:1159
 msgid "11th to 20th"
 msgstr "ngÃy 11 Äán 20"
 
@@ -3371,48 +3415,41 @@ msgstr "ngÃy 11 Äán 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
 msgid "21st to 31st"
 msgstr "ngÃy 21 Äán 31"
 
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
-#. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-msgid "day"
-msgstr "ngÃy"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Monday"
 msgstr "Thá Hai"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1124
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "Thá Ba"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1125
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "Thá TÆ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1126
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "Thá NÄm"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1127
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "Friday"
 msgstr "Thá SÃu"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../calendar/gui/dialogs/recurrence-page.c:1196
 #: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "Thá Báy"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1129
+#: ../calendar/gui/dialogs/recurrence-page.c:1197
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "Chá Nhát"
@@ -3420,31 +3457,31 @@ msgstr "Chá Nhát"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../calendar/gui/dialogs/recurrence-page.c:1321
 msgid "on the"
 msgstr "vÃo"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1425
+#: ../calendar/gui/dialogs/recurrence-page.c:1496
 msgid "occurrences"
 msgstr "lán"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2132
+#: ../calendar/gui/dialogs/recurrence-page.c:2214
 msgid "Add exception"
 msgstr "ThÃm ngoái lá"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2173
+#: ../calendar/gui/dialogs/recurrence-page.c:2255
 msgid "Could not get a selection to modify."
 msgstr "KhÃng thá láy vÃng chán cán sáa Äái."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2179
+#: ../calendar/gui/dialogs/recurrence-page.c:2261
 msgid "Modify exception"
 msgstr "Sáa Äái ngoái lá"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2223
+#: ../calendar/gui/dialogs/recurrence-page.c:2305
 msgid "Could not get a selection to delete."
 msgstr "KhÃng thá láy vÃng chán cán xoÃ."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2357
+#: ../calendar/gui/dialogs/recurrence-page.c:2439
 msgid "Date/Time"
 msgstr "NgÃy/Giá"
 
@@ -3453,12 +3490,10 @@ msgid "Every"
 msgstr "Mái"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-#| msgid "<b>Exceptions</b>"
 msgid "Exceptions"
 msgstr "Ngoái lá"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:79
-#| msgid "Preview:"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
 msgid "Preview"
 msgstr "Xem trÆác"
 
@@ -3468,78 +3503,72 @@ msgstr "C_uác hán nÃy láp lái"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:8
-#| msgid "day(s)"
 msgctxt "recurrpage"
 msgid "day(s)"
 msgstr "ngÃy"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:10
-#| msgid "for"
 msgctxt "recurrpage"
 msgid "for"
 msgstr "trong"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
-#| msgid "forever"
 msgctxt "recurrpage"
 msgid "forever"
 msgstr "mÃi mÃi"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
-#| msgid "month(s)"
 msgctxt "recurrpage"
 msgid "month(s)"
 msgstr "thÃng"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-#| msgid "until"
 msgctxt "recurrpage"
 msgid "until"
 msgstr "tái khi"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:18
-#| msgid "week(s)"
 msgctxt "recurrpage"
 msgid "week(s)"
 msgstr "tuán"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-#| msgid "year(s)"
 msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "nÄm"
 
-#: ../calendar/gui/dialogs/send-comp.c:193
-msgid "Send my alarms with this event"
+#: ../calendar/gui/dialogs/send-comp.c:198
+#, fuzzy
+#| msgid "Send my alarms with this event"
+msgid "Send my reminders with this event"
 msgstr "Gái cÃc bÃo Äáng mÃnh cÃng vái sá kián nÃy"
 
-#: ../calendar/gui/dialogs/send-comp.c:195
-#| msgid "Notify new messages for _Inbox only"
+#: ../calendar/gui/dialogs/send-comp.c:200
 msgid "Notify new attendees _only"
 msgstr "Chá thÃng bÃo cho ngÆái tham dá _mái"
 
-#: ../calendar/gui/dialogs/task-details-page.c:356
-#: ../calendar/gui/dialogs/task-details-page.c:378
+#: ../calendar/gui/dialogs/task-details-page.c:351
+#: ../calendar/gui/dialogs/task-details-page.c:373
 msgid "Completed date is wrong"
 msgstr "NgÃy hoÃn tát sai"
 
-#: ../calendar/gui/dialogs/task-details-page.c:489
+#: ../calendar/gui/dialogs/task-details-page.c:488
 msgid "Web Page"
 msgstr "Trang Web"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:298
-#: ../calendar/gui/e-cal-model-tasks.c:442
-#: ../calendar/gui/e-cal-model-tasks.c:716 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:593
-#: ../calendar/gui/print.c:3230 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/e-cal-component-preview.c:300
+#: ../calendar/gui/e-cal-model-tasks.c:440
+#: ../calendar/gui/e-cal-model-tasks.c:725 ../calendar/gui/e-task-table.c:219
+#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:606
+#: ../calendar/gui/print.c:3400 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3547,59 +3576,59 @@ msgstr "Bá thÃi"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:440
-#: ../calendar/gui/e-cal-model-tasks.c:714
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
-#: ../calendar/gui/e-task-table.c:212 ../calendar/gui/e-task-table.c:227
-#: ../calendar/gui/e-task-table.c:592 ../calendar/gui/print.c:3227
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:438
+#: ../calendar/gui/e-cal-model-tasks.c:723
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
+#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
+#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3397
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
 msgid "Completed"
 msgstr "HoÃn tát"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1226 ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1274 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "Cao"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:438
-#: ../calendar/gui/e-cal-model-tasks.c:712
-#: ../calendar/gui/e-cal-model-tasks.c:789 ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:591
-#: ../calendar/gui/print.c:3224
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:436
+#: ../calendar/gui/e-cal-model-tasks.c:721
+#: ../calendar/gui/e-cal-model-tasks.c:799 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:604
+#: ../calendar/gui/print.c:3394
 msgid "In Progress"
 msgstr "Äang tián hÃnh"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-task-table.c:518 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-task-table.c:528 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1272 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "Tháp"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-cal-model.c:1524 ../calendar/gui/e-task-table.c:517
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1225
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model.c:1578 ../calendar/gui/e-task-table.c:527
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1273
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "Chuán"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:302
-#: ../calendar/gui/e-cal-model-tasks.c:436
-#: ../calendar/gui/e-cal-model-tasks.c:710 ../calendar/gui/e-task-table.c:208
-#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:590
-#: ../calendar/gui/print.c:3221 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:304
+#: ../calendar/gui/e-cal-model-tasks.c:434
+#: ../calendar/gui/e-cal-model-tasks.c:719 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:603
+#: ../calendar/gui/print.c:3391 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "ChÆa bát Äáu"
 
@@ -3612,11 +3641,11 @@ msgid "Stat_us:"
 msgstr "T_ráng thÃi:"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. Status: Accepted: X   Declined: Y   ...
+#. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1837
-#: ../calendar/gui/e-meeting-list-view.c:596
+#: ../calendar/gui/e-calendar-view.c:1854
+#: ../calendar/gui/e-meeting-list-view.c:635
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -3625,7 +3654,7 @@ msgstr "Tráng thÃi"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:529 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "ChÆa Äánh nghÄa"
@@ -3652,54 +3681,51 @@ msgid "Click to change or view the status details of the task"
 msgstr "Nhán Äá thay Äái hay xem chi tiát tráng thÃi vá tÃc vá"
 
 #: ../calendar/gui/dialogs/task-editor.c:126
-#: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "TÃy chán _Gái"
 
-#: ../calendar/gui/dialogs/task-editor.c:331 ../calendar/gui/print.c:3142
-#: ../widgets/misc/e-send-options.c:503
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3312
+#: ../widgets/misc/e-send-options.c:535
 msgid "Task"
 msgstr "TÃc vá"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "Chi tiát tÃc vá"
 
-#: ../calendar/gui/dialogs/task-editor.c:376
-#| msgid "Print the list of tasks"
+#: ../calendar/gui/dialogs/task-editor.c:366
 msgid "Print this task"
 msgstr "In tÃc vá nÃy"
 
-#: ../calendar/gui/dialogs/task-page.c:345
+#: ../calendar/gui/dialogs/task-page.c:251
 msgid "Task's start date is in the past"
 msgstr "NgÃy bát Äáu tÃc vá trong quà khá"
 
-#: ../calendar/gui/dialogs/task-page.c:346
+#: ../calendar/gui/dialogs/task-page.c:252
 msgid "Task's due date is in the past"
 msgstr "NgÃy Äán hán tÃc vá trong quà khá"
 
-#: ../calendar/gui/dialogs/task-page.c:381
+#: ../calendar/gui/dialogs/task-page.c:286
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "KhÃng thá sáa tÃc vá và danh sÃch tÃc vá ÄÆác chán là chá Äác"
 
-#: ../calendar/gui/dialogs/task-page.c:385
-#| msgid ""
-#| "This message cannot be sent because you have not specified any recipients"
+#: ../calendar/gui/dialogs/task-page.c:290
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "KhÃng thá sáa tÃc vá nÃy và bán khÃng phái ngÆái tá chác."
 
-#: ../calendar/gui/dialogs/task-page.c:436
+#: ../calendar/gui/dialogs/task-page.c:341
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "_Tá chác:"
 
-#: ../calendar/gui/dialogs/task-page.c:882
+#: ../calendar/gui/dialogs/task-page.c:801
 msgid "Due date is wrong"
 msgstr "NgÃy Äán hán sai"
 
-#: ../calendar/gui/dialogs/task-page.c:1748
-#, c-format
-msgid "Unable to open tasks in '%s'."
+#: ../calendar/gui/dialogs/task-page.c:1757
+#, fuzzy, c-format
+#| msgid "Unable to open tasks in '%s'."
+msgid "Unable to open tasks in '%s': %s"
 msgstr "KhÃng thá má tÃc vá trong  %s Â."
 
 #: ../calendar/gui/dialogs/task-page.ui.h:2
@@ -3715,123 +3741,122 @@ msgid "Time zone:"
 msgstr "MÃi giá:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:394
+#: ../calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d ngÃy"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:400
+#: ../calendar/gui/e-alarm-list.c:399
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d tuán"
 
-#: ../calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:461
 msgid "Unknown action to be performed"
 msgstr "KhÃng biát hÃnh Äáng cán thác hián."
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:476
+#: ../calendar/gui/e-alarm-list.c:475
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s trÆác khi bát Äáu cuác hán"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:481
+#: ../calendar/gui/e-alarm-list.c:480
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s sau khi bát Äáu cuác hán"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:488
+#: ../calendar/gui/e-alarm-list.c:487
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s lÃc bát Äáu cuác hán"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:499
+#: ../calendar/gui/e-alarm-list.c:498
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s trÆác khi kát thÃc cuác hán"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:504
+#: ../calendar/gui/e-alarm-list.c:503
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s sau khi kát thÃc cuác hán"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:511
+#: ../calendar/gui/e-alarm-list.c:510
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s lÃc kát thÃc cuác hán"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:535
+#: ../calendar/gui/e-alarm-list.c:534
 #, c-format
 msgid "%s at %s"
 msgstr "%s lÃc %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:543
+#: ../calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s cho kiáu gÃy ra lá"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:674
+#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:671
 msgid "Untitled"
 msgstr "KhÃng tÃn"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
-#| msgid "Categories"
+#: ../calendar/gui/e-cal-component-preview.c:200
 msgid "Categories:"
 msgstr "Loái:"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Summary:"
 msgstr "TÃm tát:"
 
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-component-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:263
 msgid "Start Date:"
 msgstr "NgÃy bát Äáu:"
 
-#: ../calendar/gui/e-cal-component-preview.c:275
+#: ../calendar/gui/e-cal-component-preview.c:277
 msgid "Due Date:"
 msgstr "NgÃy Äán hán:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:288
-#: ../plugins/itip-formatter/itip-view.c:1075
+#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../plugins/itip-formatter/itip-view.c:1083
 msgid "Status:"
 msgstr "Tráng thÃi:"
 
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-preview.c:317
 msgid "Priority:"
 msgstr "Äá Æu tiÃn:"
 
-#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "MÃ tá:"
 
-#: ../calendar/gui/e-cal-component-preview.c:371
+#: ../calendar/gui/e-cal-component-preview.c:373
 msgid "Web Page:"
 msgstr "Trang Web:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Created"
 msgstr "ÄÃ táo"
 
@@ -3842,7 +3867,6 @@ msgstr "NgÃy kát thÃc"
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
-#| msgid "Modified"
 msgid "Last modified"
 msgstr "Sáa lán cuái"
 
@@ -3851,17 +3875,17 @@ msgstr "Sáa lán cuái"
 msgid "Start Date"
 msgstr "NgÃy bát Äáu"
 
-#: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:568
+#: ../calendar/gui/e-cal-model-calendar.c:188
+#: ../calendar/gui/e-task-table.c:580
 msgid "Free"
 msgstr "Ránh"
 
-#: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:549 ../calendar/gui/e-task-table.c:569
+#: ../calendar/gui/e-cal-model-calendar.c:191
+#: ../calendar/gui/e-meeting-time-sel.c:547 ../calendar/gui/e-task-table.c:581
 msgid "Busy"
 msgstr "Bán"
 
-#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-cal-model-tasks.c:665
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3872,45 +3896,44 @@ msgstr ""
 "10.783114,106.699804 (SÃi GÃn)"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:708
-#| msgid "None"
+#: ../calendar/gui/e-cal-model-tasks.c:717
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "KhÃng"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
-#: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
-#: ../calendar/gui/e-meeting-store.c:1029
+#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
+#: ../calendar/gui/e-meeting-store.c:1053
 msgid "Yes"
 msgstr "CÃ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
-#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
+#: ../calendar/gui/e-meeting-list-view.c:203
+#: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "KhÃng"
 
-#: ../calendar/gui/e-cal-model.c:782 ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
-#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1073
-#: ../calendar/gui/print.c:1090 ../e-util/e-charset.c:52
-#: ../modules/plugin-manager/evolution-plugin-manager.c:98
-#: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2485
+#: ../calendar/gui/e-cal-model.c:776 ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1151
+#: ../calendar/gui/print.c:1168 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:102
+#: ../plugins/itip-formatter/itip-formatter.c:469
+#: ../plugins/itip-formatter/itip-formatter.c:2697
 msgid "Unknown"
 msgstr "KhÃng biát"
 
-#: ../calendar/gui/e-cal-model.c:1526
+#: ../calendar/gui/e-cal-model.c:1580
 msgid "Recurring"
 msgstr "Láp lái"
 
-#: ../calendar/gui/e-cal-model.c:1528
+#: ../calendar/gui/e-cal-model.c:1582
 msgid "Assigned"
 msgstr "ÄÃ gÃn"
 
-#: ../calendar/gui/e-cal-model.c:2608
+#: ../calendar/gui/e-cal-model.c:2937
 #, c-format
 msgid "Opening %s"
 msgstr "Äang má %s..."
@@ -3938,7 +3961,7 @@ msgstr "NgÃy Äán hán"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:394
 msgid "Priority"
 msgstr "Äá Æu tiÃn"
 
@@ -3947,114 +3970,112 @@ msgid "Start date"
 msgstr "NgÃy bát Äáu"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:559
+#: ../calendar/gui/e-meeting-list-view.c:598
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:582
+#: ../widgets/misc/e-attachment-tree-view.c:584
 msgid "Type"
 msgstr "Kiáu"
 
-#: ../calendar/gui/e-calendar-view.c:430
-#| msgid "Cut selected text to the clipboard"
+#: ../calendar/gui/e-calendar-view.c:420
 msgid "Cut selected events to the clipboard"
 msgstr "Cát sá kián ÄÃ chán vÃo báng nhÃp"
 
-#: ../calendar/gui/e-calendar-view.c:436
-#| msgid "Copy selected text to the clipboard"
+#: ../calendar/gui/e-calendar-view.c:426
 msgid "Copy selected events to the clipboard"
 msgstr "ChÃp sá kián ÄÃ chán sang báng nhÃp"
 
-#: ../calendar/gui/e-calendar-view.c:442
-#| msgid "Paste text from the clipboard"
+#: ../calendar/gui/e-calendar-view.c:432
 msgid "Paste events from the clipboard"
 msgstr "DÃn sá kián tá báng nhÃp"
 
-#: ../calendar/gui/e-calendar-view.c:448
-#| msgid "Delete selected memos"
+#: ../calendar/gui/e-calendar-view.c:438
 msgid "Delete selected events"
 msgstr "Xoà cÃc sá kián Äà chán"
 
-#: ../calendar/gui/e-calendar-view.c:467 ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:269
 msgid "Deleting selected objects"
 msgstr "Äang xoà cÃc Äái tÆáng Äà chán..."
 
-#: ../calendar/gui/e-calendar-view.c:661 ../calendar/gui/e-memo-table.c:855
-#: ../calendar/gui/e-task-table.c:1078
+#: ../calendar/gui/e-calendar-view.c:650 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-task-table.c:1104
 msgid "Updating objects"
 msgstr "Äang cáp nhát cÃc Äái tÆáng..."
 
-#: ../calendar/gui/e-calendar-view.c:1784
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../plugins/itip-formatter/itip-formatter.c:2473
+#: ../calendar/gui/e-calendar-view.c:1801
+#: ../calendar/gui/e-meeting-list-view.c:214
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../plugins/itip-formatter/itip-formatter.c:2685
 msgid "Accepted"
 msgstr "ÄÃ cháp nhán"
 
-#: ../calendar/gui/e-calendar-view.c:1785
-#: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../plugins/itip-formatter/itip-formatter.c:2479
+#: ../calendar/gui/e-calendar-view.c:1802
+#: ../calendar/gui/e-meeting-list-view.c:215
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../plugins/itip-formatter/itip-formatter.c:2691
 msgid "Declined"
 msgstr "Bá tá chái"
 
-#: ../calendar/gui/e-calendar-view.c:1786
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-meeting-time-sel.c:548
+#: ../calendar/gui/e-calendar-view.c:1803
+#: ../calendar/gui/e-meeting-list-view.c:216
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
+#: ../calendar/gui/e-meeting-time-sel.c:546
 msgid "Tentative"
 msgstr "Tám cháp nhán"
 
-#: ../calendar/gui/e-calendar-view.c:1787
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
-#: ../plugins/itip-formatter/itip-formatter.c:2482
+#: ../calendar/gui/e-calendar-view.c:1804
+#: ../calendar/gui/e-meeting-list-view.c:217
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../plugins/itip-formatter/itip-formatter.c:2694
 msgid "Delegated"
 msgstr "áy nhiám"
 
-#: ../calendar/gui/e-calendar-view.c:1788
+#: ../calendar/gui/e-calendar-view.c:1805
 msgid "Needs action"
 msgstr "Cán hÃnh vi"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1932 ../calendar/gui/e-memo-table.c:538
-#: ../calendar/gui/e-task-table.c:753
+#. To Translators: It will display
+#. * "Organizer: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-view.c:1949 ../calendar/gui/e-memo-table.c:539
+#: ../calendar/gui/e-task-table.c:770
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Tá chác: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1936 ../calendar/gui/e-memo-table.c:543
-#: ../calendar/gui/e-task-table.c:756
+#. With SunOne accounts, there may be no ':' in
+#. * organizer.value.
+#: ../calendar/gui/e-calendar-view.c:1953 ../calendar/gui/e-memo-table.c:544
+#: ../calendar/gui/e-task-table.c:774
 #, c-format
 msgid "Organizer: %s"
 msgstr "Tá chác: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1952 ../calendar/gui/print.c:3176
+#: ../calendar/gui/e-calendar-view.c:1969 ../calendar/gui/print.c:3346
 #, c-format
 msgid "Location: %s"
 msgstr "Äáa Äiám: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1983
+#: ../calendar/gui/e-calendar-view.c:2000
 #, c-format
 msgid "Time: %s %s"
 msgstr "Giá: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:160
+#: ../calendar/gui/e-cell-date-edit-text.c:156
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:163
+#: ../calendar/gui/e-cell-date-edit-text.c:159
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:171
+#: ../calendar/gui/e-cell-date-edit-text.c:167
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4067,83 +4088,82 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:761
+#: ../calendar/gui/e-day-view-time-item.c:809
 #, c-format
 msgid "%02i minute divisions"
 msgstr "lách %02i phÃt"
 
-#: ../calendar/gui/e-day-view-time-item.c:782
+#: ../calendar/gui/e-day-view-time-item.c:830
 msgid "Show the second time zone"
 msgstr "Hián mÃi giá thá hai"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:799
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
-#: ../modules/calendar/e-calendar-preferences.c:175
-#: ../modules/calendar/e-calendar-preferences.c:224
-#| msgid "None"
+#: ../calendar/gui/e-day-view-time-item.c:847
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.c:179
+#: ../modules/calendar/e-calendar-preferences.c:231
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "KhÃng"
 
-#: ../calendar/gui/e-day-view-time-item.c:826
+#: ../calendar/gui/e-day-view-time-item.c:879
 #: ../calendar/gui/e-timezone-entry.c:319
-#: ../modules/calendar/e-calendar-preferences.c:251
+#: ../modules/calendar/e-calendar-preferences.c:258
 msgid "Select..."
 msgstr "Chán..."
 
 #. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
+#. * %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: ../calendar/gui/e-day-view-top-item.c:877 ../calendar/gui/e-day-view.c:1802
-#: ../calendar/gui/e-week-view-main-item.c:214 ../calendar/gui/print.c:1847
+#. * month, %B = full month name. You can change the
+#. * order but don't change the specifiers or add
+#. * anything.
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1819
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1968
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
+#. * %b = abbreviated month name. Don't use any other specifiers.
 #. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:881 ../calendar/gui/e-day-view.c:1819
-#: ../calendar/gui/e-week-view-main-item.c:223
-#: ../calendar/gui/ea-gnome-calendar.c:203
-#: ../modules/calendar/e-cal-shell-view-private.c:1005
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1836
+#: ../calendar/gui/e-week-view-main-item.c:224
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
+#. * Don't use any other specifiers.
 #. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:885 ../calendar/gui/e-day-view.c:1835
-#: ../calendar/gui/e-week-view-main-item.c:237
-#: ../calendar/gui/ea-gnome-calendar.c:233
-#: ../modules/calendar/e-cal-shell-view-private.c:1041
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1852
+#: ../calendar/gui/e-week-view-main-item.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:234
+#: ../modules/calendar/e-cal-shell-view-private.c:1090
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:904 ../calendar/gui/print.c:920
-#: ../calendar/gui/print.c:2341 ../calendar/gui/print.c:2358
+#: ../calendar/gui/e-day-view.c:1019 ../calendar/gui/e-week-view.c:757
+#: ../calendar/gui/print.c:977 ../calendar/gui/print.c:996
+#: ../calendar/gui/print.c:2484 ../calendar/gui/print.c:2504
 msgid "am"
 msgstr "sÃng"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1008 ../calendar/gui/e-week-view.c:763
-#: ../calendar/gui/print.c:906 ../calendar/gui/print.c:922
-#: ../calendar/gui/print.c:2343 ../calendar/gui/print.c:2360
+#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:982 ../calendar/gui/print.c:998
+#: ../calendar/gui/print.c:2489 ../calendar/gui/print.c:2506
 msgid "pm"
 msgstr "chiáu/tái"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2609
+#: ../calendar/gui/e-day-view.c:2636
 #, c-format
 msgid "Week %d"
 msgstr "Tuán %d"
@@ -4164,167 +4184,174 @@ msgstr "NgÆái dá tÃy chán"
 msgid "Resources"
 msgstr "TÃi nguyÃn"
 
-#: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/e-meeting-store.c:1023 ../calendar/gui/print.c:1069
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1147
 msgid "Individual"
 msgstr "RiÃng lá"
 
-#: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1070 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/print.c:1148 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "NhÃm"
 
-#: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:118 ../calendar/gui/e-meeting-store.c:135
-#: ../calendar/gui/print.c:1071
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1149
 msgid "Resource"
 msgstr "TÃi nguyÃn"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:1072
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
+#: ../calendar/gui/print.c:1150
 msgid "Room"
 msgstr "PhÃng"
 
-#: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1086
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/print.c:1164
 msgid "Chair"
 msgstr "Chá trÃ"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/e-meeting-store.c:1026 ../calendar/gui/print.c:1087
+#: ../calendar/gui/e-meeting-list-view.c:189
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1165
 msgid "Required Participant"
 msgstr "NgÆái dá cán thiát"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/print.c:1088
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/print.c:1166
 msgid "Optional Participant"
 msgstr "NgÆái dá tÃy chán"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/print.c:1089
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/print.c:1167
 msgid "Non-Participant"
 msgstr "NgÆái khÃng tham dá"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../calendar/gui/e-meeting-store.c:1036
+#: ../calendar/gui/e-meeting-list-view.c:213
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:1060
 msgid "Needs Action"
 msgstr "Cán hÃnh Äáng"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:539
+#: ../calendar/gui/e-meeting-list-view.c:578
 msgid "Attendee                          "
 msgstr "NgÆái dá                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:584
+#: ../calendar/gui/e-meeting-list-view.c:623
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Vui lÃng hái Ãm"
 
-#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
 msgid "In Process"
 msgstr "Trong tián trÃnh"
 
-#: ../calendar/gui/e-meeting-store.c:1760
+#: ../calendar/gui/e-meeting-store.c:1876
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Nháp mát kháu Äá truy cáp thÃng tin bán/ránh trÃn mÃy chá %s vái tÆ cÃch "
 "ngÆái dÃng %s"
 
-#: ../calendar/gui/e-meeting-store.c:1767
+#: ../calendar/gui/e-meeting-store.c:1886
 #, c-format
-#| msgid "Failed to create pipe: %s"
 msgid "Failure reason: %s"
 msgstr "NguyÃn nhÃn thát bái: %s"
 
+#: ../calendar/gui/e-meeting-store.c:1891
+#: ../plugins/caldav/caldav-browse-server.c:957
+#: ../plugins/google-account-setup/google-source.c:460
+#: ../plugins/publish-calendar/publish-calendar.c:345
+#: ../smime/gui/component.c:53
+msgid "Enter password"
+msgstr "GÃ mát kháu"
+
 #. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:434
-#: ../calendar/gui/e-meeting-time-sel.c:2397
+#. * %B = full month name, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:2379
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
+#. * name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:438
-#: ../calendar/gui/e-meeting-time-sel.c:2428
+#. * %m = month number, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:449
+#: ../calendar/gui/e-meeting-time-sel.c:2410
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#. * %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:453
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:548
 msgid "Out of Office"
 msgstr "á ngoái vÄn phÃng"
 
-#: ../calendar/gui/e-meeting-time-sel.c:551
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "No Information"
 msgstr "KhÃng cà thÃng tin"
 
-#: ../calendar/gui/e-meeting-time-sel.c:587
+#: ../calendar/gui/e-meeting-time-sel.c:585
 msgid "O_ptions"
 msgstr "TÃ_y chán"
 
-#: ../calendar/gui/e-meeting-time-sel.c:605
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _only working hours"
 msgstr "Hián chá giá lÃm _viác"
 
-#: ../calendar/gui/e-meeting-time-sel.c:616
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "Show _zoomed out"
 msgstr "Hián Thu _nhá"
 
-#: ../calendar/gui/e-meeting-time-sel.c:632
+#: ../calendar/gui/e-meeting-time-sel.c:630
 msgid "_Update free/busy"
 msgstr "Cá_p nhát Ránh/Bán"
 
-#: ../calendar/gui/e-meeting-time-sel.c:647
+#: ../calendar/gui/e-meeting-time-sel.c:645
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:665
+#: ../calendar/gui/e-meeting-time-sel.c:663
 msgid "_Autopick"
 msgstr "_Tá Äáng chán"
 
-#: ../calendar/gui/e-meeting-time-sel.c:680
+#: ../calendar/gui/e-meeting-time-sel.c:678
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:698
+#: ../calendar/gui/e-meeting-time-sel.c:696
 msgid "_All people and resources"
 msgstr "_Mái ngÆái và tÃi nguyÃn Äáu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:708
+#: ../calendar/gui/e-meeting-time-sel.c:706
 msgid "All _people and one resource"
 msgstr "Mái _ngÆái và mát tÃi nguyÃn"
 
-#: ../calendar/gui/e-meeting-time-sel.c:718
+#: ../calendar/gui/e-meeting-time-sel.c:716
 msgid "_Required people"
 msgstr "NgÆái _cán thiát"
 
-#: ../calendar/gui/e-meeting-time-sel.c:727
+#: ../calendar/gui/e-meeting-time-sel.c:725
 msgid "Required people and _one resource"
 msgstr "NgÆái cán thiát _và mát tÃi nguyÃn"
 
-#: ../calendar/gui/e-meeting-time-sel.c:776
+#: ../calendar/gui/e-meeting-time-sel.c:774
 msgid "_Start time:"
 msgstr "Thái Äiám Äá_u:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:816
+#: ../calendar/gui/e-meeting-time-sel.c:814
 msgid "_End time:"
 msgstr "Thái Äiám _cuái:"
 
@@ -4352,51 +4379,47 @@ msgstr "NgÃn ngá"
 msgid "Member"
 msgstr "ThÃnh viÃn"
 
-#: ../calendar/gui/e-memo-table.c:419
+#: ../calendar/gui/e-memo-table.c:420
 #: ../modules/calendar/e-cal-shell-content.c:473
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:439
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
+#: ../modules/calendar/e-memo-shell-view.c:293
+#: ../plugins/caldav/caldav-browse-server.c:458
 msgid "Memos"
 msgstr "Ghi nhá"
 
-#: ../calendar/gui/e-memo-table.c:500 ../calendar/gui/e-task-table.c:717
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:733
 msgid "* No Summary *"
 msgstr "* KhÃng cà bán tÃm tát *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:797
+#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:817
 msgid "Start: "
 msgstr "Bát Äáu: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:815
+#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:835
 msgid "Due: "
 msgstr "Äán hán: "
 
-#: ../calendar/gui/e-memo-table.c:720
-#| msgid "Cut selected messages to the clipboard"
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Cut selected memos to the clipboard"
 msgstr "Cát cÃc ghi nhá ÄÃ chán vÃo báng nhÃp"
 
-#: ../calendar/gui/e-memo-table.c:726
-#| msgid "Copy selected messages to the clipboard"
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Copy selected memos to the clipboard"
 msgstr "ChÃp cÃc ghi nhá ÄÃ chán vÃo báng nhÃp"
 
-#: ../calendar/gui/e-memo-table.c:732
-#| msgid "Paste memo from the clipboard"
+#: ../calendar/gui/e-memo-table.c:738
 msgid "Paste memos from the clipboard"
 msgstr "DÃn ghi nhá tá báng nhÃp"
 
-#: ../calendar/gui/e-memo-table.c:738
-#: ../modules/calendar/e-memo-shell-view-actions.c:572
+#: ../calendar/gui/e-memo-table.c:744
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "Delete selected memos"
 msgstr "Xoà cÃc ghi nhá Äà chán"
 
-#: ../calendar/gui/e-memo-table.c:744
-#| msgid "Select all visible messages"
+#: ../calendar/gui/e-memo-table.c:750
 msgid "Select all visible memos"
 msgstr "Chán mái ghi nhá Äang hián"
 
@@ -4405,50 +4428,44 @@ msgid "Click to add a memo"
 msgstr "Nhán Äá thÃm ghi nhá"
 
 #. Translators: "%d%%" is the percentage of a task done.
-#. %d is the actual value, %% is replaced with a percent sign.
-#. Result values will be 0%, 10%, 20%, ... 100%
+#. * %d is the actual value, %% is replaced with a percent sign.
+#. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:544
+#: ../calendar/gui/e-task-table.c:555
 #, c-format
-#| msgid "%d %b %Y"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:636 ../calendar/gui/print.c:2140
-#: ../calendar/importers/icalendar-importer.c:81
-#: ../calendar/importers/icalendar-importer.c:828
+#: ../calendar/gui/e-task-table.c:652 ../calendar/gui/print.c:2273
+#: ../calendar/importers/icalendar-importer.c:85
+#: ../calendar/importers/icalendar-importer.c:1043
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
 #: ../modules/calendar/e-cal-shell-content.c:434
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:444
-#: ../plugins/caldav/caldav-browse-server.c:437
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
+#: ../modules/calendar/e-task-shell-view.c:448
+#: ../plugins/caldav/caldav-browse-server.c:456
 msgid "Tasks"
 msgstr "TÃc vá"
 
-#: ../calendar/gui/e-task-table.c:943
-#| msgid "Cut selected text to the clipboard"
+#: ../calendar/gui/e-task-table.c:968
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cát tÃc vá ÄÃ chán vÃo báng nhÃp"
 
-#: ../calendar/gui/e-task-table.c:949
-#| msgid "Copy selected text to the clipboard"
+#: ../calendar/gui/e-task-table.c:974
 msgid "Copy selected tasks to the clipboard"
 msgstr "ChÃp tÃc vá ÄÃ chán sang báng nhÃp"
 
-#: ../calendar/gui/e-task-table.c:955
+#: ../calendar/gui/e-task-table.c:980
 msgid "Paste tasks from the clipboard"
 msgstr "DÃn cÃc tÃc vá tá báng nhÃp"
 
-#: ../calendar/gui/e-task-table.c:961
-#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../calendar/gui/e-task-table.c:986
+#: ../modules/calendar/e-task-shell-view-actions.c:710
 msgid "Delete selected tasks"
 msgstr "Xoà cÃc tÃc vá Äà chán"
 
-#: ../calendar/gui/e-task-table.c:967
-#| msgid "Select all visible messages"
+#: ../calendar/gui/e-task-table.c:992
 msgid "Select all visible tasks"
 msgstr "Chán mái tÃc vá Äang hián"
 
@@ -4457,67 +4474,69 @@ msgid "Select Timezone"
 msgstr "Chán mÃi giá"
 
 #. 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/e-week-view-main-item.c:231 ../calendar/gui/print.c:1828
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1949
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:286
-msgid "It has alarms."
-msgstr "Nà cà bÃo Äáng."
+#: ../calendar/gui/ea-cal-view-event.c:290
+#, fuzzy
+#| msgid "It has recurrences."
+msgid "It has reminders."
+msgstr "Nà cà nhiáu lán."
 
-#: ../calendar/gui/ea-cal-view-event.c:289
+#: ../calendar/gui/ea-cal-view-event.c:293
 msgid "It has recurrences."
 msgstr "Nà cà nhiáu lán."
 
-#: ../calendar/gui/ea-cal-view-event.c:292
+#: ../calendar/gui/ea-cal-view-event.c:296
 msgid "It is a meeting."
 msgstr "Nà là cuác háp."
 
-#: ../calendar/gui/ea-cal-view-event.c:298
+#: ../calendar/gui/ea-cal-view-event.c:303
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Sá kián lách: tÃm tát là %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:306
 msgid "Calendar Event: It has no summary."
 msgstr "Sá kián lách: chÆa cà tÃm tát."
 
-#: ../calendar/gui/ea-cal-view-event.c:322
+#: ../calendar/gui/ea-cal-view-event.c:328
 msgid "calendar view event"
 msgstr "sá kián xem lách"
 
-#: ../calendar/gui/ea-cal-view-event.c:551
+#: ../calendar/gui/ea-cal-view-event.c:557
 msgid "Grab Focus"
 msgstr "Bát tiÃu Äiám"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:315
 msgid "New Appointment"
 msgstr "Cuác hán mái"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:316
 msgid "New All Day Event"
 msgstr "Sá kián nguyÃn ngÃy mái"
 
-#: ../calendar/gui/ea-cal-view.c:307
+#: ../calendar/gui/ea-cal-view.c:317
 msgid "New Meeting"
 msgstr "Cuác háp mái"
 
-#: ../calendar/gui/ea-cal-view.c:308
+#: ../calendar/gui/ea-cal-view.c:318
 msgid "Go to Today"
 msgstr "Äi tái ngÃy hÃm nay"
 
-#: ../calendar/gui/ea-cal-view.c:309
+#: ../calendar/gui/ea-cal-view.c:319
 msgid "Go to Date"
 msgstr "Äi tái ngÃy"
 
-#: ../calendar/gui/ea-day-view-main-item.c:308
-#: ../calendar/gui/ea-week-view-main-item.c:340
+#: ../calendar/gui/ea-day-view-main-item.c:318
+#: ../calendar/gui/ea-week-view-main-item.c:344
 msgid "a table to view and select the current time range"
 msgstr "mát báng cho phÃp xem và chán phám vi thái gian hián cÃ"
 
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -4525,7 +4544,7 @@ msgstr[0] "Nà cà %d sá kián."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:153
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:154
 msgid "It has no events."
 msgstr "Nà khÃng cà sá kián."
 
@@ -4553,150 +4572,93 @@ msgstr "Ã xem lách cho mát tuán lÃm viác"
 msgid "calendar view for one or more days"
 msgstr "Ã xem lách cho mát hay nhiáu ngÃy"
 
-#: ../calendar/gui/ea-gnome-calendar.c:49
-#: ../calendar/gui/ea-gnome-calendar.c:57
-#: ../calendar/importers/icalendar-importer.c:860
+#: ../calendar/gui/ea-gnome-calendar.c:50
+#: ../calendar/gui/ea-gnome-calendar.c:58
+#: ../calendar/importers/icalendar-importer.c:1077
 msgid "Gnome Calendar"
 msgstr "Lách Gnome"
 
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:1001
+#: ../calendar/gui/ea-gnome-calendar.c:201
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:205
-#: ../calendar/gui/ea-gnome-calendar.c:210
-#: ../calendar/gui/ea-gnome-calendar.c:212
-#: ../modules/calendar/e-cal-shell-view-private.c:1008
-#: ../modules/calendar/e-cal-shell-view-private.c:1014
-#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../calendar/gui/ea-gnome-calendar.c:213
+#: ../modules/calendar/e-cal-shell-view-private.c:1057
+#: ../modules/calendar/e-cal-shell-view-private.c:1063
+#: ../modules/calendar/e-cal-shell-view-private.c:1066
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:229
-#: ../calendar/gui/ea-gnome-calendar.c:235
-#: ../calendar/gui/ea-gnome-calendar.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:243
-#: ../modules/calendar/e-cal-shell-view-private.c:1034
-#: ../modules/calendar/e-cal-shell-view-private.c:1045
-#: ../modules/calendar/e-cal-shell-view-private.c:1052
-#: ../modules/calendar/e-cal-shell-view-private.c:1055
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../calendar/gui/ea-gnome-calendar.c:236
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../calendar/gui/ea-gnome-calendar.c:244
+#: ../modules/calendar/e-cal-shell-view-private.c:1083
+#: ../modules/calendar/e-cal-shell-view-private.c:1094
+#: ../modules/calendar/e-cal-shell-view-private.c:1101
+#: ../modules/calendar/e-cal-shell-view-private.c:1104
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
-#: ../calendar/gui/ea-jump-button.c:147
+#: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "NÃt nháy"
 
-#: ../calendar/gui/ea-jump-button.c:156
+#: ../calendar/gui/ea-jump-button.c:159
 msgid "Click here, you can find more events."
 msgstr "Nhán vÃo ÄÃy Äá tÃm sá kián thÃm náa"
 
-#: ../calendar/gui/ea-week-view.c:158
+#: ../calendar/gui/ea-week-view.c:159
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Xem thÃng: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:162
+#: ../calendar/gui/ea-week-view.c:163
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Xem tuán: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:196
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for a month"
 msgstr "Ã xem lách cho mát thÃng"
 
-#: ../calendar/gui/ea-week-view.c:198
+#: ../calendar/gui/ea-week-view.c:199
 msgid "calendar view for one or more weeks"
 msgstr "Ã xem lách cho mát hay nhiáu tuán"
 
-#: ../calendar/gui/gnome-cal.c:2201
+#: ../calendar/gui/gnome-cal.c:2250
 msgid "Purging"
 msgstr "Äang táy..."
 
-#: ../calendar/gui/goto-dialog.ui.h:1
-msgid "April"
-msgstr "ThÃng TÆ"
-
-#: ../calendar/gui/goto-dialog.ui.h:2
-msgid "August"
-msgstr "ThÃng TÃm"
-
-#: ../calendar/gui/goto-dialog.ui.h:3
-msgid "December"
-msgstr "ThÃng Cháp"
-
-#: ../calendar/gui/goto-dialog.ui.h:4
-msgid "February"
-msgstr "ThÃng Hai"
-
-#: ../calendar/gui/goto-dialog.ui.h:5
-msgid "January"
-msgstr "ThÃng GiÃng"
-
-#: ../calendar/gui/goto-dialog.ui.h:6
-msgid "July"
-msgstr "ThÃng Báy"
-
-#: ../calendar/gui/goto-dialog.ui.h:7
-msgid "June"
-msgstr "ThÃng SÃu"
-
-#: ../calendar/gui/goto-dialog.ui.h:8
-msgid "March"
-msgstr "ThÃng Ba"
-
-#: ../calendar/gui/goto-dialog.ui.h:9
-msgid "May"
-msgstr "ThÃng NÄm"
-
-#: ../calendar/gui/goto-dialog.ui.h:10
-msgid "November"
-msgstr "ThÃng MÆái Mát"
-
-#: ../calendar/gui/goto-dialog.ui.h:11
-msgid "October"
-msgstr "ThÃng MÆái"
-
-#: ../calendar/gui/goto-dialog.ui.h:12
-msgid "Select Date"
-msgstr "Chán ngÃy"
-
-#: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1316
-msgid "Select _Today"
-msgstr "Chán _hÃm nay"
-
-#: ../calendar/gui/goto-dialog.ui.h:14
-msgid "September"
-msgstr "ThÃng ChÃn"
-
-#: ../calendar/gui/itip-utils.c:407 ../calendar/gui/itip-utils.c:458
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:511 ../calendar/gui/itip-utils.c:566
+#: ../calendar/gui/itip-utils.c:669
 msgid "An organizer must be set."
 msgstr "Phái chán mát bá tá chác."
 
-#: ../calendar/gui/itip-utils.c:450
+#: ../calendar/gui/itip-utils.c:558
 msgid "At least one attendee is necessary"
 msgstr "Cán Ãt nhát mát ngÆái dá."
 
-#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:755 ../calendar/gui/itip-utils.c:916
 msgid "Event information"
 msgstr "ThÃng tin sá kián"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:785
+#: ../calendar/gui/itip-utils.c:758 ../calendar/gui/itip-utils.c:919
 msgid "Task information"
 msgstr "ThÃng tin tÃc vá"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:761 ../calendar/gui/itip-utils.c:922
 msgid "Memo information"
 msgstr "ThÃng tin ghi nhá"
 
-#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:806
+#: ../calendar/gui/itip-utils.c:764 ../calendar/gui/itip-utils.c:940
 msgid "Free/Busy information"
 msgstr "ThÃng tin ránh/bán"
 
-#: ../calendar/gui/itip-utils.c:643
+#: ../calendar/gui/itip-utils.c:767
 msgid "Calendar information"
 msgstr "ThÃng tin lách"
 
@@ -4704,7 +4666,7 @@ msgstr "ThÃng tin lách"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:677
+#: ../calendar/gui/itip-utils.c:804
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "ÄÃ cháp nhán"
@@ -4713,7 +4675,7 @@ msgstr "ÄÃ cháp nhán"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:684
+#: ../calendar/gui/itip-utils.c:811
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Tám cháp nhán"
@@ -4725,7 +4687,7 @@ msgstr "Tám cháp nhán"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
+#: ../calendar/gui/itip-utils.c:818 ../calendar/gui/itip-utils.c:866
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Bá tá chái"
@@ -4734,7 +4696,7 @@ msgstr "Bá tá chái"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:825
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "áy nhiám"
@@ -4742,7 +4704,7 @@ msgstr "áy nhiám"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:711
+#: ../calendar/gui/itip-utils.c:838
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "ÄÃ cáp nhát"
@@ -4750,7 +4712,7 @@ msgstr "ÄÃ cáp nhát"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:845
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "ThÃi"
@@ -4758,7 +4720,7 @@ msgstr "ThÃi"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:725
+#: ../calendar/gui/itip-utils.c:852
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Cáp nhát"
@@ -4766,241 +4728,254 @@ msgstr "Cáp nhát"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:732
+#: ../calendar/gui/itip-utils.c:859
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Phán Äá nghá"
 
-#: ../calendar/gui/itip-utils.c:803
+#: ../calendar/gui/itip-utils.c:937
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "ThÃng tin Ránh/Bán (%s Äán %s)"
 
-#: ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:945
 msgid "iCalendar information"
 msgstr "ThÃng tin iCalendar"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:970
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "KhÃng thá Äát trÆác tÃi nguyÃn, sá kián mái cà thá xung Äát vái cÃc sá kián "
 "khÃc."
 
-#: ../calendar/gui/itip-utils.c:833
+#: ../calendar/gui/itip-utils.c:974
 msgid "Unable to book a resource, error: "
 msgstr "KhÃng thá Äát trÆác tÃi nguyÃn, lái: "
 
-#: ../calendar/gui/itip-utils.c:986
+#: ../calendar/gui/itip-utils.c:1137
 msgid "You must be an attendee of the event."
 msgstr "Bán phái là ngÆái dá sá kián áy."
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:581
 msgid "1st"
 msgstr "máng 1"
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:581
 msgid "2nd"
 msgstr "máng 2"
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:581
 msgid "3rd"
 msgstr "máng 3"
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:581
 msgid "4th"
 msgstr "máng 4"
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:581
 msgid "5th"
 msgstr "máng 5"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:582
 msgid "6th"
 msgstr "máng 6"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:582
 msgid "7th"
 msgstr "máng 7"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:582
 msgid "8th"
 msgstr "máng 8"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:582
 msgid "9th"
 msgstr "máng 9"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:582
 msgid "10th"
 msgstr "máng 10"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:583
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:583
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:583
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:583
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:583
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:584
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:584
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:584
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:584
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:584
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:585
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:585
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:585
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:585
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:585
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:586
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:586
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:586
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:586
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:586
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:587
 msgid "31st"
 msgstr "31"
 
-#: ../calendar/gui/print.c:605
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:644
 msgid "Su"
 msgstr "CN"
 
-#: ../calendar/gui/print.c:605
+#: ../calendar/gui/print.c:644
 msgid "Mo"
 msgstr "T2"
 
-#: ../calendar/gui/print.c:605
+#: ../calendar/gui/print.c:644
 msgid "Tu"
 msgstr "T3"
 
-#: ../calendar/gui/print.c:605
+#: ../calendar/gui/print.c:644
 msgid "We"
 msgstr "T4"
 
-#: ../calendar/gui/print.c:606
+#: ../calendar/gui/print.c:645
 msgid "Th"
 msgstr "T5"
 
-#: ../calendar/gui/print.c:606
+#: ../calendar/gui/print.c:645
 msgid "Fr"
 msgstr "T6"
 
-#: ../calendar/gui/print.c:606
+#: ../calendar/gui/print.c:645
 msgid "Sa"
 msgstr "T7"
 
-#: ../calendar/gui/print.c:2969
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:3139
 msgid " to "
 msgstr " tái "
 
-#: ../calendar/gui/print.c:2979
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:3149
 msgid " (Completed "
 msgstr " (HoÃn tát "
 
-#: ../calendar/gui/print.c:2985
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:3155
 msgid "Completed "
 msgstr "HoÃn tát "
 
-#: ../calendar/gui/print.c:2995
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:3165
 msgid " (Due "
 msgstr " (Äán hán "
 
-#: ../calendar/gui/print.c:3002
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:3172
 msgid "Due "
 msgstr "Äán hán "
 
-#: ../calendar/gui/print.c:3167
+#: ../calendar/gui/print.c:3337
 #, c-format
 msgid "Summary: %s"
 msgstr "TÃm tát: %s"
 
-#: ../calendar/gui/print.c:3194
+#: ../calendar/gui/print.c:3364
 msgid "Attendees: "
 msgstr "NgÆái dá:"
 
-#: ../calendar/gui/print.c:3237
+#: ../calendar/gui/print.c:3407
 #, c-format
 msgid "Status: %s"
 msgstr "Tráng thÃi: %s"
 
-#: ../calendar/gui/print.c:3252
+#: ../calendar/gui/print.c:3422
 #, c-format
 msgid "Priority: %s"
 msgstr "Äá Æu tiÃn: %s"
 
-#: ../calendar/gui/print.c:3270
+#: ../calendar/gui/print.c:3440
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Phán trÄm hoÃn tát: %i"
 
-#: ../calendar/gui/print.c:3281
+#: ../calendar/gui/print.c:3451
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3294
+#: ../calendar/gui/print.c:3464
 #, c-format
 msgid "Categories: %s"
 msgstr "Loái: %s"
 
-#: ../calendar/gui/print.c:3305
+#: ../calendar/gui/print.c:3475
 msgid "Contacts: "
 msgstr "LiÃn lác: "
 
@@ -5009,6 +4984,10 @@ msgstr "LiÃn lác: "
 msgid "% Completed"
 msgstr "% hoÃn tát"
 
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Cancelled"
+msgstr "Bá thÃi"
+
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "Äang tián hÃnh"
@@ -5021,211 +5000,187 @@ msgstr "trÃn"
 msgid "is less than"
 msgstr "dÆái"
 
-#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:84
 msgid "Appointments and Meetings"
 msgstr "Cuác hán và Cuác háp"
 
-#: ../calendar/importers/icalendar-importer.c:350
-#: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1958
+#: ../calendar/importers/icalendar-importer.c:435
+#: ../calendar/importers/icalendar-importer.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:2170
 msgid "Opening calendar"
 msgstr "Äang má lách..."
 
-#: ../calendar/importers/icalendar-importer.c:493
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "iCalendar files (.ics)"
 msgstr "Táp tin iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:494
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution iCalendar importer"
 msgstr "Bá nháp lách iCalendar"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:674
 msgid "Reminder!"
 msgstr "âââ Nhác nhá âââ"
 
-#: ../calendar/importers/icalendar-importer.c:662
-#| msgid "vCalendar files (.vcf)"
+#: ../calendar/importers/icalendar-importer.c:758
 msgid "vCalendar files (.vcs)"
 msgstr "Táp tin vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:663
+#: ../calendar/importers/icalendar-importer.c:759
 msgid "Evolution vCalendar importer"
 msgstr "Bá nháp lách vCalendar"
 
-#: ../calendar/importers/icalendar-importer.c:823
+#: ../calendar/importers/icalendar-importer.c:1038
 msgid "Calendar Events"
 msgstr "Sá kián lách"
 
-#: ../calendar/importers/icalendar-importer.c:861
+#: ../calendar/importers/icalendar-importer.c:1078
 msgid "Evolution Calendar intelligent importer"
 msgstr "Bá nháp lách thÃng minh Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
-#| msgctxt "New"
-#| msgid "M_eeting"
+#: ../calendar/importers/icalendar-importer.c:1146
+#: ../calendar/importers/icalendar-importer.c:1464
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Cuác háp"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
-#| msgid "Sent"
+#: ../calendar/importers/icalendar-importer.c:1146
+#: ../calendar/importers/icalendar-importer.c:1464
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Sá kián"
 
-#: ../calendar/importers/icalendar-importer.c:929
-#: ../calendar/importers/icalendar-importer.c:1244
-#| msgid "Task"
+#: ../calendar/importers/icalendar-importer.c:1149
+#: ../calendar/importers/icalendar-importer.c:1465
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "TÃc vá"
 
-#: ../calendar/importers/icalendar-importer.c:932
-#: ../calendar/importers/icalendar-importer.c:1245
-#| msgid "Memo"
+#: ../calendar/importers/icalendar-importer.c:1152
+#: ../calendar/importers/icalendar-importer.c:1466
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Ghi nhá"
 
-#: ../calendar/importers/icalendar-importer.c:941
-#| msgid "It has recurrences."
+#: ../calendar/importers/icalendar-importer.c:1161
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "cà láp lái"
 
-#: ../calendar/importers/icalendar-importer.c:946
-#| msgid "This and Prior Instances"
+#: ../calendar/importers/icalendar-importer.c:1166
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "là mát thá hián"
 
-#: ../calendar/importers/icalendar-importer.c:951
-#| msgid "It has alarms."
+#: ../calendar/importers/icalendar-importer.c:1171
+#, fuzzy
+#| msgid "Sh_ow a reminder"
 msgctxt "iCalImp"
-msgid "has alarms"
-msgstr "cà bÃo Äáng"
+msgid "has reminders"
+msgstr "_Hián bá nhác nhá"
 
-#: ../calendar/importers/icalendar-importer.c:956
-#| msgid "%s attachment"
+#: ../calendar/importers/icalendar-importer.c:1176
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "cà ÄÃnh kÃm"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:969
-#| msgid "Public"
+#: ../calendar/importers/icalendar-importer.c:1189
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "CÃng cáng"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:972
-#| msgid "Private"
+#: ../calendar/importers/icalendar-importer.c:1192
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "RiÃng tÆ"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:975
-#| msgid "Confidential"
+#: ../calendar/importers/icalendar-importer.c:1195
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Mát"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:979
-#| msgid "Classification"
+#: ../calendar/importers/icalendar-importer.c:1199
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "PhÃn loái"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:984
-#: ../calendar/importers/icalendar-importer.c:1284
-#| msgid "Summary"
+#: ../calendar/importers/icalendar-importer.c:1204
+#: ../calendar/importers/icalendar-importer.c:1505
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "TÃm tát"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:990
-#| msgid "Location"
+#: ../calendar/importers/icalendar-importer.c:1210
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Äáa chá"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:998
-#: ../calendar/importers/icalendar-importer.c:1280
-#| msgid "Start"
+#: ../calendar/importers/icalendar-importer.c:1218
+#: ../calendar/importers/icalendar-importer.c:1501
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Bát Äáu"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1009
-#| msgid "Due"
+#: ../calendar/importers/icalendar-importer.c:1229
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Äán hán"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1021
-#| msgid "End"
+#: ../calendar/importers/icalendar-importer.c:1241
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Kát thÃc"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1031
-#| msgid "Categories"
+#: ../calendar/importers/icalendar-importer.c:1251
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "PhÃn loái"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1055
-#| msgid "Completed"
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "HoÃn tát"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1063
-#| msgid "URL"
+#: ../calendar/importers/icalendar-importer.c:1283
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1074
-#: ../calendar/importers/icalendar-importer.c:1077
-#| msgid "Organizer"
+#: ../calendar/importers/icalendar-importer.c:1294
+#: ../calendar/importers/icalendar-importer.c:1297
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Tá chác"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1097
-#: ../calendar/importers/icalendar-importer.c:1100
-#| msgid "Attendees"
+#: ../calendar/importers/icalendar-importer.c:1317
+#: ../calendar/importers/icalendar-importer.c:1320
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "NgÆái dá"
 
-#: ../calendar/importers/icalendar-importer.c:1114
-#| msgid "Description"
+#: ../calendar/importers/icalendar-importer.c:1334
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "MÃ tá"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1276
-#| msgid "Type"
+#: ../calendar/importers/icalendar-importer.c:1497
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Kiáu"
@@ -6779,145 +6734,152 @@ msgstr "ThÃi BÃnh DÆÆng/Wallis"
 msgid "Pacific/Yap"
 msgstr "ThÃi BÃnh DÆÆng/Yap"
 
-#: ../composer/e-composer-actions.c:163
+#: ../composer/e-composer-actions.c:208
 msgid "Save as..."
 msgstr "LÆu dáng..."
 
-#: ../composer/e-composer-actions.c:259
-#: ../widgets/misc/e-attachment-view.c:380
-msgid "Attach a file"
-msgstr "ÄÃnh kÃm táp tin"
-
-#: ../composer/e-composer-actions.c:264
+#: ../composer/e-composer-actions.c:296
 #: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "ÄÃn_g"
 
-#: ../composer/e-composer-actions.c:266
+#: ../composer/e-composer-actions.c:298
 msgid "Close the current file"
 msgstr "ÄÃng táp tin hián thái"
 
-#: ../composer/e-composer-actions.c:273
+#: ../composer/e-composer-actions.c:303
+msgid "New _Message"
+msgstr "ThÆ _mái"
+
+#: ../composer/e-composer-actions.c:305
+msgid "Open New Message window"
+msgstr "Má cáa sá ThÆ Mái"
+
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
+msgid "Configure Evolution"
+msgstr "Cáu hÃnh Evolution"
+
+#: ../composer/e-composer-actions.c:319
 msgid "Save the current file"
 msgstr "LÆu táp tin hián thái"
 
-#: ../composer/e-composer-actions.c:278
+#: ../composer/e-composer-actions.c:324
 msgid "Save _As..."
 msgstr "LÆ_u dáng..."
 
-#: ../composer/e-composer-actions.c:280
+#: ../composer/e-composer-actions.c:326
 msgid "Save the current file with a different name"
 msgstr "LÆu táp tin hián thái vái tÃn khÃc"
 
-#: ../composer/e-composer-actions.c:285
-msgid "New _Message"
-msgstr "ThÆ _mái"
-
-#: ../composer/e-composer-actions.c:287
-msgid "Open New Message window"
-msgstr "Má cáa sá ThÆ Mái"
-
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:333
 msgid "Character _Encoding"
 msgstr "Báng mà _Kà tá"
 
-#: ../composer/e-composer-actions.c:311
+#: ../composer/e-composer-actions.c:350
 msgid "_Print..."
 msgstr "_In..."
 
-#: ../composer/e-composer-actions.c:318
+#: ../composer/e-composer-actions.c:357
 msgid "Print Pre_view"
 msgstr "_Xem thá bán in"
 
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:364
 msgid "Save as _Draft"
 msgstr "LÆu _bán nhÃp"
 
-#: ../composer/e-composer-actions.c:327
+#: ../composer/e-composer-actions.c:366
 msgid "Save as draft"
 msgstr "LÆu dáng nhÃp"
 
-#: ../composer/e-composer-actions.c:332 ../composer/e-composer-private.c:318
+#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
 msgid "S_end"
 msgstr "_Gái"
 
-#: ../composer/e-composer-actions.c:334
+#: ../composer/e-composer-actions.c:373
 msgid "Send this message"
 msgstr "Gái thÆ nÃy"
 
-#: ../composer/e-composer-actions.c:342
+#: ../composer/e-composer-actions.c:381
 msgid "PGP _Encrypt"
 msgstr "_Mát mà PGP"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:383
 msgid "Encrypt this message with PGP"
 msgstr "Mát mà hoà thÆ nÃy báng PGP"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:389
 msgid "PGP _Sign"
 msgstr "_KÃ PGP"
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:391
 msgid "Sign this message with your PGP key"
 msgstr "Kà tÃn vÃo thÆ nÃy báng khoà PGP cáa bán"
 
-#: ../composer/e-composer-actions.c:358
+#: ../composer/e-composer-actions.c:397
+msgid "_Picture Gallery"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:399
+msgid "Show a collection of pictures that you can drag to your message"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:405
 msgid "_Prioritize Message"
 msgstr "Æ_u tiÃn hoà thÆ"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:407
 msgid "Set the message priority to high"
 msgstr "Äát Æu tiÃn thÆ là cao"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:413
 msgid "Re_quest Read Receipt"
 msgstr "YÃu cáu thÃng _bÃo ÄÃ Äác"
 
-#: ../composer/e-composer-actions.c:368
+#: ../composer/e-composer-actions.c:415
 msgid "Get delivery notification when your message is read"
 msgstr "Chán Äá nhán thÃng bÃo khi ngÆái nhán ÄÃ Äác thÆ bán"
 
-#: ../composer/e-composer-actions.c:374
+#: ../composer/e-composer-actions.c:421
 msgid "S/MIME En_crypt"
 msgstr "Mát mà _S/MIME"
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:423
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Mát mà hoà thÆ nÃy báng Cháng nhán Mát mà hoà S/MIME cáa bán"
 
-#: ../composer/e-composer-actions.c:382
+#: ../composer/e-composer-actions.c:429
 msgid "S/MIME Sig_n"
 msgstr "KÃ S/MIM_E"
 
-#: ../composer/e-composer-actions.c:384
+#: ../composer/e-composer-actions.c:431
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Kà tÃn vÃo thÆ nÃy báng Cháng nhán Chá kà S/MIME cáa bán"
 
-#: ../composer/e-composer-actions.c:390
+#: ../composer/e-composer-actions.c:437
 msgid "_Bcc Field"
 msgstr "TrÆáng _BCC"
 
-#: ../composer/e-composer-actions.c:392
+#: ../composer/e-composer-actions.c:439
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Bát tát hián thá trÆáng BÃ mát ChÃp Cho (BCC)"
 
-#: ../composer/e-composer-actions.c:398
+#: ../composer/e-composer-actions.c:445
 msgid "_Cc Field"
 msgstr "TrÆáng _CC"
 
-#: ../composer/e-composer-actions.c:400
+#: ../composer/e-composer-actions.c:447
 msgid "Toggles whether the CC field is displayed"
 msgstr "Bát tát hián thá trÆáng ChÃp Cho (CC)"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:453
 msgid "_Reply-To Field"
 msgstr "TrÆáng _Reply-To (Trá lái)"
 
-#: ../composer/e-composer-actions.c:408
+#: ../composer/e-composer-actions.c:455
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Bát tát hián thá trÆáng Reply-To (Trá lái)"
 
-#: ../composer/e-composer-actions.c:464
+#: ../composer/e-composer-actions.c:514
 msgid "Save Draft"
 msgstr "LÆu bán nhÃp"
 
@@ -6937,35 +6899,35 @@ msgstr ""
 "HÃy gà cÃc Äáa chá sá nhán mát bán sao cáa thÆ mà khÃng xuát hián trÃn danh "
 "sÃch ngÆái nhán thÆ nÃy"
 
-#: ../composer/e-composer-header-table.c:1006
+#: ../composer/e-composer-header-table.c:1021
 msgid "Fr_om:"
 msgstr "_Tá:"
 
-#: ../composer/e-composer-header-table.c:1015
+#: ../composer/e-composer-header-table.c:1030
 msgid "_Reply-To:"
 msgstr "T_rá lái cho:"
 
-#: ../composer/e-composer-header-table.c:1019
+#: ../composer/e-composer-header-table.c:1034
 msgid "_To:"
 msgstr "Äá_n:"
 
-#: ../composer/e-composer-header-table.c:1024
+#: ../composer/e-composer-header-table.c:1039
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:1029
+#: ../composer/e-composer-header-table.c:1044
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:1049
 msgid "_Post To:"
 msgstr "_Gái tái:"
 
-#: ../composer/e-composer-header-table.c:1038
+#: ../composer/e-composer-header-table.c:1053
 msgid "S_ubject:"
 msgstr "C_há Äá:"
 
-#: ../composer/e-composer-header-table.c:1047
+#: ../composer/e-composer-header-table.c:1062
 msgid "Si_gnature:"
 msgstr "Chá _kÃ:"
 
@@ -6977,39 +6939,34 @@ msgstr "Nhán ÄÃy Äá xem Sá Äáa chá"
 msgid "Click here to select folders to post to"
 msgstr "Nhán vÃo ÄÃy Äá chán thÆ mác nÆi cán gái"
 
-#: ../composer/e-composer-private.c:217
-#| msgid "Copy the selection"
+#: ../composer/e-composer-private.c:249
 msgid "Undo the last action"
 msgstr "Hái lái hÃnh Äáng cuái cÃng"
 
-#: ../composer/e-composer-private.c:221
-#| msgid "Send Latest Information"
+#: ../composer/e-composer-private.c:253
 msgid "Redo the last undone action"
 msgstr "Thác hián lái hÃnh Äáng váa ÄÆác hái lái"
 
-#: ../composer/e-composer-private.c:225
-#| msgid "Search filter"
+#: ../composer/e-composer-private.c:257
 msgid "Search for text"
 msgstr "TÃm chuái"
 
-#: ../composer/e-composer-private.c:229
-#| msgid "Search for an iPod failed"
+#: ../composer/e-composer-private.c:261
 msgid "Search for and replace text"
 msgstr "TÃm và thay thá vÄn bán"
 
-#: ../composer/e-composer-private.c:338
-#| msgid "Save Draft"
+#: ../composer/e-composer-private.c:372
 msgid "Save draft"
 msgstr "LÆu bán nhÃp"
 
-#: ../composer/e-msg-composer.c:784
+#: ../composer/e-msg-composer.c:812
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "KhÃng thá kà tÃn thÆ gái Äi: chÆa láp cháng nhán chá kà cho tÃi khoán nÃy."
 
-#: ../composer/e-msg-composer.c:793
+#: ../composer/e-msg-composer.c:821
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7017,18 +6974,16 @@ msgid ""
 msgstr ""
 "KhÃng thá mà hoà thÆ gái Äi: chÆa láp cháng nhán mà hoà cho tÃi khoán nÃy."
 
-#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2014
+#: ../composer/e-msg-composer.c:1699 ../composer/e-msg-composer.c:2083
 msgid "Compose Message"
 msgstr "Viát thÆ"
 
-#: ../composer/e-msg-composer.c:4085
-#| msgid ""
-#| "<b>(The composer contains a non-text message body, which cannot be "
-#| "edited.)</b>"
+#: ../composer/e-msg-composer.c:4228
 msgid "The composer contains a non-text message body, which cannot be edited."
-msgstr "Bá soán tháo cháa phán nái dung thÆ phi vÄn bán nÃn khÃng thá sáa Äái ÄÆác."
+msgstr ""
+"Bá soán tháo cháa phán nái dung thÆ phi vÄn bán nÃn khÃng thá sáa Äái ÄÆác."
 
-#: ../composer/e-msg-composer.c:4790
+#: ../composer/e-msg-composer.c:4933
 msgid "Untitled Message"
 msgstr "ThÆ khÃng tÃn"
 
@@ -7045,17 +7000,14 @@ msgid "All accounts have been removed."
 msgstr "Mái tÃi khoán ÄÃ ÄÆác gá bá."
 
 #: ../composer/mail-composer.error.xml.h:3
-#| msgid "Error occurred while spawning %s: %s."
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "Gáp lái trong khi lÆu vÃo thÆ mác nhÃp."
 
 #: ../composer/mail-composer.error.xml.h:4
-#| msgid "An error occurred while printing"
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "Gáp lái trong khi lÆu vÃo thÆ mác gái Äi."
 
 #: ../composer/mail-composer.error.xml.h:5
-#| msgid "An error occurred while printing"
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Gáp lái trong khi gái. Bán muán tiáp tác thá nÃo?"
 
@@ -7129,19 +7081,15 @@ msgstr ""
 "thÆ áy thà sá cho phÃp bán tiáp tác tá chá áy."
 
 #: ../composer/mail-composer.error.xml.h:19
-#| msgid "Saving message to folder"
 msgid "Saving message to Outbox."
 msgstr "Äang lÆu thÆ vÃo háp thÆ gái."
 
 #: ../composer/mail-composer.error.xml.h:20
-#| msgid ""
-#| "The file `{0}' is not a regular file and cannot be sent in a message."
 msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 "Táp tin '{0}' khÃng phái là táp tin bÃnh thÆáng nÃn khÃng thá ÄÆác gái Äi."
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:117
-#| msgid "Bad regular expression &quot;{0}&quot;."
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Lái ÄÆác thÃng bÃo là &quot;{0}&quot;."
 
@@ -7156,7 +7104,6 @@ msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgstr "Lái ÄÆác bÃo cÃo là &quot;{0}&quot;. ThÆ chÆa ÄÆác gái Äi."
 
 #: ../composer/mail-composer.error.xml.h:24
-#| msgid "You cannot attach the file `{0}' to this message."
 msgid "You cannot attach the file &quot;{0}&quot; to this message."
 msgstr "KhÃng thá ÄÃnh kÃm táp tin &quot;{0}&quot; vÃo thÆ nÃy."
 
@@ -7164,144 +7111,123 @@ msgstr "KhÃng thá ÄÃnh kÃm táp tin &quot;{0}&quot; vÃo thÆ nÃy."
 msgid "You need to configure an account before you can compose mail."
 msgstr "Bán cán cáu hÃnh mát tÃi khoán nÃo Äà trÆác khi cà thá biÃn soán thÆ."
 
-#. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:27
-msgid "_Continue Editing"
-msgstr "_Cá soán tháo"
+#: ../composer/mail-composer.error.xml.h:26
+#, fuzzy
+#| msgid "An error occurred while printing"
+msgid "Your message was sent, but an error occurred during post-processing."
+msgstr "Gáp lái trong khi in."
 
-#: ../composer/mail-composer.error.xml.h:29
+#. Response codes were chosen somewhat arbitrarily.
+#: ../composer/mail-composer.error.xml.h:28
+msgid "_Continue Editing"
+msgstr "_Cá soán tháo"
+
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Do not Recover"
 msgstr "Äá_ng phác hái"
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Recover"
 msgstr "_Phác hái"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Save Draft"
 msgstr "_LÆu bán nhÃp"
 
-#: ../composer/mail-composer.error.xml.h:32
-#| msgid "_Save to Disk"
+#: ../composer/mail-composer.error.xml.h:33
 msgid "_Save to Outbox"
 msgstr "_LÆu vÃo háp thÆ gái"
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../composer/mail-composer.error.xml.h:35
 msgid "_Try Again"
 msgstr "_Thá lái"
 
-#: ../capplet/anjal-settings-main.c:223
-msgid "Run Anjal in a window"
-msgstr "Cháy Anjal trong cáa sá"
-
-#: ../capplet/anjal-settings-main.c:224
-#| msgid "Mark as _default memo list"
-msgid "Make Anjal the default email client"
-msgstr "Chán Anjal là trÃnh Äác thÆ mác Äánh"
-
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:231
+#: ../capplet/anjal-settings-main.c:154
 msgid "ID of the socket to embed in"
 msgstr "ID cáa socket cán nhÃng vÃo"
 
-#: ../capplet/anjal-settings-main.c:232
-#| msgid "sort"
+#: ../capplet/anjal-settings-main.c:155
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:245
-#| msgid "Default Mail Client "
-msgid "Anjal email client"
-msgstr "TrÃnh Äác thÆ Anjal"
-
-#: ../capplet/settings/mail-account-view.c:73
-#| msgid "Please choose another name."
+#: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
 msgstr "HÃy nháp há tÃn."
 
-#: ../capplet/settings/mail-account-view.c:74
-#| msgid "Using email address"
+#: ../capplet/settings/mail-account-view.c:78
 msgid "Please enter your email address."
 msgstr "HÃy nháp Äáa chá thÆ."
 
-#: ../capplet/settings/mail-account-view.c:75
+#: ../capplet/settings/mail-account-view.c:79
 msgid "The email address you have entered is invalid."
 msgstr "Äáa chá mail bán nháp khÃng háp lá."
 
-#: ../capplet/settings/mail-account-view.c:76
-#| msgid "Enter password."
+#: ../capplet/settings/mail-account-view.c:80
 msgid "Please enter your password."
 msgstr "HÃy nháp mát kháu cáa bán."
 
 # Name: don't translate / TÃn: Äáng dách
-#: ../capplet/settings/mail-account-view.c:255
-#: ../plugins/caldav/caldav-source.c:66
+#: ../capplet/settings/mail-account-view.c:259
+#: ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../capplet/settings/mail-account-view.c:359
-#: ../plugins/google-account-setup/google-contacts-source.c:56
-#: ../plugins/google-account-setup/google-source.c:81
+#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:413
+#: ../modules/online-accounts/e-online-accounts-google.c:287
+#: ../modules/online-accounts/e-online-accounts-google.c:359
+#: ../plugins/google-account-setup/google-contacts-source.c:55
+#: ../plugins/google-account-setup/google-source.c:87
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:463
-#| msgid "Personal"
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Personal details:"
 msgstr "Chi tiát cà nhÃn:"
 
-#: ../capplet/settings/mail-account-view.c:470
-#| msgid "_Name:"
+#: ../capplet/settings/mail-account-view.c:487
 msgid "Name:"
 msgstr "TÃn:"
 
-#: ../capplet/settings/mail-account-view.c:479
-#| msgid "Email address"
+#: ../capplet/settings/mail-account-view.c:496
 msgid "Email address:"
 msgstr "Äáa chá thÆ:"
 
-#: ../capplet/settings/mail-account-view.c:489
-#| msgid "Details"
+#: ../capplet/settings/mail-account-view.c:506
 msgid "Details:"
 msgstr "Chi tiát:"
 
-#: ../capplet/settings/mail-account-view.c:497
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Receiving"
 msgstr "Nhán ThÆ"
 
-#: ../capplet/settings/mail-account-view.c:504
-#| msgid "Server _Type: "
+#: ../capplet/settings/mail-account-view.c:521
 msgid "Server type:"
 msgstr "Kiáu mÃy chá:"
 
-#: ../capplet/settings/mail-account-view.c:513
-#| msgid "Server Message:"
+#: ../capplet/settings/mail-account-view.c:530
 msgid "Server address:"
 msgstr "Äáa chá mÃy chá:"
 
-#: ../capplet/settings/mail-account-view.c:522
-#| msgid "Us_ername:"
+#: ../capplet/settings/mail-account-view.c:539
 msgid "Username:"
 msgstr "TÃn ngÆái dÃng:"
 
-#: ../capplet/settings/mail-account-view.c:531
-#| msgid "No encryption"
+#: ../capplet/settings/mail-account-view.c:548
 msgid "Use encryption:"
 msgstr "KhÃng mà hoÃ"
 
-#: ../capplet/settings/mail-account-view.c:536
-#: ../capplet/settings/mail-account-view.c:571
-#| msgid "Never"
+#: ../capplet/settings/mail-account-view.c:553
+#: ../capplet/settings/mail-account-view.c:588
 msgid "never"
 msgstr "khÃng bao giá"
 
-#: ../capplet/settings/mail-account-view.c:548
-#| msgid "Ascending"
+#: ../capplet/settings/mail-account-view.c:565
 msgid "Sending"
 msgstr "Gái thÆ"
 
-#: ../capplet/settings/mail-account-view.c:590
+#: ../capplet/settings/mail-account-view.c:607
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -7312,7 +7238,7 @@ msgstr ""
 "cÃn lái. Náu khÃng thÃnh cÃng, bán sá cán Äián cÃc thÃng tin chi tiát vá mÃy "
 "chá."
 
-#: ../capplet/settings/mail-account-view.c:592
+#: ../capplet/settings/mail-account-view.c:609
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -7322,12 +7248,11 @@ msgstr ""
 "nháp bÃn dÆái. Mát sá thÃng tin ÄÃ ÄÆác Äián sán do bán ÄÃ nháp trÆác ÄÃu, "
 "nhÆng bán cà thá cán Äiáu chánh lái."
 
-#: ../capplet/settings/mail-account-view.c:594
-#| msgid "You may only configure a single Exchange account."
+#: ../capplet/settings/mail-account-view.c:611
 msgid "You can specify more options to configure the account."
 msgstr "Bán cà thá xÃc Äánh nhiáu tÃy chán Äá cáu hÃnh tÃi khoán."
 
-#: ../capplet/settings/mail-account-view.c:596
+#: ../capplet/settings/mail-account-view.c:613
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -7335,11 +7260,11 @@ msgstr ""
 "BÃy giá Äán thiát láp gái thÆ. Mát vÃi thiát láp Äà ÄÆác dà thá tá Äáng. "
 "NhÆng bán nÃn kiám tra lái cho chác chán."
 
-#: ../capplet/settings/mail-account-view.c:597
+#: ../capplet/settings/mail-account-view.c:614
 msgid "You can specify your default settings for your account."
 msgstr "Bán cà thá xÃc Äánh cÃc thiát láp mác Äánh cho tÃi khoán cáa bán."
 
-#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:615
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -7347,116 +7272,100 @@ msgstr ""
 "Äán lÃc kiám tra lái mái thá trÆác khi thá liÃn lác vái mÃy chá và láy thÆ "
 "mái vá."
 
-#: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2094 ../mail/em-account-editor.c:2215
+#: ../capplet/settings/mail-account-view.c:630
+#: ../mail/em-account-editor.c:2289 ../mail/em-account-editor.c:2425
 msgid "Identity"
 msgstr "NhÃn dáng"
 
-#: ../capplet/settings/mail-account-view.c:613
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:630
 msgid "Next - Receiving mail"
 msgstr "Ká tiáp - Nhán thÆ"
 
-#: ../capplet/settings/mail-account-view.c:614
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Receiving mail"
 msgstr "Nhán thÆ"
 
-#: ../capplet/settings/mail-account-view.c:614
-#: ../capplet/settings/mail-account-view.c:615
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Next - Sending mail"
 msgstr "Ká tiáp - Gái thÆ"
 
-#: ../capplet/settings/mail-account-view.c:614
-#| msgid "Identity"
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Back - Identity"
 msgstr "Quay lái - Äánh danh"
 
-#: ../capplet/settings/mail-account-view.c:614
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Next - Receiving options"
 msgstr "Ká tiáp - TÃy chán nhán"
 
-#: ../capplet/settings/mail-account-view.c:615
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Receiving options"
 msgstr "TÃy chán nhán"
 
-#: ../capplet/settings/mail-account-view.c:615
-#: ../capplet/settings/mail-account-view.c:617
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving mail"
 msgstr "Quay lái - Nhán thÆ"
 
-#: ../capplet/settings/mail-account-view.c:617
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Sending mail"
 msgstr "Gái thÆ"
 
-#: ../capplet/settings/mail-account-view.c:617
-#: ../capplet/settings/mail-account-view.c:618
-#| msgid "Delete account?"
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Next - Review account"
 msgstr "Ká tiáp - Kiám lái tÃi khoán"
 
-#: ../capplet/settings/mail-account-view.c:617
-#| msgid "Defaults"
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Next - Defaults"
 msgstr "Ká tiáp - Mác Äánh"
 
-#: ../capplet/settings/mail-account-view.c:617
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving options"
 msgstr "Quay lái - Tuá chán nhán"
 
-#: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3043
+#: ../capplet/settings/mail-account-view.c:635
+#: ../mail/em-account-editor.c:3377
 msgid "Defaults"
 msgstr "Mác Äánh"
 
-#: ../capplet/settings/mail-account-view.c:618
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Back - Sending mail"
 msgstr "Quay lái - Gái thÆ"
 
-#: ../capplet/settings/mail-account-view.c:620
-#| msgid "Delete account?"
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Review account"
 msgstr "Kiám lái tÃi khoán"
 
-#: ../capplet/settings/mail-account-view.c:620
-#| msgid "Fiji"
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Finish"
 msgstr "HoÃn tát"
 
-#: ../capplet/settings/mail-account-view.c:620
-#| msgid "Ascending"
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Back - Sending"
 msgstr "Quay lái - Gái thÆ"
 
-#: ../capplet/settings/mail-account-view.c:725
+#: ../capplet/settings/mail-account-view.c:760
 msgid "Setup Google contacts with Evolution"
 msgstr "Thiát láp liÃn lác Google vái Evolution"
 
-#: ../capplet/settings/mail-account-view.c:726
+#: ../capplet/settings/mail-account-view.c:761
 msgid "Setup Google calendar with Evolution"
 msgstr "Thiát láp lách Google vái Evolution"
 
-#: ../capplet/settings/mail-account-view.c:731
+#: ../capplet/settings/mail-account-view.c:766
 msgid "You may need to enable IMAP access."
 msgstr "Bán cán bát truy cáp IMAP."
 
-#: ../capplet/settings/mail-account-view.c:739
-#| msgid "Backing Evolution accounts and settings"
+#: ../capplet/settings/mail-account-view.c:774
 msgid "Google account settings:"
 msgstr "Thiát láp tÃi khoán Google:"
 
-#: ../capplet/settings/mail-account-view.c:766
+#: ../capplet/settings/mail-account-view.c:800
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "Thiát láp lách Yahoo vái Evolution"
 
-#: ../capplet/settings/mail-account-view.c:770
+#: ../capplet/settings/mail-account-view.c:804
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
@@ -7465,90 +7374,77 @@ msgstr ""
 "Lách Yahoo ÄÆác Äát tÃn dáng tÃn_há. ÄÃ thá tÃn lách cáa bán theo quy tác "
 "nÃy. Vui lÃng xÃc nhán hoác nháp tÃn lách ÄÃng."
 
-#: ../capplet/settings/mail-account-view.c:777
-#| msgid "Backing Evolution accounts and settings"
+#: ../capplet/settings/mail-account-view.c:813
 msgid "Yahoo account settings:"
 msgstr "Thiát láp tÃi khoán Yahoo:"
 
-#: ../capplet/settings/mail-account-view.c:791
-#| msgid "Calendar Message"
+#: ../capplet/settings/mail-account-view.c:827
 msgid "Yahoo Calendar name:"
 msgstr "TÃn lách Yahoo:"
 
-#: ../capplet/settings/mail-account-view.c:1063
-#| msgid "Pass_word:"
+#: ../capplet/settings/mail-account-view.c:1098
 msgid "Password:"
 msgstr "Mát kháu:"
 
-#: ../capplet/settings/mail-account-view.c:1132
-#: ../capplet/settings/mail-settings-view.c:266
-#| msgid "Close"
+#: ../capplet/settings/mail-account-view.c:1150
+#: ../capplet/settings/mail-settings-view.c:254
 msgid "Close Tab"
 msgstr "ÄÃng thá"
 
-#: ../capplet/settings/mail-account-view.c:1142
-#| msgid "Account Editor"
+#: ../capplet/settings/mail-account-view.c:1160
 msgid "Account Wizard"
 msgstr "Há trá thiát láp tÃi khoán"
 
-#: ../capplet/settings/mail-capplet-shell.c:212
-#| msgid "Evolution Account Assistant"
+#: ../capplet/settings/mail-capplet-shell.c:215
 msgid "Evolution account assistant"
 msgstr "Phá tà tÃi khoán Evolution"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:358 ../mail/e-mail-migrate.c:677
-#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:148
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
-#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:218
-#: ../mail/message-list.c:1709
-#: ../modules/addressbook/e-book-shell-backend.c:96
-#: ../modules/addressbook/e-book-shell-migrate.c:135
-#: ../modules/calendar/e-cal-shell-backend.c:107
-#: ../modules/calendar/e-cal-shell-migrate.c:148
-#: ../modules/calendar/e-memo-shell-backend.c:96
-#: ../modules/calendar/e-memo-shell-migrate.c:106
-#: ../modules/calendar/e-task-shell-backend.c:96
-#: ../modules/calendar/e-task-shell-migrate.c:115
+#: ../capplet/settings/mail-capplet-shell.c:377 ../mail/e-mail-local.c:81
+#: ../mail/e-mail-migrate.c:750 ../mail/em-folder-tree-model.c:153
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:159
+#: ../mail/em-folder-tree-model.c:161 ../mail/em-folder-tree-model.c:168
+#: ../mail/em-folder-tree-model.c:170
+#: ../modules/addressbook/e-book-shell-backend.c:100
+#: ../modules/addressbook/e-book-shell-migrate.c:136
+#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-migrate.c:154
+#: ../modules/calendar/e-memo-shell-backend.c:102
+#: ../modules/calendar/e-memo-shell-migrate.c:109
+#: ../modules/calendar/e-task-shell-backend.c:102
+#: ../modules/calendar/e-task-shell-migrate.c:121
 msgid "On This Computer"
 msgstr "TrÃn mÃy nÃy"
 
-#: ../capplet/settings/mail-settings-view.c:145
+#: ../capplet/settings/mail-settings-view.c:150
 #, c-format
-#| msgid "Modify"
 msgid "Modify %s..."
 msgstr "Äang sáa %s..."
 
-#: ../capplet/settings/mail-settings-view.c:147
-#| msgid "Add IM Account"
+#: ../capplet/settings/mail-settings-view.c:152
 msgid "Add a new account"
 msgstr "ThÃm tÃi khoán mái"
 
-#: ../capplet/settings/mail-settings-view.c:183
-#| msgid "Account Management"
+#: ../capplet/settings/mail-settings-view.c:188
 msgid "Account management"
 msgstr "Quán là tÃi khoán"
 
-#: ../capplet/settings/mail-settings-view.c:276
-#| msgid "Junk Settings"
+#: ../capplet/settings/mail-settings-view.c:264
 msgid "Settings"
 msgstr "Thiát láp"
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
-#| msgid "Calendar information"
 msgid "Calendar event notifications"
 msgstr "ThÃng tin lách"
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:2
-#| msgid "Evolution Elm importer"
 msgid "Evolution Alarm Notify"
 msgstr "Bá nháp Elm vÃo Evolution"
 
 # Name: do not translate/ tÃn: Äáng dách
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:959
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:999
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
-#: ../shell/e-shell-window-private.c:253
+#: ../shell/e-shell-window-private.c:257
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7556,7 +7452,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "ThÆ tÃn và Lách Evolution"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Bá phán mám nhÃm (Groupware)"
 
@@ -7565,48 +7461,44 @@ msgid "Manage your email, contacts and schedule"
 msgstr "Quán là thÆ tÃn, lách biáu và cÃc liÃn lác"
 
 #: ../data/evolution-settings.desktop.in.in.h:1
-#| msgid "Configure your email accounts here"
 msgid "Configure email accounts"
 msgstr "Cáu hÃnh tÃi khoán thÆ"
 
 #: ../data/evolution-settings.desktop.in.in.h:2
-#| msgid "Junk Mail Settings"
 msgid "Email Settings"
 msgstr "Thiát láp thÆ"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:226
+#: ../e-util/e-activity.c:227
 #, c-format
-#| msgid "Cancelled"
 msgid "%s (cancelled)"
 msgstr "%s (bá huá)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:229
+#: ../e-util/e-activity.c:230
 #, c-format
-#| msgid "%s (%d%% complete)"
 msgid "%s (completed)"
 msgstr "%s (hoÃn tát)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:232
+#: ../e-util/e-activity.c:233
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (Äang chá)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:236
+#: ../e-util/e-activity.c:237
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (Äang huá)"
 
-#: ../e-util/e-activity.c:238
+#: ../e-util/e-activity.c:239
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:243
+#: ../e-util/e-activity.c:244
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hoÃn tát)"
@@ -7689,84 +7581,142 @@ msgid "Visual"
 msgstr "Trác quan"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:199
-#: ../modules/calendar/e-cal-shell-view-actions.c:1794
+#: ../e-util/e-datetime-format.c:206
+#: ../modules/calendar/e-cal-shell-view-actions.c:1856
 #: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:311
+#: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "HÃm nay"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:210 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "NgÃy mai"
 
-#: ../e-util/e-datetime-format.c:212
-#| msgid "Yesterday %l:%M %p"
+#: ../e-util/e-datetime-format.c:219
 msgid "Yesterday"
 msgstr "HÃm qua"
 
-#. Translators: %a is a strftime modifier, the abbreviated week day name, for example "Next Tue".
-#. ngettext is used to be able to define different translations for different days of week, where
-#. necessary. Index is between 1 and 7 inclusive, meaning 1 .. Monday, 2 .. Tuesday, ..., 7 .. Sunday
-#: ../e-util/e-datetime-format.c:218
-#, c-format
-#| msgid "Next"
-msgid "Next %a"
-msgid_plural "Next %a"
-msgstr[0] "%a tái"
+#. Translators: This is used for abbreviated days in the future.
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:227
+#, fuzzy
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Mon"
+msgstr "%a tái"
+
+#. Translators: This is used for abbreviated days in the future.
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:233
+#, fuzzy
+#| msgid "Next _Thread"
+msgctxt "DateFmt"
+msgid "Next Tue"
+msgstr "_NhÃnh ká"
 
-#: ../e-util/e-datetime-format.c:295 ../e-util/e-datetime-format.c:305
-#: ../e-util/e-datetime-format.c:314
-#| msgid "_Use system defaults"
+#. Translators: This is used for abbreviated days in the future.
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:239
+#, fuzzy
+#| msgid "Next _Thread"
+msgctxt "DateFmt"
+msgid "Next Wed"
+msgstr "_NhÃnh ká"
+
+#. Translators: This is used for abbreviated days in the future.
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:245
+#, fuzzy
+#| msgid "Next _Thread"
+msgctxt "DateFmt"
+msgid "Next Thu"
+msgstr "_NhÃnh ká"
+
+#. Translators: This is used for abbreviated days in the future.
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:251
+#, fuzzy
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Fri"
+msgstr "%a tái"
+
+#. Translators: This is used for abbreviated days in the future.
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:257
+#, fuzzy
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Sat"
+msgstr "%a tái"
+
+#. Translators: This is used for abbreviated days in the future.
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:263
+#, fuzzy
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Sun"
+msgstr "%a tái"
+
+#: ../e-util/e-datetime-format.c:350 ../e-util/e-datetime-format.c:360
+#: ../e-util/e-datetime-format.c:369
 msgid "Use locale default"
 msgstr "DÃng thiát láp ngÃn ngá mác Äánh"
 
-#: ../e-util/e-datetime-format.c:510
-#| msgid "Format"
+#: ../e-util/e-datetime-format.c:574
 msgid "Format:"
 msgstr "Äánh dáng:"
 
-#: ../e-util/e-file-utils.c:152
-#| msgid "Unknown type"
+#: ../e-util/e-file-utils.c:151
 msgid "(Unknown Filename)"
 msgstr "(TÃn táp tin khÃng biát)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:156
+#: ../e-util/e-file-utils.c:155
 #, c-format
-#| msgid "Pinging %s"
 msgid "Writing \"%s\""
 msgstr "Äang ghi \"%s\""
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:161
+#: ../e-util/e-file-utils.c:160
 #, c-format
-#| msgid "Copying `%s' to `%s'"
 msgid "Writing \"%s\" to %s"
 msgstr "Äang ghi \"%s\" vÃo %s"
 
-#: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:388
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "tuán"
 
-#: ../e-util/e-print.c:157
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "Gáp lái trong khi in."
 
-#: ../e-util/e-print.c:164
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "Há tháng in ÄÃ thÃng bÃo nháng chi tiát nÃy vá lái ÄÃ:"
 
-#: ../e-util/e-print.c:170
+#: ../e-util/e-print.c:174
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "Há tháng in khÃng thÃng bÃo chi tiát thÃm vá lái ÄÃ."
 
-#: ../e-util/e-signature.c:707
+#: ../e-util/e-signature.c:708
 msgid "Autogenerated"
 msgstr "Tá Äáng phÃt sinh"
 
@@ -7790,230 +7740,221 @@ msgstr "Bán cà muán ghi Äà lÃn nà khÃng?"
 msgid "File exists \"{0}\"."
 msgstr "Táp tin  {0}  Äà cÃ."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:155
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
 msgid "_Overwrite"
 msgstr "_Ghi ÄÃ"
 
-#: ../e-util/e-util.c:154
+#: ../e-util/e-util.c:117
 msgid "Could not open the link."
 msgstr "KhÃng thá má liÃn kát."
 
-#: ../e-util/e-util.c:201
+#: ../e-util/e-util.c:164
 msgid "Could not display help for Evolution."
 msgstr "KhÃng thá hián thá trá giÃp vá Evolution."
 
-#: ../e-util/gconf-bridge.c:1281
+#: ../e-util/gconf-bridge.c:1332
 #, c-format
 msgid "GConf error: %s"
 msgstr "Lái GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1292
+#: ../e-util/gconf-bridge.c:1343
 msgid "All further errors shown only on terminal."
 msgstr "Lái bá sung chá hián thá trÃn thiát bá cuái."
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1050
-#: ../mail/e-mail-tag-editor.c:329 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1060
+#: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "Tá"
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1051
-#: ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1061
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "Trá lái cho"
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1053
-#: ../mail/em-format-html.c:2402 ../mail/em-format-html.c:2464
-#: ../mail/em-format-html.c:2487 ../modules/mail/em-mailer-prefs.c:76
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1063
+#: ../mail/em-format-html.c:2593 ../mail/em-format-html.c:2661
+#: ../mail/em-format-html.c:2684 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1054
-#: ../mail/em-format-html.c:2403 ../mail/em-format-html.c:2468
-#: ../mail/em-format-html.c:2490 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1064
+#: ../mail/em-format-html.c:2594 ../mail/em-format-html.c:2665
+#: ../mail/em-format-html.c:2687 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:426 ../em-format/em-format.c:1055
-#: ../mail/e-mail-tag-editor.c:334 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:78
-#: ../plugins/groupwise-features/notification.ui.h:2
-#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
+#: ../em-format/em-format-quote.c:464 ../em-format/em-format.c:1065
+#: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
+#: ../smime/lib/e-cert.c:1151
 msgid "Subject"
 msgstr "Chá Äá"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:437 ../mail/em-format-html.c:2584
-#: ../modules/mail/em-mailer-prefs.c:1117
+#: ../em-format/em-format-quote.c:475 ../mail/em-format-html.c:2786
+#: ../modules/mail/em-mailer-prefs.c:1028
 msgid "Mailer"
 msgstr "TrÃnh thÆ"
 
-#: ../em-format/em-format-quote.c:518 ../mail/em-composer-utils.c:1141
+#: ../em-format/em-format-quote.c:565 ../mail/em-composer-utils.c:1203
 msgid "-------- Forwarded Message --------"
 msgstr "âââThÆ ÄÃ chuyán tiápâââ"
 
-#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:79 ../widgets/misc/e-dateedit.c:529
-#: ../widgets/misc/e-dateedit.c:551
+#: ../em-format/em-format.c:1066 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "NgÃy"
 
-#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format.c:1067 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "NhÃm tin"
 
-#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format.c:1068 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Mát"
 
-#: ../em-format/em-format.c:1455
+#: ../em-format/em-format.c:1472
 #, c-format
 msgid "%s attachment"
 msgstr "%s ÄÃnh kÃm"
 
-#: ../em-format/em-format.c:1547
+#: ../em-format/em-format.c:1583
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "KhÃng thá phÃn tÃch thÆ S/MIME. KhÃng biát sao."
 
-#: ../em-format/em-format.c:1729 ../em-format/em-format.c:1926
+#: ../em-format/em-format.c:1777 ../em-format/em-format.c:2005
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "KhÃng thá phÃn tÃch thÆ MIME nÃn hián thá dáng mà nguán."
 
-#: ../em-format/em-format.c:1739
+#: ../em-format/em-format.c:1788
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Kiáu mà hoà khÃng ÄÆác há trá cho: multipart/encrypted"
 
-#: ../em-format/em-format.c:1759
+#: ../em-format/em-format.c:1808
 msgid "Could not parse PGP/MIME message"
 msgstr "KhÃng thá phÃn tÃch thÆ PGP/MIME"
 
-#: ../em-format/em-format.c:1760
+#: ../em-format/em-format.c:1809
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "KhÃng thá phÃn tÃch thÆ PGP/MIME: lái khÃng rÃ"
 
-#: ../em-format/em-format.c:1951
+#: ../em-format/em-format.c:2030
 msgid "Unsupported signature format"
 msgstr "Äánh dáng chá kà khÃng há trá"
 
-#: ../em-format/em-format.c:1964 ../em-format/em-format.c:2137
+#: ../em-format/em-format.c:2043 ../em-format/em-format.c:2225
 msgid "Error verifying signature"
 msgstr "Gáp lái khi xÃc minh chá kÃ"
 
-#: ../em-format/em-format.c:1965 ../em-format/em-format.c:2124
-#: ../em-format/em-format.c:2138
+#: ../em-format/em-format.c:2044 ../em-format/em-format.c:2210
+#: ../em-format/em-format.c:2226
 msgid "Unknown error verifying signature"
 msgstr "Gáp lái lá khi xÃc minh chá kÃ."
 
-#: ../em-format/em-format.c:2229
-#| msgid "Could not parse PGP message"
+#: ../em-format/em-format.c:2318
 msgid "Could not parse PGP message: "
 msgstr "KhÃng thá phÃn tÃch thÆ PGP:"
 
-#: ../em-format/em-format.c:2235 ../mail/mail-ops.c:624
-#: ../plugins/caldav/caldav-browse-server.c:211
-#: ../plugins/caldav/caldav-browse-server.c:1408 ../plugins/face/face.c:169
-#: ../smime/gui/certificate-manager.c:100
-msgid "Unknown error"
-msgstr "Lái lá"
-
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../filter/e-filter-datespec.c:70
+#: ../filter/e-filter-datespec.c:66
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d giÃy trÆác"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:67
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "%d giÃy sau"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:68
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d phÃt trÆác"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "%d phÃt sau"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d giá trÆác"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "%d giá sau"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ngÃy trÆác"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "%d ngÃy sau"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d tuán trÆác"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "%d tuán sau"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d thÃng trÆác"
 
-#: ../filter/e-filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "%d thÃng sau"
 
-#: ../filter/e-filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d nÄm trÆác"
 
-#: ../filter/e-filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "%d nÄm sau"
 
-#: ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:129
 msgid "<click here to select a date>"
 msgstr "<nhán ÄÃy Äá chán ngÃy>"
 
-#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
-#: ../filter/e-filter-datespec.c:158
+#: ../filter/e-filter-datespec.c:132 ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:154
 msgid "now"
 msgstr "bÃy giá"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:139
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
@@ -8021,67 +7962,68 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Chán thái Äiám Äá Äái chiáu"
 
-#: ../filter/e-filter-file.c:188
-#| msgid "Choose a file"
+#: ../filter/e-filter-file.c:190
 msgid "Choose a File"
 msgstr "Chán táp tin"
 
-#: ../filter/e-filter-rule.c:669
+#: ../filter/e-filter-rule.c:666
 msgid "R_ule name:"
 msgstr "TÃn q_uy tác:"
 
-#: ../filter/e-filter-rule.c:699
+#: ../filter/e-filter-rule.c:696
 msgid "Find items that meet the following conditions"
 msgstr "TÃm mác tÆÆng áng vái nháng Äiáu khián sau"
 
-#: ../filter/e-filter-rule.c:724
+#: ../filter/e-filter-rule.c:721
 msgid "If all conditions are met"
 msgstr "Náu mái tiÃu chuán Äáu thoá"
 
-#: ../filter/e-filter-rule.c:725
+#: ../filter/e-filter-rule.c:722
 msgid "If any conditions are met"
 msgstr "Náu tiÃu chuán nÃo thoá"
 
-#: ../filter/e-filter-rule.c:728
+#: ../filter/e-filter-rule.c:725
 msgid "_Find items:"
 msgstr "_TÃm mác:"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:757
+#: ../filter/e-filter-rule.c:754
 msgid "None"
 msgstr "KhÃng"
 
-#: ../filter/e-filter-rule.c:758
+#: ../filter/e-filter-rule.c:755
 msgid "All related"
 msgstr "Mái thá liÃn quan"
 
-#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:756 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Trá lái"
 
-#: ../filter/e-filter-rule.c:760
+#: ../filter/e-filter-rule.c:757
 msgid "Replies and parents"
 msgstr "Trá lái và má"
 
-#: ../filter/e-filter-rule.c:761
+#: ../filter/e-filter-rule.c:758
 msgid "No reply or parent"
 msgstr "KhÃng cà trá lái hay Äiáu má"
 
-#: ../filter/e-filter-rule.c:764
-msgid "I_nclude threads"
+#: ../filter/e-filter-rule.c:761
+#, fuzzy
+#| msgid "I_nclude threads"
+msgid "I_nclude threads:"
 msgstr "Gám cÃc _nhÃnh"
 
-#: ../filter/e-filter-rule.c:789
+#: ../filter/e-filter-rule.c:786
 msgid "A_dd Condition"
 msgstr "ThÃm Äiá_u kián"
 
-#: ../filter/e-filter-rule.c:1136 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:317
+#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:321
 msgid "Incoming"
 msgstr "Gái Äán"
 
-#: ../filter/e-filter-rule.c:1136 ../mail/em-utils.c:318
+#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:322
 msgid "Outgoing"
 msgstr "Gái Äi"
 
@@ -8114,7 +8056,7 @@ msgstr "Thiáu ngÃy."
 msgid "Missing file name."
 msgstr "Thiáu tÃn táp tin."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:83
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
 msgid "Missing name."
 msgstr "Thiáu tÃn."
 
@@ -8170,7 +8112,7 @@ msgstr ""
 "NgÃy gái thÆ sá ÄÆác Äái chiáu\n"
 "vái thái Äiám hián thái, khi lác."
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:193
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:194
 msgid "_Filter Rules"
 msgstr "_Quy tác Lác"
 
@@ -8207,65 +8149,261 @@ msgstr "thái Äiám bán chán"
 msgid "years"
 msgstr "nÄm"
 
-#: ../mail/e-mail-attachment-bar.c:93 ../mail/e-mail-attachment-bar.c:98
-#: ../mail/em-format-html-display.c:1053 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:131
-#: ../widgets/misc/e-attachment-paned.c:136
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:863 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "KhÃng"
+
+#: ../mail/em-account-editor.c:946
+msgid "Never"
+msgstr "KhÃng bao giá"
+
+#: ../mail/em-account-editor.c:947
+msgid "Always"
+msgstr "LuÃn luÃn"
+
+#: ../mail/em-account-editor.c:948
+msgid "Ask for each message"
+msgstr "Hái cho mái thÆ"
+
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1833 ../widgets/misc/e-account-tree-view.c:131
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "KhÃng"
+
+#: ../mail/em-account-editor.c:2237
+#, fuzzy
+#| msgid "_File:"
+msgid "Fil_e:"
+msgstr "_Táp tin:"
+
+#: ../mail/em-account-editor.c:2237 ../mail/mail-config.ui.h:157
+msgid "_Path:"
+msgstr "ÄÆáng _dán:"
+
+#: ../mail/em-account-editor.c:2286
+msgid "Mail Configuration"
+msgstr "Cáu hÃnh ThÆ"
+
+#: ../mail/em-account-editor.c:2287
+#, fuzzy
+#| msgid ""
+#| "Welcome to the Evolution Mail Configuration Assistant.\n"
+#| "\n"
+#| "Click \"Forward\" to begin."
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"ChÃo máng dÃng Phá tà cáu hÃnh thÆ Evolution.\n"
+"\n"
+"HÃy nhán \"Tiáp\" Äá bát Äáu."
+
+#: ../mail/em-account-editor.c:2290
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Vui lÃng nháp tÃn và Äáa chá thÆ Äián tá vÃo bÃn dÆái. TrÆáng  tÃy chán  "
+"bÃn dÆái khÃng cán phái ÄÃ chán, trá khi bán muán gám thÃng tin áy vÃo thÆ "
+"bán cán gái."
+
+#: ../mail/em-account-editor.c:2292 ../mail/em-account-editor.c:2484
+msgid "Receiving Email"
+msgstr "Nhán ThÆ"
+
+#: ../mail/em-account-editor.c:2293
+msgid "Please configure the following account settings."
+msgstr "HÃy cáu hÃnh cÃc thiát láp tÃi khoán sau."
+
+#: ../mail/em-account-editor.c:2295 ../mail/em-account-editor.c:3081
+msgid "Sending Email"
+msgstr "Gái ThÆ"
+
+#: ../mail/em-account-editor.c:2296
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"HÃy nháp thÃng tin vá cÃch bán sá gái thÆ. Náu bán khÃng chác, hÃy hái quán "
+"trá há tháng hoác ISP (nhà cung cáp dách vá Internet) cáa bán."
+
+#: ../mail/em-account-editor.c:2298 ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "ThÃng tin tÃi khoán"
+
+#: ../mail/em-account-editor.c:2299
+#, fuzzy
+#| msgid ""
+#| "Please enter a descriptive name for this account in the space below.\n"
+#| "This name will be used for display purposes only."
+msgid ""
+"Please enter a descriptive name for this account below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"HÃy nháp mát tÃn dián tá cho tÃi khoán nÃy vÃo trÆáng bÃn dÆái.\n"
+"Chá ÄÆác dÃng tÃn nÃy vái mác ÄÃch hián thá thÃi."
+
+#: ../mail/em-account-editor.c:2303
+msgid "Done"
+msgstr "HoÃn tát"
+
+#: ../mail/em-account-editor.c:2304
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"Xin chÃc máng, bán Äà hoÃn tát quà trÃnh cáu hÃnh thÆ.\n"
+"\n"
+"Tá bÃy giá bán cà thá gái và nhán thÆ báng Evolution.\n"
+"\n"
+"HÃy nhán \"Ãp dáng\" Äá lÆu cÃc thiát láp."
+
+#: ../mail/em-account-editor.c:2843
+msgid "Check for _new messages every"
+msgstr "_Kiám tra cà thÆ mái mái"
+
+#: ../mail/em-account-editor.c:2851
+msgid "minu_tes"
+msgstr "phÃ_t"
+
+#: ../mail/em-account-editor.c:3520 ../mail/mail-config.ui.h:101
+msgid "Security"
+msgstr "Báo mát"
+
+#. Most sections for this is auto-generated from the camel config
+#. Most sections for this is auto-generated fromt the camel config
+#: ../mail/em-account-editor.c:3575 ../mail/em-account-editor.c:3658
+msgid "Receiving Options"
+msgstr "TÃy chán Nhán"
+
+#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
+msgid "Checking for New Messages"
+msgstr "Kiám tra cà ThÆ Mái"
+
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1416 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
+#: ../widgets/misc/e-attachment-paned.c:133
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "ÄÃnh kÃm"
 
-#: ../mail/e-mail-attachment-bar.c:633
-#: ../widgets/misc/e-attachment-paned.c:624
-#| msgid "Month View"
+#: ../mail/e-mail-attachment-bar.c:608
+#: ../widgets/misc/e-attachment-paned.c:623
 msgid "Icon View"
 msgstr "Khung xem biáu tÆáng"
 
-#: ../mail/e-mail-attachment-bar.c:635
-#: ../widgets/misc/e-attachment-paned.c:626
-#| msgid "_List View"
+#: ../mail/e-mail-attachment-bar.c:610
+#: ../widgets/misc/e-attachment-paned.c:625
 msgid "List View"
 msgstr "Khung Xem danh sÃch"
 
-#: ../mail/e-mail-browser.c:132 ../shell/e-shell-window-actions.c:1406
-#: ../shell/e-shell-window-actions.c:1413
-#: ../shell/e-shell-window-actions.c:1420
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1441
 msgid "Close this window"
 msgstr "ÄÃng cáa sá nÃy"
 
-#: ../mail/e-mail-browser.c:289
-#| msgid "Subject"
+#: ../mail/e-mail-browser.c:293
 msgid "(No Subject)"
 msgstr "(KhÃng chá Äá)"
 
 #: ../mail/e-mail-display.c:66
-#| msgid "_Add to Address Book"
 msgid "_Add to Address Book..."
 msgstr "ThÃm vÃo Sá Äá_a chá..."
 
 #: ../mail/e-mail-display.c:73
-#| msgid "_To this Address"
 msgid "_To This Address"
 msgstr "_Cho Äáa chá nÃy"
 
 #: ../mail/e-mail-display.c:80
-#| msgid "_From this Address"
 msgid "_From This Address"
 msgstr "_Tá Äáa chá nÃy"
 
+#: ../mail/e-mail-display.c:87
+#, fuzzy
+#| msgid "_Send To..."
+msgid "Send _Reply To..."
+msgstr "_Gái cho..."
+
 #: ../mail/e-mail-display.c:89
-#| msgid "Create _Search Folder"
+#, fuzzy
+#| msgid "Send a mail message to this address"
+msgid "Send a reply message to this address"
+msgstr "Gái thÆ Äán Äáa chá nÃy"
+
+#: ../mail/e-mail-display.c:96
 msgid "Create Search _Folder"
 msgstr "Táo thÆ mác tÃm _kiám"
 
-#: ../mail/e-mail-folder-utils.c:88
+#: ../mail/e-mail-folder-utils.c:111
 #, c-format
-#| msgid "Saving message to folder"
 msgid "Saving message to folder '%s'"
 msgstr "Äang lÆu thÆ vÃo thÆ mác '%s'"
 
-#: ../mail/e-mail-label-dialog.c:225
-#| msgid "Label _Name:"
+#: ../mail/e-mail-folder-utils.c:274
+msgid "Forwarded messages"
+msgstr "ThÆ ÄÃ chuyán tiáp"
+
+#: ../mail/e-mail-folder-utils.c:391
+#, fuzzy
+#| msgid "Checks selected messages for duplicates"
+msgid "Scanning messages for duplicates"
+msgstr "ÄÃnh dáu cÃc thÆ Äà chán là trÃng láp"
+
+#: ../mail/e-mail-folder-utils.c:584
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Äang láy %d thÆ..."
+
+#: ../mail/e-mail-folder-utils.c:834
+#, c-format
+msgid "Removing folder '%s'"
+msgstr "Äang gá bá thÆ mác '%s'"
+
+#: ../mail/e-mail-folder-utils.c:968
+#, c-format
+msgid "File \"%s\" has been removed."
+msgstr "Táp tin \"%s\" ÄÃ ÄÆác gá bá."
+
+#: ../mail/e-mail-folder-utils.c:972
+#, fuzzy
+#| msgid "File \"%s\" has been removed."
+msgid "File has been removed."
+msgstr "Táp tin \"%s\" ÄÃ ÄÆác gá bá."
+
+#: ../mail/e-mail-folder-utils.c:1031
+msgid "Removing attachments"
+msgstr "Äang xoà ÄÃnh kÃm"
+
+#: ../mail/e-mail-folder-utils.c:1195
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messages"
+msgstr[0] "Äang lÆu %d thÆ"
+
+#: ../mail/e-mail-folder-utils.c:1539 ../mail/em-folder-utils.c:613
+#, fuzzy, c-format
+#| msgid "Invalid folder: %s"
+msgid "Invalid folder URI '%s'"
+msgstr "ThÆ mác khÃng háp lá: %s"
+
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+msgid "Junk filtering software:"
+msgstr ""
+
+#: ../mail/e-mail-label-dialog.c:223
 msgid "_Label name:"
 msgstr "TÃ_n nhÃn:"
 
@@ -8294,7 +8432,7 @@ msgid "_Later"
 msgstr "_Sau nÃy"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:616
+#: ../modules/mail/e-mail-shell-view-actions.c:684
 msgid "Add Label"
 msgstr "ThÃm nhÃn"
 
@@ -8302,76 +8440,72 @@ msgstr "ThÃm nhÃn"
 msgid "Edit Label"
 msgstr "Sáa nhÃn"
 
-#: ../mail/e-mail-label-manager.c:349
-#| msgid ""
-#| "Note: Underscore in the label name is used as mnemonic identifier in menu."
+#: ../mail/e-mail-label-manager.c:350
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
 msgstr "Ghi chÃ: gách dÆái tÃn nhÃn là phÃm tát trong trÃnh ÄÆn."
 
-#: ../mail/e-mail-label-tree-view.c:86
+#: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
 msgstr "MÃu"
 
-#: ../mail/e-mail-label-tree-view.c:96
-#: ../modules/plugin-manager/evolution-plugin-manager.c:66
-#: ../plugins/caldav/caldav-browse-server.c:1297
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../widgets/menus/gal-define-views-dialog.c:334
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../plugins/caldav/caldav-browse-server.c:1358
+#: ../widgets/menus/gal-define-views-dialog.c:347
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
 msgid "Name"
 msgstr "TÃn"
 
-#: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
-#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree.c:2986
-#: ../modules/mail/e-mail-shell-view-private.c:1099
-#: ../modules/mail/e-mail-shell-view-private.c:1110
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:312
+#: ../mail/em-folder-tree-model.c:720
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "Háp thÆ nhán"
 
-#: ../mail/e-mail-local.c:36 ../mail/e-mail-migrate.c:1007
-#: ../mail/em-folder-tree-model.c:758
-#: ../modules/mail/e-mail-shell-view-private.c:1097
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:713
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "NhÃp"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:770
-#: ../modules/mail/e-mail-shell-view-private.c:1101
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:724
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "Háp thÆ gái"
 
-#: ../mail/e-mail-local.c:38 ../mail/e-mail-migrate.c:1000
-#: ../mail/em-folder-tree-model.c:772
-#: ../modules/mail/e-mail-shell-view-private.c:1103
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:728
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "ÄÃ gái"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:761
-#: ../modules/mail/e-mail-shell-view-private.c:1105
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:716
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:581
+#: ../plugins/templates/templates.c:1034 ../plugins/templates/templates.c:1312
+#: ../plugins/templates/templates.c:1322
 msgid "Templates"
 msgstr "Máu"
 
-#: ../mail/e-mail-migrate.c:131
+#: ../mail/e-mail-migrate.c:134
 msgid "Migrating..."
 msgstr "Äang nÃng cáp..."
 
-#: ../mail/e-mail-migrate.c:164
+#: ../mail/e-mail-migrate.c:169
 msgid "Migration"
 msgstr "NÃng cáp"
 
-#: ../mail/e-mail-migrate.c:204
+#: ../mail/e-mail-migrate.c:210
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Äang nÃng cáp  %s Â:"
 
-#: ../mail/e-mail-migrate.c:657
+#: ../mail/e-mail-migrate.c:728
 msgid "Migrating Folders"
 msgstr "NÃng cáp ThÆ mác"
 
-#: ../mail/e-mail-migrate.c:658
+#: ../mail/e-mail-migrate.c:729
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -8383,781 +8517,727 @@ msgstr ""
 "\n"
 "HÃy kiÃn nhán trong khi Evolution nÃng cáp cÃc thÆ mác cáa bán..."
 
-#: ../mail/e-mail-migrate.c:1147
+#: ../mail/e-mail-migrate.c:1527
 #, c-format
-#| msgid "Unable to create local mail folders at `%s': %s"
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "KhÃng thá táo nháng thÆ mác thÆ các bá tái '%s': %s"
 
-#: ../mail/e-mail-notebook-view.c:565
-#| msgid "Please select a user."
+#: ../mail/e-mail-notebook-view.c:621
 msgid "Please select a folder"
 msgstr "HÃy chán mát thÆ mác."
 
-#. XXX e-error should provide a widget layout and API suitable
-#. *     for packing additional widgets to the right of the alert
-#. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:111
-#: ../modules/calendar/e-task-shell-view-actions.c:576
-#| msgid "Do not ask me again."
-msgid "Do not ask me again"
-msgstr "Äáng hái náa."
-
-#: ../mail/e-mail-reader.c:309 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "ChÃp vÃo thÆ mác"
 
-#: ../mail/e-mail-reader.c:309 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "ChÃ_p"
 
-#. Translators: %s is replaced with a folder name
-#. %d with count of duplicate messages.
-#: ../mail/e-mail-reader.c:510
-#, c-format
-msgid ""
-"Folder '%s' contains %d duplicate message. Are you sure you want to delete "
-"it?"
-msgid_plural ""
-"Folder '%s' contains %d duplicate messages. Are you sure you want to delete "
-"them?"
-msgstr[0] ""
-"ThÆ mác '%s' chá %d thÆ trÃng láp. Bán cà chác muán xoà chÃng khÃng?"
-
-#: ../mail/e-mail-reader.c:969 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Chuyán vÃo thÆ mác"
 
-#: ../mail/e-mail-reader.c:969 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "Chu_yán"
 
-#. Check buttons
-#: ../mail/e-mail-reader.c:1248 ../mail/e-mail-reader.c:1404
-#: ../mail/e-mail-reader.c:1446
-#| msgid "Do not ask me again."
+#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1403
 msgid "_Do not ask me again."
 msgstr "Äáng _hái náa."
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1409
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_LuÃn bá qua Reply-To: Äái vái háp thÆ chung."
 
-#: ../mail/e-mail-reader.c:1558
-#| msgid "_Save Message"
-msgid "Save Message"
-msgid_plural "Save Messages"
-msgstr[0] "LÆu thÆ"
-
-#. Translators: This is a part of a suggested file name
-#. * used when saving a message or multiple messages to an
-#. * mbox format, when the first message doesn't have a
-#. * Subject. The extension ".mbox" is appended to this
-#. * string, thus it will be something like "Message.mbox"
-#. * at the end.
-#: ../mail/e-mail-reader.c:1579
-#: ../plugins/groupwise-features/notification.ui.h:1
-#: ../plugins/groupwise-features/properties.ui.h:3
-#| msgid "Message"
-msgid "Message"
-msgid_plural "Messages"
-msgstr[0] "ThÆ"
-
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:1775
 msgid "A_dd Sender to Address Book"
 msgstr "_ThÃm ngÆái gái vÃo Sá Äáa chá"
 
-#: ../mail/e-mail-reader.c:1855
-#| msgid "Add Sender to Address Book"
+#: ../mail/e-mail-reader.c:1777
 msgid "Add sender to address book"
 msgstr "ThÃm ngÆái gái vÃo sá Äáa chá"
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:1782
 msgid "Check for _Junk"
 msgstr "Kiám tra tÃm thÆ _rÃc"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:1784
 msgid "Filter the selected messages for junk status"
 msgstr "Lác cÃc thÆ ÄÃ chán Äá quyát Äánh tráng thÃi thÆ rÃc"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1789
 msgid "_Copy to Folder..."
 msgstr "_ChÃp vÃo thÆ mác..."
 
-#: ../mail/e-mail-reader.c:1869
+#: ../mail/e-mail-reader.c:1791
 msgid "Copy selected messages to another folder"
 msgstr "ChÃp cÃc thÆ ÄÃ chán sang thÆ mác khÃc"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:1796
 msgid "_Delete Message"
 msgstr "_Xoà thÆ"
 
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1798
 msgid "Mark the selected messages for deletion"
 msgstr "ÄÃnh dáu cÃc thÆ ÄÃ chán cán xoÃ"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1803
 msgid "Filter on Mailing _List..."
 msgstr "_Lác theo háp thÆ chung..."
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1805
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Táo quy tác Äá lác mái thÆ ÄÆác gái cho háp thÆ chung nÃy"
 
-#: ../mail/e-mail-reader.c:1888
+#: ../mail/e-mail-reader.c:1810
 msgid "Filter on _Recipients..."
 msgstr "Lác theo NgÆái _nhán..."
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1812
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Táo quy tác Äá lác mái thÆ ÄÆác gái cho nháng ngÆái nhán nÃy"
 
-#: ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1817
 msgid "Filter on Se_nder..."
 msgstr "Lác theo NgÆái _gái..."
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1819
 msgid "Create a rule to filter messages from this sender"
 msgstr "Táo quy tác Äá lác mái thÆ tá ngÆái gái nÃy"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:1824
 msgid "Filter on _Subject..."
 msgstr "Lác theo _Chá Äá..."
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1826
 msgid "Create a rule to filter messages with this subject"
 msgstr "Táo quy tác Äá lác mái thÆ cà chá Äá nÃy"
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:1831
 msgid "A_pply Filters"
 msgstr "Ã_p dáng bá lác"
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:1833
 msgid "Apply filter rules to the selected messages"
 msgstr "Ãp dáng bá lác vÃo cÃc thÆ ÄÃ chán"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:1838
 msgid "_Find in Message..."
 msgstr "_TÃm trong thÆ"
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:1840
 msgid "Search for text in the body of the displayed message"
 msgstr "TÃm Äoán trong nái dung thÆ ÄÃ hián thá"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1845
 msgid "_Clear Flag"
 msgstr "XÃ_a cá"
 
-#: ../mail/e-mail-reader.c:1925
-#| msgid "Undelete the selected messages"
+#: ../mail/e-mail-reader.c:1847
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Bá cá Tiáp-theo khái thÆ ÄÆác chán"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1852
 msgid "_Flag Completed"
 msgstr "Cá _hoÃn tát"
 
-#: ../mail/e-mail-reader.c:1932
-#| msgid "Select all messages in the same thread as the selected message"
+#: ../mail/e-mail-reader.c:1854
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Äát cá tiáp-theo sang hoÃn tát cho thÆ ÄÆác chán"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1859
 msgid "Follow _Up..."
 msgstr "_Tiáp theo..."
 
-#: ../mail/e-mail-reader.c:1939
-#| msgid "Flag selected messages for follow-up"
+#: ../mail/e-mail-reader.c:1861
 msgid "Flag the selected messages for follow-up"
 msgstr "Äát cá tiáp-theo cho thÆ ÄÆác chán"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:1866
 msgid "_Attached"
 msgstr "Gái _kÃm"
 
-#: ../mail/e-mail-reader.c:1946 ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Chuyán tiáp thÆ Äà chán tái ngÆái khÃc nhÆ là ÄÃnh kÃm"
 
-#: ../mail/e-mail-reader.c:1951
-#| msgid "_Forward as iCalendar"
+#: ../mail/e-mail-reader.c:1873
 msgid "Forward As _Attached"
 msgstr "Chuyán dáng ÄÃnh _kÃm"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1880
 msgid "_Inline"
 msgstr "Trác t_iáp"
 
-#: ../mail/e-mail-reader.c:1960 ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
 msgid "Forward the selected message in the body of a new message"
 msgstr "Chuyán tiáp thÆ ÄÃ chán trong nái dung thÆ mái"
 
-#: ../mail/e-mail-reader.c:1965
-#| msgid "_Forward style:"
+#: ../mail/e-mail-reader.c:1887
 msgid "Forward As _Inline"
 msgstr "Chuyán dáng _inline"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1894
 msgid "_Quoted"
 msgstr "TrÃch _dán"
 
-#: ../mail/e-mail-reader.c:1974 ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
 msgid "Forward the selected message quoted like a reply"
 msgstr "Chuyán tiáp thÆ ÄÃ chán ÄÆác trÃch dán dáng trá lái"
 
-#: ../mail/e-mail-reader.c:1979
-#| msgid "_Forward style:"
+#: ../mail/e-mail-reader.c:1901
 msgid "Forward As _Quoted"
 msgstr "Chuyán dáng _trÃch dán"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1908
 msgid "_Load Images"
 msgstr "Tái á_nh"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:1910
 msgid "Force images in HTML mail to be loaded"
 msgstr "Buác tái ánh trong thÆ HTML"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:1915
 msgid "_Important"
 msgstr "_Quan tráng"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:1917
 msgid "Mark the selected messages as important"
 msgstr "ÄÃnh dáu Quan Tráng cÃc thÆ ÄÃ chán"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:1922
 msgid "_Junk"
 msgstr "_ThÆ rÃc"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages as junk"
 msgstr "ÄÃnh dáu thÆ rÃc cÃc thÆ ÄÃ chán"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:1929
 msgid "_Not Junk"
 msgstr "KhÃ_ng phái rÃc"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:1931
 msgid "Mark the selected messages as not being junk"
 msgstr "ÄÃnh dáu KhÃng phái thÆ rÃc cÃc thÆ ÄÃ chán"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:1936
 msgid "_Read"
 msgstr "Äá_c"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:1938
 msgid "Mark the selected messages as having been read"
 msgstr "ÄÃnh dáu ÄÃ Äác cÃc thÆ ÄÃ chán"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:1943
 msgid "Uni_mportant"
 msgstr "_KhÃng quan tráng"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:1945
 msgid "Mark the selected messages as unimportant"
 msgstr "ÄÃnh dáu KhÃng Quan Tráng cÃc thÆ ÄÃ chán"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:1950
 msgid "_Unread"
 msgstr "_ChÆa Äác"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:1952
 msgid "Mark the selected messages as not having been read"
 msgstr "ÄÃnh dáu ChÆa Äác cÃc thÆ ÄÃ chán"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:1957
 msgid "_Edit as New Message..."
 msgstr "_Sáa dáng thÆ mái..."
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:1959
 msgid "Open the selected messages in the composer for editing"
 msgstr "Má cÃc thÆ ÄÃ chán trong bá soán tháo Äá hiáu chánh"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:1964
 msgid "Compose _New Message"
 msgstr "Viát thÆ _mái"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:1966
 msgid "Open a window for composing a mail message"
 msgstr "Má cáa sá viát thÆ"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:1971
 msgid "_Open in New Window"
 msgstr "Má tr_ong cáa sá mái"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:1973
 msgid "Open the selected messages in a new window"
 msgstr "Má cÃc thÆ ÄÃ chán trong cáa sá mái"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:1978
 msgid "_Move to Folder..."
 msgstr "Ch_uyán sang thÆ mác..."
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:1980
 msgid "Move selected messages to another folder"
 msgstr "Di chuyán cÃc thÆ ÄÃ chán sang thÆ mác khÃc"
 
-#: ../mail/e-mail-reader.c:2063
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:1985
 msgid "_Switch to Folder"
 msgstr "_Chuyán sang thÆ mác"
 
-#: ../mail/e-mail-reader.c:2065
-#| msgid "Install the shared folder"
+#: ../mail/e-mail-reader.c:1987
 msgid "Display the parent folder"
 msgstr "Hián thÆ mác cha"
 
-#: ../mail/e-mail-reader.c:2070
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:1992
 msgid "Switch to _next tab"
 msgstr "Chuyán sang thá _ká"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:1994
 msgid "Switch to the next tab"
 msgstr "Chuyán sang thá ká tiáp"
 
-#: ../mail/e-mail-reader.c:2077
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:1999
 msgid "Switch to _previous tab"
 msgstr "Chuyán sang thá _trÆác"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2001
 msgid "Switch to the previous tab"
 msgstr "Chuyán sang thá trÆác ÄÃ"
 
-#: ../mail/e-mail-reader.c:2084
-#| msgid "Close the current file"
+#: ../mail/e-mail-reader.c:2006
 msgid "Cl_ose current tab"
 msgstr "ÄÃng táp tin hián thái"
 
-#: ../mail/e-mail-reader.c:2086
-#| msgid "Close the current file"
+#: ../mail/e-mail-reader.c:2008
 msgid "Close current tab"
 msgstr "ÄÃng thá hián thái"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2013
 msgid "_Next Message"
 msgstr "ThÆ _ká"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2015
 msgid "Display the next message"
 msgstr "Hián thá thÆ ká tiáp"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2020
 msgid "Next _Important Message"
 msgstr "ThÆ _quan tráng ká"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2022
 msgid "Display the next important message"
 msgstr "Hián thá thÆ quan tráng ká tiáp"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2027
 msgid "Next _Thread"
 msgstr "_NhÃnh ká"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2029
 msgid "Display the next thread"
 msgstr "Hián thá nhÃnh Äác ká tiáp"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2034
 msgid "Next _Unread Message"
 msgstr "ThÆ _chÆa Äác ká"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2036
 msgid "Display the next unread message"
 msgstr "Hián thá thÆ chÆa Äác ká tiáp"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2041
 msgid "_Previous Message"
 msgstr "ThÆ t_rÆác"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2043
 msgid "Display the previous message"
 msgstr "Hián thá thÆ trÆác ÄÃ"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2048
 msgid "Pr_evious Important Message"
 msgstr "ThÆ quan tráng t_rÆác"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2050
 msgid "Display the previous important message"
 msgstr "Hián thá thÆ quan tráng trÆác ÄÃ"
 
-#: ../mail/e-mail-reader.c:2133
-#| msgid "Previous"
+#: ../mail/e-mail-reader.c:2055
 msgid "Previous T_hread"
 msgstr "Mách thÆ _trÆác"
 
-#: ../mail/e-mail-reader.c:2135
-#| msgid "Display the previous message"
+#: ../mail/e-mail-reader.c:2057
 msgid "Display the previous thread"
 msgstr "Hián thá mách thÆ trÆác ÄÃ"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2062
 msgid "P_revious Unread Message"
 msgstr "ThÆ chÆa Äác t_rÆác"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2064
 msgid "Display the previous unread message"
 msgstr "Hián thá thÆ chÆa Äác trÆác ÄÃ"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2071
 msgid "Print this message"
 msgstr "In thÆ nÃy"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2078
 msgid "Preview the message to be printed"
 msgstr "Xem thá thÆ cán in"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2083
 msgid "Re_direct"
 msgstr "Chuyán _hÆáng"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2085
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Chuyán hÆáng (bounce: náy lÃn) thÆ ÄÃ chán tái ngÆái khÃc"
 
-#: ../mail/e-mail-reader.c:2168
-#| msgid "No Attachment"
+#: ../mail/e-mail-reader.c:2090
 msgid "Remo_ve Attachments"
 msgstr "_Bá ÄÃnh kÃm"
 
-#: ../mail/e-mail-reader.c:2170
-#| msgid "Save attachments"
+#: ../mail/e-mail-reader.c:2092
 msgid "Remove attachments"
 msgstr "LÆu ÄÃnh kÃm"
 
-#: ../mail/e-mail-reader.c:2175
-#| msgid "Hide S_elected Messages"
+#: ../mail/e-mail-reader.c:2097
 msgid "Remove Du_plicate Messages"
 msgstr "Xoà cÃc thÆ trÃng láp"
 
-#: ../mail/e-mail-reader.c:2177
-#| msgid "Mark the selected messages for deletion"
+#: ../mail/e-mail-reader.c:2099
 msgid "Checks selected messages for duplicates"
 msgstr "ÄÃnh dáu cÃc thÆ Äà chán là trÃng láp"
 
-#: ../mail/e-mail-reader.c:2182 ../mail/mail.error.xml.h:102
-#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "Trá lái _mái ngÆái"
 
-#: ../mail/e-mail-reader.c:2184
-#| msgid "Compose a reply to all of the recipients of the selected message"
+#: ../mail/e-mail-reader.c:2106
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Soán thÆ trá lái cho mái ngÆái nhán thÆ ÄÃ chán"
 
-#: ../mail/e-mail-reader.c:2189 ../mail/mail.error.xml.h:103
+#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
 msgid "Reply to _List"
 msgstr "Trá lái _Háp thÆ chung"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2113
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Viát thÆ trá lái cho háp thÆ chung cáa thÆ ÄÃ chán"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2118
 #: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "T_rá lái ngÆái gái"
 
-#: ../mail/e-mail-reader.c:2198
+#: ../mail/e-mail-reader.c:2120
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Viát thÆ trá lái cho ngÆái gái thÆ ÄÃ chán"
 
-#: ../mail/e-mail-reader.c:2203
-#| msgid "Save as..."
+#: ../mail/e-mail-reader.c:2125
 msgid "_Save as mbox..."
 msgstr "LÆu dáng _mbox..."
 
-#: ../mail/e-mail-reader.c:2205
-#| msgid "Save the selected messages as a text file"
+#: ../mail/e-mail-reader.c:2127
 msgid "Save selected messages as an mbox file"
 msgstr "LÆu cÃc thÆ ÄÆác chán vÃo táp tin dáng mbox"
 
-#: ../mail/e-mail-reader.c:2210
-msgid "Search Folder from Mailing _List..."
-msgstr "ThÆ mác tÃm kiám trÃn _Háp thÆ chung..."
-
-#: ../mail/e-mail-reader.c:2212
-#| msgid "Create a Search Folder for this mailing list"
-msgid "Create a search folder for this mailing list"
-msgstr "Táo thÆ mác tÃm kiám cho háp thÆ chung nÃy"
-
-#: ../mail/e-mail-reader.c:2217
-msgid "Search Folder from Recipien_ts..."
-msgstr "_ThÆ mác tÃm kiám tá NgÆái nhán..."
-
-#: ../mail/e-mail-reader.c:2219
-#| msgid "Create a Search Folder for these recipients"
-msgid "Create a search folder for these recipients"
-msgstr "Táo thÆ mác tÃm kiám cho nháng ngÆái nhán nÃy"
-
-#: ../mail/e-mail-reader.c:2224
-msgid "Search Folder from Sen_der..."
-msgstr "ThÆ mác tÃm kiám trÃn NgÆái _gái..."
-
-#: ../mail/e-mail-reader.c:2226
-#| msgid "Create a Search Folder for this sender"
-msgid "Create a search folder for this sender"
-msgstr "Táo thÆ mác tÃm kiám cho ngÆái gái nÃy"
-
-#: ../mail/e-mail-reader.c:2231
-msgid "Search Folder from S_ubject..."
-msgstr "ThÆ mác tÃm kiám trÃn _Chá Äá..."
-
-#: ../mail/e-mail-reader.c:2233
-#| msgid "Create a Search Folder for this subject"
-msgid "Create a search folder for this subject"
-msgstr "Táo thÆ mác tÃm kiám cho chá Äá nÃy"
-
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2132
 msgid "_Message Source"
 msgstr "_MÃ nguán thÆ"
 
-#: ../mail/e-mail-reader.c:2240
+#: ../mail/e-mail-reader.c:2134
 msgid "Show the raw email source of the message"
 msgstr "Hián thÆ thÃ, mà nguán"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2146
 msgid "_Undelete Message"
 msgstr "_Háy xoà thÆ"
 
-#: ../mail/e-mail-reader.c:2254
+#: ../mail/e-mail-reader.c:2148
 msgid "Undelete the selected messages"
 msgstr "Háy xoà nháng thÆ Äà chán"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2153
 msgid "_Normal Size"
 msgstr "Cá chuá_n"
 
-#: ../mail/e-mail-reader.c:2261
+#: ../mail/e-mail-reader.c:2155
 msgid "Reset the text to its original size"
 msgstr "Phác hái kÃch cá chá gác"
 
-#: ../mail/e-mail-reader.c:2266
+#: ../mail/e-mail-reader.c:2160
 msgid "_Zoom In"
 msgstr "_PhÃng to"
 
-#: ../mail/e-mail-reader.c:2268
+#: ../mail/e-mail-reader.c:2162
 msgid "Increase the text size"
 msgstr "TÄng kÃch cá chá"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2167
 msgid "Zoom _Out"
 msgstr "Thu _nhá"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2169
 msgid "Decrease the text size"
 msgstr "Giám kÃch cá chá"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2176
 msgid "Create R_ule"
 msgstr "Táo q_uy tác"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2183
 msgid "Ch_aracter Encoding"
 msgstr "Bá _kà tá"
 
-#: ../mail/e-mail-reader.c:2296
-#| msgid "F_orward As..."
+#: ../mail/e-mail-reader.c:2190
 msgid "F_orward As"
 msgstr "Chuyán tiáp _dáng"
 
-#: ../mail/e-mail-reader.c:2303
-#| msgid "_Reply"
+#: ../mail/e-mail-reader.c:2197
 msgid "_Group Reply"
 msgstr "T_rá lái nhÃm"
 
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2204
 msgid "_Go To"
 msgstr "Ä_i tái"
 
-#: ../mail/e-mail-reader.c:2317
-#| msgid "Mar_k as"
+#: ../mail/e-mail-reader.c:2211
 msgid "Mar_k As"
 msgstr "ÄÃnh _dáu lÃ"
 
-#: ../mail/e-mail-reader.c:2324
+#: ../mail/e-mail-reader.c:2218
 msgid "_Message"
 msgstr "_ThÆ"
 
-#: ../mail/e-mail-reader.c:2331
+#: ../mail/e-mail-reader.c:2225
 msgid "_Zoom"
 msgstr "Thu _phÃng"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2235
+msgid "Search Folder from Mailing _List..."
+msgstr "ThÆ mác tÃm kiám trÃn _Háp thÆ chung..."
+
+#: ../mail/e-mail-reader.c:2237
+msgid "Create a search folder for this mailing list"
+msgstr "Táo thÆ mác tÃm kiám cho háp thÆ chung nÃy"
+
+#: ../mail/e-mail-reader.c:2242
+msgid "Search Folder from Recipien_ts..."
+msgstr "_ThÆ mác tÃm kiám tá NgÆái nhán..."
+
+#: ../mail/e-mail-reader.c:2244
+msgid "Create a search folder for these recipients"
+msgstr "Táo thÆ mác tÃm kiám cho nháng ngÆái nhán nÃy"
+
+#: ../mail/e-mail-reader.c:2249
+msgid "Search Folder from Sen_der..."
+msgstr "ThÆ mác tÃm kiám trÃn NgÆái _gái..."
+
+#: ../mail/e-mail-reader.c:2251
+msgid "Create a search folder for this sender"
+msgstr "Táo thÆ mác tÃm kiám cho ngÆái gái nÃy"
+
+#: ../mail/e-mail-reader.c:2256
+msgid "Search Folder from S_ubject..."
+msgstr "ThÆ mác tÃm kiám trÃn _Chá Äá..."
+
+#: ../mail/e-mail-reader.c:2258
+msgid "Create a search folder for this subject"
+msgstr "Táo thÆ mác tÃm kiám cho chá Äá nÃy"
+
+#: ../mail/e-mail-reader.c:2281
 msgid "Mark for Follo_w Up..."
 msgstr "ÄÃnh dáu Cán th_eo dÃi tiáp..."
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2289
 msgid "Mark as _Important"
 msgstr "ÄÃnh dáu _Quan tráng"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2293
 msgid "Mark as _Junk"
 msgstr "ÄÃnh dáu _ThÆ rÃc"
 
-#: ../mail/e-mail-reader.c:2372
+#: ../mail/e-mail-reader.c:2297
 msgid "Mark as _Not Junk"
 msgstr "ÄÃ_nh dáu KhÃc rÃc"
 
-#: ../mail/e-mail-reader.c:2376
+#: ../mail/e-mail-reader.c:2301
 msgid "Mar_k as Read"
 msgstr "ÄÃnh dáu ÄÃ Äá_c"
 
-#: ../mail/e-mail-reader.c:2380
-#| msgid "Mark as Un_important"
+#: ../mail/e-mail-reader.c:2305
 msgid "Mark as Uni_mportant"
 msgstr "ÄÃnh dáu _KhÃng quan tráng"
 
-#: ../mail/e-mail-reader.c:2384
+#: ../mail/e-mail-reader.c:2309
 msgid "Mark as _Unread"
 msgstr "ÄÃnh dá_u ChÆa Äác"
 
-#: ../mail/e-mail-reader.c:2428
+#: ../mail/e-mail-reader.c:2353
 msgid "_Caret Mode"
 msgstr "_Chá Äá con nhÃy"
 
-#: ../mail/e-mail-reader.c:2430
+#: ../mail/e-mail-reader.c:2355
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Hián thá con cháy nhÃy trong phán nái dung cÃc thÆ ÄÃ hián thá"
 
-#: ../mail/e-mail-reader.c:2436
+#: ../mail/e-mail-reader.c:2361
 msgid "All Message _Headers"
 msgstr "CÃc dÃng Äáu t_hÆ"
 
-#: ../mail/e-mail-reader.c:2438
+#: ../mail/e-mail-reader.c:2363
 msgid "Show messages with all email headers"
 msgstr "Hián thá thÆ vái mái dÃng Äáu thÆ"
 
-#: ../mail/e-mail-reader.c:2670
-msgid "Unable to retrieve message"
-msgstr "KhÃng thá nhán thÆ."
-
-#: ../mail/e-mail-reader.c:2731 ../mail/mail-ops.c:2044
+#: ../mail/e-mail-reader.c:2659
 #, c-format
-#| msgid "Retrieving message %s"
 msgid "Retrieving message '%s'"
 msgstr "Äang láy thÆ '%s'"
 
 #. we changed user, thus reset the chosen calendar combo too, because
-#. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3344 ../mail/mail-config.ui.h:31
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:538
-#: ../plugins/google-account-setup/google-source.c:674
+#. * other user means other calendars subscribed
+#: ../mail/e-mail-reader.c:3246 ../mail/mail-config.ui.h:32
+#: ../plugins/google-account-setup/google-source.c:316
+#: ../plugins/google-account-setup/google-source.c:565
+#: ../plugins/google-account-setup/google-source.c:704
 #: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "Mác Äánh"
 
-#: ../mail/e-mail-reader.c:3524
+#: ../mail/e-mail-reader.c:3415
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "Chuyán t_iáp"
 
-#: ../mail/e-mail-reader.c:3525
+#: ../mail/e-mail-reader.c:3416
 msgid "Forward the selected message to someone"
 msgstr "Chuyán tiáp thÆ ÄÃ chán tái ngÆái khÃc"
 
-#: ../mail/e-mail-reader.c:3544
-#| msgid "Group Items By"
+#: ../mail/e-mail-reader.c:3435
 msgid "Group Reply"
 msgstr "Trá lái nhÃm"
 
-#: ../mail/e-mail-reader.c:3545
-#| msgid "Compose a reply to the mailing list of the selected message"
+#: ../mail/e-mail-reader.c:3436
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Viát thÆ trá lái cho háp thÆ chung, hoác cho tát cá mái ngÆái"
 
-#: ../mail/e-mail-reader.c:3590 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:744
+#: ../mail/e-mail-reader.c:3489 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "XoÃ"
 
-#: ../mail/e-mail-reader.c:3623
-#: ../modules/calendar/e-cal-shell-view-actions.c:1309
-#: ../widgets/misc/e-calendar.c:196
+#: ../mail/e-mail-reader.c:3522
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "Ká"
 
-#: ../mail/e-mail-reader.c:3627
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
-#: ../widgets/misc/e-calendar.c:172
+#: ../mail/e-mail-reader.c:3526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "LÃi"
 
-#: ../mail/e-mail-reader.c:3637 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "Trá lái"
 
-#: ../mail/e-mail-reader.c:4274
+#: ../mail/e-mail-reader.c:4205
 #, c-format
-#| msgid "Folder"
 msgid "Folder '%s'"
 msgstr "ThÆ mác '%s'"
 
-#: ../mail/e-mail-session.c:644
+#: ../mail/e-mail-reader-utils.c:145
+#, fuzzy
+#| msgid "Do not ask me again"
+msgid "Do not warn me again"
+msgstr "Äáng hái náa."
+
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:670
+#, fuzzy, c-format
+#| msgid ""
+#| "Folder '%s' contains %d duplicate message. Are you sure you want to "
+#| "delete it?"
+#| msgid_plural ""
+#| "Folder '%s' contains %d duplicate messages. Are you sure you want to "
+#| "delete them?"
+msgid ""
+"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
+"it?"
+msgid_plural ""
+"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] ""
+"ThÆ mác '%s' chá %d thÆ trÃng láp. Bán cà chác muán xoà chÃng khÃng?"
+
+#: ../mail/e-mail-reader-utils.c:1047
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "LÆu thÆ"
+
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * mbox format, when the first message doesn't have a
+#. * subject.  The extension ".mbox" is appended to the
+#. * string; for example "Message.mbox".
+#: ../mail/e-mail-reader-utils.c:1068
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "ThÆ"
+
+#: ../mail/e-mail-session.c:870
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "HÃy gà cám tá mát kháu cho %s"
 
-#: ../mail/e-mail-session.c:646
+#: ../mail/e-mail-session.c:874
 msgid "Enter Passphrase"
 msgstr "GÃ cám tá mát kháu"
 
-#: ../mail/e-mail-session.c:649
+#: ../mail/e-mail-session.c:878
 #, c-format
 msgid "Enter Password for %s"
 msgstr "HÃy gà mát kháu cho %s"
 
-#: ../mail/e-mail-session.c:651
+#: ../mail/e-mail-session.c:882
 msgid "Enter Password"
 msgstr "GÃ mát kháu"
 
-#: ../mail/e-mail-session.c:696
+#: ../mail/e-mail-session.c:933
 #, c-format
 msgid "User canceled operation."
 msgstr "NgÆái dÃng ÄÃ thÃi thao tÃc nÃy."
 
-#: ../mail/e-mail-session.c:864
+#: ../mail/e-mail-session.c:1046
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "ChÆa cung cáp Äáa chá ÄÃch thà tián trÃnh chuyán tiáp thÆ nÃy Äà bá thÃi."
 
-#: ../mail/e-mail-session.c:873
+#: ../mail/e-mail-session.c:1055
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "KhÃng tÃm tháy tÃi khoán cà thá sá dáng thà tián trÃnh chuyán tiáp thÆ nÃy "
 "ÄÃ bá thÃi."
 
-#: ../mail/e-mail-session.c:1262 ../mail/mail-ops.c:1220
-#, c-format
-#| msgid "Opening folder %s"
-msgid "Opening folder '%s'"
-msgstr "Äang má thÆ mác '%s'"
-
-#: ../mail/e-mail-session.c:1278
-#, c-format
-#| msgid "Invalid folder: `%s'"
-msgid "Invalid folder: %s"
-msgstr "ThÆ mác khÃng háp lá: %s"
+#: ../mail/e-mail-session-utils.c:419
+#, fuzzy, c-format
+#| msgid "Expunging and storing account '%s'"
+msgid "Cannot get transport for account '%s'"
+msgstr "Äang xoà hán và cát giá tÃi khoán %s..."
 
-#: ../mail/e-mail-session-utils.c:477 ../mail/mail-ops.c:605
+#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:634
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Viác Ãp dáng bá lác gái Äi bá lái: %s"
 
-#: ../mail/e-mail-session-utils.c:501 ../mail/e-mail-session-utils.c:535
-#: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
+#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
+#: ../mail/mail-ops.c:653 ../mail/mail-ops.c:687
 #, c-format
-#| msgid ""
-#| "Failed to append to %s: %s\n"
-#| "Appending to local `Sent' folder instead."
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local 'Sent' folder instead."
@@ -9165,205 +9245,45 @@ msgstr ""
 "Lái nái thÃm vÃo %s: %s\n"
 "Cho nÃn nái thÃm vÃo thÆ mác 'ÄÃ gái'."
 
-#: ../mail/e-mail-session-utils.c:555 ../mail/mail-ops.c:673
+#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:707
 #, c-format
-#| msgid "Failed to append to local `Sent' folder: %s"
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Lái nái thÃm vÃo thÆ mác các bá 'ÄÃ gái' các bá: %s"
 
-#: ../mail/e-mail-session-utils.c:761 ../mail/mail-ops.c:774
-#: ../mail/mail-ops.c:866
+#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:810
+#: ../mail/mail-ops.c:906
 msgid "Sending message"
 msgstr "Äang gái thÆ"
 
-#: ../mail/e-mail-session-utils.c:832
+#: ../mail/e-mail-session-utils.c:873
 #, c-format
-#| msgid "Unsubscribing from folder \"%s\""
 msgid "Unsubscribing from folder '%s'"
 msgstr "Äang bá ÄÄng kà thÆ mác '%s'"
 
-#: ../mail/e-mail-store-utils.c:39
+#: ../mail/e-mail-store-utils.c:168
 #, c-format
-#| msgid "Disconnecting from %s"
 msgid "Disconnecting from '%s'"
 msgstr "Äang ngát kát nái tá '%s'"
 
-#: ../mail/e-mail-store-utils.c:130
+#: ../mail/e-mail-store-utils.c:259
 #, c-format
-#| msgid "Reconnecting to %s"
 msgid "Reconnecting to '%s'"
 msgstr "Äang tÃi kát nái tái '%s'"
 
-#: ../mail/e-mail-tag-editor.c:295
+#: ../mail/e-mail-store-utils.c:334
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "Äang chuán bá tÃi khoán  %s  Äá ra ngoái tuyán"
+
+#: ../mail/e-mail-tag-editor.c:291
 msgid "Flag to Follow Up"
 msgstr "Äát cá Äá theo dÃi tiáp"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:566 ../mail/mail-config.ui.h:69
-#: ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr "KhÃng mà hoÃ"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../mail/em-account-editor.c:570 ../mail/mail-config.ui.h:124
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "TLS encryption"
-msgstr "Mát mà TLS"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../mail/em-account-editor.c:574 ../mail/mail-config.ui.h:91
-#: ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "Mát mà SSL"
-
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:842 ../widgets/misc/e-signature-combo-box.c:79
-#| msgid "None"
-msgctxt "mail-signature"
-msgid "None"
-msgstr "KhÃng"
-
-#: ../mail/em-account-editor.c:923
-msgid "Never"
-msgstr "KhÃng bao giá"
-
-#: ../mail/em-account-editor.c:924
-msgid "Always"
-msgstr "LuÃn luÃn"
-
-#: ../mail/em-account-editor.c:925
-msgid "Ask for each message"
-msgstr "Hái cho mái thÆ"
-
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1707 ../widgets/misc/e-account-tree-view.c:131
-#| msgid "None"
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "KhÃng"
-
-#: ../mail/em-account-editor.c:2091
-msgid "Mail Configuration"
-msgstr "Cáu hÃnh ThÆ"
-
-#: ../mail/em-account-editor.c:2092
-#| msgid ""
-#| "Welcome to the Evolution Mail Configuration Assistant.\n"
-#| "\n"
-#| "Click \"Forward\" to begin. "
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"ChÃo máng dÃng Phá tà cáu hÃnh thÆ Evolution.\n"
-"\n"
-"HÃy nhán \"Tiáp\" Äá bát Äáu."
-
-#: ../mail/em-account-editor.c:2095
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Vui lÃng nháp tÃn và Äáa chá thÆ Äián tá vÃo bÃn dÆái. TrÆáng  tÃy chán  "
-"bÃn dÆái khÃng cán phái ÄÃ chán, trá khi bán muán gám thÃng tin áy vÃo thÆ "
-"bán cán gái."
-
-#: ../mail/em-account-editor.c:2097 ../mail/em-account-editor.c:2259
-msgid "Receiving Email"
-msgstr "Nhán ThÆ"
-
-#: ../mail/em-account-editor.c:2098
-#| msgid "Please select among the following options"
-msgid "Please configure the following account settings."
-msgstr "HÃy cáu hÃnh cÃc thiát láp tÃi khoán sau."
-
-#: ../mail/em-account-editor.c:2100 ../mail/em-account-editor.c:2758
-msgid "Sending Email"
-msgstr "Gái ThÆ"
-
-#: ../mail/em-account-editor.c:2101
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"HÃy nháp thÃng tin vá cÃch bán sá gái thÆ. Náu bán khÃng chác, hÃy hái quán "
-"trá há tháng hoác ISP (nhà cung cáp dách vá Internet) cáa bán."
-
-#: ../mail/em-account-editor.c:2103
-msgid "Account Management"
-msgstr "Quán là TÃi khoán"
-
-#: ../mail/em-account-editor.c:2104
-msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"HÃy nháp mát tÃn dián tá cho tÃi khoán nÃy vÃo trÆáng bÃn dÆái.\n"
-"Chá ÄÆác dÃng tÃn nÃy vái mác ÄÃch hián thá thÃi."
-
-#: ../mail/em-account-editor.c:2108
-msgid "Done"
-msgstr "HoÃn tát"
-
-#: ../mail/em-account-editor.c:2109
-#| msgid ""
-#| "Congratulations, your mail configuration is complete.\n"
-#| "\n"
-#| "You are now ready to send and receive email \n"
-#| "using Evolution. \n"
-#| "\n"
-#| "Click \"Apply\" to save your settings."
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"Xin chÃc máng, bán Äà hoÃn tát quà trÃnh cáu hÃnh thÆ.\n"
-"\n"
-"Tá bÃy giá bán cà thá gái và nhán thÆ báng Evolution.\n"
-"\n"
-"HÃy nhán \"Ãp dáng\" Äá lÆu cÃc thiát láp."
-
-#: ../mail/em-account-editor.c:2572
-msgid "Check for _new messages every"
-msgstr "_Kiám tra cà thÆ mái mái"
-
-#: ../mail/em-account-editor.c:2580
-msgid "minu_tes"
-msgstr "phÃ_t"
-
-#: ../mail/em-account-editor.c:2862
-#| msgid "Please select an image for this contact"
-msgid "Please select a folder from the current account."
-msgstr "HÃy chán thÆ mác tá tÃi khoán hián tái."
-
-#: ../mail/em-account-editor.c:3171 ../mail/mail-config.ui.h:98
-msgid "Security"
-msgstr "Báo mát"
-
-#. Most sections for this is auto-generated from the camel config
-#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3216 ../mail/em-account-editor.c:3284
-msgid "Receiving Options"
-msgstr "TÃy chán Nhán"
-
-#: ../mail/em-account-editor.c:3217 ../mail/em-account-editor.c:3285
-msgid "Checking for New Messages"
-msgstr "Kiám tra cà ThÆ Mái"
-
-#. Note to translators: this is the attribution string used when quoting messages.
-#. * each ${Variable} gets replaced with a value. To see a full list of available
-#. * variables, see mail/em-composer-utils.c:attribvars array
-#: ../mail/em-composer-utils.c:1136
+#. Note to translators: this is the attribution string used
+#. * when quoting messages.  Each ${Variable} gets replaced
+#. * with a value.  To see a full list of available variables,
+#. * see mail/em-composer-utils.c:attribvars array.
+#: ../mail/em-composer-utils.c:1197
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9371,36 +9291,35 @@ msgstr ""
 "VÃo ${AbbrevWeekdayName}, ngÃy ${Day}, ${Month} nÄm ${Year} lÃc ${24Hour}:"
 "${Minute} ${TimeZone}, ${Sender} viát:"
 
-#: ../mail/em-composer-utils.c:1146
+#: ../mail/em-composer-utils.c:1208
 msgid "-----Original Message-----"
 msgstr "âââThÆ gácâââ"
 
-#. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1804
+#. Translators: First %s is an email address, second %s
+#. * is the subject of the email, third %s is the date.
+#: ../mail/em-composer-utils.c:1992
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "ThÆ gái cho %s vá \"%s\" vÃo %s ÄÃ ÄÆác Äác."
 
-#. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1854
+#: ../mail/em-composer-utils.c:2052
 #, c-format
-#| msgid "Mail Notification Properties"
 msgid "Delivery Notification for: \"%s\""
 msgstr "XÃc nhán gái/nhán thÆ cho: \"%s\""
 
-#: ../mail/em-composer-utils.c:2272
+#: ../mail/em-composer-utils.c:2592
 msgid "an unknown sender"
 msgstr "ngÆái gái lá"
 
-#: ../mail/em-composer-utils.c:2696
+#: ../mail/em-composer-utils.c:2998
 msgid "Posting destination"
 msgstr "ÄÃch gái Äán"
 
-#: ../mail/em-composer-utils.c:2697
+#: ../mail/em-composer-utils.c:2999
 msgid "Choose folders to post the message to."
 msgstr "HÃy chán cÃc thÆ mác nÆi cán gái thÆ."
 
-#: ../mail/em-filter-folder-element.c:337
+#: ../mail/em-filter-folder-element.c:241
 msgid "Select Folder"
 msgstr "Chán thÆ mác"
 
@@ -9486,7 +9405,6 @@ msgid "Follow Up"
 msgstr "Theo dÃi tiáp"
 
 #: ../mail/em-filter-i18n.h:29
-#| msgid "Forward"
 msgid "Forward to"
 msgstr "Chuyán Äán"
 
@@ -9518,7 +9436,7 @@ msgstr "chÆa Äát"
 msgid "is set"
 msgstr "ÄÃ Äát"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:60
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
 msgid "Junk"
 msgstr "ThÆ rÃc"
 
@@ -9555,7 +9473,6 @@ msgid "Message is not Junk"
 msgstr "ThÆ khÃng phái rÃc"
 
 #: ../mail/em-filter-i18n.h:50
-#| msgid "Message contains"
 msgid "Message Location"
 msgstr "Vá trà thÆ"
 
@@ -9568,7 +9485,7 @@ msgid "Play Sound"
 msgstr "PhÃt Ãm thanh"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "Äác"
 
@@ -9649,201 +9566,256 @@ msgid "Unset Status"
 msgstr "Bá Äát tráng thÃi"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:539
+#: ../mail/em-filter-rule.c:561
 msgid "Then"
 msgstr "Rái"
 
-#: ../mail/em-filter-rule.c:570
+#: ../mail/em-filter-rule.c:592
 msgid "Add Ac_tion"
 msgstr "ThÃm _hÃnh Äáng"
 
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:124
+#: ../mail/em-folder-properties.c:145
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "ThÆ chÆa Äác:"
 
-#. TODO: can this be done in a loop?
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:128
+#: ../mail/em-folder-properties.c:156
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Táng sá thÆ:"
 
-#: ../mail/em-folder-properties.c:146
+#: ../mail/em-folder-properties.c:177
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Sá dáng hán ngách (%s):"
 
-#: ../mail/em-folder-properties.c:148
+#: ../mail/em-folder-properties.c:179
 #, c-format
 msgid "Quota usage"
 msgstr "Sá dáng hán ngách"
 
-#: ../mail/em-folder-properties.c:290
+#: ../mail/em-folder-properties.c:317
 msgid "Folder Properties"
 msgstr "Thuác tÃnh thÆ mác"
 
-#: ../mail/em-folder-selection-button.c:81
+#: ../mail/em-folder-selection-button.c:79
 msgid "<click here to select a folder>"
 msgstr "<nhán ÄÃy Äá chán thÆ mác>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:436
 msgid "C_reate"
 msgstr "Tá_o"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:442
 msgid "Folder _name:"
 msgstr "TÃ_n thÆ mác:"
 
-#. load store to mail component
-#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
-#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
-#: ../mail/mail-vfolder.c:1140 ../mail/mail-vfolder.c:1216
-msgid "Search Folders"
-msgstr "ThÆ mác tÃm kiám"
-
-#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
-msgid "UNMATCHED"
-msgstr "KHÃNG KHáP"
-
-#: ../mail/em-folder-tree-model.c:836 ../mail/em-folder-tree-model.c:1113
-msgid "Loading..."
-msgstr "Äang náp..."
-
-#: ../mail/em-folder-tree.c:201
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Äang quÃt cÃc thÆ mác trong  %s Â..."
-
-#: ../mail/em-folder-tree.c:629
+#: ../mail/em-folder-tree.c:647
 msgid "Folder names cannot contain '/'"
 msgstr "TÃn thÆ mác khÃng thá cháa kà tá sá chÃo."
 
 # Variable: do not translate/ bián: Äáng dách
-#: ../mail/em-folder-tree.c:1191
+#: ../mail/em-folder-tree.c:768
 #, c-format
-#| msgctxt "folder-display"
-#| msgid "%s (%u)"
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1427
+#: ../mail/em-folder-tree.c:1590
 msgid "Mail Folder Tree"
 msgstr "CÃy thÆ mác thÆ"
 
-#: ../mail/em-folder-tree.c:1788 ../mail/em-folder-utils.c:90
+#: ../mail/em-folder-tree.c:2069 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "Äang chuyán thÆ mác %s..."
 
-#: ../mail/em-folder-tree.c:1792 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:2072 ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "Äang sao chÃp thÆ mác %s..."
 
-#: ../mail/em-folder-tree.c:1801 ../mail/message-list.c:2214
+#: ../mail/em-folder-tree.c:2079 ../mail/message-list.c:2303
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Äang chuyán thÆ vÃo thÆ mác %s..."
 
-#: ../mail/em-folder-tree.c:1805 ../mail/message-list.c:2216
+#: ../mail/em-folder-tree.c:2083 ../mail/message-list.c:2305
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Äang sao chÃp thÆ vÃo thÆ mác %s..."
 
-#: ../mail/em-folder-tree.c:1824
+#: ../mail/em-folder-tree.c:2102
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "KhÃng thá thá thÆ vÃo kho mác Äá Äánh"
 
-#: ../mail/em-folder-utils.c:422
-#| msgid "_Move Folder To..."
+#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:163 ../mail/em-folder-tree-model.c:165
+#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
+#: ../mail/mail-vfolder.c:1125 ../mail/mail-vfolder.c:1239
+msgid "Search Folders"
+msgstr "ThÆ mác tÃm kiám"
+
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:179 ../mail/em-folder-tree-model.c:181
+msgid "UNMATCHED"
+msgstr "KHÃNG KHáP"
+
+#: ../mail/em-folder-tree-model.c:790 ../mail/em-folder-tree-model.c:1075
+msgid "Loading..."
+msgstr "Äang náp..."
+
+#: ../mail/em-folder-utils.c:488
 msgid "Move Folder To"
 msgstr "Chuyán thÆ mác Äán"
 
-#: ../mail/em-folder-utils.c:422
-#| msgid "_Copy Folder To..."
+#: ../mail/em-folder-utils.c:488
 msgid "Copy Folder To"
 msgstr "ChÃp thÆ mác vÃo"
 
-#: ../mail/em-folder-utils.c:571
-#: ../plugins/groupwise-features/share-folder-common.c:138
-#, c-format
-#| msgid "Creating folder `%s'"
-msgid "Creating folder '%s'"
-msgstr "Äang táo thÆ mác '%s'"
-
-#: ../mail/em-folder-utils.c:745
-#| msgid "Create folder"
+#: ../mail/em-folder-utils.c:590
 msgid "Create Folder"
 msgstr "Táo thÆ mác"
 
-#: ../mail/em-folder-utils.c:746
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
+#: ../mail/em-folder-utils.c:591
 msgid "Specify where to create the folder:"
 msgstr "XÃc Äánh nÆi táo thÆ mác:"
 
-#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1604
+#: ../mail/em-format-html.c:166
+msgid "Formatting message"
+msgstr "Äang Äánh dáng thÆ..."
+
+#: ../mail/em-format-html.c:378
+msgid "Formatting Message..."
+msgstr "Äang Äánh dáng thÆ..."
+
+#: ../mail/em-format-html.c:1562 ../mail/em-format-html.c:1572
+#, c-format
+msgid "Retrieving '%s'"
+msgstr "Äang nhán '%s'"
+
+#: ../mail/em-format-html.c:1723 ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "ChÆa kÃ"
 
-#: ../mail/em-format-html-display.c:88
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr "ThÆ nÃy khÃng cà chá kà nÃn khÃng thá Äám báo thÆ nÃy do ngÆái áy gái."
-
-#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1605
+#: ../mail/em-format-html.c:1724 ../mail/em-format-html-display.c:90
 msgid "Valid signature"
 msgstr "Chá kà háp lá"
 
-#: ../mail/em-format-html-display.c:89
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr "ThÆ nÃy cà chá kà và háp lá nÃn rát cà thá là thÆ áy do ngÆái áy gái."
-
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1606
+#: ../mail/em-format-html.c:1725 ../mail/em-format-html-display.c:91
 msgid "Invalid signature"
 msgstr "Chá kà khÃng háp lá"
 
-#: ../mail/em-format-html-display.c:90
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-"KhÃng thá xÃc minh chá kà cáa thÆ nÃy: cà lá nà bá giá trong khi truyán."
-
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1607
+#: ../mail/em-format-html.c:1726 ../mail/em-format-html-display.c:92
 msgid "Valid signature, but cannot verify sender"
 msgstr "Chá kà háp lá nhÆng mà khÃng thá xÃc minh ngÆái gái"
 
+#: ../mail/em-format-html.c:1727 ../mail/em-format-html-display.c:93
+msgid "Signature exists, but need public key"
+msgstr "Chá kà tán tái, nhÆng cán khoà cÃng"
+
+#: ../mail/em-format-html.c:1733 ../mail/em-format-html-display.c:100
+msgid "Unencrypted"
+msgstr "KhÃng mà hoÃ"
+
+#: ../mail/em-format-html.c:1734 ../mail/em-format-html-display.c:101
+msgid "Encrypted, weak"
+msgstr "Mát mà yáu"
+
+#: ../mail/em-format-html.c:1735 ../mail/em-format-html-display.c:102
+msgid "Encrypted"
+msgstr "Mát mÃ"
+
+#: ../mail/em-format-html.c:1736 ../mail/em-format-html-display.c:103
+msgid "Encrypted, strong"
+msgstr "Mát mà mánh"
+
+#: ../mail/em-format-html.c:2136
+msgid "Unknown external-body part."
+msgstr ""
+
+#: ../mail/em-format-html.c:2146
+msgid "Malformed external-body part."
+msgstr ""
+
+#: ../mail/em-format-html.c:2177
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Trá tái Äáa chá FTP (%s)"
+
+#: ../mail/em-format-html.c:2188
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Trá tái táp tin các bá (%s) háp lá tái Äáa chá Â %s Â"
+
+#: ../mail/em-format-html.c:2190
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Trá tái táp tin các bá (%s)"
+
+#: ../mail/em-format-html.c:2211
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Trá tái dá liáu á xa (%s)"
+
+#: ../mail/em-format-html.c:2226
+#, 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 Â)"
+
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../mail/em-format-html.c:2934
+#: ../plugins/mail-notification/mail-notification.c:402
+#, fuzzy, c-format
+#| msgid "From %s:"
+msgid "From: %s"
+msgstr "Tá %s:"
+
+#: ../mail/em-format-html.c:2956
+#, fuzzy
+#| msgid "(No Subject)"
+msgid "(no subject)"
+msgstr "(KhÃng chá Äá)"
+
+#: ../mail/em-format-html.c:3032
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "ThÆ nÃy ÄÃ ÄÆác gái bái %s thay mát cho %s"
+
+#: ../mail/em-format-html-display.c:89
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "ThÆ nÃy khÃng cà chá kà nÃn khÃng thá Äám báo thÆ nÃy do ngÆái áy gái."
+
+#: ../mail/em-format-html-display.c:90
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr "ThÆ nÃy cà chá kà và háp lá nÃn rát cà thá là thÆ áy do ngÆái áy gái."
+
 #: ../mail/em-format-html-display.c:91
 msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+"KhÃng thá xÃc minh chá kà cáa thÆ nÃy: cà lá nà bá giá trong khi truyán."
+
+#: ../mail/em-format-html-display.c:92
+msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "ThÆ nÃy cà chá kà háp lá, nhÆng mà khÃng thá xÃc minh ngÆái gái thÆ."
 
-#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1608
-msgid "Signature exists, but need public key"
-msgstr "Chá kà tán tái, nhÆng cán khoà cÃng"
-
-#: ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "ThÆ nÃy ÄÆác kà báng chá kÃ, nhÆng khÃng cà khoà cÃng tÆÆng áng."
 
-#: ../mail/em-format-html-display.c:99 ../mail/em-format-html.c:1614
-msgid "Unencrypted"
-msgstr "KhÃng mà hoÃ"
-
-#: ../mail/em-format-html-display.c:99
+#: ../mail/em-format-html-display.c:100
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9851,11 +9823,7 @@ msgstr ""
 "ThÆ nÃy khÃng ÄÆác mà hoà nÃn bát cá ngÆái nÃo cà xem ÄÆác nái dung nà trong "
 "khi truyán qua Internet."
 
-#: ../mail/em-format-html-display.c:100 ../mail/em-format-html.c:1615
-msgid "Encrypted, weak"
-msgstr "Mát mà yáu"
-
-#: ../mail/em-format-html-display.c:100
+#: ../mail/em-format-html-display.c:101
 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 "
@@ -9865,22 +9833,14 @@ msgstr ""
 "khà khÄn khi Äác thÆ nÃy ÄÆác mát thái gian háu Ãch, nhÆng mà cà thá lÃm nhÆ "
 "thá."
 
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1616
-msgid "Encrypted"
-msgstr "Mát mÃ"
-
-#: ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 "ThÆ nÃy ÄÆác mà hoÃ. NgÆái khÃc sá gáp khà khÄn nhiáu khi Äác nái dung thÆ."
 
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1617
-msgid "Encrypted, strong"
-msgstr "Mát mà mánh"
-
-#: ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html-display.c:103
 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 "
@@ -9889,15 +9849,15 @@ msgstr ""
 "ThÆ nÃy ÄÆác mà hoà báng thuát toÃn mát mà mánh. NgÆái khÃc sá gáp khà khÄn "
 "rát nhiáu khi Äác nái dung thÆ ÄÆác thái gian háu Ãch. "
 
-#: ../mail/em-format-html-display.c:238 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Xem cháng nhán"
 
-#: ../mail/em-format-html-display.c:251
+#: ../mail/em-format-html-display.c:254
 msgid "This certificate is not viewable"
 msgstr "Cháng nhán nÃy khÃng cà khá nÄng xem"
 
-#: ../mail/em-format-html-display.c:506
+#: ../mail/em-format-html-display.c:566
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -9906,29 +9866,46 @@ msgstr ""
 "cà khá nÄng xem nà khÃng cà Äánh dáng, hoác trong trÃnh soán tháo vÄn bán "
 "bÃn ngoÃi."
 
-#: ../mail/em-format-html-display.c:749
-#| msgid "Completed On"
+#: ../mail/em-format-html-display.c:756
+#, fuzzy
+#| msgid "Save Message"
+#| msgid_plural "Save Messages"
+msgid "Save Image"
+msgstr "LÆu thÆ"
+
+#: ../mail/em-format-html-display.c:804
+#, fuzzy
+#| msgid "Save Message..."
+msgid "Save _Image..."
+msgstr "LÆu thÆ..."
+
+#: ../mail/em-format-html-display.c:806
+#, fuzzy
+#| msgid "Save the current file"
+msgid "Save the image to a file"
+msgstr "LÆu táp tin hián thái"
+
+#: ../mail/em-format-html-display.c:1034
 msgid "Completed on"
 msgstr "HoÃn tát vÃo"
 
-#: ../mail/em-format-html-display.c:757
+#: ../mail/em-format-html-display.c:1046
 msgid "Overdue:"
 msgstr "Quà hán:"
 
-#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:761
+#: ../mail/em-format-html-display.c:1054
 msgid "by"
 msgstr "vÃo"
 
-#: ../mail/em-format-html-display.c:978 ../mail/em-format-html-display.c:1025
+#: ../mail/em-format-html-display.c:1335 ../mail/em-format-html-display.c:1386
 msgid "View _Unformatted"
 msgstr "Xem _khÃng Äánh dáng"
 
-#: ../mail/em-format-html-display.c:980
+#: ../mail/em-format-html-display.c:1337
 msgid "Hide _Unformatted"
 msgstr "án _khÃng Äánh dáng"
 
-#: ../mail/em-format-html-display.c:1045
+#: ../mail/em-format-html-display.c:1408
 msgid "O_pen With"
 msgstr "Má _báng"
 
@@ -9937,134 +9914,67 @@ msgstr "Má _báng"
 msgid "Page %d of %d"
 msgstr "Trang %d trÃn %d"
 
-#: ../mail/em-format-html.c:165
-msgid "Formatting message"
-msgstr "Äang Äánh dáng thÆ..."
-
-#: ../mail/em-format-html.c:364
-msgid "Formatting Message..."
-msgstr "Äang Äánh dáng thÆ..."
-
-#: ../mail/em-format-html.c:1448 ../mail/em-format-html.c:1458
-#, c-format
-#| msgid "Retrieving `%s'"
-msgid "Retrieving '%s'"
-msgstr "Äang nhán '%s'"
-
-#: ../mail/em-format-html.c:1979
-msgid "Unknown external-body part."
-msgstr ""
-
-#: ../mail/em-format-html.c:1987
-msgid "Malformed external-body part."
-msgstr ""
-
-#: ../mail/em-format-html.c:2017
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Trá tái Äáa chá FTP (%s)"
-
-#: ../mail/em-format-html.c:2028
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Trá tái táp tin các bá (%s) háp lá tái Äáa chá Â %s Â"
-
-#: ../mail/em-format-html.c:2030
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Trá tái táp tin các bá (%s)"
-
-#: ../mail/em-format-html.c:2051
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Trá tái dá liáu á xa (%s)"
-
-#: ../mail/em-format-html.c:2062
-#, 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 Â)"
-
-#. To translators: This message suggests to the receipients that the sender of the mail is
-#. different from the one listed in From field.
-#: ../mail/em-format-html.c:2762
-#, c-format
-#| msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgid "This message was sent by %s on behalf of %s"
-msgstr "ThÆ nÃy ÄÃ ÄÆác gái bái %s thay mát cho %s"
-
 #: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
 #: ../mail/em-html-stream.c:122
 #, c-format
-#| msgid "No summary available."
 msgid "No HTML stream available"
 msgstr "KhÃng cà luáng HTML"
 
-#: ../mail/em-subscription-editor.c:1107
+#: ../mail/em-subscription-editor.c:1162
 msgid "Folder Subscriptions"
 msgstr "ÄÄng kà thÆ mác"
 
-#: ../mail/em-subscription-editor.c:1146
+#: ../mail/em-subscription-editor.c:1201
 msgid "_Account:"
 msgstr "TÃi _khoán:"
 
-#: ../mail/em-subscription-editor.c:1161
-#| msgid "Save Search"
+#: ../mail/em-subscription-editor.c:1216
 msgid "Clear Search"
 msgstr "Xoà tÃm kiám"
 
-#: ../mail/em-subscription-editor.c:1179
-#| msgid "does not contain"
+#: ../mail/em-subscription-editor.c:1234
 msgid "Sho_w items that contain:"
 msgstr "_Hián mác cháa:"
 
-#: ../mail/em-subscription-editor.c:1218
-#| msgid "Subscribe to Other User's Folder"
+#: ../mail/em-subscription-editor.c:1273
 msgid "Subscribe to the selected folder"
 msgstr "ÄÄng kà thÆ mác ÄÆác chán"
 
-#: ../mail/em-subscription-editor.c:1219
-#| msgid "Subscribed"
+#: ../mail/em-subscription-editor.c:1274
 msgid "Su_bscribe"
 msgstr "ÄÄng _kÃ"
 
-#: ../mail/em-subscription-editor.c:1230
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
-#| msgid "Rename the selected folder"
+#: ../mail/em-subscription-editor.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
 msgid "Unsubscribe from the selected folder"
 msgstr "Bá ÄÄng kà thÆ mác ÄÆác chán"
 
-#: ../mail/em-subscription-editor.c:1231
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../mail/em-subscription-editor.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
 msgid "_Unsubscribe"
 msgstr "Há_y ÄÄng kÃ"
 
-#: ../mail/em-subscription-editor.c:1242
-#| msgid "All local folders"
+#: ../mail/em-subscription-editor.c:1297
 msgid "Collapse all folders"
 msgstr "Thu gán mái thÆ mác"
 
-#: ../mail/em-subscription-editor.c:1243
-#| msgid "Collapse All _Threads"
+#: ../mail/em-subscription-editor.c:1298
 msgid "C_ollapse All"
 msgstr "_Thu gán hát"
 
-#: ../mail/em-subscription-editor.c:1253
-#| msgid "E_xpand All Threads"
+#: ../mail/em-subscription-editor.c:1308
 msgid "Expand all folders"
 msgstr "_Má mái thÆ mác"
 
-#: ../mail/em-subscription-editor.c:1254
-#| msgid "E_xpand All Threads"
+#: ../mail/em-subscription-editor.c:1309
 msgid "E_xpand All"
 msgstr "_Má bung hát"
 
-#: ../mail/em-subscription-editor.c:1264
-#| msgid "Refresh the folder"
+#: ../mail/em-subscription-editor.c:1319
 msgid "Refresh the folder list"
 msgstr "Cáp nhát danh sÃch thÆ mác"
 
-#: ../mail/em-subscription-editor.c:1276
-#| msgid "Cancel the current mail operation"
+#: ../mail/em-subscription-editor.c:1331
 msgid "Stop the current operation"
 msgstr "Háy thao tÃc hián thái"
 
@@ -10072,23 +9982,22 @@ msgstr "Háy thao tÃc hián thái"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:101
+#: ../mail/em-utils.c:102
 #, c-format
-#| msgid "Are you sure you want to open {0} messages at once?"
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Bán cà chác muán má cá %d thÆ cÃng lÃc khÃng?"
 
-#: ../mail/em-utils.c:153
+#: ../mail/em-utils.c:158
 #: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "Äáng hián thÃng Äiáp nÃ_y lán náa."
 
-#: ../mail/em-utils.c:327
+#: ../mail/em-utils.c:333
 msgid "Message Filters"
 msgstr "Bá lác thÆ"
 
-#: ../mail/em-utils.c:883
+#: ../mail/em-utils.c:918
 #, c-format
 msgid "Messages from %s"
 msgstr "Thá tá %s"
@@ -10097,8 +10006,7 @@ msgstr "Thá tá %s"
 msgid "Search _Folders"
 msgstr "_ThÆ mác tÃm kiám"
 
-#: ../mail/em-vfolder-rule.c:603
-#| msgid "Folder"
+#: ../mail/em-vfolder-rule.c:618
 msgid "Add Folder"
 msgstr "ThÃm thÆ mác"
 
@@ -10121,17 +10029,14 @@ msgid "\"Filter Editor\" window width"
 msgstr "Äá ráng cáa sá mác Äánh"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-#| msgid "Folder Subscriptions"
 msgid "\"Folder Subscriptions\" window height"
 msgstr "Chiáu cao cáa sá \"ÄÄng kà thÆ mác\""
 
 #: ../mail/evolution-mail.schemas.in.h:5
-#| msgid "\"Send and Receive Mail\" window maximize state"
 msgid "\"Folder Subscriptions\" window maximize state"
 msgstr "Tráng thÃi má tái Äa cáa cáa sá \"ÄÄng kà thÆ mác\""
 
 #: ../mail/evolution-mail.schemas.in.h:6
-#| msgid "Folder Subscriptions"
 msgid "\"Folder Subscriptions\" window width"
 msgstr "Chiáu ráng cáa sá \"ÄÄng kà thÆ mác\""
 
@@ -10170,7 +10075,7 @@ msgid "Always request read receipt"
 msgstr "LuÃn luÃn yÃu cáu thÃng bÃo ÄÃ Äác"
 
 #: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Thái lÆáng theo giÃy trong ÄÃ cán hián thá lái trÃn thanh tráng thÃi."
 
@@ -10183,8 +10088,6 @@ msgstr ""
 "trong cáa sá Äang xem khÃng."
 
 #: ../mail/evolution-mail.schemas.in.h:16
-#| msgid "Attached message"
-#| msgid_plural "%d attached messages"
 msgid "Attribute message."
 msgstr ""
 
@@ -10197,12 +10100,10 @@ msgid "Automatic link recognition"
 msgstr "Tá Äáng nhán dáng liÃn kát"
 
 #: ../mail/evolution-mail.schemas.in.h:19
-#| msgid "Check for _new messages every"
 msgid "Check for new messages in all active accounts"
 msgstr "Kiám tra thÆ mái cho mái tÃi khoán hoát Äáng"
 
 #: ../mail/evolution-mail.schemas.in.h:20
-#| msgid "Check for _new messages every"
 msgid "Check for new messages on start"
 msgstr "Kiám tra thÆ mái lÃc khái Äáng"
 
@@ -10318,19 +10219,25 @@ msgstr "Äá ráng mác Äánh cáa Cáa sá Soán,"
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr ""
 "Quyát Äánh cà nÃn tra tÃm Äáa chá Äá lác ra thÆ rÃc chá trong sá Äáa chá các "
 "bá hay khÃng"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Quyát Äánh cà nÃn tra tÃm trong sá Äáa chá tÃm Äáa chá thÆ cáa ngÆái gái, "
 "hay khÃng"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -10343,13 +10250,13 @@ msgstr ""
 "cháy chám náu bán ÄÃ ÄÃnh dáu sá Äáa chá á xa (v.d. LDAP) Äá tá Äáng Äián "
 "nát."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "XÃc Äánh cà nÃn sá dáng cÃc dÃng Äáu tá chán Äá kiám tra cà thÆ rÃc, hay "
 "khÃng."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -10359,7 +10266,7 @@ msgstr ""
 "khÃng. Bát tÃy chán nÃy và ghi rà nháng dÃng Äáu háu Ãch, thà tÄng tác Äá "
 "kiám tra cà thÆ rÃc."
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -10367,87 +10274,85 @@ msgstr ""
 "XÃc Äánh cà nÃn sá dáng cÃng mát phÃng chá trÃn cá hai dÃng Äáu  Tá  và  "
 "Chá Äá  trong cát  ThÆ Â khi xem theo chiáu dác."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Directory for loading/attaching files to composer."
 msgstr "ThÆ mác tá ÄÃ cán náp/ÄÃnh táp tin vÃo bá cáu táo."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Directory for saving mail component files."
 msgstr "ThÆ mác vÃo ÄÃ cán lÆu cÃc táp tin thÃnh phán thÆ."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 "Bát hay tát thay thá phán tÃn thÆ mác bá cát ngán trong khung lá báng dáu "
 "chám láng"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Display only message texts not exceeding certain size"
 msgstr "Chá hián thÆ khÃng vÆát quà kÃch thÆác nhát Äánh"
 
-#: ../mail/evolution-mail.schemas.in.h:54
-#| msgid "Could not save signature file."
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Do not add signature delimiter"
 msgstr "KhÃng thÃm phÃn cÃch chá kÃ"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Vá chá bÃo lái chÃnh tá trÃn tá khi gÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty Junk folders on exit"
 msgstr "LÃm sách thÆ mác ThÆ rÃc khi thoÃt"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty Trash folders on exit"
 msgstr "LÃm sách thÆ mác RÃc khi thoÃt"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "LÃm sách thÆ mác ThÆ rÃc khi thoÃt khái trÃnh Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "LÃm sách thÆ mác RÃc khi thoÃt trÃnh Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Bát chá Äá con nhÃy, Äá bán xem con cháy khi Äác thÆ."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "Bát/tát phÃm dÃi ma thuát"
 
-#: ../mail/evolution-mail.schemas.in.h:63
-#| msgid "It disables/enables the prompt while marking multiple messages."
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Bát/tát dáu nhác trong khi ÄÃnh dáu nhiáu thÆ."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable or disable type ahead search feature"
 msgstr "Bát/tát tÃnh nÄng tÃm kiám gà trÆác"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders"
 msgstr "Bát thÆ mác tÃm kiám"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable search folders on startup."
 msgstr "Bát thÆ mác tÃm kiám vÃo lÃc khái cháy."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -10455,36 +10360,29 @@ msgstr ""
 "Bát tÃy chán nÃy Äá sá dáng phÃm dÃi Äá cuán qua à xem thá thÆ, danh sÃch "
 "thÆ và cÃc thÆ mác."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:71
-#| msgid ""
-#| "Enable this to use Space bar key to scroll in message preview, message "
-#| "list and folders."
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Enable/disable caret mode"
 msgstr "Bát/tát chá Äá con nhÃy"
 
-#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:44
+#: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Mà hoà cÃc tÃn táp tin theo kiáu dÃng Outlook/GMail"
 
-#: ../mail/evolution-mail.schemas.in.h:74
-#| msgid ""
-#| "Encode file names in the mail headers same as Outlook or GMail does, to "
-#| "let them understand localized file names sent by Evolution, because they "
-#| "do not follow the RFC 2231, but uses incorrect RFC 2047 standard."
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -10496,39 +10394,38 @@ msgstr ""
 "gái, và táp tin nhÆ váy khÃng tÃy theo RFC 2231, chá dÃng tiÃu chuán RFC "
 "2047 khÃng ÄÃng."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Flush Outbox after filtering"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:76
-#| msgid "Forwarded message"
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Forward message."
 msgstr "Chuyán thÆ."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Group Reply replies to list"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane"
 msgstr "Äá cao à cáa sá danh sÃch thÆ"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Height of the message-list pane."
 msgstr "Äá cao à cáa sá danh sÃch thÆ."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "án à xem thá táng thÆ mác và gá bá vÃng chán"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr ""
 "Náu ngÆái dÃng cá má hÆn 9 thÆ cÃng lÃc thà hái náu há thát muán lÃm nhÆ thá."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -10539,20 +10436,19 @@ msgstr ""
 "phán Bonobo trong cÆ sá dá liáu dáng MIME cáa GNOME thà cà thá ÄÆác sá dáng "
 "Äá hián thá nái dung."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Ignore list Reply-To:"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:84
-#| msgid ""
-#| "Initial height of the \"Send and Receive Mail\" window. The value updates "
-#| "as the user resizes the window vertically."
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
-msgstr "Chiáu cao Äáu tiÃn cáa cáa sá \"Bá Äiáu chánh bá lác\". Già trá nÃy cá cáp nhát khi ngÆái dÃng co giÃn cáa sá theo chiáu dác."
+msgstr ""
+"Chiáu cao Äáu tiÃn cáa cáa sá \"Bá Äiáu chánh bá lác\". Già trá nÃy cá cáp "
+"nhát khi ngÆái dÃng co giÃn cáa sá theo chiáu dác."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 #, fuzzy
 #| msgid ""
 #| "Initial height of the \"Send and Receive Mail\" window. The value updates "
@@ -10564,7 +10460,7 @@ msgstr ""
 "Chiáu cao Äáu tiÃn cáa cáa sá  Gái và Nhán ThÆ Â. Già trá nÃy cá cáp nhát "
 "khi ngÆái dÃng co giÃn cáa sá theo chiáu dác."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 #, fuzzy
 #| msgid ""
 #| "Initial height of the \"Send and Receive Mail\" window. The value updates "
@@ -10576,7 +10472,7 @@ msgstr ""
 "Chiáu cao Äáu tiÃn cáa cáa sá  Gái và Nhán ThÆ Â. Già trá nÃy cá cáp nhát "
 "khi ngÆái dÃng co giÃn cáa sá theo chiáu dác."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10584,7 +10480,7 @@ msgstr ""
 "Chiáu cao Äáu tiÃn cáa cáa sá  Gái và Nhán ThÆ Â. Già trá nÃy cá cáp nhát "
 "khi ngÆái dÃng co giÃn cáa sá theo chiáu dác."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 #, fuzzy
 #| msgid ""
 #| "Initial maximize state of the \"Send and Receive Mail\" window. The value "
@@ -10603,7 +10499,7 @@ msgstr ""
 "thá nÃy khÃng phái ÄÆác Evolution dÃng và cáa sá  Gái và Nhán ThÆ Â khÃng "
 "phÃng to ÄÆác. Do Äà khoà nÃy chá tán tái lÃm chi tiát thác hián."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 #, fuzzy
 #| msgid ""
 #| "Initial maximize state of the \"Send and Receive Mail\" window. The value "
@@ -10622,7 +10518,7 @@ msgstr ""
 "thá nÃy khÃng phái ÄÆác Evolution dÃng và cáa sá  Gái và Nhán ThÆ Â khÃng "
 "phÃng to ÄÆác. Do Äà khoà nÃy chá tán tái lÃm chi tiát thác hián."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 #, fuzzy
 #| msgid ""
 #| "Initial maximize state of the \"Send and Receive Mail\" window. The value "
@@ -10641,7 +10537,7 @@ msgstr ""
 "thá nÃy khÃng phái ÄÆác Evolution dÃng và cáa sá  Gái và Nhán ThÆ Â khÃng "
 "phÃng to ÄÆác. Do Äà khoà nÃy chá tán tái lÃm chi tiát thác hián."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10654,7 +10550,7 @@ msgstr ""
 "thá nÃy khÃng phái ÄÆác Evolution dÃng và cáa sá  Gái và Nhán ThÆ Â khÃng "
 "phÃng to ÄÆác. Do Äà khoà nÃy chá tán tái lÃm chi tiát thác hián."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 #, fuzzy
 #| msgid ""
 #| "Initial width of the \"Send and Receive Mail\" window. The value updates "
@@ -10666,7 +10562,7 @@ msgstr ""
 "Chiáu ráng Äáu tiÃn cáa cáa sá  Gái và Nhán ThÆ Â. Già trá nÃy cá cáp nhát "
 "khi ngÆái dÃng co giÃn cáa sá theo chiáu ngang."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 #, fuzzy
 #| msgid ""
 #| "Initial width of the \"Send and Receive Mail\" window. The value updates "
@@ -10678,7 +10574,7 @@ msgstr ""
 "Chiáu ráng Äáu tiÃn cáa cáa sá  Gái và Nhán ThÆ Â. Già trá nÃy cá cáp nhát "
 "khi ngÆái dÃng co giÃn cáa sá theo chiáu ngang."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 #, fuzzy
 #| msgid ""
 #| "Initial width of the \"Send and Receive Mail\" window. The value updates "
@@ -10690,7 +10586,7 @@ msgstr ""
 "Chiáu ráng Äáu tiÃn cáa cáa sá  Gái và Nhán ThÆ Â. Già trá nÃy cá cáp nhát "
 "khi ngÆái dÃng co giÃn cáa sá theo chiáu ngang."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10698,7 +10594,7 @@ msgstr ""
 "Chiáu ráng Äáu tiÃn cáa cáa sá  Gái và Nhán ThÆ Â. Già trá nÃy cá cáp nhát "
 "khi ngÆái dÃng co giÃn cáa sá theo chiáu ngang."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -10706,7 +10602,7 @@ msgid ""
 "replying."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -10716,7 +10612,7 @@ msgstr ""
 "kiám sá xoà hoÃn toÃn thÆ ÄÃ, khÃng phái ÄÆn gián gá bá nà khái kát quá tÃm "
 "kiám."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 #, fuzzy
 #| msgid ""
 #| "It disables/enables the repeated prompts to warn that deleting messages "
@@ -10730,7 +10626,7 @@ msgstr ""
 "kiám sá xoà hoÃn toÃn thÆ ÄÃ, khÃng phái ÄÆn gián gá bá nà khái kát quá tÃm "
 "kiám."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 #, fuzzy
 #| msgid ""
 #| "It disables/enables the repeated prompts to ask if offline sync is "
@@ -10742,52 +10638,65 @@ msgstr ""
 "NÃ bát/tát tÃnh nÄng cá nhác yÃu cáu Äáng bá ngoái tuyán khÃng, trÆác khi "
 "vÃo chá Äá ngoái tuyán."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
 "sets a Reply-To: header which redirects your reply back to the list"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
+#, fuzzy
+#| msgid ""
+#| "It disables/enables the repeated prompts to warn that deleting messages "
+#| "from a search folder permanently deletes the message, not simply removing "
+#| "it from the search results."
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
+msgstr ""
+"Nà bát/tát tÃnh nÄng cá nhác cánh bÃo ráng viác xoà thÆ khái mát thÆ mác tÃm "
+"kiám sá xoà hoÃn toÃn thÆ ÄÃ, khÃng phái ÄÆn gián gá bá nà khái kát quá tÃm "
+"kiám."
+
+#: ../mail/evolution-mail.schemas.in.h:103
 #, fuzzy
 #| msgid "Last time empty junk was run"
 msgid "Last time Empty Junk was run"
 msgstr "Lán cuái cÃng ÄÃ Äá thÆ mác thÆ rÃc"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:104
 #, fuzzy
 #| msgid "Last time empty trash was run"
 msgid "Last time Empty Trash was run"
 msgstr "Lán cuái cÃng ÄÃ Äá rÃc"
 
-#: ../mail/evolution-mail.schemas.in.h:103
-#| msgid "Mayotte"
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Layout style"
 msgstr "Kiáu bá các"
 
-#: ../mail/evolution-mail.schemas.in.h:104
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:106
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "Mác quà Äà thÆ nÃn ÄÆác ghi lÆu."
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of Labels and their associated colors"
 msgstr "Danh sÃch NhÃn và mÃu sác liÃn quan"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "Danh sÃch cÃc dáng MIME cán kiám tra Äái vái bá xem thÃnh phán Bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accepted licenses"
 msgstr "Danh sÃch cÃc quyán phÃp ÄÃ cháp nhán"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "List of accounts"
 msgstr "Danh sÃch cÃc tÃi khoán"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -10796,15 +10705,15 @@ msgstr ""
 "áy cháa chuái láp tÃn cáa cÃc thÆ mác con liÃn quan vái /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of custom headers and whether they are enabled."
 msgstr "Danh sÃch cÃc dÃng Äáu tá chán và náu bát chÆa."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Danh sÃch cÃc mà ngÃn ngá tá Äián ÄÆác dÃng Äá kiám tra chÃnh tá."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -10812,15 +10721,15 @@ msgstr ""
 "Danh sÃch cÃc nhÃn mà thÃnh phán thÆ cáa Evolution biát ÄÆác. Danh sÃch áy "
 "cháa chuái name:color (tÃn:mÃu) mà mÃu áy dáng há tháp lác phÃn HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "List of protocol names whose license has been accepted."
 msgstr "Danh sÃch cÃc tÃn giao thác cà quyán Äà cháp nhán."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Load images for HTML messages over HTTP"
 msgstr "Náp qua HTTP cÃc ánh cho thÆ HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -10831,322 +10740,330 @@ msgstr ""
 "1 - tái ánh trong thÆ Äán tá liÃn lác\n"
 "2 - lÃc nÃo cÅng tái ánh tá Internet (khÃng an toÃn)"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions"
 msgstr "Ghi lÆu cÃc hÃnh Äáng lác"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Log filter actions to the specified log file."
 msgstr "Ghi lÆu cÃc hÃnh Äáng lác vÃo táp tin bán ghi ÄÃ ghi rÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Logfile to log filter actions"
 msgstr "Táp tin bán ghi nÆi cán ghi lÆu cÃc hÃnh Äáng lác."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Logfile to log filter actions."
 msgstr "Táp tin bán ghi nÆi cán ghi lÆu cÃc hÃnh Äáng lác."
 
-#: ../mail/evolution-mail.schemas.in.h:120
-#| msgid "Uniform row height"
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser height"
 msgstr "Chiáu cao trÃnh duyát thÆ"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser maximized"
 msgstr "TrÃnh duyát thÆ to tái Äa"
 
-#: ../mail/evolution-mail.schemas.in.h:122
-#| msgid "Email begins with"
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mail browser width"
 msgstr "Äá ráng trÃnh duyát thÆ"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout"
 msgstr "ÄÃnh dáu là Äà xem, sau thái hán Äà ghi rÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark as Seen after specified timeout."
 msgstr "ÄÃnh dáu là Äà xem, sau thái hán Äà ghi rÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\""
 msgstr "ÄÃnh cÃc trÃch dán trong thÆ Â Xem thá Â."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Mark citations in the message \"Preview\"."
 msgstr "ÄÃnh cÃc trÃch dán trong thÆ Â Xem thá Â."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message text limit for display"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Kiáu dÃng hián thá thÆ (\"normal\" - chuán, \"full headers\" - dÃng Äáu ÄÃy "
 "Äá, \"source\" - mà nguán)"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Sá ngÃy tái thiáu giáa hai lán xoà thÆ rÃc khi thoÃt."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Sá ngÃy tái thiáu giáa hai lán Äá rÃc khi thoÃt."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Thái gian tái thiáu giáa hai lán xoà thÆ rÃc khi thoÃt, theo ngÃy."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Thái gian tái thiáu giáa hai lán sá rÃc khi thoÃt, theo ngÃy."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Sá Äáa chá cán hián thá trong Cho/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:134
-#| msgid "-----Original Message-----"
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Original message."
 msgstr "ThÆ gác."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid "Path where picture gallery should search for its content"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Possible values are: never - to never close browser window always - to "
 "always close browser window ask - (or any other value) will ask user"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:139
+#, fuzzy
+#| msgid ""
+#| "The following recipients were not recognized as valid mail addresses:\n"
+#| "{0}"
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr ""
+"Nháng ngÆái nhán sau khÃng cà Äáa chá thÆ háp lá:\n"
+"{0}"
+
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt on empty subject"
 msgstr "Nhác khi cà chá Äá ráng"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Nhác ngÆái dÃng khi há cá xoà hán thÆ mác."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Nhác ngÆái dÃng khi há cá gái thÆ chÆa cà Chá Äá."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when deleting messages in search folder"
 msgstr "Nhác khi xoà thÆ khái thÆ mác tÃm kiám"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:144
 #, fuzzy
 #| msgid "Prompt while marking multiple messages"
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Nhác khi ÄÃnh dáu nhiáu thÆ"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:145
 #, fuzzy
 #| msgid "Prompt while marking multiple messages"
 msgid "Prompt when replying privately to list messages"
 msgstr "Nhác khi ÄÃnh dáu nhiáu thÆ"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:146
 #, fuzzy
 #| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgid "Prompt when replying to many recipients"
 msgstr "Nhác khi gái thÆ mà chá cà ngÆái nhán Bà mát ChÃp Ch_o (Bcc)"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user expunges"
 msgstr "Nhác khi ngÆái dÃng xoà hán"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user only fills Bcc"
 msgstr "Nhác khi ngÆái dÃng chá nháp Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Nhác khi ngÆái dÃng cá má hÆn 9 thÆ cÃng lÃc"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Nhác khi ngÆái dÃng cá gái thÆ HTML cho liÃn lác khÃng muán nhán HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Nhác khi ngÆái dÃng cá gái thÆ mà khÃng cà ngÆái nhán Cho (To) hay ChÃp Cho "
 "(CC)."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Nhác khi ngÆái dÃng cá gái thÆ dáng HTML khÃng phái ÄÆác muán"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Prompt while marking multiple messages"
 msgstr "Nhác khi ÄÃnh dáu nhiáu thÆ"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put personalized signatures at the top of replies"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:155
 #, fuzzy
 #| msgid "Start _typing at the bottom on replying"
 msgid "Put the cursor at the bottom of replies"
 msgstr "Khi ÄÃp áng, bát Äáu gà bÃn _dÆái (khuyán khÃch)"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Nhán dáng hÃnh cÆái trong vÄn bán và thay thá báng ánh."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Recognize links in text and replace them."
 msgstr "Nhán ra mái liÃn kát trong vÄn bán và thay thá chÃng."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Run junk test on incoming mail."
 msgstr "Cháy phÃp thá thÆ rÃc khi thÆ gái Äán"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Save directory"
 msgstr "ThÆ mác lÆu"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Search for the sender photo in local address books"
 msgstr "TÃm kiám ánh cháp ngÆái gái trong cÃc sá Äáa chá các bá"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default"
 msgstr "Gái thÆ dáng HTML theo mác Äánh"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Send HTML mail by default."
 msgstr "Gái thÆ dáng HTML theo mác Äánh"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Sender email-address column in the message list"
 msgstr "Cát Äáa chá thÆ cua ngÆái gái trong danh sÃch thÆ"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Server synchronization interval"
 msgstr "Khoáng Äái Äáng bá mÃy chá"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:170
 #, fuzzy
 #| msgid "Also encrypt to sel_f when sending encrypted messages"
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "CÅng mát mà hoà ch_o chÃnh bán khi gái thÆ Äà mát mÃ"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show Animations"
 msgstr "Hián hoát cánh"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-#| msgid "Collapse all message threads"
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all message headers"
 msgstr "Hián hát dÃng Äáu thÆ"
 
-#: ../mail/evolution-mail.schemas.in.h:169
-#| msgid "Select all the text in a message"
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show all the headers when viewing a messages."
 msgstr "Hián hát tát cá dÃng Äáu khi xem thÆ."
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show animated images as animations."
 msgstr "Hián ánh ÄÃ hoát cánh kiáu hoát cánh."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Hián thá mái thÆ bá xoà (kiáu gaÌch ÄÃ) trong danh sÃch cÃc thÆ."
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show deleted messages in the message-list"
 msgstr "Hián thá thÆ bá xoà trong danh sÃch cÃc thÆ."
 
-#: ../mail/evolution-mail.schemas.in.h:173
-#| msgid "_Show image animations"
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show image animations"
 msgstr "Hián hoát cánh ánh"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show original \"Date\" header value."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Show photo of the sender"
 msgstr "Hián ánh cháp cáa ngÆái gái"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 "Hián thá Äáa chá thÆ cáa ngÆái gái trong mát cát riÃng trong danh sÃch thÆ."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Hián thá ánh cháp cáa ngÆái gái trong à cáa sá Äác thÆ."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -11157,41 +11074,45 @@ msgid ""
 "Post: header, if there is one."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell check inline"
 msgstr "Kiám tra trác tiáp chÃnh tá"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking color"
 msgstr "MÃu kiám tra chÃnh tá"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Spell checking languages"
 msgstr "NgÃn ngá kiám tra chÃnh tá"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid "State of message headers in paned view"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Terminal font"
 msgstr "PhÃng chá thiát bá cuái"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "The default plugin for Junk hook"
 msgstr "Phán bá sung mác Äánh cho mÃc ThÆ rÃc"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:195
 #, fuzzy
 #| msgid "The last time empty junk was run, in days since the epoch."
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Lán cuái cÃng xoà thÆ rÃc, theo ngÃy tá ká nguyÃn bát Äáu."
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:196
 #, fuzzy
 #| msgid "The last time empty trash was run, in days since the epoch."
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Lán cuái cÃng ÄÃ cháy Äá rÃc, theo ngÃy tá ká nguyÃn bát Äáu."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -11199,33 +11120,33 @@ msgid ""
 "message list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "The terminal font for mail display."
 msgstr "PhÃng chá thiát bá cuái Äá hián thá thÆ."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "The variable width font for mail display."
 msgstr "PhÃng chá Äá ráng bián Äái Äá hián thá thÆ."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -11235,7 +11156,7 @@ msgstr ""
 " â 1\t\tcánh bÃo\n"
 " â 2\t\tthÃng Äiáp gá lái."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:204
 #, fuzzy
 #| msgid ""
 #| "This decides the max size of the text part that can be formatted under "
@@ -11248,7 +11169,7 @@ msgstr ""
 "Già trá nÃy Äát kÃch cá tái Äa cáa phán vÄn bán cà thá ÄÆác Äánh dáng dÆái "
 "Evolution. Già trá mác Äánh là 4096 KB (4 MB), ghi theo KB."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -11258,7 +11179,7 @@ msgstr ""
 "lác. Váy náu phán bá sung Äà liát kà mác Äánh bá tát, nà khÃng bá thay thá "
 "báng phán bá sung sán sÃng khÃc."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -11267,7 +11188,7 @@ msgstr ""
 "HÃnh vi nÃy thà bá chán thÆ trong danh sÃch, và gá bo à xem thá Äái vái thÆ "
 "mác ÄÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:207
 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;"
@@ -11279,7 +11200,7 @@ msgstr ""
 "&lt;header enabled&gt;\n"
 "(láp Äà bát dÃng Äáu, náu sá hián thá dÃng Äáu áy trong à xem thÆ)."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -11290,11 +11211,11 @@ msgstr ""
 "các bá, Äá loái trá khái tián trÃnh lác ra thÆ rÃc cÃc thÆ ÄÆác gái bái liÃn "
 "lác ÄÃ biát."
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "This option would help in improving the speed of fetching."
 msgstr "TÃy chán nÃy sá tÄng tác Äá láy thÆ."
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11302,15 +11223,19 @@ msgstr ""
 "TÃy chán nÃy Äát sá Äáa chá cán hián thá trong à xem danh sÃch thÆ mác Äánh, "
 "á ngoái ÄÃ hián thá dáu chám láng (â)."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:211
+#, fuzzy
+#| msgid ""
+#| "This setting specifies whether the threads should be in expanded or "
+#| "collapsed state by default. Evolution requires a restart."
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
+"collapsed state by default. Requires a restart to apply."
 msgstr ""
 "Thiát láp nÃy xÃc Äánh cÃc nhÃnh nÃn ÄÆác giÃn ra hay co lái theo mác Äánh. "
 "Evolution cán thiát khái cháy lái."
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -11319,94 +11244,85 @@ msgstr ""
 "Thiát láp nÃy xÃc Äánh cÃc nhÃnh nÃn ÄÆác sáp xáp dáa vÃo thÆ mái nhát trong "
 "mái nhÃnh, hÆn là theo ngÃy thÃng nhán thÆ. Cán phái khái cháy lái Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:213
+msgid ""
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Thread the message-list based on Subject"
 msgstr "Hián thá nhÃnh trong danh sÃch thÆ, theo Chá Äá"
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Timeout for marking message as seen"
 msgstr "Thái hán ÄÃnh dáu thÆ ÄÃ xem"
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Timeout for marking message as seen."
 msgstr "Thái hán ÄÃnh dáu thÆ ÄÃ xem."
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "UID string of the default account."
 msgstr "Chuái UID cáa tÃi khoán mác Äánh."
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "MÃu gách dÆái cho tá sai chÃnh tá khi dÃng chác nÄng chÃnh tá trác tiáp."
 
-#: ../mail/evolution-mail.schemas.in.h:213
-msgid "Use SpamAssassin daemon and client"
-msgstr "DÃng trÃnh nán và áng dáng khÃch SpamAssassin"
-
-#: ../mail/evolution-mail.schemas.in.h:214
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "DÃng trÃnh nán và áng dáng khÃch SpamAssassin (spamc/spamd)."
-
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid "Use custom fonts"
 msgstr "DÃng phÃng chá tá chán"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Use custom fonts for displaying mail."
 msgstr "DÃng phÃng chá tá chán Äá hián thá thÆ."
 
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid "Use only local spam tests."
-msgstr "DÃng chá sá kiám tra thÆ rÃc kiáu các bá."
-
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid "Use only the local spam tests (no DNS)."
-msgstr "DÃng chá sá kiám tra thÆ rÃc kiáu các bá (khÃng cà DNS)."
-
-#: ../mail/evolution-mail.schemas.in.h:219
+#: ../mail/evolution-mail.schemas.in.h:221
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
 "message or the bottom."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:220
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:221
+#: ../mail/evolution-mail.schemas.in.h:223
 msgid "Variable width font"
 msgstr "PhÃng chá ráng bián"
 
-#: ../mail/evolution-mail.schemas.in.h:222
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Mác Äánh là cà nÃn thÃm vÃo mái thÆ mát yÃu cáu thÃng bÃo Äà Äác, hay khÃng."
 
-#: ../mail/evolution-mail.schemas.in.h:223
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid ""
 "Whether check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
 "started. This option is used only together with 'send_recv_on_start' option."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:224
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
 "Whether check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "CÃ nÃn tát tÃnh nÄng thay thá phán cÃn lái cáa tÃn thÆ mác bá cát ngán trong "
 "khung lá báng dáu chám láng, hay khÃng."
 
-#: ../mail/evolution-mail.schemas.in.h:226
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11414,139 +11330,134 @@ msgstr ""
 "CÃ nÃn trá vá táo nhÃnh thÆ theo chá Äá khi thÆ khÃng cháa dÃng Äáu In-Reply-"
 "To (trá lái theo thÆ trÆác) hay References (tham chiáu)."
 
-#: ../mail/evolution-mail.schemas.in.h:227
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "CÃ nÃn sáp xáp nhÃnh dáa vÃo thÆ mái nhát trong nhÃnh, hay khÃng"
 
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
 "one minute after the last action invocation."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Width of the message-list pane"
 msgstr "Äá ráng à cáa sá danh sÃch thÆ"
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid "Width of the message-list pane."
 msgstr "Äá ráng cáa à cáa sá danh sÃch thÆ."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:181
 msgid "Importing Elm data"
 msgstr "Äang nháp dá liáu Elm..."
 
-#: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
-#: ../modules/mail/e-mail-shell-view.c:1045
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
-#: ../widgets/misc/e-send-options.c:500
+#: ../mail/importers/elm-importer.c:351 ../mail/importers/pine-importer.c:458
+#: ../modules/mail/e-mail-shell-view.c:1051
+#: ../widgets/misc/e-send-options.c:520
 msgid "Mail"
 msgstr "ThÆ tÃn"
 
-#: ../mail/importers/elm-importer.c:380
+#: ../mail/importers/elm-importer.c:396
 msgid "Evolution Elm importer"
 msgstr "Bá nháp Elm vÃo Evolution"
 
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:397
 msgid "Import mail from Elm."
 msgstr "Äang nháp thÆ tá Elm"
 
-#: ../mail/importers/evolution-mbox-importer.c:127
-#: ../plugins/dbx-import/dbx-importer.c:227
-#| msgid "Destination folder:"
+#: ../mail/importers/evolution-mbox-importer.c:138
+#: ../plugins/dbx-import/dbx-importer.c:250
 msgid "_Destination folder:"
 msgstr "_ThÆ mác ÄÃch:"
 
-#: ../mail/importers/evolution-mbox-importer.c:133
-#: ../plugins/dbx-import/dbx-importer.c:233
-#: ../plugins/pst-import/pst-importer.c:316
+#: ../mail/importers/evolution-mbox-importer.c:145
+#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/pst-import/pst-importer.c:460
 msgid "Select folder"
 msgstr "Chán thÆ mác"
 
-#: ../mail/importers/evolution-mbox-importer.c:134
-#: ../plugins/pst-import/pst-importer.c:316
+#: ../mail/importers/evolution-mbox-importer.c:146
+#: ../plugins/dbx-import/dbx-importer.c:261
+#: ../plugins/pst-import/pst-importer.c:461
 msgid "Select folder to import into"
 msgstr "Chán thÆ mác Äá nháp vÃo"
 
-#: ../mail/importers/evolution-mbox-importer.c:403
-#| msgid "Subject"
+#: ../mail/importers/evolution-mbox-importer.c:433
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Chá Äá"
 
-#: ../mail/importers/evolution-mbox-importer.c:408
-#| msgid "From"
+#: ../mail/importers/evolution-mbox-importer.c:438
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Tá"
 
-#: ../mail/importers/evolution-mbox-importer.c:452
-#: ../shell/e-shell-utils.c:253
+#: ../mail/importers/evolution-mbox-importer.c:482
+#: ../shell/e-shell-utils.c:221
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:453
+#: ../mail/importers/evolution-mbox-importer.c:483
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Bá nháp thÆ mác dáng Berkeley Mailbox"
 
-#: ../mail/importers/mail-importer.c:65
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "Äang nháp háp thÆ..."
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:149
-#: ../plugins/dbx-import/dbx-importer.c:568
-#: ../plugins/pst-import/pst-importer.c:478
-#: ../plugins/pst-import/pst-importer.c:587
+#: ../mail/importers/mail-importer.c:153
+#: ../plugins/dbx-import/dbx-importer.c:610
+#: ../plugins/pst-import/pst-importer.c:648
 #, c-format
-#| msgid "Importing `%s'"
 msgid "Importing '%s'"
 msgstr "Äang nháp '%s'"
 
-#: ../mail/importers/mail-importer.c:308
+#: ../mail/importers/mail-importer.c:316
 #, c-format
 msgid "Scanning %s"
 msgstr "Äang quÃt %s..."
 
-#: ../mail/importers/pine-importer.c:223
+#: ../mail/importers/pine-importer.c:260
 msgid "Importing Pine data"
 msgstr "Äang nháp dá liáu Pine..."
 
-#: ../mail/importers/pine-importer.c:420
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../mail/importers/pine-importer.c:463
+#: ../modules/addressbook/addressbook-config.c:1081
 msgid "Address Book"
 msgstr "Sá Äáa chá"
 
-#: ../mail/importers/pine-importer.c:462
+#: ../mail/importers/pine-importer.c:509
 msgid "Evolution Pine importer"
 msgstr "Bá nháp Pine vÃo Evolution"
 
-#: ../mail/importers/pine-importer.c:463
+#: ../mail/importers/pine-importer.c:510
 msgid "Import mail from Pine."
 msgstr "Nháp thÆ tá Pine"
 
-#: ../mail/mail-autofilter.c:70
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "Gái thÆ chÆ %s"
 
-#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
+#: ../mail/mail-autofilter.c:228 ../mail/mail-autofilter.c:271
 #, c-format
 msgid "Mail from %s"
 msgstr "Thá tá %s"
 
-#: ../mail/mail-autofilter.c:256
+#: ../mail/mail-autofilter.c:254
 #, c-format
 msgid "Subject is %s"
 msgstr "Chá Äá là %s"
 
-#: ../mail/mail-autofilter.c:291
+#: ../mail/mail-autofilter.c:295
 #, c-format
 msgid "%s mailing list"
 msgstr "Háp thÆ chung %s"
 
-#: ../mail/mail-autofilter.c:382
+#: ../mail/mail-autofilter.c:404
 msgid "Add Filter Rule"
 msgstr "ThÃm quy tác lác"
 
@@ -11555,7 +11466,7 @@ msgstr "ThÃm quy tác lác"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:480
+#: ../mail/mail-autofilter.c:507
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -11569,11 +11480,6 @@ msgstr[0] ""
 "%s Äà bá thay Äái và thÆ mác bá xoÃ\n"
 "\"%s\"."
 
-#: ../mail/mail-config.ui.h:1
-#| msgid "No Information"
-msgid "Account Information"
-msgstr "ThÃng tin tÃi khoán"
-
 #: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
 msgstr "ThÃm chá _kà mái..."
@@ -11582,469 +11488,482 @@ msgstr "ThÃm chá _kà mái..."
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_LuÃn kà tÃn lÃn cÃc thÆ cán gái Äi khi dÃng tÃi khoán nÃy"
 
+#: ../mail/mail-config.ui.h:4
+msgid ""
+"All new emails with header that matches given content will be automatically "
+"filtered as junk"
+msgstr ""
+
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "Cho phÃp _háp thÆ chung chuyán hÆáng trá lái riÃng sang háp thÆ"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "CÅng mát mà hoà ch_o chÃnh bán khi gái thÆ Äà mát mÃ"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "LuÃn _ChÃp Cho (Cc) tái:"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "LuÃn _BÃ mát ChÃp Cho (Bcc) tái:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "LuÃn _tin khoà trong dÃy khoà tÃi khi mà hoÃ"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "LuÃn luÃn mát _mà hoà cho chÃnh bán khi gái thÆ Äà mát mÃ"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "LuÃn luÃn _yÃu cáu thÃng bÃo ÄÃ Äác"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Apply the same _view settings to all folders"
 msgstr "DÃng _cÃng thiát láp cho mái thÆ mác"
 
-#: ../mail/mail-config.ui.h:14
-#: ../modules/addressbook/addressbook-config.c:1023
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1088
 msgid "Authentication"
 msgstr "XÃc thác"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "Tá Äáng chÃn biáu tÆáng _xÃc cám"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "Bá _kà tá:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "_Kiám tra cà kiáu ÄÆác há trá"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "Kiám tra dÃng Äá_u tá chán tÃm thÆ rÃc"
 
-#: ../mail/mail-config.ui.h:19
-#| msgid "Check for _new messages every"
+#: ../mail/mail-config.ui.h:20
 msgid "Check for new _messages on start"
 msgstr "_Kiám tra cà thÆ mái lÃc khái Äáng"
 
-#: ../mail/mail-config.ui.h:20
-#| msgid "Check for _new messages every"
+#: ../mail/mail-config.ui.h:21
 msgid "Check for new messa_ges in all active accounts"
 msgstr "_Kiám tra cà thÆ mái trong tát cá tÃi khoán hoát Äáng"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Check incoming _messages for junk"
 msgstr "Kiám tra thÆ gái Äán là thÆ _rÃc"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Check spelling while I _type"
 msgstr "Kiám tra chÃnh _tá khi Äang gÃ"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "XÃ_a"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "X_oÃ"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "_MÃu tá gà sai:"
 
-#: ../mail/mail-config.ui.h:26
-#| msgid "Compose Message"
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "Viát thÆ"
 
-#: ../mail/mail-config.ui.h:27
-#: ../modules/plugin-manager/evolution-plugin-manager.c:157
+#: ../mail/mail-config.ui.h:28
+#: ../modules/plugin-manager/evolution-plugin-manager.c:161
 msgid "Configuration"
 msgstr "Cáu hÃnh"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "_XÃc nhán khi xoà hán thÆ mác"
 
-#: ../mail/mail-config.ui.h:29
-#| msgid "Configuration"
+#: ../mail/mail-config.ui.h:30
 msgid "Confirmations"
 msgstr "XÃc nhán"
 
-#: ../mail/mail-config.ui.h:30
-#: ../modules/addressbook/autocompletion-config.c:155
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
-#| msgid "Date/Time"
+#: ../mail/mail-config.ui.h:31
+#: ../modules/addressbook/autocompletion-config.c:188
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Date/Time Format"
 msgstr "Äánh dáng thái gian"
 
-#: ../mail/mail-config.ui.h:32
-#| msgid "Default Priority:"
+#: ../mail/mail-config.ui.h:33
 msgid "Default Behavior"
 msgstr "HÃnh vi mác Äánh"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Default character e_ncoding:"
 msgstr "Bá kà tá mác Äá_nh:"
 
-#: ../mail/mail-config.ui.h:34
-#| msgid "Delete"
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "Xoà thÆ"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "_Xoà thÆ rÃc khi thoÃt"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "KÃ _sá lÃn cÃc thÆ gái Äi (theo mác Äánh)"
 
-#: ../mail/mail-config.ui.h:38
-#| msgid "All Message _Headers"
+#: ../mail/mail-config.ui.h:39
 msgid "Displayed Message Headers"
 msgstr "DÃng Äáu thÆ ÄÆác hián"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "Äáng ÄÃnh dáu thÆ là thÆ rÃc náu ngÆái gái nám trong _sá Äáa chá cáa tÃi"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Do not quote"
 msgstr "Äáng trÃch dán"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
 msgstr "Háp _NhÃp:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
 msgstr "Äá_a chá thÆ:"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Empty trash folders on e_xit"
 msgstr "LÃm sách thÆ mác _rÃc khi thoÃt"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "Cháng nhán _mà hoÃ:"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "Mát mà mái thÆ cán _gái Äi (theo mác Äánh)"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "F_all back to threading messages by subject"
 msgstr "Trá _vá táo nhÃnh thÆ theo chá Äá"
 
-#: ../mail/mail-config.ui.h:48
-#| msgid "Fix_ed width Font:"
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed Width Font:"
 msgstr "PhÃng Äá ráng cá Äánh:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Format messages in _HTML"
 msgstr "Äánh dáng thÆ báng _HTML"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Full Nam_e:"
 msgstr "_Há tÃn:"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr "Trá lái nhÃm Äán háp thÆ chung thÃi, náu cà thá"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "ThÆ HTML"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "áy nhiám H_TTP:"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
+#, fuzzy
+#| msgid "Sender contains"
+msgid "Header content"
+msgstr "NgÆái gái cháa"
+
+#: ../mail/mail-config.ui.h:57
+#, fuzzy
+#| msgid "Header Name:"
+msgid "Header name"
+msgstr "TÃn dÃng Äáu:"
+
+#: ../mail/mail-config.ui.h:58
 msgid "Headers"
 msgstr "DÃng Äáu"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:59
 msgid "Highlight _quotations with"
 msgstr "TÃ _sang trÃch dán báng"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "Bá qua Reply-To: Äái vái háp thÆ chung"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:61
 msgid "Inline"
 msgstr "Trác tiáp"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:62
 msgid "Inline (Outlook style)"
 msgstr "Trác tiáp (kiáu Outlook)"
 
-#: ../mail/mail-config.ui.h:61 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "NhÃn"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "Báng NgÃn ngá"
 
-#: ../mail/mail-config.ui.h:63
-#| msgid "_Load Images"
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "Äang náp ánh"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "Báng dÃng Äáu thÆ"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "Äáa Äiám háp thÆ"
 
-#: ../mail/mail-config.ui.h:66
-#| msgid "Messages"
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "Hián thá thÆ"
 
-#: ../mail/mail-config.ui.h:67
-#| msgid "Message Retract"
+#: ../mail/mail-config.ui.h:70
 msgid "Message Receipts"
 msgstr "NgÆái nhán thÆ"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "KhÃng Äát á_y nhiám cho:"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "KhÃng mà hoÃ"
+
+#: ../mail/mail-config.ui.h:73
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "TÃy chán nÃy bá bá qua náu tÃm tháy dÃng Äáu thÆ rÃc riÃng."
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:74
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
-#| msgid "Personal Information"
 msgid "Optional Information"
 msgstr "ThÃng tin tuá chán"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:76
 msgid "Or_ganization:"
 msgstr "Tá _chác:"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:77
 msgid "PGP/GPG _Key ID:"
 msgstr "Mà sá _khoà PGP/GPG:"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:78
 msgid "Pass_word:"
 msgstr "Mát k_háu:"
 
-#: ../mail/mail-config.ui.h:76
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#: ../mail/mail-config.ui.h:79
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Pick a color"
 msgstr "Chán mÃu"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:80
 msgid "Port:"
 msgstr "Cáng:"
 
-#: ../mail/mail-config.ui.h:78
-#| msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+#: ../mail/mail-config.ui.h:81
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:80
-#| msgid "Junk Settings"
+#: ../mail/mail-config.ui.h:83
 msgid "Proxy Settings"
 msgstr "Thiát láp uá nhiám"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:84
 msgid "Quoted"
 msgstr "TrÃch dán"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:85
 msgid "Re_member password"
 msgstr "Nhá _mát kháu"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:86
 msgid "Re_ply-To:"
 msgstr "T_rá lái cho:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:87
 msgid "Remember _password"
 msgstr "Nhá _mát kháu"
 
-#: ../mail/mail-config.ui.h:85
-#| msgid "Replies and parents"
+#: ../mail/mail-config.ui.h:88
 msgid "Replies and Forwards"
 msgstr "Trá lái và chuyán tiáp"
 
-#: ../mail/mail-config.ui.h:86
-#| msgid "Server Information"
+#: ../mail/mail-config.ui.h:89
 msgid "Required Information"
 msgstr "ThÃng tin bát buác"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:90
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:91
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:92
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:93
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:92
-#| msgid "<b>SSL is not supported in this build of Evolution</b>"
+#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "Mát mà SSL"
+
+#: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr "Bán Evolution nÃy khÃng há trá SSL"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr "TÃm kiám ánh chá_p ngÆái gái chá trong cÃc sá Äáa chá các bá"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "_Chán..."
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "_Gái thÃng bÃo ÄÃ Äác thÆ:"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "PhÃng chá _chuán:"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "Chán phÃng chá HTML Äá ráng cáng"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML variable width font"
 msgstr "Chán phÃng chá Äá ráng bián HTML"
 
-#: ../mail/mail-config.ui.h:101
-#| msgid "<b>Sender Photograph</b>"
+#: ../mail/mail-config.ui.h:104
 msgid "Sender Photograph"
 msgstr "ánh ngÆái gái"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:103
-#| msgid "Compose a reply to the mailing list of the selected message"
+#: ../mail/mail-config.ui.h:106
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Gái trá lái _riÃng cho mát thÆ tá háp thÆ chung"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:105
-#| msgid "_Prompt when sending messages with an empty subject line"
+#: ../mail/mail-config.ui.h:108
+#, fuzzy
+#| msgid "Sending a message with only _Bcc recipients defined"
+msgid "Sending a message with _recipients not entered as mail addresses"
+msgstr "Gái thÆ chá Äán Äáa chá trong _Bcc"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:110
 msgid "Sending a message with an _empty subject line"
 msgstr "Gái thÆ vái dÃng chá Äá Äá _tráng"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:107
-#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+#: ../mail/mail-config.ui.h:112
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Gái thÆ chá Äán Äáa chá trong _Bcc"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:114
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Gái thÆ Äán rát _nhiáu ngÆái nhán"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:115
 msgid "Sent _Messages Folder:"
 msgstr "ThÆ _mác thÆ ÄÃ gái:"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:116
 msgid "Ser_ver requires authentication"
 msgstr "MÃy phác _vá cán thiát xÃc thác"
 
-#: ../mail/mail-config.ui.h:112
-#| msgid "Server Information"
+#: ../mail/mail-config.ui.h:117
 msgid "Server Configuration"
 msgstr "Cáu hÃnh mÃy chá"
 
-#: ../mail/mail-config.ui.h:113
-#| msgid "Server _Type: "
+#: ../mail/mail-config.ui.h:118
 msgid "Server _Type:"
 msgstr "_Kiáu mÃy chá:"
 
-#: ../mail/mail-config.ui.h:114
-#| msgid "Sig_ning certificate:"
+#: ../mail/mail-config.ui.h:119
+#, fuzzy
+#| msgid "Add Custom Junk Header"
+msgid "Set custom junk header"
+msgstr "ThÃm dÃng Äáu thÆ rÃc tá chán"
+
+#: ../mail/mail-config.ui.h:120
 msgid "Si_gning algorithm:"
 msgstr "_Thuát toÃn kà tÃn:"
 
-#: ../mail/mail-config.ui.h:115
-#| msgid "Signatures"
+#: ../mail/mail-config.ui.h:121
 msgid "Sig_natures"
 msgstr "Chá _kÃ"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
 msgstr "Chá_ng nhán kà tÃn:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
 msgstr "Chá _kÃ:"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:124
 msgid "Signatures"
 msgstr "Chá kÃ"
 
-#: ../mail/mail-config.ui.h:119
-#| msgid "Sig_ning certificate:"
+#: ../mail/mail-config.ui.h:125
 msgid "Signing _algorithm:"
 msgstr "_Thuát toÃn kà tÃn:"
 
-#: ../mail/mail-config.ui.h:120
-#| msgid "Local Folders"
+#: ../mail/mail-config.ui.h:126
 msgid "Special Folders"
 msgstr "ThÆ mác Äác biát"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:127
 msgid "Spell Checking"
 msgstr "Kiám tra chÃnh tá"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:128
 msgid "Start _typing at the bottom on replying"
 msgstr "Khi ÄÃp áng, bát Äáu gà bÃn _dÆái (khuyán khÃch)"
 
-#: ../mail/mail-config.ui.h:123
-#| msgid "Start: "
+#: ../mail/mail-config.ui.h:129
 msgid "Start up"
 msgstr "Khái Äáng"
 
-#: ../mail/mail-config.ui.h:125
-#| msgid "T_ype: "
+#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "Mát mà TLS"
+
+#: ../mail/mail-config.ui.h:131
 msgid "T_ype:"
 msgstr "Kiá_u:"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:132
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12052,7 +11971,7 @@ msgstr ""
 "Danh sÃch ngÃn ngá nÃy phán Ãnh chá nháng ngÃn ngá cho mà bán Äà cÃi Äát tá "
 "Äián."
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12063,7 +11982,7 @@ msgstr ""
 "TÃn bán xÃc Äánh sá chá ÄÆác dÃng\n"
 "chá cho mác ÄÃch hián thá."
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:136
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -12071,7 +11990,7 @@ msgstr ""
 "Äá trÃnh sá cá thÆ tÃn dá xáu há, hái xÃc nhán trÆác khi thác hián nháng "
 "hÃnh Äáng ÄÆác ÄÃnh dáu sau:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:137
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12079,149 +11998,137 @@ msgstr ""
 "HÃy gà tÃn mà bán muán dÃng cho tÃi khoán nÃy.\n"
 "Và dá:  Chá lÃm  hoác  Cà nhÃn Â."
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:139
 msgid "Us_ername:"
 msgstr "TÃn n_gÆái dÃng:"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:140
 msgid "Use Authe_ntication"
 msgstr "_XÃc thác"
 
-#: ../mail/mail-config.ui.h:135
-#| msgid "User_name:"
+#: ../mail/mail-config.ui.h:141
 msgid "User _Name:"
 msgstr "TÃ_n ngÆái dÃng:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
 msgstr "_ThÃm chá kÃ"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:143
 msgid "_Always load images from the Internet"
 msgstr "_LuÃn tái ánh xuáng Internet"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
 msgstr "Kiáu _xÃc thác"
 
-#: ../mail/mail-config.ui.h:139
-msgid "_Default junk plugin:"
-msgstr "Phán bá sung thÆ rÃc _mác Äánh:"
-
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:145
 msgid "_Direct connection to the Internet"
 msgstr "Kát nái trác tiáp tái Int_ernet"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:146
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Äá_ng kà tÃn yÃu cáu háp (Äá tÆÆng thÃch vái trÃnh Outlook)"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:147
 msgid "_Forward style:"
 msgstr "Kiáu dÃng chuyán t_iáp:"
 
-#: ../mail/mail-config.ui.h:143
-#| msgid "Current Folder"
+#: ../mail/mail-config.ui.h:148
 msgid "_Junk Folder:"
 msgstr "ThÆ mác thÆ _rÃc:"
 
-#: ../mail/mail-config.ui.h:144
-#| msgid "_Keep Signature above the original message on replying"
+#: ../mail/mail-config.ui.h:149
 msgid "_Keep signature above the original message on replying"
 msgstr "Hián chá _kà bÃn trÃn thÆ gác khi trá lái"
 
-#: ../mail/mail-config.ui.h:145
-#| msgid "Language"
+#: ../mail/mail-config.ui.h:150
 msgid "_Languages"
 msgstr "_NgÃn ngá"
 
-#: ../mail/mail-config.ui.h:146
-#| msgid "_Load images in messages from contacts"
+#: ../mail/mail-config.ui.h:151
 msgid "_Load images only in messages from contacts"
 msgstr "Chá tái ánh trong thÆ gái tá _liÃn lác ÄÃ biát"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:152
 msgid "_Lookup in local address book only"
 msgstr "Tr_a tÃm chá trong sá Äáa chá các bá"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:153
 msgid "_Make this my default account"
 msgstr "Äát tÃi khoán nÃy _mác Äánh"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:154
 msgid "_Manual proxy configuration:"
 msgstr "Cáu hÃnh áy nhiá_m thá cÃng:"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:156
 msgid "_Never load images from the Internet"
 msgstr "KhÃ_ng bao giá tái ánh tá Internet"
 
-#: ../mail/mail-config.ui.h:152
-msgid "_Path:"
-msgstr "ÄÆáng _dán:"
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
+msgid "_Port:"
+msgstr "_Cáng:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:159
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "Nhác khi gái thÆ dáng _HTML cho liÃn lác nÃo khÃng muán nhán thÆ HTML"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:160
 msgid "_Reply style:"
 msgstr "Kiáu dÃng t_rá lái:"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:161
 msgid "_Script:"
 msgstr "Táp _lánh:"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:162
 msgid "_Secure HTTP Proxy:"
 msgstr "áy nhiám HTTP _báo mát:"
 
-#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:164 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_MÃy chá:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:160
-#| msgid "Show animated images as animations."
+#: ../mail/mail-config.ui.h:166
 msgid "_Show animated images"
 msgstr "_Hián ánh hoát cánh"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:167
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Hián ánh cháp ngÆái gái trong à xem thá thÆ"
 
-#: ../mail/mail-config.ui.h:162
-#| msgid "Drafts _Folder:"
+#: ../mail/mail-config.ui.h:168
 msgid "_Trash Folder:"
 msgstr "ThÆ mác _rÃc:"
 
-#: ../mail/mail-config.ui.h:163
-msgid "_Use Secure Connection:"
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
 msgstr "DÃng kát nái _báo mát:"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:170
 msgid "_Use system defaults"
 msgstr "_DÃng già trá mác Äánh cáa há tháng"
 
-#: ../mail/mail-config.ui.h:165
+#: ../mail/mail-config.ui.h:171
 msgid "_Use the same fonts as other applications"
 msgstr "_DÃng cÃng nháng phÃng chá vái cÃc áng dáng khÃc"
 
-#: ../mail/mail-config.ui.h:166 ../smime/gui/smime-ui.ui.h:48
-#| msgid "am"
+#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:167 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:174
 msgid "color"
 msgstr "mÃu"
 
-#: ../mail/mail-config.ui.h:169
+#: ../mail/mail-config.ui.h:175
 msgid "description"
 msgstr "mà tá"
 
@@ -12241,66 +12148,64 @@ msgstr "Mái thÆ mác các bá"
 msgid "Call"
 msgstr "Gái"
 
-#: ../mail/mail-dialogs.ui.h:5
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "_HoÃn tát"
 
-#: ../mail/mail-dialogs.ui.h:6
-#| msgid "Edit Signature"
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Chá kà Äián tá"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "Äáng chuyán tiáp"
 
-#: ../mail/mail-dialogs.ui.h:8
-#| msgid "Encrypt"
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Encryption"
 msgstr "Mát mà hoÃ"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "Theo dÃi tiáp"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "Cho bán biát tin tác nÃy"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Chuyán tiáp"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "Äiáu kián Quyán phÃp"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "KhÃng cán thiát trá lái"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "Trá lái tát cá"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "Xem lái"
 
-#: ../mail/mail-dialogs.ui.h:19
-#| msgid "Search Folder source"
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Search Folder Sources"
 msgstr "Nguán thÆ mác tÃm kiám"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "ThÃng tin Báo mát"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Specific folders"
 msgstr "ThÆ mác riÃng"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12308,25 +12213,25 @@ msgstr ""
 "CÃc thÆ mà bán Äà chán Äá theo dÃi tiáp thà ÄÆác liát kà bÃn dÆái.\n"
 "HÃy chán mát hÃnh Äáng theo dÃi tiáp tá trÃnh ÄÆn  Cá Â."
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "_Cháp nhán Bán quyán"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Due By:"
 msgstr "Äán _hán:"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Flag:"
 msgstr "_Cá:"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Tick this to accept the license agreement"
 msgstr ""
 "HÃy ÄÃnh dáu _trong háp chán nÃy Äá cháp nhán cÃc Äiáu kián cáa bán quyán "
 "nÃy."
 
-#: ../mail/mail-folder-cache.c:792
+#: ../mail/mail-folder-cache.c:779
 #, c-format
 msgid "Pinging %s"
 msgstr "Äang  ping  %s..."
@@ -12335,218 +12240,136 @@ msgstr "Äang  ping  %s..."
 msgid "Filtering Selected Messages"
 msgstr "Äang lác cÃc thÆ ÄÃ chán"
 
-#: ../mail/mail-ops.c:226
+#: ../mail/mail-ops.c:205
 msgid "Fetching Mail"
 msgstr "Äang láy thÆ..."
 
-#: ../mail/mail-ops.c:785
+#: ../mail/mail-ops.c:821
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Äang gái thÆ %d trÃn %d..."
 
-#: ../mail/mail-ops.c:831
+#: ../mail/mail-ops.c:869
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Viác gái %d trÃn %d thÆ bá lái."
 
-#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:788
+#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:837
 msgid "Canceled."
 msgstr "Bá thÃi."
 
-#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:790
+#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:839
 msgid "Complete."
 msgstr "HoÃn tát."
 
-#: ../mail/mail-ops.c:941
+#: ../mail/mail-ops.c:985
 #, c-format
-#| msgid "Moving messages to %s"
 msgid "Moving messages to '%s'"
 msgstr "Äang chuyán thÆ tái '%s'"
 
-#: ../mail/mail-ops.c:941
+#: ../mail/mail-ops.c:986
 #, c-format
-#| msgid "Copying messages to %s"
 msgid "Copying messages to '%s'"
 msgstr "Äang chÃp thÆ vÃo '%s'"
 
-#: ../mail/mail-ops.c:1062
-#, c-format
-#| msgid "Scanning folders in \"%s\""
-msgid "Scanning folders in '%s'"
-msgstr "Äang quÃt cÃc thÆ mác trong '%s'"
-
-#: ../mail/mail-ops.c:1178
-msgid "Forwarded messages"
-msgstr "ThÆ ÄÃ chuyán tiáp"
-
-#: ../mail/mail-ops.c:1295
-#, c-format
-#| msgid "Retrieving quota information for folder %s"
-msgid "Retrieving quota information for folder '%s'"
-msgstr "Äang láy thÃng hán ngách cáa thÆ mác '%s'"
-
-#: ../mail/mail-ops.c:1370
-#, c-format
-#| msgid "Opening store %s"
-msgid "Opening store '%s'"
-msgstr "Äang má kho '%s'"
-
-#: ../mail/mail-ops.c:1446
-#, c-format
-#| msgid "Removing folder %s"
-msgid "Removing folder '%s'"
-msgstr "Äang gá bá thÆ mác '%s'"
-
-#: ../mail/mail-ops.c:1585
+#: ../mail/mail-ops.c:1104
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Äang cát giá thÆ mác %s..."
 
-#: ../mail/mail-ops.c:1654
+#: ../mail/mail-ops.c:1179
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Äang xoà hán và cát giá tÃi khoán %s..."
 
-#: ../mail/mail-ops.c:1655
+#: ../mail/mail-ops.c:1180
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Äang cát giá tÃi khoán %s..."
 
-#: ../mail/mail-ops.c:1713
+#: ../mail/mail-ops.c:1242
 #, c-format
-#| msgid "Refreshing folder"
 msgid "Refreshing folder '%s'"
 msgstr "Äang cáp nhát thÆ mác '%s'"
 
-#: ../mail/mail-ops.c:1877
+#: ../mail/mail-ops.c:1432
 #, c-format
-#| msgid "Expunging folder"
 msgid "Expunging folder '%s'"
 msgstr "Äang xoà dán thÆ mác '%s'"
 
-#: ../mail/mail-ops.c:1949
+#: ../mail/mail-ops.c:1517
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Äang Äá rÃc trong  %s Â..."
 
-#: ../mail/mail-ops.c:1950
-msgid "Local Folders"
-msgstr "ThÆ mác các bá"
-
-#: ../mail/mail-ops.c:2123
-#, c-format
-msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] "Äang láy %d thÆ..."
-
-#: ../mail/mail-ops.c:2216
-#, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messages"
-msgstr[0] "Äang lÆu %d thÆ"
-
-#: ../mail/mail-ops.c:2312
-#, c-format
-#| msgid ""
-#| "Error saving messages to: %s:\n"
-#| " %s"
-msgid "Error saving messages to: %s:\n"
-msgstr "Gáp lái khi lÆu thÆ vÃo: %s:\n"
-
-#: ../mail/mail-ops.c:2387
-#, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "Äang chuán bá tÃi khoán  %s  Äá ra ngoái tuyán"
-
-#: ../mail/mail-ops.c:2478
-msgid "Checking Service"
-msgstr "Äang kiám tra dách vá..."
-
-#: ../mail/mail-ops.c:2558
+#: ../mail/mail-ops.c:1619
 #, c-format
-#| msgid "Disconnecting from %s"
 msgid "Disconnecting %s"
 msgstr "Äang ngát kát nái tá %s"
 
-#: ../mail/mail-ops.c:2615
-#, c-format
-#| msgid "Saving attachment"
-msgid "Removing attachments"
-msgstr "Äang xoà ÄÃnh kÃm"
-
-#: ../mail/mail-ops.c:2662
-#, c-format
-#| msgid "All accounts have been removed."
-msgid "File \"%s\" has been removed."
-msgstr "Táp tin \"%s\" ÄÃ ÄÆác gá bá."
-
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:198
 msgid "Canceling..."
 msgstr "Äang thÃi..."
 
-#: ../mail/mail-send-recv.c:435
+#: ../mail/mail-send-recv.c:454
 msgid "Send & Receive Mail"
 msgstr "Gái và Nhán ThÆ"
 
-#: ../mail/mail-send-recv.c:452
+#: ../mail/mail-send-recv.c:470
 msgid "Cancel _All"
 msgstr "ThÃi _tát cá"
 
-#: ../mail/mail-send-recv.c:569
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:979
 msgid "Updating..."
 msgstr "Äang cáp nhát..."
 
-#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:653
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:691
 msgid "Waiting..."
 msgstr "Äang chá..."
 
-#: ../mail/mail-send-recv.c:903
+#: ../mail/mail-send-recv.c:959
 #, c-format
 msgid "Checking for new mail"
 msgstr "Äang kiám tra tÃm thÆ mái..."
 
-#: ../mail/mail-tools.c:69
+#: ../mail/mail-tools.c:72
 #, fuzzy, c-format
 #| msgid "Could not create spool directory `%s': %s"
 msgid "Could not create spool directory '%s': %s"
 msgstr "KhÃng thá táo thÆ mác áng chá Â %s Â: %s"
 
-#: ../mail/mail-tools.c:102
+#: ../mail/mail-tools.c:106
 #, fuzzy, c-format
 #| msgid "Trying to movemail a non-mbox source `%s'"
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Äang cá movemail (di chuyán thÆ) mát nguán khÃng dáng mbox  %s Â"
 
-#: ../mail/mail-tools.c:214
+#: ../mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "ThÆ ÄÃ chuyán tiáp - %s"
 
-#: ../mail/mail-tools.c:216
+#: ../mail/mail-tools.c:217
 msgid "Forwarded message"
 msgstr "ThÆ ÄÃ chuyán tiáp"
 
-#: ../mail/mail-vfolder.c:86
+#: ../mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Äang thiát láp thÆ mác tÃm kiám: %s"
 
-#: ../mail/mail-vfolder.c:235
-#, c-format
-msgid "Updating Search Folders for '%s:%s'"
+#: ../mail/mail-vfolder.c:232
+#, fuzzy, c-format
+#| msgid "Updating Search Folders for '%s:%s'"
+msgid "Updating Search Folders for '%s' : %s"
 msgstr "Äang cáp nhát cÃc thÆ mác tÃm kiám cho  %s:%s Â"
 
-#: ../mail/mail-vfolder.c:242
-#, c-format
-msgid "Updating Search Folders for '%s'"
-msgstr "Äang cáp nhát cÃc thÆ mác tÃm kiám cho  %s Â"
-
 #. Translators: The first %s is name of the affected
 #. * search folder(s), the second %s is the URI of the
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:709
+#: ../mail/mail-vfolder.c:678
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12560,26 +12383,23 @@ msgstr[0] ""
 "ThÆ mác tÃm \"%s\" Äà thay Äái và thÆ mác bá xoÃ\n"
 "\"%s\""
 
-#: ../mail/mail-vfolder.c:1273
+#: ../mail/mail-vfolder.c:1314
 msgid "Edit Search Folder"
 msgstr "Sáa thÆ mác tÃm kiám"
 
-#: ../mail/mail-vfolder.c:1380
+#: ../mail/mail-vfolder.c:1423
 msgid "New Search Folder"
 msgstr "ThÆ mác tÃm kiám mái"
 
 #: ../mail/mail.error.xml.h:1
-#| msgid "Check Junk Failed"
 msgid "\"Check Junk\" Failed"
 msgstr "Lái kiám tra thÆ rÃc"
 
 #: ../mail/mail.error.xml.h:2
-#| msgid "Report Junk Failed"
 msgid "\"Report Junk\" Failed"
 msgstr "Lái thÃng bÃo thÆ rÃc"
 
 #: ../mail/mail.error.xml.h:3
-#| msgid "Report Not Junk Failed"
 msgid "\"Report Not Junk\" Failed"
 msgstr "Lái thÃng bÃo khÃng phái thÆ rÃc"
 
@@ -12719,7 +12539,6 @@ msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "KhÃng thá di chuyán thÆ mác  {0}  sang  {1} Â."
 
 #: ../mail/mail.error.xml.h:32
-#| msgid "Cannot open source \"{1}\""
 msgid "Cannot open source \"{1}\"."
 msgstr "KhÃng thá má nguán \"{1}\"."
 
@@ -12772,7 +12591,6 @@ msgstr ""
 "chá thÆáng; phÃm CapsLock (chá hoa luÃn) phái tát."
 
 #: ../mail/mail.error.xml.h:43
-#| msgid "Close this window"
 msgid "Close message window."
 msgstr "ÄÃng cáa sá."
 
@@ -12780,42 +12598,19 @@ msgstr "ÄÃng cáa sá."
 msgid "Could not save signature file."
 msgstr "KhÃng thá lÆu táp tin chá kÃ."
 
-#: ../mail/mail.error.xml.h:45
-msgid ""
-"Default local store has been changed from mbox to maildir format. Do you "
-"want to migrate now ?\n"
-"\n"
-"A mbox account will be created to preserve the old mbox folders. You can "
-"delete it after ensuring the data is safely migrated. Please make sure there "
-"is enough space if you choose to migrate."
-msgstr ""
-"Kho lÆu các bá mác Äánh Äà thay Äái tá dáng mbox sang maildir. Bán cà muán "
-"chuyán qua maildir khÃng?\n"
-"\n"
-"TÃi khoán mbox sá ÄÆác táo Äá báo lÆu cÃc thÆ mác dáng mbox cÅ. Bán cà thá "
-"xoà Äi sau khi báo Äám viác chuyán Äái thÃnh cÃng tát Äáp. HÃy báo Äám cà Äá "
-"vÃng ÄÄa tráng trÆác khi chuyán Äái."
-
-#: ../mail/mail.error.xml.h:48
-msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "Xoà cÃc thÆ khái thÆ mác tÃm kiám  {0}  khÃng?"
-
-#: ../mail/mail.error.xml.h:50
-#| msgid "Do not disable"
+#: ../mail/mail.error.xml.h:46
 msgid "Do _Not Disable"
 msgstr "Äáng _tát"
 
-#: ../mail/mail.error.xml.h:51
-#| msgid "Do _not Send"
+#: ../mail/mail.error.xml.h:47
 msgid "Do _Not Send"
 msgstr "Äá_ng gái"
 
-#: ../mail/mail.error.xml.h:52
-#| msgid "_Do not Synchronize"
+#: ../mail/mail.error.xml.h:48
 msgid "Do _Not Synchronize"
 msgstr "Äá_ng Äáng bá"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:49
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -12823,60 +12618,127 @@ msgstr ""
 "Bán cà muán Äáng bá các bá nháng thÆ mác cà nhÃn cán sá dáng ngoái tuyán "
 "khÃng?"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "Bán cà muán ÄÃnh dáu mái thÆ Äà Äác khÃng?"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "Bán cà muán lÆu cÃc thay Äái khÃng?"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "HÃy gà mát kháu."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Gáp lái khi náp lái Äánh nghÄa bá lác."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "Gáp lái khi thác hián thao tÃc."
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "Gáp lái khi  {0} Â."
 
+#: ../mail/mail.error.xml.h:59
+#, fuzzy
+#| msgid ""
+#| "Default local store has been changed from mbox to maildir format. Do you "
+#| "want to migrate now ?\n"
+#| "\n"
+#| "A mbox account will be created to preserve the old mbox folders. You can "
+#| "delete it after ensuring the data is safely migrated. Please make sure "
+#| "there is enough space if you choose to migrate."
+msgid ""
+"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"mail must be migrated to the new format before Evolution can proceed. Do you "
+"want to migrate now?\n"
+"\n"
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
+msgstr ""
+"Kho lÆu các bá mác Äánh Äà thay Äái tá dáng mbox sang maildir. Bán cà muán "
+"chuyán qua maildir khÃng?\n"
+"\n"
+"TÃi khoán mbox sá ÄÆác táo Äá báo lÆu cÃc thÆ mác dáng mbox cÅ. Bán cà thá "
+"xoà Äi sau khi báo Äám viác chuyán Äái thÃnh cÃng tát Äáp. HÃy báo Äám cà Äá "
+"vÃng ÄÄa tráng trÆác khi chuyán Äái."
+
+#: ../mail/mail.error.xml.h:62
+msgid "Evolution's local mail format has changed."
+msgstr ""
+
 #: ../mail/mail.error.xml.h:63
-#| msgid "Really unsubscribe from folder \"%s\"?"
+#, fuzzy
+#| msgid "_Download Messages for Offline Usage"
+msgid "Failed to download messages for offline viewing."
+msgstr "Tái _vá thÆ Äá Äác ngoái tuyán"
+
+#: ../mail/mail.error.xml.h:64
+#, fuzzy
+#| msgid "Remove duplicate messages?"
+msgid "Failed to find duplicate messages."
+msgstr "Xoà thÆ trÃng láp chá?"
+
+#: ../mail/mail.error.xml.h:65
+#, fuzzy
+#| msgid "failed to open book"
+msgid "Failed to open folder."
+msgstr "viác má sá bá lái"
+
+#: ../mail/mail.error.xml.h:66
+#, fuzzy
+#| msgid "Querying server for a list of supported authentication mechanisms."
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr "Äang truy ván mÃy chá cà danh sÃch cÃc cÆ chá xÃc thác ÄÆác há trá."
+
+#: ../mail/mail.error.xml.h:67
+#, fuzzy
+#| msgid "View image attachments directly in mail messages."
+msgid "Failed to remove attachments from messages."
+msgstr "Xem ánh ÄÃnh kÃm trác tiáp trong thÆ."
+
+#: ../mail/mail.error.xml.h:68
+#, fuzzy
+#| msgid "Unable to retrieve message"
+msgid "Failed to retrieve messages."
+msgstr "KhÃng thá nhán thÆ."
+
+#: ../mail/mail.error.xml.h:69
+#, fuzzy
+#| msgid "Failed to send %d of %d messages"
+msgid "Failed to save messages to disk."
+msgstr "Viác gái %d trÃn %d thÆ bá lái."
+
+#: ../mail/mail.error.xml.h:70
 msgid "Failed to unsubscribe from folder."
 msgstr "Lái bá ÄÄng kà thÆ mác."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:71
 msgid "File exists but cannot overwrite it."
 msgstr "Táp tin ÄÃ tán tái nhÆng khÃng thá ghi ÄÃ lÃn nÃ."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:72
 msgid "File exists but is not a regular file."
 msgstr "Táp tin tán tái nhÆng khÃng phái là táp tin chuán."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:67
-#| msgid "The attachment does not contain a valid calendar message"
+#: ../mail/mail.error.xml.h:74
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "ThÆ mác '{0}' khÃng cháa thÆ trÃng láp."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:75
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Náu bán tiáp tác, bán sá khÃng thá phác hái nháng thÆ nÃy."
 
-#: ../mail/mail.error.xml.h:69
-#| msgid ""
-#| "If you delete the folder, all of its contents and its subfolders contents "
-#| "will be deleted permanently."
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -12884,19 +12746,16 @@ msgstr ""
 "Náu bán xoà thÆ mác nÃy, mái nái dung cáa nà và thÆ mác con sá bá xoà vÄnh "
 "vián."
 
-#: ../mail/mail.error.xml.h:70
-#| msgid ""
-#| "If you delete the folder, all of its contents and its subfolders contents "
-#| "will be deleted permanently."
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Náu bán xoà thÆ mác nÃy, mái nái dung cáa nà sá bá xoà vÄnh vián."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:78
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Náu bán tiáp tác, mái tÃi khoán áy nhiám sá bá xoà hoÃn toÃn."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12904,11 +12763,11 @@ msgstr ""
 "Náu bán tiáp tác, thÃng tin tÃi khoán và cÃc thÃng tin áy nhiám sá bá xoà "
 "hoÃn toÃn."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:81
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Náu bán tiáp tác, thÃng tin tÃi khoán sá bá xoà hoÃn toÃn."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -12916,71 +12775,79 @@ msgstr ""
 "Náu bán thoÃt thà nháng thÆ nÃy sá khÃng ÄÆác gái tái khi khái cháy lái "
 "trÃnh Evolution."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:83
 msgid "Ignore"
 msgstr "Bá qua"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:84
 msgid "Invalid authentication"
 msgstr "XÃc thác khÃng háp lá"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:85
 msgid "Mail Deletion Failed"
 msgstr "Lái xoà thÆ"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:86
 msgid "Mail filters automatically updated."
 msgstr "CÃc bá lác thÆ ÄÃ ÄÆác cáp nhát tá Äáng."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:87
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
 msgstr ""
-"Nhiáu há tháng thÆ Äián tá thÃm mát dÃng Äáu  Cà vá là Cho  (Apparently-To) "
-"vÃo mái thÆ chá cà ngÆái nhán BCC (Bà mát ChÃp Cho). Náu thÃm dÃng Äáu áy, "
-"nà sá liát kà mái ngÆái nhán trong thÆ cáa bán. Äá trÃnh ngÆái gái thÆ rÃc "
-"Än cáp cÃc Äáa chá trong danh sÃch áy, bán hÃy thÃm Ãt nhát mát ngÆái nhán "
-"Cho (To) hay ChÃp Cho (Cc), v.d. Äáa chá mÃnh."
+"Nhiáu há tháng thÆ Äián tá thÃm mát dÃng Äáu  Cà vá là Cho  (Apparently-"
+"To) vÃo mái thÆ chá cà ngÆái nhán BCC (Bà mát ChÃp Cho). Náu thÃm dÃng Äáu "
+"áy, nà sá liát kà mái ngÆái nhán trong thÆ cáa bán. Äá trÃnh ngÆái gái thÆ "
+"rÃc Än cáp cÃc Äáa chá trong danh sÃch áy, bán hÃy thÃm Ãt nhát mát ngÆái "
+"nhán Cho (To) hay ChÃp Cho (Cc), v.d. Äáa chá mÃnh."
 
-#: ../mail/mail.error.xml.h:81
-#| msgid "Create a new folder for storing mail"
-msgid "Migrate local mbox folders to maildir"
-msgstr "Chuyán thÆ mác các bá dáng mbox sang dáng maildir"
+#: ../mail/mail.error.xml.h:88
+#, fuzzy
+#| msgid ""
+#| "Warning: Deleting messages from a Search Folder will delete the actual "
+#| "message from one of your local or remote folders.\n"
+#| "Do you really want to do this?"
+msgid ""
+"Messages shown in Search Folders are not copies. Deleting them from a Search "
+"Folder will delete the actual messages from the folder or folders in which "
+"they physically reside. Do you really want to delete these messages?"
+msgstr ""
+"Cánh bÃo: hÃnh Äáng xoà thÆ khái thÆ mác tÃm kiám sá cÅng xoà thÆ thát khái "
+"mát cáa nháng thÆ mác các bá hay thÆ mác tá xa cáa bán.\n"
+"Bán thác sá muán lÃm nhÆ thá khÃng?"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:89
 msgid "Missing folder."
 msgstr "Thiáu thÆ mác."
 
-#: ../mail/mail.error.xml.h:84
-#| msgid "Never"
+#: ../mail/mail.error.xml.h:91
 msgid "N_ever"
 msgstr "_KhÃng bao giá"
 
-#: ../mail/mail.error.xml.h:85
-#| msgid "Unfinished messages found"
+#: ../mail/mail.error.xml.h:92
 msgid "No duplicate messages found."
 msgstr "KhÃng tháy thÆ trÃng láp."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:93
 msgid "No sources selected."
 msgstr "ChÆa chán nguán."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:94
 msgid "Opening too many messages at once may take a long time."
 msgstr "Viác má quà nhiáu thÆ cÃng lÃc cà lá sá mát lÃu."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:95
 msgid "Please check your account settings and try again."
 msgstr "HÃy kiám tra xem thiát láp tÃi khoán rái thá lái."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:96
 msgid "Please enable the account or send using another account."
 msgstr "HÃy bát tÃi khoán nÃy hoác gái báng tÃi khoán khÃc."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -12988,7 +12855,7 @@ msgstr ""
 "HÃy nháp mát Äáa chá thÆ Äián tá háp lá vÃo trÆáng Cho: (To). CÃ thá tÃm "
 "kiám Äáa chá thÆ báng cÃch nháp vÃo nÃt Cho: (To) á cánh háp nháp."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -12998,67 +12865,63 @@ msgstr ""
 "HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:100
 msgid "Please provide an unique name to identify this signature."
 msgstr "HÃy cung cáp tÃn duy nhát Äá nhán dián chá kà nÃy."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:101
 msgid "Please wait."
 msgstr "Vui lÃng chá..."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:102
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Gáp lái khi nÃng cáp thÆ mác thÆ cÅ Â {0} Â."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:103
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Äang truy ván mÃy chá cà danh sÃch cÃc cÆ chá xÃc thác ÄÆác há trá."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:104
 msgid "Read receipt requested."
 msgstr "ThÃng bÃo ÄÃ Äác ÄÆác yÃu cáu."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:105
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Thác sá xoà thÆ mác  {0}  và mái thÆ mác con cáa nà khÃng?"
 
-#: ../mail/mail.error.xml.h:99
-#| msgid "Cannot delete folder \"{0}\"."
+#: ../mail/mail.error.xml.h:106
 msgid "Really delete folder \"{0}\"?"
 msgstr "Thát sá xoà thÆ mác \"{0}\" chá?"
 
-#: ../mail/mail.error.xml.h:100
-#| msgid "Remove the delegate %s?"
+#: ../mail/mail.error.xml.h:107
 msgid "Remove duplicate messages?"
 msgstr "Xoà thÆ trÃng láp chá?"
 
-#: ../mail/mail.error.xml.h:101
-#| msgid "_Private"
+#: ../mail/mail.error.xml.h:108
 msgid "Reply _Privately"
 msgstr "Trá lái _riÃng"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:111
 msgid "Search Folders automatically updated."
 msgstr "CÃc thÆ mác tÃm kiám ÄÃ ÄÆác cáp nhát tá Äáng."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:112
 msgid "Send private reply?"
 msgstr "Gái riÃng chá?"
 
-#: ../mail/mail.error.xml.h:106
-#| msgid "Sender or Recipients"
+#: ../mail/mail.error.xml.h:113
 msgid "Send reply to all recipients?"
 msgstr "Gái trá lái tát cá ngÆái nhán chá?"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:114
 msgid "Signature Already Exists"
 msgstr "Chá kà Äà cÃ"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:115
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Äáng bá các bá cÃc thÆ mác Äá sá dáng khi ngoái tuyán khÃng?"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13066,7 +12929,7 @@ msgstr ""
 "KhÃng cho phÃp thay Äái tÃn cáa thÆ mác há tháng, di chuyán hay xoà chÃng và "
 "trÃnh Evolution cán thiát thÆ mác há tháng Äá hoát Äáng ÄÆác."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13084,7 +12947,7 @@ msgstr ""
 "Än cáp cÃc Äáa chá trong danh sÃch áy, bán hÃy thÃm Ãt nhát mát ngÆái nhán "
 "Cho (To) hay ChÃp Cho (Cc), v.d. Äáa chá mÃnh."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13092,7 +12955,7 @@ msgstr ""
 "NgÆái nhán sau khÃng cà Äáa chá thÆ háp lá:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13100,11 +12963,17 @@ msgstr ""
 "Nháng ngÆái nhán sau khÃng cà Äáa chá thÆ háp lá:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:125
 msgid "The script file must exist and be executable."
 msgstr "Táp tin vÄn lánh phái tán tái và cà cháy ÄÆác."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:126
+#, fuzzy
+#| msgid "Text message part limit"
+msgid "These messages are not copies."
+msgstr "Hán chá phán vÄn bán thÆ"
+
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13112,19 +12981,19 @@ msgstr ""
 "CÃ lá ÄÃ thÃm thÆ mác nÃy mát cÃch ngám; hÃy dÃng bá sáa thÆ mác tÃm kiám Äá "
 "thÃm nà mát cÃch dát khoÃt, náu cán thiát."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
 "KhÃng thá gái thÆ nÃy và bán Äang gái nà báng mát tÃi khoán chÆa ÄÆác bát"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:130
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "KhÃng thá gái thÆ nÃy và bán chÆa ghi rà ngÆái nhán nÃo."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13132,11 +13001,11 @@ msgstr ""
 "MÃy chá nÃy khÃng há trá loái xÃc thác nÃy và cà lá hoÃn toÃn khÃng há trá "
 "xÃc thác nÃo."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:132
 msgid "This signature has been changed, but has not been saved."
 msgstr "Chá kà nÃy Äà thay Äái, nhÆng ván chÆa ÄÆác lÆu."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:133
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -13144,18 +13013,15 @@ msgstr ""
 "HÃnh Äáng nÃy sá ÄÃnh dáu mái thÆ ÄÃ Äác trong thÆ mác ÄÃ chán, cÅng trong "
 "mái thÆ mác con cáa nÃ."
 
-#: ../mail/mail.error.xml.h:126
-#| msgid ""
-#| "This will mark all messages as read in the selected folder and its "
-#| "subfolders."
+#: ../mail/mail.error.xml.h:134
 msgid "This will mark all messages as read in the selected folder."
 msgstr "HÃnh Äáng nÃy sá ÄÃnh dáu mái thÆ 'ÄÃ Äác' trong thÆ mác ÄÃ chán."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:135
 msgid "Unable to connect to the GroupWise server."
 msgstr "KhÃng kát nái tái mÃy chá Groupwise ÄÆác."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:136
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13163,33 +13029,29 @@ msgstr ""
 "KhÃng thá má thÆ mác NhÃp (Drafts) cho tÃi khoán nÃy. DÃng thÆ mác NhÃp cáa "
 "há tháng thay thá chá?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:137
 msgid "Unable to read license file."
 msgstr "KhÃng thá Äác táp tin quyán phÃp."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:138
+#, fuzzy
+#| msgid "Unable to retrieve message"
+msgid "Unable to retrieve message."
+msgstr "KhÃng thá nhán thÆ."
+
+#: ../mail/mail.error.xml.h:139
 msgid "Use _Default"
 msgstr "_DÃng mác Äánh"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:140
 msgid "Use default drafts folder?"
 msgstr "DÃng thÆ mác nhÃp mác Äánh chá?"
 
-#: ../mail/mail.error.xml.h:132
-msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual "
-"message from one of your local or remote folders.\n"
-"Do you really want to do this?"
-msgstr ""
-"Cánh bÃo: hÃnh Äáng xoà thÆ khái thÆ mác tÃm kiám sá cÅng xoà thÆ thát khái mát cáa nháng thÆ mác các bá hay thÆ mác tá xa cáa bán.\n"
-"Bán thác sá muán lÃm nhÆ thá khÃng?"
-
-#: ../mail/mail.error.xml.h:134
-#| msgid "Would you like to accept it?"
+#: ../mail/mail.error.xml.h:141
 msgid "Would you like to close the message window?"
 msgstr "Bán cà muán ÄÃng cáa sá thÆ khÃng?"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:142
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -13199,7 +13061,7 @@ msgstr ""
 "chuyán hÆáng trá lái riÃng nÃy vá háp thÆ chung. Bán cà chác muán tiáp tác "
 "khÃng?"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:143
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -13208,10 +13070,7 @@ msgstr ""
 "Bán Äang trá lái cho mát thÆ gái Äán háp thÆ chung, nhÆng bán Äang chá trá "
 "lái riÃng cho ngÆái gái. Bán cà chác muán tiáp tác khÃng?"
 
-#: ../mail/mail.error.xml.h:137
-#| msgid ""
-#| "Retracting a message may remove it from the recipient's mailbox. Are you "
-#| "sure you want to do this ?"
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -13219,31 +13078,31 @@ msgstr ""
 "Bán chuán bá trá lái cho rát nhiáu ngÆái nhán. Bán cà chác muán trá lái cho "
 "TáT Cá há chá?"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:145
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Bán khÃng cà quyán xoà thÆ nÃy."
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:146
 msgid "You have not filled in all of the required information."
 msgstr "Bán chÆa Äián Äá cÃc thÃng tin yÃu cáu."
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:147
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Bán cà vÃi thÆ chÆa gái, bán ván muán thoÃt chá?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:148
 msgid "You may not create two accounts with the same name."
 msgstr "KhÃng cho phÃp bán táo hai tÃi khoán trÃng tÃn."
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:149
 msgid "You must name this Search Folder."
 msgstr "Bán phái Äát tÃn cho thÆ mác TÃm kiám nÃy."
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:150
 msgid "You must specify a folder."
 msgstr "Bán phái xÃc Äánh thÆ mác."
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:151
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13254,142 +13113,160 @@ msgstr ""
 "hoác/và báng cÃch chán mái thÆ mác Äáa phÆÆng,\n"
 "mái thÆ mác á xa, hoác cá hai."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:153
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Bán Äà khÃng ÄÄng nháp ÄÆác vÃo mÃy chá  {0}  vái tÆ cÃch  {0} Â."
 
-#: ../mail/mail.error.xml.h:147
-#| msgid "Always"
+#: ../mail/mail.error.xml.h:154
 msgid "_Always"
 msgstr "_LuÃn luÃn"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:155
 msgid "_Append"
 msgstr "_Nái thÃm"
 
-#: ../mail/mail.error.xml.h:149
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:600
+#: ../mail/mail.error.xml.h:156
+#: ../plugins/publish-calendar/publish-calendar.c:619
 msgid "_Disable"
 msgstr "_Tát"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:157
 msgid "_Discard changes"
 msgstr "_Háy cÃc thay Äái"
 
-#: ../mail/mail.error.xml.h:151
-#: ../modules/mail/e-mail-shell-view-actions.c:1054
+#: ../mail/mail.error.xml.h:158
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "_Empty Trash"
 msgstr "Äá _rÃc"
 
-#: ../mail/mail.error.xml.h:152
+# Name: do not translate/ tÃn: Äáng dách
+#: ../mail/mail.error.xml.h:159
+#, fuzzy
+#| msgid "Evolution"
+msgid "_Exit Evolution"
+msgstr "Evolution"
+
+#: ../mail/mail.error.xml.h:160
 msgid "_Expunge"
 msgstr "_Xoà hán"
 
-#: ../mail/mail.error.xml.h:153
-#| msgid "No"
+#: ../mail/mail.error.xml.h:161
+#, fuzzy
+#| msgid "Migration"
+msgid "_Migrate Now"
+msgstr "NÃng cáp"
+
+#: ../mail/mail.error.xml.h:162
 msgid "_No"
 msgstr "_KhÃng"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:163
 msgid "_Open Messages"
 msgstr "_Má cÃc thÆ"
 
-#: ../mail/mail.error.xml.h:157
-#| msgid "Send Receipt"
+#: ../mail/mail.error.xml.h:166
 msgid "_Send Receipt"
 msgstr "_Gái biÃn nhán"
 
-#: ../mail/mail.error.xml.h:158
-#| msgid "Synchronize"
+#: ../mail/mail.error.xml.h:167
 msgid "_Synchronize"
 msgstr "Äáng _bá"
 
-#: ../mail/mail.error.xml.h:159
-#| msgid "Yes"
+#: ../mail/mail.error.xml.h:168
 msgid "_Yes"
 msgstr "_CÃ"
 
-#: ../mail/message-list.c:1213
+#: ../mail/mail.error.xml.h:169
+msgid "{0}"
+msgstr "{0}"
+
+#: ../mail/message-list.c:1261
 msgid "Unseen"
 msgstr "ChÆa xem"
 
-#: ../mail/message-list.c:1214
+#: ../mail/message-list.c:1262
 msgid "Seen"
 msgstr "ÄÃ xem"
 
-#: ../mail/message-list.c:1215
+#: ../mail/message-list.c:1263
 msgid "Answered"
 msgstr "ÄÃ trá lái"
 
-#: ../mail/message-list.c:1216
+#: ../mail/message-list.c:1264
 msgid "Forwarded"
 msgstr "ÄÃ chuyán tiáp"
 
-#: ../mail/message-list.c:1217
+#: ../mail/message-list.c:1265
 msgid "Multiple Unseen Messages"
 msgstr "Nhiáu thÆ chÆa xem"
 
-#: ../mail/message-list.c:1218
+#: ../mail/message-list.c:1266
 msgid "Multiple Messages"
 msgstr "Nhiáu thÆ"
 
-#: ../mail/message-list.c:1222
+#: ../mail/message-list.c:1270
 msgid "Lowest"
 msgstr "Tháp nhát"
 
-#: ../mail/message-list.c:1223
+#: ../mail/message-list.c:1271
 msgid "Lower"
 msgstr "Tháp hÆn"
 
-#: ../mail/message-list.c:1227
+#: ../mail/message-list.c:1275
 msgid "Higher"
 msgstr "Cao hÆn"
 
-#: ../mail/message-list.c:1228
+#: ../mail/message-list.c:1276
 msgid "Highest"
 msgstr "Cao nhát"
 
-#: ../mail/message-list.c:1837 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1909 ../widgets/table/e-cell-date.c:51
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
-#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1844 ../plugins/itip-formatter/itip-view.c:205
+#. * in 12-hour format, without seconds.
+#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "HÃm nay %l:%M %p"
 
-#: ../mail/message-list.c:1853
+#: ../mail/message-list.c:1925
 msgid "Yesterday %l:%M %p"
 msgstr "HÃm qua %l:%M %p"
 
-#: ../mail/message-list.c:1865
+#: ../mail/message-list.c:1937
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1873
+#: ../mail/message-list.c:1945
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1875
+#: ../mail/message-list.c:1947
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2642
+#: ../mail/message-list.c:2752
 msgid "Select all visible messages"
 msgstr "Chán mái thÆ hián rÃ"
 
-#: ../mail/message-list.c:2800 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2912 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "ThÆ"
 
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:4160
+#, fuzzy
+#| msgid "Follow-Up"
+msgid "Follow-up"
+msgstr "Theo dÃi tiáp"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4468 ../mail/message-list.c:4892
+#: ../mail/message-list.c:4675 ../mail/message-list.c:5098
 msgid "Generating message list"
 msgstr "Äang táo danh sÃch thÆ..."
 
-#: ../mail/message-list.c:4707
+#: ../mail/message-list.c:4912
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13397,7 +13274,7 @@ msgstr ""
 "KhÃng cà thÆ nÃo tÆÆng áng vái tiÃu chuán tÃm kiám cáa bán. Hoác xoà sách "
 "trÆáng tÃm kiám dÃng mác trÃnh ÄÆn  TÃm kiám > Dán Â, hoác sáa Äái chuái ÄÃ."
 
-#: ../mail/message-list.c:4709
+#: ../mail/message-list.c:4914
 msgid "There are no messages in this folder."
 msgstr "KhÃng cà thÆ trong thÆ mác nÃy."
 
@@ -13426,7 +13303,7 @@ msgid "Sent Messages"
 msgstr "ThÆ ÄÃ gái"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:570
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Size"
 msgstr "Cá"
 
@@ -13435,36 +13312,35 @@ msgid "Subject - Trimmed"
 msgstr "Chá Äá â Gán"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1562
 msgid "Body contains"
 msgstr "Nái dung cháa"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1498
+#: ../modules/mail/e-mail-shell-view-actions.c:1569
 msgid "Message contains"
 msgstr "ThÆ cháa"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1505
+#: ../modules/mail/e-mail-shell-view-actions.c:1576
 msgid "Recipients contain"
 msgstr "NgÆái nhán cháa"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
 msgid "Sender contains"
 msgstr "NgÆái gái cháa"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1590
 msgid "Subject contains"
 msgstr "Chá Äá cháa"
 
 #: ../mail/searchtypes.xml.h:6
-#| msgid "Subject or Sender contains"
 msgid "Subject or Addresses contains"
 msgstr "Chá Äá hay Äáa chá cháa"
 
-#: ../modules/addressbook/addressbook-config.c:209
+#: ../modules/addressbook/addressbook-config.c:207
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -13472,7 +13348,7 @@ msgstr ""
 "Chán tÃy chán nÃy nghÄa là Evolution sá chá kát nái tái mÃy chá LDAP cáa bán "
 "náu mÃy chá LDAP áy há trá SSL."
 
-#: ../modules/addressbook/addressbook-config.c:211
+#: ../modules/addressbook/addressbook-config.c:209
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -13480,7 +13356,7 @@ msgstr ""
 "Chán tÃy chán nÃy nghÄa là Evolution sá chá kát nái tái mÃy chá LDAP cáa bán "
 "náu mÃy chá LDAP áy há trá TLS."
 
-#: ../modules/addressbook/addressbook-config.c:213
+#: ../modules/addressbook/addressbook-config.c:211
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -13490,16 +13366,15 @@ msgstr ""
 "trá TLS. NhÆ thá thà kát nái cáa bán khÃng an toÃn, cà thá bá lá háng báo "
 "mát."
 
-#: ../modules/addressbook/addressbook-config.c:612
-#| msgid "Birthdays & Anniversaries"
+#: ../modules/addressbook/addressbook-config.c:641
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "DÃng _lách Sinh nhát và Ká niám"
 
-#: ../modules/addressbook/addressbook-config.c:648
+#: ../modules/addressbook/addressbook-config.c:683
 msgid "Copy _book content locally for offline operation"
 msgstr "Sao chÃp các bá nái dung sá Äá thao tÃc ngoái tuyán"
 
-#: ../modules/addressbook/addressbook-config.c:756
+#: ../modules/addressbook/addressbook-config.c:798
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -13509,7 +13384,7 @@ msgstr ""
 "danh sÃch cÃc cáng chuán ÄÃ ÄÆác cung cáp. HÃy hái quán trá há tháng cáa bán "
 "Äá biát dÃng cáng nÃo."
 
-#: ../modules/addressbook/addressbook-config.c:830
+#: ../modules/addressbook/addressbook-config.c:879
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13519,7 +13394,7 @@ msgstr ""
 "phÃp nÃy thÃnh  Äáa chá thÆ Â cÅng yÃu cáu truy cáp nác danh Äán mÃy chá "
 "LDAP. "
 
-#: ../modules/addressbook/addressbook-config.c:905
+#: ../modules/addressbook/addressbook-config.c:962
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -13530,29 +13405,29 @@ msgstr ""
 "kiám Âcon sá bao gám mái mác dÆái cÆ sá tÃm. Phám vi tÃm kiám Âmát sá chá "
 "tÃm nháng mác nám mát mác Äá dÆái trong cÆ sá tÃm thÃi."
 
-#: ../modules/addressbook/addressbook-config.c:1021
+#: ../modules/addressbook/addressbook-config.c:1086
 msgid "Server Information"
 msgstr "ThÃng tin mÃy chá"
 
-#: ../modules/addressbook/addressbook-config.c:1026
+#: ../modules/addressbook/addressbook-config.c:1091
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Chi tiát"
 
-#: ../modules/addressbook/addressbook-config.c:1027
-#: ../modules/mail/e-mail-shell-view.c:54
+#: ../modules/addressbook/addressbook-config.c:1092
+#: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "TÃm kiám"
 
-#: ../modules/addressbook/addressbook-config.c:1029
+#: ../modules/addressbook/addressbook-config.c:1094
 msgid "Downloading"
 msgstr "Tái vá"
 
-#: ../modules/addressbook/addressbook-config.c:1235
+#: ../modules/addressbook/addressbook-config.c:1309
 msgid "Address Book Properties"
 msgstr "Thuác tÃnh Sá Äáa chá"
 
-#: ../modules/addressbook/addressbook-config.c:1237
+#: ../modules/addressbook/addressbook-config.c:1311
 msgid "New Address Book"
 msgstr "Sá Äáa chá mái"
 
@@ -13561,7 +13436,6 @@ msgid "Autocomplete length"
 msgstr "Äá dÃi tá Äáng gà xong"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
-#| msgid "Contact Print Test"
 msgid "Contact layout style"
 msgstr "Kiáu bá các liÃn lác"
 
@@ -13570,7 +13444,6 @@ msgid "Contact preview pane position (horizontal)"
 msgstr ""
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
-#| msgid "Month view vertical pane position"
 msgid "Contact preview pane position (vertical)"
 msgstr "Vá trà (dác) khung xem trÆác liÃn lác"
 
@@ -13595,7 +13468,6 @@ msgid "Position of the contact preview pane when oriented vertically."
 msgstr ""
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
-#| msgid "Save in address book"
 msgid "Primary address book"
 msgstr "Sá Äáa chá chÃnh"
 
@@ -13604,16 +13476,22 @@ msgid "Show autocompleted name with an address"
 msgstr "Hián tÃn tá Äáng Äián nát cÃng vái Äáa chá"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+#, fuzzy
+#| msgid "Show Animations"
+msgid "Show maps"
+msgstr "Hián hoát cánh"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid "Show preview pane"
 msgstr "Hián à Xem thá"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid ""
 "The UID of the selected (or \"primary\") address book in the sidebar of the "
 "\"Contacts\" view."
 msgstr ""
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -13621,21 +13499,21 @@ msgid ""
 "contact list."
 msgstr ""
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr "Sá kà tá cán gà trÆác khi trÃnh Evolution sá cá tá Äáng hoÃn tát."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Äáa chá URI cho thÆ mác ÄÃ dÃng cuái cÃng trong háp thoái chán tÃn."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "URI for the folder last used in the select names dialog."
 msgstr "Äáa chá URI cho thÆ mác ÄÃ dÃng cuái cÃng trong háp thoái chán tÃn."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
@@ -13643,360 +13521,370 @@ msgstr ""
 "Cà nà Ãp buác hián thá trong mác nháp Äáa chá thÆ cÃng vái tÃn cáa liÃn lác "
 "tá Äáng Äián nát, hay khÃng."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+#, fuzzy
+#| msgid "Whether to show the preview pane."
+msgid "Whether to show maps in preview pane."
+msgstr "CÃ nÃn hián thá Ã cáa sá xem thá hay khÃng."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid "Whether to show the preview pane."
 msgstr "CÃ nÃn hián thá Ã cáa sá xem thá hay khÃng."
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:161
-#: ../modules/mail/em-mailer-prefs.c:1138
-#| msgid "Table model"
+#: ../modules/addressbook/autocompletion-config.c:194
+#: ../modules/mail/em-mailer-prefs.c:1049
 msgid "_Table column:"
 msgstr "_Cát báng:"
 
-#: ../modules/addressbook/autocompletion-config.c:164
+#: ../modules/addressbook/autocompletion-config.c:197
 msgid "Autocompletion"
 msgstr "Tá Äáng gà xong"
 
-#: ../modules/addressbook/autocompletion-config.c:167
+#: ../modules/addressbook/autocompletion-config.c:200
 msgid "Always _show address of the autocompleted contact"
 msgstr "LÃc nÃ_o cÅng hián Äáa chá cáa liÃn lác tá Äáng Äián nát"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:98
-#: ../modules/addressbook/e-book-shell-migrate.c:153
+#: ../modules/addressbook/e-book-shell-backend.c:102
+#: ../modules/addressbook/e-book-shell-migrate.c:154
 msgid "On LDAP Servers"
 msgstr "TrÃn mÃy chá LDAP"
 
-#: ../modules/addressbook/e-book-shell-backend.c:280
+#: ../modules/addressbook/e-book-shell-backend.c:302
 msgctxt "New"
 msgid "_Contact"
 msgstr "LiÃn lá_c"
 
-#: ../modules/addressbook/e-book-shell-backend.c:282
-#: ../modules/addressbook/e-book-shell-view-actions.c:773
+#: ../modules/addressbook/e-book-shell-backend.c:304
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new contact"
 msgstr "Táo liÃn lác mái"
 
-#: ../modules/addressbook/e-book-shell-backend.c:287
+#: ../modules/addressbook/e-book-shell-backend.c:309
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Danh sÃch _liÃn lác"
 
-#: ../modules/addressbook/e-book-shell-backend.c:289
-#: ../modules/addressbook/e-book-shell-view-actions.c:780
+#: ../modules/addressbook/e-book-shell-backend.c:311
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Create a new contact list"
 msgstr "Táo mát danh sÃch liÃn lác mái"
 
-#: ../modules/addressbook/e-book-shell-backend.c:297
+#: ../modules/addressbook/e-book-shell-backend.c:319
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Sá Äáa chá"
 
-#: ../modules/addressbook/e-book-shell-backend.c:299
-#: ../modules/addressbook/e-book-shell-view-actions.c:703
+#: ../modules/addressbook/e-book-shell-backend.c:321
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Create a new address book"
 msgstr "Táo mát sá Äáa chá mái"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:316
-#: ../modules/addressbook/e-book-shell-view.c:401
-#: ../modules/calendar/e-cal-shell-backend.c:109
-#: ../modules/calendar/e-cal-shell-migrate.c:59
+#: ../modules/addressbook/e-book-shell-backend.c:338
+#: ../modules/addressbook/e-book-shell-view.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:115
+#: ../modules/calendar/e-cal-shell-migrate.c:63
+#: ../modules/online-accounts/e-online-accounts-google.c:366
 msgid "Contacts"
 msgstr "LiÃn lác"
 
-#: ../modules/addressbook/e-book-shell-backend.c:325
+#: ../modules/addressbook/e-book-shell-backend.c:348
 msgid "Certificates"
 msgstr "Cháng nhán"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:263
-#: ../modules/addressbook/e-book-shell-view-actions.c:549
-#| msgid "Save as vCard..."
+#: ../modules/addressbook/e-book-shell-view-actions.c:387
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "Save as vCard"
 msgstr "LÆu dáng vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
 msgid "Co_py All Contacts To..."
 msgstr "ChÃ_p cÃc liÃn lác sang..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:682
-#| msgid "Copy the contacts of the selected folder into another folder"
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
 msgid "Copy the contacts of the selected address book to another"
 msgstr "ChÃp cÃc liÃn lác cáa sá Äáa chá ÄÆác chán qua chá khÃc"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
-#| msgid "Del_ete Address Book"
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
 msgid "D_elete Address Book"
 msgstr "_Xoà sá Äáa chá"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:689
-#| msgid "Delete the selected folder"
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "Delete the selected address book"
 msgstr "Xoà sá Äáa chá Äà chán"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
 msgid "Mo_ve All Contacts To..."
 msgstr "Chu_yán cÃc liÃn lác sang..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:696
-#| msgid "Move the contacts of the selected folder into another folder"
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
 msgid "Move the contacts of the selected address book to another"
 msgstr "Chuyán cÃc liÃn lác cáa sá Äáa chá ÄÆác chán qua chá khÃc"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:833
 msgid "_New Address Book"
 msgstr "Sá Äáa chá _mái"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
 msgid "Address _Book Properties"
 msgstr "Thuác tÃnh _Sá Äáa chá"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:710
-#| msgid "Change the properties of the selected folder"
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Show properties of the selected address book"
 msgstr "Thay Äái thuác tÃnh cáa sá Äáa chá ÄÃ chán"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
-#: ../modules/calendar/e-task-shell-view-actions.c:750
-#: ../modules/mail/e-mail-shell-view-actions.c:1138
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+#, fuzzy
+#| msgid "Address Book"
+msgid "Address Book _Map"
+msgstr "Sá Äáa chá"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#, fuzzy
+#| msgid "Copy the contacts of the selected address book to another"
+msgid "Show map with all contacts from selected address book"
+msgstr "ChÃp cÃc liÃn lác cáa sá Äáa chá ÄÆác chán qua chá khÃc"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:854
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-memo-shell-view-actions.c:640
+#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "_Rename..."
 msgstr "Äá_i tÃn..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:717
-#| msgid "Rename the selected folder"
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
 msgid "Rename the selected address book"
 msgstr "Äái tÃn sá Äáa chá ÄÃ chán"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
-#| msgid "S_ave Address Book As VCard"
-msgid "S_ave Address Book as vCard"
-msgstr "LÆu sá Äá_a chá dáng vCard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:724
-#| msgid "Save the contacts of the selected folder as VCard"
-msgid "Save the contacts of the selected address book as a vCard"
-msgstr "LÆu cÃc liÃn lác cáa sá Äáa chá ÄÃ chán dáng vCard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:731
-#| msgid "Stop Loading"
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 msgid "Stop loading"
 msgstr "NgÆng náp"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
-#| msgid "_Copy Contact to..."
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
 msgid "_Copy Contact To..."
 msgstr "_ChÃp liÃn lác sang..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:738
-#| msgid "Copy selected contacts to another folder"
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 msgid "Copy selected contacts to another address book"
 msgstr "ChÃp cÃc liÃn lác ÄÃ chán sang sá Äáa chá khÃc"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:743
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
 msgid "_Delete Contact"
 msgstr "_Xoà LiÃn lác"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:750
-#| msgid "_Forward Contact..."
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
 msgid "_Find in Contact..."
 msgstr "_TÃm liÃn lác..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:752
-#| msgid "Search for text in the body of the displayed message"
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
 msgid "Search for text in the displayed contact"
 msgstr "TÃm nái dung trong liÃn lác Äang xem"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:757
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
 msgid "_Forward Contact..."
 msgstr "Ch_uyán tiáp liÃn lác..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:759
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Send selected contacts to another person"
 msgstr "Gái cÃc liÃn lác ÄÃ chán cho mát ngÆái khÃc"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:764
-#| msgid "_Move Contact to..."
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 msgid "_Move Contact To..."
 msgstr "Chu_yán liÃn lác sang..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:766
-#| msgid "Move selected contacts to another folder"
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
 msgid "Move selected contacts to another address book"
 msgstr "Chuyán cÃc liÃn lác ÄÃ chán sang sá Äáa chá khÃc"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 msgid "_New Contact..."
 msgstr "LiÃ_n lác mái..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:778
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
 msgid "New Contact _List..."
 msgstr "Danh sÃch _liÃn lác mái..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:785
-#| msgctxt "New"
-#| msgid "_Contact"
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
 msgid "_Open Contact"
 msgstr "Má liÃn lá_c"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:787
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
 msgid "View the current contact"
 msgstr "Xem liÃn lác hián thái"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:924
 msgid "_Send Message to Contact..."
 msgstr "_Gái thÆ tái liÃn lác..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:794
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
 msgid "Send a message to the selected contacts"
 msgstr "Gái thÆ cho cÃc liÃn lác ÄÃ chán"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1500
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Actions"
 msgstr "_HÃnh Äáng"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:808
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
-#: ../modules/calendar/e-task-shell-view-actions.c:815
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
+#: ../modules/calendar/e-memo-shell-view-actions.c:677
+#: ../modules/calendar/e-task-shell-view-actions.c:829
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "_Preview"
 msgstr "_Xem thá"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:817
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
-#: ../modules/calendar/e-memo-shell-view-actions.c:676
-#: ../modules/calendar/e-task-shell-view-actions.c:828
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-memo-shell-view-actions.c:690
+#: ../modules/calendar/e-task-shell-view-actions.c:842
 msgid "_Delete"
 msgstr "_XoÃ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "_Properties"
 msgstr "_Thuác tÃnh"
 
-#. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:830
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
-msgid "_Save as vCard..."
-msgstr "LÆu dáng _vCard..."
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#, fuzzy
+#| msgid "Address Book"
+msgid "Address Book Map"
+msgstr "Sá Äáa chá"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:858
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Contact _Preview"
 msgstr "_Xem thá liÃn lác"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:991
 msgid "Show contact preview window"
 msgstr "Hián à xem thá liÃn lác"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
-#: ../modules/calendar/e-memo-shell-view-actions.c:733
-#: ../modules/calendar/e-task-shell-view-actions.c:897
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#, fuzzy
+#| msgid "Show as list"
+msgid "Show _Maps"
+msgstr "Xem dáng danh sÃch"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:999
+#, fuzzy
+#| msgid "Show contact preview window"
+msgid "Show maps in contact preview window"
+msgstr "Hián à xem thá liÃn lác"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1018
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:1472
 msgid "_Classic View"
 msgstr "Xem _chuán"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
-#| msgid "Show message preview below the message list"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1020
 msgid "Show contact preview below the contact list"
 msgstr "Hián khung xem liÃn lác bÃn dÆái danh sÃch liÃn lác"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:886
-#: ../modules/calendar/e-memo-shell-view-actions.c:740
-#: ../modules/calendar/e-task-shell-view-actions.c:904
-#: ../modules/mail/e-mail-shell-view-actions.c:1408
+#: ../modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../modules/calendar/e-memo-shell-view-actions.c:754
+#: ../modules/calendar/e-task-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:1479
 msgid "_Vertical View"
 msgstr "Xem _dác"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
-#| msgid "Show contact preview window"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1027
 msgid "Show contact preview alongside the contact list"
 msgstr "Hián khung xem liÃn lác bÃn cánh danh sÃch liÃn lác"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:896
-#: ../modules/calendar/e-cal-shell-view-actions.c:1660
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
-#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:935
 msgid "Any Category"
 msgstr "Loái nÃo"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:903
-#: ../modules/calendar/e-cal-shell-view-actions.c:1674
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
-#: ../modules/calendar/e-task-shell-view-actions.c:956
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:970
 msgid "Unmatched"
 msgstr "KhÃng kháp"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1684
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:966
-#: ../modules/mail/e-mail-shell-view-actions.c:1484
-#: ../shell/e-shell-content.c:613
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../shell/e-shell-content.c:666
 msgid "Advanced Search"
 msgstr "TÃm kiám cáp cao"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:946
-#| msgid "Print selected contacts"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "Print all shown contacts"
 msgstr "In mái liÃn lác Äang xem"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
-#| msgid "Previews the contacts to be printed"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1092
 msgid "Preview the contacts to be printed"
 msgstr "Xem thá trÆác khi in liÃn lác"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:1099
 msgid "Print selected contacts"
 msgstr "In cÃc liÃn lác ÄÃ chán"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
-#| msgid "Save selected contacts as a VCard"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1114
+msgid "S_ave Address Book as vCard"
+msgstr "LÆu sá Äá_a chá dáng vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "LÆu cÃc liÃn lác cáa sá Äáa chá ÄÃ chán dáng vCard"
+
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:1122
+#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+msgid "_Save as vCard..."
+msgstr "LÆu dáng _vCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1124
 msgid "Save selected contacts as a vCard"
 msgstr "LÆu cÃc liÃn lác ÄÃ chán theo dáng vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:345
+#: ../modules/addressbook/e-book-shell-view.c:349
 msgid "_Forward Contacts"
 msgstr "_Chuyán tiáp cÃc liÃn lác"
 
-#: ../modules/addressbook/e-book-shell-view.c:347
+#: ../modules/addressbook/e-book-shell-view.c:351
 msgid "_Forward Contact"
 msgstr "_Chuyán tiáp liÃn lác"
 
-#: ../modules/addressbook/e-book-shell-view.c:378
-#| msgid "Send _Message to Contacts"
+#: ../modules/addressbook/e-book-shell-view.c:382
 msgid "_Send Message to Contacts"
 msgstr "_Gái thÆ cho cÃc liÃn lác"
 
-#: ../modules/addressbook/e-book-shell-view.c:380
-#| msgid "Send _Message to List"
+#: ../modules/addressbook/e-book-shell-view.c:384
 msgid "_Send Message to List"
 msgstr "_Gái thÆ cho danh sÃch"
 
-#: ../modules/addressbook/e-book-shell-view.c:382
-#| msgid "Send _Message to Contact"
+#: ../modules/addressbook/e-book-shell-view.c:386
 msgid "_Send Message to Contact"
 msgstr "_Gái thÆ cho liÃn lác"
 
-#: ../modules/addressbook/eab-composer-util.c:143
+#: ../modules/addressbook/eab-composer-util.c:149
 msgid "Multiple vCards"
 msgstr "Nhiáu vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:151
+#: ../modules/addressbook/eab-composer-util.c:157
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard cho %s"
 
-#: ../modules/addressbook/eab-composer-util.c:163
-#: ../modules/addressbook/eab-composer-util.c:190
+#: ../modules/addressbook/eab-composer-util.c:169
+#: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information"
 msgstr "ThÃng tin liÃn lác"
 
-#: ../modules/addressbook/eab-composer-util.c:192
+#: ../modules/addressbook/eab-composer-util.c:198
 #, c-format
 msgid "Contact information for %s"
 msgstr "ThÃng tin liÃn lác cho %s"
@@ -14083,10 +13971,6 @@ msgstr "_TÃm mái cÆ sá tÃm cà thá"
 msgid "_Login method:"
 msgstr "CÃch ÄÄn_g nháp:"
 
-#: ../modules/addressbook/ldap-config.ui.h:27
-msgid "_Port:"
-msgstr "_Cáng:"
-
 #: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "_Phám vi tÃm:"
@@ -14095,19 +13979,52 @@ msgstr "_Phám vi tÃm:"
 msgid "_Timeout:"
 msgstr "_Thái hán:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr "DÃng kát nái _báo mát:"
-
 #: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "thá"
 
+#: ../modules/bogofilter/evolution-bogofilter.c:146
+#, fuzzy, c-format
+#| msgid "Failed to apply outgoing filters: %s"
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "Viác Ãp dáng bá lác gái Äi bá lái: %s"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:164
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr ""
+
+#: ../modules/bogofilter/evolution-bogofilter.c:213
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr ""
+
+#: ../modules/bogofilter/evolution-bogofilter.c:312
+msgid "Bogofilter Options"
+msgstr "TÃy chán Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:321
+msgid "Convert message text to _Unicode"
+msgstr "Chuyán Äái vÄn bán thÆ sang _Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:477
+#, fuzzy
+#| msgid "Bogofilter Options"
+msgid "Bogofilter"
+msgstr "TÃy chán Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "Chuyán Äái thÆ sang Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"Chuyán Äái vÄn bán cáa thÆ sang UTF-8 Unicode, Äá háp nhát cÃc hiáu bÃi rÃc "
+"Äán tá cÃc bá kà tá khÃc nhau."
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 #, no-c-format
-#| msgid ""
-#| "<i>%u and %d will be replaced by user and domain from the email address.</"
-#| "i>"
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr ""
 "%u và %d sá ÄÆác thay thá báng ngÆái dÃng và tÃn mián táng tá Äáa chá thÆ."
@@ -14117,69 +14034,65 @@ msgid "(Shown in a Day View)"
 msgstr "(Hián trong mát à Xem NgÃy)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:4
-#| msgid "minutes"
 msgid "05 minutes"
 msgstr "05 phÃt"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:5
-#| msgid "minutes"
 msgid "10 minutes"
 msgstr "10 phÃt"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:6
-#| msgid "minutes"
 msgid "15 minutes"
 msgstr "15 phÃt"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:7
-#| msgid "minutes"
 msgid "30 minutes"
 msgstr "30 phÃt"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:8
-#| msgid "minutes"
 msgid "60 minutes"
 msgstr "60 phÃt"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
-#| msgid "Alarms"
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Alerts"
 msgstr "BÃo Äáng"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Day _ends:"
 msgstr "NgÃy _kát thÃc:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
-#| msgid "Day"
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
 msgid "Days"
 msgstr "NgÃy"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
-#| msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
 msgid "Default Free/Busy Server"
 msgstr "MÃy chá Ránh/Bán Mác Äánh"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Display"
 msgstr "Hián thá"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
-#| msgid "Show display alarms in notification tray"
-msgid "Display alarms in _notification area only"
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#, fuzzy
+#| msgid "Display alarms in _notification area only"
+msgid "Display reminders in _notification area only"
 msgstr "Hián thá bÃo Äáng trong _khay thÃng bÃo"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
-#| msgid "hours"
-#| msgid_plural "hours"
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Hours"
 msgstr "Giá"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
-#| msgid "minutes"
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
 msgid "Minutes"
 msgstr "PhÃt"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#, fuzzy
+#| msgid "Publishing Location"
+msgid "Publishing Information"
+msgstr "Äáa Äiám Xuát bán"
+
 #. Sunday
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "S_un"
@@ -14194,7 +14107,9 @@ msgid "Se_cond zone:"
 msgstr "MÃi thá _hai:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Select the calendars for alarm notification"
+#, fuzzy
+#| msgid "Select the calendars for alarm notification"
+msgid "Select the calendars for reminder notification"
 msgstr "Chán nháng lách cán dÃng tÃnh nÄng bÃo Äáng"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
@@ -14212,7 +14127,6 @@ msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr "_Hián sá kián láp lái báng chá nghiÃng á ÄÃy trÃi lách"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:35
-#| msgid "Show week _numbers in date navigator"
 msgid "Show week _numbers"
 msgstr "Hiá_n sá thá tá tuán"
 
@@ -14225,251 +14139,249 @@ msgstr "TÃc vá hát hán vÃo hÃm n_ay:"
 msgid "T_hu"
 msgstr "T_5"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Template:"
 msgstr "Máu:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
-#: ../widgets/misc/e-dateedit.c:606
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Giá"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Time format:"
 msgstr "Äánh dáng giá:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
-#| msgid "Show the second time zone"
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "DÃng _mÃi giá há tháng"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "Tuán _bát Äáu:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1643
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Work Week"
 msgstr "Tuán lÃm viác"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Work days:"
 msgstr "NgÃy lÃm viác:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 giá (AM/PM: sÃng/chiáu)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "_24 hour"
 msgstr "_24 giá"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "Hái xÃc thác khi xÃ_a bá mác"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "NÃn cÃc ngÃy _cuái tuán trong à xem thÃng"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Day begins:"
 msgstr "_NgÃy bát Äáu:"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Fri"
 msgstr "T_6"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "án tÃc vá _hoÃn thÃnh sau (khi)"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "_Mon"
 msgstr "T_2"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "TÃc vá _quà hán:"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "_Sat"
 msgstr "T_7"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "_Hián thái Äiám kát thÃc cuác hán trong à xem tuán và thÃng Äáu"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "_Time divisions:"
 msgstr "_Chia thái gian:"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "_Tue"
 msgstr "T_3"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "_Wed"
 msgstr "T_4"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "trÆác mái ngÃy ká niám/ngÃy sinh"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every appointment"
 msgstr "trÆác mái cuác hán"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "ChÆÆng trÃnh bÃo Äáng"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "Hái xÃc nhán trÆác khi xoà mác"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "MÃu nán cáa mái tÃc vá hát hán hÃm nay, cà dáng  #rrggbb Â"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "MÃu nán cáa mái tÃc vá quà hán, cà dáng  #rrggbb Â"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
-#| msgid "Birthdays & Anniversaries"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Birthday and anniversary reminder"
 msgstr "Nhác nhá sinh nhát và ká niám"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
-#| msgid "Birthdays & Anniversaries"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
 msgid "Birthday and anniversary reminder units"
 msgstr "ÄÆn vá nhác nhá sinh nhát và ká niám"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-#| msgid "Birthdays & Anniversaries"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "Birthday and anniversary reminder value"
 msgstr "Già trá nhác nhá sinh nhát và ká niám"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-msgid "Calendars to run alarms for"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#, fuzzy
+#| msgid "Calendars to run alarms for"
+msgid "Calendars to run reminders for"
 msgstr "Lách cán cháy bÃo Äáng cho chÃng"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "MÃu cán vá DÃng Marcus Bains trong thanh Thái gian (bá ráng Äá chán mác Äánh)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "MÃu cán vá DÃng Marcus Bains trong à xem NgÃy"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
 msgid "Compress weekends in month view"
 msgstr "NÃn cÃc ngÃy cuái tuán trong à xem thÃng"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid "Confirm expunge"
 msgstr "XÃc nhán khi xoà hán"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "NgÃy cán ngá à giá bát Äáu và kát thÃc Äáu lÃm viác."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "Bá nhác nhá cuác hán mác Äánh"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "ÄÆn vá nhác nhá mác Äánh"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Già trá nhác nhá mác Äánh"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Directory for saving alarm audio files"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#, fuzzy
+#| msgid "Directory for saving alarm audio files"
+msgid "Directory for saving reminder audio files"
 msgstr "ThÆ mác vÃo ÄÃ cán lÆu cÃc táp tin Ãm thanh bÃo Äáng"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "Äáa chá máng cáa mÃy chá Ránh/Bán"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "Äáa chá máng máu Ránh/Bán"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "án mái tÃc vá hoÃn tát"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "án ÄÆn vá tÃc vá"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "án già trá tÃc vá"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "VÃ trá Ã cáa sá ngang"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Giá kát thÃc ngÃy lÃm viác, cà dáng 24 giá (0-23)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Giá bát Äáu ngÃy lÃm viác, cà dáng 24 giá (0-23)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Háp thái gian ÄÆác hián thá trong à xem NgÃy/Tuán lÃm viác, theo phÃt"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Last alarm time"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#, fuzzy
+#| msgid "Last alarm time"
+msgid "Last reminder time"
 msgstr "Giá bÃo Äáng cuái cÃng"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "List of recently used second time zones in a Day View."
 msgstr "Danh sÃch cÃc mÃi giá váa dÃng trong mát à Xem NgÃy."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "List of server URLs for free/busy publishing."
 msgstr "Danh sÃch cÃc Äáa chá máng mÃy chá Äá xuát bán thÃng tin Ránh/Bán."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line"
 msgstr "DÃng Marcus Bains"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Day View"
 msgstr "MÃu DÃng Marcus Bains â Xem ngÃy"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "MÃu DÃng Marcus Bains â Thanh thái gian"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -14477,59 +14389,57 @@ msgstr ""
 "Sá tái Äa cÃc mÃi giá váa dÃng cán giá lái trong mát danh sÃch  "
 "day_second_zones Â."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Maximum number of recently used timezones to remember."
 msgstr "Sá tái Äa cÃc mÃi giá váa dÃng cán nhá."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
-#| msgid "_Reply style:"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
 msgid "Memo layout style"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Memo preview pane position (horizontal)"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
-#| msgid "Month view vertical pane position"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 msgid "Memo preview pane position (vertical)"
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "PhÃt kát thÃc ngÃy lÃm viác, 0-59."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "PhÃt bát Äáu ngÃy lÃm viác, 0-59."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "Vá trà cáa à cáa sá ngang trong à xem thÃng"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid "Month view vertical pane position"
 msgstr "Vá trà cáa à cáa sá dác trong à xem thÃng"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 #, fuzzy
 #| msgid "Number of units for determining a default reminder."
 msgid "Number of units for determining a birthday or anniversary reminder."
 msgstr "Táng sá ÄÆn vá Äá quyát Äánh lÃc nÃo nhác nhá mác Äánh."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid "Number of units for determining a default reminder."
 msgstr "Táng sá ÄÆn vá Äá quyát Äánh lÃc nÃo nhác nhá mác Äánh."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
 msgid "Number of units for determining when to hide tasks."
 msgstr "Táng sá ÄÆn vá Äá quyát Äánh lÃc nÃo nÃn án cáng viác."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Overdue tasks color"
 msgstr "MÃu cáa tÃc vá quà hán"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -14537,7 +14447,7 @@ msgstr ""
 "Và trá cáa à cáa sá ngang, giáa lách duyát ngÃy và danh sÃch tÃc vá khi "
 "khÃng phái trong à xem thÃng, theo Äiám ánh."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14545,25 +14455,25 @@ msgstr ""
 "Và trá cáa à cáa sá ngang, giáa à xem và lách duyát ngÃy và danh sÃch tÃc vá "
 "khi trong à xem thÃng, theo Äiám ánh."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "Vá trà cáa à cáa sá dác, giáa cÃc danh sÃch lách và lách duyát ngÃy."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14571,7 +14481,7 @@ msgstr ""
 "Và trá cáa à cáa sá dác, giáa à xem và lách duyát ngÃy và danh sÃch cÃng "
 "viác khi trong à xem thÃng, theo Äiám ánh."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -14579,36 +14489,42 @@ msgstr ""
 "Và trá cáa à cáa sá ngang, giáa lách duyát ngÃy và danh sÃch tÃc vá khi "
 "khÃng phái trong à xem thÃng, theo Äiám ánh."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
-#| msgid "Print this calendar"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
 msgid "Primary calendar"
 msgstr "Lách chÃnh"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
-#| msgid "New memo list"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Primary memo list"
 msgstr "Danh sÃch ghi nhá chÃnh"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
-#| msgid "New task list"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary task list"
 msgstr "Danh sÃch tÃc vá chÃnh"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Programs that are allowed to be run by alarms."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#, fuzzy
+#| msgid "Programs that are allowed to be run by alarms."
+msgid "Programs that are allowed to be run by reminders."
 msgstr "ChÆÆng trÃnh mà bÃo Äáng cà thá cháy."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Recently used second time zones in a Day View"
 msgstr "MÃi giá thá hai váa dÃng trong mát à Xem NgÃy"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
-#| msgid "Recurrence date is invalid"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
 msgid "Recurrent Events in Italic"
 msgstr "Sá kián láp lái chá nghiÃng"
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#, fuzzy
+#| msgid "Reminder Notes"
+msgid "Reminder programs"
+msgstr "Chà thÃch Nhác nhá"
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
+#, fuzzy
+#| msgid "Save directory for alarm audio"
+msgid "Save directory for reminder audio"
 msgstr "ThÆ mác lÆu Ãm thanh bÃo Äáng"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
@@ -14637,7 +14553,9 @@ msgid "Show days with recurrent events in italic font in bottom left calendar."
 msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display alarms in notification tray"
+#, fuzzy
+#| msgid "Show display alarms in notification tray"
+msgid "Show display reminders in notification tray"
 msgstr "Hián thá bÃo Äáng trong khay thÃng bÃo"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
@@ -14645,12 +14563,10 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Hián trÆáng Tráng thÃi trong bá sáa cuác háp/tÃc vá/sá kián"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
-#| msgid "Show the \"Preview\" pane"
 msgid "Show the memo preview pane"
 msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
-#| msgid "Show the \"Preview\" pane"
 msgid "Show the task preview pane"
 msgstr ""
 
@@ -14765,7 +14681,9 @@ msgid "Time divisions"
 msgstr "Chia thái gian"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last alarm ran, in time_t."
+#, fuzzy
+#| msgid "Time the last alarm ran, in time_t."
+msgid "Time the last reminder ran, in time_t."
 msgstr "Giá ÄÃ bÃo Äáng cuái cÃng, theo time_t"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
@@ -14822,7 +14740,9 @@ msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "HÃm bát Äáu tuán, tá Chá Nhát (0) Äán Thá Báy (6)."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display alarms."
+#, fuzzy
+#| msgid "Whether or not to use the notification tray for display alarms."
+msgid "Whether or not to use the notification tray for display reminders."
 msgstr "CÃ nÃn dÃng khay thÃng bÃo Äá hián thá bÃo Äáng hay khÃng."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
@@ -14934,123 +14854,127 @@ msgstr "Giá bát Äáu ngÃy lÃm viác"
 msgid "Workday start minute"
 msgstr "PhÃt bát Äáu ngÃy lÃm viác"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../modules/calendar/e-cal-attachment-handler.c:312
 #: ../smime/gui/smime-ui.ui.h:22
-#| msgid "Import"
 msgid "I_mport"
 msgstr "_Nháp"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:343
-#| msgid "Select Calendar"
+#: ../modules/calendar/e-cal-attachment-handler.c:393
 msgid "Select a Calendar"
 msgstr "Chán Lách"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:370
-#| msgid "Select Task List"
+#: ../modules/calendar/e-cal-attachment-handler.c:420
 msgid "Select a Task List"
 msgstr "Chán Danh sÃch tÃc vá"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:380
-#| msgid "Import to Calendar"
+#: ../modules/calendar/e-cal-attachment-handler.c:430
 msgid "I_mport to Calendar"
 msgstr "_Nháp vÃo Lách"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:387
-#| msgid "_Import to Tasks"
+#: ../modules/calendar/e-cal-attachment-handler.c:437
 msgid "I_mport to Tasks"
 msgstr "_Nháp vÃo TÃc vá"
 
+#: ../modules/calendar/e-calendar-preferences.c:461
+#, fuzzy
+#| msgid "Selected Calendars for Alarms"
+msgid "Selected Calendars for Reminders"
+msgstr "CÃc Lách ÄÃ chán cho BÃo Äáng"
+
+#: ../modules/calendar/e-calendar-preferences.c:863
+msgid "Ti_me and date:"
+msgstr "N_gÃy giá:"
+
+#: ../modules/calendar/e-calendar-preferences.c:864
+msgid "_Date only:"
+msgstr "Chá _ngÃy:"
+
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:111
-#: ../modules/calendar/e-cal-shell-migrate.c:192
-#: ../modules/calendar/e-memo-shell-backend.c:98
-#: ../modules/calendar/e-memo-shell-migrate.c:149
-#: ../modules/calendar/e-task-shell-backend.c:98
-#: ../modules/calendar/e-task-shell-migrate.c:158
+#: ../modules/calendar/e-cal-shell-backend.c:117
+#: ../modules/calendar/e-cal-shell-migrate.c:198
+#: ../modules/calendar/e-memo-shell-backend.c:104
+#: ../modules/calendar/e-memo-shell-migrate.c:152
+#: ../modules/calendar/e-task-shell-backend.c:104
+#: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr "TrÃn Web"
 
-#: ../modules/calendar/e-cal-shell-backend.c:113
-#: ../plugins/calendar-weather/calendar-weather.c:120
+#: ../modules/calendar/e-cal-shell-backend.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:127
 msgid "Weather"
 msgstr "Thái tiát"
 
-#: ../modules/calendar/e-cal-shell-backend.c:200
-#: ../modules/calendar/e-cal-shell-migrate.c:62
+#: ../modules/calendar/e-cal-shell-backend.c:206
+#: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr "Sinh nhát và Ká niám"
 
-#: ../modules/calendar/e-cal-shell-backend.c:425
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgctxt "New"
 msgid "_Appointment"
 msgstr "Cuác _hán"
 
-#: ../modules/calendar/e-cal-shell-backend.c:427
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Create a new appointment"
 msgstr "Táo cuác hán mái"
 
-#: ../modules/calendar/e-cal-shell-backend.c:432
+#: ../modules/calendar/e-cal-shell-backend.c:446
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Cuác hán ngu_yÃn ngÃy"
 
-#: ../modules/calendar/e-cal-shell-backend.c:434
+#: ../modules/calendar/e-cal-shell-backend.c:448
 msgid "Create a new all-day appointment"
 msgstr "Táo cuác hán nguyÃn ngÃy mái"
 
-#: ../modules/calendar/e-cal-shell-backend.c:439
+#: ../modules/calendar/e-cal-shell-backend.c:453
 msgctxt "New"
 msgid "M_eeting"
 msgstr "Cuác há_p"
 
-#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgid "Create a new meeting request"
 msgstr "Táo yÃu cáu cuác háp mái"
 
-#: ../modules/calendar/e-cal-shell-backend.c:449
+#: ../modules/calendar/e-cal-shell-backend.c:463
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Lác_h"
 
-#: ../modules/calendar/e-cal-shell-backend.c:451
-#: ../modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Create a new calendar"
 msgstr "Táo lách mái"
 
-#: ../modules/calendar/e-cal-shell-backend.c:754
-#: ../plugins/itip-formatter/itip-formatter.c:2809
+#: ../modules/calendar/e-cal-shell-backend.c:788
 msgid "Calendar and Tasks"
 msgstr "TÃc vá và Lách"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:217
-#| msgid "Loading Calendar"
+#: ../modules/calendar/e-cal-shell-sidebar.c:184
 msgid "Loading calendars"
 msgstr "Äang náp lách"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:641
-#| msgid "_New Calendar"
+#: ../modules/calendar/e-cal-shell-sidebar.c:755
 msgid "_New Calendar..."
 msgstr "Lách _mái<..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:658
-#| msgid "Calendar Source Selector"
+#: ../modules/calendar/e-cal-shell-sidebar.c:772
 msgid "Calendar Selector"
 msgstr "Bá chán lách"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1001
+#: ../modules/calendar/e-cal-shell-sidebar.c:1123
 #, c-format
-#| msgid "Opening calendar"
 msgid "Opening calendar at %s"
 msgstr "Äang má lách tái %s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
 msgid "Print"
 msgstr "In"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:306
+#: ../modules/calendar/e-cal-shell-view-actions.c:320
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -15061,335 +14985,309 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:337
 msgid "Purge events older than"
 msgstr "Táy mái sá kián trÆác"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:534
-#| msgid "Copying items"
+#: ../modules/calendar/e-cal-shell-view-actions.c:564
 msgid "Copying Items"
 msgstr "Äang chÃp"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:804
-#| msgid "Moving items"
+#: ../modules/calendar/e-cal-shell-view-actions.c:848
 msgid "Moving Items"
 msgstr "Äang di chuyán"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1131
-#| msgid "Sent"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1175
 msgid "event"
 msgstr "sá kián"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1133
-#: ../modules/calendar/e-cal-shell-view-memopad.c:216
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:510
-#: ../modules/calendar/e-task-shell-view-actions.c:627
-#| msgid "_Forward as iCalendar"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1177
+#: ../modules/calendar/e-cal-shell-view-memopad.c:219
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:286
+#: ../modules/calendar/e-memo-shell-view-actions.c:524
+#: ../modules/calendar/e-task-shell-view-actions.c:641
 msgid "Save as iCalendar"
 msgstr "_LÆu dáng iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
 msgid "_Copy..."
 msgstr "_ChÃp..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
-#| msgid "Select Calendar"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "D_elete Calendar"
 msgstr "_Xoà Lách"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1297
-#| msgid "Delete the selected folder"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
 msgid "Delete the selected calendar"
 msgstr "Xoà lách Äà chán"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1304
-#| msgid "Go back"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
 msgid "Go Back"
 msgstr "Quay lái"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1311
-#| msgid "Go forward"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
 msgid "Go Forward"
 msgstr "Äi tiáp"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1318
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Select today"
 msgstr "Chán hÃm nay"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1323
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Select _Date"
 msgstr "Chán _ngÃy"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Select a specific date"
 msgstr "Chán ngÃy xÃc Äánh"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "_New Calendar"
 msgstr "Lách _mái"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
-#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "Purg_e"
 msgstr "_Táy"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1346
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Purge old appointments and meetings"
 msgstr "Táy cÃc cuác hán và cuác háp cÅ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
-#: ../modules/calendar/e-task-shell-view-actions.c:743
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-task-shell-view-actions.c:757
 msgid "Re_fresh"
 msgstr "Cá_p nhát"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1353
-#| msgid "Rename the selected folder"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Refresh the selected calendar"
 msgstr "Cáp nhát lách ÄÆác chán"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
-#| msgid "Rename the selected folder"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Rename the selected calendar"
 msgstr "Äái tÃn lách ÄÆác chán"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
-#| msgid "Show _only this Calendar"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 msgid "Show _Only This Calendar"
 msgstr "Chá hián lách _nÃy"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Cop_y to Calendar..."
 msgstr "_ChÃp vÃo Lách..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "_Delegate Meeting..."
 msgstr "á_y nhiám cuác háp..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
-#| msgid "Delete the appointment"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "_Delete Appointment"
 msgstr "_Xoà cuác hán"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1388
-#| msgid "Delete the appointment"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "Delete selected appointments"
 msgstr "Xoà cuác hán ÄÆác chán"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
-#| msgid "Delete this _Occurrence"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
 msgid "Delete This _Occurrence"
 msgstr "_Xoà lán nÃy"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Delete this occurrence"
 msgstr "Xoà lán nÃy"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
-#| msgid "Delete _All Occurrences"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "Delete All Occ_urrences"
 msgstr "XÃ_a mái lán"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "Delete all occurrences"
 msgstr "Xoà mái lán"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
-#| msgid "New All Day _Event"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
 msgid "New All Day _Event..."
 msgstr "Sá _kián trán ngÃy mái..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
-#| msgid "Create a new all-day appointment"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Create a new all day event"
 msgstr "Táo cuác hán trán ngÃy mái"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1414
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
+#: ../modules/calendar/e-task-shell-view-actions.c:722
 msgid "_Forward as iCalendar..."
 msgstr "Chuyán dáng _iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
-#| msgid "New _Meeting"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
 msgid "New _Meeting..."
 msgstr "Cuác _háp mái..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
-#| msgid "Create a new meeting request"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "Create a new meeting"
 msgstr "Táo cuác háp mái"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Mo_ve to Calendar..."
 msgstr "Chuyán _vÃo Lách..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "New _Appointment..."
 msgstr "Cuác há_n mái..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
 msgid "Make this Occurrence _Movable"
 msgstr "Cho phÃp di chuyán _lán nÃy"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
 msgid "_Open Appointment"
 msgstr "_Má Cuác hán"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "View the current appointment"
 msgstr "Xem cuác hán hián thái"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
 msgid "_Reply"
 msgstr "T_rá lái"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-#| msgid "Save as vCard..."
-msgid "Save as iCalendar..."
-msgstr "LÆu dáng iCalendar..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
 msgid "_Schedule Meeting..."
 msgstr "Láp lách c_uác háp..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
-#| msgid "Purge old appointments and meetings"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 msgid "Converts an appointment to a meeting"
 msgstr "Chuyán cÃc cuác hán thÃnh háp"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
-#| msgid "New _Appointment..."
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
 msgid "Conv_ert to Appointment..."
 msgstr "Chuyán sang cuác há_n..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
-#| msgid "%s at the end of the appointment"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
 msgid "Converts a meeting to an appointment"
 msgstr "Chuyán cuác háp thÃnh cuác hán"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1491
-#| msgid "_Quit"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
 msgid "Quit"
 msgstr "ThoÃt"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1615
+#: ../modules/calendar/e-cal-shell-view-actions.c:1651
 msgid "Day"
 msgstr "NgÃy"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1617
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 msgid "Show one day"
 msgstr "Xem mát ngÃy"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1622
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
 msgid "List"
 msgstr "Danh sÃch"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1624
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 msgid "Show as list"
 msgstr "Xem dáng danh sÃch"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1629
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
 msgid "Month"
 msgstr "ThÃng"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 msgid "Show one month"
 msgstr "Xem mát thÃng"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1636
+#: ../modules/calendar/e-cal-shell-view-actions.c:1672
 msgid "Week"
 msgstr "Tuán"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1638
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
 msgid "Show one week"
 msgstr "Xem mát tuán"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1645
-#| msgid "Show one week"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1681
 msgid "Show one work week"
 msgstr "Xem mát tuán lÃm viác"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Active Appointments"
 msgstr "Cuác hán hoát Äáng"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
 msgid "Next 7 Days' Appointments"
 msgstr "Cuác hán 7 ngÃy ká"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1698
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
-#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-memo-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:994
 msgid "Description contains"
 msgstr "MÃ tá cháa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1705
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-memo-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:1001
 msgid "Summary contains"
 msgstr "TÃm tát cháa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1753
 msgid "Print this calendar"
 msgstr "In lách nÃy"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1724
-#| msgid "Previews the calendar to be printed"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
 msgid "Preview the calendar to be printed"
 msgstr "Xem thá lách trÆác khi in"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1797
+#: ../modules/calendar/e-cal-shell-view-actions.c:1782
+#: ../modules/calendar/e-cal-shell-view-memopad.c:294
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:381
+#: ../modules/calendar/e-memo-shell-view-actions.c:843
+#: ../modules/calendar/e-task-shell-view-actions.c:1042
+msgid "_Save as iCalendar..."
+msgstr "LÆu dáng _iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1859
 msgid "Go To"
 msgstr "Äi tái"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:214
-#: ../modules/calendar/e-memo-shell-view-actions.c:508
-#| msgid "Memo"
+#: ../modules/calendar/e-cal-shell-view-memopad.c:217
+#: ../modules/calendar/e-memo-shell-view-actions.c:522
 msgid "memo"
 msgstr "ghi nhá"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:640
-#| msgid "New memo"
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
 msgid "New _Memo"
 msgstr "_Ghi nhá mái"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-backend.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-cal-shell-view-memopad.c:262
+#: ../modules/calendar/e-memo-shell-backend.c:300
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
 msgid "Create a new memo"
 msgstr "Táo ghi nhá mái"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-cal-shell-view-memopad.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:661
 msgid "_Open Memo"
 msgstr "_Má ghi nhá"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:266
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../modules/calendar/e-cal-shell-view-memopad.c:269
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
 msgid "View the selected memo"
 msgstr "Xem ghi nhá ÄÃ chán"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-memo-shell-view-actions.c:668
+#: ../modules/calendar/e-task-shell-view-actions.c:806
 msgid "Open _Web Page"
 msgstr "Má trang _Web"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:290
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
-#| msgid "View the selected memo"
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
 msgid "Print the selected memo"
 msgstr "In ghi nhá ÄÃ chán"
 
@@ -15397,276 +15295,228 @@ msgstr "In ghi nhá ÄÃ chán"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:281
-#: ../modules/calendar/e-task-shell-view-actions.c:625
-#| msgid "Task"
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:284
+#: ../modules/calendar/e-task-shell-view-actions.c:639
 msgid "task"
 msgstr "tÃc vá"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
+#: ../modules/calendar/e-task-shell-view-actions.c:701
 msgid "_Assign Task"
 msgstr "_GÃn TÃc vá"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:778
 msgid "_Mark as Complete"
 msgstr "ÄÃnh dáu _hoÃn tát"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:335
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "Mark selected tasks as complete"
 msgstr "ÄÃnh dáu cÃc tÃc vá Äà chán là hoÃn tát"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 msgid "_Mark as Incomplete"
 msgstr "ÄÃnh dáu chÆa h_oÃn tát"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
-#: ../modules/calendar/e-task-shell-view-actions.c:773
-#| msgid "Mark selected tasks as complete"
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:342
+#: ../modules/calendar/e-task-shell-view-actions.c:787
 msgid "Mark selected tasks as incomplete"
 msgstr "ÄÃnh dáu cÃc tÃc vá Äà chán là chÆa hoÃn tát"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "New _Task"
 msgstr "_TÃc vá mái"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-backend.c:286
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
+#: ../modules/calendar/e-task-shell-backend.c:299
+#: ../modules/calendar/e-task-shell-view-actions.c:794
 msgid "Create a new task"
 msgstr "Táo tÃc vá mái"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:799
 msgid "_Open Task"
 msgstr "_Má tÃc vá"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "View the selected task"
 msgstr "Xem tÃc vá ÄÃ chán"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../modules/calendar/e-memo-shell-view-actions.c:829
-#: ../modules/calendar/e-task-shell-view-actions.c:1028
-#| msgid "_Forward as iCalendar..."
-msgid "_Save as iCalendar..."
-msgstr "LÆu dáng _iCalendar..."
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
-#| msgid "View the selected task"
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-task-shell-view-actions.c:1027
 msgid "Print the selected task"
 msgstr "In tÃc vá ÄÃ chán"
 
-#: ../modules/calendar/e-calendar-preferences.c:437
-msgid "Selected Calendars for Alarms"
-msgstr "CÃc Lách ÄÃ chán cho BÃo Äáng"
-
-#: ../modules/calendar/e-calendar-preferences.c:836
-#| msgid "D_ue date:"
-msgid "Ti_me and date:"
-msgstr "N_gÃy giá:"
-
-#: ../modules/calendar/e-calendar-preferences.c:837
-#| msgid "_Date completed:"
-msgid "_Date only:"
-msgstr "Chá _ngÃy:"
-
-#: ../modules/calendar/e-memo-shell-backend.c:285
+#: ../modules/calendar/e-memo-shell-backend.c:298
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Ghi nhá"
 
-#: ../modules/calendar/e-memo-shell-backend.c:292
-#| msgctxt "New"
-#| msgid "_Shared memo"
+#: ../modules/calendar/e-memo-shell-backend.c:305
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "Ghi nhá ch_ung"
 
-#: ../modules/calendar/e-memo-shell-backend.c:294
-#| msgid "Create a shared new memo"
+#: ../modules/calendar/e-memo-shell-backend.c:307
 msgid "Create a new shared memo"
 msgstr "Táo ghi nhá chung mái"
 
-#: ../modules/calendar/e-memo-shell-backend.c:302
-#| msgid "Memo List"
+#: ../modules/calendar/e-memo-shell-backend.c:315
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Danh sÃch ghi nhá"
 
-#: ../modules/calendar/e-memo-shell-backend.c:304
-#: ../modules/calendar/e-memo-shell-view-actions.c:607
+#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Create a new memo list"
 msgstr "Táo danh sÃch ghi nhá mái"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:225
+#: ../modules/calendar/e-memo-shell-sidebar.c:179
 msgid "Loading memos"
 msgstr "Äang náp ghi nhá..."
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:594
-#| msgid "Memo Source Selector"
+#: ../modules/calendar/e-memo-shell-sidebar.c:696
 msgid "Memo List Selector"
 msgstr "Bá chán danh sÃch ghi nhá"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:899
+#: ../modules/calendar/e-memo-shell-sidebar.c:1009
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Äang má ghi nhá tái %s..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
 msgid "Print Memos"
 msgstr "In ghi nhá"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:570
-#| msgid "_Delete Message"
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
 msgid "_Delete Memo"
 msgstr "_Xoà ghi nhá"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:577
-#| msgid "_Find in Message..."
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "_Find in Memo..."
 msgstr "_TÃm bán ghi nhá..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:579
-#| msgid "Search for text in the body of the displayed message"
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
 msgid "Search for text in the displayed memo"
 msgstr "TÃm nái dung trong bán ghi nhá Äang xem"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
-#| msgid "_New Memo List"
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
 msgid "D_elete Memo List"
 msgstr "_Xoà danh sÃch ghi nhá"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
-#| msgid "Delete selected memos"
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Delete the selected memo list"
 msgstr "Xoà danh sÃch ghi nhá Äà chán"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
 msgid "_New Memo List"
 msgstr "Danh sÃch ghi _nhá mái"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
-#| msgid "Delete selected memos"
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
 msgid "Refresh the selected memo list"
 msgstr "Cáp nhát danh sÃch ghi nhá ÄÃ chán"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:628
-#| msgid "Rename the selected folder"
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Rename the selected memo list"
 msgstr "Äái tÃn danh sÃch ghi nhá ÄÃ chán"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
-#| msgid "Show _only this Memo List"
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
 msgid "Show _Only This Memo List"
 msgstr "Chá hián danh sÃch ghi nhá _nÃy"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:712
-#| msgid "_Preview"
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
 msgid "Memo _Preview"
 msgstr "_Xem trÆác bán ghi nhá"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:714
-#| msgid "Show preview pane"
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
 msgid "Show memo preview pane"
 msgstr "Khung xem thá"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:735
-#| msgid "Show message preview below the message list"
+#: ../modules/calendar/e-memo-shell-view-actions.c:749
 msgid "Show memo preview below the memo list"
 msgstr "Hián thá khung xem ghi nhá bÃn dÆái danh sÃch ghi nhá"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:742
-#| msgid "Show message preview below the message list"
+#: ../modules/calendar/e-memo-shell-view-actions.c:756
 msgid "Show memo preview alongside the memo list"
 msgstr "Hián khung xem ghi nhá bÃn cánh danh sÃch ghi nhá"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:800
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
 msgid "Print the list of memos"
 msgstr "In danh sÃch cÃc ghi nhá"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:807
-#| msgid "Previews the list of memos to be printed"
+#: ../modules/calendar/e-memo-shell-view-actions.c:821
 msgid "Preview the list of memos to be printed"
 msgstr "Xem thá danh sÃch ghi nhá trÆác khi in"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
+#: ../modules/calendar/e-memo-shell-view.c:227
+msgid "Delete Memos"
+msgstr "Xoà ghi nhá"
+
+#: ../modules/calendar/e-memo-shell-view.c:229
+msgid "Delete Memo"
+msgstr "Xoà ghi nhá"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:424
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d ghi nhá"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:424
-#: ../modules/calendar/e-task-shell-view-private.c:575
+#: ../modules/calendar/e-memo-shell-view-private.c:428
+#: ../modules/calendar/e-task-shell-view-private.c:585
 #, c-format
-#| msgid ", %d selected"
-#| msgid_plural ", %d selected"
 msgid "%d selected"
 msgstr "%d ÄÃ chán"
 
-#: ../modules/calendar/e-memo-shell-view.c:223
-#| msgid "_Delete Message"
-msgid "Delete Memos"
-msgstr "Xoà ghi nhá"
-
-#: ../modules/calendar/e-memo-shell-view.c:225
-#| msgid "Delegate To"
-msgid "Delete Memo"
-msgstr "Xoà ghi nhá"
-
-#: ../modules/calendar/e-task-shell-backend.c:284
+#: ../modules/calendar/e-task-shell-backend.c:297
 msgctxt "New"
 msgid "_Task"
 msgstr "_TÃc vá"
 
-#: ../modules/calendar/e-task-shell-backend.c:291
+#: ../modules/calendar/e-task-shell-backend.c:304
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "TÃc vá ÄÃ _gÃn"
 
-#: ../modules/calendar/e-task-shell-backend.c:293
+#: ../modules/calendar/e-task-shell-backend.c:306
 msgid "Create a new assigned task"
 msgstr "Táo tÃc vá ÄÃ gÃn mái"
 
-#: ../modules/calendar/e-task-shell-backend.c:301
-#| msgid "Task List"
+#: ../modules/calendar/e-task-shell-backend.c:314
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Danh sÃch _tÃc vá"
 
-#: ../modules/calendar/e-task-shell-backend.c:303
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-task-shell-backend.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "Create a new task list"
 msgstr "Táo danh sÃch tÃc vá mái"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:225
+#: ../modules/calendar/e-task-shell-sidebar.c:179
 msgid "Loading tasks"
 msgstr "Äang náp tÃc vá..."
 
-#: ../modules/calendar/e-task-shell-sidebar.c:594
-#| msgid "Task Source Selector"
+#: ../modules/calendar/e-task-shell-sidebar.c:696
 msgid "Task List Selector"
 msgstr "Bá chán danh sÃch tÃc vá"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:899
+#: ../modules/calendar/e-task-shell-sidebar.c:1010
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Äang má tÃc vá tái %s..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
 msgid "Print Tasks"
 msgstr "In tÃc vá"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:569
+#: ../modules/calendar/e-task-shell-view-actions.c:583
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15678,583 +15528,558 @@ msgstr ""
 "\n"
 "Bán cà thát sá muán xoà nháng tÃc vá nÃy sao?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:694
-#| msgid "_Delete"
+#: ../modules/calendar/e-task-shell-view-actions.c:590
+msgid "Do not ask me again"
+msgstr "Äáng hái náa."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:708
 msgid "_Delete Task"
 msgstr "_Xoà tÃc vá"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:701
-#| msgid "_Find in Message..."
+#: ../modules/calendar/e-task-shell-view-actions.c:715
 msgid "_Find in Task..."
 msgstr "_TÃm tÃc vá..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:703
-#| msgid "Search for text in the body of the displayed message"
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "Search for text in the displayed task"
 msgstr "TÃm nái dung trong tÃc vá Äang xem"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:715
-#| msgid "_Copy..."
+#: ../modules/calendar/e-task-shell-view-actions.c:729
 msgid "Copy..."
 msgstr "ChÃp..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:722
-#| msgid "Select Task List"
+#: ../modules/calendar/e-task-shell-view-actions.c:736
 msgid "D_elete Task List"
 msgstr "_Xoà danh sÃch tÃc vá"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:724
-#| msgid "Delete selected tasks"
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "Delete the selected task list"
 msgstr "Xoà danh sÃch tÃc vá Äà chán"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:743
 msgid "_New Task List"
 msgstr "Da_nh sÃch TÃc vá mái"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
-#| msgid "Delete selected tasks"
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Refresh the selected task list"
 msgstr "Cáp nhát danh sÃch tÃc vá ÄÃ chán"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:752
-#| msgid "Rename the selected folder"
+#: ../modules/calendar/e-task-shell-view-actions.c:766
 msgid "Rename the selected task list"
 msgstr "Äái tÃn danh sÃch tÃc vá ÄÃ chán"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:757
-#| msgid "Show _only this Task List"
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "Show _Only This Task List"
 msgstr "Chá hián danh sÃch tÃc vá _nÃy"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:771
-#| msgid "_Mark as Incomplete"
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 msgid "Mar_k as Incomplete"
 msgstr "ÄÃnh dáu chÆa h_oÃn tát"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-task-shell-view-actions.c:815
 msgid "Delete completed tasks"
 msgstr "Xoà cÃc tÃc vá hoÃn tát"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:876
+#: ../modules/calendar/e-task-shell-view-actions.c:890
 msgid "Task _Preview"
 msgstr "_Xem thá tÃc vá"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:878
-#| msgid "Show preview pane"
+#: ../modules/calendar/e-task-shell-view-actions.c:892
 msgid "Show task preview pane"
 msgstr "Hián khung xem trÆác"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:899
+#: ../modules/calendar/e-task-shell-view-actions.c:913
 #, fuzzy
 #| msgid "Show message preview below the message list"
 msgid "Show task preview below the task list"
 msgstr "Hián thá Ã xem thá thÆ bÃn dÆái danh sÃch thÆ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:906
+#: ../modules/calendar/e-task-shell-view-actions.c:920
 #, fuzzy
 #| msgid "Show message preview below the message list"
 msgid "Show task preview alongside the task list"
 msgstr "Hián thá Ã xem thá thÆ bÃn dÆái danh sÃch thÆ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:928
 msgid "Active Tasks"
 msgstr "TÃc vá hoát Äáng"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:942
 msgid "Completed Tasks"
 msgstr "TÃc vá hoÃn tát"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/calendar/e-task-shell-view-actions.c:949
 msgid "Next 7 Days' Tasks"
 msgstr "TÃc vá 7 ngÃy ká"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/calendar/e-task-shell-view-actions.c:956
 msgid "Overdue Tasks"
 msgstr "TÃc vá quà hán"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:949
+#: ../modules/calendar/e-task-shell-view-actions.c:963
 msgid "Tasks with Attachments"
 msgstr "TÃc vá cà Äá ÄÃnh kÃm"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:999
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "Print the list of tasks"
 msgstr "In danh sÃch cÃc tÃc vá"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1006
+#: ../modules/calendar/e-task-shell-view-actions.c:1020
 #, fuzzy
 #| msgid "Previews the list of tasks to be printed"
 msgid "Preview the list of tasks to be printed"
 msgstr "Xem thá danh sÃch cÃc tÃc vá cán in"
 
-#: ../modules/calendar/e-task-shell-view-private.c:468
+#: ../modules/calendar/e-task-shell-view.c:362
+msgid "Delete Tasks"
+msgstr "Xoà tÃc vá"
+
+#: ../modules/calendar/e-task-shell-view.c:364
+msgid "Delete Task"
+msgstr "Xoà tÃc vá"
+
+#: ../modules/calendar/e-task-shell-view-private.c:472
 msgid "Expunging"
 msgstr "Äang xoà hán..."
 
-#: ../modules/calendar/e-task-shell-view-private.c:571
+#: ../modules/calendar/e-task-shell-view-private.c:581
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tÃc vá"
 
-#: ../modules/calendar/e-task-shell-view.c:358
-#| msgid "Completed Tasks"
-msgid "Delete Tasks"
-msgstr "Xoà tÃc vá"
+#: ../modules/mail/em-account-prefs.c:219
+msgid "Evolution Account Assistant"
+msgstr "Phá tà tÃi khoán Evolution"
 
-#: ../modules/calendar/e-task-shell-view.c:360
-#| msgid "Delegate To"
-msgid "Delete Task"
-msgstr "Xoà tÃc vá"
+#: ../modules/mail/em-account-prefs.c:268
+msgid "Account Editor"
+msgstr "Bá sáa tÃi khoán"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:380
+#: ../modules/mail/e-mail-attachment-handler.c:384
 #, c-format
-#| msgid "Attached message"
-#| msgid_plural "%d attached messages"
 msgid "%d attached messages"
 msgstr "%d thÆ ÄÃnh kÃm"
 
-#. Translators: "None" for a junk hook name,
-#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:94
-#| msgid "None"
-msgctxt "mail-junk-hook"
-msgid "None"
-msgstr "KhÃng"
-
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "BÃi _thÆ"
 
-#: ../modules/mail/e-mail-shell-backend.c:172
+#: ../modules/mail/e-mail-shell-backend.c:197
 msgid "Compose a new mail message"
 msgstr "Viát thÆ mái"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:205
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "ThÆ _mác thÆ"
 
-#: ../modules/mail/e-mail-shell-backend.c:182
+#: ../modules/mail/e-mail-shell-backend.c:207
 msgid "Create a new mail folder"
 msgstr "Táo háp thÆ mái"
 
-#: ../modules/mail/e-mail-shell-backend.c:481
+#: ../modules/mail/e-mail-shell-backend.c:412
 msgid "Mail Accounts"
 msgstr "TÃi khoán thÆ"
 
-#: ../modules/mail/e-mail-shell-backend.c:489
+#: ../modules/mail/e-mail-shell-backend.c:420
 msgid "Mail Preferences"
 msgstr "TÃy thÃch thÆ"
 
-#: ../modules/mail/e-mail-shell-backend.c:497
+#: ../modules/mail/e-mail-shell-backend.c:428
 msgid "Composer Preferences"
 msgstr "TÃy thÃch bá soán tháo"
 
-#: ../modules/mail/e-mail-shell-backend.c:505
+#: ../modules/mail/e-mail-shell-backend.c:436
 msgid "Network Preferences"
 msgstr "TÃy thÃch Máng"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1047
-#: ../modules/mail/e-mail-shell-view.c:954
-#| msgid "Disable Account"
+#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view.c:960
 msgid "_Disable Account"
 msgstr "_Tát tÃi khoán"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1049
-#| msgid "Disable Account"
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
 msgid "Disable this account"
 msgstr "Tát tÃi khoán nÃy"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1056
-#| msgid "Permanently remove all deleted messages from all folders"
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Gá bá hoÃn toÃn mái thÆ Äà xoà ra khái mái thÆ mác"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1061
-msgid "C_reate Search Folder From Search..."
-msgstr "Tá_o thÆ mác tÃm kiám tá kát quá tÃm kiám..."
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1068
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Download Messages for Offline Usage"
 msgstr "Tái _vá thÆ Äá Äác ngoái tuyán"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1070
-#| msgid "Download messages of accounts/folders marked for offline"
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Tái vá cÃc thÆ cáa tÃi khoán và thÆ mác cà ÄÃnh dáu ngoái tuyán"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1075
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
 msgid "Fl_ush Outbox"
 msgstr "Xoà _sách háp thÆ gái"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1082
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "_Copy Folder To..."
 msgstr "_ChÃp thÆ mác vÃo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1084
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "Copy the selected folder into another folder"
 msgstr "Sao chÃp thÆ mác ÄÃ chán sang thÆ mác khÃc"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1091
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Permanently remove this folder"
 msgstr "Gá bá hoÃn toÃn thÆ mác nÃy"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1096
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 msgid "E_xpunge"
 msgstr "_Xoà hán"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1098
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Gá bá hoÃn toÃn mái thÆ Äà xoà trong thÆ mác nÃy"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1103
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Mar_k All Messages as Read"
 msgstr "ÄÃnh dáu mái thÆ ÄÃ Äá_c"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1105
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Mark all messages in the folder as read"
 msgstr "ÄÃnh dáu  Äà Äác  mái thÆ nám trong thÆ mác nÃy"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1110
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 msgid "_Move Folder To..."
 msgstr "Chu_yán thÆ mác sang..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1112
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "Move the selected folder into another folder"
 msgstr "Chuyán thÆ mác ÄÃ chán vÃo thÆ mác khÃc"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1117
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "_New..."
 msgstr "_Mái..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1119
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "Create a new folder for storing mail"
 msgstr "Táo thÆ mác mái Äá lÆu thÆ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1126
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Change the properties of this folder"
 msgstr "Thay Äái thuác tÃnh cáa thÆ mác nÃy"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1133
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "Refresh the folder"
 msgstr "Cáp nhát thÆ mác"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1140
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "Change the name of this folder"
 msgstr "Thay Äái tÃn thÆ mác nÃy"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
 msgid "Select Message _Thread"
 msgstr "Chán nhÃnh _thÆ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Chán tát cá nhÆng thÆ trong cÃng nhÃnh vái thÆ ÄÃ chán"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1152
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
 msgid "Select Message S_ubthread"
 msgstr "Chán nhÃnh _phá thÆ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1154
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "Select all replies to the currently selected message"
 msgstr "Chán mái trá lái thÆ ÄÆác chán hián thái"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
 msgid "Empty _Trash"
 msgstr "Äá _rÃc"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 #, fuzzy
 #| msgid "Permanently remove all deleted messages from all folders"
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Gá bá hoÃn toÃn mái thÆ Äà xoà ra mái thÆ mác"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
 msgid "_New Label"
 msgstr "_NhÃn mái"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
-#| msgid "None"
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
 msgid "N_one"
 msgstr "_KhÃng"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
-#| msgid "_Subscriptions..."
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "_Manage Subscriptions"
 msgstr "_Quán là ÄÄng kÃ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "ÄÄng kà hoác háy ÄÄng kà thÆ mác trÃn mÃy chá tá xa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Send / _Receive"
 msgstr "Gái / _Nhán"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "Send queued items and retrieve new items"
 msgstr "Gái cÃc mác Äang Äái gái và nhán cÃc mác mái"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1210
-#| msgid "_Decline all"
-msgid "R_eceive all"
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#, fuzzy
+#| msgid "R_eceive all"
+msgid "R_eceive All"
 msgstr "_Nhán hát"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Receive new items from all accounts"
 msgstr "Nhán mác mái tá mái tÃi khoán"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
-#| msgid "_Send"
-msgid "_Send all"
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#, fuzzy
+#| msgid "_Send all"
+msgid "_Send All"
 msgstr "_Gái hát"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 #, fuzzy
 #| msgid "Send queued items and retrieve new items"
 msgid "Send queued items in all accounts"
 msgstr "Gái cÃc mác Äang Äái gái và nhán cÃc mác mái"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
-#: ../widgets/misc/e-activity-proxy.c:314
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "Háy bá"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
 msgid "Cancel the current mail operation"
 msgstr "Háy thao tÃc thÆ tÃn hián thái"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1252
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Collapse All _Threads"
 msgstr "_Thu gán mái nhÃnh"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "Collapse all message threads"
 msgstr "Thu gán mái nhÃnh thÆ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "E_xpand All Threads"
 msgstr "_DÃn ra mái nhÃnh"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
 msgid "Expand all message threads"
 msgstr "DÃn ra mái nhÃnh thÆ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
 msgid "_Message Filters"
 msgstr "Bá _lác thÆ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "Create or edit rules for filtering new mail"
 msgstr "Táo hoác sáa Äái quy tác lác thÆ mái"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
-msgid "Search F_olders"
-msgstr "TÃm kiám tr_ong thÆ mác"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
-#, fuzzy
-#| msgid "Create or edit Search Folder definitions"
-msgid "Create or edit search folder definitions"
-msgstr "Táo hoác sáa Äái lái Äánh nghÄa thÆ mác tÃm kiám"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
 msgid "_Subscriptions..."
 msgstr "_Sá ÄÄng kÃ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "F_older"
 msgstr "ThÆ _mác"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
 msgid "_Label"
 msgstr "_NhÃn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1367
+msgid "C_reate Search Folder From Search..."
+msgstr "Tá_o thÆ mác tÃm kiám tá kát quá tÃm kiám..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1374
+msgid "Search F_olders"
+msgstr "TÃm kiám tr_ong thÆ mác"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#, fuzzy
+#| msgid "Create or edit Search Folder definitions"
+msgid "Create or edit search folder definitions"
+msgstr "Táo hoác sáa Äái lái Äánh nghÄa thÆ mác tÃm kiám"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1407
 msgid "_New Folder..."
 msgstr "ThÆ mác _mái..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1364
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
 msgid "Show Message _Preview"
 msgstr "Hián à _xem thá thÆ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1366
-#| msgid "Show message preview window"
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
 msgid "Show message preview pane"
 msgstr "Hián khung xem thÆ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1372
-#| msgid "Hide _Deleted Messages"
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "Show _Deleted Messages"
 msgstr "Hián cÃc thÆ ÄÃ _xoÃ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1374
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 #, fuzzy
 #| msgid "Show deleted messages (with a strike-through) in the message-list."
 msgid "Show deleted messages with a line through them"
 msgstr "Hián thá mái thÆ bá xoà (kiáu gaÌch ÄÃ) trong danh sÃch cÃc thÆ."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1451
 msgid "_Group By Threads"
 msgstr "NhÃm lái theo _nhÃnh"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1382
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
 #, fuzzy
 #| msgid "Threaded Message list"
 msgid "Threaded message list"
 msgstr "Danh sÃch thÆ theo nhÃnh"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1403
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "Show message preview below the message list"
 msgstr "Hián thá Ã xem thá thÆ bÃn dÆái danh sÃch thÆ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1410
+#: ../modules/mail/e-mail-shell-view-actions.c:1481
 #, fuzzy
 #| msgid "Show message preview below the message list"
 msgid "Show message preview alongside the message list"
 msgstr "Hián thá Ã xem thá thÆ bÃn dÆái danh sÃch thÆ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1418
+#: ../modules/mail/e-mail-shell-view-actions.c:1489
 msgid "All Messages"
 msgstr "Mái thÆ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-shell-view-actions.c:1496
 msgid "Important Messages"
 msgstr "ThÆ quan tráng"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1432
+#: ../modules/mail/e-mail-shell-view-actions.c:1503
 msgid "Last 5 Days' Messages"
 msgstr "ThÆ trong 5 ngÃy trÆác"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1439
+#: ../modules/mail/e-mail-shell-view-actions.c:1510
 msgid "Messages Not Junk"
 msgstr "ThÆ khÃng phái rÃc"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1446
+#: ../modules/mail/e-mail-shell-view-actions.c:1517
 msgid "Messages with Attachments"
 msgstr "ThÆ cà Äá ÄÃnh kÃm"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#: ../modules/mail/e-mail-shell-view-actions.c:1524
 msgid "No Label"
 msgstr "KhÃng cà nhÃn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1460
+#: ../modules/mail/e-mail-shell-view-actions.c:1531
 msgid "Read Messages"
 msgstr "ThÆ ÄÃ Äác"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1467
+#: ../modules/mail/e-mail-shell-view-actions.c:1538
 msgid "Recent Messages"
 msgstr "ThÆ gán ÄÃy"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1474
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
 msgid "Unread Messages"
 msgstr "ThÆ chÆa Äác"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1526
+#: ../modules/mail/e-mail-shell-view-actions.c:1597
 #, fuzzy
 #| msgid "Subject or Sender contains"
 msgid "Subject or Addresses contain"
 msgstr "Chá Äá hay ngÆái gái cháa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1536
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "All Accounts"
 msgstr "Mái tÃi khoán"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1543
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Current Account"
 msgstr "TÃi khoán hián thái"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1550
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Current Folder"
 msgstr "ThÆ mác hián thái"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1030
+#: ../modules/mail/e-mail-shell-view.c:563
+msgid "All Account Search"
+msgstr "TÃm trong mái tÃi khoán"
+
+#: ../modules/mail/e-mail-shell-view.c:736
+msgid "Account Search"
+msgstr "TÃm trong tÃi khoán"
+
+#: ../modules/mail/e-mail-shell-view.c:958
+msgid "Proxy _Logout"
+msgstr "ÄÄng _xuát áy nhiám"
+
+#: ../modules/mail/e-mail-shell-view-private.c:997
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d ÄÃ chán, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1041
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d bá xoÃ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1047
-#: ../modules/mail/e-mail-shell-view-private.c:1054
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d thÆ rÃc"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d nhÃp"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d chÆa gái"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1072
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d ÄÃ gái"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1084
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d chÆa Äác, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1087
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d táng cáng"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1107
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 #, fuzzy
 #| msgid "Task"
 msgid "Trash"
 msgstr "TÃc vá"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1461
+#: ../modules/mail/e-mail-shell-view-private.c:1542
 msgid "Send / Receive"
 msgstr "Gái / Nhán"
 
-#: ../modules/mail/e-mail-shell-view.c:564
-msgid "All Account Search"
-msgstr "TÃm trong mái tÃi khoán"
-
-#: ../modules/mail/e-mail-shell-view.c:747
-msgid "Account Search"
-msgstr "TÃm trong tÃi khoán"
-
-#: ../modules/mail/e-mail-shell-view.c:952
-msgid "Proxy _Logout"
-msgstr "ÄÄng _xuát áy nhiám"
-
-#: ../modules/mail/em-account-prefs.c:219
-msgid "Evolution Account Assistant"
-msgstr "Phá tà tÃi khoán Evolution"
-
-#: ../modules/mail/em-account-prefs.c:268
-msgid "Account Editor"
-msgstr "Bá sáa tÃi khoán"
-
 #: ../modules/mail/em-composer-prefs.c:495
-#: ../modules/plugin-manager/evolution-plugin-manager.c:357
-#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../modules/plugin-manager/evolution-plugin-manager.c:361
+#: ../plugins/publish-calendar/publish-calendar.c:857
 #: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "Bát"
@@ -16263,70 +16088,38 @@ msgstr "Bát"
 msgid "Language(s)"
 msgstr "NgÃn ngá"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "Mái lán"
 
-#: ../modules/mail/em-mailer-prefs.c:93
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "Mát lán mái ngÃy"
 
-#: ../modules/mail/em-mailer-prefs.c:94
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "Mát lán mái tuán"
 
-#: ../modules/mail/em-mailer-prefs.c:95
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "Mát lán mái thÃng"
 
-#: ../modules/mail/em-mailer-prefs.c:177
-msgid "Add Custom Junk Header"
-msgstr "ThÃm dÃng Äáu thÆ rÃc tá chán"
-
-#: ../modules/mail/em-mailer-prefs.c:185
-msgid "Header Name:"
-msgstr "TÃn dÃng Äáu:"
-
-#: ../modules/mail/em-mailer-prefs.c:186
-msgid "Header Value Contains:"
-msgstr "Già trá dÃng Äáu cháa:"
-
-#: ../modules/mail/em-mailer-prefs.c:286
+#: ../modules/mail/em-mailer-prefs.c:293
 msgid "Header"
 msgstr "Äáu trang"
 
-#: ../modules/mail/em-mailer-prefs.c:290
+#: ../modules/mail/em-mailer-prefs.c:297
 msgid "Contains Value"
 msgstr "Cháa già trá"
 
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:764
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "Phán bá sung %s sán sÃng và táp tin nhá phÃn Äà ÄÆác cÃi Äát."
-
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:701 ../modules/mail/em-mailer-prefs.c:773
-#, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr ""
-"Phán bá sung %s khÃng sán sÃng. HÃy kiám tra gÃi ÄÃ ÄÃ ÄÆác cÃi Äát chÆa."
-
-#: ../modules/mail/em-mailer-prefs.c:737
-#, fuzzy
-#| msgid "No Junk plugin available"
-msgid "No junk plugin available"
-msgstr "KhÃng cà phán bá sung ThÆ rÃc"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1140
+#: ../modules/mail/em-mailer-prefs.c:1051
 #, fuzzy
 #| msgid "Table header"
 msgid "_Date header:"
 msgstr "Phán Äáu báng"
 
-#: ../modules/mail/em-mailer-prefs.c:1141
+#: ../modules/mail/em-mailer-prefs.c:1052
 #, fuzzy
 #| msgid "Show _Original Size"
 msgid "Show _original header value"
@@ -16343,7 +16136,6 @@ msgstr ""
 "Mái lán khái cháy Evolution, kiám tra náu nà là trÃnh thÆ mác Äánh hay khÃng."
 
 #: ../modules/mailto-handler/evolution-mailto-handler.c:146
-#| msgid "Do you want to make Evolution your default e-mail client?"
 msgid "Do you want to make Evolution your default email client?"
 msgstr ""
 "Bán cà muán Äát Evolution là áng dáng khÃch thÆ Äián tá mác Äánh cáa bán "
@@ -16354,14 +16146,10 @@ msgid "Click 'Work Online' to return to online mode."
 msgstr "Nhán Trác tuyán' Äá trá vá trác tuyán."
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
-#| msgid ""
-#| "Evolution is currently offline.\n"
-#| "Click on this button to work online."
 msgid "Evolution is currently offline due to a network outage."
 msgstr "Evolution hián thái Äang ngoái tuyán và Äát máng."
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
-#| msgid "Evolution is in the process of going offline."
 msgid "Evolution is currently offline."
 msgstr "Evolution hián Äang ngoái tuyán."
 
@@ -16371,36 +16159,62 @@ msgid ""
 "established."
 msgstr "Evolution sá quay lái trác tuyán ngay khi cà kát nái máng."
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an authentication token."
+msgstr ""
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+#, fuzzy
+#| msgid "Other"
+msgid "OAuth"
+msgstr "KhÃc"
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+msgid ""
+"This option will connect to the server by way of the GNOME Online Accounts "
+"service"
+msgstr ""
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
 msgid "Author(s)"
 msgstr "TÃc giá"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:251
+#: ../modules/plugin-manager/evolution-plugin-manager.c:256
 msgid "Plugin Manager"
 msgstr "Bá quán là phán bá sung"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:267
+#: ../modules/plugin-manager/evolution-plugin-manager.c:271
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 "Ghi chÃ: mát sá thay Äái sá khÃng hoát Äáng cho Äán khi ÄÃ khái Äáng lái"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:296
+#: ../modules/plugin-manager/evolution-plugin-manager.c:300
 msgid "Overview"
 msgstr "ToÃn cánh"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:365
-#: ../modules/plugin-manager/evolution-plugin-manager.c:448
+#: ../modules/plugin-manager/evolution-plugin-manager.c:369
+#: ../modules/plugin-manager/evolution-plugin-manager.c:452
 msgid "Plugin"
 msgstr "Phán bá sung"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+#: ../modules/plugin-manager/evolution-plugin-manager.c:490
 msgid "_Plugins"
 msgstr "_Phán bá sung"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+#: ../modules/plugin-manager/evolution-plugin-manager.c:491
 msgid "Enable and disable plugins"
 msgstr "Bát và tát phán bá sung"
 
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Phán bá sung Thá Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Phán bá sung Thá cho bá náp Python EPlugin."
+
 # Name? TÃn?
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
@@ -16410,48 +16224,100 @@ msgstr "Hello Python"
 msgid "Python Plugin Loader tests"
 msgstr "CÃc hÃm thá Bá Náp Phán Bá Sung Python"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Phán bá sung Thá Python"
+#: ../modules/spamassassin/evolution-spamassassin.c:191
+#, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
+msgstr ""
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Phán bá sung Thá cho bá náp Python EPlugin."
+#: ../modules/spamassassin/evolution-spamassassin.c:214
+#, fuzzy
+#| msgid "Filter junk messages using SpamAssassin."
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr "Lác ra thÆ rÃc báng SpamAssassin."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:233
+#, fuzzy, c-format
+#| msgid "Failed to send %d of %d messages"
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "Viác gái %d trÃn %d thÆ bá lái."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:261
+msgid "Failed to read output from SpamAssassin: "
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:316
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr ""
+
+#: ../modules/spamassassin/evolution-spamassassin.c:835
+msgid "SpamAssassin Options"
+msgstr "TÃy chán SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:850
+msgid "I_nclude remote tests"
+msgstr "_Bao gám cÃc phÃp thá tá xa"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:864
+#, fuzzy
+#| msgid "This will make SpamAssassin more reliable, but slower"
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "Viác nÃy giÃp SpamAssasin ÄÃng tin hÆn, cÃn chám hÆn"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1073
+#, fuzzy
+#| msgid "SpamAssassin Options"
+msgid "SpamAssassin"
+msgstr "TÃy chán SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use SpamAssassin daemon and client"
+msgstr "DÃng trÃnh nán và áng dáng khÃch SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "DÃng trÃnh nán và áng dáng khÃch SpamAssassin (spamc/spamd)."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use only local spam tests."
+msgstr "DÃng chá sá kiám tra thÆ rÃc kiáu các bá."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use only the local spam tests (no DNS)."
+msgstr "DÃng chá sá kiám tra thÆ rÃc kiáu các bá (khÃng cà DNS)."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:276
-#: ../widgets/misc/e-import-assistant.c:399
+#: ../modules/startup-wizard/evolution-startup-wizard.c:280
+#: ../widgets/misc/e-import-assistant.c:396
 msgid "Please select the information that you would like to import:"
 msgstr "HÃy chán thÃng tin bán muán nháp:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:308
-#: ../widgets/misc/e-import-assistant.c:555
+#: ../modules/startup-wizard/evolution-startup-wizard.c:312
+#: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "Tá %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:319
-#: ../modules/startup-wizard/evolution-startup-wizard.c:416
-#| msgid "Importing files"
+#: ../modules/startup-wizard/evolution-startup-wizard.c:323
+#: ../modules/startup-wizard/evolution-startup-wizard.c:421
 msgid "Importing Files"
 msgstr "Nháp táp tin"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:394
+#: ../modules/startup-wizard/evolution-startup-wizard.c:399
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr ""
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:412
+#: ../modules/startup-wizard/evolution-startup-wizard.c:417
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr ""
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:482
+#: ../modules/startup-wizard/evolution-startup-wizard.c:497
 msgid "Evolution Setup Assistant"
 msgstr "Trá tà thiát láp Evolution"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:488
+#: ../modules/startup-wizard/evolution-startup-wizard.c:503
 msgid "Welcome"
 msgstr "ChÃo máng"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:493
+#: ../modules/startup-wizard/evolution-startup-wizard.c:508
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -16464,6 +16330,12 @@ msgstr ""
 "\n"
 "Vui lÃng nhán nÃt  Tiáp  Äá tiáp tác."
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:613
+#, fuzzy
+#| msgid "Loading..."
+msgid "Loading accounts..."
+msgstr "Äang náp..."
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 #, fuzzy
 #| msgid "List local address book folders"
@@ -16478,15 +16350,16 @@ msgstr "CÃc Sá Äáa chá các bá"
 msgid ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
-msgstr "Danh sÃch cÃc Äáu mái cho phán bá sung nhác nhá Äá ÄÃnh kÃm lán trong nái dung thÆ"
+msgstr ""
+"Danh sÃch cÃc Äáu mái cho phán bá sung nhác nhá Äá ÄÃnh kÃm lán trong nái "
+"dung thÆ"
 
-#. Check buttons
-#: ../plugins/attachment-reminder/attachment-reminder.c:117
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "Äáng hián thÃng Äiáp nÃ_y lán náa."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:411
+#: ../plugins/attachment-reminder/attachment-reminder.c:464
+#: ../plugins/templates/templates.c:462
 msgid "Keywords"
 msgstr "Tá khoÃ"
 
@@ -16503,7 +16376,9 @@ msgid "Message has no attachments"
 msgstr "ThÆ khÃng cà Äá ÄÃnh kÃm"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-msgid "_Add attachment..."
+#, fuzzy
+#| msgid "_Add attachment..."
+msgid "_Add Attachment..."
 msgstr "_ThÃm Äá ÄÃnh kÃm..."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
@@ -16519,7 +16394,6 @@ msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Nhác bán náu bán quÃn ÄÃnh kÃm vÃo thÆ."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-#| msgid "Inline"
 msgid "Inline Audio"
 msgstr "Tiáng trác tiáp"
 
@@ -16527,36 +16401,36 @@ msgstr "Tiáng trác tiáp"
 msgid "Play audio attachments directly in mail messages."
 msgstr "PhÃt ÄÃnh kÃm Ãm thanh trác tiáp khi xem thÆ."
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:192
 #, fuzzy
 #| msgid "Select name of the Evolution backup file"
-msgid "Select name of the Evolution back up file"
+msgid "Select name of the Evolution backup file"
 msgstr "Chán tÃn cáa táp tin sao lÆu Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:216
+#: ../plugins/backup-restore/backup-restore.c:225
 #, fuzzy
 #| msgid "_Restart Evolution after backup"
-msgid "_Restart Evolution after back up"
+msgid "_Restart Evolution after backup"
 msgstr "_Khái cháy lái Evolution sau khi sao lÆu"
 
-#: ../plugins/backup-restore/backup-restore.c:242
+#: ../plugins/backup-restore/backup-restore.c:251
 #, fuzzy
 #| msgid "Select name of the Evolution backup file to restore"
-msgid "Select name of the Evolution back up file to restore"
+msgid "Select name of the Evolution backup file to restore"
 msgstr "Chán tÃn cáa táp tin sao lÆu Evolution cán phác hái"
 
-#: ../plugins/backup-restore/backup-restore.c:255
+#: ../plugins/backup-restore/backup-restore.c:264
 msgid "_Restart Evolution after restore"
 msgstr "_Khái cháy lái Evolution sau khi phác hái"
 
-#: ../plugins/backup-restore/backup-restore.c:323
+#: ../plugins/backup-restore/backup-restore.c:337
 #, fuzzy
 #| msgid ""
 #| "You can restore Evolution from your backup. It can restore all the Mails, "
 #| "Calendars, Tasks, Memos, Contacts. \n"
 #| "It also restores all your personal settings, mail filters etc."
 msgid ""
-"You can restore Evolution from your back up. It can restore all the Mails, "
+"You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 msgstr ""
@@ -16564,162 +16438,163 @@ msgstr ""
 "tát cá cÃc ThÆ, Lách, TÃc vá, Ghi nhá và LiÃn lác.\n"
 "CÅng phác hái cÃc thiát láp cà nhÃn, bá lác thÆ v.v."
 
-#: ../plugins/backup-restore/backup-restore.c:330
+#: ../plugins/backup-restore/backup-restore.c:344
 #, fuzzy
 #| msgid "_Restore Evolution from the backup file"
-msgid "_Restore Evolution from the back up file"
+msgid "_Restore Evolution from the backup file"
 msgstr "_Phác hái Evolution tá táp tin sao lÆu"
 
-#: ../plugins/backup-restore/backup-restore.c:337
+#: ../plugins/backup-restore/backup-restore.c:351
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Chán kho lÆu Evolution cán phác hái:"
 
-#: ../plugins/backup-restore/backup-restore.c:340
+#: ../plugins/backup-restore/backup-restore.c:354
 msgid "Choose a file to restore"
 msgstr "Chán táp tin cán phác hái"
 
-#: ../plugins/backup-restore/backup-restore.c:348
+#: ../plugins/backup-restore/backup-restore.c:362
 #, fuzzy
 #| msgid "Restore from backup"
-msgid "Restore from back up"
+msgid "Restore from backup"
 msgstr "Phác hái tá bán sao lÆu"
 
-#: ../plugins/backup-restore/backup-restore.c:386
+#: ../plugins/backup-restore/backup-restore.c:402
 #, fuzzy
 #| msgid "Backing up Evolution Data"
 msgid "_Back up Evolution Data..."
 msgstr "Sao lÆu Dá liáu Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:388
+#: ../plugins/backup-restore/backup-restore.c:404
 #, fuzzy
 #| msgid "Backup and restore Evolution data and settings"
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "LÆu trá và phác hái cÃc dá liáu và thiát láp Äáu cáa trÃnh Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:393
+#: ../plugins/backup-restore/backup-restore.c:409
 #, fuzzy
 #| msgid "Restoring Evolution Data"
 msgid "R_estore Evolution Data..."
 msgstr "Phác hái Dá liáu Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:395
+#: ../plugins/backup-restore/backup-restore.c:411
 #, fuzzy
 #| msgid "Backup and restore Evolution data and settings"
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "LÆu trá và phác hái cÃc dá liáu và thiát láp Äáu cáa trÃnh Evolution"
 
-#: ../plugins/backup-restore/backup.c:79
+#: ../plugins/backup-restore/backup.c:77
 #, fuzzy
 #| msgid "Backup Evolution directory"
 msgid "Back up Evolution directory"
 msgstr "ThÆ mác lÆu trá Evolution"
 
-#: ../plugins/backup-restore/backup.c:81
+#: ../plugins/backup-restore/backup.c:79
 msgid "Restore Evolution directory"
 msgstr "ThÆ mác phác hái Evolution"
 
-#: ../plugins/backup-restore/backup.c:83
+#: ../plugins/backup-restore/backup.c:81
 #, fuzzy
 #| msgid "Check Evolution Backup"
 msgid "Check Evolution Back up"
 msgstr "Kiám tra kho sao lÆu Evolution"
 
-#: ../plugins/backup-restore/backup.c:85
+#: ../plugins/backup-restore/backup.c:83
 msgid "Restart Evolution"
 msgstr "Khái cháy lái Evolution"
 
-#: ../plugins/backup-restore/backup.c:87
+#: ../plugins/backup-restore/backup.c:85
 msgid "With Graphical User Interface"
 msgstr "Báng giao dián ngÆái dÃng Äá háa"
 
-#: ../plugins/backup-restore/backup.c:289
-#: ../plugins/backup-restore/backup.c:399
+#. FIXME Will the versioned setting always work?
+#: ../plugins/backup-restore/backup.c:299
+#: ../plugins/backup-restore/backup.c:418
 msgid "Shutting down Evolution"
 msgstr "Äang tát trÃnh Evolution"
 
-#: ../plugins/backup-restore/backup.c:296
+#: ../plugins/backup-restore/backup.c:308
 msgid "Backing Evolution accounts and settings"
 msgstr "Äang sao lÆu cÃc tÃi khoán và thiát láp Äáu cáa trÃnh Evolution"
 
-#: ../plugins/backup-restore/backup.c:304
+#: ../plugins/backup-restore/backup.c:318
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Äang sao lÆu dá liáu Evolution (ThÆ, LiÃn lác, Lách, TÃc vá, Ghi nhá)"
 
-#: ../plugins/backup-restore/backup.c:317
+#: ../plugins/backup-restore/backup.c:331
 #, fuzzy
 #| msgid "Backup complete"
 msgid "Back up complete"
 msgstr "Viác sao lÆu hoÃn tát"
 
-#: ../plugins/backup-restore/backup.c:322
-#: ../plugins/backup-restore/backup.c:496
+#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:527
 msgid "Restarting Evolution"
 msgstr "Äang khái cháy lái Evolution"
 
-#: ../plugins/backup-restore/backup.c:403
+#: ../plugins/backup-restore/backup.c:424
 #, fuzzy
 #| msgid "Backup current Evolution data"
 msgid "Back up current Evolution data"
 msgstr "Sao lÆu dá liáu Evolution hián thái"
 
-#: ../plugins/backup-restore/backup.c:409
+#: ../plugins/backup-restore/backup.c:432
 #, fuzzy
 #| msgid "Extracting files from backup"
 msgid "Extracting files from back up"
 msgstr "Äang trÃch cÃc táp tin tá kho sao lÆu"
 
-#: ../plugins/backup-restore/backup.c:466
+#: ../plugins/backup-restore/backup.c:491
 msgid "Loading Evolution settings"
 msgstr "Äang náp thiát láp Evolution"
 
-#: ../plugins/backup-restore/backup.c:481
+#: ../plugins/backup-restore/backup.c:508
 #, fuzzy
 #| msgid "Removing temporary backup files"
 msgid "Removing temporary back up files"
 msgstr "Äang gá bá cÃc táp tin sao lÆu tám thái"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:520
 msgid "Ensuring local sources"
 msgstr "Äang Äám báo cà cÃc nguán các bá"
 
-#: ../plugins/backup-restore/backup.c:678
+#: ../plugins/backup-restore/backup.c:707
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Äang sao lÆu vÃo thÆ mác %s"
 
-#: ../plugins/backup-restore/backup.c:683
+#: ../plugins/backup-restore/backup.c:712
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Äang phác hái tá thÆ mác %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:705
+#: ../plugins/backup-restore/backup.c:736
 #, fuzzy
 #| msgid "Evolution Backup"
 msgid "Evolution Back up"
 msgstr "Sao lÆu Evolution"
 
-#: ../plugins/backup-restore/backup.c:705
+#: ../plugins/backup-restore/backup.c:736
 msgid "Evolution Restore"
 msgstr "Phác hái Evolution"
 
-#: ../plugins/backup-restore/backup.c:746
+#: ../plugins/backup-restore/backup.c:774
 msgid "Backing up Evolution Data"
 msgstr "Sao lÆu Dá liáu Evolution"
 
-#: ../plugins/backup-restore/backup.c:747
+#: ../plugins/backup-restore/backup.c:775
 msgid "Please wait while Evolution is backing up your data."
 msgstr "HÃy Äái trong khi Evolution sao lÆu dá liáu cáa bán."
 
-#: ../plugins/backup-restore/backup.c:749
+#: ../plugins/backup-restore/backup.c:777
 msgid "Restoring Evolution Data"
 msgstr "Phác hái Dá liáu Evolution"
 
-#: ../plugins/backup-restore/backup.c:750
+#: ../plugins/backup-restore/backup.c:778
 msgid "Please wait while Evolution is restoring your data."
 msgstr "HÃy Äái trong khi Evolution phác hái dá liáu cáa bán."
 
-#: ../plugins/backup-restore/backup.c:768
+#: ../plugins/backup-restore/backup.c:796
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Tián trÃnh nÃy cà thá kÃo dÃi mát lÃt, phá thuác vÃo sá lÆáng dá liáu trong "
@@ -16801,39 +16676,39 @@ msgstr ""
 "liáu trÆác khi tiáp tác. HÃnh Äáng nÃy sá xoà tát cá dá liáu và thiát láp "
 "hián tái và phác hái tá bán sao lÆu."
 
-#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "LiÃn lác Tá Äáng"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:709
+#: ../plugins/bbdb/bbdb.c:710
 #, fuzzy
 #| msgid "_Auto-create address book entries when replying to messages"
 msgid "Create _address book entries when sending mails"
 msgstr "Tá Äáng táo mác nháp trong sá Äá_a chá khi hái Ãm thÆ"
 
-#: ../plugins/bbdb/bbdb.c:715
+#: ../plugins/bbdb/bbdb.c:716
 msgid "Select Address book for Automatic Contacts"
 msgstr "Chán Sá Äáa chá cho LiÃn Lác Tá Äáng"
 
-#: ../plugins/bbdb/bbdb.c:730
+#: ../plugins/bbdb/bbdb.c:731
 msgid "Instant Messaging Contacts"
 msgstr "LiÃn lác Tin nhán tác khác"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:745
+#: ../plugins/bbdb/bbdb.c:746
 #, fuzzy
 #| msgid "Synchronize contact info and images from Pidgin buddy list"
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "Äáng bá hoà thÃng tin liÃn lác và ánh tá danh sÃch bán bà Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:751
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Chán Sá Äáa chá cho danh sÃch bán bà Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:762
+#: ../plugins/bbdb/bbdb.c:763
 msgid "Synchronize with _buddy list now"
 msgstr "Äáng bá hoà vái danh sÃch ngÆái _bán ngay bÃy giá"
 
@@ -16858,73 +16733,15 @@ msgstr ""
 "Tá Äáng Äián vÃo sá Äáa chá cÃc tÃn và Äáa chá thÆ khi bán hái Ãm thÆ. CÅng "
 "Äián thÃng tin liÃn lác IM tá cÃc danh sÃch bán bà cáa bán."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
-#, c-format
-msgid "Bogofilter is not available. Please install it first."
-msgstr "Bogofilter khÃng cÃ. Vui lÃng cÃi Bogofilter ÄÃ."
-
-#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:167
-#, c-format
-msgid "Error occurred while spawning %s: %s."
-msgstr "Gáp lái trong khi táo %s: %s"
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
-#, c-format
-msgid "Bogofilter child process does not respond, killing..."
-msgstr "Tián trÃnh con lác Bogofilter khÃng ÄÃp áng nÃn buác kát thÃc..."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:198
-#, c-format
-msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr "Khoáng Äái tián trÃnh con lác Bogofilter bá giÃn Äoán nÃn chám dát..."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:221
-#, c-format
-msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr "Lái gái dá liáu qua áng dán cho lác Bogofilter, mà lái: %d"
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:406
-msgid "Convert message text to _Unicode"
-msgstr "Chuyán Äái vÄn bán thÆ sang _Unicode"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr "Chuyán Äái thÆ sang Unicode"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-"Chuyán Äái vÄn bán cáa thÆ sang UTF-8 Unicode, Äá háp nhát cÃc hiáu bÃi rÃc "
-"Äán tá cÃc bá kà tá khÃc nhau."
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-#, fuzzy
-#| msgid "Bogofilter junk plugin"
-msgid "Bogofilter Junk Filter"
-msgstr "Phán má ráng thÆ rÃc Bogofilter"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter Options"
-msgstr "TÃy chán Bogofilter"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-#, fuzzy
-#| msgid "Filters junk messages using Bogofilter."
-msgid "Filter junk messages using Bogofilter."
-msgstr "Lác ra thÆ rÃc báng Bogofilter."
-
-#: ../plugins/caldav/caldav-browse-server.c:205
+#: ../plugins/caldav/caldav-browse-server.c:214
 msgid "Authentication failed. Server requires correct login."
 msgstr "XÃc thác thát bái. MÃy chá ÄÃi ÄÄng nháp ÄÃng."
 
-#: ../plugins/caldav/caldav-browse-server.c:207
+#: ../plugins/caldav/caldav-browse-server.c:216
 msgid "Given URL cannot be found."
 msgstr "KhÃng tÃm tháy URL ÄÃ cho."
 
-#: ../plugins/caldav/caldav-browse-server.c:211
+#: ../plugins/caldav/caldav-browse-server.c:220
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16933,33 +16750,31 @@ msgstr ""
 "MÃy chá trá vá dá liáu bát thÆáng.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:341
-#: ../plugins/caldav/caldav-browse-server.c:665
+#: ../plugins/caldav/caldav-browse-server.c:360
+#: ../plugins/caldav/caldav-browse-server.c:694
 #, fuzzy
 #| msgid "Failed to update delegates:"
 msgid "Failed to parse server response."
 msgstr "KhÃng thá cáp nhát ngÆái áy nhiám:"
 
-#: ../plugins/caldav/caldav-browse-server.c:435
-#| msgid "Ends"
+#: ../plugins/caldav/caldav-browse-server.c:454
 msgid "Events"
 msgstr "Sá kián"
 
-#: ../plugins/caldav/caldav-browse-server.c:457
-#| msgid "New calendar"
+#: ../plugins/caldav/caldav-browse-server.c:476
 msgid "User's calendars"
 msgstr "Lách ngÆái dÃng"
 
-#: ../plugins/caldav/caldav-browse-server.c:566
-#: ../plugins/caldav/caldav-browse-server.c:734
+#: ../plugins/caldav/caldav-browse-server.c:588
+#: ../plugins/caldav/caldav-browse-server.c:763
 #, fuzzy
 #| msgid "Failed to authenticate with LDAP server."
 msgid "Failed to get server URL."
 msgstr "Viác xÃc thác vái mÃy chá LDAP bá lái."
 
-#: ../plugins/caldav/caldav-browse-server.c:732
-#: ../plugins/caldav/caldav-browse-server.c:773
-#: ../plugins/caldav/caldav-browse-server.c:1432
+#: ../plugins/caldav/caldav-browse-server.c:761
+#: ../plugins/caldav/caldav-browse-server.c:802
+#: ../plugins/caldav/caldav-browse-server.c:1493
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -16971,29 +16786,29 @@ msgstr ""
 "\n"
 "Äang tÃm kiám cÃc LiÃn lác..."
 
-#: ../plugins/caldav/caldav-browse-server.c:771
+#: ../plugins/caldav/caldav-browse-server.c:800
 #, fuzzy
 #| msgid "Unable to find any calendars"
 msgid "Could not find any user calendar."
 msgstr "KhÃng tÃm tháy lách nÃo"
 
-#: ../plugins/caldav/caldav-browse-server.c:903
+#: ../plugins/caldav/caldav-browse-server.c:938
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "Lán thá trÆác thát bái: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:905
+#: ../plugins/caldav/caldav-browse-server.c:940
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "Lán thá trÆác thát bái vái mà lái %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:910
+#: ../plugins/caldav/caldav-browse-server.c:945
 #, fuzzy, c-format
 #| msgid "Enter password for %s (user %s)"
 msgid "Enter password for user %s on server %s"
 msgstr "HÃy gà mát kháu cho %s (ngÆái dÃng %s)"
 
-#: ../plugins/caldav/caldav-browse-server.c:969
+#: ../plugins/caldav/caldav-browse-server.c:1008
 #, fuzzy, c-format
 #| msgid ""
 #| "Cannot create output file: %s:\n"
@@ -17004,7 +16819,7 @@ msgstr ""
 " %s"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1215
+#: ../plugins/caldav/caldav-browse-server.c:1266
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -17016,72 +16831,75 @@ msgstr ""
 "\n"
 "Äang tÃm kiám cÃc LiÃn lác..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1264
-#: ../plugins/caldav/caldav-source.c:255
+#: ../plugins/caldav/caldav-browse-server.c:1325
+#: ../plugins/caldav/caldav-source.c:261
 msgid "Server _handles meeting invitations"
 msgstr "MÃy chá _xá là thÆ mái háp"
 
-#: ../plugins/caldav/caldav-browse-server.c:1271
+#: ../plugins/caldav/caldav-browse-server.c:1332
 #, fuzzy
 #| msgid "Local Calendars"
 msgid "List of available calendars:"
 msgstr "Lách các bá"
 
-#: ../plugins/caldav/caldav-browse-server.c:1309
+#: ../plugins/caldav/caldav-browse-server.c:1370
 #, fuzzy
 #| msgid "Sort"
 msgid "Supports"
 msgstr "Sáp xáp"
 
-#: ../plugins/caldav/caldav-browse-server.c:1336
-#: ../plugins/caldav/caldav-source.c:254
+#: ../plugins/caldav/caldav-browse-server.c:1397
+#: ../plugins/caldav/caldav-source.c:259
 #, fuzzy
 #| msgid "New email"
-msgid "User e-_mail:"
+msgid "User e_mail:"
 msgstr "ThÆ mái"
 
-#: ../plugins/caldav/caldav-browse-server.c:1408
+#: ../plugins/caldav/caldav-browse-server.c:1469
 #, fuzzy, c-format
 #| msgid "Failed to create pipe: %s"
 msgid "Failed to create thread: %s"
 msgstr "Lái táo áng dán: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1517
+#: ../plugins/caldav/caldav-browse-server.c:1585
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "URL cáa mÃy chá '%s' khÃng háp lá"
 
-#: ../plugins/caldav/caldav-browse-server.c:1523
+#: ../plugins/caldav/caldav-browse-server.c:1591
 msgid "Browse for a CalDAV calendar"
 msgstr "Duyát tÃm lách CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:235
-#: ../plugins/calendar-http/calendar-http.c:100
+#: ../plugins/caldav/caldav-source.c:240
+#: ../plugins/calendar-http/calendar-http.c:107
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:242
-#: ../plugins/google-account-setup/google-contacts-source.c:348
-msgid "Use _SSL"
-msgstr "DÃng _SSL"
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:145
+#: ../plugins/google-account-setup/google-contacts-source.c:359
+#, fuzzy
+#| msgid "_Use secure connection:"
+msgid "Use _secure connection"
+msgstr "DÃng kát nái _báo mát:"
 
-#: ../plugins/caldav/caldav-source.c:244
-#: ../plugins/google-account-setup/google-contacts-source.c:326
-#: ../plugins/google-account-setup/google-source.c:638
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
+#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
 msgid "User_name:"
 msgstr "TÃ_n ngÆái dÃng:"
 
-#: ../plugins/caldav/caldav-source.c:257
+#: ../plugins/caldav/caldav-source.c:264
 msgid "Brows_e server for a calendar"
 msgstr "_Duyát tÃm lách trÃn mÃy chá"
 
-#: ../plugins/caldav/caldav-source.c:275
-#: ../plugins/calendar-file/calendar-file.c:194
-#: ../plugins/calendar-http/calendar-http.c:119
-#: ../plugins/calendar-weather/calendar-weather.c:398
-#: ../plugins/google-account-setup/google-contacts-source.c:366
-#: ../plugins/google-account-setup/google-source.c:645
+#: ../plugins/caldav/caldav-source.c:282
+#: ../plugins/calendar-file/calendar-file.c:204
+#: ../plugins/calendar-http/calendar-http.c:129
+#: ../plugins/calendar-weather/calendar-weather.c:421
+#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../plugins/google-account-setup/google-source.c:675
 msgid "Re_fresh:"
 msgstr "Cá_p nhát:"
 
@@ -17090,41 +16908,36 @@ msgid "Add CalDAV support to Evolution."
 msgstr "ThÃm há trá CalDAV vÃo Evolution."
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-#| msgid "CalDAV sources"
 msgid "CalDAV Support"
 msgstr "Nguán CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:128
+#: ../plugins/calendar-file/calendar-file.c:134
 #, fuzzy
 #| msgid "Custom Header Options"
 msgid "_Customize options"
 msgstr "TÃy chán dÃng Äáu tá chán"
 
-#: ../plugins/calendar-file/calendar-file.c:147
-#| msgid "File name:"
+#: ../plugins/calendar-file/calendar-file.c:153
 msgid "File _name:"
 msgstr "_TÃn táp tin:"
 
-#: ../plugins/calendar-file/calendar-file.c:151
-#| msgid "Choose a file"
+#: ../plugins/calendar-file/calendar-file.c:157
 msgid "Choose calendar file"
 msgstr "Chán táp tin lách"
 
-#: ../plugins/calendar-file/calendar-file.c:199
-#| msgid "Open"
+#: ../plugins/calendar-file/calendar-file.c:209
 msgid "On open"
 msgstr "LÃc má"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:210
 msgid "On file change"
 msgstr "LÃc táp tin thay Äái"
 
-#: ../plugins/calendar-file/calendar-file.c:201
-#| msgid "Personal"
+#: ../plugins/calendar-file/calendar-file.c:211
 msgid "Periodically"
 msgstr "Äánh ká"
 
-#: ../plugins/calendar-file/calendar-file.c:216
+#: ../plugins/calendar-file/calendar-file.c:228
 msgid "Force read _only"
 msgstr "Buác là _chá Äác"
 
@@ -17136,11 +16949,7 @@ msgstr "ThÃm lách các bá vÃo Evolution."
 msgid "Local Calendars"
 msgstr "Lách các bá"
 
-#: ../plugins/calendar-http/calendar-http.c:134
-msgid "_Secure connection"
-msgstr "Kát nái _báo mát"
-
-#: ../plugins/calendar-http/calendar-http.c:194
+#: ../plugins/calendar-http/calendar-http.c:207
 msgid "Userna_me:"
 msgstr "TÃ_n ngÆái dÃng:"
 
@@ -17154,63 +16963,62 @@ msgstr "ThÃm lách web vÃo Evolution."
 msgid "Web Calendars"
 msgstr "Lách"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Fog"
 msgstr "Thái tiát: sÆÆng mÃ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Cloudy"
 msgstr "Thái tiát: nhiáu mÃy"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Cloudy Night"
 msgstr "Thái tiát: ÄÃm Äáy mÃy"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Overcast"
 msgstr "Thái tiát: u Ãm"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Showers"
 msgstr "Thái tiát: mÆa rÃo"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:70
 msgid "Weather: Snow"
 msgstr "Thái tiát: tuyát"
 
-#: ../plugins/calendar-weather/calendar-weather.c:69
+#: ../plugins/calendar-weather/calendar-weather.c:71
 msgid "Weather: Sunny"
 msgstr "Thái tiát: trÆÌi cà nÄÌng"
 
-#: ../plugins/calendar-weather/calendar-weather.c:70
+#: ../plugins/calendar-weather/calendar-weather.c:72
 msgid "Weather: Clear Night"
 msgstr "Thái tiát: ÄÃm rÃ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:71
+#: ../plugins/calendar-weather/calendar-weather.c:73
 msgid "Weather: Thunderstorms"
 msgstr "Thái tiát: bÃo kÃm sám"
 
-#: ../plugins/calendar-weather/calendar-weather.c:225
+#: ../plugins/calendar-weather/calendar-weather.c:239
 msgid "Select a location"
 msgstr "Chán Äáa Äiám"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:331
-#: ../plugins/calendar-weather/calendar-weather.c:376
-#| msgid "None"
+#: ../plugins/calendar-weather/calendar-weather.c:350
+#: ../plugins/calendar-weather/calendar-weather.c:398
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "KhÃng"
 
-#: ../plugins/calendar-weather/calendar-weather.c:451
+#: ../plugins/calendar-weather/calendar-weather.c:477
 msgid "_Units:"
 msgstr "ÄÆn _vá"
 
-#: ../plugins/calendar-weather/calendar-weather.c:460
+#: ../plugins/calendar-weather/calendar-weather.c:486
 msgid "Metric (Celsius, cm, etc)"
 msgstr "MÃt (Celsius, cm v.v.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:463
+#: ../plugins/calendar-weather/calendar-weather.c:489
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Má (Fahrenheit, inch v.v.)"
 
@@ -17222,34 +17030,7 @@ msgstr "ThÃm lách thái tiát vÃo Evolution."
 msgid "Weather Calendars"
 msgstr "Lách Thái tiát"
 
-#: ../plugins/contacts-map/contacts-map.c:55
-#: ../plugins/contacts-map/contacts-map.c:201
-#| msgid "Contacts: "
-msgid "Contacts map"
-msgstr "Bán Äá liÃn lác"
-
-#: ../plugins/contacts-map/contacts-map.c:56
-#, fuzzy
-#| msgid "Send a message to the selected contacts"
-msgid "Show a map of all the contacts"
-msgstr "Gái thÆ cho cÃc liÃn lác ÄÃ chán"
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
-msgid "Add a map showing the location of contacts when possible."
-msgstr ""
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
-#| msgid "No contacts"
-msgid "Map for contacts"
-msgstr "Bán Äá liÃn lác"
-
-#: ../plugins/dbx-import/dbx-importer.c:233
-#, fuzzy
-#| msgid "Select folder to import into"
-msgid "Select folder to import OE folder into"
-msgstr "Chán thÆ mác Äá nháp vÃo"
-
-#: ../plugins/dbx-import/dbx-importer.c:252
+#: ../plugins/dbx-import/dbx-importer.c:284
 #, fuzzy
 #| msgid "Importing Outlook data"
 msgid "Importing Outlook Express data"
@@ -17273,25 +17054,25 @@ msgstr "Nháp PST Outlook"
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "CÃc thÆ mác cà nhÃn Outlook (.pst)"
 
-#: ../plugins/default-source/default-source.c:83
+#: ../plugins/default-source/default-source.c:168
 msgid "Mark as _default address book"
 msgstr "ÄÃnh _dáu là sá Äáa chá mác Äánh"
 
-#: ../plugins/default-source/default-source.c:96
+#: ../plugins/default-source/default-source.c:182
 #, fuzzy
 #| msgid "Show autocompleted name with an address"
 msgid "A_utocomplete with this address book"
 msgstr "Hián tÃn tá Äáng Äián nát cÃng vái Äáa chá"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:191
 msgid "Mark as _default calendar"
 msgstr "ÄÃnh _dáu là lách mác Äánh"
 
-#: ../plugins/default-source/default-source.c:106
+#: ../plugins/default-source/default-source.c:192
 msgid "Mark as _default task list"
 msgstr "ÄÃnh _dáu là danh sÃch tÃc vá mác Äánh"
 
-#: ../plugins/default-source/default-source.c:107
+#: ../plugins/default-source/default-source.c:193
 msgid "Mark as _default memo list"
 msgstr "ÄÃnh _dáu là danh sÃch ghi nhá mác Äánh"
 
@@ -17318,66 +17099,64 @@ msgstr ""
 "cáa dÃng Äáu tá chán vái mát dáu báng  =  theo sau, và cÃc già trá Äánh "
 "giái báng dáu chám pháy  ; Â."
 
-#: ../plugins/email-custom-header/email-custom-header.c:319
+#: ../plugins/email-custom-header/email-custom-header.c:322
 #, fuzzy
 #| msgid "Security:"
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Báo mát:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../plugins/email-custom-header/email-custom-header.c:326
 #, fuzzy
 #| msgid "Personal"
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "CÃ nhÃn"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../plugins/email-custom-header/email-custom-header.c:327
 #, fuzzy
 #| msgid "Unclassified"
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Xem chung"
 
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:328
 #, fuzzy
 #| msgid "Protected"
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "ÄÃ báo vá"
 
-#: ../plugins/email-custom-header/email-custom-header.c:326
-#| msgid "Confidential"
+#: ../plugins/email-custom-header/email-custom-header.c:329
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Mát"
 
-#: ../plugins/email-custom-header/email-custom-header.c:327
+#: ../plugins/email-custom-header/email-custom-header.c:330
 #, fuzzy
 #| msgid "Secret"
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Mát"
 
-#: ../plugins/email-custom-header/email-custom-header.c:328
+#: ../plugins/email-custom-header/email-custom-header.c:331
 #, fuzzy
 #| msgid "Top secret"
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Tái mát"
 
-#: ../plugins/email-custom-header/email-custom-header.c:394
-#| msgid "None"
+#: ../plugins/email-custom-header/email-custom-header.c:388
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "KhÃng"
 
-#: ../plugins/email-custom-header/email-custom-header.c:586
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "DÃng Äáu tá _chán"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:845
+#: ../plugins/email-custom-header/email-custom-header.c:847
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -17386,12 +17165,12 @@ msgstr ""
 "(Custom Header) là danh sÃch cÃc tÃn già trá khoÃ\n"
 "Phán Äáu RiÃng Äánh giái báng dáu chám pháy  ; Â."
 
-#: ../plugins/email-custom-header/email-custom-header.c:899
+#: ../plugins/email-custom-header/email-custom-header.c:901
 msgid "Key"
 msgstr "KhoÃ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:915
-#: ../plugins/templates/templates.c:417
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:468
 msgid "Values"
 msgstr "Già trá"
 
@@ -17415,7 +17194,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr ""
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:128
+#: ../plugins/external-editor/external-editor.c:132
 msgid "Automatically launch when a new mail is edited"
 msgstr ""
 
@@ -17427,11 +17206,11 @@ msgstr "TrÃnh soán tháo bÃn ngoÃi mác Äánh"
 msgid "The default command that must be used as the editor."
 msgstr "CÃu lánh mác Äánh cán dÃng lÃm trÃnh soán tháo."
 
-#: ../plugins/external-editor/external-editor.c:117
+#: ../plugins/external-editor/external-editor.c:121
 msgid "Command to be executed to launch the editor: "
 msgstr "CÃu lánh cán cháy Äá khái cháy trÃnh soán tháo:"
 
-#: ../plugins/external-editor/external-editor.c:118
+#: ../plugins/external-editor/external-editor.c:122
 #, fuzzy
 #| msgid ""
 #| "For Emacs use \"xemacs\"\n"
@@ -17443,8 +17222,8 @@ msgstr ""
 "Äái vái Emacs, dÃng  xemacs Â\n"
 "Äái vái VI, dÃng  gvim Â."
 
-#: ../plugins/external-editor/external-editor.c:384
-#: ../plugins/external-editor/external-editor.c:386
+#: ../plugins/external-editor/external-editor.c:402
+#: ../plugins/external-editor/external-editor.c:404
 #, fuzzy
 #| msgid "Compose in _External Editor"
 msgid "Compose in External Editor"
@@ -17481,7 +17260,6 @@ msgstr ""
 "cáa bán. HÃy thá lái sau."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
-#| msgid "External Editor"
 msgid "External editor still running"
 msgstr "TrÃnh soán tháo bÃn ngoÃi ván Äang cháy"
 
@@ -17509,28 +17287,27 @@ msgid ""
 "should be set before checking this, otherwise nothing happens."
 msgstr ""
 
-#: ../plugins/face/face.c:286
+#: ../plugins/face/face.c:292
 #, fuzzy
-#| msgid "Select a (48*48) png of size < 700bytes"
-msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
-msgstr "Chán mát ánh (48Ã48) PNG kÃch cá < 700 byte"
+#| msgid "Select a File"
+msgid "Select a Face Picture"
+msgstr "Chán táp tin"
 
-#: ../plugins/face/face.c:296
+#: ../plugins/face/face.c:302
 #, fuzzy
 #| msgid "Importing files"
 msgid "Image files"
 msgstr "Nháp táp tin"
 
-#: ../plugins/face/face.c:355
+#: ../plugins/face/face.c:359
 msgid "_Insert Face picture by default"
 msgstr "Mác Äánh _chÃn ánh chÃn dung"
 
-#: ../plugins/face/face.c:366
+#: ../plugins/face/face.c:370
 msgid "Load new _Face picture"
 msgstr "_Náp ánh chÃn dung"
 
-#: ../plugins/face/face.c:422
-#| msgid "Include:"
+#: ../plugins/face/face.c:429
 msgid "Include _Face"
 msgstr "_Gám ánh chÃn dung"
 
@@ -17574,19 +17351,18 @@ msgstr "KhÃng thá gái mác nÃy.\n"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "Táp tin bán chán khÃng giáng nhÆ ánh .png háp lá. Lái: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:314
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
-#| msgid "_Server:"
+#: ../plugins/google-account-setup/google-contacts-source.c:325
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
 msgid "Server"
 msgstr "MÃy chá"
 
-#: ../plugins/google-account-setup/google-source.c:438
+#: ../plugins/google-account-setup/google-source.c:459
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
 "Nháp mát kháu cho ngÆái dÃng %s truy cáp Äán danh sÃch cÃc lách ÄÃ ÄÄng kÃ."
 
-#: ../plugins/google-account-setup/google-source.c:549
+#: ../plugins/google-account-setup/google-source.c:576
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17595,17 +17371,17 @@ msgstr ""
 "KhÃng thá Äác dá liáu tá mÃy chá Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:549
-#: ../plugins/mail-to-task/mail-to-task.c:736
-#: ../plugins/mail-to-task/mail-to-task.c:955
+#: ../plugins/google-account-setup/google-source.c:576
+#: ../plugins/mail-to-task/mail-to-task.c:813
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 msgid "Unknown error."
 msgstr "Lái lá."
 
-#: ../plugins/google-account-setup/google-source.c:649
+#: ../plugins/google-account-setup/google-source.c:679
 msgid "Cal_endar:"
 msgstr "_Lách:"
 
-#: ../plugins/google-account-setup/google-source.c:684
+#: ../plugins/google-account-setup/google-source.c:714
 #, fuzzy
 #| msgid "Retrieve _list"
 msgid "Retrieve _List"
@@ -17616,476 +17392,10 @@ msgid "Add Google Calendars to Evolution."
 msgstr "ThÃm lách Google vÃo Evolution."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-#| msgid "Gnome Calendar"
 msgid "Google Calendars"
 msgstr "Lách Google"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-msgid "Checklist"
-msgstr "Danh sÃch kiám"
-
-#: ../plugins/groupwise-features/gw-ui.c:112
-msgid "New _Shared Folder..."
-msgstr "ThÆ mác _chung mái..."
-
-#: ../plugins/groupwise-features/gw-ui.c:119
-msgid "_Proxy Login..."
-msgstr "ÄÄng nhá_p áy nhiám..."
-
-#: ../plugins/groupwise-features/gw-ui.c:170
-msgid "Junk Mail Settings..."
-msgstr "Thiát láp ThÆ rÃc.."
-
-#: ../plugins/groupwise-features/gw-ui.c:177
-msgid "Track Message Status..."
-msgstr "Theo dÃi tráng thÃi thÆ..."
-
-#: ../plugins/groupwise-features/gw-ui.c:183
-msgid "Retract Mail"
-msgstr "Háy bá thÆ"
-
-#: ../plugins/groupwise-features/gw-ui.c:331
-msgid "Accept"
-msgstr "Cháp nhán"
-
-#: ../plugins/groupwise-features/gw-ui.c:338
-msgid "Accept Tentatively"
-msgstr "Cháp nhán tám"
-
-#: ../plugins/groupwise-features/gw-ui.c:345
-msgid "Decline"
-msgstr "Tá chái"
-
-#: ../plugins/groupwise-features/gw-ui.c:352
-#, fuzzy
-#| msgid "_Delegate Meeting..."
-msgid "Rese_nd Meeting..."
-msgstr "á_y nhiám cuác háp..."
-
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
-msgid "Create folder"
-msgstr "Táo thÆ mác"
-
-#: ../plugins/groupwise-features/install-shared.c:230
-#, fuzzy, c-format
-#| msgid ""
-#| "The user '%s' has shared a folder with you\n"
-#| "\n"
-#| "Message from '%s'\n"
-#| "\n"
-#| "\n"
-#| "%s\n"
-#| "\n"
-#| "\n"
-#| "Click 'Forward' to install the shared folder\n"
-#| "\n"
-msgid ""
-"The user '%s' has shared a folder with you\n"
-"\n"
-"Message from '%s'\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"Click 'Apply' to install the shared folder\n"
-"\n"
-msgstr ""
-"NgÆái dÃng '%s' ÄÃ chia sá mát thÆ mác cho bán\n"
-"\n"
-"ThÃng bÃo tá '%s'\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"Nhán 'Tái' Äá cÃi Äát thÆ mác chia sá nÃy\n"
-"\n"
-
-#: ../plugins/groupwise-features/install-shared.c:242
-msgid "Install the shared folder"
-msgstr "CÃi Äát thÆ mác chia sá"
-
-#: ../plugins/groupwise-features/install-shared.c:246
-msgid "Shared Folder Installation"
-msgstr "CÃi Äát thÆ mác chia sá"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:82
-msgid "Junk Settings"
-msgstr "Thiát láp ThÆ rÃc"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:96
-#: ../plugins/groupwise-features/junk-settings.ui.h:3
-msgid "Junk Mail Settings"
-msgstr "Thiát láp ThÆ rÃc"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:1
-msgid "Email:"
-msgstr "ThÆ Äián tá:"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:2
-#, fuzzy
-#| msgid "_Junk List"
-msgid "Junk List:"
-msgstr "Danh sÃch _ThÆ rÃc"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:6
-msgid "_Enable"
-msgstr "_Bát"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:7
-msgid "_Junk List"
-msgstr "Danh sÃch _ThÆ rÃc"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:12
-#: ../widgets/table/e-table-config.ui.h:21
-msgid "_Remove"
-msgstr "_Gá bá"
-
-#: ../plugins/groupwise-features/mail-retract.c:81
-msgid "Message Retract"
-msgstr "RÃt lui thÆ"
-
-#: ../plugins/groupwise-features/mail-retract.c:90
-#, fuzzy
-#| msgid ""
-#| "Retracting a message may remove it from the recipient's mailbox. Are you "
-#| "sure you want to do this ?"
-msgid ""
-"Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this?"
-msgstr ""
-"RÃt lui mát thÆ thà cÅng cà thá gá bá nà khái háp thÆ cáa ngÆái nhán. Bán cà "
-"chác lÃm nhÆ thá khÃng?"
-
-#: ../plugins/groupwise-features/mail-retract.c:111
-msgid "Message retracted successfully"
-msgstr "ThÆ ÄÃ ÄÆác háy bá"
-
-#: ../plugins/groupwise-features/mail-send-options.c:202
-msgid "Insert Send options"
-msgstr "ChÃn tÃy chán gái"
-
-#: ../plugins/groupwise-features/notification.ui.h:3
-#: ../plugins/groupwise-features/properties.ui.h:6
-msgid "The participants will receive the following notification.\n"
-msgstr "Mái ngÆái dá sá nhán thÃng bÃo theo ÄÃy.\n"
-
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to GroupWise messages"
-msgstr "ThÃm TÃy chán Gái vÃo thÆ GroupWise"
-
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-#, fuzzy
-#| msgid "A plugin for the features in GroupWise accounts."
-msgid "Fine-tune your GroupWise accounts."
-msgstr "Phán bá sung cho nháng tÃnh nÄng trong tÃi khoán GroupWise."
-
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "GroupWise Features"
-msgstr "TÃnh nÄng GroupWise"
-
-#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
-msgid "Message retract failed"
-msgstr "Lái háy bá thÆ"
-
-#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
-msgid "The server did not allow the selected message to be retracted."
-msgstr "MÃy chá khÃng cho phÃp bán háy bá thÆ ÄÃ."
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "TÃi khoán  {0}  Äà cÃ. HÃy kiám tra lái cÃy thÆ mác."
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
-msgid "Account Already Exists"
-msgstr "TÃi khoán ÄÃ cÃ"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
-msgid "Invalid user"
-msgstr "NgÆái dÃng khÃng háp lá"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"Lái ÄÄng nháp qua mÃy chá áy nhiám dÆái  {0} Â. HÃy kiám tra lái Äáa chá thÆ "
-"Äián tá và thá lái."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
-msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr ""
-"KhÃng thá cáp cho ngÆái dÃng  {0}  quyán truy cáp qua mÃy chá áy nhiám."
-
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
-msgid "Specify User"
-msgstr "Ghi rà ngÆái dÃng"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
-msgid "You have already given proxy permissions to this user."
-msgstr "Bán ÄÃ cáp cho ngÆái dÃng nÃy quyán áy nhiám."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
-msgid "You have to specify a valid user name to give proxy rights."
-msgstr "Bán cán phái ghi rà mát tÃn ngÆái dÃng háp lá, Äá cáp quyán áy nhiám."
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "Bán khÃng thá chia sá thÆ mác nÃy vái ngÆái dÃng Äà ghi rà  {0} Â"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
-msgid "You have to specify a user name which you want to add to the list"
-msgstr "Bán cán phái ghi rà tÃn ngÆái dÃng cán thÃm vÃo danh sÃch"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
-#, fuzzy
-#| msgid "Are you sure you want to delete this meeting?"
-msgid "Do you want to resend the meeting?"
-msgstr "Bán cà chác muán xoà cuác háp nÃy khÃng?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-#, fuzzy
-#| msgid "Are you sure you want to delete this meeting?"
-msgid "Do you want to resend the recurring meeting?"
-msgstr "Bán cà chác muán xoà cuác háp nÃy khÃng?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-#, fuzzy
-#| msgid "Do you want to recover unfinished messages?"
-msgid "Do you want to retract the original item?"
-msgstr "Bán cà muán phác hái cÃc thÆ chÆa hoÃn tát khÃng?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
-#, fuzzy
-#| msgid "_Delete this item from all other recipient's mailboxes?"
-msgid "The original will be removed from the recipient's mailbox."
-msgstr "_Xoà mác nÃy ra háp thÆ cáa mái ngÆái nhán khÃc khÃng?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
-msgid "This is a recurring meeting"
-msgstr "ÄÃy là cuác háp láp"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
-msgid "This will create a new meeting using the existing meeting details."
-msgstr ""
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
-msgid ""
-"This will create a new meeting with the existing meeting details. The "
-"recurrence rule needs to be re-entered."
-msgstr ""
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
-msgid "Would you like to accept it?"
-msgstr "Muán cháp nhán ?"
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
-msgid "Would you like to decline it?"
-msgstr "Muán tá chái ?"
-
-#: ../plugins/groupwise-features/properties.ui.h:1
-msgid "C_ustomize notification message"
-msgstr "Tuá _chánh thÃng Äiáp thÃng bÃo"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
-msgid "Con_tacts..."
-msgstr "L_iÃn lác..."
-
-#: ../plugins/groupwise-features/properties.ui.h:4
-msgid "Shared Folder Notification"
-msgstr "ThÃng bÃo thÆ mác chia sá"
-
-#: ../plugins/groupwise-features/properties.ui.h:8
-#, fuzzy
-#| msgid "Users"
-msgid "Users:"
-msgstr "NgÆái dÃng"
-
-#: ../plugins/groupwise-features/properties.ui.h:11
-msgid "_Not Shared"
-msgstr "KhÃ_ng chia sá"
-
-#: ../plugins/groupwise-features/properties.ui.h:13
-msgid "_Shared With..."
-msgstr "Chia sá _vái..."
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
-msgid "Access Rights"
-msgstr "Quyán truy cáp"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
-msgid "Add/Edit"
-msgstr "ThÃm/Sáa"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
-msgid "Con_tacts"
-msgstr "_LiÃn lác"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
-msgid "Modify _folders/options/rules/"
-msgstr "Sáa Äái _thÆ mác/tÃy chán/quy tác/"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
-msgid "Read items marked _private"
-msgstr "Äác mác cà dáu _RiÃng"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
-msgid "Reminder Notes"
-msgstr "Chà thÃch Nhác nhá"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
-msgid "Subscribe to my _alarms"
-msgstr "ÄÄng kà vái _bÃo Äáng tÃi"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
-msgid "Subscribe to my _notifications"
-msgstr "ÄÄng kà vái thÃ_ng bÃo tÃi"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
-msgid "_Write"
-msgstr "_Ghi"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
-msgid "permission to read|_Read"
-msgstr "Äá_c"
-
-#: ../plugins/groupwise-features/proxy-listing.ui.h:1
-msgid "Proxy"
-msgstr "áy nhiám"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:243
-#, fuzzy
-#| msgid "Account name"
-msgid "Account Name"
-msgstr "TÃn tÃi khoán"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
-msgid "Proxy Login"
-msgstr "ÄÄng nháp áy nhiám"
-
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:251
-#: ../plugins/groupwise-features/proxy.c:494
-#: ../plugins/groupwise-features/send-options.c:84
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sGÃ mát kháu cho %s (ngÆái dÃng %s)"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
-msgid "The Proxy tab will be available only when the account is online."
-msgstr "CÃ thá sá dáng Thanh áy nhiám chá khi tÃi khoán trác tuyán."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:704
-msgid "The Proxy tab will be available only when the account is enabled."
-msgstr "CÃ thá sá dáng Thanh áy nhiám chá khi tÃi khoán ÄÃ bát."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:709
-#, fuzzy
-#| msgid "Proxy"
-msgctxt "GW"
-msgid "Proxy"
-msgstr "áy nhiám"
-
-#: ../plugins/groupwise-features/proxy.c:935
-#: ../plugins/groupwise-features/share-folder.c:692
-msgid "Add User"
-msgstr "ThÃm ngÆái dÃng"
-
-#: ../plugins/groupwise-features/send-options.c:214
-msgid "Advanced send options"
-msgstr "TÃy chán gái cáp cao"
-
-#: ../plugins/groupwise-features/share-folder-common.c:316
-#: ../plugins/groupwise-features/share-folder.c:727
-msgid "Users"
-msgstr "NgÆái dÃng"
-
-#: ../plugins/groupwise-features/share-folder-common.c:317
-msgid "Enter the users and set permissions"
-msgstr "Nháp nháng ngÆái dÃng và láp quyán hán"
-
-#: ../plugins/groupwise-features/share-folder-common.c:418
-msgid "Sharing"
-msgstr "DÃng chung"
-
-#: ../plugins/groupwise-features/share-folder.c:530
-msgid "Custom Notification"
-msgstr "ThÃng bÃo tá chán"
-
-#: ../plugins/groupwise-features/share-folder.c:732
-msgid "Add   "
-msgstr "ThÃm   "
-
-#: ../plugins/groupwise-features/share-folder.c:738
-msgid "Modify"
-msgstr "Sáa Äái"
-
-#: ../plugins/groupwise-features/status-track.c:125
-msgid "Message Status"
-msgstr "Tráng thÃi thÆ"
-
-#. Subject
-#: ../plugins/groupwise-features/status-track.c:139
-msgid "Subject:"
-msgstr "Chá Äá:"
-
-#: ../plugins/groupwise-features/status-track.c:153
-msgid "From:"
-msgstr "Tá:"
-
-#: ../plugins/groupwise-features/status-track.c:168
-msgid "Creation date:"
-msgstr "NgÃy táo:"
-
-#: ../plugins/groupwise-features/status-track.c:208
-msgid "Recipient: "
-msgstr "NgÆái nhán: "
-
-#: ../plugins/groupwise-features/status-track.c:215
-msgid "Delivered: "
-msgstr "PhÃt: "
-
-#: ../plugins/groupwise-features/status-track.c:221
-msgid "Opened: "
-msgstr "Má: "
-
-#: ../plugins/groupwise-features/status-track.c:226
-msgid "Accepted: "
-msgstr "Cháp nhán: "
-
-#: ../plugins/groupwise-features/status-track.c:231
-msgid "Deleted: "
-msgstr "XoÃ: "
-
-#: ../plugins/groupwise-features/status-track.c:236
-msgid "Declined: "
-msgstr "Tá chái: "
-
-#: ../plugins/groupwise-features/status-track.c:241
-msgid "Completed: "
-msgstr "Xong: "
-
-#: ../plugins/groupwise-features/status-track.c:246
-msgid "Undelivered: "
-msgstr "ChÆa phÃt: "
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-#| msgid "Inline"
 msgid "Inline Image"
 msgstr "ánh trác tiáp"
 
@@ -18093,12 +17403,12 @@ msgstr "ánh trác tiáp"
 msgid "View image attachments directly in mail messages."
 msgstr "Xem ánh ÄÃnh kÃm trác tiáp trong thÆ."
 
-#: ../plugins/imap-features/imap-headers.c:329
+#: ../plugins/imap-features/imap-headers.c:337
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "DÃng Äáu tá chán"
 
-#: ../plugins/imap-features/imap-headers.c:342
+#: ../plugins/imap-features/imap-headers.c:349
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "DÃng Äáu IMAP"
@@ -18125,15 +17435,18 @@ msgstr ""
 "Nhiáu dÃng Äáu hÆn nghÄa là nhiáu thái gian hÆn Äá tái vá."
 
 #: ../plugins/imap-features/imap-headers.ui.h:8
+#, fuzzy
+#| msgid ""
+#| "_Basic Headers - (Fastest) \n"
+#| "Use this if you do not have filters based on mailing lists"
 msgid ""
-"_Basic Headers - (Fastest) \n"
+"_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
 "_DÃng Äáu cÆ bán - (Nhanh nhát)\n"
 "DÃng náu bán khÃng lác háp thÆ chung"
 
 #: ../plugins/imap-features/imap-headers.ui.h:10
-#| msgid "Fetch A_ll Headers"
 msgid "_Fetch All Headers"
 msgstr "Láy _mái dÃng Äáu"
 
@@ -18146,19 +17459,19 @@ msgid "IMAP Features"
 msgstr "TÃnh nÄng IMAP"
 
 #. Translators: The first '%s' is replaced with a calendar name,
-#. the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:485
+#. * the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:499
 #, fuzzy, c-format
 #| msgid "Failed to load the calendar '%s'"
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Lái náp lách  %s Â"
 
-#: ../plugins/itip-formatter/itip-formatter.c:654
+#: ../plugins/itip-formatter/itip-formatter.c:659
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Cà cuác hán trong lách  %s  xung Äát vái cuác háp nÃy."
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:683
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "TÃm tháy cuác hán trong lách  %s Â"
@@ -18179,116 +17492,115 @@ msgstr "KhÃng tÃm tháy tÃc vá nÃy trong danh sÃch tÃc vá nÃo"
 msgid "Unable to find this memo in any memo list"
 msgstr "KhÃng tÃm tháy bán ghi nhá nÃy trong bát cá danh sÃch ghi nhá nÃo"
 
-#: ../plugins/itip-formatter/itip-formatter.c:880
-#| msgid "Opening calendar"
-msgid "Opening the calendar. Please wait.."
+#: ../plugins/itip-formatter/itip-formatter.c:1082
+#, fuzzy
+#| msgid "Opening the calendar. Please wait.."
+msgid "Opening the calendar. Please wait..."
 msgstr "Äang má lách. Vui lÃng chá..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:883
+#: ../plugins/itip-formatter/itip-formatter.c:1085
 msgid "Searching for an existing version of this appointment"
 msgstr "Äang tÃm kiám mát phiÃn bán hián thái cáa cuác hán nÃy"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1166
+#: ../plugins/itip-formatter/itip-formatter.c:1362
 msgid "Unable to parse item"
 msgstr "KhÃng thá phÃn tÃch mác"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1255
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "KhÃng gái ÄÆác mác cho lách  %s Â. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1267
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Äà gái cho lách  %s  nhÆ Äà cháp nhán"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1467
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Äà gái cho lách  %s  nhÆ dá Äánh"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1472
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Äà gái cho lách  %s  nhÆ bá tá chái"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1477
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Äà gái cho lách  %s  vái tráng thÃi  bá thÃi Â"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1579
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Bá tá chác ÄÃ gá bá ngÆái áy nhiám %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1382
+#: ../plugins/itip-formatter/itip-formatter.c:1586
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ÄÃ gái mát thÃng bÃo háy bá cho ngÆái áy nhiám"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "KhÃng thá gái thÃng bÃo háy bá cho ngÆái áy nhiám"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1495
+#: ../plugins/itip-formatter/itip-formatter.c:1700
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "KhÃng thá cáp nhát tráng thÃi ngÆái dá và tráng thÃi khÃng háp lá."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1524
+#: ../plugins/itip-formatter/itip-formatter.c:1729
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "KhÃng cáp nhát ÄÆác ngÆái dá. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1528
+#: ../plugins/itip-formatter/itip-formatter.c:1733
 msgid "Attendee status updated"
 msgstr "Tráng thÃi ngÆái dá ÄÃ ÄÆác cáp nhát."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1532
+#: ../plugins/itip-formatter/itip-formatter.c:1737
 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 dá và khÃng cÃn cà lái mác áy."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1554
+#: ../plugins/itip-formatter/itip-formatter.c:1759
 msgid "Meeting information sent"
 msgstr "Tin tác cuác háp ÄÃ ÄÆác gái"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1557
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 msgid "Task information sent"
 msgstr "ThÃng tin tÃc vá ÄÃ ÄÆác gái"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1560
+#: ../plugins/itip-formatter/itip-formatter.c:1765
 msgid "Memo information sent"
 msgstr "ThÃng tin ghi nhá ÄÃ ÄÆác gái"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1569
+#: ../plugins/itip-formatter/itip-formatter.c:1774
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "KhÃng thá gái thÃng tin vá cuác háp và cuác háp khÃng tán tái"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1777
 msgid "Unable to send task information, the task does not exist"
 msgstr "KhÃng thá gái thÃng tin vá tÃc vá và tÃc vá khÃng tán tái"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1780
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "KhÃng thá gái thÃng tin vá bán ghi nhá và bán ghi nhá khÃng tán tái"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#| msgid "Calendars"
+#: ../plugins/itip-formatter/itip-formatter.c:1846
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1645
-#| msgid "New Calendar"
+#: ../plugins/itip-formatter/itip-formatter.c:1851
 msgid "Save Calendar"
 msgstr "LÆu lách"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1703
-#: ../plugins/itip-formatter/itip-formatter.c:1714
+#: ../plugins/itip-formatter/itip-formatter.c:1914
+#: ../plugins/itip-formatter/itip-formatter.c:1925
 msgid "The calendar attached is not valid"
 msgstr "Lách ÄÃ ÄÃnh kÃm khÃng háp lá"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1704
-#: ../plugins/itip-formatter/itip-formatter.c:1715
+#: ../plugins/itip-formatter/itip-formatter.c:1915
+#: ../plugins/itip-formatter/itip-formatter.c:1926
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18296,15 +17608,15 @@ msgstr ""
 "ThÆ nÃy tuyÃn bá cháa mát lách, nhÆng mà lách Äà khÃng phái là mát iCalendar "
 "háp lá."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1755
-#: ../plugins/itip-formatter/itip-formatter.c:1783
-#: ../plugins/itip-formatter/itip-formatter.c:1892
+#: ../plugins/itip-formatter/itip-formatter.c:1966
+#: ../plugins/itip-formatter/itip-formatter.c:1994
+#: ../plugins/itip-formatter/itip-formatter.c:2103
 msgid "The item in the calendar is not valid"
 msgstr "Mác trong lách khÃng háp lá."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1756
-#: ../plugins/itip-formatter/itip-formatter.c:1784
-#: ../plugins/itip-formatter/itip-formatter.c:1893
+#: ../plugins/itip-formatter/itip-formatter.c:1967
+#: ../plugins/itip-formatter/itip-formatter.c:1995
+#: ../plugins/itip-formatter/itip-formatter.c:2104
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18312,92 +17624,97 @@ msgstr ""
 "ThÆ áy cà phái cháa mát lách, nhÆng mà lách áy khÃng cháa sá kián nÃo, tÃc "
 "vá nÃo hay thÃng tin ránh/bán nÃo."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1797
+#: ../plugins/itip-formatter/itip-formatter.c:2008
 msgid "The calendar attached contains multiple items"
 msgstr "Lách ÄÃ ÄÃnh kÃm cháa nhiáu mác"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1798
+#: ../plugins/itip-formatter/itip-formatter.c:2009
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "Äá xá là mái mác nÃy thà nÃn lÆu táp tin nÃy và nháp lách ÄÃ."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2460
-#| msgid "None"
+#: ../plugins/itip-formatter/itip-formatter.c:2672
 msgctxt "cal-itip"
 msgid "None"
 msgstr "KhÃng"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2476
+#: ../plugins/itip-formatter/itip-formatter.c:2688
 msgid "Tentatively Accepted"
 msgstr "Tám ÄÃ cháp nhán"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2594
+#: ../plugins/itip-formatter/itip-formatter.c:2806
 msgid "This meeting recurs"
 msgstr "Cuác háp nÃy láp lái"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2597
+#: ../plugins/itip-formatter/itip-formatter.c:2809
 msgid "This task recurs"
 msgstr "TÃc vá nÃy láp lái"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2600
+#: ../plugins/itip-formatter/itip-formatter.c:2812
 msgid "This memo recurs"
 msgstr "Bán ghi nhá nÃy láp lái"
 
+#: ../plugins/itip-formatter/itip-formatter.c:3036
+#, fuzzy
+#| msgid "Meeting Information"
+msgid "Meeting Invitations"
+msgstr "Tin tác cuác háp"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2834
+#: ../plugins/itip-formatter/itip-formatter.c:3061
 msgid "_Delete message after acting"
 msgstr "_Xoà thÆ sau hÃnh Äáng"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2844
-#: ../plugins/itip-formatter/itip-formatter.c:2877
+#: ../plugins/itip-formatter/itip-formatter.c:3071
+#: ../plugins/itip-formatter/itip-formatter.c:3104
 msgid "Conflict Search"
 msgstr "TÃm kiám xung Äát"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2859
+#: ../plugins/itip-formatter/itip-formatter.c:3086
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Chán nháng lách cán tÃm kiám cuác háp cà xung Äát vái nhau"
 
 #. strftime format of a time,
-#. in 24-hour format, without seconds.
+#. * in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "HÃm nay %l:%M %p"
 
 #. strftime format of a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "HÃm nay %l:%M %p"
 
 #. strftime format of a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "HÃm nay %l:%M %p"
 
 #. strftime format of a time,
-#. in 24-hour format, without seconds.
+#. * in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "NgÃy mai %H:%M"
 
 #. strftime format of a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "NgÃy mai %H:%M:%S"
 
 #. strftime format of a time,
-#. in 12-hour format, without seconds.
+#. * in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "NgÃy mai %l:%M %p"
 
 #. strftime format of a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "NgÃy mai %l:%M:%S %p"
@@ -18410,56 +17727,56 @@ msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
-#. time, in 24-hour format, without seconds.
+#. * time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
-#. time, in 24-hour format.
+#. * time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
-#. time, in 12-hour format, without seconds.
+#. * time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
-#. time, in 12-hour format.
+#. * time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
-#. without a year.
+#. * without a year.
 #: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
-#. without a year and a time,
-#. in 24-hour format, without seconds.
+#. * without a year and a time,
+#. * in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
-#. and a time, in 24-hour format.
+#. * and a time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
-#. and a time, in 12-hour format, without seconds.
+#. * and a time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
-#. and a time, in 12-hour format.
+#. * and a time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
@@ -18470,98 +17787,97 @@ msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
+#. * time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
+#. * time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
+#. * time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
+#. * time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:362
-#: ../plugins/itip-formatter/itip-view.c:363
-#: ../plugins/itip-formatter/itip-view.c:450
-#: ../plugins/itip-formatter/itip-view.c:451
-#: ../plugins/itip-formatter/itip-view.c:538
+#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:540
 msgid "An unknown person"
 msgstr "NgÆái lá"
 
-#: ../plugins/itip-formatter/itip-view.c:367
-#: ../plugins/itip-formatter/itip-view.c:455
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
-#| msgid "Please respond on behalf of <b>%s</b>"
 msgid "Please respond on behalf of %s"
 msgstr "Vui lÃng hái ÄÃp thay mát cho %s"
 
-#: ../plugins/itip-formatter/itip-view.c:369
-#: ../plugins/itip-formatter/itip-view.c:457
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:546
 #, fuzzy, c-format
 #| msgid "Received on behalf of <b>%s</b>"
 msgid "Received on behalf of %s"
 msgstr "Nhán ÄÆác thay mát cho <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, fuzzy, c-format
 #| msgid ""
 #| "<b>%s</b> through %s has published the following meeting information:"
 msgid "%s through %s has published the following meeting information:"
 msgstr "<b>%s</b> thÃng qua  %s  Äà xuát bán tin tác cuác háp nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has published the following meeting information:"
 msgid "%s has published the following meeting information:"
 msgstr "<b>%s</b> ÄÃ xuát bán tin tác cuác háp nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:383
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has delegated the following meeting to you:"
 msgid "%s has delegated the following meeting to you:"
 msgstr "<b>%s</b> ÄÃ áy nhiám cuác háp nÃy cho bán:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:386
 #, fuzzy, c-format
 #| msgid ""
 #| "<b>%s</b> through %s requests your presence at the following meeting:"
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> thÃng qua %s yÃu cáu sá hián dián cáa bán tái cuác háp nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, fuzzy, c-format
 #| msgid "<b>%s</b> requests your presence at the following meeting:"
 msgid "%s requests your presence at the following meeting:"
 msgstr "<b>%s</b> yÃu cáu sá hián dián cáa bán tái cuác háp nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> thÃng qua %s muán thÃm vÃo mát cuác háp ÄÃ cÃ:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, fuzzy, c-format
 #| msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgid "%s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> muán thÃm vÃo mát cuác háp ÄÃ cÃ:"
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, fuzzy, c-format
 #| msgid ""
 #| "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18571,7 +17887,7 @@ msgid ""
 "meeting:"
 msgstr "<b>%s</b> thÃng qua %s muán nhán tin tác vá cuác háp nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, fuzzy, c-format
 #| msgid ""
 #| "<b>%s</b> wishes to receive the latest information for the following "
@@ -18579,97 +17895,97 @@ msgstr "<b>%s</b> thÃng qua %s muán nhán tin tác vá cuác háp nÃy:"
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> muán nhán tin tác vá cuác háp nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> thÃng qua %s ÄÃ trá lái vá cuác háp:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has sent back the following meeting response:"
 msgid "%s has sent back the following meeting response:"
 msgstr "<b>%s</b> ÄÃ trá lái vá cuác háp:"
 
-#: ../plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:412
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgid "%s through %s has canceled the following meeting:"
 msgstr "<b>%s</b> thÃng qua  %s  Äà háy bá cuác háp nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:414
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has canceled the following meeting."
 msgid "%s has canceled the following meeting."
 msgstr "<b>%s</b> ÄÃ háy bá cuác háp nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:418
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> thÃng qua %s ÄÃ Äá nghá nháng thay Äái cuác háp nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:420
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has proposed the following meeting changes."
 msgid "%s has proposed the following meeting changes."
 msgstr "<b>%s</b> ÄÃ Äá nghá nháng thay Äái cuác háp nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:422
+#: ../plugins/itip-formatter/itip-view.c:424
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> thÃng qua %s ÄÃ tá chái nháng thay Äái cuác háp nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:426
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has declined the following meeting changes."
 msgid "%s has declined the following meeting changes."
 msgstr "<b>%s</b> ÄÃ tá chái nháng thay Äái cuác háp nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has published the following task:"
 msgid "%s through %s has published the following task:"
 msgstr "<b>%s</b> thÃng qua %s ÄÃ xuát bán tÃc vá nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has published the following task:"
 msgid "%s has published the following task:"
 msgstr "<b>%s</b> ÄÃ xuát bán tÃc vá nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../plugins/itip-formatter/itip-view.c:471
 #, fuzzy, c-format
 #| msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> yÃu cáu gÃn %s cho tÃc vá nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:472
+#: ../plugins/itip-formatter/itip-view.c:474
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has assigned you a task:"
 msgid "%s through %s has assigned you a task:"
 msgstr "<b>%s</b> thÃng qua %s ÄÃ gÃn bán cho tÃc vá nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has assigned you a task:"
 msgid "%s has assigned you a task:"
 msgstr "<b>%s</b> ÄÃ gÃn bán cho tÃc vá nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> thÃng qua %s muán thÃm vÃo tÃc vá ÄÃ cÃ:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, fuzzy, c-format
 #| msgid "<b>%s</b> wishes to add to an existing task:"
 msgid "%s wishes to add to an existing task:"
 msgstr "<b>%s</b> muán thÃm vÃo tÃc vá ÄÃ cÃ."
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, fuzzy, c-format
 #| msgid ""
 #| "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18679,7 +17995,7 @@ msgid ""
 "assigned task:"
 msgstr "<b>%s</b> thÃng qua %s muán nhán tin tác vá tÃc vá ÄÃ gÃn nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, fuzzy, c-format
 #| msgid ""
 #| "<b>%s</b> wishes to receive the latest information for the following "
@@ -18688,212 +18004,206 @@ msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "<b>%s</b> muán nhán tin tác vá tÃc vá ÄÃ gÃn nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, fuzzy, c-format
 #| msgid ""
 #| "<b>%s</b> through %s has sent back the following assigned task response:"
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> thÃng qua %s ÄÃ trá lái tÃc vá ÄÃ gÃn:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has sent back the following assigned task response:"
 msgid "%s has sent back the following assigned task response:"
 msgstr "<b>%s</b> ÄÃ trá lái tÃc vá ÄÃ gÃn:"
 
-#: ../plugins/itip-formatter/itip-view.c:498
+#: ../plugins/itip-formatter/itip-view.c:500
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> thÃng qua %s ÄÃ háy bá tÃc vá ÄÃ gÃn nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:500
+#: ../plugins/itip-formatter/itip-view.c:502
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has canceled the following assigned task:"
 msgid "%s has canceled the following assigned task:"
 msgstr "<b>%s</b> ÄÃ háy bá tÃc vá ÄÃ gÃn nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:504
+#: ../plugins/itip-formatter/itip-view.c:506
 #, fuzzy, c-format
 #| msgid ""
 #| "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> thÃng qua %s ÄÃ Äá nghá nháng thay Äái cÃch gÃn tÃc vá nÃy:."
 
-#: ../plugins/itip-formatter/itip-view.c:506
+#: ../plugins/itip-formatter/itip-view.c:508
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgid "%s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> ÄÃ Äá nghá nháng thay Äái cÃch gÃn tÃc vá nÃy:."
 
-#: ../plugins/itip-formatter/itip-view.c:510
+#: ../plugins/itip-formatter/itip-view.c:512
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgid "%s through %s has declined the following assigned task:"
 msgstr "Â<b>%s</b>Â thÃng qua %s ÄÃ tá chái tÃc vá ÄÃ gÃn nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:512
+#: ../plugins/itip-formatter/itip-view.c:514
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has declined the following assigned task:"
 msgid "%s has declined the following assigned task:"
 msgstr "<b>%s</b> ÄÃ tá chái tÃc vá ÄÃ gÃn nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../plugins/itip-formatter/itip-view.c:551
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has published the following memo:"
 msgid "%s through %s has published the following memo:"
 msgstr "<b>%s</b> thÃng qua %s ÄÃ xuát bán bán ghi nhá nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:551
+#: ../plugins/itip-formatter/itip-view.c:553
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has published the following memo:"
 msgid "%s has published the following memo:"
 msgstr "<b>%s</b> ÄÃ xuát bán bán ghi nhá nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:556
+#: ../plugins/itip-formatter/itip-view.c:558
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> thÃng qua %s muán thÃm vÃo mát bán ghi nhá ÄÃ cÃ:"
 
-#: ../plugins/itip-formatter/itip-view.c:558
+#: ../plugins/itip-formatter/itip-view.c:560
 #, fuzzy, c-format
 #| msgid "<b>%s</b> wishes to add to an existing memo:"
 msgid "%s wishes to add to an existing memo:"
 msgstr "<b>%s</b> muán thÃm vÃo mát bán ghi nhá ÄÃ cÃ:"
 
-#: ../plugins/itip-formatter/itip-view.c:562
+#: ../plugins/itip-formatter/itip-view.c:564
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> thÃng qua  %s  Äà háy bá bán ghi nhá dÃng chung nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:564
+#: ../plugins/itip-formatter/itip-view.c:566
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has canceled the following shared memo:"
 msgid "%s has canceled the following shared memo:"
 msgstr "<b>%s</b> ÄÃ háy bá bán ghi nhá dÃng chung nÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:688
+#: ../plugins/itip-formatter/itip-view.c:690
 msgid "All day:"
 msgstr "Trán ngÃy:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
-#| msgid "Sta_rt date:"
+#: ../plugins/itip-formatter/itip-view.c:700
 msgid "Start day:"
 msgstr "NgÃy bát Äáu:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1054
+#: ../plugins/itip-formatter/itip-view.c:700
+#: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Start time:"
 msgstr "Thái Äiám Äáu:"
 
-#: ../plugins/itip-formatter/itip-view.c:710
-#| msgid "%d day"
-#| msgid_plural "%d days"
+#: ../plugins/itip-formatter/itip-view.c:712
 msgid "End day:"
 msgstr "NgÃy kát thÃc:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1065
+#: ../plugins/itip-formatter/itip-view.c:712
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "End time:"
 msgstr "Thái Äiám kát thÃc:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Open Calendar"
 msgstr "_Má Lách"
 
-#: ../plugins/itip-formatter/itip-view.c:849
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:859
-#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:864
 #: ../plugins/itip-formatter/itip-view.c:881
+#: ../plugins/itip-formatter/itip-view.c:886
 msgid "_Decline"
 msgstr "_Tá chái"
 
-#: ../plugins/itip-formatter/itip-view.c:850
 #: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:862
-#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:867
 #: ../plugins/itip-formatter/itip-view.c:883
-#| msgid "Accept"
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "A_ccept"
 msgstr "_Cháp nhán"
 
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Decline all"
 msgstr "_Tá chái tát cá"
 
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative all"
 msgstr "Tá_m cháp nhán tát cá"
 
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:860
-#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:865
 #: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:887
 msgid "_Tentative"
 msgstr "Tám cháp _nhán"
 
-#: ../plugins/itip-formatter/itip-view.c:855
-#| msgid "_Accept all"
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "A_ccept all"
 msgstr "C_háp nhán tát cá"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:866
+#: ../plugins/itip-formatter/itip-view.c:871
 msgid "_Send Information"
 msgstr "_Gái thÃng tin"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:875
 msgid "_Update Attendee Status"
 msgstr "_Cáp nhát tráng thÃi ngÆái dá"
 
-#: ../plugins/itip-formatter/itip-view.c:873
+#: ../plugins/itip-formatter/itip-view.c:878
 msgid "_Update"
 msgstr "_Cáp nhát"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1085
-#: ../plugins/itip-formatter/itip-view.c:1139
+#: ../plugins/itip-formatter/itip-view.c:1093
+#: ../plugins/itip-formatter/itip-view.c:1147
 msgid "Comment:"
 msgstr "Ghi chÃ:"
 
-#: ../plugins/itip-formatter/itip-view.c:1124
+#: ../plugins/itip-formatter/itip-view.c:1132
 msgid "Send _reply to sender"
 msgstr "T_rá lái ngÆái gái"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "Send _updates to attendees"
 msgstr "Gái bán cá_p nhát cho cÃc ngÆái dá"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "_Apply to all instances"
 msgstr "Ã_p dáng cho mái lán"
 
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "Show time as _free"
 msgstr "Hián giá là _ránh"
 
-#: ../plugins/itip-formatter/itip-view.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1183
 msgid "_Preserve my reminder"
 msgstr "_Báo tán lái nhác nhá mÃnh"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1181
+#: ../plugins/itip-formatter/itip-view.c:1189
 msgid "_Inherit reminder"
 msgstr "Ká tháa gh_i nhá"
 
-#: ../plugins/itip-formatter/itip-view.c:1924
+#: ../plugins/itip-formatter/itip-view.c:1965
 msgid "_Tasks:"
 msgstr "_TÃc vá:"
 
-#: ../plugins/itip-formatter/itip-view.c:1926
-#| msgid "_Memos"
+#: ../plugins/itip-formatter/itip-view.c:1967
 msgid "_Memos:"
 msgstr "Ghi _nhá:"
 
@@ -18933,18 +18243,10 @@ msgid "Beep or play sound file."
 msgstr "KÃu bÃp hay phÃt táp tin Ãm thanh."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable D-Bus messages."
-msgstr "Bát thÃng Äiáp D-Bus."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
-msgstr "Hián thá biáu tÆáng trong vÃng thÃng bÃo."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "Táo ra mát thÃng Äiáp D-BUS khi nhán thÆ mái."
+msgstr "Hián thá biáu tÆáng trong vÃng thÃng bÃo."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
@@ -18952,15 +18254,15 @@ msgstr ""
 "ÄÃng (\"true\") thà kÃu BÃp, khÃng thà phÃt táp tin Ãm thanh khi nhán thÆ "
 "mái."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Notify new messages for Inbox only."
 msgstr "ThÃng bÃo vá thÆ mái chá trong háp thÆ nhán."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid "Play sound when new messages arrive."
 msgstr "PhÃt Ãm thanh khi nhán thÆ mái"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 #, fuzzy
 #| msgid ""
 #| "Sound file to be played when new messages arrive, if not in beep mode."
@@ -18968,43 +18270,34 @@ msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
 "Táp tin Ãm thanh cán phÃt khi nhán thÆ mái, náu khÃng phái á chá Äá kÃu bÃp."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Popup message together with the icon."
-msgstr "Hián thá thÃng Äiáp cÃng vái biáu tÆáng."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "Hián thá biáu tÆáng thÆ mái trong vÃng thÃng bÃo khi nhán thÆ má."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Sound file name to be played."
 msgstr "TÃn cáa táp tin Ãm thanh cán phÃt."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "Táp tin Ãm thanh cán phÃt khi nhán thÆ mái, náu khÃng phái á chá Äá kÃu bÃp."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 #, fuzzy
 #| msgid "Use underline"
 msgid "Use sound theme"
 msgstr "DÃng gách chÃn"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "CÃ nÃn phÃt Ãm thanh hay kÃu bÃp khi nhán thÆ mái."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
-msgid "Whether show message over the icon when new messages arrive."
-msgstr ""
-"CÃ nÃn hián thá thÃng Äiáp á trÃn biáu tÆáng hay khÃng, khi nhán thÆ mái."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "CÃ nÃn thÃng bÃo chá vá thÆ mái trong háp thÆ nhán, hay khÃng."
 
-#: ../plugins/mail-notification/mail-notification.c:390
+#: ../plugins/mail-notification/mail-notification.c:391
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19016,73 +18309,69 @@ msgstr[0] ""
 "Bán ÄÃ nhán %d thÆ mái\n"
 "trong %s."
 
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:402
-#, fuzzy, c-format
-#| msgid "From %s:"
-msgid "From: %s"
-msgstr "Tá %s:"
-
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:415
+#: ../plugins/mail-notification/mail-notification.c:416
 #, fuzzy, c-format
 #| msgid "Subject:"
 msgid "Subject: %s"
 msgstr "Chá Äá:"
 
-#: ../plugins/mail-notification/mail-notification.c:425
+#: ../plugins/mail-notification/mail-notification.c:427
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Bán ÄÃ nhán %d thÆ mái."
 
-#: ../plugins/mail-notification/mail-notification.c:438
-#: ../plugins/mail-notification/mail-notification.c:446
-#: ../plugins/mail-notification/mail-notification.c:449
+#: ../plugins/mail-notification/mail-notification.c:436
+#: ../plugins/mail-notification/mail-notification.c:444
+#: ../plugins/mail-notification/mail-notification.c:447
 msgid "New email"
 msgstr "ThÆ mái"
 
-#: ../plugins/mail-notification/mail-notification.c:498
-msgid "Show icon in _notification area"
-msgstr "Hiá_n thá biáu tÆáng trong vÃng thÃng bÃo"
-
-#: ../plugins/mail-notification/mail-notification.c:528
-msgid "Popup _message together with the icon"
-msgstr "Hián thá thÃng Äiáp cÃng _vái biáu tÆáng"
+#. Translators: The '%s' is a mail
+#. * folder name.  (e.g. "Show Inbox")
+#: ../plugins/mail-notification/mail-notification.c:468
+#, fuzzy, c-format
+#| msgid "Show Fields"
+msgid "Show %s"
+msgstr "Hián trÆáng"
 
-#: ../plugins/mail-notification/mail-notification.c:715
-msgid "_Play sound when new messages arrive"
+#: ../plugins/mail-notification/mail-notification.c:673
+#, fuzzy
+#| msgid "_Play sound when new messages arrive"
+msgid "_Play sound when a new message arrives"
 msgstr "_PhÃt Ãm thanh khi nhán thÆ mái"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:703
 msgid "_Beep"
 msgstr "KÃu _bÃp"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:716
 #, fuzzy
 #| msgid "Use underline"
 msgid "Use sound _theme"
 msgstr "DÃng gách chÃn"
 
-#: ../plugins/mail-notification/mail-notification.c:777
+#: ../plugins/mail-notification/mail-notification.c:735
 #, fuzzy
 #| msgid "Play _sound file"
 msgid "Play _file:"
 msgstr "PhÃt táp tin Ã_m thanh"
 
-#: ../plugins/mail-notification/mail-notification.c:788
+#: ../plugins/mail-notification/mail-notification.c:744
 msgid "Select sound file"
 msgstr "Chán táp tin Ãm thanh"
 
-#: ../plugins/mail-notification/mail-notification.c:846
+#: ../plugins/mail-notification/mail-notification.c:801
 msgid "Notify new messages for _Inbox only"
 msgstr "ThÃng bÃo vá thÆ má_i chá trong háp thÆ nhán"
 
-#: ../plugins/mail-notification/mail-notification.c:855
-msgid "Generate a _D-Bus message"
-msgstr "Táo ra mát thÃng Äiáp _D-Bus"
+#: ../plugins/mail-notification/mail-notification.c:811
+#, fuzzy
+#| msgid "Show new mail icon in notification area when new messages arrive."
+msgid "Show _notification when a new message arrives"
+msgstr "Hián thá biáu tÆáng thÆ mái trong vÃng thÃng bÃo khi nhán thÆ má."
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
@@ -19095,117 +18384,81 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "PhÃt Ãm thanh khi nhán thÆ mái"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:157
+#: ../plugins/mail-to-task/mail-to-task.c:238
 #, c-format
 msgid "Created from a mail by %s"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:489
+#: ../plugins/mail-to-task/mail-to-task.c:603
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:492
+#: ../plugins/mail-to-task/mail-to-task.c:606
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:495
+#: ../plugins/mail-to-task/mail-to-task.c:609
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 msgstr ""
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:515
+#: ../plugins/mail-to-task/mail-to-task.c:626
+#, c-format
 msgid ""
-"Selected calendar contains some events for the given mails already. Would "
-"you like to create new events anyway?"
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
 msgstr ""
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:521
+#: ../plugins/mail-to-task/mail-to-task.c:629
+#, c-format
 msgid ""
-"Selected task list contains some tasks for the given mails already. Would "
-"you like to create new tasks anyway?"
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
 msgstr ""
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:527
+#: ../plugins/mail-to-task/mail-to-task.c:632
+#, c-format
 msgid ""
-"Selected memo list contains some memos for the given mails already. Would "
-"you like to create new memos anyway?"
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
 msgstr ""
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:548
-msgid ""
-"Selected calendar contains an event for the given mail already. Would you "
-"like to create new event anyway?"
-msgid_plural ""
-"Selected calendar contains events for the given mails already. Would you "
-"like to create new events anyway?"
-msgstr[0] ""
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:557
-msgid ""
-"Selected task list contains a task for the given mail already. Would you "
-"like to create new task anyway?"
-msgid_plural ""
-"Selected task list contains tasks for the given mails already. Would you "
-"like to create new tasks anyway?"
-msgstr[0] ""
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:566
-msgid ""
-"Selected memo list contains a memo for the given mail already. Would you "
-"like to create new memo anyway?"
-msgid_plural ""
-"Selected memo list contains memos for the given mails already. Would you "
-"like to create new memos anyway?"
-msgstr[0] ""
+#: ../plugins/mail-to-task/mail-to-task.c:651
+#, fuzzy
+#| msgid "Do you wish to overwrite it?"
+msgid "Do you wish to continue converting remaining mails?"
+msgstr "Bán cà muán ghi Äà lÃn nà khÃng?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:726
 #, fuzzy
 #| msgid "No Summary"
 msgid "[No Summary]"
 msgstr "KhÃng cà bán tÃm tát"
 
-#: ../plugins/mail-to-task/mail-to-task.c:636
+#: ../plugins/mail-to-task/mail-to-task.c:738
 msgid "Invalid object returned from a server"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:707
+#: ../plugins/mail-to-task/mail-to-task.c:788
 #, fuzzy, c-format
 #| msgid "An error occurred while printing"
 msgid "An error occurred during processing: %s"
 msgstr "Gáp lái trong khi in."
 
-#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:813
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "KhÃng thá má lách: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:743
+#: ../plugins/mail-to-task/mail-to-task.c:820
 #, fuzzy
 #| msgid ""
 #| "Selected source is read only, thus cannot create task there. Select other "
@@ -19216,14 +18469,14 @@ msgid ""
 msgstr ""
 "Bán ÄÃ chán nguán chá-Äác nÃn khÃng thá táo tÃc vá á ÄÃ. HÃy chán nguán khÃc."
 
-#: ../plugins/mail-to-task/mail-to-task.c:746
+#: ../plugins/mail-to-task/mail-to-task.c:823
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr ""
 "Bán ÄÃ chán nguán chá-Äác nÃn khÃng thá táo tÃc vá á ÄÃ. HÃy chán nguán khÃc."
 
-#: ../plugins/mail-to-task/mail-to-task.c:749
+#: ../plugins/mail-to-task/mail-to-task.c:826
 #, fuzzy
 #| msgid ""
 #| "Selected source is read only, thus cannot create task there. Select other "
@@ -19234,55 +18487,61 @@ msgid ""
 msgstr ""
 "Bán ÄÃ chán nguán chá-Äác nÃn khÃng thá táo tÃc vá á ÄÃ. HÃy chán nguán khÃc."
 
-#: ../plugins/mail-to-task/mail-to-task.c:955
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 #, fuzzy, c-format
 #| msgid "Cannot open source \"{2}\"."
 msgid "Cannot get source list. %s"
 msgstr "KhÃng thá má nguán  {2} Â."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1138
+#, fuzzy
+#| msgid "No description available."
+msgid "No writable calendar is available."
+msgstr "KhÃng cà mà tá."
+
+#: ../plugins/mail-to-task/mail-to-task.c:1230
 #, fuzzy
 #| msgid "_Create new view"
 msgid "Create an _Event"
 msgstr "Tá_o à xem mái"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1232
 #, fuzzy
 #| msgid "Compose a reply to the sender of the selected message"
 msgid "Create a new event from the selected message"
 msgstr "Viát thÆ trá lái cho ngÆái gái thÆ ÄÃ chán"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1081
+#: ../plugins/mail-to-task/mail-to-task.c:1237
 #, fuzzy
 #| msgid "Create a new memo"
 msgid "Create a Mem_o"
 msgstr "Táo ghi nhá mái"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1083
+#: ../plugins/mail-to-task/mail-to-task.c:1239
 #, fuzzy
 #| msgid "Compose a reply to the sender of the selected message"
 msgid "Create a new memo from the selected message"
 msgstr "Viát thÆ trá lái cho ngÆái gái thÆ ÄÃ chán"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1088
+#: ../plugins/mail-to-task/mail-to-task.c:1244
 #, fuzzy
 #| msgid "Create a new task"
 msgid "Create a _Task"
 msgstr "Táo tÃc vá mái"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1090
+#: ../plugins/mail-to-task/mail-to-task.c:1246
 #, fuzzy
 #| msgid "Compose a reply to the sender of the selected message"
 msgid "Create a new task from the selected message"
 msgstr "Viát thÆ trá lái cho ngÆái gái thÆ ÄÃ chán"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1098
+#: ../plugins/mail-to-task/mail-to-task.c:1254
 #, fuzzy
 #| msgid "New _Meeting"
 msgid "Create a _Meeting"
 msgstr "Cuác _háp mái"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1100
+#: ../plugins/mail-to-task/mail-to-task.c:1256
 #, fuzzy
 #| msgid "Create a new meeting request"
 msgid "Create a new meeting from the selected message"
@@ -19294,57 +18553,57 @@ msgstr "Táo yÃu cáu cuác háp mái"
 msgid "Convert a mail message to a task."
 msgstr "Chuyán Äái thÆ ÄÃ chán sang tÃc vá mái"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:294
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:346
 msgid "Get List _Archive"
 msgstr "Láy _kho háp"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:296
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:348
 msgid "Get an archive of the list this message belongs to"
 msgstr "Láy kho cáa háp thÆ chung cáa thÆ nÃy"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:301
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:353
 msgid "Get List _Usage Information"
 msgstr "Gái thÃng tin vá cÃch sá _dáng háp"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:303
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:355
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Láy thÃng tin vá cÃch sá dáng háp thÆ chung cáa thÆ nÃy"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:308
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:360
 msgid "Contact List _Owner"
 msgstr "LiÃn lác vái ngÆái _sá háu há"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:310
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:362
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "LiÃn lác vái ngÆái chá háp thÆ chung cáa thÆ nÃy."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:315
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
 msgid "_Post Message to List"
 msgstr "_Gái thÆ cho háp"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:317
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Gái thÆ cho háp thÆ chung cáa thÆ nÃy"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:322
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
 msgid "_Subscribe to List"
 msgstr "ÄÄng _kà vái háp"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:324
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "ÄÄng kà vái háp thÆ chung cáa thÆ nÃy"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:329
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
 msgid "_Unsubscribe from List"
 msgstr "_Bá ÄÄng kà khái háp"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:331
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
 #, fuzzy
 #| msgid "Unsubscribe to the mailing list this message belongs to"
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Bá ÄÄng kà vái háp thÆ chung cáa thÆ nÃy"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:338
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
 msgid "Mailing _List"
 msgstr "_Háp thÆ chung"
 
@@ -19450,19 +18709,19 @@ msgstr ""
 "Muán ÄÃnh dáu cÃc thÆ ÄÃ Äác chá trong thÆ mác hián thái, hoác trong thÆ mác "
 "hián thái cÅng nhÆ tát cá cÃc thÆ mác con ?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:196
+#: ../plugins/mark-all-read/mark-all-read.c:215
 #, fuzzy
 #| msgid "Current Folder and _Subfolders"
 msgid "In Current Folder and _Subfolders"
 msgstr "ThÆ mác hián thái và cÃc thÆ mác c_on"
 
-#: ../plugins/mark-all-read/mark-all-read.c:210
+#: ../plugins/mark-all-read/mark-all-read.c:229
 #, fuzzy
 #| msgid "Current _Folder Only"
 msgid "In Current _Folder Only"
 msgstr "Chá thÆ _mác hián thái"
 
-#: ../plugins/mark-all-read/mark-all-read.c:447
+#: ../plugins/mark-all-read/mark-all-read.c:575
 msgid "Mark Me_ssages as Read"
 msgstr "ÄÃnh dá_u thÆ ÄÃ Äác"
 
@@ -19482,7 +18741,6 @@ msgid "Plain Text Mode"
 msgstr "Chá Äá chá thÃ"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
-#| msgid "Prefer plain-text"
 msgid "Prefer Plain Text"
 msgstr "Æu tiÃn vÄn bán thÃ"
 
@@ -19490,52 +18748,42 @@ msgstr "Æu tiÃn vÄn bán thÃ"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:225
+#: ../plugins/prefer-plain/prefer-plain.c:251
 msgid "Show HTML if present"
 msgstr "Hián thá HTML náu cÃ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:225
+#: ../plugins/prefer-plain/prefer-plain.c:252
 msgid "Let Evolution choose the best part to show."
 msgstr "Äá Evolution tá chán cÃi gà tát nhát."
 
-#: ../plugins/prefer-plain/prefer-plain.c:226
-#| msgid "Show HTML if present"
+#: ../plugins/prefer-plain/prefer-plain.c:255
 msgid "Show plain text if present"
 msgstr "Hián vÄn bán thà náu cÃ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:226
+#: ../plugins/prefer-plain/prefer-plain.c:256
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr "Hián vÄn bán thà náu cÃ, khÃng thà Äá Evolution tá chán."
 
-#: ../plugins/prefer-plain/prefer-plain.c:227
-#| msgid "Only ever show PLAIN"
+#: ../plugins/prefer-plain/prefer-plain.c:260
 msgid "Only ever show plain text"
 msgstr "LuÃn luÃn chá hián vÄn bán thÃ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:227
+#: ../plugins/prefer-plain/prefer-plain.c:261
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:274
+#: ../plugins/prefer-plain/prefer-plain.c:313
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:294
+#: ../plugins/prefer-plain/prefer-plain.c:333
 msgid "HTML _Mode"
 msgstr "Chá Äá HT_ML"
 
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
-msgid "Evolution Profiler"
-msgstr "Bá táo há sÆ Evolution"
-
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Profile data events in Evolution (for developers only)."
-msgstr ""
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
 msgstr "Nháp cÃc thÆ Outlook tá táp tin PST"
@@ -19548,42 +18796,38 @@ msgstr "Nháp PST Outlook"
 msgid "Outlook personal folders (.pst)"
 msgstr "CÃc thÆ mác cà nhÃn Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:311
+#: ../plugins/pst-import/pst-importer.c:450
 msgid "_Mail"
 msgstr "_ThÆ tÃn"
 
-#: ../plugins/pst-import/pst-importer.c:323
+#: ../plugins/pst-import/pst-importer.c:469
 msgid "Destination folder:"
 msgstr "ThÆ mác ÄÃch:"
 
-#. Address book
-#: ../plugins/pst-import/pst-importer.c:329
+#: ../plugins/pst-import/pst-importer.c:475
 msgid "_Address Book"
 msgstr "Sá Äá_a chá"
 
-#. Appointments
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:476
 msgid "A_ppointments"
 msgstr "C_uác hán"
 
-#. Tasks
-#: ../plugins/pst-import/pst-importer.c:342 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:477 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_TÃc vá"
 
-#. Journal
-#: ../plugins/pst-import/pst-importer.c:348
+#: ../plugins/pst-import/pst-importer.c:478
 msgid "_Journal entries"
 msgstr "Mác nháp Nhát _kÃ"
 
-#: ../plugins/pst-import/pst-importer.c:363
+#: ../plugins/pst-import/pst-importer.c:585
 msgid "Importing Outlook data"
 msgstr "Äang nháp dá liáu Outlook"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:146
-#: ../plugins/publish-calendar/publish-calendar.c:154
-#: ../plugins/publish-calendar/publish-calendar.c:156
+#: ../plugins/publish-calendar/publish-calendar.c:147
+#: ../plugins/publish-calendar/publish-calendar.c:155
+#: ../plugins/publish-calendar/publish-calendar.c:157
 msgid "Calendar Publishing"
 msgstr "Xuát bán lách"
 
@@ -19597,62 +18841,59 @@ msgstr "Äáa Äiám"
 msgid "Publish calendars to the web."
 msgstr "Cho phÃp xuát bán lách vÃo Web"
 
-#: ../plugins/publish-calendar/publish-calendar.c:212
-#: ../plugins/publish-calendar/publish-calendar.c:453
+#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../plugins/publish-calendar/publish-calendar.c:471
 #, fuzzy, c-format
 #| msgid "Could not open source"
 msgid "Could not open %s:"
 msgstr "KhÃng thá má nguán."
 
-#: ../plugins/publish-calendar/publish-calendar.c:214
+#: ../plugins/publish-calendar/publish-calendar.c:218
 #, fuzzy, c-format
 #| msgid "Could not parse PGP message: Unknown error"
 msgid "Could not open %s: Unknown error"
 msgstr "KhÃng thá phÃn tÃch thÆ PGP: lái khÃng rÃ"
 
-#: ../plugins/publish-calendar/publish-calendar.c:234
+#: ../plugins/publish-calendar/publish-calendar.c:238
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:236
+#: ../plugins/publish-calendar/publish-calendar.c:240
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:280
+#: ../plugins/publish-calendar/publish-calendar.c:288
 #, c-format
 msgid "Mount of %s failed:"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:600
+#: ../plugins/publish-calendar/publish-calendar.c:619
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "_Bát"
 
-#: ../plugins/publish-calendar/publish-calendar.c:743
+#: ../plugins/publish-calendar/publish-calendar.c:767
 msgid "Are you sure you want to remove this location?"
 msgstr "Bán cà chác muán gá bá Äáa chá nÃy khÃng?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
-#. where the publishing should be done, fails. Basically, this shouldn't
-#. ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1055
-#| msgid "Could not create message."
+#. * where the publishing should be done, fails. Basically, this shouldn't
+#. * ever happen, and if so, then something is really wrong.
+#: ../plugins/publish-calendar/publish-calendar.c:1099
 msgid "Could not create publish thread."
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:1063
+#: ../plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "_Xuát bán thÃng tin lách"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
-#| msgid "Custom Notification"
 msgid "Custom Location"
 msgstr "Vá trà tá chán"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:3
-#| msgid "Day"
 msgid "Daily"
 msgstr "HÃng ngÃy"
 
@@ -19661,10 +18902,6 @@ msgid "FTP (with login)"
 msgstr "FTP (cán ÄÄng nháp)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:9
-#| msgid ""
-#| "Daily\n"
-#| "Weekly\n"
-#| "Manual (via Actions menu)"
 msgid "Manual (via Actions menu)"
 msgstr "Tá chán (qua trÃnh ÄÆn HÃnh Äáng)"
 
@@ -19673,7 +18910,6 @@ msgid "P_ort:"
 msgstr "_Cáng:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:12
-#| msgid "Public"
 msgid "Public FTP"
 msgstr "FTP CÃng cáng"
 
@@ -19698,27 +18934,22 @@ msgid "Service _type:"
 msgstr "_Kiáu dách vá:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:18
-#| msgid "Source"
 msgid "Sources"
 msgstr "Nguán"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:19
-#| msgid "Time _zone:"
 msgid "Time _duration:"
 msgstr ""
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:20
-#| msgid "WebDAV"
 msgid "WebDAV (HTTP)"
 msgstr "WebDAV (HTTP)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
-#| msgid "Week"
 msgid "Weekly"
 msgstr "HÃng tuán"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#| msgid "_Window"
 msgid "Windows share"
 msgstr ""
 
@@ -19743,176 +18974,117 @@ msgid "_Username:"
 msgstr "TÃn _ngÆái dÃng:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:31
-#| msgid "Call"
 msgid "iCal"
 msgstr "iCal"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:69
-#: ../plugins/publish-calendar/publish-format-ical.c:82
+#: ../plugins/publish-calendar/publish-format-fb.c:95
+#: ../plugins/publish-calendar/publish-format-ical.c:92
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr ""
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:481
+#: ../plugins/publish-calendar/url-editor-dialog.c:518
 msgid "New Location"
 msgstr "Äáa chá mái"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:483
+#: ../plugins/publish-calendar/url-editor-dialog.c:520
 msgid "Edit Location"
 msgstr "Sáa Äáa chá"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
-#, c-format
-msgid "SpamAssassin not found, code: %d"
-msgstr "KhÃng tÃm tháy SpamAssassin, mÃ: %d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
-#, c-format
-msgid "Failed to create pipe: %s"
-msgstr "Lái táo áng dán: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
-#, c-format
-msgid "Error after fork: %s"
-msgstr "Lái sau khi táo tián trÃnh con: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
-#, c-format
-msgid "SpamAssassin child process does not respond, killing..."
-msgstr "Tián trÃnh con SpamAssassin khÃng ÄÃp áng nÃn buác kát thÃc..."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
-#, c-format
-msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr "Khoáng Äái tián trÃnh con SpamAssassin bá giÃn Äoán nÃn chám dát..."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
-#, c-format
-msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr "Lái gái dá liáu qua áng dán cho SpamAssassin, mà lái: %d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
-#, c-format
-#| msgid "SpamAssassin is not available."
-msgid "SpamAssassin is not available. Please install it first."
-msgstr "SpamAssassin khÃng cÃ. HÃy cÃi SpamAssassin trÆác."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:940
-msgid "This will make SpamAssassin more reliable, but slower"
-msgstr "Viác nÃy giÃp SpamAssasin ÄÃng tin hÆn, cÃn chám hÆn"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:948
-msgid "I_nclude remote tests"
-msgstr "_Bao gám cÃc phÃp thá tá xa"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-#| msgid "Filters junk messages using Bogofilter."
-msgid "Filter junk messages using SpamAssassin."
-msgstr "Lác ra thÆ rÃc báng SpamAssassin."
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-#| msgid "SpamAssassin junk plugin"
-msgid "SpamAssassin Junk Filter"
-msgstr "Bá thÆ rÃc SpamAssassin"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin Options"
-msgstr "TÃy chán SpamAssassin"
-
-#.
-#. * Translator: the %F %T is the thirth argument for a strftime function.
-#. * It lets you define the formatting of the date in the csv-file.
-#. *
-#: ../plugins/save-calendar/csv-format.c:161
+#. Translators: the %F %T is the third argument for a
+#. * strftime function.  It lets you define the formatting
+#. * of the date in the csv-file.
+#: ../plugins/save-calendar/csv-format.c:168
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Description List"
 msgstr "Danh sÃch mà tá"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Categories List"
 msgstr "Danh sÃch Loái"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Comment List"
 msgstr "Danh sÃch Ghi chÃ"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Contact List"
 msgstr "Danh sÃch liÃn lác"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Start"
 msgstr "Bát Äáu"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:391
 msgid "End"
 msgstr "Kát thÃc"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:392
 msgid "Due"
 msgstr "Äán hán"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:393
 msgid "percent Done"
 msgstr "Phán trÄm xong"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:395
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:396
 msgid "Attendees List"
 msgstr "Danh sÃch ngÆái dá"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:398
 msgid "Modified"
 msgstr "ÄÃ sáa Äái"
 
-#: ../plugins/save-calendar/csv-format.c:530
+#: ../plugins/save-calendar/csv-format.c:573
 #, fuzzy
 #| msgid "Advanced options for the CSV format"
 msgid "A_dvanced options for the CSV format"
 msgstr "TÃy chán cáp cao cho khuÃn dáng CSV"
 
-#: ../plugins/save-calendar/csv-format.c:537
+#: ../plugins/save-calendar/csv-format.c:581
 #, fuzzy
 #| msgid "Prepend a header"
 msgid "Prepend a _header"
 msgstr "ThÃm dÃng Äáu vÃo Äáu"
 
-#: ../plugins/save-calendar/csv-format.c:546
+#: ../plugins/save-calendar/csv-format.c:590
 #, fuzzy
 #| msgid "Value delimiter:"
 msgid "_Value delimiter:"
 msgstr "Dáu Äánh giái già trá:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:601
 #, fuzzy
 #| msgid "Record delimiter:"
 msgid "_Record delimiter:"
 msgstr "Dáu Äánh giái mác ghi:"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:612
 #, fuzzy
 #| msgid "Encapsulate values with:"
 msgid "_Encapsulate values with:"
 msgstr "Bao già trá báng:"
 
-#: ../plugins/save-calendar/csv-format.c:582
-msgid "Comma separated value format (.csv)"
+#: ../plugins/save-calendar/csv-format.c:638
+#, fuzzy
+#| msgid "Comma separated value format (.csv)"
+msgid "Comma separated values (.csv)"
 msgstr "KhuÃn dáng già trá Äánh giái báng dáu pháy (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:162
-msgid "iCalendar format (.ics)"
-msgstr "Táp tin iCalendar (.ics)"
+#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:225
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
@@ -19929,36 +19101,37 @@ msgstr "LÆu cÃc lách hay tÃc vá Äáu ÄÃ chán vÃo ÄÄa."
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:147
+#: ../plugins/save-calendar/rdf-format.c:156
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:369
-msgid "RDF format (.rdf)"
+#: ../plugins/save-calendar/rdf-format.c:389
+#, fuzzy
+#| msgid "RDF format (.rdf)"
+msgid "RDF (.rdf)"
 msgstr "KhuÃn dáng RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
-#| msgid "Format"
+#: ../plugins/save-calendar/save-calendar.c:127
 msgid "_Format:"
 msgstr "Äánh _dáng:"
 
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:189
 msgid "Select destination file"
 msgstr "Chán táp tin ÄÃch"
 
-#: ../plugins/save-calendar/save-calendar.c:334
+#: ../plugins/save-calendar/save-calendar.c:344
 #, fuzzy
 #| msgid "Saves selected calendar or tasks list to disk."
 msgid "Save the selected calendar to disk"
 msgstr "LÆu cÃc lách hay tÃc vá Äáu ÄÃ chán vÃo ÄÄa."
 
-#: ../plugins/save-calendar/save-calendar.c:365
+#: ../plugins/save-calendar/save-calendar.c:375
 #, fuzzy
 #| msgid "Saves selected calendar or tasks list to disk."
 msgid "Save the selected memo list to disk"
 msgstr "LÆu cÃc lách hay tÃc vá Äáu ÄÃ chán vÃo ÄÄa."
 
-#: ../plugins/save-calendar/save-calendar.c:396
+#: ../plugins/save-calendar/save-calendar.c:406
 #, fuzzy
 #| msgid "Saves selected calendar or tasks list to disk."
 msgid "Save the selected task list to disk"
@@ -19968,22 +19141,26 @@ msgstr "LÆu cÃc lách hay tÃc vá Äáu ÄÃ chán vÃo ÄÄa."
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
-msgstr "Danh sÃch cÃc cáp tá-khoÃ/giÃ-trá cho phán bá sung Máu thay thá trong nái dung thÆ."
+msgstr ""
+"Danh sÃch cÃc cáp tá-khoÃ/giÃ-trá cho phán bá sung Máu thay thá trong nái "
+"dung thÆ."
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "Phán bá sung máu dáa vÃo bán nhÃp"
+msgid ""
+"Drafts based template plugin. You can use variables like $ORIG[subject], "
+"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
+"an email you are replying to."
+msgstr ""
 
-#: ../plugins/templates/templates.c:631
-#| msgid "No title"
+#: ../plugins/templates/templates.c:1094
 msgid "No Title"
 msgstr "KhÃng tÃn"
 
-#: ../plugins/templates/templates.c:741
+#: ../plugins/templates/templates.c:1195
 msgid "Save as _Template"
 msgstr "LÆu dáng _máu"
 
-#: ../plugins/templates/templates.c:743
+#: ../plugins/templates/templates.c:1197
 msgid "Save as Template"
 msgstr "LÆu lÃm máu"
 
@@ -19992,12 +19169,10 @@ msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
 msgstr ""
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-#| msgid "TNEF Attachment decoder"
 msgid "TNEF Decoder"
 msgstr "Bá giái mà ÄÃnh kÃm TNEF"
 
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
-#| msgid "Multiple vCards"
 msgid "Inline vCards"
 msgstr ""
 
@@ -20005,36 +19180,30 @@ msgstr ""
 msgid "Show vCards directly in mail messages."
 msgstr ""
 
-#: ../plugins/vcard-inline/vcard-inline.c:195
-#: ../plugins/vcard-inline/vcard-inline.c:280
+#: ../plugins/vcard-inline/vcard-inline.c:207
+#: ../plugins/vcard-inline/vcard-inline.c:292
 msgid "Show Full vCard"
 msgstr "Hián toÃn vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:198
+#: ../plugins/vcard-inline/vcard-inline.c:210
 msgid "Show Compact vCard"
 msgstr "Hián vCard tÃm gán"
 
-#: ../plugins/vcard-inline/vcard-inline.c:259
-#| msgid "There is one other contact."
-#| msgid_plural "There are %d other contacts."
+#: ../plugins/vcard-inline/vcard-inline.c:271
 msgid "There is one other contact."
 msgstr "CÃ %d liÃn lác khÃc."
 
-#: ../plugins/vcard-inline/vcard-inline.c:268
+#: ../plugins/vcard-inline/vcard-inline.c:280
 #, c-format
-#| msgid "There is one other contact."
-#| msgid_plural "There are %d other contacts."
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "CÃ %d liÃn lác khÃc."
 
-#: ../plugins/vcard-inline/vcard-inline.c:289
-#| msgid "Save in address book"
+#: ../plugins/vcard-inline/vcard-inline.c:301
 msgid "Save in Address Book"
 msgstr "LÆu vÃo sá Äáa chá"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-#| msgid "WebDAV contacts"
 msgid "Add WebDAV contacts to Evolution."
 msgstr "ThÃm liÃn lác WebDAV vÃo Evolution."
 
@@ -20046,11 +19215,11 @@ msgstr "LiÃn lác WebDAV"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:283
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "TrÃnh dÃng I_fMatch (yÃu cáu trÃn Apache < 2.2.8)"
 
@@ -20071,12 +19240,10 @@ msgid "Default sidebar width"
 msgstr "Äá ráng khung lá mác Äánh"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
-#| msgid "Default window state"
 msgid "Default window X coordinate"
 msgstr "Toá Äá X mác Äánh cáa cáa sá"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:6
-#| msgid "Default window state"
 msgid "Default window Y coordinate"
 msgstr "Toá Äá Y mác Äánh cáa cáa sá"
 
@@ -20093,7 +19260,6 @@ msgid "Default window width"
 msgstr "Äá ráng cáa sá mác Äánh"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
-#| msgid "Enable search folders"
 msgid "Enable express mode"
 msgstr "Bát tÃm nhanh"
 
@@ -20139,12 +19305,10 @@ msgstr ""
 "keyring) hoác táp tin mát kháu  ~/.gnome2_private/Evolution Â."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
-#| msgid "Insert Attachment"
 msgid "Initial attachment view"
 msgstr "Khung xem Äinh kÃm ban Äáu"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:20
-#| msgid "Install the shared folder"
 msgid "Initial file chooser folder"
 msgstr "ThÆ mác bá chán táp tin ban Äáu"
 
@@ -20218,7 +19382,7 @@ msgstr "Hián khung lá"
 msgid "Skip development warning dialog"
 msgstr "Bá qua háp thoái cánh bÃo phÃt trián"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:371
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
 msgid "Start in offline mode"
 msgstr "Khái cháy trong chá Äá ngoái tuyán"
 
@@ -20235,12 +19399,10 @@ msgstr ""
 "2.6.0 Â)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
-#| msgid "The default width for the main window, in pixels."
 msgid "The default X coordinate for the main window."
 msgstr "Toá Äá X mác Äánh cáa cáa sá chÃnh."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:39
-#| msgid "The default width for the main window, in pixels."
 msgid "The default Y coordinate for the main window."
 msgstr "Toá Äá Y mác Äánh cáa cáa sá chÃnh."
 
@@ -20336,7 +19498,9 @@ msgid "Use HTTP proxy"
 msgstr "DÃng áy nhiám HTTP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "User name to pass as authentication when doing HTTP proxying."
+#, fuzzy
+#| msgid "User name to pass as authentication when doing HTTP proxying."
+msgid "Username to pass as authentication when doing HTTP proxying."
 msgstr ""
 "TÃn ngÆái dÃng cán gái Äá xÃc thác khi kát nái qua mÃy chá áy nhiám HTTP."
 
@@ -20381,11 +19545,11 @@ msgstr "Kiáu nÃt cáa sá"
 msgid "Window buttons are visible"
 msgstr "Hián thá nÃt cáa sá"
 
-#: ../shell/e-shell-content.c:674 ../shell/e-shell-content.c:675
+#: ../shell/e-shell-content.c:729 ../shell/e-shell-content.c:730
 msgid "Searches"
 msgstr "Viác tÃm kiám"
 
-#: ../shell/e-shell-content.c:717
+#: ../shell/e-shell-content.c:773
 msgid "Save Search"
 msgstr "LÆu viác tÃm kiám"
 
@@ -20393,340 +19557,313 @@ msgstr "LÆu viác tÃm kiám"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:941
-#| msgid "Sho_w: "
+#: ../shell/e-shell-searchbar.c:938
 msgid "Sho_w:"
 msgstr "_Hián:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:974
-#| msgid "Sear_ch: "
+#: ../shell/e-shell-searchbar.c:971
 msgid "Sear_ch:"
 msgstr "TÃm _kiám:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1037
-#| msgid " i_n "
+#: ../shell/e-shell-searchbar.c:1034
 msgid "i_n"
 msgstr " tro_ng "
 
 # Name: do not translate/ tÃn: Äáng dách
-#: ../shell/e-shell-utils.c:255
-#| msgid "vCard (.vcf, .gcrd)"
+#: ../shell/e-shell-utils.c:223
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:257
-#| msgid "iCalendar files (.ics)"
-msgid "iCalendar (.ics)"
-msgstr "iCalendar (.ics)"
-
-#: ../shell/e-shell-utils.c:278
-#| msgid "All files"
+#: ../shell/e-shell-utils.c:246
 msgid "All Files (*)"
 msgstr "Mái táp tin (*)"
 
-#: ../shell/e-shell-view.c:297
+#: ../shell/e-shell-view.c:296
 msgid "Saving user interface state"
 msgstr ""
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:643
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr "NhÃm Viát hoà Gnome <gnomevi-list lists sourceforge net>"
 
-#: ../shell/e-shell-window-actions.c:654
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "Trang Web Evolution"
 
-#: ../shell/e-shell-window-actions.c:1216
-#| msgid "Bug buddy is not installed."
+#: ../shell/e-shell-window-actions.c:902
+#, fuzzy
+#| msgid "Categories List"
+msgid "Categories Editor"
+msgstr "Danh sÃch Loái"
+
+#: ../shell/e-shell-window-actions.c:1237
 msgid "Bug Buddy is not installed."
 msgstr "ChÆa cÃi Äát trÃnh Bug Buddy (thÃng bÃo lái)."
 
-#: ../shell/e-shell-window-actions.c:1218
-#| msgid "Bug buddy could not be run."
+#: ../shell/e-shell-window-actions.c:1239
 msgid "Bug Buddy could not be run."
 msgstr "KhÃng thá cháy trÃnh Bug buddy."
 
-#: ../shell/e-shell-window-actions.c:1399
+#: ../shell/e-shell-window-actions.c:1420
 msgid "Show information about Evolution"
 msgstr "Hián thÃng tin vá Evolution"
 
-#: ../shell/e-shell-window-actions.c:1404
-#: ../shell/e-shell-window-actions.c:1418
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1439
 msgid "_Close Window"
 msgstr "ÄÃng _cáa sá"
 
-#: ../shell/e-shell-window-actions.c:1425
-#| msgid "A_ppointments"
+#: ../shell/e-shell-window-actions.c:1446
 msgid "_Contents"
 msgstr "_Nái dung"
 
-#: ../shell/e-shell-window-actions.c:1427
-#| msgid "Open Other User's Folder"
+#: ../shell/e-shell-window-actions.c:1448
 msgid "Open the Evolution User Guide"
 msgstr "Má hÆáng dán sá dáng Evolution"
 
-# Name: do not translate/ tÃn: Äáng dách
-#: ../shell/e-shell-window-actions.c:1453
-msgid "Evolution _FAQ"
-msgstr "_Hái ÄÃp Evolution"
-
-#: ../shell/e-shell-window-actions.c:1455
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "Má trang Web hián thá cÃc cÃu hái thÆáng gáp"
-
-#: ../shell/e-shell-window-actions.c:1460
+#: ../shell/e-shell-window-actions.c:1474
 msgid "_Forget Passwords"
 msgstr "_QuÃn cÃc mát kháu"
 
-#: ../shell/e-shell-window-actions.c:1462
-#| msgid "Are you sure you want to forget all remembered passwords?"
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Forget all remembered passwords"
 msgstr "QuÃn hát tát cá mát kháu ÄÃ nhá"
 
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:1481
 msgid "I_mport..."
 msgstr "_Nháp..."
 
-#: ../shell/e-shell-window-actions.c:1469
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Import data from other programs"
 msgstr "Nháp dá liáu tá chÆÆng trÃnh khÃc"
 
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1488
 msgid "New _Window"
 msgstr "Cáa sá _mái"
 
-#: ../shell/e-shell-window-actions.c:1476
-#| msgid "Create a new window displaying this folder"
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Create a new window displaying this view"
 msgstr "Táo cáa sá mái hián thá khung xem nÃy"
 
-#: ../shell/e-shell-window-actions.c:1490
-#| msgid "Configuration"
-msgid "Configure Evolution"
-msgstr "Cáu hÃnh Evolution"
+#: ../shell/e-shell-window-actions.c:1502
+#, fuzzy
+#| msgid "_Available Categories:"
+msgid "Available Cate_gories"
+msgstr "_Loái sán cÃ:"
+
+#: ../shell/e-shell-window-actions.c:1504
+#, fuzzy
+#| msgid "_Available Categories:"
+msgid "Manage available categories"
+msgstr "_Loái sán cÃ:"
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1516
 msgid "_Quick Reference"
 msgstr "Tham kháo _nhanh"
 
-#: ../shell/e-shell-window-actions.c:1497
-#| msgid "Change Evolution's settings"
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Show Evolution's shortcut keys"
 msgstr "Hián phÃm tát Evolution"
 
-#: ../shell/e-shell-window-actions.c:1504
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Exit the program"
 msgstr "ThoÃt khái chÆÆng trÃnh"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1530
 msgid "_Advanced Search..."
 msgstr "TÃm kiám cáp c_ao..."
 
-#: ../shell/e-shell-window-actions.c:1511
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Construct a more advanced search"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1518
-#| msgid "Cancel the current mail operation"
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Clear the current search parameters"
 msgstr "Huá tham sá tÃm kiám hián tái"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Edit Saved Searches..."
 msgstr "_Sáa viác tÃm kiám ÄÃ lÆu..."
 
-#: ../shell/e-shell-window-actions.c:1525
-#| msgid "Manage your email, contacts and schedule"
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Manage your saved searches"
 msgstr "Quán là tÃm kiám Äà lÆu"
 
-#: ../shell/e-shell-window-actions.c:1532
+#: ../shell/e-shell-window-actions.c:1553
 msgid "Click here to change the search type"
 msgstr "Nhán vÃo ÄÃy Äá sáa Äái kiáu tÃm kiám"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1558
 msgid "_Find Now"
 msgstr "TÃm n_gay"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1539
-#| msgid "Cancel the current mail operation"
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Execute the current search parameters"
 msgstr "Thác hián tham sá tÃm kiám hián tái"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Save Search..."
 msgstr "_LÆu viác tÃm kiám..."
 
-#: ../shell/e-shell-window-actions.c:1546
-#| msgid "Save the current file"
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Save the current search parameters"
 msgstr "LÆu thm sá tÃm kiám hián tái"
 
-#: ../shell/e-shell-window-actions.c:1558
-#| msgid "Submit _Bug Report"
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Submit _Bug Report..."
 msgstr "Gái _bÃo cÃo lái..."
 
-#: ../shell/e-shell-window-actions.c:1560
+#: ../shell/e-shell-window-actions.c:1581
 msgid "Submit a bug report using Bug Buddy"
 msgstr "BÃo cÃo lái báng Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1586
 msgid "_Work Offline"
 msgstr "_Ngoái tuyán"
 
-#: ../shell/e-shell-window-actions.c:1567
-#| msgid "Start in offline mode"
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Put Evolution into offline mode"
 msgstr "Äát Evolution vÃo chá Äá ngoái tuyán"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1593
 msgid "_Work Online"
 msgstr "_Trác tuyán"
 
-#: ../shell/e-shell-window-actions.c:1574
-#| msgid "Start in online mode"
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Put Evolution into online mode"
 msgstr "ÄÆa Evolution trá lái chá Äá trác tuyán"
 
-#: ../shell/e-shell-window-actions.c:1602
+#: ../shell/e-shell-window-actions.c:1623
 msgid "Lay_out"
 msgstr "_Bá trÃ"
 
-#: ../shell/e-shell-window-actions.c:1609
+#: ../shell/e-shell-window-actions.c:1630
 msgid "_New"
 msgstr "Má_i"
 
-#: ../shell/e-shell-window-actions.c:1616
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Search"
 msgstr "TÃm _kiám"
 
-#: ../shell/e-shell-window-actions.c:1623
+#: ../shell/e-shell-window-actions.c:1644
 msgid "_Switcher Appearance"
 msgstr "HÃnh thác bá _chuyán Äái"
 
-#: ../shell/e-shell-window-actions.c:1637
+#: ../shell/e-shell-window-actions.c:1658
 msgid "_Window"
 msgstr "_Cáa sá"
 
-#: ../shell/e-shell-window-actions.c:1666
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show Side _Bar"
 msgstr "Hián khung _lá"
 
-#: ../shell/e-shell-window-actions.c:1668
-#| msgid "Show Side _Bar"
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the side bar"
 msgstr "Hián khung lá"
 
-#: ../shell/e-shell-window-actions.c:1674
-#| msgid "Show Animations"
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Buttons"
 msgstr "Hián _nÃt"
 
-#: ../shell/e-shell-window-actions.c:1676
-#| msgid "Show the second time zone"
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the switcher buttons"
 msgstr "Hián nÃt chuyán"
 
-#: ../shell/e-shell-window-actions.c:1682
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show _Status Bar"
 msgstr "Hián thanh t_ráng thÃi"
 
-#: ../shell/e-shell-window-actions.c:1684
-#| msgid "Show _Status Bar"
+#: ../shell/e-shell-window-actions.c:1705
 msgid "Show the status bar"
 msgstr "Hián thanh tráng thÃi"
 
-#: ../shell/e-shell-window-actions.c:1690
-#| msgid "Show _Toolbar"
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show _Tool Bar"
 msgstr "Hián thanh cÃng cá"
 
-#: ../shell/e-shell-window-actions.c:1692
-#| msgid "Show _Toolbar"
+#: ../shell/e-shell-window-actions.c:1713
 msgid "Show the tool bar"
 msgstr "Hián thanh cÃng cá"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1735
 msgid "_Icons Only"
 msgstr "Chá _hÃnh"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons with icons only"
 msgstr "Hián thá mái cÃi nÃt cáa sá dÃng chá ánh thÃi"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1742
 msgid "_Text Only"
 msgstr "Chá _nhÃn"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1744
 msgid "Display window buttons with text only"
 msgstr "Hián thá mái cÃi nÃt cáa sá dÃng chá chá thÃi"
 
-#: ../shell/e-shell-window-actions.c:1728
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Icons _and Text"
 msgstr "HÃnh _và nhÃn"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1751
 msgid "Display window buttons with icons and text"
 msgstr "Hián thá mái cÃi nÃt cáa sá dÃng ánh và chá Äáu"
 
-#: ../shell/e-shell-window-actions.c:1735
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Tool_bar Style"
 msgstr "_Kiáu thanh cÃng cá"
 
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1758
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Hián thá mái cÃi nÃt cáa sá dÃng thiát láp thanh cÃng cá cáa mÃn hÃnh nán"
 
-#: ../shell/e-shell-window-actions.c:1745
+#: ../shell/e-shell-window-actions.c:1766
 msgid "Define Views..."
 msgstr "XÃc Äánh à xem..."
 
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Create or edit views"
 msgstr "Táo hay sáa à xem"
 
-#: ../shell/e-shell-window-actions.c:1752
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Save Custom View..."
 msgstr "LÆu à xem tá chán..."
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Save current custom view"
 msgstr "LÆu à xem riÃng hián thái"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1782
 msgid "C_urrent View"
 msgstr "Ã _xem hián thái"
 
-#: ../shell/e-shell-window-actions.c:1771
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Custom View"
 msgstr "Ã xem tá chán"
 
-#: ../shell/e-shell-window-actions.c:1773
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Current view is a customized view"
 msgstr "à xem hián thái là à xem Äà tÃy chánh"
 
-#: ../shell/e-shell-window-actions.c:1783
-#| msgid "Set up the page settings for your current printer"
+#: ../shell/e-shell-window-actions.c:1804
 msgid "Change the page settings for your current printer"
 msgstr "Thay Äái thiát láp trang cho mÃy in hián thái tái"
 
-#: ../shell/e-shell-window-actions.c:2168
+#: ../shell/e-shell-window-actions.c:2194
 #, c-format
 msgid "Switch to %s"
 msgstr "Chuyán sang %s"
 
-#: ../shell/e-shell-window-actions.c:2381
+#: ../shell/e-shell-window-actions.c:2414
 msgid "Execute these search parameters"
 msgstr ""
 
@@ -20737,26 +19874,24 @@ msgstr ""
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:434
+#: ../shell/e-shell-window.c:442
 msgid "New"
 msgstr "Mái"
 
-#: ../shell/e-shell.c:247
-#| msgid "Preparing account '%s' for offline"
+#: ../shell/e-shell.c:361
 msgid "Preparing to go offline..."
 msgstr "Äang chuán bá ngoái tuyán..."
 
-#: ../shell/e-shell.c:300
-#| msgid "Preparing account '%s' for offline"
+#: ../shell/e-shell.c:414
 msgid "Preparing to go online..."
 msgstr "Äang chuán bá trác tuyán..."
 
-#: ../shell/e-shell.c:362
+#: ../shell/e-shell.c:476
 msgid "Preparing to quit..."
 msgstr "Äang chuán bá thoÃt..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:191
+#: ../shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20792,7 +19927,7 @@ msgstr ""
 "ChÃng tÃi hy váng bán thÃch kát quá cáa quà trÃnh lÃm viác cáa chÃng tÃi,\n"
 "và chÃng tÃi hÃo hác chá Äái sá ÄÃng gÃp cáa bán!\n"
 
-#: ../shell/main.c:215
+#: ../shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20800,65 +19935,63 @@ msgstr ""
 "Xin cÃm Æn\n"
 "NhÃm Evolution\n"
 
-#: ../shell/main.c:222
+#: ../shell/main.c:226
 msgid "Do not tell me again"
 msgstr "Äáng nhác lái lán náa"
 
-#. Translators: Do NOT translate the five component names, they MUST remain in English!
-#: ../shell/main.c:367
+#. Translators: Do NOT translate the five component
+#. * names, they MUST remain in English!
+#: ../shell/main.c:308
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgstr ""
 
-#: ../shell/main.c:369
+#: ../shell/main.c:312
 msgid "Apply the given geometry to the main window"
 msgstr "Ãp dáng toá Äá cho cáa sá chÃnh"
 
-#: ../shell/main.c:373
+#: ../shell/main.c:316
 msgid "Start in online mode"
 msgstr "Khái cháy trong chá Äá trác tuyán"
 
-#: ../shell/main.c:375
+#: ../shell/main.c:318
 msgid "Ignore network availability"
 msgstr "KhÃng quan tÃm tÃnh tráng máng"
 
-#: ../shell/main.c:377
-#| msgid "Start in online mode"
+#: ../shell/main.c:320
 msgid "Start in \"express\" mode"
 msgstr "Bát Äáu chá Äá \"tác hÃnh\""
 
-#: ../shell/main.c:380
-#| msgid "Forcibly shut down all Evolution components"
+#: ../shell/main.c:323
 msgid "Forcibly shut down Evolution"
 msgstr "Buác kát thÃc Evolution"
 
-#: ../shell/main.c:383
+#: ../shell/main.c:326
 msgid "Send the debugging output of all components to a file."
 msgstr "Gái thÃng tin gá lái cáa mái thÃnh phán vÃo táp tin."
 
-#: ../shell/main.c:385
+#: ../shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "Tát náp phán bá sung."
 
-#: ../shell/main.c:387
+#: ../shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Tát à cáa sá xem thá cáa ThÆ, LiÃn lác và TÃc vá."
 
-#: ../shell/main.c:391
+#: ../shell/main.c:334
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 
-#: ../shell/main.c:393
-#| msgid "Restarting Evolution"
+#: ../shell/main.c:336
 msgid "Request a running Evolution process to quit"
 msgstr "YÃu cáu tián trÃnh Evolution Äang cháy phái thoÃt"
 
-#: ../shell/main.c:557 ../shell/main.c:565
+#: ../shell/main.c:512 ../shell/main.c:520
 msgid "- The Evolution PIM and Email Client"
 msgstr "â áng dáng thÆ Äián tá và quán là thÃng tin cà nhÃn Evolution"
 
-#: ../shell/main.c:627
+#: ../shell/main.c:583
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: --online and --offline cannot be used together.\n"
@@ -20871,11 +20004,8 @@ msgstr ""
 "ÄÆác dÃng chung.\n"
 "  HÃy dÃng lánh '%s --help' (trá giÃp) Äá biát thÃm thÃng tin.\n"
 
-#: ../shell/main.c:633
+#: ../shell/main.c:589
 #, c-format
-#| msgid ""
-#| "%s: --online and --offline cannot be used together.\n"
-#| "  Use %s --help for more information.\n"
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
@@ -20895,7 +20025,6 @@ msgid "Cannot upgrade directly from version {0}"
 msgstr "Xoà dá liáu cÅ tá phiÃn bán {0} khÃng?"
 
 #: ../shell/shell.error.xml.h:3
-#| msgid "Continue"
 msgid "Continue Anyway"
 msgstr "Ván tiáp"
 
@@ -20915,7 +20044,6 @@ msgstr ""
 "ÄÆác nhác gà mát kháu lán sau cán thiát."
 
 #: ../shell/shell.error.xml.h:7
-#| msgid "_Quit"
 msgid "Quit Now"
 msgstr "ThoÃt ngay"
 
@@ -20946,102 +20074,97 @@ msgstr ""
 "\n"
 "Náu bán chán tiáp tác thà cà lá sá khÃng thá truy cáp mát phán dá liáu cÅ.\n"
 
-#: ../shell/test/e-test-shell-backend.c:60
-#| msgctxt "New"
-#| msgid "_Test"
+#: ../shell/test/e-test-shell-backend.c:56
 msgctxt "New"
 msgid "_Test Item"
 msgstr "Mác _kiám thá"
 
-#: ../shell/test/e-test-shell-backend.c:62
+#: ../shell/test/e-test-shell-backend.c:58
 msgid "Create a new test item"
 msgstr "Táo mác kiám tra mái"
 
-#: ../shell/test/e-test-shell-backend.c:70
+#: ../shell/test/e-test-shell-backend.c:66
 #, fuzzy
 #| msgid "Resource"
 msgctxt "New"
 msgid "Test _Source"
 msgstr "TÃi nguyÃn"
 
-#: ../shell/test/e-test-shell-backend.c:72
+#: ../shell/test/e-test-shell-backend.c:68
 #, fuzzy
 #| msgid "Create a new test item"
 msgid "Create a new test source"
 msgstr "Táo mác kiám tra mái"
 
-#: ../smclient/eggdesktopfile.c:165
+#: ../smclient/eggdesktopfile.c:166
 #, c-format
 msgid "File is not a valid .desktop file"
 msgstr "KhÃng phái táp tin .desktop háp lá"
 
-#: ../smclient/eggdesktopfile.c:188
+#: ../smclient/eggdesktopfile.c:189
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "PhiÃn bán táp tin desktop khÃng ÄÆác há trá '%s'"
 
-#: ../smclient/eggdesktopfile.c:957
+#: ../smclient/eggdesktopfile.c:959
 #, c-format
-#| msgid "Scanning %s"
 msgid "Starting %s"
 msgstr "Äang bát Äáu %s"
 
-#: ../smclient/eggdesktopfile.c:1098
+#: ../smclient/eggdesktopfile.c:1102
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr ""
 
-#: ../smclient/eggdesktopfile.c:1166
+#: ../smclient/eggdesktopfile.c:1170
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr ""
 
-#: ../smclient/eggdesktopfile.c:1365
+#: ../smclient/eggdesktopfile.c:1370
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
 
-#: ../smclient/eggdesktopfile.c:1386
+#: ../smclient/eggdesktopfile.c:1391
 #, fuzzy, c-format
 #| msgid "Editor not launchable"
 msgid "Not a launchable item"
 msgstr "KhÃng thá khái cháy trÃnh soán tháo"
 
-#: ../smclient/eggsmclient.c:227
+#: ../smclient/eggsmclient.c:226
 #, fuzzy
 #| msgid "_Direct connection to the Internet"
 msgid "Disable connection to session manager"
 msgstr "Kát nái trác tiáp tái Int_ernet"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:229
 #, fuzzy
 #| msgid "Set up Pilot configuration"
 msgid "Specify file containing saved configuration"
 msgstr "Thiát láp cáu hÃnh Pilot"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:229
 msgid "FILE"
 msgstr "TáP-TIN"
 
-#: ../smclient/eggsmclient.c:233
+#: ../smclient/eggsmclient.c:232
 msgid "Specify session management ID"
 msgstr ""
 
-#: ../smclient/eggsmclient.c:233
-#| msgid "UID"
+#: ../smclient/eggsmclient.c:232
 msgid "ID"
 msgstr "ID"
 
-#: ../smclient/eggsmclient.c:254
+#: ../smclient/eggsmclient.c:253
 msgid "Session management options:"
 msgstr ""
 
-#: ../smclient/eggsmclient.c:255
-#| msgid "_Show image animations"
+#: ../smclient/eggsmclient.c:254
 msgid "Show session management options"
 msgstr "Hián mái tuá chán quán là phiÃn lÃm viác"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:107
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -21052,7 +20175,7 @@ msgstr ""
 "\n"
 "Sáa Äái thiát láp tin cáy:"
 
-#: ../smime/gui/cert-trust-dialog.c:144
+#: ../smime/gui/cert-trust-dialog.c:146
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -21061,7 +20184,7 @@ msgstr ""
 "Và bán tin cáy nhà cám quyán Äà phÃt hÃnh cháng nhán nÃy, thà bán tin cáy "
 "xÃc thác cáa cháng nhán nÃy trá khi chá thá cÃch khÃc á ÄÃy."
 
-#: ../smime/gui/cert-trust-dialog.c:148
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -21070,90 +20193,135 @@ msgstr ""
 "Và bán khÃng tin cáy nhà cám quyán Äà phÃt hÃnh cháng nhán nÃy, thà bán "
 "khÃng tin cáy xÃc thác cáa cháng nhán nÃy trá khi chá thá cÃch khÃc á ÄÃy."
 
-#: ../smime/gui/certificate-manager.c:148
-#: ../smime/gui/certificate-manager.c:460
-#: ../smime/gui/certificate-manager.c:697
-msgid "Select a certificate to import..."
-msgstr "HÃy chán cháng nhán cán nháp..."
-
-#: ../smime/gui/certificate-manager.c:157
-msgid "All PKCS12 files"
-msgstr "Mái táp tin PKCS12"
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+msgid "Certificate Name"
+msgstr "TÃn cháng nhán"
 
-#: ../smime/gui/certificate-manager.c:163
-#: ../smime/gui/certificate-manager.c:475
-#: ../smime/gui/certificate-manager.c:711
-msgid "All files"
-msgstr "Mái táp tin"
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+#, fuzzy
+#| msgid "Or_ganization:"
+msgid "Issued To Organization"
+msgstr "Tá _chác:"
 
-#: ../smime/gui/certificate-manager.c:182
-#| msgid "Imported Certificate"
-msgid "Failed to import user's certificate"
-msgstr ""
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+#, fuzzy
+#| msgid "Organizational Unit (OU)"
+msgid "Issued To Organizational Unit"
+msgstr "ÄÆn vá Tá chác (ÄT)"
 
-#: ../smime/gui/certificate-manager.c:352
-#: ../smime/gui/certificate-manager.c:574
-#: ../smime/gui/certificate-manager.c:808
-msgid "Certificate Name"
-msgstr "TÃn cháng nhán"
+#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
+#: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/lib/e-cert.c:569
+msgid "Serial Number"
+msgstr "Sá sán xuát"
 
-#: ../smime/gui/certificate-manager.c:361
-#: ../smime/gui/certificate-manager.c:592
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
 msgid "Purposes"
 msgstr "Mác ÄÃch"
 
-#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
-#: ../smime/lib/e-cert.c:566
-msgid "Serial Number"
-msgstr "Sá sán xuát"
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+msgid "Issued By"
+msgstr "PhÃt hÃnh bái"
+
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
+#, fuzzy
+#| msgid "Or_ganization:"
+msgid "Issued By Organization"
+msgstr "Tá _chác:"
 
-#: ../smime/gui/certificate-manager.c:378
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
+#, fuzzy
+#| msgid "Organizational Unit (OU)"
+msgid "Issued By Organizational Unit"
+msgstr "ÄÆn vá Tá chác (ÄT)"
+
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
+#, fuzzy
+#| msgid "Issuer"
+msgid "Issued"
+msgstr "Nhà phÃt hÃnh"
+
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
 msgid "Expires"
 msgstr "Hát hán"
 
-#: ../smime/gui/certificate-manager.c:469
-msgid "All email certificate files"
-msgstr "Mái táp tin cháng nhán thÆ Äián tá"
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:29
+msgid "SHA1 Fingerprint"
+msgstr "VÃn tay SHA1"
 
-#: ../smime/gui/certificate-manager.c:502
-#| msgid "Failed to delete contact"
-msgid "Failed to import contact's certificate"
-msgstr ""
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:26
+msgid "MD5 Fingerprint"
+msgstr "VÃn tay MD5"
+
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+#, fuzzy
+#| msgid "Email _Address:"
+msgid "Email Address"
+msgstr "Äá_a chá thÆ:"
+
+#: ../smime/gui/certificate-manager.c:575
+msgid "Select a certificate to import..."
+msgstr "HÃy chán cháng nhán cán nháp..."
+
+#: ../smime/gui/certificate-manager.c:588
+msgid "All files"
+msgstr "Mái táp tin"
+
+#: ../smime/gui/certificate-manager.c:623
+#, fuzzy
+#| msgid "Failed to authenticate.\n"
+msgid "Failed to import certificate"
+msgstr "Viác xÃc thác bá lái.\n"
+
+#: ../smime/gui/certificate-manager.c:991
+msgid "All PKCS12 files"
+msgstr "Mái táp tin PKCS12"
 
-#: ../smime/gui/certificate-manager.c:583
-msgid "E-Mail Address"
-msgstr "Äáa chá thÆ"
+#: ../smime/gui/certificate-manager.c:1009
+msgid "All email certificate files"
+msgstr "Mái táp tin cháng nhán thÆ Äián tá"
 
-#: ../smime/gui/certificate-manager.c:706
+#: ../smime/gui/certificate-manager.c:1027
 msgid "All CA certificate files"
 msgstr "Mái táp tin cháng nhán Nhà cám quyán cháng nhán (CA)"
 
-#: ../smime/gui/certificate-manager.c:737
-msgid "Failed to import certificate authority's certificate"
-msgstr ""
-
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-viewer.c:345
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Bá xem cháng nhán: %s"
 
-#: ../smime/gui/component.c:46
+#: ../smime/gui/component.c:50
 #, fuzzy, c-format
 #| msgid "Enter the password for `%s'"
 msgid "Enter the password for '%s'"
 msgstr "Nháp mát kháu cho '%s'"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:69
+#: ../smime/gui/component.c:76
 msgid "Enter new password for certificate database"
 msgstr "HÃy gà mát kháu mái cho cÆ sá dá liáu cháng nhán"
 
-#: ../smime/gui/component.c:71
+#: ../smime/gui/component.c:78
 msgid "Enter new password"
 msgstr "HÃy gà mát kháu mái"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -21162,7 +20330,7 @@ msgstr ""
 "PhÃt hÃnh cho:\n"
 "  Chá Äá: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -21171,7 +20339,7 @@ msgstr ""
 "PhÃt hÃnh bái:\n"
 "  Chá Äá: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:169
+#: ../smime/gui/e-cert-selector.c:172
 msgid "Select certificate"
 msgstr "Chán cháng nhán"
 
@@ -21184,7 +20352,6 @@ msgid "Authorities"
 msgstr "Nhà cám quyán"
 
 #: ../smime/gui/smime-ui.ui.h:3
-#| msgid "Backup All"
 msgid "Backup _All"
 msgstr "Sao _lÆu tát cá"
 
@@ -21196,7 +20363,7 @@ msgstr ""
 "TrÆác khi tin cáy nhà cám quyán nÃy Äá lÃm gà thà bán nÃn kiám tra cháng "
 "nhán cáa nÃ, và chÃnh thác và thá tác cáa nà (náu cÃng bá)."
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1097
 msgid "Certificate"
 msgstr "Cháng nhán"
 
@@ -21205,12 +20372,10 @@ msgid "Certificate Authority Trust"
 msgstr "Äá tin nhà cám quyán cháng nhán"
 
 #: ../smime/gui/smime-ui.ui.h:7
-#| msgid "<b>Certificate Fields</b>"
 msgid "Certificate Fields"
 msgstr "TrÆáng cháng nhán"
 
 #: ../smime/gui/smime-ui.ui.h:8
-#| msgid "<b>Certificate Hierarchy</b>"
 msgid "Certificate Hierarchy"
 msgstr "CÃy cháng nhán"
 
@@ -21251,33 +20416,21 @@ msgid "Expires On"
 msgstr "Hát hán vÃo"
 
 #: ../smime/gui/smime-ui.ui.h:19
-#| msgid "Field Name"
 msgid "Field Value"
 msgstr "Già trá trÆáng"
 
 #: ../smime/gui/smime-ui.ui.h:20
-#| msgid "MD5 Fingerprint"
 msgid "Fingerprints"
 msgstr "VÃn tay"
 
-#: ../smime/gui/smime-ui.ui.h:23
-#| msgid "Issued On"
-msgid "Issued By"
-msgstr "PhÃt hÃnh bái"
-
 #: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "PhÃt hÃnh vÃo"
 
 #: ../smime/gui/smime-ui.ui.h:25
-#| msgid "Issued On"
 msgid "Issued To"
 msgstr "PhÃt hÃnh cho"
 
-#: ../smime/gui/smime-ui.ui.h:26
-msgid "MD5 Fingerprint"
-msgstr "VÃn tay MD5"
-
 #: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "Tá chác (T)"
@@ -21286,15 +20439,11 @@ msgstr "Tá chác (T)"
 msgid "Organizational Unit (OU)"
 msgstr "ÄÆn vá Tá chác (ÄT)"
 
-#: ../smime/gui/smime-ui.ui.h:29
-msgid "SHA1 Fingerprint"
-msgstr "VÃn tay SHA1"
-
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:829
 msgid "SSL Client Certificate"
 msgstr "Cháng nhán khÃch SSL"
 
-#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:833
 msgid "SSL Server Certificate"
 msgstr "Cháng nhán mÃy chá SSL"
 
@@ -21325,7 +20474,6 @@ msgid "Trust this CA to identify websites."
 msgstr "Tin cáy nhà cám quyán cháng nhán nÃy Äá nhán dián chá Web."
 
 #: ../smime/gui/smime-ui.ui.h:38
-#| msgid "<b>Validity</b>"
 msgid "Validity"
 msgstr "Äá háp lá"
 
@@ -21348,7 +20496,6 @@ msgstr "Cháng nhán cáa bán"
 
 #. This is a verb, as in "make a backup".
 #: ../smime/gui/smime-ui.ui.h:44
-#| msgid "Backup"
 msgid "_Backup"
 msgstr "Sao _lÆu"
 
@@ -21356,7 +20503,7 @@ msgstr "Sao _lÆu"
 msgid "_Edit CA Trust"
 msgstr "_Sáa tÃnh tin cáy CA"
 
-#: ../smime/lib/e-cert-db.c:906
+#: ../smime/lib/e-cert-db.c:912
 msgid "Certificate already exists"
 msgstr "Cháng nhán nÃy ÄÃ cÃ"
 
@@ -21365,195 +20512,194 @@ msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:414
+#: ../smime/lib/e-cert.c:417
 msgid "Sign"
 msgstr "KÃ nhán"
 
-#: ../smime/lib/e-cert.c:415
+#: ../smime/lib/e-cert.c:418
 msgid "Encrypt"
 msgstr "Mát mà hoÃ"
 
-#: ../smime/lib/e-cert.c:527
+#: ../smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "PhiÃn bán"
 
-#: ../smime/lib/e-cert.c:542
+#: ../smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "PhiÃn bán 1"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "PhiÃn bán 2"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "PhiÃn bán 3"
 
-#: ../smime/lib/e-cert.c:630
+#: ../smime/lib/e-cert.c:634
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PCKS #1 MD2 vái mà hoà RSA"
 
-#: ../smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:637
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PCKS #1 MD5 vái mà hoà RSA"
 
-#: ../smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:640
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PCKS #1 SHA-1 vái mà hoà RSA"
 
-#: ../smime/lib/e-cert.c:639
-#| msgid "PKCS #1 SHA-1 With RSA Encryption"
+#: ../smime/lib/e-cert.c:643
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "PCKS #1 SHA-256 vái mà hoà RSA"
 
-#: ../smime/lib/e-cert.c:642
-#| msgid "PKCS #1 SHA-1 With RSA Encryption"
+#: ../smime/lib/e-cert.c:646
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "PCKS #1 SHA-384 vái mà hoà RSA"
 
-#: ../smime/lib/e-cert.c:645
-#| msgid "PKCS #1 SHA-1 With RSA Encryption"
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PCKS #1 SHA-512 vái mà hoà RSA"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:676
 msgid "PKCS #1 RSA Encryption"
 msgstr "Mát mà RSA PKCS #1"
 
-#: ../smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:679
 msgid "Certificate Key Usage"
 msgstr "CÃch dÃng khoà cháng nhán"
 
-#: ../smime/lib/e-cert.c:678
+#: ../smime/lib/e-cert.c:682
 msgid "Netscape Certificate Type"
 msgstr "Kiáu cháng nhán Netscape"
 
-#: ../smime/lib/e-cert.c:681
+#: ../smime/lib/e-cert.c:685
 msgid "Certificate Authority Key Identifier"
 msgstr "Bá nhán dián khoà nhà cám quyán cháng nhán"
 
-#: ../smime/lib/e-cert.c:693
+#: ../smime/lib/e-cert.c:697
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Bá nhán dián Äái tÆáng (%s)"
 
-#: ../smime/lib/e-cert.c:744
+#: ../smime/lib/e-cert.c:749
 msgid "Algorithm Identifier"
 msgstr "Bá nhán dián thuát toÃn"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:757
 msgid "Algorithm Parameters"
 msgstr "Tham sá thuát toÃn"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Info"
 msgstr "ThÃng tin khoà cÃng nhà nhán"
 
-#: ../smime/lib/e-cert.c:779
+#: ../smime/lib/e-cert.c:784
 msgid "Subject Public Key Algorithm"
 msgstr "Thuát toÃn khoà cÃng nhà nhán"
 
-#: ../smime/lib/e-cert.c:794
+#: ../smime/lib/e-cert.c:799
 msgid "Subject's Public Key"
 msgstr "Khoà cÃng nhà nhán"
 
-#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:820 ../smime/lib/e-cert.c:870
 msgid "Error: Unable to process extension"
 msgstr "Lái: khÃng thá xá là phán má ráng"
 
-#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:841 ../smime/lib/e-cert.c:853
 msgid "Object Signer"
 msgstr "Bá kà nhán Äái tÆáng"
 
-#: ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:845
 msgid "SSL Certificate Authority"
 msgstr "Nhà cám quyán cháng nhán SSL"
 
-#: ../smime/lib/e-cert.c:844
+#: ../smime/lib/e-cert.c:849
 msgid "Email Certificate Authority"
 msgstr "Nhà cám quyán cháng nhán thÆ Äián tá"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:878
 msgid "Signing"
 msgstr "KÃ nhán"
 
-#: ../smime/lib/e-cert.c:876
+#: ../smime/lib/e-cert.c:882
 msgid "Non-repudiation"
 msgstr "KhÃng tá chái"
 
-#: ../smime/lib/e-cert.c:880
+#: ../smime/lib/e-cert.c:886
 msgid "Key Encipherment"
 msgstr "Mát mà hoà khoÃ"
 
-#: ../smime/lib/e-cert.c:884
+#: ../smime/lib/e-cert.c:890
 msgid "Data Encipherment"
 msgstr "Mát mà hoà dá liáu"
 
-#: ../smime/lib/e-cert.c:888
+#: ../smime/lib/e-cert.c:894
 msgid "Key Agreement"
 msgstr "Cháp thuán khoÃ"
 
-#: ../smime/lib/e-cert.c:892
+#: ../smime/lib/e-cert.c:898
 msgid "Certificate Signer"
 msgstr "NgÆái kà cháng nhán"
 
-#: ../smime/lib/e-cert.c:896
+#: ../smime/lib/e-cert.c:902
 msgid "CRL Signer"
 msgstr "NgÆái kà CRL"
 
-#: ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:951
 msgid "Critical"
 msgstr "NghiÃm tráng"
 
-#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
+#: ../smime/lib/e-cert.c:953 ../smime/lib/e-cert.c:956
 msgid "Not Critical"
 msgstr "KhÃng nghiÃm tráng"
 
-#: ../smime/lib/e-cert.c:970
+#: ../smime/lib/e-cert.c:977
 msgid "Extensions"
 msgstr "Phán má ráng"
 
 # Variable: do not translate/ bián: Äáng dách
-#. Translators: This string is used in Certificate details for fields like Issuer
-#. or Subject, which shows the field name on the left and its respective value
-#. on the right, both as stored in the certificate itself. You probably do not
-#. need to change this string, unless changing the order of name and value.
-#. As a result example: "OU = VeriSign Trust Network"
-#.
-#: ../smime/lib/e-cert.c:1045
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself.  You probably do not need to
+#. * change this string, unless changing the order of
+#. * name and value.  As a result example:
+#. * "OU = VeriSign Trust Network"
+#: ../smime/lib/e-cert.c:1055
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
+#: ../smime/lib/e-cert.c:1111 ../smime/lib/e-cert.c:1234
 msgid "Certificate Signature Algorithm"
 msgstr "Thuát toÃn chá kà cháng nhán"
 
-#: ../smime/lib/e-cert.c:1109
+#: ../smime/lib/e-cert.c:1120
 msgid "Issuer"
 msgstr "Nhà phÃt hÃnh"
 
-#: ../smime/lib/e-cert.c:1164
+#: ../smime/lib/e-cert.c:1175
 msgid "Issuer Unique ID"
 msgstr "ThÃng tin Äác nhát nhán biát nhà phÃt hÃnh"
 
-#: ../smime/lib/e-cert.c:1183
+#: ../smime/lib/e-cert.c:1194
 msgid "Subject Unique ID"
 msgstr "ThÃng tin Äác nhát nhán biát nhà nhán"
 
-#: ../smime/lib/e-cert.c:1229
+#: ../smime/lib/e-cert.c:1240
 msgid "Certificate Signature Value"
 msgstr "Già trá chá kà cháng nhán"
 
-#: ../smime/lib/e-pkcs12.c:250
+#: ../smime/lib/e-pkcs12.c:256
 msgid "PKCS12 File Password"
 msgstr "Mát kháu táp tin PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:251
+#: ../smime/lib/e-pkcs12.c:257
 msgid "Enter password for PKCS12 file:"
 msgstr "GÃ mát kháu cho táp tin PCKS12:"
 
-#: ../smime/lib/e-pkcs12.c:353
+#: ../smime/lib/e-pkcs12.c:363
 msgid "Imported Certificate"
 msgstr "Cháng nhán ÄÃ nháp"
 
@@ -21634,7 +20780,7 @@ msgstr "Vái t_ráng thÃi"
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:789
 msgid "UTC"
 msgstr "Giá thá giái"
 
@@ -21643,7 +20789,6 @@ msgid "Select a Time Zone"
 msgstr "Chán mÃi giá"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
-#| msgid "Time Zone"
 msgid "Time Zones"
 msgstr "MÃi giá"
 
@@ -21661,18 +20806,17 @@ msgstr ""
 "DÃng nÃt chuát phái Äá thu nhá."
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
-#| msgid "Selection Mode"
 msgid "_Selection"
 msgstr "_Chán"
 
-#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-define-views-dialog.c:359
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Äánh nghÄa à xem cho %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:354
-#: ../widgets/menus/gal-define-views-dialog.c:356
+#: ../widgets/menus/gal-define-views-dialog.c:367
+#: ../widgets/menus/gal-define-views-dialog.c:369
 msgid "Define Views"
 msgstr "Äánh nghÄa à xem"
 
@@ -21681,11 +20825,11 @@ msgstr "Äánh nghÄa à xem"
 msgid "Define Views for \"%s\""
 msgstr "Äánh nghÄa à xem cho  %s Â"
 
-#: ../widgets/menus/gal-view-factory-etable.c:113
+#: ../widgets/menus/gal-view-factory-etable.c:111
 msgid "Table"
 msgstr "Báng"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "LÆu à xem hián thái"
 
@@ -21697,7 +20841,7 @@ msgstr "Tá_o à xem mái"
 msgid "_Replace existing view"
 msgstr "Tha_y thá Ã xem hián cÃ"
 
-#: ../widgets/menus/gal-view-new-dialog.c:106
+#: ../widgets/menus/gal-view-new-dialog.c:108
 msgid "Define New View"
 msgstr "XÃc Äánh à xem mái"
 
@@ -21713,141 +20857,141 @@ msgstr "Kiáu à xem"
 msgid "Type of view:"
 msgstr "Kiáu à xem:"
 
-#: ../widgets/misc/e-account-manager.c:355
+#: ../widgets/misc/e-account-manager.c:353
 msgid "De_fault"
 msgstr "_Mác Äánh"
 
+#: ../widgets/misc/e-account-tree-view.c:243
+#, fuzzy
+#| msgid "Account name"
+msgid "Account Name"
+msgstr "TÃn tÃi khoán"
+
 #: ../widgets/misc/e-account-tree-view.c:274
 msgid "Protocol"
 msgstr "Giao thác"
 
-#: ../widgets/misc/e-attachment-dialog.c:307
+#: ../widgets/misc/e-attachment-dialog.c:308
 msgid "Attachment Properties"
 msgstr "Thuác tÃnh ÄÃnh kÃm"
 
-#: ../widgets/misc/e-attachment-dialog.c:332
-#| msgid "F_ilename:"
+#: ../widgets/misc/e-attachment-dialog.c:330
 msgid "_Filename:"
 msgstr "TÃn táp t_in:"
 
-#: ../widgets/misc/e-attachment-dialog.c:367
+#: ../widgets/misc/e-attachment-dialog.c:365
 #, fuzzy
 #| msgid "MIME Type"
 msgid "MIME Type:"
 msgstr "Dáng MIME:"
 
-#: ../widgets/misc/e-attachment-dialog.c:375
-#: ../widgets/misc/e-attachment-store.c:533
+#: ../widgets/misc/e-attachment-dialog.c:373
+#: ../widgets/misc/e-attachment-store.c:559
 msgid "_Suggest automatic display of attachment"
 msgstr "Äá nghá _hián thá tá Äáng Äá ÄÃnh kÃm"
 
-#: ../widgets/misc/e-attachment-handler-image.c:100
+#: ../widgets/misc/e-attachment-handler-image.c:95
 #, fuzzy
 #| msgid "Set as _Background"
 msgid "Could not set as background"
 msgstr "Äát lÃm _nán"
 
-#: ../widgets/misc/e-attachment-handler-image.c:152
+#: ../widgets/misc/e-attachment-handler-image.c:145
 msgid "Set as _Background"
 msgstr "Äát lÃm _nán"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:90
+#: ../widgets/misc/e-attachment-handler-sendto.c:93
 #, fuzzy
 #| msgid "Could not open the link."
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "KhÃng thá má liÃn kát."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:132
-#| msgid "Send To:"
+#: ../widgets/misc/e-attachment-handler-sendto.c:135
 msgid "_Send To..."
 msgstr "_Gái cho..."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:134
+#: ../widgets/misc/e-attachment-handler-sendto.c:137
 #, fuzzy
 #| msgid "Select folder to save selected attachments..."
 msgid "Send the selected attachments somewhere"
 msgstr "Chán thÆ mác nÆi cán lÆu nháng ÄÃnh kÃm ÄÃ chán..."
 
-#: ../widgets/misc/e-attachment-icon-view.c:506
-#: ../widgets/misc/e-attachment-tree-view.c:545
-#| msgid "Loading..."
+#: ../widgets/misc/e-attachment-icon-view.c:162
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Loading"
 msgstr "Náp"
 
-#: ../widgets/misc/e-attachment-icon-view.c:518
-#: ../widgets/misc/e-attachment-tree-view.c:557
-#| msgid "Shading"
+#: ../widgets/misc/e-attachment-icon-view.c:174
+#: ../widgets/misc/e-attachment-tree-view.c:559
 msgid "Saving"
 msgstr "LÆu"
 
-#: ../widgets/misc/e-attachment-paned.c:100
+#: ../widgets/misc/e-attachment-paned.c:97
 msgid "Hide Attachment _Bar"
 msgstr "án thanh ÄÃnh _kÃm"
 
-#: ../widgets/misc/e-attachment-paned.c:102
-#: ../widgets/misc/e-attachment-paned.c:640
+#: ../widgets/misc/e-attachment-paned.c:99
+#: ../widgets/misc/e-attachment-paned.c:639
 msgid "Show Attachment _Bar"
 msgstr "Hián thanh ÄÃnh _kÃm"
 
-#: ../widgets/misc/e-attachment-store.c:521
-#| msgid "Attachment"
-#| msgid_plural "Attachments"
+#: ../widgets/misc/e-attachment-store.c:547
 msgid "Add Attachment"
 msgstr "ThÃm ÄÃnh kÃm"
 
-#: ../widgets/misc/e-attachment-store.c:524
+#: ../widgets/misc/e-attachment-store.c:550
 msgid "A_ttach"
 msgstr "ÄÃnh _kÃm"
 
-#: ../widgets/misc/e-attachment-store.c:587
-#| msgid "Save attachments"
+#: ../widgets/misc/e-attachment-store.c:613
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "LÆu ÄÃnh kÃm"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:616
-#: ../widgets/misc/e-attachment.c:1786 ../widgets/misc/e-attachment.c:2328
-#| msgid "attachment"
+#: ../widgets/misc/e-attachment-store.c:642
+#: ../widgets/misc/e-attachment.c:1810 ../widgets/misc/e-attachment.c:2352
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:352
+#: ../widgets/misc/e-attachment-view.c:404
+msgid "Open With Other Application..."
+msgstr ""
+
+#: ../widgets/misc/e-attachment-view.c:411
 msgid "S_ave All"
 msgstr "LÆ_u tát cá"
 
-#: ../widgets/misc/e-attachment-view.c:378
-#| msgid "_Add attachment..."
+#: ../widgets/misc/e-attachment-view.c:437
 msgid "A_dd Attachment..."
 msgstr "_ThÃm ÄÃnh kÃm..."
 
-#: ../widgets/misc/e-attachment-view.c:402
+#: ../widgets/misc/e-attachment-view.c:461
 msgid "_Hide"
 msgstr "á_n"
 
-#: ../widgets/misc/e-attachment-view.c:409
-#| msgid "S_ave All"
+#: ../widgets/misc/e-attachment-view.c:468
 msgid "Hid_e All"
 msgstr "á_n tát cá"
 
-#: ../widgets/misc/e-attachment-view.c:416
+#: ../widgets/misc/e-attachment-view.c:475
 msgid "_View Inline"
 msgstr "_Xem trác tiáp"
 
-#: ../widgets/misc/e-attachment-view.c:423
+#: ../widgets/misc/e-attachment-view.c:482
 #, fuzzy
 #| msgid "_View Inline"
 msgid "Vie_w All Inline"
 msgstr "_Xem trác tiáp"
 
-#: ../widgets/misc/e-attachment-view.c:740
+#: ../widgets/misc/e-attachment-view.c:803
 #, fuzzy, c-format
 #| msgid "Open in %s..."
-msgid "Open with \"%s\""
+msgid "Open With \"%s\""
 msgstr "Má báng %s..."
 
-#: ../widgets/misc/e-attachment-view.c:743
+#: ../widgets/misc/e-attachment-view.c:806
 #, fuzzy, c-format
 #| msgid "Save attachment as"
 msgid "Open this attachment in %s"
@@ -21857,74 +21001,71 @@ msgstr "LÆu ÄÃnh kÃm dáng"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:997
-#| msgid "Attached message"
-#| msgid_plural "%d attached messages"
+#: ../widgets/misc/e-attachment.c:998
 msgid "Attached message"
 msgstr "ThÆ ÄÃnh kÃm"
 
-#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2630
+#: ../widgets/misc/e-attachment.c:1853 ../widgets/misc/e-attachment.c:2654
 msgid "A load operation is already in progress"
 msgstr "Thao tÃc náp Äang thác hián"
 
-#: ../widgets/misc/e-attachment.c:1837 ../widgets/misc/e-attachment.c:2638
+#: ../widgets/misc/e-attachment.c:1861 ../widgets/misc/e-attachment.c:2662
 msgid "A save operation is already in progress"
 msgstr "Thao tÃc lÆu Äang thác hián"
 
-#: ../widgets/misc/e-attachment.c:1929
+#: ../widgets/misc/e-attachment.c:1953
 #, fuzzy, c-format
 #| msgid "Could not load address book"
 msgid "Could not load '%s'"
 msgstr "KhÃng thá náp sá Äáa chá"
 
-#: ../widgets/misc/e-attachment.c:1932
+#: ../widgets/misc/e-attachment.c:1956
 #, fuzzy, c-format
 #| msgid "Could not open the link."
 msgid "Could not load the attachment"
 msgstr "KhÃng thá má liÃn kát."
 
-#: ../widgets/misc/e-attachment.c:2208
+#: ../widgets/misc/e-attachment.c:2232
 #, fuzzy, c-format
 #| msgid "Could not open source"
 msgid "Could not open '%s'"
 msgstr "KhÃng thá má nguán."
 
-#: ../widgets/misc/e-attachment.c:2211
+#: ../widgets/misc/e-attachment.c:2235
 #, fuzzy, c-format
 #| msgid "Could not open the link."
 msgid "Could not open the attachment"
 msgstr "KhÃng thá má liÃn kát."
 
-#: ../widgets/misc/e-attachment.c:2646
+#: ../widgets/misc/e-attachment.c:2670
 #, fuzzy
 #| msgid "Attachment Reminder"
 msgid "Attachment contents not loaded"
 msgstr "Nhác nhá Äá ÄÃnh kÃm"
 
-#: ../widgets/misc/e-attachment.c:2722
+#: ../widgets/misc/e-attachment.c:2746
 #, fuzzy, c-format
 #| msgid "Could not execute '%s': %s\n"
 msgid "Could not save '%s'"
 msgstr "KhÃng thá thác hián  %s Â: %s\n"
 
-#: ../widgets/misc/e-attachment.c:2725
+#: ../widgets/misc/e-attachment.c:2749
 #, fuzzy, c-format
 #| msgid "Select folder to save all attachments"
 msgid "Could not save the attachment"
 msgstr "Chán thÆ mác vÃo ÄÃ cán lÆu mái ÄÃnh kÃm"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:362
-#| msgid "Click to open %s"
+#: ../widgets/misc/e-buffer-tagger.c:387
 msgid "Ctrl-click to open a link"
 msgstr "Nhán giá Ctrl Äá má liÃn kát"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1259
+#: ../widgets/misc/e-calendar-item.c:1249
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:220
+#: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "Lách thÃng"
 
@@ -21932,98 +21073,103 @@ msgstr "Lách thÃng"
 msgid "Character Encoding"
 msgstr "Báng mà Kà tá"
 
-#: ../widgets/misc/e-charset-combo-box.c:122
+#: ../widgets/misc/e-charset-combo-box.c:119
 msgid "Enter the character set to use"
 msgstr "HÃy gà bá kà tá cán dÃng"
 
-#: ../widgets/misc/e-charset-combo-box.c:341
+#: ../widgets/misc/e-charset-combo-box.c:339
 msgid "Other..."
 msgstr "KhÃc..."
 
-#: ../widgets/misc/e-dateedit.c:507
+#: ../widgets/misc/e-contact-map-window.c:355
+#, fuzzy
+#| msgid "Contacts map"
+msgid "Contacts Map"
+msgstr "Bán Äá liÃn lác"
+
+#: ../widgets/misc/e-dateedit.c:501
 msgid "Date and Time"
 msgstr "NgÃy và Giá"
 
-#: ../widgets/misc/e-dateedit.c:528
+#: ../widgets/misc/e-dateedit.c:522
 msgid "Text entry to input date"
 msgstr "TrÆáng nháp ngÃy"
 
-#: ../widgets/misc/e-dateedit.c:550
+#: ../widgets/misc/e-dateedit.c:544
 msgid "Click this button to show a calendar"
 msgstr "Nháp vÃo cÃi nÃt nÃy Äá hián thá mát lách"
 
-#: ../widgets/misc/e-dateedit.c:605
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Háp tá háp thá xuáng Äá chán thái gian"
 
-#: ../widgets/misc/e-dateedit.c:677
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "BÃ_y giá"
 
-#: ../widgets/misc/e-dateedit.c:683
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "HÃ_m nay"
 
 #. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../widgets/misc/e-dateedit.c:691
+#. * is not permitted.
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_KhÃng cÃ"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1698 ../widgets/misc/e-dateedit.c:1930
-#| msgid "None"
+#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1921
 msgctxt "date"
 msgid "None"
 msgstr "KhÃng"
 
-#: ../widgets/misc/e-dateedit.c:1825
+#: ../widgets/misc/e-dateedit.c:1815
 msgid "Invalid Date Value"
 msgstr "Già trá ngÃy thÃng khÃng háp lá"
 
-#: ../widgets/misc/e-dateedit.c:1869
+#: ../widgets/misc/e-dateedit.c:1859
 msgid "Invalid Time Value"
 msgstr "Già trá giá khÃng háp lá"
 
-#: ../widgets/misc/e-import-assistant.c:252
+#: ../widgets/misc/e-import-assistant.c:249
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr ""
 "HÃy chán táp tin muán nháp vÃo Evolution, và chán dáng táp tin tá danh sÃch."
 
-#: ../widgets/misc/e-import-assistant.c:269
+#: ../widgets/misc/e-import-assistant.c:266
 msgid "F_ilename:"
 msgstr "TÃn táp t_in:"
 
-#: ../widgets/misc/e-import-assistant.c:279
+#: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
 msgstr "Chán táp tin"
 
-#: ../widgets/misc/e-import-assistant.c:293
-#: ../widgets/misc/e-import-assistant.c:468
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
 msgid "File _type:"
 msgstr "Kiáu _táp tin:"
 
-#: ../widgets/misc/e-import-assistant.c:336
-#: ../widgets/misc/e-import-assistant.c:912
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:913
 msgid "Choose the destination for this import"
 msgstr "HÃy chán nháp vÃo ÄÃch nÃo"
 
-#: ../widgets/misc/e-import-assistant.c:361
+#: ../widgets/misc/e-import-assistant.c:358
 msgid "Choose the type of importer to run:"
 msgstr "Chán kiáu bá nháp cán cháy:"
 
-#: ../widgets/misc/e-import-assistant.c:369
+#: ../widgets/misc/e-import-assistant.c:366
 msgid "Import data and settings from _older programs"
 msgstr "Nháp dá liáu và thiát láp tá chÆÆng trÃnh _cÅ"
 
-#: ../widgets/misc/e-import-assistant.c:377
+#: ../widgets/misc/e-import-assistant.c:374
 msgid "Import a _single file"
 msgstr "Nháp _mát táp tin riÃng lá"
 
-#: ../widgets/misc/e-import-assistant.c:529
+#: ../widgets/misc/e-import-assistant.c:526
 #, fuzzy
 #| msgid ""
 #| "Evolution checked for settings to import from the following\n"
@@ -22041,40 +21187,37 @@ msgstr ""
 "hÃy nháp vÃo cÃi nÃt ÂLÃiÂ.\n"
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:769
-#| msgid "_Import"
+#: ../widgets/misc/e-import-assistant.c:768
 msgid "_Cancel Import"
 msgstr "_Huá nháp"
 
-#: ../widgets/misc/e-import-assistant.c:911
-#| msgid "Preview the message to be printed"
+#: ../widgets/misc/e-import-assistant.c:912
 msgid "Preview data to be imported"
 msgstr "Xem thá trÆác khi nháp"
 
-#: ../widgets/misc/e-import-assistant.c:917
-#: ../widgets/misc/e-import-assistant.c:930
-#: ../widgets/misc/e-import-assistant.c:1280
-#: ../widgets/misc/e-import-assistant.c:1346
-#: ../widgets/misc/e-import-assistant.c:1355
-#| msgid "Important"
+#: ../widgets/misc/e-import-assistant.c:918
+#: ../widgets/misc/e-import-assistant.c:931
+#: ../widgets/misc/e-import-assistant.c:1276
+#: ../widgets/misc/e-import-assistant.c:1352
+#: ../widgets/misc/e-import-assistant.c:1361
 msgid "Import Data"
 msgstr "Nháp dá liáu"
 
-#: ../widgets/misc/e-import-assistant.c:925
+#: ../widgets/misc/e-import-assistant.c:926
 msgid "Select what type of file you want to import from the list."
 msgstr "Chán loái táp tin bán muán nháp tá danh sÃch."
 
-#: ../widgets/misc/e-import-assistant.c:1270
-#: ../widgets/misc/e-import-assistant.c:1304
+#: ../widgets/misc/e-import-assistant.c:1266
+#: ../widgets/misc/e-import-assistant.c:1301
 msgid "Evolution Import Assistant"
 msgstr "Trá tà nháp Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1287
-#: ../widgets/misc/e-import-assistant.c:1334
+#: ../widgets/misc/e-import-assistant.c:1283
+#: ../widgets/misc/e-import-assistant.c:1339
 msgid "Import Location"
 msgstr "Äáa Äiám nháp"
 
-#: ../widgets/misc/e-import-assistant.c:1298
+#: ../widgets/misc/e-import-assistant.c:1294
 #, fuzzy
 #| msgid ""
 #| "Welcome to the Evolution Import Assistant.\n"
@@ -22089,29 +21232,29 @@ msgstr ""
 "Vái trá tà nÃy, bán sá ÄÆác hÆáng dán thÃng qua tián trÃnh\n"
 "nháp cÃc táp tin bÃn ngoÃi vÃo Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1312
+#: ../widgets/misc/e-import-assistant.c:1311
 msgid "Importer Type"
 msgstr "Kiáu bá nháp"
 
-#: ../widgets/misc/e-import-assistant.c:1320
+#: ../widgets/misc/e-import-assistant.c:1321
 msgid "Select Information to Import"
 msgstr "Chán thÃng tin cán nháp vÃo"
 
-#: ../widgets/misc/e-import-assistant.c:1327
+#: ../widgets/misc/e-import-assistant.c:1330
 msgid "Select a File"
 msgstr "Chán táp tin"
 
-#: ../widgets/misc/e-import-assistant.c:1341
+#: ../widgets/misc/e-import-assistant.c:1347
 #, fuzzy
 #| msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Nhán  Nháp  Äá bát Äáu nháp táp tin nÃy vÃo Evolution. "
 
-#: ../widgets/misc/e-map.c:752
+#: ../widgets/misc/e-map.c:883
 msgid "World Map"
 msgstr "Bán Äá Thá giái"
 
-#: ../widgets/misc/e-map.c:754
+#: ../widgets/misc/e-map.c:886
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -22150,17 +21293,16 @@ msgstr ""
 "Evolution hián thái Äang ngoái tuyán.\n"
 "Nhán vÃo cÃi nÃt nÃy Äá lÃm viác trác tuyán."
 
-#: ../widgets/misc/e-preferences-window.c:281
+#: ../widgets/misc/e-preferences-window.c:279
 msgid "Evolution Preferences"
 msgstr "TÃy thÃch Evolution"
 
-#: ../widgets/misc/e-search-bar.c:82
+#: ../widgets/misc/e-search-bar.c:81
 #, c-format
 msgid "Matches: %d"
 msgstr "Kháp: %d"
 
 #: ../widgets/misc/e-search-bar.c:563
-#| msgid "Close this window"
 msgid "Close the find bar"
 msgstr "ÄÃng thanh tÃm kiám"
 
@@ -22169,7 +21311,6 @@ msgid "Fin_d:"
 msgstr "TÃ_m:"
 
 #: ../widgets/misc/e-search-bar.c:583
-#| msgid "Always search"
 msgid "Clear the search"
 msgstr "Xoà tÃm kiám"
 
@@ -22190,7 +21331,6 @@ msgid "Find the next occurrence of the phrase"
 msgstr "TÃm cÃi ká tiáp"
 
 #: ../widgets/misc/e-search-bar.c:645
-#| msgid "M_atch case"
 msgid "Mat_ch case"
 msgstr "_PhÃn biát hoa/thÆáng"
 
@@ -22202,7 +21342,7 @@ msgstr "ÄÃ Äán trang cuái, quay lái trang Äáu"
 msgid "Reached top of page, continued from bottom"
 msgstr "ÄÃ Äán trang Äáu, quay lái trang cuái"
 
-#: ../widgets/misc/e-send-options.c:516
+#: ../widgets/misc/e-send-options.c:552
 msgid "When de_leted:"
 msgstr "Khi ÄÃ _xoÃ:"
 
@@ -22219,36 +21359,30 @@ msgid "Deli_vered and opened"
 msgstr "Äà phÃt _và má"
 
 #: ../widgets/misc/e-send-options.ui.h:5
-#| msgid "<b>Delivery Options</b>"
 msgid "Delivery Options"
 msgstr "TÃy chán gái"
 
 #: ../widgets/misc/e-send-options.ui.h:6
-#| msgid "_Until:"
 msgctxt "ESendOptions"
 msgid "_Until"
 msgstr "Äán _khi"
 
 #: ../widgets/misc/e-send-options.ui.h:7
-#| msgid "_After:"
 msgctxt "ESendOptionsAfter"
 msgid "_After"
 msgstr "_Sau"
 
 #: ../widgets/misc/e-send-options.ui.h:8
-#| msgid "days"
 msgctxt "ESendOptionsAfter"
 msgid "days"
 msgstr "ngÃy"
 
 #: ../widgets/misc/e-send-options.ui.h:9
-#| msgid "Wi_thin"
 msgctxt "ESendOptionsWithin"
 msgid "Wi_thin"
 msgstr "Tr_ong vÃng"
 
 #: ../widgets/misc/e-send-options.ui.h:10
-#| msgid "days"
 msgctxt "ESendOptionsWithin"
 msgid "days"
 msgstr "ngÃy"
@@ -22262,14 +21396,10 @@ msgid "Gene_ral Options"
 msgstr "TÃy chán ch_ung"
 
 #: ../widgets/misc/e-send-options.ui.h:15
-#| msgid ""
-#| "None\n"
-#| "Mail Receipt"
 msgid "Mail Receipt"
 msgstr "BiÃn nhán thÆ"
 
 #: ../widgets/misc/e-send-options.ui.h:17
-#| msgid "Priority"
 msgid "Proprietary"
 msgstr ""
 
@@ -22278,7 +21408,6 @@ msgid "R_eply requested"
 msgstr "YÃu cáu t_rá lái"
 
 #: ../widgets/misc/e-send-options.ui.h:20
-#| msgid "<b>Return Notification</b>"
 msgid "Return Notification"
 msgstr ""
 
@@ -22291,7 +21420,6 @@ msgid "Sta_tus Tracking"
 msgstr "Theo dÃi _tráng thÃi"
 
 #: ../widgets/misc/e-send-options.ui.h:24
-#| msgid "S_tandard Font:"
 msgid "Standard"
 msgstr "Chuán"
 
@@ -22302,7 +21430,6 @@ msgid "Status Tracking"
 msgstr "Theo dÃi tráng thÃi"
 
 #: ../widgets/misc/e-send-options.ui.h:26
-#| msgid "Top secret"
 msgid "Top Secret"
 msgstr "Tái mát"
 
@@ -22323,7 +21450,6 @@ msgid "_All information"
 msgstr "_Mái thÃng tin"
 
 #: ../widgets/misc/e-send-options.ui.h:32
-#| msgid "_Classification"
 msgid "_Classification:"
 msgstr "_PhÃn loái:"
 
@@ -22349,14 +21475,13 @@ msgstr "Khi ÄÃ _má:"
 
 #. Translators: Used in send options dialog
 #: ../widgets/misc/e-send-options.ui.h:40
-#| msgid "None"
 msgctxt "send-options"
 msgid "None"
 msgstr "KhÃng"
 
 #: ../widgets/misc/e-signature-editor.c:138
-#: ../widgets/misc/e-signature-editor.c:563
-#: ../widgets/misc/e-signature-manager.c:355
+#: ../widgets/misc/e-signature-editor.c:564
+#: ../widgets/misc/e-signature-manager.c:372
 #: ../widgets/misc/e-signature-script-dialog.c:219
 msgid "Unnamed"
 msgstr "KhÃng tÃn"
@@ -22365,29 +21490,27 @@ msgstr "KhÃng tÃn"
 msgid "_Save and Close"
 msgstr "_LÆu và ÄÃng"
 
-#: ../widgets/misc/e-signature-editor.c:430
+#: ../widgets/misc/e-signature-editor.c:431
 msgid "Edit Signature"
 msgstr "Sáa chá kÃ"
 
-#: ../widgets/misc/e-signature-editor.c:445
+#: ../widgets/misc/e-signature-editor.c:446
 msgid "_Signature Name:"
 msgstr "TÃn chá _kÃ:"
 
-#: ../widgets/misc/e-signature-manager.c:300
-#| msgid "Add signature script"
+#: ../widgets/misc/e-signature-manager.c:317
 msgid "Add Signature Script"
 msgstr "ThÃm script chá kÃ"
 
-#: ../widgets/misc/e-signature-manager.c:365
-#| msgid "Edit Signature"
+#: ../widgets/misc/e-signature-manager.c:382
 msgid "Edit Signature Script"
 msgstr "Sáa script chá kÃ"
 
-#: ../widgets/misc/e-signature-manager.c:583
+#: ../widgets/misc/e-signature-manager.c:602
 msgid "Add _Script"
 msgstr "ThÃm _Script"
 
-#: ../widgets/misc/e-signature-script-dialog.c:269
+#: ../widgets/misc/e-signature-script-dialog.c:268
 #, fuzzy
 #| msgid ""
 #| "The output of this script will be used as your\n"
@@ -22403,12 +21526,11 @@ msgstr ""
 "TÃn bán xÃc Äánh sá chá ÄÆác dÃng\n"
 "chá cho mác ÄÃch hián thá."
 
-#: ../widgets/misc/e-signature-script-dialog.c:314
-#| msgid "_Script:"
+#: ../widgets/misc/e-signature-script-dialog.c:313
 msgid "S_cript:"
 msgstr "S_cript:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:345
+#: ../widgets/misc/e-signature-script-dialog.c:344
 #, fuzzy
 #| msgid "The script file must exist and be executable."
 msgid "Script file must be executable."
@@ -22418,119 +21540,126 @@ msgstr "Táp tin vÄn lánh phái tán tái và cà cháy ÄÆác."
 msgid "Click here to go to URL"
 msgstr "Nhán ÄÃy Äá Äi tái Äáa chá máng"
 
-#: ../widgets/misc/e-web-view.c:373
+#: ../widgets/misc/e-web-view.c:410
 msgid "_Copy Link Location"
 msgstr "_ChÃp Äáa chá liÃn kát"
 
-#: ../widgets/misc/e-web-view.c:375
-#| msgid "Copy selected text to the clipboard"
+#: ../widgets/misc/e-web-view.c:412
 msgid "Copy the link to the clipboard"
 msgstr "Sao chÃp liÃn kát sang báng nhÃp"
 
-#: ../widgets/misc/e-web-view.c:383
+#: ../widgets/misc/e-web-view.c:420
 msgid "_Open Link in Browser"
 msgstr "_Má liÃn kát báng trÃnh duyát"
 
-#: ../widgets/misc/e-web-view.c:385
-#| msgid "_Open Link in Browser"
+#: ../widgets/misc/e-web-view.c:422
 msgid "Open the link in a web browser"
 msgstr "Má liÃn kát báng trÃnh duyát"
 
-#: ../widgets/misc/e-web-view.c:393
-#| msgid "Copy _Email Address"
+#: ../widgets/misc/e-web-view.c:430
 msgid "_Copy Email Address"
 msgstr "ChÃp Äáa chá _thÆ"
 
-#: ../widgets/misc/e-web-view.c:422 ../widgets/misc/e-web-view.c:1077
-#| msgid "Select all the text in a message"
+#: ../widgets/misc/e-web-view.c:447
+#, fuzzy
+#| msgid "_No image"
+msgid "_Copy Image"
+msgstr "KhÃ_ng cà ánh"
+
+#: ../widgets/misc/e-web-view.c:449
+#, fuzzy
+#| msgid "Copy the link to the clipboard"
+msgid "Copy the image to the clipboard"
+msgstr "Sao chÃp liÃn kát sang báng nhÃp"
+
+#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
 msgid "Select all text and images"
 msgstr "Chán toÃn bá hÃnh và chá"
 
-#: ../widgets/misc/e-web-view.c:854 ../widgets/misc/e-web-view.c:856
-#: ../widgets/misc/e-web-view.c:858
+#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
+#: ../widgets/misc/e-web-view.c:986
 #, c-format
 msgid "Click to call %s"
 msgstr "Nhán Äá gái %s"
 
-#: ../widgets/misc/e-web-view.c:860
+#: ../widgets/misc/e-web-view.c:988
 msgid "Click to hide/unhide addresses"
 msgstr "Nhán Äá (bá) án Äáa chá"
 
-#: ../widgets/misc/e-web-view.c:862
+#: ../widgets/misc/e-web-view.c:990
 #, c-format
 msgid "Click to open %s"
 msgstr "Nhán Äá má %s"
 
-#: ../widgets/misc/ea-calendar-item.c:299
-#: ../widgets/misc/ea-calendar-item.c:308
+#: ../widgets/misc/ea-calendar-item.c:306
+#: ../widgets/misc/ea-calendar-item.c:315
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../widgets/misc/ea-calendar-item.c:311
+#: ../widgets/misc/ea-calendar-item.c:318
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Lách: tá %s Äán %s"
 
-#: ../widgets/misc/ea-calendar-item.c:347
+#: ../widgets/misc/ea-calendar-item.c:354
 msgid "evolution calendar item"
 msgstr "mác lách evolution"
 
-#: ../widgets/table/e-cell-combo.c:177
+#: ../widgets/table/e-cell-combo.c:187
 msgid "popup list"
 msgstr "danh sÃch tá má"
 
-#: ../widgets/table/e-cell-date-edit.c:303
+#: ../widgets/table/e-cell-date-edit.c:299
 msgid "Now"
 msgstr "BÃy giá"
 
 #. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:320
-#| msgid "None"
+#: ../widgets/table/e-cell-date-edit.c:316
 msgctxt "table-date"
 msgid "None"
 msgstr "KhÃng"
 
-#: ../widgets/table/e-cell-date-edit.c:328
+#: ../widgets/table/e-cell-date-edit.c:324
 msgid "OK"
 msgstr "OK"
 
-#: ../widgets/table/e-cell-date-edit.c:872
+#: ../widgets/table/e-cell-date-edit.c:868
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Thái gian phái cà Äánh dáng: %s"
 
-#: ../widgets/table/e-cell-percent.c:76
+#: ../widgets/table/e-cell-percent.c:80
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Già trá phán trÄm phái nám giáa 0 và 100, ká cá hai sá ÄÃ"
 
-#: ../widgets/table/e-table-click-to-add.c:595
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
+#: ../widgets/table/e-table-click-to-add.c:607
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:143
 msgid "click to add"
 msgstr "nhán Äá thÃm"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
 msgid "(Ascending)"
 msgstr "(TÄng dán)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
 msgid "(Descending)"
 msgstr "(Giám dán)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:400
 msgid "Not sorted"
 msgstr "ChÆa sáp xáp"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:441
 msgid "No grouping"
 msgstr "ChÆa nhÃm lái"
 
-#: ../widgets/table/e-table-config.c:654
+#: ../widgets/table/e-table-config.c:666
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Hián trÆáng"
 
-#: ../widgets/table/e-table-config.c:674
+#: ../widgets/table/e-table-config.c:686
 msgid "Available Fields"
 msgstr "TrÆáng cà sán"
 
@@ -22539,7 +21668,7 @@ msgid "A_vailable Fields:"
 msgstr "TrÆáng cà _sán:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1668
+#: ../widgets/table/e-table-header-item.c:1717
 msgid "Ascending"
 msgstr "TÄng dán"
 
@@ -22552,7 +21681,7 @@ msgid "Clear _All"
 msgstr "_Xoà tát cá"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1668
+#: ../widgets/table/e-table-header-item.c:1717
 msgid "Descending"
 msgstr "Giám dán"
 
@@ -22600,6 +21729,10 @@ msgstr "T_rÆáng ÄÃ hián..."
 msgid "_Group By..."
 msgstr "_NhÃm lái theo..."
 
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "_Gá bá"
+
 #: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "_Hián trÆáng trong à xem"
@@ -22612,12 +21745,11 @@ msgstr "_Hián thá nháng trÆáng nÃy theo thá tá:"
 msgid "_Sort..."
 msgstr "_Sáp xáp..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:117
-#| msgid "Add a C_olumn..."
+#: ../widgets/table/e-table-field-chooser-dialog.c:119
 msgid "Add a Column"
 msgstr "ThÃm cát"
 
-#: ../widgets/table/e-table-field-chooser.c:151
+#: ../widgets/table/e-table-field-chooser.c:153
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -22626,129 +21758,738 @@ msgstr ""
 "hÃy kÃo nà vÃo vá trà Äà Äánh."
 
 #. Translators: This text is used as a special row when an ETable
-#. has turned on grouping on a column, which has set a title.
-#. The first %s is replaced with a column title.
-#. The second %s is replaced with an actual  group value.
-#. Finally the %d is replaced with count of items in this group.
-#. Example: "Family name: Smith (13 items)"
+#. * has turned on grouping on a column, which has set a title.
+#. * The first %s is replaced with a column title.
+#. * The second %s is replaced with an actual  group value.
+#. * Finally the %d is replaced with count of items in this group.
+#. * Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:354
+#: ../widgets/table/e-table-group-container.c:361
 #, c-format
-#| msgid "%s : %s (%d item)"
-#| msgid_plural "%s : %s (%d items)"
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s: %s (%d mác)"
 
 #. Translators: This text is used as a special row when an ETable
-#. has turned on grouping on a column, which doesn't have set a title.
-#. The %s is replaced with an actual group value.
-#. The %d is replaced with count of items in this group.
-#. Example: "Smith (13 items)"
+#. * has turned on grouping on a column, which doesn't have set a title.
+#. * The %s is replaced with an actual group value.
+#. * The %d is replaced with count of items in this group.
+#. * Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:366
+#: ../widgets/table/e-table-group-container.c:373
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d mác)"
 
-#: ../widgets/table/e-table-header-item.c:1512
+#: ../widgets/table/e-table-header-item.c:1557
 msgid "Customize Current View"
 msgstr "TÃy chánh à xem hián thái"
 
-#: ../widgets/table/e-table-header-item.c:1533
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Sort _Ascending"
 msgstr "Sáp xáp _tÄng dán"
 
-#: ../widgets/table/e-table-header-item.c:1536
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Sort _Descending"
 msgstr "Sáp xáp _giám dán"
 
-#: ../widgets/table/e-table-header-item.c:1539
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "_Unsort"
 msgstr "_Háy sáp xáp"
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "Group By This _Field"
 msgstr "NhÃm lái theo t_rÆáng nÃy"
 
-#: ../widgets/table/e-table-header-item.c:1545
+#: ../widgets/table/e-table-header-item.c:1591
 msgid "Group By _Box"
 msgstr "NhÃm lái theo _háp"
 
-#: ../widgets/table/e-table-header-item.c:1549
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Remove This _Column"
 msgstr "Bá _cát nÃy"
 
-#: ../widgets/table/e-table-header-item.c:1552
+#: ../widgets/table/e-table-header-item.c:1598
 msgid "Add a C_olumn..."
 msgstr "ThÃ_m cát..."
 
-#: ../widgets/table/e-table-header-item.c:1556
+#: ../widgets/table/e-table-header-item.c:1602
 msgid "A_lignment"
 msgstr "Chánh c_anh"
 
-#: ../widgets/table/e-table-header-item.c:1559
+#: ../widgets/table/e-table-header-item.c:1605
 msgid "B_est Fit"
 msgstr "_Váa nhát"
 
-#: ../widgets/table/e-table-header-item.c:1562
+#: ../widgets/table/e-table-header-item.c:1608
 msgid "Format Column_s..."
 msgstr "Äánh _dáng cát..."
 
-#: ../widgets/table/e-table-header-item.c:1566
+#: ../widgets/table/e-table-header-item.c:1612
 msgid "Custo_mize Current View..."
 msgstr "TÃy chánh à xe_m hián thái..."
 
-#: ../widgets/table/e-table-header-item.c:1625
+#: ../widgets/table/e-table-header-item.c:1674
 msgid "_Sort By"
 msgstr "_Sáp xáp theo"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1692
 msgid "_Custom"
 msgstr "Tá _chán"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:126
+#: ../widgets/table/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
 msgstr "bát lÃn mát Äiáu con"
 
 #. Translators: description of a "toggle" action
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
 msgid "toggle the cell"
 msgstr "bát/tát à nÃy"
 
 #. Translators: description of an "expand" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:212
+#: ../widgets/table/gal-a11y-e-cell-tree.c:214
 msgid "expands the row in the ETree containing this cell"
 msgstr "dÃn ra hÃng trong ETree cháa à nÃy"
 
 #. Translators: description of a "collapse" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:219
+#: ../widgets/table/gal-a11y-e-cell-tree.c:221
 msgid "collapses the row in the ETree containing this cell"
 msgstr "co lái hÃng trong ETree cháa à nÃy"
 
-#: ../widgets/table/gal-a11y-e-cell.c:119
+#: ../widgets/table/gal-a11y-e-cell.c:123
 msgid "Table Cell"
 msgstr "Ã báng"
 
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
 msgid "click"
 msgstr "nhán"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:154
+#: ../widgets/table/gal-a11y-e-table-column-header.c:158
 msgid "sort"
 msgstr "sáp"
 
-#: ../widgets/text/e-text.c:2289
+#: ../widgets/text/e-text.c:2327
 msgid "Select All"
 msgstr "Chán tát cá"
 
-#: ../widgets/text/e-text.c:2301
+#: ../widgets/text/e-text.c:2339
 msgid "Input Methods"
 msgstr "CÃch nháp"
 
+#~ msgid "(map)"
+#~ msgstr "(bán Äá)"
+
+#~ msgid "map"
+#~ msgstr "bán Äá"
+
+#~ msgid "Accessing LDAP Server anonymously"
+#~ msgstr "Truy cáp và danh tái mÃy chá LDAP"
+
+#~ msgid "Enter password for %s (user %s)"
+#~ msgstr "HÃy gà mát kháu cho %s (ngÆái dÃng %s)"
+
+#~| msgid "Invalid contact."
+#~ msgid "Invalid object"
+#~ msgstr "Äái tÆáng khÃng háp"
+
+#~ msgid "Edit Alarm"
+#~ msgstr "Sáa BÃo Äáng"
+
+#~ msgid "Add Alarm"
+#~ msgstr "ThÃm BÃo Äáng"
+
+#~| msgid "Alarms"
+#~ msgid "Alarm"
+#~ msgstr "BÃo Äáng"
+
+#~ msgid "Alarms"
+#~ msgstr "BÃo Äáng"
+
+#~ msgid "Click here to close the current window"
+#~ msgstr "Nhán ÄÃy Äá ÄÃng cáa sá hián thái"
+
+#~ msgid "Click here to view help available"
+#~ msgstr "Nhán ÄÃy Äá xem trá giÃp cà sán"
+
+#~ msgid "Click here to save the current window"
+#~ msgstr "Nhán ÄÃy Äá lÆu cáa sá hián thái"
+
+#~ msgid "Click here to attach a file"
+#~ msgstr "Nhán ÄÃy Äá ÄÃnh kÃm táp tin"
+
+#~ msgid "_Alarms"
+#~ msgstr "_BÃo Äáng"
+
+#~ msgid "The organizer selected no longer has an account."
+#~ msgstr "Bá tá chác Äà chán khÃng cÃn cà tÃi khoán lái."
+
+#~| msgid "None"
+#~ msgctxt "cal-alarms"
+#~ msgid "None"
+#~ msgstr "KhÃng"
+
+#~ msgid "Custom Alarm:"
+#~ msgstr "BÃo Äáng tá chán:"
+
+#~ msgid "_Alarm"
+#~ msgstr "_BÃo Äáng"
+
+#~ msgid "_Group:"
+#~ msgstr "_NhÃm:"
+
+#~ msgid "It has alarms."
+#~ msgstr "Nà cà bÃo Äáng."
+
+#~| msgid "It has alarms."
+#~ msgctxt "iCalImp"
+#~ msgid "has alarms"
+#~ msgstr "cà bÃo Äáng"
+
+#~ msgid "Run Anjal in a window"
+#~ msgstr "Cháy Anjal trong cáa sá"
+
+#~| msgid "Mark as _default memo list"
+#~ msgid "Make Anjal the default email client"
+#~ msgstr "Chán Anjal là trÃnh Äác thÆ mác Äánh"
+
+#~| msgid "Default Mail Client "
+#~ msgid "Anjal email client"
+#~ msgstr "TrÃnh Äác thÆ Anjal"
+
+#~| msgid "Opening folder %s"
+#~ msgid "Opening folder '%s'"
+#~ msgstr "Äang má thÆ mác '%s'"
+
+#~ msgid "Account Management"
+#~ msgstr "Quán là TÃi khoán"
+
+#~| msgid "Please select an image for this contact"
+#~ msgid "Please select a folder from the current account."
+#~ msgstr "HÃy chán thÆ mác tá tÃi khoán hián tái."
+
+#~ msgid "Scanning folders in \"%s\""
+#~ msgstr "Äang quÃt cÃc thÆ mác trong  %s Â..."
+
+#~| msgid "Creating folder `%s'"
+#~ msgid "Creating folder '%s'"
+#~ msgstr "Äang táo thÆ mác '%s'"
+
+#~ msgid "_Default junk plugin:"
+#~ msgstr "Phán bá sung thÆ rÃc _mác Äánh:"
+
+#~ msgid "_Use Secure Connection:"
+#~ msgstr "DÃng kát nái _báo mát:"
+
+#~| msgid "Scanning folders in \"%s\""
+#~ msgid "Scanning folders in '%s'"
+#~ msgstr "Äang quÃt cÃc thÆ mác trong '%s'"
+
+#~| msgid "Retrieving quota information for folder %s"
+#~ msgid "Retrieving quota information for folder '%s'"
+#~ msgstr "Äang láy thÃng hán ngách cáa thÆ mác '%s'"
+
+#~| msgid "Opening store %s"
+#~ msgid "Opening store '%s'"
+#~ msgstr "Äang má kho '%s'"
+
+#~ msgid "Local Folders"
+#~ msgstr "ThÆ mác các bá"
+
+#~| msgid ""
+#~| "Error saving messages to: %s:\n"
+#~| " %s"
+#~ msgid "Error saving messages to: %s:\n"
+#~ msgstr "Gáp lái khi lÆu thÆ vÃo: %s:\n"
+
+#~ msgid "Checking Service"
+#~ msgstr "Äang kiám tra dách vá..."
+
+#~ msgid "Updating Search Folders for '%s'"
+#~ msgstr "Äang cáp nhát cÃc thÆ mác tÃm kiám cho  %s Â"
+
+#~ msgid "Delete messages in Search Folder \"{0}\"?"
+#~ msgstr "Xoà cÃc thÆ khái thÆ mác tÃm kiám  {0}  khÃng?"
+
+#~| msgid "Create a new folder for storing mail"
+#~ msgid "Migrate local mbox folders to maildir"
+#~ msgstr "Chuyán thÆ mác các bá dáng mbox sang dáng maildir"
+
+#~ msgid "Alarm programs"
+#~ msgstr "ChÆÆng trÃnh bÃo Äáng"
+
+#~| msgid "Save as vCard..."
+#~ msgid "Save as iCalendar..."
+#~ msgstr "LÆu dáng iCalendar..."
+
+#~| msgid "None"
+#~ msgctxt "mail-junk-hook"
+#~ msgid "None"
+#~ msgstr "KhÃng"
+
+#~ msgid "Header Value Contains:"
+#~ msgstr "Già trá dÃng Äáu cháa:"
+
+#~ msgid "%s plugin is available and the binary is installed."
+#~ msgstr "Phán bá sung %s sán sÃng và táp tin nhá phÃn Äà ÄÆác cÃi Äát."
+
+#~ msgid ""
+#~ "%s plugin is not available. Please check whether the package is installed."
+#~ msgstr ""
+#~ "Phán bá sung %s khÃng sán sÃng. HÃy kiám tra gÃi ÄÃ ÄÃ ÄÆác cÃi Äát chÆa."
+
+#, fuzzy
+#~| msgid "No Junk plugin available"
+#~ msgid "No junk plugin available"
+#~ msgstr "KhÃng cà phán bá sung ThÆ rÃc"
+
+#~ msgid "Bogofilter is not available. Please install it first."
+#~ msgstr "Bogofilter khÃng cÃ. Vui lÃng cÃi Bogofilter ÄÃ."
+
+#~ msgid "Error occurred while spawning %s: %s."
+#~ msgstr "Gáp lái trong khi táo %s: %s"
+
+#~ msgid "Bogofilter child process does not respond, killing..."
+#~ msgstr "Tián trÃnh con lác Bogofilter khÃng ÄÃp áng nÃn buác kát thÃc..."
+
+#~ msgid "Wait for Bogofilter child process interrupted, terminating..."
+#~ msgstr ""
+#~ "Khoáng Äái tián trÃnh con lác Bogofilter bá giÃn Äoán nÃn chám dát..."
+
+#~ msgid "Pipe to Bogofilter failed, error code: %d."
+#~ msgstr "Lái gái dá liáu qua áng dán cho lác Bogofilter, mà lái: %d"
+
+#, fuzzy
+#~| msgid "Bogofilter junk plugin"
+#~ msgid "Bogofilter Junk Filter"
+#~ msgstr "Phán má ráng thÆ rÃc Bogofilter"
+
+#, fuzzy
+#~| msgid "Filters junk messages using Bogofilter."
+#~ msgid "Filter junk messages using Bogofilter."
+#~ msgstr "Lác ra thÆ rÃc báng Bogofilter."
+
+#~ msgid "Use _SSL"
+#~ msgstr "DÃng _SSL"
+
+#~ msgid "_Secure connection"
+#~ msgstr "Kát nái _báo mát"
+
+#, fuzzy
+#~| msgid "Send a message to the selected contacts"
+#~ msgid "Show a map of all the contacts"
+#~ msgstr "Gái thÆ cho cÃc liÃn lác ÄÃ chán"
+
+#~| msgid "No contacts"
+#~ msgid "Map for contacts"
+#~ msgstr "Bán Äá liÃn lác"
+
+#, fuzzy
+#~| msgid "Select folder to import into"
+#~ msgid "Select folder to import OE folder into"
+#~ msgstr "Chán thÆ mác Äá nháp vÃo"
+
+#, fuzzy
+#~| msgid "Select a (48*48) png of size < 700bytes"
+#~ msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
+#~ msgstr "Chán mát ánh (48Ã48) PNG kÃch cá < 700 byte"
+
+#~ msgid "Checklist"
+#~ msgstr "Danh sÃch kiám"
+
+#~ msgid "New _Shared Folder..."
+#~ msgstr "ThÆ mác _chung mái..."
+
+#~ msgid "_Proxy Login..."
+#~ msgstr "ÄÄng nhá_p áy nhiám..."
+
+#~ msgid "Junk Mail Settings..."
+#~ msgstr "Thiát láp ThÆ rÃc.."
+
+#~ msgid "Track Message Status..."
+#~ msgstr "Theo dÃi tráng thÃi thÆ..."
+
+#~ msgid "Retract Mail"
+#~ msgstr "Háy bá thÆ"
+
+#~ msgid "Accept"
+#~ msgstr "Cháp nhán"
+
+#~ msgid "Accept Tentatively"
+#~ msgstr "Cháp nhán tám"
+
+#~ msgid "Decline"
+#~ msgstr "Tá chái"
+
+#, fuzzy
+#~| msgid "_Delegate Meeting..."
+#~ msgid "Rese_nd Meeting..."
+#~ msgstr "á_y nhiám cuác háp..."
+
+#~ msgid "Create folder"
+#~ msgstr "Táo thÆ mác"
+
+#, fuzzy
+#~| msgid ""
+#~| "The user '%s' has shared a folder with you\n"
+#~| "\n"
+#~| "Message from '%s'\n"
+#~| "\n"
+#~| "\n"
+#~| "%s\n"
+#~| "\n"
+#~| "\n"
+#~| "Click 'Forward' to install the shared folder\n"
+#~| "\n"
+#~ msgid ""
+#~ "The user '%s' has shared a folder with you\n"
+#~ "\n"
+#~ "Message from '%s'\n"
+#~ "\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "\n"
+#~ "Click 'Apply' to install the shared folder\n"
+#~ "\n"
+#~ msgstr ""
+#~ "NgÆái dÃng '%s' ÄÃ chia sá mát thÆ mác cho bán\n"
+#~ "\n"
+#~ "ThÃng bÃo tá '%s'\n"
+#~ "\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "\n"
+#~ "Nhán 'Tái' Äá cÃi Äát thÆ mác chia sá nÃy\n"
+#~ "\n"
+
+#~ msgid "Install the shared folder"
+#~ msgstr "CÃi Äát thÆ mác chia sá"
+
+#~ msgid "Shared Folder Installation"
+#~ msgstr "CÃi Äát thÆ mác chia sá"
+
+#~ msgid "Junk Settings"
+#~ msgstr "Thiát láp ThÆ rÃc"
+
+#~ msgid "Junk Mail Settings"
+#~ msgstr "Thiát láp ThÆ rÃc"
+
+#~ msgid "Email:"
+#~ msgstr "ThÆ Äián tá:"
+
+#, fuzzy
+#~| msgid "_Junk List"
+#~ msgid "Junk List:"
+#~ msgstr "Danh sÃch _ThÆ rÃc"
+
+#~ msgid "_Enable"
+#~ msgstr "_Bát"
+
+#~ msgid "_Junk List"
+#~ msgstr "Danh sÃch _ThÆ rÃc"
+
+#~ msgid "Message Retract"
+#~ msgstr "RÃt lui thÆ"
+
+#, fuzzy
+#~| msgid ""
+#~| "Retracting a message may remove it from the recipient's mailbox. Are you "
+#~| "sure you want to do this ?"
+#~ msgid ""
+#~ "Retracting a message may remove it from the recipient's mailbox. Are you "
+#~ "sure you want to do this?"
+#~ msgstr ""
+#~ "RÃt lui mát thÆ thà cÅng cà thá gá bá nà khái háp thÆ cáa ngÆái nhán. Bán "
+#~ "cà chác lÃm nhÆ thá khÃng?"
+
+#~ msgid "Message retracted successfully"
+#~ msgstr "ThÆ ÄÃ ÄÆác háy bá"
+
+#~ msgid "Insert Send options"
+#~ msgstr "ChÃn tÃy chán gái"
+
+#~ msgid "The participants will receive the following notification.\n"
+#~ msgstr "Mái ngÆái dá sá nhán thÃng bÃo theo ÄÃy.\n"
+
+#~ msgid "Add Send Options to GroupWise messages"
+#~ msgstr "ThÃm TÃy chán Gái vÃo thÆ GroupWise"
+
+#, fuzzy
+#~| msgid "A plugin for the features in GroupWise accounts."
+#~ msgid "Fine-tune your GroupWise accounts."
+#~ msgstr "Phán bá sung cho nháng tÃnh nÄng trong tÃi khoán GroupWise."
+
+#~ msgid "GroupWise Features"
+#~ msgstr "TÃnh nÄng GroupWise"
+
+#~ msgid "Message retract failed"
+#~ msgstr "Lái háy bá thÆ"
+
+#~ msgid "The server did not allow the selected message to be retracted."
+#~ msgstr "MÃy chá khÃng cho phÃp bán háy bá thÆ ÄÃ."
+
+#~ msgid ""
+#~ "Account &quot;{0}&quot; already exists. Please check your folder tree."
+#~ msgstr "TÃi khoán  {0}  Äà cÃ. HÃy kiám tra lái cÃy thÆ mác."
+
+#~ msgid "Account Already Exists"
+#~ msgstr "TÃi khoán ÄÃ cÃ"
+
+#~ msgid "Invalid user"
+#~ msgstr "NgÆái dÃng khÃng háp lá"
+
+#~ msgid ""
+#~ "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+#~ "address and try again."
+#~ msgstr ""
+#~ "Lái ÄÄng nháp qua mÃy chá áy nhiám dÆái  {0} Â. HÃy kiám tra lái Äáa chá "
+#~ "thÆ Äián tá và thá lái."
+
+#~ msgid "Proxy access cannot be given to user &quot;{0}&quot;"
+#~ msgstr ""
+#~ "KhÃng thá cáp cho ngÆái dÃng  {0}  quyán truy cáp qua mÃy chá áy nhiám."
+
+#~ msgid "Specify User"
+#~ msgstr "Ghi rà ngÆái dÃng"
+
+#~ msgid "You have already given proxy permissions to this user."
+#~ msgstr "Bán ÄÃ cáp cho ngÆái dÃng nÃy quyán áy nhiám."
+
+#~ msgid "You have to specify a valid user name to give proxy rights."
+#~ msgstr ""
+#~ "Bán cán phái ghi rà mát tÃn ngÆái dÃng háp lá, Äá cáp quyán áy nhiám."
+
+#~ msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+#~ msgstr "Bán khÃng thá chia sá thÆ mác nÃy vái ngÆái dÃng Äà ghi rà  {0} Â"
+
+#~ msgid "You have to specify a user name which you want to add to the list"
+#~ msgstr "Bán cán phái ghi rà tÃn ngÆái dÃng cán thÃm vÃo danh sÃch"
+
+#, fuzzy
+#~| msgid "Are you sure you want to delete this meeting?"
+#~ msgid "Do you want to resend the meeting?"
+#~ msgstr "Bán cà chác muán xoà cuác háp nÃy khÃng?"
+
+#, fuzzy
+#~| msgid "Are you sure you want to delete this meeting?"
+#~ msgid "Do you want to resend the recurring meeting?"
+#~ msgstr "Bán cà chác muán xoà cuác háp nÃy khÃng?"
+
+#, fuzzy
+#~| msgid "Do you want to recover unfinished messages?"
+#~ msgid "Do you want to retract the original item?"
+#~ msgstr "Bán cà muán phác hái cÃc thÆ chÆa hoÃn tát khÃng?"
+
+#, fuzzy
+#~| msgid "_Delete this item from all other recipient's mailboxes?"
+#~ msgid "The original will be removed from the recipient's mailbox."
+#~ msgstr "_Xoà mác nÃy ra háp thÆ cáa mái ngÆái nhán khÃc khÃng?"
+
+#~ msgid "This is a recurring meeting"
+#~ msgstr "ÄÃy là cuác háp láp"
+
+#~ msgid "Would you like to accept it?"
+#~ msgstr "Muán cháp nhán ?"
+
+#~ msgid "Would you like to decline it?"
+#~ msgstr "Muán tá chái ?"
+
+#~ msgid "C_ustomize notification message"
+#~ msgstr "Tuá _chánh thÃng Äiáp thÃng bÃo"
+
+#~ msgid "Con_tacts..."
+#~ msgstr "L_iÃn lác..."
+
+#, fuzzy
+#~| msgid "Users"
+#~ msgid "Users:"
+#~ msgstr "NgÆái dÃng"
+
+#~ msgid "_Not Shared"
+#~ msgstr "KhÃ_ng chia sá"
+
+#~ msgid "_Shared With..."
+#~ msgstr "Chia sá _vái..."
+
+#~ msgid "Access Rights"
+#~ msgstr "Quyán truy cáp"
+
+#~ msgid "Add/Edit"
+#~ msgstr "ThÃm/Sáa"
+
+#~ msgid "Con_tacts"
+#~ msgstr "_LiÃn lác"
+
+#~ msgid "Modify _folders/options/rules/"
+#~ msgstr "Sáa Äái _thÆ mác/tÃy chán/quy tác/"
+
+#~ msgid "Read items marked _private"
+#~ msgstr "Äác mác cà dáu _RiÃng"
+
+#~ msgid "Subscribe to my _alarms"
+#~ msgstr "ÄÄng kà vái _bÃo Äáng tÃi"
+
+#~ msgid "Subscribe to my _notifications"
+#~ msgstr "ÄÄng kà vái thÃ_ng bÃo tÃi"
+
+#~ msgid "_Write"
+#~ msgstr "_Ghi"
+
+#~ msgid "permission to read|_Read"
+#~ msgstr "Äá_c"
+
+#~ msgid "Proxy"
+#~ msgstr "áy nhiám"
+
+#~ msgid "Proxy Login"
+#~ msgstr "ÄÄng nháp áy nhiám"
+
+#~ msgid "%sEnter password for %s (user %s)"
+#~ msgstr "%sGÃ mát kháu cho %s (ngÆái dÃng %s)"
+
+#~ msgid "The Proxy tab will be available only when the account is online."
+#~ msgstr "CÃ thá sá dáng Thanh áy nhiám chá khi tÃi khoán trác tuyán."
+
+#~ msgid "The Proxy tab will be available only when the account is enabled."
+#~ msgstr "CÃ thá sá dáng Thanh áy nhiám chá khi tÃi khoán ÄÃ bát."
+
+#, fuzzy
+#~| msgid "Proxy"
+#~ msgctxt "GW"
+#~ msgid "Proxy"
+#~ msgstr "áy nhiám"
+
+#~ msgid "Add User"
+#~ msgstr "ThÃm ngÆái dÃng"
+
+#~ msgid "Advanced send options"
+#~ msgstr "TÃy chán gái cáp cao"
+
+#~ msgid "Users"
+#~ msgstr "NgÆái dÃng"
+
+#~ msgid "Enter the users and set permissions"
+#~ msgstr "Nháp nháng ngÆái dÃng và láp quyán hán"
+
+#~ msgid "Sharing"
+#~ msgstr "DÃng chung"
+
+#~ msgid "Custom Notification"
+#~ msgstr "ThÃng bÃo tá chán"
+
+#~ msgid "Add   "
+#~ msgstr "ThÃm   "
+
+#~ msgid "Modify"
+#~ msgstr "Sáa Äái"
+
+#~ msgid "Message Status"
+#~ msgstr "Tráng thÃi thÆ"
+
+#~ msgid "Subject:"
+#~ msgstr "Chá Äá:"
+
+#~ msgid "From:"
+#~ msgstr "Tá:"
+
+#~ msgid "Creation date:"
+#~ msgstr "NgÃy táo:"
+
+#~ msgid "Recipient: "
+#~ msgstr "NgÆái nhán: "
+
+#~ msgid "Delivered: "
+#~ msgstr "PhÃt: "
+
+#~ msgid "Opened: "
+#~ msgstr "Má: "
+
+#~ msgid "Accepted: "
+#~ msgstr "Cháp nhán: "
+
+#~ msgid "Deleted: "
+#~ msgstr "XoÃ: "
+
+#~ msgid "Declined: "
+#~ msgstr "Tá chái: "
+
+#~ msgid "Completed: "
+#~ msgstr "Xong: "
+
+#~ msgid "Undelivered: "
+#~ msgstr "ChÆa phÃt: "
+
+#~ msgid "Enable D-Bus messages."
+#~ msgstr "Bát thÃng Äiáp D-Bus."
+
+#~ msgid "Generates a D-Bus message when new mail messages arrive."
+#~ msgstr "Táo ra mát thÃng Äiáp D-BUS khi nhán thÆ mái."
+
+#~ msgid "Popup message together with the icon."
+#~ msgstr "Hián thá thÃng Äiáp cÃng vái biáu tÆáng."
+
+#~ msgid "Whether show message over the icon when new messages arrive."
+#~ msgstr ""
+#~ "CÃ nÃn hián thá thÃng Äiáp á trÃn biáu tÆáng hay khÃng, khi nhán thÆ mái."
+
+#~ msgid "Show icon in _notification area"
+#~ msgstr "Hiá_n thá biáu tÆáng trong vÃng thÃng bÃo"
+
+#~ msgid "Popup _message together with the icon"
+#~ msgstr "Hián thá thÃng Äiáp cÃng _vái biáu tÆáng"
+
+#~ msgid "Generate a _D-Bus message"
+#~ msgstr "Táo ra mát thÃng Äiáp _D-Bus"
+
+#~ msgid "Evolution Profiler"
+#~ msgstr "Bá táo há sÆ Evolution"
+
+#~ msgid "SpamAssassin not found, code: %d"
+#~ msgstr "KhÃng tÃm tháy SpamAssassin, mÃ: %d"
+
+#~ msgid "Failed to create pipe: %s"
+#~ msgstr "Lái táo áng dán: %s"
+
+#~ msgid "Error after fork: %s"
+#~ msgstr "Lái sau khi táo tián trÃnh con: %s"
+
+#~ msgid "SpamAssassin child process does not respond, killing..."
+#~ msgstr "Tián trÃnh con SpamAssassin khÃng ÄÃp áng nÃn buác kát thÃc..."
+
+#~ msgid "Wait for SpamAssassin child process interrupted, terminating..."
+#~ msgstr "Khoáng Äái tián trÃnh con SpamAssassin bá giÃn Äoán nÃn chám dát..."
+
+#~ msgid "Pipe to SpamAssassin failed, error code: %d"
+#~ msgstr "Lái gái dá liáu qua áng dán cho SpamAssassin, mà lái: %d"
+
+#~| msgid "SpamAssassin is not available."
+#~ msgid "SpamAssassin is not available. Please install it first."
+#~ msgstr "SpamAssassin khÃng cÃ. HÃy cÃi SpamAssassin trÆác."
+
+#~| msgid "SpamAssassin junk plugin"
+#~ msgid "SpamAssassin Junk Filter"
+#~ msgstr "Bá thÆ rÃc SpamAssassin"
+
+#~ msgid "iCalendar format (.ics)"
+#~ msgstr "Táp tin iCalendar (.ics)"
+
+#~ msgid "Drafts based template plugin"
+#~ msgstr "Phán bá sung máu dáa vÃo bán nhÃp"
+
+# Name: do not translate/ tÃn: Äáng dách
+#~ msgid "Evolution _FAQ"
+#~ msgstr "_Hái ÄÃp Evolution"
+
+#~ msgid "Open the Frequently Asked Questions webpage"
+#~ msgstr "Má trang Web hián thá cÃc cÃu hái thÆáng gáp"
+
+#~ msgid "E-Mail Address"
+#~ msgstr "Äáa chá thÆ"
+
 #~ msgid "search bar"
 #~ msgstr "thanh tÃm"
 
@@ -22795,9 +22536,6 @@ msgstr "CÃch nháp"
 #~ msgid "Server Version"
 #~ msgstr "PhiÃn bán mÃy chá"
 
-#~ msgid "{0}"
-#~ msgstr "{0}"
-
 #~ msgid "{1}"
 #~ msgstr "{1}"
 
@@ -24496,9 +24234,6 @@ msgstr "CÃch nháp"
 #~ msgid "<b>%s</b> has published meeting information."
 #~ msgstr "<b>%s</b> ÄÃ cÃng bá tin tác cuác háp."
 
-#~ msgid "Meeting Information"
-#~ msgstr "Tin tác cuác háp"
-
 #~ 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."
 
@@ -25124,9 +24859,6 @@ msgstr "CÃch nháp"
 #~ msgid "message"
 #~ msgstr "thÆ"
 
-#~ msgid "Save Message..."
-#~ msgstr "LÆu thÆ..."
-
 #~ msgid "Add address"
 #~ msgstr "ThÃm Äáa chá"
 
@@ -25164,8 +24896,8 @@ msgstr "CÃch nháp"
 #~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
 #~ "vertically."
 #~ msgstr ""
-#~ "Náu à cáa sá  Xem thá  ÄÆác bát, hián thá nà cánh nhau hÆn là theo chiáu "
-#~ "dác."
+#~ "Náu à cáa sá  Xem thá  ÄÆác bát, hián thá nà cánh nhau hÆn là theo "
+#~ "chiáu dác."
 
 #~ msgid "Message Window default height"
 #~ msgstr "Äá cao mác Äánh cáa Cáa sá thÆ"
@@ -25182,9 +24914,6 @@ msgstr "CÃch nháp"
 #~ msgid "Subscribe dialog default width"
 #~ msgstr "Äá ráng mác Äánh cáa háp thoái ÄÄng kÃ"
 
-#~ msgid "Text message part limit"
-#~ msgstr "Hán chá phán vÄn bán thÆ"
-
 #~ msgid "Thread the message list."
 #~ msgstr "Hián thá nhÃnh trong danh sÃch thÆ."
 
@@ -25974,7 +25703,8 @@ msgstr "CÃch nháp"
 
 #~ msgid "Cannot access the \"Exchange settings\" tab in offline mode."
 #~ msgstr ""
-#~ "KhÃng thá truy cáp Äán thá  Thiát láp Trao Äái  trong chá Äá ngoái tuyán."
+#~ "KhÃng thá truy cáp Äán thá  Thiát láp Trao Äái  trong chá Äá ngoái "
+#~ "tuyán."
 
 #~ msgid "Cannot change password due to configuration problems."
 #~ msgstr "KhÃng thá thay Äái mát kháu và ván Äá cáu hÃnh."
@@ -25989,8 +25719,8 @@ msgstr "CÃch nháp"
 #~ "Changes to options for Exchange account \"{0}\" will only take effect "
 #~ "after restarting Evolution."
 #~ msgstr ""
-#~ "CÃc thay Äái trong tÃy chán cáa tÃi khoán Evolution  {0}  sá cà tÃc Äáng "
-#~ "chá sau khi bán khái cháy lái trÃnh Evolution."
+#~ "CÃc thay Äái trong tÃy chán cáa tÃi khoán Evolution  {0}  sá cà tÃc "
+#~ "Äáng chá sau khi bán khái cháy lái trÃnh Evolution."
 
 #~ msgid "Could not authenticate to server."
 #~ msgstr "KhÃng thá xÃc thác tái mÃy chá."
@@ -26227,9 +25957,6 @@ msgstr "CÃch nháp"
 #~ msgid "{0} is already a delegate"
 #~ msgstr "{0} ÄÃ mát ngÆái áy nhiám."
 
-#~ msgid "{0} is already in the list"
-#~ msgstr "{0} Äà cà trong danh sÃch."
-
 #~ msgid "Subscribe to Other User's Tasks"
 #~ msgstr "ÄÄng kà vái cÃc tÃc vá cáa ngÆái dÃng khÃc"
 
@@ -26329,8 +26056,9 @@ msgstr "CÃch nháp"
 #~ "The \"hald\" service is required but not currently running. Please enable "
 #~ "the service and rerun this program, or contact your system administrator."
 #~ msgstr ""
-#~ "Dách vá  hald  cán thiát nhÆng khÃng Äang cháy. HÃy hiáu lác dách vá nÃy "
-#~ "và khái cháy lái chÆÆng trÃnh nÃy, hoác liÃn lác vái quán trá há tháng."
+#~ "Dách vá  hald  cán thiát nhÆng khÃng Äang cháy. HÃy hiáu lác dách vá "
+#~ "nÃy và khái cháy lái chÆÆng trÃnh nÃy, hoác liÃn lác vái quán trá há "
+#~ "tháng."
 
 #~ msgid ""
 #~ "Evolution could not find an iPod to synchronize with. Either the iPod is "
@@ -26674,8 +26402,8 @@ msgstr "CÃch nháp"
 #~ msgstr ""
 #~ "CÃc phiÃn bán Evolution trÆác Äà lÆu dá liáu vÃo mát vá trà khÃc.\n"
 #~ "\n"
-#~ "Náu bán chán gá bá dá liáu nÃy, toÃn bá nái dung cáa thÆ mác  evolution  "
-#~ "sá bá xoà hoÃn toÃn. Náu bán chán giá dá liáu nÃy, bán cà thá tá gá bá "
+#~ "Náu bán chán gá bá dá liáu nÃy, toÃn bá nái dung cáa thÆ mác  evolution "
+#~ " sá bá xoà hoÃn toÃn. Náu bán chán giá dá liáu nÃy, bán cà thá tá gá bá "
 #~ "nái dung  evolution  vÃo mát lÃc thuán tián.\n"
 
 #~ msgid ""
@@ -26737,9 +26465,6 @@ msgstr "CÃch nháp"
 #~ msgid "Edit"
 #~ msgstr "Hiáu chánh"
 
-#~ msgid "View"
-#~ msgstr "Xem"
-
 #~ msgid "Shutting down %s (%s)\n"
 #~ msgstr "Äang tát %s (%s)\n"
 
@@ -27140,9 +26865,6 @@ msgstr "CÃch nháp"
 #~ msgid "Item(s) belong to these _categories:"
 #~ msgstr "CÃc mác thuác vá nháng _loái nÃy:"
 
-#~ msgid "_Available Categories:"
-#~ msgstr "_Loái sán cÃ:"
-
 #~ msgid "categories"
 #~ msgstr "loái"
 
@@ -27383,7 +27105,8 @@ msgstr "CÃch nháp"
 
 #~ msgid "Mark all messages in this folder and subfolders as read?"
 #~ msgstr ""
-#~ "ÄÃnh dáu  Äà Äác  mái thÆ nám trong thÆ mác nÃy và cÃc thÆ mác con khÃng?"
+#~ "ÄÃnh dáu  Äà Äác  mái thÆ nám trong thÆ mác nÃy và cÃc thÆ mác con "
+#~ "khÃng?"
 
 #~ msgid "Do you want the operation to be performed also in the subfolders?"
 #~ msgstr "Bán cà muán thác hián thao tÃc Äà xuáng nháng thÆ mác con khÃng?"
@@ -27435,8 +27158,8 @@ msgstr "CÃch nháp"
 
 #~ msgid "'.' and '..' are reserved folder names."
 #~ msgstr ""
-#~ "Dáu chám  .  và hai dáu chám tiáp tác  ..  là hai tÃn thÆ mác Äác biát, "
-#~ "ÄÆác dÃnh riÃng."
+#~ "Dáu chám  .  và hai dáu chám tiáp tác  ..  là hai tÃn thÆ mác Äác "
+#~ "biát, ÄÆác dÃnh riÃng."
 
 #~ msgid "Error opening the FAQ webpage."
 #~ msgstr "Gáp lái khi má trang Web Hái ÄÃp."



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