update version reliance

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

	* configure.in: update version reliance

svn path=/trunk/; revision=23667

1 files changed, 2762 insertions, 1591 deletions

diff --git a/po/ms.po b/po/ms.po
index 36b9742c0d..4b31d59492 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-19 11:10+0800\n"
+"POT-Creation-Date: 2003-12-07 17:06-0500\n"
 "PO-Revision-Date: 2003-11-17 11:40+0800\n"
 "Last-Translator: Mimos Open Source Development Group <ismas@mimos.my>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang@lists.sf.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
@@ -30,176 +30,181 @@ msgid "Could not read pilot's Address application block"
 msgstr "Tidak dapat membaca blok aplikasi Alamat rintis"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Folder Autocompletion"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Certificates"
 msgstr "Sijil"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Configure access to LDAP directory servers here"
-msgstr "Buat konfigurasi capaian ke pelayan direktori LDAP di sini"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Configure autocomple here"
+msgstr "Buat konfigurasi akaun e-mel anda di sini"
 
 #. Fix me *
 #. can not get name, should be a bug of e-book.Anyway, should set a default name.
 #.
 #. name = e_book_get_name (book);
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: mail/importers/netscape-importer.c:1844 shell/e-shortcuts.c:1088
 msgid "Contacts"
 msgstr "Kenalan"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Directory Servers"
-msgstr "Pelayan Direktori"
-
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Evolution Addressbook"
 msgstr "Buku Alamat Evolution"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Kawalan Konfigurasi LDAP Buku Alamat Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address pop-up"
 msgstr "Pop-up alamat Buku Alamat Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook address viewer"
 msgstr "Pelihat alamat Buku Alamat Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook card viewer"
 msgstr "Pelihat kad Buku Alamat Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook component"
 msgstr "Komponen Buku Alamat Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook folder viewer"
 msgstr "Pelihat folder Buku Alamat Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Kawalan Pengurusan Sijil S/Mime Evolution"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Kawalan konfigurasi seting folder Evolution"
+
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manager your S/Mime certificates here"
 msgstr "Urus sijil S/Mime anda di sini"
 
-#: addressbook/gui/component/addressbook-component.c:125
+#: addressbook/gui/component/addressbook-component.c:145
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "New Addressbook"
 msgstr "Buku Alamat"
 
-#: addressbook/gui/component/addressbook-component.c:126
+#: addressbook/gui/component/addressbook-component.c:146
+msgid "Properties..."
+msgstr "Ciri-ciri..."
+
+#: addressbook/gui/component/addressbook-component.c:147
 #: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:342 filter/libfilter-i18n.h:10
-#: mail/em-account-prefs.c:236 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:403
+#: filter/libfilter-i18n.h:10 mail/em-account-prefs.c:236
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 msgid "Delete"
 msgstr "Hapus"
 
-#: addressbook/gui/component/addressbook-component.c:127
-#: calendar/gui/calendar-component.c:343
+#: addressbook/gui/component/addressbook-component.c:148
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:401
 #, fuzzy
 msgid "Rename"
 msgstr "_Namakan semula"
 
-#: addressbook/gui/component/addressbook-component.c:185
+#: addressbook/gui/component/addressbook-component.c:217
 #, fuzzy
 msgid "New Contact"
 msgstr "Kenalan Baru:"
 
-#: addressbook/gui/component/addressbook-component.c:186
+#: addressbook/gui/component/addressbook-component.c:218
 msgid "_Contact"
 msgstr "_Kenalan"
 
-#: addressbook/gui/component/addressbook-component.c:187
+#: addressbook/gui/component/addressbook-component.c:219
 msgid "Create a new contact"
 msgstr "Wujudkan kenalan baru"
 
-#: addressbook/gui/component/addressbook-component.c:192
+#: addressbook/gui/component/addressbook-component.c:224
 msgid "New Contact List"
 msgstr "Senarai Kenalan Baru"
 
-#: addressbook/gui/component/addressbook-component.c:193
+#: addressbook/gui/component/addressbook-component.c:225
 #, fuzzy
 msgid "Contact _List"
 msgstr "Senarai Kenalan Baru"
 
-#: addressbook/gui/component/addressbook-component.c:194
+#: addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new contact list"
 msgstr "Wujudkan senarai kenalan baru"
 
-#: addressbook/gui/component/addressbook-component.c:336
-#: calendar/gui/calendar-component.c:639
+#: addressbook/gui/component/addressbook-component.c:375
+#: calendar/gui/calendar-component.c:834 calendar/gui/tasks-component.c:764
 msgid "On This Computer"
 msgstr "Atas Komputer Ini"
 
 #. orange
-#: addressbook/gui/component/addressbook-component.c:346
-#: calendar/gui/calendar-component.c:647 calendar/gui/migration.c:123
-#: calendar/gui/migration.c:146 filter/filter-label.c:123
-#: mail/mail-config.c:67 mail/mail-config.glade.h:83
+#: addressbook/gui/component/addressbook-component.c:385
+#: calendar/gui/calendar-component.c:842 calendar/gui/migration.c:123
+#: calendar/gui/migration.c:146 calendar/gui/tasks-component.c:772
+#: filter/filter-label.c:123 mail/mail-config.c:65 mail/mail-config.glade.h:86
 #: shell/e-config-upgrade.c:1456
 msgid "Personal"
 msgstr "Peribadi"
 
 #. red
-#: addressbook/gui/component/addressbook-component.c:353
-#: calendar/gui/calendar-component.c:654 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
+#: addressbook/gui/component/addressbook-component.c:392
+#: calendar/gui/calendar-component.c:849 filter/filter-label.c:122
+#: mail/mail-config.c:64 mail/mail-config.glade.h:133
 #: shell/e-config-upgrade.c:1455
 msgid "Work"
 msgstr "Kerja"
 
-#: addressbook/gui/component/addressbook-config.c:205
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-component.c:400
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Pelayan LDAP"
+
+#. FIXME: parent
+#: addressbook/gui/component/addressbook-config.c:244
+#, fuzzy
+msgid "Could not create a directory for the new addressbook."
+msgstr "Tidak dapat mewujudkan direktori untuk kalendar baru"
+
+#: addressbook/gui/component/addressbook-config.c:416
 msgid "Failed to connect to LDAP server"
 msgstr "Gagal disambungkan ke pelayan LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:230
+#: addressbook/gui/component/addressbook-config.c:440
 msgid "Failed to authenticate with LDAP server"
 msgstr "Gagal disahkan dengan pelayan LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:258
+#: addressbook/gui/component/addressbook-config.c:468
 msgid "Could not perform query on Root DSE"
 msgstr "Tidak dapat membuat pertanyaan pada Asas DSE"
 
-#: addressbook/gui/component/addressbook-config.c:681
+#: addressbook/gui/component/addressbook-config.c:792
 msgid "The server responded with no supported search bases"
 msgstr "Pelayan memberikan maklum balas dengan tiada asas carian sokongan"
 
-#: addressbook/gui/component/addressbook-config.c:1192
+#: addressbook/gui/component/addressbook-config.c:1203
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Pelayan ini tidak menyokong maklumat skema LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1214
+#: addressbook/gui/component/addressbook-config.c:1225
 msgid "Error retrieving schema information"
 msgstr "Ralat ketika mendapatkan semula maklumat skema"
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1233
 msgid "Server did not respond with valid schema information"
 msgstr "Pelayan tidak memberikan maklum balas dengan maklumat skema yang sah"
 
-#: addressbook/gui/component/addressbook-config.c:1636
-msgid "Account Name"
-msgstr "Nama Akaun"
-
-#: addressbook/gui/component/addressbook-config.c:1638
-msgid "Server Name"
-msgstr "Nama Pelayan"
-
-#: addressbook/gui/component/addressbook-config.c:1675
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP tidak dibolehkan dalam binaan Evolution ini"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Kenalan Lain"
-
-#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:500
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -207,7 +212,7 @@ msgstr ""
 "Kami tidak dapat membuka buku alamat ini.  Sila semak ada\n"
 "laluan atau tidak dan adakah anda diberi kebenaran untuk mencapainya."
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:507
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -217,7 +222,7 @@ msgstr ""
 "sama ada anda telah memasukkan URI yang tidak betul, atau pelayan LDAP\n"
 "tidak dapat dijangkau."
 
-#: addressbook/gui/component/addressbook.c:509
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -230,7 +235,7 @@ msgstr ""
 "anda mestilah kompilkan atur cara dari sumber CVS setelah\n"
 "mendapatkan semula OpenLDAP dari pautan di bawah.\n"
 
-#: addressbook/gui/component/addressbook.c:519
+#: addressbook/gui/component/addressbook.c:521
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -244,44 +249,43 @@ msgstr ""
 msgid "Unable to open addressbook"
 msgstr "Tidak dapat membuka buku alamat"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:600
 msgid "Accessing LDAP Server anonymously"
 msgstr "Mencapai Pelayan LDAP tanpa nama"
 
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:670
 msgid "Failed to authenticate.\n"
 msgstr "Gagal disahkan.\n"
 
-#: addressbook/gui/component/addressbook.c:652
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:676
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sMasukkan kata laluan bagi %s (pengguna %s)"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:802
 msgid "Name begins with"
 msgstr "Nama bermula dengan"
 
-#: addressbook/gui/component/addressbook.c:781
+#: addressbook/gui/component/addressbook.c:803
 msgid "Email begins with"
 msgstr "E-mel bermula dengan"
 
-#: addressbook/gui/component/addressbook.c:782
-#: calendar/gui/cal-search-bar.c:53
+#: addressbook/gui/component/addressbook.c:804
+#: calendar/gui/cal-search-bar.c:52
 msgid "Category is"
 msgstr "Kategorinya ialah"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:783
-#: calendar/gui/cal-search-bar.c:49
+#: addressbook/gui/component/addressbook.c:805
+#: calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Sebarang medan mengandungi"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:806
 msgid "Advanced..."
 msgstr "Lanjutan..."
 
-#: addressbook/gui/component/addressbook.c:930
+#: addressbook/gui/component/addressbook.c:927
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -294,7 +298,7 @@ msgstr ""
 "Sila jadikan carian anda lebih khusus atau tingkatkan had hasil dalam\n"
 "keutamaan pelayan direktori bagi buku alamat ini."
 
-#: addressbook/gui/component/addressbook.c:936
+#: addressbook/gui/component/addressbook.c:933
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -306,29 +310,44 @@ msgstr ""
 "lebih khusus atau tingkatkan had masa dalam keutamaan pelayan\n"
 "direktori bagi buku alamat ini."
 
-#: addressbook/gui/component/addressbook.c:942
+#: addressbook/gui/component/addressbook.c:939
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Bahagian belakang buku alamat ini tidak dapat menghuraikan pertanyaan ini."
 
-#: addressbook/gui/component/addressbook.c:945
+#: addressbook/gui/component/addressbook.c:942
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bahagian belakang buku alamat ini enggan membuat pertanyaan ini."
 
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:945
 msgid "This query did not complete successfully."
 msgstr "Pertanyaan ini tidak dapat disiapkan dengan jayanya."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1021
-#: calendar/gui/cal-search-bar.c:354
+#: addressbook/gui/component/addressbook.c:982
+#: calendar/gui/cal-search-bar.c:353
 msgid "Any Category"
 msgstr "Sebarang Kategori"
 
-#: addressbook/gui/component/addressbook.c:1102
-msgid "URI of the contacts that the control will display"
+#: addressbook/gui/component/addressbook.c:1063
+#, fuzzy
+msgid "UID of the contacts source that the view will display"
 msgstr "URI bagi kenalan yang akan dipaparkan oleh kawalan"
 
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "URI for the folder last used in the select names dialog"
+msgstr ""
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -349,6 +368,7 @@ msgstr "  T_unjukkan Asas Sokongan"
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
@@ -382,8 +402,9 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Tambahkan Pelayan LDAP"
+#, fuzzy
+msgid "Addressbook Creation Assistant"
+msgstr "Pembantu Konfigurasi LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
 msgid "Addressbook Sources"
@@ -399,9 +420,9 @@ msgid "Anonymously"
 msgstr "Tanpa nama"
 
 #: addressbook/gui/component/ldap-config.glade.h:15
+#, fuzzy
 msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
+"Congratulations, you are finished setting up this addressbook.\n"
 "\n"
 "Please click the \"Finish\" button to save the settings you have entered "
 "here."
@@ -412,50 +433,51 @@ msgstr ""
 "Sila klik butang \"Selesai\" untuk menyimpan seting yang anda masukkan di "
 "sini."
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
 msgid "Connecting"
 msgstr "Disambungkan"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished _name:"
 msgstr "Nama_ berbeza:"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Edit LDAP Server"
 msgstr "Edit Pelayan LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address:"
 msgstr "Alamat e-mel:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 "Evolution akan mengggunakan DN ini untuk mengesahkan anda dengan pelayan"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution akan menggunakan alamat e-mel ini untuk mengesahkan anda dengan "
 "pelayan"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Finished"
 msgstr "Selesai"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Am"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Pembantu Konfigurasi LDAP"
+#: addressbook/gui/component/ldap-config.glade.h:26
+#, fuzzy
+msgid "Group:"
+msgstr "Kumpulan"
 
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Tidak Pernah"
 
@@ -484,7 +506,7 @@ msgid "S_earch scope: "
 msgstr "Skop C_arian: "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:397 calendar/gui/e-cal-view.c:718
+#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
 #: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Sedang mencari"
@@ -546,28 +568,32 @@ msgstr ""
 "LDAP, dan bagi mewujudkan dan mengedit kenalan. "
 
 #: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"Specifying a display name and group is the first step in setting up an "
+"addressbook."
 msgstr ""
 "Menetapkan nama paparan ialah langkah terakhir yang diperlukan dalam membuat "
 "konfigurasi pelayan LDAP."
 
 #: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Langkah 1: Maklumat Pelayan"
+msgid "Step 1: Folder Characteristics"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Langkah 2: Sambungkan ke Pelayan"
+#, fuzzy
+msgid "Step 2: Server Information"
+msgstr "Langkah 1: Maklumat Pelayan"
 
 #: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Langkah 3: Mencari dalam Direktori"
+#, fuzzy
+msgid "Step 3: Connecting to Server"
+msgstr "Langkah 2: Sambungkan ke Pelayan"
 
 #: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Langkah 4: Paparkan Nama"
+#, fuzzy
+msgid "Step 4: Searching the Directory"
+msgstr "Langkah 3: Mencari dalam Direktori"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 msgid "Sub"
@@ -579,18 +605,6 @@ msgstr "Asas Carian Sokongan"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-"Langkah pertama dalam membuat konfigurasi pelayan LDAP adalah memberikan "
-"namanya, dan maklumat log masuk\n"
-"anda. Sila tanya pentadbir sistem anda jika anda tidak pasti tentang "
-"maklumat ini."
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
 "searches, and how long a search should take. Ask your system administrator "
@@ -603,7 +617,7 @@ msgstr ""
 "sama ada anda\n"
 "perlu mengubah opsyen ini atau tidak."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:57
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -614,7 +628,7 @@ msgstr ""
 "bermula. Jika anda membiarkannya kosong, carian akan bermula pada akar "
 "pepohon direktori."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -629,14 +643,14 @@ msgstr ""
 "Skop carian bagi \"satu\" akan hanya merangkumi entri satu tahap di bawah "
 "asas anda.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:65
+#: addressbook/gui/component/ldap-config.glade.h:63
+#, fuzzy
 msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
+"This assistant will help you create a new addressbook. \n"
 "\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
+"Depending on the type of addressbook you create, additional\n"
+"parameters may be required. Please contact your system\n"
+"administrator if you need help finding this information."
 msgstr ""
 "Pembantu ini akan membantu anda mencapai khidmat direktori dalam talian\n"
 "dengan menggunakan pelayan LDAP (Lightweight Directory Access Protocol). \n"
@@ -645,14 +659,14 @@ msgstr ""
 "hubungi pentadbir sistem anda jika anda memerlukan bantuan untuk mendapatkan "
 "maklumat ini."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Ini nama penuh pelayan ldap anda. Contohnya, \"ldap.syarikatsaya.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -662,7 +676,7 @@ msgstr ""
 "sehingga \n"
 "terlalu besar akan melambatkan buku alamat anda."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -672,7 +686,7 @@ msgstr ""
 "perhatian bahawa mengesetkannya kepada \"Alamat E-mel\" memerlukan capaian "
 "tanpa nama kepada pelayan ldap anda."
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:72
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -682,6 +696,16 @@ msgstr ""
 "anda.\n"
 "Ia untuk tujuan paparan sahaja. "
 
+#: addressbook/gui/component/ldap-config.glade.h:74
+#, fuzzy
+msgid ""
+"This is the name that will appear in your Evolution folder list. It is for "
+"display purposes only. "
+msgstr ""
+"Ini nama bagi pelayan ini yang akan tertera pada senarai folder Evolution "
+"anda.\n"
+"Ia untuk tujuan paparan sahaja. "
+
 #: addressbook/gui/component/ldap-config.glade.h:75
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
@@ -710,20 +734,33 @@ msgid "Using email address"
 msgstr "Menggunakan alamat e-mel"
 
 #: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Pada bila-bila masa yang mungkin"
 
 #: addressbook/gui/component/ldap-config.glade.h:83
+#, fuzzy
+msgid ""
+"You have decided to configure an LDAP server. The first step in doing this "
+"is to provide its name and your\n"
+"log in information. Please ask your system administrator if you are unsure "
+"of this information."
+msgstr ""
+"Langkah pertama dalam membuat konfigurasi pelayan LDAP adalah memberikan "
+"namanya, dan maklumat log masuk\n"
+"anda. Sila tanya pentadbir sistem anda jika anda tidak pasti tentang "
+"maklumat ini."
+
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Display name:"
 msgstr "_Paparkan nama:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "_Download limit:"
 msgstr "_Had muat turun:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:142 ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/ldap-config.glade.h:87 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:146 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -732,39 +769,39 @@ msgstr "_Had muat turun:"
 msgid "_Edit"
 msgstr "_Edit"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "_Log in method:"
 msgstr "_Kaedah log masuk:"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid "_Port number:"
 msgstr "_Nombor port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "_Search base:"
 msgstr "_Asas carian:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid "_Server name:"
 msgstr "_Nama pelayan:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:92
 msgid "_Timeout (minutes):"
 msgstr "_Tamat masa (minit):"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:93
 msgid "cards"
 msgstr "kad"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "connecting-tab"
 msgstr "tab sambung"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid "general-tab"
 msgstr "tab am"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:96
 msgid "searching-tab"
 msgstr "tab cari"
 
@@ -777,7 +814,7 @@ msgid "Remove All"
 msgstr "Keluarkan Semua"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:212
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:694
 #: composer/e-msg-composer-attachment-bar.c:444
 msgid "Remove"
 msgstr "Keluarkan"
@@ -815,14 +852,10 @@ msgstr "Nama"
 msgid "Source"
 msgstr "Sumber"
 
-#: addressbook/gui/component/select-names/e-select-names.c:504
+#: addressbook/gui/component/select-names/e-select-names.c:518
 msgid "Select Contacts from Addressbook"
 msgstr "Pilih Kenalan daripada Buku Alamat"
 
-#: addressbook/gui/component/select-names/e-select-names.c:647
-msgid "Find contact in"
-msgstr "Cari kenalan dalam"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Cari"
@@ -898,7 +931,8 @@ msgid "D_epartment:"
 msgstr "J_abatan:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:18
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:1
+#: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Perincian"
 
@@ -965,12 +999,13 @@ msgid "_Categories..."
 msgstr "_Kategori..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: calendar/gui/dialogs/meeting-page.c:635 calendar/gui/e-cal-view.c:1300
-#: calendar/gui/e-cal-view.c:1331 calendar/gui/e-calendar-table.c:1010
-#: calendar/gui/e-calendar-table.c:1028 mail/em-folder-view.c:695
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:36
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:108 ui/evolution-tasks.xml.h:18
+#: calendar/gui/dialogs/meeting-page.c:633 calendar/gui/e-cal-view.c:1223
+#: calendar/gui/e-cal-view.c:1254 calendar/gui/e-calendar-table.c:1009
+#: calendar/gui/e-calendar-table.c:1027 mail/em-folder-tree.c:1501
+#: mail/em-folder-view.c:705 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:36 ui/evolution-comp-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:110
+#: ui/evolution-tasks.xml.h:18
 msgid "_Delete"
 msgstr "_Hapus"
 
@@ -2091,7 +2126,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "Nama Penuh"
 
@@ -2317,9 +2352,9 @@ msgstr "Sampaikan kepada Kenalan"
 msgid "Send Message to Contact"
 msgstr "Hantar Mesej kepada Kenalan"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
+#: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2452
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:76
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:78
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Cetak"
@@ -2341,9 +2376,12 @@ msgstr "Alihkan ke folder..."
 msgid "Cut"
 msgstr "Potong"
 
+#. create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:908
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
+#: calendar/gui/calendar-component.c:429
+#: calendar/gui/dialogs/copy-source-dialog.c:135
+#: calendar/gui/tasks-component.c:400 ui/evolution-addressbook.xml.h:2
+#: ui/evolution-mail-message.xml.h:9 ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Salin"
 
@@ -2353,7 +2391,7 @@ msgid "Paste"
 msgstr "Tampal"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1265
+#: calendar/gui/e-cal-view.c:1192
 msgid "Current View"
 msgstr "Pandangan Semasa"
 
@@ -2370,166 +2408,169 @@ msgstr ""
 "semula"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "* Click here to add a contact *"
-msgstr "* Klik di sini untuk menambahkan kenalan *"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Pembantu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Telefon Pembantu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Address"
-msgstr "Alamat Perniagaan"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "Faks Perniagaan"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Telefon Perniagaan"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Telefon Perniagaan 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Telefon Panggil Balik"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Telefon Kereta"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategori"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Telefon Syarikat"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Jabatan"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: addressbook/gui/widgets/eab-contact-display.c:216
 #: addressbook/gui/widgets/eab-contact-display.c:217
 #: addressbook/gui/widgets/eab-contact-display.c:218
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:348 smime/lib/e-cert.c:769
 msgid "Email"
 msgstr "E-mel"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: addressbook/gui/widgets/eab-popup-control.c:460
 msgid "Email 2"
 msgstr "E-mel 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 #: addressbook/gui/widgets/eab-popup-control.c:470
 msgid "Email 3"
 msgstr "E-mel 3"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Nama Keluarga"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "Failkan Sebagai"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "URL Bebas-sibuk"
+msgid "Given Name"
+msgstr "Nama Diberi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "Alamat Rumah"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "Faks Rumah"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Telefon Rumah"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Telefon Rumah 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordan"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Manager"
 msgstr "Pengurus"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Telefon Bimbit"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Nama ringkas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Pejabat"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisasi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "Alamat Lain"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Faks Lain"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Telefon Lain"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "Pengelui"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Telefon Utama"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Profesion"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Peranan"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "Pasangan"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Gelaran"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Web Site"
 msgstr "Laman Web"
 
@@ -2619,10 +2660,18 @@ msgstr "Senaraikan Ahli"
 msgid "Job Title"
 msgstr "Gelaran Jawatan"
 
+#: addressbook/gui/widgets/eab-contact-display.c:221
+msgid "Home Address"
+msgstr "Alamat Rumah"
+
 #: addressbook/gui/widgets/eab-contact-display.c:222
 msgid "Work Address"
 msgstr "Alamat Tempat Kerja"
 
+#: addressbook/gui/widgets/eab-contact-display.c:223
+msgid "Other Address"
+msgstr "Alamat Lain"
+
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "Home page"
@@ -2633,107 +2682,104 @@ msgstr "Laman web"
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-gui-util.c:43
 msgid "Success"
 msgstr "Berjaya"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#: addressbook/gui/widgets/eab-gui-util.c:44
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:536
-#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:995
-#: shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:1011
 msgid "Unknown error"
 msgstr "Ralat tak diketahui"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#: addressbook/gui/widgets/eab-gui-util.c:45
 msgid "Repository offline"
 msgstr "Repositori luar talian"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/eab-gui-util.c:46
 msgid "Permission denied"
 msgstr "Kebenaran dinafikan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:47
 msgid "Contact not found"
 msgstr "Kenalan tidak dijumpai"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Contact ID already exists"
 msgstr "ID Kenalan telah wujud"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Protocol not supported"
 msgstr "Protokol tidak disokong"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:600
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2321 camel/camel-service.c:734
+#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-tasks.c:213
+#: calendar/gui/print.c:2320 camel/camel-service.c:734
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
 #: camel/providers/pop3/camel-pop3-store.c:530
 msgid "Cancelled"
 msgstr "Batal"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Authentication Failed"
 msgstr "Pengesahan Gagal"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Authentication Required"
 msgstr "Pengesahan Diperlukan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "TLS not Available"
 msgstr "TLS tidak Ada"
 
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Addressbook does not exist"
 msgstr "Buku Alamat tidak wujud"
 
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Other error"
 msgstr "Ralat lain"
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
+#: addressbook/gui/widgets/eab-gui-util.c:82
 msgid "Do you want to save changes?"
 msgstr "Adakah anda ingin menyimpan perubahan?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:86
+#: addressbook/gui/widgets/eab-gui-util.c:84
 msgid "_Discard"
 msgstr "_Buang"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid "Error adding list"
 msgstr "Ralat ketika menambahkan senarai"
 
-#: addressbook/gui/widgets/eab-gui-util.c:105
-#: addressbook/gui/widgets/eab-gui-util.c:459
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Error adding contact"
 msgstr "Ralat ketika menambahkan kenalan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying list"
 msgstr "Ralat ketika mengubahsuaikan senarai"
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: addressbook/gui/widgets/eab-gui-util.c:112
 msgid "Error modifying contact"
 msgstr "Ralat ketika mengubah suai kenalan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:122
 msgid "Error removing list"
 msgstr "Ralat ketika mengeluarkan senarai"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-#: addressbook/gui/widgets/eab-gui-util.c:417
+#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:415
 msgid "Error removing contact"
 msgstr "Ralat ketika mengeluarkan kenalan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
+#: addressbook/gui/widgets/eab-gui-util.c:204
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2742,7 +2788,7 @@ msgstr ""
 "Membuka %d kenalan akan turut membuka %d tetingkap baru.\n"
 "Adakah anda benar-benar ingin memaparkan semua kenalan ini?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:232
+#: addressbook/gui/widgets/eab-gui-util.c:230
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2751,45 +2797,45 @@ msgstr ""
 "%s telah wujud\n"
 "Adakah anda ingin menulis gantinya?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:236
+#: addressbook/gui/widgets/eab-gui-util.c:234
 msgid "Overwrite"
 msgstr "Tulis ganti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:272
+#: addressbook/gui/widgets/eab-gui-util.c:270
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Ralat ketika menyimpan %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:309
+#: addressbook/gui/widgets/eab-gui-util.c:307
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:378
+#: addressbook/gui/widgets/eab-gui-util.c:376
 msgid "list"
 msgstr "senarai"
 
-#: addressbook/gui/widgets/eab-gui-util.c:514
+#: addressbook/gui/widgets/eab-gui-util.c:513
 msgid "Move contact to"
 msgstr "Alihkan kenalan ke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:516
+#: addressbook/gui/widgets/eab-gui-util.c:515
 msgid "Copy contact to"
 msgstr "Salin kenalan ke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:519
+#: addressbook/gui/widgets/eab-gui-util.c:518
 msgid "Move contacts to"
 msgstr "Alihkan kenalan ke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:521
+#: addressbook/gui/widgets/eab-gui-util.c:520
 msgid "Copy contacts to"
 msgstr "Salin kenalan ke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Multiple VCards"
 msgstr "VCard Berganda"
 
-#: addressbook/gui/widgets/eab-gui-util.c:718
+#: addressbook/gui/widgets/eab-gui-util.c:714
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard bagi %s"
@@ -2979,7 +3025,7 @@ msgstr "Jidar"
 msgid "Number of columns:"
 msgstr "Bilangan lajur:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:78
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Opsyen"
 
@@ -3231,9 +3277,9 @@ msgid "Evolution's Tasks component"
 msgstr "Komponen ujian Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1084 calendar/gui/print.c:1797
-#: calendar/gui/tasks-control.c:488
-#: calendar/importers/icalendar-importer.c:711
+#: calendar/gui/e-tasks.c:1082 calendar/gui/print.c:1796
+#: calendar/gui/tasks-control.c:486
+#: calendar/importers/icalendar-importer.c:716
 #: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
 msgid "Tasks"
 msgstr "Tugas"
@@ -3242,19 +3288,19 @@ msgstr "Tugas"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Khidmat pemberitahuan penggera Kalendar Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Bermula:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Berakhir:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
 msgid "Evolution Alarm"
 msgstr "Penggera Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
 #, c-format
 msgid "Alarm on %s"
 msgstr "Penggera pada %s"
@@ -3333,15 +3379,15 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Jangan tanya saya lagi tentang atur cara ini."
 
-#: calendar/gui/alarm-notify/notify-main.c:154
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize Bonobo"
 msgstr "Tidak dapat memulakan Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:157
+#: calendar/gui/alarm-notify/notify-main.c:160
 msgid "Could not initialize gnome-vfs"
 msgstr "Tidak dapat memulakan gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:166
+#: calendar/gui/alarm-notify/notify-main.c:169
 msgid "Could not create the alarm notify service factory"
 msgstr "Tidak dapat mewujudkan penggera, maklumkan kilang khidmat"
 
@@ -3349,19 +3395,152 @@ msgstr "Tidak dapat mewujudkan penggera, maklumkan kilang khidmat"
 msgid "invalid time"
 msgstr "masa tak sah"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "Ralat iCalendar"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Warna bagi tugas yang genap tempoh hari ini"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Warna bagi tugas yang genap tempoh hari ini"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Show where events end in week and month views"
+msgstr "_Tunjukkan masa akhir temu janji dalam pandangan minggu dan bulan"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "The view showing when the calendar starts"
+msgstr "Pralihat kalendar yang akan dicetak"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "Units of default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Minta pengesahan apabila menghapuskan item"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Minta pengesahan apabila menghapuskan item"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Hapuskan tugas yang siap"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Tunjukkan bilangan _minggu dalam pemandu arah tarikh"
+
+#: calendar/gui/cal-search-bar.c:49
 msgid "Summary contains"
 msgstr "Ringkasan mengandungi"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Description contains"
 msgstr "Huraian mengandungi"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "Ulasan mengandungi"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1134
+#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Tidak padan"
 
@@ -3384,90 +3563,99 @@ msgstr "Singkirkan peristiwa yang lebih lama dari"
 msgid "days"
 msgstr "hari"
 
-#: calendar/gui/calendar-commands.c:479
+#: calendar/gui/calendar-commands.c:450
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:482 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:453 calendar/gui/e-day-view-top-item.c:692
 #: calendar/gui/e-day-view.c:1359 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:484 calendar/gui/calendar-commands.c:489
-#: calendar/gui/calendar-commands.c:491
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
+#: calendar/gui/calendar-commands.c:462
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:508 calendar/gui/calendar-commands.c:514
-#: calendar/gui/calendar-commands.c:520 calendar/gui/calendar-commands.c:522
+#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:512
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
+#: calendar/gui/calendar-commands.c:483
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:281
+#: calendar/gui/calendar-component.c:368
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:321
+#: calendar/gui/calendar-component.c:408
 #, fuzzy
 msgid "Rename this calendar to"
 msgstr "Cetak kalendar ini"
 
-#: calendar/gui/calendar-component.c:341
+#: calendar/gui/calendar-component.c:428
 msgid "New Calendar"
 msgstr "Kalendar Baru"
 
-#: calendar/gui/calendar-component.c:524
+#: calendar/gui/calendar-component.c:632
 msgid "New appointment"
 msgstr "Temu janji baru"
 
-#: calendar/gui/calendar-component.c:525
+#: calendar/gui/calendar-component.c:633
 msgid "_Appointment"
 msgstr "_Temu janji"
 
-#: calendar/gui/calendar-component.c:526
+#: calendar/gui/calendar-component.c:634
 msgid "Create a new appointment"
 msgstr "Wujudkan temu janji baru"
 
-#: calendar/gui/calendar-component.c:531
+#: calendar/gui/calendar-component.c:639
 msgid "New meeting"
 msgstr "Mesyuarat baru"
 
-#: calendar/gui/calendar-component.c:532
+#: calendar/gui/calendar-component.c:640
 msgid "M_eeting"
 msgstr "M_esyuarat"
 
-#: calendar/gui/calendar-component.c:533
+#: calendar/gui/calendar-component.c:641
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Wujudkan mesyuarat baru"
 
-#: calendar/gui/calendar-component.c:538
+#: calendar/gui/calendar-component.c:646
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Temu Janji Baru Sepanjang Hari"
 
-#: calendar/gui/calendar-component.c:539
+#: calendar/gui/calendar-component.c:647
 msgid "All _Day Appointment"
 msgstr "Temu Janji _Sepanjang Hari"
 
-#: calendar/gui/calendar-component.c:540
+#: calendar/gui/calendar-component.c:648
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Wujudkan temu janji baru"
 
+#: calendar/gui/calendar-component.c:715
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:727
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
+
 #. create the remote source group
-#: calendar/gui/calendar-component.c:663
+#: calendar/gui/calendar-component.c:858
 msgid "On The Web"
 msgstr ""
 
@@ -3583,7 +3771,7 @@ msgstr "Hantar Kepada:"
 msgid "With these arguments:"
 msgstr "Dengan argumen ini:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:46
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -3599,6 +3787,10 @@ msgstr "jam"
 msgid "minutes"
 msgstr "minit"
 
+#: calendar/gui/dialogs/alarm-page.c:798
+msgid "Action/Trigger"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -3631,7 +3823,7 @@ msgstr "Hantar E-mel"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:985 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Ringkasan:"
@@ -3661,7 +3853,7 @@ msgstr "temu janji berakhir"
 msgid "hour(s)"
 msgstr "jam"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:174
+#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minit"
 
@@ -3715,7 +3907,7 @@ msgstr "Hari"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:607
 msgid "Friday"
 msgstr "Jumaat"
 
@@ -3729,7 +3921,7 @@ msgstr "Minit"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/e-itip-control.c:603
 msgid "Monday"
 msgstr "Isnin"
 
@@ -3739,7 +3931,7 @@ msgstr "A_had"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:608
 msgid "Saturday"
 msgstr "Sabtu"
 
@@ -3753,7 +3945,7 @@ msgstr "Tunjukkan bilangan _minggu dalam pemandu arah tarikh"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:602
 msgid "Sunday"
 msgstr "Ahad"
 
@@ -3771,7 +3963,7 @@ msgstr "Senarai Tugas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:606
 msgid "Thursday"
 msgstr "Khamis"
 
@@ -3789,7 +3981,7 @@ msgstr "Format masa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/e-itip-control.c:604
 msgid "Tuesday"
 msgstr "Selasa"
 
@@ -3799,7 +3991,7 @@ msgstr "M_inggu bermula:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:605
 msgid "Wednesday"
 msgstr "Rabu"
 
@@ -3841,7 +4033,7 @@ msgid "_Fri"
 msgstr "_Jumaat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:151
 msgid "_General"
 msgstr "_Am"
 
@@ -3881,7 +4073,7 @@ msgstr "_Rabu"
 msgid "before every appointment"
 msgstr "sebelum setiap temu janji"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
+#: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
@@ -3889,11 +4081,11 @@ msgstr ""
 "Peristiwa yang sedang dihapuskan ialah mesyuarat, adakah anda ingin "
 "menghantar notis pembatalan?"
 
-#: calendar/gui/dialogs/cancel-comp.c:61
+#: calendar/gui/dialogs/cancel-comp.c:60
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Adakah anda pasti ingin membatalkan dan menghapuskan mesyuarat ini?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:66
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -3901,11 +4093,11 @@ msgstr ""
 "Tugas yang sedang dihapuskan diumpukkan, adakah anda ingin menghantar notis "
 "pembatalan?"
 
-#: calendar/gui/dialogs/cancel-comp.c:70
+#: calendar/gui/dialogs/cancel-comp.c:69
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Adakah anda pasti ingin membatalkan dan menghapuskan tugas ini?"
 
-#: calendar/gui/dialogs/cancel-comp.c:76
+#: calendar/gui/dialogs/cancel-comp.c:75
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -3913,54 +4105,54 @@ msgstr ""
 "Entri jurnal yang sedang dihapuskan disiarkan, adakah anda ingin menghantar "
 "notis pembatalan?"
 
-#: calendar/gui/dialogs/cancel-comp.c:79
+#: calendar/gui/dialogs/cancel-comp.c:78
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Adakah anda pasti ingin membatalkan dan menghapuskan entri jurnal ini?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Peristiwa ini telah dihapuskan."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Tugas ini telah dihapuskan."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Entri jurnal ini telah dihapuskan"
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Anda telah membuat perubahan. Abaikan perubahan tersebut dan tutup "
 "editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Anda tidak membuat sebarang perubahan, tutup editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Peristiwa ini telah diubah."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Tugas ini telah diubah."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Entri jurnal ini telah diubah."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Anda telah membuat perubahan. Abaikan perubahan tersebut dan kemas kini "
 "editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Anda tidak membuat sebarang perubahan, kemas kini editor?"
@@ -3970,162 +4162,167 @@ msgstr "%s  Anda tidak membuat sebarang perubahan, kemas kini editor?"
 msgid "Validation error: %s"
 msgstr "Ralat pengesahan: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2230
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
 msgid " to "
 msgstr " kepada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2234
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
 msgid " (Completed "
 msgstr "(Siap "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2236
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
 msgid "Completed "
 msgstr "Siap "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2241
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
 msgid " (Due "
 msgstr " (Genap Tempoh "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2243
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
 msgid "Due "
 msgstr "Genap Tempoh"
 
-#: calendar/gui/dialogs/comp-editor.c:336
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "Could not update object"
 msgstr "Tidak dapat mengemas kini objek"
 
-#: calendar/gui/dialogs/comp-editor.c:787
-#: calendar/gui/dialogs/comp-editor.c:824
+#: calendar/gui/dialogs/comp-editor.c:786
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "Edit Appointment"
 msgstr "Edit Temu Janji"
 
-#: calendar/gui/dialogs/comp-editor.c:792
-#: calendar/gui/dialogs/comp-editor.c:829
+#: calendar/gui/dialogs/comp-editor.c:791
+#: calendar/gui/dialogs/comp-editor.c:828
 #, c-format
 msgid "Appointment - %s"
 msgstr "Temu janji - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:795
-#: calendar/gui/dialogs/comp-editor.c:832
+#: calendar/gui/dialogs/comp-editor.c:794
+#: calendar/gui/dialogs/comp-editor.c:831
 #, c-format
 msgid "Task - %s"
 msgstr "Tugas - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:834
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entri jurnal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
-#: calendar/gui/dialogs/comp-editor.c:845
+#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:844
 msgid "No summary"
 msgstr "Tiada ringkasan"
 
-#: calendar/gui/dialogs/comp-editor.c:1275 calendar/gui/e-cal-view.c:1043
-#: calendar/gui/e-calendar-table.c:1142 composer/e-msg-composer.c:1138
+#: calendar/gui/dialogs/comp-editor.c:1274 calendar/gui/e-cal-view.c:979
+#: calendar/gui/e-calendar-table.c:1141 composer/e-msg-composer.c:1138
 msgid "Save as..."
 msgstr "Simpan sebagai..."
 
-#: calendar/gui/dialogs/comp-editor.c:1378
-#: calendar/gui/dialogs/comp-editor.c:1402
-#: calendar/gui/dialogs/comp-editor.c:1428
+#: calendar/gui/dialogs/comp-editor.c:1377
+#: calendar/gui/dialogs/comp-editor.c:1401
+#: calendar/gui/dialogs/comp-editor.c:1427
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Perubahan yang dibuat pada item ini boleh dibuang jika kemas kini dilakukan"
 
-#: calendar/gui/dialogs/comp-editor.c:1456
-#: calendar/gui/dialogs/comp-editor.c:1465
+#: calendar/gui/dialogs/comp-editor.c:1455
+#: calendar/gui/dialogs/comp-editor.c:1464
 msgid "Unable to obtain current version!"
 msgstr "Tidak dapat memperoleh versi semasa!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/copy-source-dialog.c:141
+#, fuzzy
+msgid "Select destination source"
+msgstr "Pilih destinasi untuk folder ini disalin"
+
+#: calendar/gui/dialogs/delete-comp.c:95
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Adakah anda pasti ingin menghapuskan temu janji `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:99
+#: calendar/gui/dialogs/delete-comp.c:98
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Adakah anda pasti ingin menghapuskan temu janji tak berjudul ini?"
 
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:104
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Adakah anda pasti ingin menghapuskan tugas `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:108
+#: calendar/gui/dialogs/delete-comp.c:107
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Adakah anda pasti ingin menghapuskan tugas tak berjudul ini?"
 
-#: calendar/gui/dialogs/delete-comp.c:114
+#: calendar/gui/dialogs/delete-comp.c:113
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Adakah anda pasti ingin menghapuskan entri jurnal `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:117
+#: calendar/gui/dialogs/delete-comp.c:116
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Adakah anda pasti ingin menghapuskan entri jurnal tak berjudul ini?"
 
-#: calendar/gui/dialogs/delete-comp.c:132
+#: calendar/gui/dialogs/delete-comp.c:131
 #, c-format
 msgid "Are you sure you want to delete %d appointments?"
 msgstr "Adakah anda pasti ingin menghapuskan %d temu janji?"
 
-#: calendar/gui/dialogs/delete-comp.c:137
+#: calendar/gui/dialogs/delete-comp.c:136
 #, c-format
 msgid "Are you sure you want to delete %d tasks?"
 msgstr "Adakah anda pasti ingin menghapuskan %d tugas?"
 
-#: calendar/gui/dialogs/delete-comp.c:142
+#: calendar/gui/dialogs/delete-comp.c:141
 #, c-format
 msgid "Are you sure you want to delete %d journal entries?"
 msgstr "Adakah anda pasti ingin menghapuskan %d entri jurnal?"
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:52
 msgid "The event could not be deleted due to a corba error"
 msgstr "Peristiwa tidak dapat dihapuskan disebabkan oleh ralat corba"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:55
 msgid "The task could not be deleted due to a corba error"
 msgstr "Tugas tidak boleh dihapuskan disebabkan oleh ralat corba"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:58
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Entri jurnal tidak dapat dihapuskan disebabkan oleh ralat corba"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:61
 msgid "The item could not be deleted due to a corba error"
 msgstr "Item tidak dapat dihapuskan disebabkan oleh ralat corba"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:68
 msgid "The event could not be deleted because permission was denied"
 msgstr "Peristiwa tidak dapat dihapuskan kerana kebenaran dinafikan"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:71
 msgid "The task could not be deleted because permission was denied"
 msgstr "Tugas tidak dapat dihapuskan kerana kebenaran dinafikan"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:74
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Entri jurnal tidak dapat dihapuskan kerana kebenaran dinafikan"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:77
 msgid "The item could not be deleted because permission was denied"
 msgstr "Item tidak dapat dihapuskan kerana kebenaran dinafikan"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:84
 msgid "The event could not be deleted due to an error"
 msgstr "Peristiwa tidak dapat dihapuskan disebabkan oleh satu ralat"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:87
 msgid "The task could not be deleted due to an error"
 msgstr "Tugas tidak boleh dihapuskan disebabkan oleh satu ralat"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:90
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Entri jurnal tidak dapat dihapuskan disebabkan oleh satu ralat"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:93
 msgid "The item could not be deleted due to an error"
 msgstr "Item tidak dapat dihapuskan disebabkan oleh satu ralat"
 
@@ -4141,43 +4338,43 @@ msgstr "Ditugaskan Kepada:"
 msgid "Enter Delegate"
 msgstr "Masukkan Ditugaskan"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2267
+#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
 msgid "Appointment"
 msgstr "Temu janji"
 
-#: calendar/gui/dialogs/event-editor.c:208
+#: calendar/gui/dialogs/event-editor.c:207
 msgid "Reminder"
 msgstr "Peringatan"
 
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:214
 msgid "Recurrence"
 msgstr "Perulangan"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:221
+#: calendar/gui/dialogs/event-editor.c:294
+#: calendar/gui/dialogs/event-editor.c:438
 msgid "Scheduling"
 msgstr "Penjadualan"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:228
+#: calendar/gui/dialogs/event-editor.c:297
+#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Mesyuarat"
 
-#: calendar/gui/dialogs/event-page.c:600 calendar/gui/dialogs/task-page.c:504
+#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
 msgid "Start date is wrong"
 msgstr "Tarikh mula adalah salah"
 
-#: calendar/gui/dialogs/event-page.c:610
+#: calendar/gui/dialogs/event-page.c:609
 msgid "End date is wrong"
 msgstr "Tarikh akhir adalah salah"
 
-#: calendar/gui/dialogs/event-page.c:633
+#: calendar/gui/dialogs/event-page.c:632
 msgid "Start time is wrong"
 msgstr "Masa mula adalah salah"
 
-#: calendar/gui/dialogs/event-page.c:640
+#: calendar/gui/dialogs/event-page.c:639
 msgid "End time is wrong"
 msgstr "Masa akhir adalah salah"
 
@@ -4246,31 +4443,31 @@ msgid "_Start time:"
 msgstr "_Masa mula:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:312
+#: calendar/gui/dialogs/meeting-page.c:310
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:704
+#: calendar/gui/e-cal-model-tasks.c:592 composer/e-msg-composer.c:2050
+#: mail/em-account-prefs.c:448 mail/em-folder-view.c:714
 #: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
+#: widgets/misc/e-dateedit.c:1482 widgets/misc/e-dateedit.c:1597
 msgid "None"
 msgstr "Tiada"
 
-#: calendar/gui/dialogs/meeting-page.c:417
+#: calendar/gui/dialogs/meeting-page.c:415
 msgid "The organizer selected no longer has an account."
 msgstr "Penyusun yang dipilih tidak lagi mempunyai akaun."
 
-#: calendar/gui/dialogs/meeting-page.c:423
+#: calendar/gui/dialogs/meeting-page.c:421
 msgid "An organizer is required."
 msgstr "Penyusun diperlukan."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:436
 msgid "At least one attendee is required."
 msgstr "Sekurang-kurangnya seorang peserta diperlukan."
 
-#: calendar/gui/dialogs/meeting-page.c:631
+#: calendar/gui/dialogs/meeting-page.c:629
 msgid "_Delegate To..."
 msgstr "_Ditugaskan Kepada..."
 
@@ -4311,17 +4508,11 @@ msgid "Member"
 msgstr "Ahli"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1112 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Sila Jawab"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Peranan"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:14
 #: calendar/gui/e-meeting-list-view.c:270
@@ -4345,6 +4536,7 @@ msgid "_Invite Others..."
 msgstr "_Jemput Orang Lain..."
 
 #: calendar/gui/dialogs/new-calendar.c:102
+#: calendar/gui/dialogs/new-task-list.c:46
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Sumber dengan nama '%s' telah wujud dalam kumpulan yang dipilih"
@@ -4376,6 +4568,7 @@ msgid "Could not create directory for new calendar"
 msgstr "Tidak dapat mewujudkan direktori untuk kalendar baru"
 
 #: calendar/gui/dialogs/new-calendar.c:254
+#: calendar/gui/dialogs/new-task-list.c:131
 msgid "A group must be selected"
 msgstr "Satu kumpulan mesti dipilih."
 
@@ -4400,39 +4593,64 @@ msgstr "Maklumat kalendar"
 msgid "Calendar Name"
 msgstr "Nama Kalendar"
 
-#: calendar/gui/dialogs/recur-comp.c:51
+#: calendar/gui/dialogs/new-task-list.c:56
+#, fuzzy
+msgid "Could not create directory for new task list"
+msgstr "Tidak dapat mewujudkan direktori untuk kalendar baru"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+#, fuzzy
+msgid "<b>Task List Options</b>"
+msgstr "<b>Opsyen kalendar</b>"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Senarai Tugas"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Senarai Tugas"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Senarai Tugas"
+
+#: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 "Anda sedang mengubah suai peristiwa yang berulang, apa yang ingin anda ubah "
 "suai?"
 
-#: calendar/gui/dialogs/recur-comp.c:55
+#: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 "Anda sedang mengubah suai tugas yang berulang, apakah yang ingin anda ubah "
 "suai?"
 
-#: calendar/gui/dialogs/recur-comp.c:59
+#: calendar/gui/dialogs/recur-comp.c:58
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 "Anda sedang mengubah suai entri jurnal yang berulang, apakah yang ingin anda "
 "ubah suai?"
 
-#: calendar/gui/dialogs/recur-comp.c:73
+#: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
 msgstr "Contoh Ini Sahaja"
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:76
 #, fuzzy
 msgid "This and Prior Instances"
 msgstr "Contoh Ini dan Masa Depan"
 
-#: calendar/gui/dialogs/recur-comp.c:83
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr "Contoh Ini dan Masa Depan"
 
-#: calendar/gui/dialogs/recur-comp.c:88
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr "Semua Contoh"
 
@@ -4485,6 +4703,11 @@ msgstr "semasa"
 msgid "occurrences"
 msgstr "kejadian"
 
+#: calendar/gui/dialogs/recurrence-page.c:2334
+#, fuzzy
+msgid "Date/Time"
+msgstr "Tarikh/Masa:"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "A_dd"
 msgstr "T_ambah"
@@ -4549,7 +4772,7 @@ msgstr "minggu"
 msgid "year(s)"
 msgstr "tahun"
 
-#: calendar/gui/dialogs/save-comp.c:54
+#: calendar/gui/dialogs/save-comp.c:53
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
@@ -4559,31 +4782,31 @@ msgstr ""
 "\n"
 "Adakah anda ingin menyimpan perubahan yang dilakukan?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1546
+#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
 msgid "_Discard Changes"
 msgstr "_Buang Perubahan"
 
-#: calendar/gui/dialogs/save-comp.c:63
+#: calendar/gui/dialogs/save-comp.c:62
 msgid "Save Event"
 msgstr "Simpan Peristiwa"
 
-#: calendar/gui/dialogs/send-comp.c:58
+#: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
 msgstr "Maklumat mesyuarat telah diwujudkan. Hantar maklumat?"
 
-#: calendar/gui/dialogs/send-comp.c:61
+#: calendar/gui/dialogs/send-comp.c:60
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Maklumat mesyuarat telah diubah. Hantar versi yang telah dikemas kini?"
 
-#: calendar/gui/dialogs/send-comp.c:68
+#: calendar/gui/dialogs/send-comp.c:67
 msgid "The task assignment information has been created. Send it?"
 msgstr "Maklumat umpukan tugas telah diwujudkan. Hantar maklumat?"
 
-#: calendar/gui/dialogs/send-comp.c:72
+#: calendar/gui/dialogs/send-comp.c:71
 msgid "The task information has changed. Send an updated version?"
 msgstr "Maklumat tugas telah diubah. Hantar versi yang telah dikemas kini?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:404
 msgid "Completed date is wrong"
 msgstr "Tarikh siap adalah salah"
 
@@ -4594,42 +4817,42 @@ msgstr "% _Selesai"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:598
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-meeting-model.c:289
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-meeting-model.c:289
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
-#: calendar/gui/print.c:2318
+#: calendar/gui/print.c:2317
 msgid "Completed"
 msgstr "Selesai"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:914
+#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:916
 msgid "High"
 msgstr "Tinggi"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:596
-#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2315
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-calendar-table.c:476
+#: calendar/gui/e-tasks.c:207 calendar/gui/print.c:2314
 msgid "In Progress"
 msgstr "Sedang Dijalankan"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:235
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:914
 msgid "Low"
 msgstr "Rendah"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:404
-#: calendar/gui/e-tasks.c:233 mail/message-list.c:913
+#: calendar/gui/e-cal-model.c:835 calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:594
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:217
-#: calendar/gui/print.c:2312
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
+#: calendar/gui/print.c:2311
 msgid "Not Started"
 msgstr "Tidak Dimulakan"
 
@@ -4638,7 +4861,7 @@ msgid "Progress"
 msgstr "Perkembangan"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/e-calendar-table.c:405
 msgid "Undefined"
 msgstr "Tidak ditentukan"
 
@@ -4658,21 +4881,21 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Laman Web:"
 
-#: calendar/gui/dialogs/task-editor.c:194
+#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Asas"
 
-#: calendar/gui/dialogs/task-editor.c:208
-#: calendar/gui/dialogs/task-editor.c:271
-#: calendar/gui/dialogs/task-editor.c:408
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Umpukan"
 
-#: calendar/gui/dialogs/task-page.c:477
+#: calendar/gui/dialogs/task-page.c:476
 msgid "Due date is wrong"
 msgstr "Tarikh genap tempoh adalah salah"
 
-#: calendar/gui/dialogs/task-page.c:537
+#: calendar/gui/dialogs/task-page.c:536
 msgid "Due date is before start date!"
 msgstr "Tarikh genap tempoh adalah sebelum tarikh mula!"
 
@@ -4680,9 +4903,9 @@ msgstr "Tarikh genap tempoh adalah sebelum tarikh mula!"
 msgid "Con_fidential"
 msgstr "Su_lit"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1038
 #: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:247
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Huraian:"
 
@@ -4787,26 +5010,21 @@ msgstr "%s semasa %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s bagi jenis cetusan yang tak diketahui"
 
-#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:283
-#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-cal-list-view.c:262 calendar/gui/e-cal-model.c:283
+#: calendar/gui/e-cal-model.c:290 calendar/gui/e-calendar-table.c:380
 msgid "Public"
 msgstr "Awam"
 
-#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:292
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-cal-list-view.c:263 calendar/gui/e-cal-model.c:292
+#: calendar/gui/e-calendar-table.c:381
 msgid "Private"
 msgstr "Persendirian"
 
-#: calendar/gui/e-cal-list-view.c:265 calendar/gui/e-cal-model.c:294
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-cal-list-view.c:264 calendar/gui/e-cal-model.c:294
+#: calendar/gui/e-calendar-table.c:382
 msgid "Confidential"
 msgstr "Sulit"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategori"
-
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Description"
@@ -4818,11 +5036,12 @@ msgid "Start Date"
 msgstr "Tarikh Mula"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1083
+#: calendar/gui/e-calendar-table.etspec.h:15 mail/mail-security.glade.h:5
+#: shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Ringkasan"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:178
 msgid "color"
 msgstr "warna"
 
@@ -4830,13 +5049,12 @@ msgstr "warna"
 msgid "component"
 msgstr "komponen"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
 msgid "Free"
 msgstr "Bebas"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:456
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
 #: calendar/gui/e-meeting-time-sel.c:399
-#: shell/evolution-shell-component.c:1207
 msgid "Busy"
 msgstr "Sibuk"
 
@@ -4848,7 +5066,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
 msgid "E"
 msgstr "E"
 
@@ -4882,17 +5100,17 @@ msgstr "Tidak"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:296 calendar/gui/e-cal-model.c:299
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1023 calendar/gui/e-itip-control.c:1239
 #: calendar/gui/e-meeting-list-view.c:144
 #: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-model.c:217
 #: calendar/gui/e-meeting-model.c:252 calendar/gui/e-meeting-model.c:317
 #: calendar/gui/e-meeting-model.c:754 calendar/gui/e-meeting-model.c:770
 #: calendar/gui/e-meeting-store.c:115 calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1647
-#: camel/camel-gpg-context.c:1698 camel/camel-tcp-stream-openssl.c:631
+#: calendar/gui/e-meeting-store.c:215 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1705 camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1902
-#: widgets/misc/e-charset-picker.c:60
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1952
+#: shell/e-component-registry.c:164 widgets/misc/e-charset-picker.c:60
 msgid "Unknown"
 msgstr "Tak diketahui"
 
@@ -4904,179 +5122,178 @@ msgstr "Berulang"
 msgid "Assigned"
 msgstr "Diumpukkan"
 
-#: calendar/gui/e-cal-view.c:393 calendar/gui/e-calendar-table.c:1348
-msgid "Updating objects"
-msgstr "Mengemaskinikan objek"
-
-#: calendar/gui/e-cal-view.c:739 calendar/gui/e-calendar-table.c:724
+#: calendar/gui/e-cal-view.c:610 calendar/gui/e-calendar-table.c:723
 msgid "Deleting selected objects"
 msgstr "Menghapuskan objek yang dipilih"
 
-#: calendar/gui/e-cal-view.c:1250 calendar/gui/e-cal-view.c:1339
+#: calendar/gui/e-cal-view.c:717 calendar/gui/e-calendar-table.c:1347
+msgid "Updating objects"
+msgstr "Mengemaskinikan objek"
+
+#: calendar/gui/e-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
 msgid "New _Appointment..."
 msgstr "Temu janji _Baru..."
 
-#: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
+#: calendar/gui/e-cal-view.c:1178 calendar/gui/e-cal-view.c:1264
 msgid "New All Day _Event"
 msgstr "_Peristiwa Baru Sepanjang Hari"
 
-#: calendar/gui/e-cal-view.c:1252 calendar/gui/e-cal-view.c:1343
+#: calendar/gui/e-cal-view.c:1179 calendar/gui/e-cal-view.c:1266
 msgid "New Meeting"
 msgstr "Mesyuarat Baru"
 
-#: calendar/gui/e-cal-view.c:1253 calendar/gui/e-cal-view.c:1345
+#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
 msgid "New Task"
 msgstr "Tugas Baru"
 
-#: calendar/gui/e-cal-view.c:1257 calendar/gui/e-cal-view.c:1284
-#: calendar/gui/e-cal-view.c:1351 calendar/gui/e-calendar-table.c:993
-#: calendar/gui/e-calendar-table.c:1035 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-cal-view.c:1184 calendar/gui/e-cal-view.c:1207
+#: calendar/gui/e-cal-view.c:1274 calendar/gui/e-calendar-table.c:992
+#: calendar/gui/e-calendar-table.c:1034 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:39 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:120
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:122
 #: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Cetak..."
 
-#: calendar/gui/e-cal-view.c:1261 calendar/gui/e-cal-view.c:1291
-#: calendar/gui/e-cal-view.c:1349 calendar/gui/e-calendar-table.c:999
-#: calendar/gui/e-calendar-table.c:1033 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-cal-view.c:1188 calendar/gui/e-cal-view.c:1214
+#: calendar/gui/e-cal-view.c:1272 calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1032 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:38 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:118 ui/evolution-tasks.xml.h:20
+#: ui/evolution-mail-message.xml.h:120 ui/evolution-tasks.xml.h:20
 msgid "_Paste"
 msgstr "_Tampal"
 
-#: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
+#: calendar/gui/e-cal-view.c:1194 calendar/gui/e-cal-view.c:1258
 #: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Pergi ke _Hari Ini"
 
-#: calendar/gui/e-cal-view.c:1268 calendar/gui/e-cal-view.c:1337
+#: calendar/gui/e-cal-view.c:1195 calendar/gui/e-cal-view.c:1260
 msgid "_Go to Date..."
 msgstr "_Pergi ke Tarikh..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:40
+#: calendar/gui/e-cal-view.c:1199 ui/evolution-calendar.xml.h:40
 msgid "_Publish Free/Busy Information"
 msgstr "_Siarkan Maklumat Bebas/Sibuk"
 
-#: calendar/gui/e-cal-view.c:1276 calendar/gui/e-cal-view.c:1355
-#: ui/evolution.xml.h:30
-msgid "_Settings..."
-msgstr "_Seting..."
-
-#: calendar/gui/e-cal-view.c:1282 calendar/gui/e-cal-view.c:1347
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1031
-#: mail/em-folder-view.c:670 shell/e-shortcuts-view.c:422
+#: calendar/gui/e-cal-view.c:1205 calendar/gui/e-cal-view.c:1270
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-calendar-table.c:1030
+#: mail/em-folder-view.c:680 shell/e-shortcuts-view.c:422
 #: ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Buka"
 
-#: calendar/gui/e-cal-view.c:1283 calendar/gui/e-cal-view.c:1353
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-calendar-table.c:1037
-#: mail/em-folder-view.c:672 mail/em-popup.c:589 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:124
+#: calendar/gui/e-cal-view.c:1206 calendar/gui/e-cal-view.c:1276
+#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1036
+#: mail/em-folder-view.c:682 mail/em-popup.c:590 mail/em-popup.c:646
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Save As..."
 msgstr "_Simpan Sebagai..."
 
-#: calendar/gui/e-cal-view.c:1289 calendar/gui/e-cal-view.c:1329
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1026
+#: calendar/gui/e-cal-view.c:1212 calendar/gui/e-cal-view.c:1252
+#: calendar/gui/e-calendar-table.c:996 calendar/gui/e-calendar-table.c:1025
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "P_otong"
 
-#: calendar/gui/e-cal-view.c:1290 calendar/gui/e-cal-view.c:1327
-#: calendar/gui/e-calendar-table.c:998 calendar/gui/e-calendar-table.c:1024
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:35
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:105
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-cal-view.c:1213 calendar/gui/e-cal-view.c:1250
+#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1023
+#: mail/em-folder-tree.c:1496 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:17
 msgid "_Copy"
 msgstr "_Salin"
 
-#: calendar/gui/e-cal-view.c:1295
+#: calendar/gui/e-cal-view.c:1218
 msgid "_Schedule Meeting..."
 msgstr "_Jadualkan Mesyuarat..."
 
-#: calendar/gui/e-cal-view.c:1296
+#: calendar/gui/e-cal-view.c:1219
 msgid "_Forward as iCalendar..."
 msgstr "_Sampaikan sebagai iCalendar..."
 
-#: calendar/gui/e-cal-view.c:1301 calendar/gui/e-cal-view.c:1332
+#: calendar/gui/e-cal-view.c:1224 calendar/gui/e-cal-view.c:1255
 msgid "Delete this _Occurrence"
 msgstr "Hapuskan Kejadian _ini"
 
-#: calendar/gui/e-cal-view.c:1302 calendar/gui/e-cal-view.c:1333
+#: calendar/gui/e-cal-view.c:1225 calendar/gui/e-cal-view.c:1256
 msgid "Delete _All Occurrences"
 msgstr "Hapuskan _Semua Kejadian"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
+msgid "_Settings..."
+msgstr "_Seting..."
+
+#: calendar/gui/e-calendar-table.c:424
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:425
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:426
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:427
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:428
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:429
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:430
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:431
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:432
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:433
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:434
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:991
+#: calendar/gui/e-calendar-table.c:990
 msgid "Open _Web Page"
 msgstr "Buka Laman _Web"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Assign Task"
 msgstr "_Umpukkan Tugas"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1003
 msgid "_Forward as iCalendar"
 msgstr "_Sampaikan sebagai iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1004
 msgid "_Mark as Complete"
 msgstr "_Tandakan sebagai Siap"
 
-#: calendar/gui/e-calendar-table.c:1006
+#: calendar/gui/e-calendar-table.c:1005
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Tandakan Tugas yang Dipilih sebagai Siap"
 
-#: calendar/gui/e-calendar-table.c:1011 calendar/gui/e-calendar-table.c:1029
+#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
 msgid "_Delete Selected Tasks"
 msgstr "_Hapuskan Tugas yang Dipilih"
 
-#: calendar/gui/e-calendar-table.c:1431
+#: calendar/gui/e-calendar-table.c:1430
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klik untuk menambahkan tugas"
@@ -5090,8 +5307,8 @@ msgstr "% Siap"
 msgid "Alarms"
 msgstr "Penggera"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1172
-#: camel/camel-filter-driver.c:1267 mail/mail-send-recv.c:576
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1262 mail/mail-send-recv.c:576
 msgid "Complete"
 msgstr "Siap"
 
@@ -5120,18 +5337,18 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
+#: calendar/gui/e-cell-date-edit-text.c:125
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5150,7 +5367,7 @@ msgstr "%02i bahagian minit"
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1342
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1534
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1533
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5163,125 +5380,125 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:819
+#: calendar/gui/print.c:818
 msgid "am"
 msgstr "pagi"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:599 calendar/gui/e-week-view.c:328
-#: calendar/gui/print.c:821
+#: calendar/gui/print.c:820
 msgid "pm"
 msgstr "petang"
 
-#: calendar/gui/e-itip-control.c:142
+#: calendar/gui/e-itip-control.c:139
 #, c-format
 msgid "start_calendar_server(): %s"
 msgstr "start_calendar_server(): %s"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:636
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ya. (Perulangan Rumit)"
 
-#: calendar/gui/e-itip-control.c:650
+#: calendar/gui/e-itip-control.c:648
 msgid "Every day"
 msgstr "Setiap hari"
 
-#: calendar/gui/e-itip-control.c:652
+#: calendar/gui/e-itip-control.c:650
 #, c-format
 msgid "Every %d days"
 msgstr "Setiap %d hari"
 
-#: calendar/gui/e-itip-control.c:658
+#: calendar/gui/e-itip-control.c:656
 msgid "Every week"
 msgstr "Setiap minggu"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:658
 #, c-format
 msgid "Every %d weeks"
 msgstr "Setiap %d minggu"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:661
 msgid "Every week on "
 msgstr "Setiap minggu pada "
 
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:663
 #, c-format
 msgid "Every %d weeks on "
 msgstr "Setiap %d minggu pada "
 
-#: calendar/gui/e-itip-control.c:673
+#: calendar/gui/e-itip-control.c:671
 msgid " and "
 msgstr " dan "
 
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:678
 #, c-format
 msgid "The %s day of "
 msgstr "%s hari dalam "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:691
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s dalam "
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:696
 msgid "every month"
 msgstr "setiap bulan"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:701
 #, c-format
 msgid "every %d months"
 msgstr "setiap %d bulan"
 
-#: calendar/gui/e-itip-control.c:709
+#: calendar/gui/e-itip-control.c:707
 msgid "Every year"
 msgstr "Setiap tahun"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:709
 #, c-format
 msgid "Every %d years"
 msgstr "Setiap %d tahun"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:721
 #, c-format
 msgid " a total of %d times"
 msgstr " sejumlah %d kali"
 
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:730
 msgid ", ending on "
 msgstr ", berakhir pada "
 
-#: calendar/gui/e-itip-control.c:756
+#: calendar/gui/e-itip-control.c:754
 msgid "<b>Starts:</b> "
 msgstr "<b>Mula:</b> "
 
-#: calendar/gui/e-itip-control.c:766
+#: calendar/gui/e-itip-control.c:764
 msgid "<b>Ends:</b> "
 msgstr "<b>Akhir:</b> "
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:784
 msgid "<b>Completed:</b> "
 msgstr "<b>Siap:</b> "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:794
 msgid "<b>Due:</b> "
 msgstr "<b>Genap tempoh:</b> "
 
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:886
+#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
 msgid "iCalendar Information"
 msgstr "Maklumat iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:848
+#: calendar/gui/e-itip-control.c:846
 msgid "iCalendar Error"
 msgstr "Ralat iCalendar"
 
-#: calendar/gui/e-itip-control.c:917 calendar/gui/e-itip-control.c:933
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-itip-control.c:961
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-itip-control.c:931
+#: calendar/gui/e-itip-control.c:942 calendar/gui/e-itip-control.c:959
 msgid "An unknown person"
 msgstr "Orang yang tak diketahui"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:966
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5289,320 +5506,319 @@ msgstr ""
 "<br>Sila kaji semula maklumat berikut, dan kemudian pilih tindakan daripada "
 "menu di bawah."
 
-#: calendar/gui/e-itip-control.c:983
+#: calendar/gui/e-itip-control.c:981
 msgid "<i>None</i>"
 msgstr "<i>Tiada</i>"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:992
 msgid "Location:"
 msgstr "Lokasi:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:203
+#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:1013 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-model.c:281 calendar/gui/e-meeting-model.c:304
 #: calendar/gui/e-meeting-model.c:796 calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:419
+#: calendar/gui/e-meeting-store.c:202 calendar/gui/itip-utils.c:418
 msgid "Accepted"
 msgstr "Diterima"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
 msgid "Tentatively Accepted"
 msgstr "Diterima Sementara"
 
-#: calendar/gui/e-itip-control.c:1021 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:1019 calendar/gui/e-meeting-list-view.c:181
 #: calendar/gui/e-meeting-model.c:283 calendar/gui/e-meeting-model.c:306
 #: calendar/gui/e-meeting-model.c:797 calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:425
-#: calendar/gui/itip-utils.c:451
+#: calendar/gui/e-meeting-store.c:204 calendar/gui/itip-utils.c:424
+#: calendar/gui/itip-utils.c:450
 msgid "Declined"
 msgstr "Ditolak"
 
-#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
-#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1106
+#: calendar/gui/e-itip-control.c:1132 calendar/gui/e-itip-control.c:1145
+#: calendar/gui/e-itip-control.c:1158 calendar/gui/e-itip-control.c:1171
 msgid "Choose an action:"
 msgstr "Pilih tindakan:"
 
-#: calendar/gui/e-itip-control.c:1081
+#: calendar/gui/e-itip-control.c:1079
 msgid "Update"
 msgstr "Kemas kini"
 
-#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1113
-#: calendar/gui/e-itip-control.c:1136 calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-itip-control.c:1162 calendar/gui/e-itip-control.c:1175
-#: shell/e-shell.c:985 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1134 calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1160 calendar/gui/e-itip-control.c:1173
+#: shell/e-shell.c:1001 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1107
 msgid "Accept"
 msgstr "Terima"
 
-#: calendar/gui/e-itip-control.c:1110
+#: calendar/gui/e-itip-control.c:1108
 msgid "Tentatively accept"
 msgstr "Terima sementara"
 
-#: calendar/gui/e-itip-control.c:1111
+#: calendar/gui/e-itip-control.c:1109
 msgid "Decline"
 msgstr "Tolak"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1133
 msgid "Send Free/Busy Information"
 msgstr "Hantar Maklumat Bebas/Sibuk"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1146
 msgid "Update respondent status"
 msgstr "Kemas kini status responden"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1159
 msgid "Send Latest Information"
 msgstr "Hantar Maklumat Terkini"
 
-#: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
+#: calendar/gui/e-itip-control.c:1172 calendar/gui/itip-utils.c:438
 #: mail/mail-send-recv.c:386 mail/mail-send-recv.c:438
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: shell/e-shell-startup-wizard.c:788 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Batal"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> telah menyiarkan maklumat mesyuarat."
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1262
 msgid "Meeting Information"
 msgstr "Maklumat Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1267
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> meminta kehadiran %s di mesyuarat."
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1269
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> meminta kehadiran anda di mesyuarat."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1270
 msgid "Meeting Proposal"
 msgstr "Cadangan Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ingin menambahkan pada mesyuarat yang sedia ada."
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1275
 msgid "Meeting Update"
 msgstr "Pengemaskinian Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ingin menerima maklumat mesyuarat terkini."
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1280
 msgid "Meeting Update Request"
 msgstr "Permintaan Pengemaskinian Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> telah memberikan jawapan agar mesyuarat diadakan."
 
-#: calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-itip-control.c:1288
 msgid "Meeting Reply"
 msgstr "Jawapan Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1295
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> telah membatalkan mesyuarat."
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1296
 msgid "Meeting Cancellation"
 msgstr "Pembatalan Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
+#: calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> telah menghantar mesej yang tidak dapat difahami."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1304
 msgid "Bad Meeting Message"
 msgstr "Mesej Mesyuarat Salah"
 
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> telah menyiarkan maklumat tugas."
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1329
 msgid "Task Information"
 msgstr "Maklumat Tugas"
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> meminta %s untuk menjalankan tugas."
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1336
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> meminta anda menjalankan tugas."
 
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1337
 msgid "Task Proposal"
 msgstr "Cadangan Tugas"
 
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ingin menambahkan pada tugas yang sedia ada."
 
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1342
 msgid "Task Update"
 msgstr "Pengemaskinian Tugas"
 
-#: calendar/gui/e-itip-control.c:1348
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ingin menerima maklumat tugas terkini."
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1347
 msgid "Task Update Request"
 msgstr "Permintaan Pengemaskinian Tugas"
 
-#: calendar/gui/e-itip-control.c:1356
+#: calendar/gui/e-itip-control.c:1354
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> telah memberikan jawapan terhadap umpukan tugas."
 
-#: calendar/gui/e-itip-control.c:1357
+#: calendar/gui/e-itip-control.c:1355
 msgid "Task Reply"
 msgstr "Jawapan Tugas"
 
-#: calendar/gui/e-itip-control.c:1364
+#: calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> telah membatalkan tugas."
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1363
 msgid "Task Cancellation"
 msgstr "Pembatalan Tugas"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1371
 msgid "Bad Task Message"
 msgstr "Mesej Tugas Salah"
 
-#: calendar/gui/e-itip-control.c:1392
+#: calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> telah menyiarkan maklumat bebas/sibuk."
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1391
 msgid "Free/Busy Information"
 msgstr "Maklumat Bebas/Sibuk"
 
-#: calendar/gui/e-itip-control.c:1397
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> meminta maklumat bebas/sibuk anda."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1396
 msgid "Free/Busy Request"
 msgstr "Permintaan Bebas/Sibuk"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1400
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> telah memberikan jawapan terhadap permintaan bebas/sibuk."
 
-#: calendar/gui/e-itip-control.c:1403
+#: calendar/gui/e-itip-control.c:1401
 msgid "Free/Busy Reply"
 msgstr "Jawapan Bebas/Sibuk"
 
-#: calendar/gui/e-itip-control.c:1408
+#: calendar/gui/e-itip-control.c:1406
 msgid "Bad Free/Busy Message"
 msgstr "Mesej Bebas/Sibuk Salah"
 
-#: calendar/gui/e-itip-control.c:1484
+#: calendar/gui/e-itip-control.c:1482
 msgid "The message does not appear to be properly formed"
 msgstr "Mesej tidak terbentuk dengan sempurna"
 
-#: calendar/gui/e-itip-control.c:1552
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message contains only unsupported requests."
 msgstr "Mesej mengandungi permintaan yang tidak disokong sahaja."
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Lampiran tidak mengandungi mesej kalendar yang sah"
 
-#: calendar/gui/e-itip-control.c:1614
+#: calendar/gui/e-itip-control.c:1612
 msgid "The attachment has no viewable calendar items"
 msgstr "Lampiran mempunyai item kalendar yang tidak dapat dilihat"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1851
 msgid "Calendar file could not be updated!\n"
 msgstr "Fail kalendar tidak dapat dikemaskinikan!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1853
 msgid "Update complete\n"
 msgstr "Pengemaskinian siap\n"
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1957
+#: calendar/gui/e-itip-control.c:1883 calendar/gui/e-itip-control.c:1955
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Status peserta tidak dapat dikemaskinikan kerana item tidak lagi wujud"
 
-#: calendar/gui/e-itip-control.c:1901 calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1899 calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objek tak sah dan tidak dapat dikemas kini\n"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1909
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Maklum balas ini bukannya daripada peserta semasa.  Tambahkan sebagai "
 "peserta?"
 
-#: calendar/gui/e-itip-control.c:1923
+#: calendar/gui/e-itip-control.c:1921
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Status peserta tidak dapat dikemaskinikan kerana status tak sah!\n"
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1940
 msgid "There was an error on the CORBA system\n"
 msgstr "Terdapat ralat pada sistem CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1945
+#: calendar/gui/e-itip-control.c:1943
 msgid "Object could not be found\n"
 msgstr "Objek tidak dapat dijumpai\n"
 
-#: calendar/gui/e-itip-control.c:1948
+#: calendar/gui/e-itip-control.c:1946
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Anda tidak mendapat kebenaran sah untuk mengemaskinikan kalendar\n"
 
-#: calendar/gui/e-itip-control.c:1951
+#: calendar/gui/e-itip-control.c:1949
 msgid "Attendee status updated\n"
 msgstr "Status peserta dikemaskinikan\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1952
 msgid "Attendee status could not be updated!\n"
 msgstr "Status peserta tidak dapat dikemaskinikan!\n"
 
-#: calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1990
 msgid "Removal Complete"
 msgstr "Pengeluaran Selesai"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2074
+#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
 msgid "Item sent!\n"
 msgstr "Item dihantar!\n"
 
-#: calendar/gui/e-itip-control.c:2028 calendar/gui/e-itip-control.c:2078
+#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
 msgid "The item could not be sent!\n"
 msgstr "Item tidak dapat dihantar!\n"
 
@@ -5762,7 +5978,7 @@ msgstr "%a %m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1607
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1606
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -5854,12 +6070,12 @@ msgstr "Tidak dapat memuatkan tugas dalam `%s"
 msgid "The method required to load `%s' is not supported"
 msgstr "Kaedah yang diperlukan untuk memuatkan `%s tidak disokong"
 
-#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1764
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1765
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Anda tidak mendapat kebenaran untuk membuka folder dalam `%s"
 
-#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1978
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5868,39 +6084,39 @@ msgstr ""
 "Ralat dalam %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:959
+#: calendar/gui/e-tasks.c:958
 msgid "Completing tasks..."
 msgstr "Menyiapkan tugas..."
 
-#: calendar/gui/e-tasks.c:982
+#: calendar/gui/e-tasks.c:981
 msgid "Deleting selected objects..."
 msgstr "Menghapuskan objek yang dipilih..."
 
-#: calendar/gui/e-tasks.c:1007
+#: calendar/gui/e-tasks.c:1006
 msgid "Expunging"
 msgstr "Sedang Buang"
 
-#: calendar/gui/gnome-cal.c:1603 mail/importers/netscape-importer.c:1843
+#: calendar/gui/gnome-cal.c:1604 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: calendar/gui/gnome-cal.c:1736
+#: calendar/gui/gnome-cal.c:1737
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Tidak dapat membuka folder dalam `%s'"
 
-#: calendar/gui/gnome-cal.c:1750
+#: calendar/gui/gnome-cal.c:1751
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Kaedah yang diperlukan untuk membuka `%s' tidak disokong"
 
-#: calendar/gui/gnome-cal.c:1807
+#: calendar/gui/gnome-cal.c:1808
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Menambahkan penggera bagi %s"
 
-#: calendar/gui/gnome-cal.c:1999
+#: calendar/gui/gnome-cal.c:2000
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5912,7 +6128,7 @@ msgstr ""
 " telah rosak. Anda perlu memulakan semula Evolution untuk menggunakannya "
 "semula"
 
-#: calendar/gui/gnome-cal.c:2007
+#: calendar/gui/gnome-cal.c:2008
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5924,7 +6140,7 @@ msgstr ""
 " telah rosak. Anda perlu memulakan semula Evolution untuk menggunakannya "
 "semula"
 
-#: calendar/gui/gnome-cal.c:2847
+#: calendar/gui/gnome-cal.c:2848
 msgid "Purging"
 msgstr "Menyingkir"
 
@@ -5984,296 +6200,332 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
+#: calendar/gui/itip-utils.c:347
 msgid "An organizer must be set."
 msgstr "Penyusun mestilah ditetapkan."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:302
 msgid "At least one attendee is necessary"
 msgstr "Sekurang-kurangnya seorang peserta adalah perlu"
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
 msgid "Event information"
 msgstr "Maklumat peristiwa"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
 msgid "Task information"
 msgstr "Maklumat tugas"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Journal information"
 msgstr "Maklumat jurnal"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
 msgid "Free/Busy information"
 msgstr "Maklumat Bebas/Sibuk"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:398
 msgid "Calendar information"
 msgstr "Maklumat kalendar"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:434
 msgid "Updated"
 msgstr "Dikemaskinikan"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:442
 msgid "Refresh"
 msgstr "Muat semula"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:446
 msgid "Counter-proposal"
 msgstr "Cadangan balas"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:517
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Maklumat Bebas/Sibuk (%s hingga %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:527
 msgid "iCalendar information"
 msgstr "Maklumat iCalendar"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Anda mestilah peserta peristiwa itu."
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:476
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:477
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:478
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:479
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:480
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:481
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:483
+#: calendar/gui/print.c:482
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Su"
 msgstr "Ahad"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Mo"
 msgstr "Isnin"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "Tu"
 msgstr "Selasa"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:556
 msgid "We"
 msgstr "Rabu"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Th"
 msgstr "Khamis"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Fr"
 msgstr "Jumaat"
 
-#: calendar/gui/print.c:558
+#: calendar/gui/print.c:557
 msgid "Sa"
 msgstr "Sabtu"
 
 #. Day
-#: calendar/gui/print.c:1892
+#: calendar/gui/print.c:1891
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Hari yang dipilih (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1917 calendar/gui/print.c:1921
+#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1918
+#: calendar/gui/print.c:1917
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1922 calendar/gui/print.c:1924
-#: calendar/gui/print.c:1925
+#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
+#: calendar/gui/print.c:1924
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1929
+#: calendar/gui/print.c:1928
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Minggu yang dipilih (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1937
+#: calendar/gui/print.c:1936
 msgid "Selected month (%b %Y)"
 msgstr "Bulan yang dipilih (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1944
+#: calendar/gui/print.c:1943
 msgid "Selected year (%Y)"
 msgstr "Tahun yang dipilih (%Y)"
 
-#: calendar/gui/print.c:2269
+#: calendar/gui/print.c:2268
 msgid "Task"
 msgstr "Tugas"
 
-#: calendar/gui/print.c:2328
+#: calendar/gui/print.c:2327
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2345
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Keutamaan: %s"
 
-#: calendar/gui/print.c:2357
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Peratus Siap: %i"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2368
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2383
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategori: %s"
 
-#: calendar/gui/print.c:2394
+#: calendar/gui/print.c:2393
 msgid "Contacts: "
 msgstr "Kenalan: "
 
-#: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:565 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
+#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Pralihat Cetakan"
 
-#: calendar/gui/print.c:2566
+#: calendar/gui/print.c:2565
 msgid "Print Item"
 msgstr "Item Cetakan"
 
-#: calendar/gui/print.c:2639
+#: calendar/gui/print.c:2638
 msgid "Print Setup"
 msgstr "Persediaan Cetakan"
 
+#: calendar/gui/tasks-component.c:338
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:378
+#, fuzzy
+msgid "Rename this task list to"
+msgstr "Cetak kalendar ini"
+
+#: calendar/gui/tasks-component.c:398
+#, fuzzy
+msgid "New Task List"
+msgstr "Senarai Tugas"
+
+#: calendar/gui/tasks-component.c:590
+msgid "New task"
+msgstr "Tugas baru"
+
+#: calendar/gui/tasks-component.c:591
+msgid "_Task"
+msgstr "_Tugas"
+
+#: calendar/gui/tasks-component.c:592
+msgid "Create a new task"
+msgstr "Wujudkan tugas baru"
+
+#: calendar/gui/tasks-component.c:659
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:671
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
 #: calendar/gui/tasks-control.c:148
 msgid "The URI of the tasks folder to display"
 msgstr "URI bagi folder tugas akan memaparkan"
 
-#: calendar/gui/tasks-control.c:449
+#: calendar/gui/tasks-control.c:447
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6285,11 +6537,11 @@ msgstr ""
 "\n"
 "Anda pasti ingin memadamkan tugas ini?"
 
-#: calendar/gui/tasks-control.c:452
+#: calendar/gui/tasks-control.c:450
 msgid "Do not ask me again."
 msgstr "Jangan tanya saya lagi."
 
-#: calendar/gui/tasks-control.c:594
+#: calendar/gui/tasks-control.c:592
 msgid "Print Tasks"
 msgstr "Cetak Tugas"
 
@@ -6317,15 +6569,15 @@ msgstr "Fail iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Fail vCalendar (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:464
+#: calendar/importers/icalendar-importer.c:469
 msgid "Reminder!!"
 msgstr "Peringatan!!"
 
-#: calendar/importers/icalendar-importer.c:704
+#: calendar/importers/icalendar-importer.c:709
 msgid "Calendar Events"
 msgstr "Peristiwa Kalendar"
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:734
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6333,7 +6585,7 @@ msgstr ""
 "Evolution telah menjumpai fail Kalendar Gnome.\n"
 "Adakah anda ingin mengimportnya ke dalam Evolution?"
 
-#: calendar/importers/icalendar-importer.c:736
+#: calendar/importers/icalendar-importer.c:741
 msgid "Gnome Calendar"
 msgstr "Kalendar Gnome"
 
@@ -7945,63 +8197,63 @@ msgstr "Anda mestilah berada dalam talian untuk melengkapkan pengendalian ini"
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Gagal mewujudkan saluran bagi '%s': %s"
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:553
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Gagal mewujudkan proses anak '%s': %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Aliran mesej tak sah diterima daripada %s: %s"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:948
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Menyegerakkan folder"
 
-#: camel/camel-filter-driver.c:1037 camel/camel-filter-driver.c:1410
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Ralat ketika menghuraikan penapis : %s: %s"
 
-#: camel/camel-filter-driver.c:1046 camel/camel-filter-driver.c:1416
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Ralat ketika melaksanakan penapis :%s: %s"
 
-#: camel/camel-filter-driver.c:1113
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Tidak dapat membuka folder spul"
 
-#: camel/camel-filter-driver.c:1122
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Tidak dapat memproses folder spul"
 
-#: camel/camel-filter-driver.c:1137
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Mendapatkan mesej %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1141
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Tidak dapat membuka mesej"
 
-#: camel/camel-filter-driver.c:1142 camel/camel-filter-driver.c:1154
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Gagal pada mesej %d"
 
-#: camel/camel-filter-driver.c:1168 camel/camel-filter-driver.c:1262
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
 msgid "Syncing folder"
 msgstr "Menyegerakkan folder"
 
-#: camel/camel-filter-driver.c:1229
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Mendapatkan mesej %d daripada %d"
 
-#: camel/camel-filter-driver.c:1244
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Gagal pada mesej %d daripada %d"
@@ -8018,7 +8270,7 @@ msgstr "Argumen tak sah pada (bendera sistem)"
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argumen tak sah pada (tag pengguna)"
 
-#: camel/camel-filter-search.c:676 camel/camel-filter-search.c:684
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Ralat ketika melaksanakan carian penapis: %s: %s"
@@ -8050,34 +8302,34 @@ msgstr "(padan dengan semua) memerlukan hasil bool tunggal"
 msgid "Performing query on unknown header: %s"
 msgstr "Membuat pertanyaan pada pengepala yang tak diketahui:  %s"
 
-#: camel/camel-folder.c:585
+#: camel/camel-folder.c:586
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Pengendalian tidak disokong: tambahkan mesej: bagi %s"
 
-#: camel/camel-folder.c:1163
+#: camel/camel-folder.c:1164
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Pengendalian tidak disokong: cari mengikut ungkapan: bagi %s"
 
-#: camel/camel-folder.c:1203
+#: camel/camel-folder.c:1204
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Pengendalian tidak disokong: cari mengikut uids: bagi %s"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Moving messages"
 msgstr "Mengalihkan mesej"
 
-#: camel/camel-folder.c:1321
+#: camel/camel-folder.c:1322
 msgid "Copying messages"
 msgstr "Menyalin mesej"
 
-#: camel/camel-folder.c:1571
+#: camel/camel-folder.c:1572
 msgid "Filtering new message(s)"
 msgstr "Menapis mesej baru"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:703
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8088,15 +8340,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:717
 msgid "Failed to parse gpg userid hint."
 msgstr "Gagal menghuraikan petunjuk id pengguna gpg."
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr "Gagal menghuraikan permintaan ungkapan laluan gpg."
 
-#: camel/camel-gpg-context.c:743
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8105,30 +8357,30 @@ msgstr ""
 "Anda memerlukan ungkapan laluan untuk membuka kunci bagi\n"
 "pengguna:  \"%s\""
 
-#: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1410 camel/camel-gpg-context.c:1490
-#: camel/camel-gpg-context.c:1597 mail/mail-send-recv.c:572
+#: camel/camel-gpg-context.c:770 camel/camel-gpg-context.c:1260
+#: camel/camel-gpg-context.c:1417 camel/camel-gpg-context.c:1497
+#: camel/camel-gpg-context.c:1604 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Batal."
 
-#: camel/camel-gpg-context.c:781
+#: camel/camel-gpg-context.c:788
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Gagal membuka kunci rahsia: 3 ungkapan laluan yang rosak diberikan."
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:794
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Maklum balas yang tidak dijangkakan daripada GnuPG: %s"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:806
 msgid "No data provided"
 msgstr "Tiada data diberikan"
 
-#: camel/camel-gpg-context.c:837
+#: camel/camel-gpg-context.c:844
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Gagal untuk menyulitkan: Penerima sah tidak ditetapkan."
 
-#: camel/camel-gpg-context.c:1114
+#: camel/camel-gpg-context.c:1121
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8139,64 +8391,65 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1119
+#: camel/camel-gpg-context.c:1126
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Gagal untuk GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1232 camel/camel-smime-context.c:406
+#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1646
-#: camel/camel-gpg-context.c:1697
+#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
+#: camel/camel-gpg-context.c:1704
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Gagal melaksanakan gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1402
-#: camel/camel-gpg-context.c:1483 camel/camel-gpg-context.c:1506
-#: camel/camel-gpg-context.c:1590 camel/camel-gpg-context.c:1614
-#: camel/camel-gpg-context.c:1668 camel/camel-gpg-context.c:1719
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1409
+#: camel/camel-gpg-context.c:1490 camel/camel-gpg-context.c:1513
+#: camel/camel-gpg-context.c:1597 camel/camel-gpg-context.c:1621
+#: camel/camel-gpg-context.c:1675 camel/camel-gpg-context.c:1726
 msgid "Failed to execute gpg."
 msgstr "Gagal melaksanakan gpg."
 
-#: camel/camel-gpg-context.c:1289
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr "Ini ialah bahagian mesej yang ditandatangani secara digital"
 
-#: camel/camel-gpg-context.c:1369 camel/camel-gpg-context.c:1378
-#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:709
+#: camel/camel-gpg-context.c:1376 camel/camel-gpg-context.c:1385
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:712
+#: camel/camel-smime-context.c:719
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Tidak dapat mengesah betul tandatangan mesej: tidak dapat mewujudkan fail "
 "sementara: %s"
 
-#: camel/camel-gpg-context.c:1385
+#: camel/camel-gpg-context.c:1392
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Tidak dapat mengesah betul tandatangan mesej: tidak dapat mewujudkan fail "
 "sementara: %s"
 
-#: camel/camel-gpg-context.c:1466
+#: camel/camel-gpg-context.c:1473
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: camel/camel-gpg-context.c:1524
+#: camel/camel-gpg-context.c:1531
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Ini ialah bahagian mesej yang ditandatangani secara digital"
 
-#: camel/camel-gpg-context.c:1621 camel/camel-smime-context.c:963
+#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Kandungan badan indeks"
 
-#: camel/camel-gpg-context.c:1625
+#: camel/camel-gpg-context.c:1632
 msgid "Unable to parse message content"
 msgstr "Tidak dapat menghuraikan kandungan mesej"
 
@@ -8303,7 +8556,7 @@ msgstr "Gagal menyahsulitkan bahagian MIME: ralat protokol"
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Gagal menyahsulitkan bahagian MIME: struktur tak sah"
 
-#: camel/camel-multipart-signed.c:691
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "ralat hurai"
 
@@ -8633,12 +8886,12 @@ msgstr "Penyedia e-mel folder maya"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Untuk membaca mel sebagai pertanyaan bagi set folder yang lain"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:352 camel/camel-session.c:402
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Tidak ada penyedia bagi protokol `%s'"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:525
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8705,6 +8958,17 @@ msgstr "Tidak dapat memperoleh folder: pengendalian tak sah pada simpanan ini"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Tidak dapat mewujudkan folder: pengendalian tak sah pada simpanan ini"
 
+#: camel/camel-store.c:791 mail/importers/netscape-importer.c:1842
+#: mail/mail-ops.c:1119
+msgid "Trash"
+msgstr "Sampah"
+
+#: camel/camel-store.c:793 mail/mail-ops.c:1125
+#: ui/evolution-mail-message.xml.h:46
+#, fuzzy
+msgid "Junk"
+msgstr "Jun"
+
 #: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr "Tidak dapat memperoleh sijil pengeluar"
@@ -9079,53 +9343,68 @@ msgid "Failed to cache %s: %s"
 msgstr "Gagal untuk cache %s: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Sedang disambungkan ke pelayan..."
+
+#: camel/providers/imap/camel-imap-provider.c:45
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Gagal disambungkan ke pelayan LDAP"
+
+#: camel/providers/imap/camel-imap-provider.c:47
+#, fuzzy
+msgid "Command:"
+msgstr "Syarikat"
+
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Checking for new mail"
 msgstr "Menyemak mel baru"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Check for new messages in all folders"
 msgstr "Menyemak mesej baru dalam semua folder"
 
-#: camel/providers/imap/camel-imap-provider.c:48
+#: camel/providers/imap/camel-imap-provider.c:55
 msgid "Folders"
 msgstr "Folder"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
 msgid "Show only subscribed folders"
 msgstr "Tunjukkan folder yang dilanggan sahaja"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
 msgid "Override server-supplied folder namespace"
 msgstr "Menolak ruang nama folder yang disediakan oleh pelayan"
 
-#: camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
 msgid "Namespace"
 msgstr "Ruang nama"
 
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Gunakan penapis bagi mesej baru dalam INBOX dalam pelayan ini"
 
-#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:66
 msgid "Automatically synchronize remote mail locally"
 msgstr "Secara automatik segerakkan mel jauh secara setempat"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:74
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Untuk membaca dan menyimpan mel dalam pelayan IMAP."
 
-#: camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap/camel-imap-provider.c:89
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-store.c:265
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Kata laluan"
 
-#: camel/providers/imap/camel-imap-provider.c:84
+#: camel/providers/imap/camel-imap-provider.c:91
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -9650,7 +9929,7 @@ msgstr "Tidak dapat menutup folder sumber %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Tidak dapat menutup folder sementara: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Tidak dapat menamakan semula folder: %s"
@@ -9933,7 +10212,7 @@ msgstr "Hapuskan selepas %s hari"
 msgid "Disable support for all POP3 extensions"
 msgstr "Melumpuhkan sokongan untuk semua sambungan POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -10024,7 +10303,7 @@ msgid "No such folder `%s'."
 msgstr "Folder tersebut tidak ada `%s'"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Hantar mel"
 
@@ -10079,7 +10358,7 @@ msgstr "hantarkan mel"
 msgid "Mail delivery via the sendmail program"
 msgstr "Penyerahan mel melalui atur cara hantar mel"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:98
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10370,7 +10649,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1375
+#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
 msgid "attachment"
 msgstr "lampiran"
 
@@ -10414,11 +10693,11 @@ msgstr "Jenis MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Cadangkan paparan automatik bagi lampiran"
 
-#: composer/e-msg-composer-hdrs.c:289
+#: composer/e-msg-composer-hdrs.c:287
 msgid "You need to configure an account before you can compose mail."
 msgstr "Anda perlu mengkonfigurasikan akaun sebelum anda boleh menggubah mel."
 
-#: composer/e-msg-composer-hdrs.c:482
+#: composer/e-msg-composer-hdrs.c:480
 msgid "Click here for the address book"
 msgstr "Klik di sini bagi buku alamat"
 
@@ -10429,45 +10708,45 @@ msgstr "Klik di sini bagi buku alamat"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:513
+#: composer/e-msg-composer-hdrs.c:510
 msgid "Reply-To:"
 msgstr "Balas Kepada:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:519
+#: composer/e-msg-composer-hdrs.c:516
 msgid "From:"
 msgstr "Daripada:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:525
+#: composer/e-msg-composer-hdrs.c:522
 msgid "Subject:"
 msgstr "Tajuk:"
 
-#: composer/e-msg-composer-hdrs.c:534
+#: composer/e-msg-composer-hdrs.c:531
 msgid "To:"
 msgstr "Kepada:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:532
 msgid "Enter the recipients of the message"
 msgstr "Masukkan penerima mesej"
 
-#: composer/e-msg-composer-hdrs.c:538
+#: composer/e-msg-composer-hdrs.c:535
 msgid "Cc:"
 msgstr "Salinan kepada (Sk):"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:536
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Masukkan alamat yang akan menerima salinan mesej"
 
-#: composer/e-msg-composer-hdrs.c:542
+#: composer/e-msg-composer-hdrs.c:539
 msgid "Bcc:"
 msgstr "Salinan tersembunyi (St):"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:540
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10478,14 +10757,19 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:550
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Post To:"
 msgstr "Kirimkan Kepada:"
 
-#: composer/e-msg-composer-hdrs.c:552
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Posting destination"
 msgstr "Destinasi Pengiriman"
 
+#: composer/e-msg-composer-hdrs.c:548
+#, fuzzy
+msgid "Choose a folder to post the message to."
+msgstr "Lampirkan fail ke mesej"
+
 #: composer/e-msg-composer-select-file.c:119
 msgid "Attach file(s)"
 msgstr "Lampirkan fail"
@@ -10520,21 +10804,21 @@ msgstr "Fail wujud, tulis ganti?"
 msgid "Error saving file: %s"
 msgstr "Ralat ketika menyimpan fail: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1204
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Ralat ketika memuatkan fail: %s"
 
-#: composer/e-msg-composer.c:1241
+#: composer/e-msg-composer.c:1242
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Ralat ketika mencapai fail: %s"
 
-#: composer/e-msg-composer.c:1249
+#: composer/e-msg-composer.c:1250
 msgid "Unable to retrieve message from editor"
 msgstr "Tidak boleh mendapatkan semula mesej daripada editor"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1257
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10543,7 +10827,7 @@ msgstr ""
 "Tidak dapat menjangkau fail: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1264
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10552,7 +10836,7 @@ msgstr ""
 "Tidak dapat memangkas fail: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1272
+#: composer/e-msg-composer.c:1273
 #, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10561,7 +10845,7 @@ msgstr ""
 "Tidak dapat menyalin penghurai fail: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1282
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10570,7 +10854,7 @@ msgstr ""
 "Ralat ketika menyimpan mesej secara automatik: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1386
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10579,7 +10863,7 @@ msgstr ""
 "sebelumnya.\n"
 "Adakah anda ingin cuba memulihkannya?"
 
-#: composer/e-msg-composer.c:1541
+#: composer/e-msg-composer.c:1550
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10590,28 +10874,28 @@ msgstr ""
 "\n"
 "Adakah anda ingin menyimpan perubahan yang telah dibuat?"
 
-#: composer/e-msg-composer.c:1550
+#: composer/e-msg-composer.c:1559
 msgid "Warning: Modified Message"
 msgstr "Amaran: Mesej yang Diubah Suai"
 
-#: composer/e-msg-composer.c:1582
+#: composer/e-msg-composer.c:1592
 msgid "Open file"
 msgstr "Buka fail"
 
-#: composer/e-msg-composer.c:2001
+#: composer/e-msg-composer.c:2011
 msgid "Signature:"
 msgstr "Tandatangan:"
 
-#: composer/e-msg-composer.c:2041 mail/mail-account-gui.c:1260
+#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
-#: composer/e-msg-composer.c:2221 composer/e-msg-composer.c:2918
-#: composer/e-msg-composer.c:2919
+#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
+#: composer/e-msg-composer.c:2930
 msgid "Compose a message"
 msgstr "Gubah mesej"
 
-#: composer/e-msg-composer.c:2950
+#: composer/e-msg-composer.c:2961
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10619,7 +10903,7 @@ msgstr ""
 "Tidak dapat mewujudkan tetingkap penggubah:\n"
 "Tidak dapat mengaktifkan kawalan pemilih alamat."
 
-#: composer/e-msg-composer.c:2980
+#: composer/e-msg-composer.c:2991
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10631,7 +10915,7 @@ msgstr ""
 "Sila pastikan versi gtkhtml dan libgtkhtml\n"
 "yang betul dipasang.\n"
 
-#: composer/e-msg-composer.c:3050
+#: composer/e-msg-composer.c:3061
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10639,7 +10923,7 @@ msgstr ""
 "Tidak dapat mewujudkan tetingkap penggubah:\n"
 "Tidak dapat mengaktifkan komponen editor HTML."
 
-#: composer/e-msg-composer.c:4060
+#: composer/e-msg-composer.c:4071
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10647,11 +10931,13 @@ msgstr ""
 "<b>(Penggubah mengandungi badan mesej bukan teks yang tidak boleh diedit.)<b>"
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr "Set perisian kumpulan Evolution"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Ximian Evolution"
 
 #: data/evolution.keys.in.h:1
@@ -10907,13 +11193,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: widgets/misc/e-dateedit.c:1416 widgets/misc/e-dateedit.c:1641
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1413 widgets/misc/e-dateedit.c:1638
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11046,19 +11332,19 @@ msgstr ""
 "Ralat dalam ungkapan biasa '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:61 shell/e-config-upgrade.c:1454
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:63
+#: mail/mail-config.glade.h:64 shell/e-config-upgrade.c:1454
 msgid "Important"
 msgstr "Penting"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/mail-config.c:66
+#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
 msgid "To Do"
 msgstr "Perkara yang Perlu Dibuat"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:65
+#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
 #: shell/e-config-upgrade.c:1458
 msgid "Later"
 msgstr "Selepas itu"
@@ -11163,7 +11449,7 @@ msgstr "yang lalu"
 msgid "months"
 msgstr "bulan"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:175
+#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr "saat"
 
@@ -11260,7 +11546,7 @@ msgstr "Ungkapan"
 msgid "Follow Up"
 msgstr "Susulan"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:703
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
 msgid "Label"
 msgstr "Label"
 
@@ -11342,8 +11628,9 @@ msgstr "Pengepala yang khusus"
 msgid "Stop Processing"
 msgstr "Hentikan Memproses"
 
-#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1462 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1438 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: smime/lib/e-cert.c:1074
 msgid "Subject"
 msgstr "Tajuk"
 
@@ -11440,7 +11727,7 @@ msgid "starts with"
 msgstr "bermula dengan"
 
 #: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:918
+#: mail/mail-vfolder.c:915
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Tajuk peraturan '%s' tidak unik, pilih yang lain."
@@ -11526,7 +11813,7 @@ msgstr "Pemandang folder Mel Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Kawalan keutamaan Mel Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:773
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:783
 #: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
 #: mail/importers/pine-importer.c:572
 msgid "Mail"
@@ -11536,7 +11823,7 @@ msgstr "Mel"
 msgid "Mail Accounts"
 msgstr "Akaun Mel"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
 msgid "Mail Preferences"
 msgstr "Keutamaan Mel"
 
@@ -11581,7 +11868,7 @@ msgid "Protocol"
 msgstr "Protokol"
 
 #: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1246
+#: mail/mail-config.c:1250
 msgid "Unnamed"
 msgstr "Tanpa nama"
 
@@ -11605,20 +11892,17 @@ msgstr "Tambahkan tandatangan skrip"
 msgid "Signature(s)"
 msgstr "Tandatangan"
 
-#. FIXME: this wording sucks
-#: mail/em-composer-utils.c:117
+#: mail/em-composer-utils.c:123
+#, fuzzy, c-format
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
 msgstr ""
 "Anda menghantar mesej berformat HTML. Sila pastikan bahawa\n"
 "penerima berikut mahu dan boleh menerima mel HTML:\n"
 
-#: mail/em-composer-utils.c:129
-msgid "Send anyway?"
-msgstr "Tetap hantarkan?"
-
-#: mail/em-composer-utils.c:150
+#: mail/em-composer-utils.c:137
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11626,7 +11910,7 @@ msgstr ""
 "Mesej ini tidak mempunyai tajuk.\n"
 "Anda pasti ingin menghantarnya?"
 
-#: mail/em-composer-utils.c:176
+#: mail/em-composer-utils.c:153
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11634,11 +11918,11 @@ msgstr ""
 "Memandangkan senarai kenalan yang anda hantar dikonfigurasikan untuk "
 "menyembunyikan alamat senarai, mesej ini akan hanya mengandungi penerima St."
 
-#: mail/em-composer-utils.c:180
+#: mail/em-composer-utils.c:157
 msgid "This message contains only Bcc recipients."
 msgstr "Mesej ini hanya mengandungi penerima St."
 
-#: mail/em-composer-utils.c:185
+#: mail/em-composer-utils.c:162
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11648,11 +11932,11 @@ msgstr ""
 "pengepala Jelas Kepada.\n"
 "Tetap hantarkan?"
 
-#: mail/em-composer-utils.c:329
+#: mail/em-composer-utils.c:301
 msgid "You must specify recipients in order to send this message."
 msgstr "Anda mestilah menetapkan penerima untuk menghantar mesej ini."
 
-#: mail/em-composer-utils.c:566
+#: mail/em-composer-utils.c:543
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11669,167 +11953,285 @@ msgstr "Wujudkan _Folder Maya Daripada Carian..."
 msgid "<click here to select a folder>"
 msgstr "<klik di sini untuk memilih folder>"
 
-#: mail/em-folder-selector.c:234
-msgid "Folder _name"
-msgstr "Nama _folder"
+#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+msgid "Create New Folder"
+msgstr "Wujudkan Folder Baru"
 
-#: mail/em-folder-view.c:589 mail/em-folder-view.c:603
-#: shell/e-shell-importer.c:1061
+#: mail/em-folder-selector.c:137 mail/em-folder-tree.c:1091
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Tetapkan di mana folder akan diwujudkan:"
+
+#: mail/em-folder-selector.c:263
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
+msgstr "Nama _folder:"
+
+#: mail/em-folder-tree-model.c:559 mail/em-utils.c:1943
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Tidak dapat mewujudkan direktori sementara: %s"
+
+#: mail/em-folder-tree-model.c:568
+#, c-format
+msgid "Could not create temporary mbox store: %s"
+msgstr "Tidak dapat mewujudkan stor mbox sementara: %s"
+
+#: mail/em-folder-tree-model.c:577
+#, c-format
+msgid "Could not create temporary mbox folder: %s"
+msgstr "Tidak dapat mewujudkan folder mbox sementara: %s"
+
+#: mail/em-folder-tree-model.c:592
+#, c-format
+msgid "Could not copy messages to temporary mbox folder: %s"
+msgstr "Tidak dapat menyalin mesej ke folder mbox sementara: %s"
+
+#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+msgid "Loading..."
+msgstr "Sedang memuatkan..."
+
+#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: mail/em-folder-tree.c:985 mail/em-folder-tree.c:998
+#: mail/em-folder-view.c:590 mail/em-folder-view.c:604
+#: shell/e-shell-importer.c:1060
 msgid "Select folder"
 msgstr "Pilih folder"
 
+#: mail/em-folder-tree.c:1091
+msgid "Create folder"
+msgstr "Wujudkan folder"
+
+#: mail/em-folder-tree.c:1179
+#, c-format
+msgid "Could not delete folder: %s"
+msgstr "Tidak dapat menghapuskan folder: %s"
+
+#: mail/em-folder-tree.c:1200
+#, c-format
+msgid "Really delete folder \"%s\" and all of its subfolders?"
+msgstr ""
+"Anda pasti ingin menghapuskan folder \"%s\" dan semua subfolder dalamnya?"
+
+#: mail/em-folder-tree.c:1210 shell/e-shell-folder-commands.c:416
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Hapuskan \"%s\""
+
+#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Namakan semula folder \"%s\" kepada:"
+
+#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+msgid "Rename Folder"
+msgstr "Namakan semula Folder"
+
+#: mail/em-folder-tree.c:1272 shell/e-shell-folder-commands.c:554
+#, c-format
+msgid "A folder named \"%s\" already exists. Please use a different name."
+msgstr "Folder bernama \"%s\" telah wujud. Sila gunakan nama yang lain."
+
+#: mail/em-folder-tree.c:1370
+msgid "Folder properties"
+msgstr "Ciri-ciri Folder"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-tree.c:1376
+msgid "Properties"
+msgstr "Ciri-ciri"
+
+#: mail/em-folder-tree.c:1384
+msgid "Folder Name"
+msgstr "Nama Folder"
+
+#: mail/em-folder-tree.c:1491 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
+msgid "_View"
+msgstr "_Lihat"
+
+#: mail/em-folder-tree.c:1492
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Buka dalam Tetingkap _Baru"
+
+#: mail/em-folder-tree.c:1497
+msgid "_Move"
+msgstr "_Alih"
+
+#: mail/em-folder-tree.c:1500
+msgid "_New Folder..."
+msgstr "_Folder Baru..."
+
+#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
+msgid "_Rename"
+msgstr "_Namakan semula"
+
+#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "_Ciri-ciri..."
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:671 mail/em-popup.c:588
+#: mail/em-folder-view.c:681 mail/em-popup.c:589
 msgid "_Edit as New Message..."
 msgstr "_Edit sebagai Mesej Baru..."
 
-#: mail/em-folder-view.c:673
+#: mail/em-folder-view.c:683
 msgid "_Print"
 msgstr "_Cetak"
 
-#: mail/em-folder-view.c:676 ui/evolution-mail-message.xml.h:122
+#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
 msgid "_Reply to Sender"
 msgstr "_Balas kepada Penghantar"
 
-#: mail/em-folder-view.c:677 mail/em-popup.c:649
-#: ui/evolution-mail-message.xml.h:84
+#: mail/em-folder-view.c:687 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:86
 msgid "Reply to _List"
 msgstr "Balas kepada _Senarai"
 
-#: mail/em-folder-view.c:678 mail/em-popup.c:650
-#: ui/evolution-mail-message.xml.h:83
+#: mail/em-folder-view.c:688 mail/em-popup.c:651
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reply to _All"
 msgstr "Balas kepada _Semua"
 
-#: mail/em-folder-view.c:679 mail/em-popup.c:652
+#: mail/em-folder-view.c:689 mail/em-popup.c:653
 msgid "_Forward"
 msgstr "_Sampaikan"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:692
 msgid "Follo_w Up..."
 msgstr "Susu_lan..."
 
-#: mail/em-folder-view.c:683
+#: mail/em-folder-view.c:693
 msgid "Fla_g Completed"
 msgstr "Bendera Siap Ditunjukkan"
 
-#: mail/em-folder-view.c:684
+#: mail/em-folder-view.c:694
 msgid "Cl_ear Flag"
 msgstr "Ko_songkan Bendera"
 
-#: mail/em-folder-view.c:687 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as Read"
 msgstr "Tanda_kan sebagai Telah Dibaca"
 
-#: mail/em-folder-view.c:688
+#: mail/em-folder-view.c:698
 msgid "Mark as _Unread"
 msgstr "Tandakan sebagai _Belum Dibaca"
 
-#: mail/em-folder-view.c:689
+#: mail/em-folder-view.c:699
 msgid "Mark as _Important"
 msgstr "Tandakan sebagai _Penting"
 
-#: mail/em-folder-view.c:690
+#: mail/em-folder-view.c:700
 msgid "_Mark as Unimportant"
 msgstr "_Tandakan sebagai Tidak Penting"
 
-#: mail/em-folder-view.c:691 ui/evolution-mail-message.xml.h:51
+#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Tandakan sebagai _Belum Dibaca"
 
-#: mail/em-folder-view.c:692 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Tandakan sebagai _Penting"
 
-#: mail/em-folder-view.c:696
+#: mail/em-folder-view.c:706
 msgid "U_ndelete"
 msgstr "Batalkan hapus"
 
-#: mail/em-folder-view.c:699
+#: mail/em-folder-view.c:709
 msgid "Mo_ve to Folder..."
 msgstr "Alih_kan ke Folder..."
 
-#: mail/em-folder-view.c:700 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Salin ke Folder..."
 
-#: mail/em-folder-view.c:708
+#: mail/em-folder-view.c:718
 msgid "Add Sender to Address_book"
 msgstr "Tambahkan Penghantar ke Buku_Alamat"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:721
 msgid "Appl_y Filters"
 msgstr "Gunak_an Penapis"
 
-#: mail/em-folder-view.c:714
+#: mail/em-folder-view.c:724
 msgid "Crea_te Rule From Message"
 msgstr "Wujud_kan Peraturan Daripada Mesej"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:725
 msgid "VFolder on _Subject"
 msgstr "VFolder bagi _Tajuk"
 
-#: mail/em-folder-view.c:716
+#: mail/em-folder-view.c:726
 msgid "VFolder on Se_nder"
 msgstr "VFolder bagi Pen_ghantar"
 
-#: mail/em-folder-view.c:717
+#: mail/em-folder-view.c:727
 msgid "VFolder on _Recipients"
 msgstr "VFolder bagi _Penerima"
 
-#: mail/em-folder-view.c:718
+#: mail/em-folder-view.c:728
 msgid "VFolder on Mailing _List"
 msgstr "VFolder bagi Senarai _Mel"
 
-#: mail/em-folder-view.c:720
+#: mail/em-folder-view.c:730
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VFolder bagi Pen_ghantar"
 
-#: mail/em-folder-view.c:724
+#: mail/em-folder-view.c:734
 msgid "Filter on Sub_ject"
 msgstr "Penapis bagi Ta_juk"
 
-#: mail/em-folder-view.c:725
+#: mail/em-folder-view.c:735
 msgid "Filter on Sen_der"
 msgstr "Penapis bagi Peng_hantar"
 
-#: mail/em-folder-view.c:726
+#: mail/em-folder-view.c:736
 msgid "Filter on Re_cipients"
 msgstr "Penapis bagi Pe_nerima"
 
-#: mail/em-folder-view.c:727
+#: mail/em-folder-view.c:737
 msgid "Filter on _Mailing List"
 msgstr "Penapis bagi _Senarai Mel"
 
-#: mail/em-folder-view.c:729
+#: mail/em-folder-view.c:739
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Penapis bagi Peng_hantar"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1507 mail/em-folder-view.c:1545
-#: mail/mail-config.glade.h:38
+#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
+#: mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Piawai"
 
-#: mail/em-folder-view.c:1579
+#: mail/em-folder-view.c:1583
 msgid "Print Message"
 msgstr "Cetak Mesej"
 
-#: mail/em-folder-view.c:1820
+#: mail/em-folder-view.c:1825
 msgid "_Copy Link Location"
 msgstr "_Salin Lokasi Pautan"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:343
+#: mail/em-format-html-display.c:368
 #, c-format
 msgid "Matches: %d"
 msgstr "Padanan: %d"
 
-#: mail/em-format-html-display.c:570
+#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#, fuzzy
+msgid "Unsigned"
+msgstr "Diumpukkan"
+
+#: mail/em-format-html-display.c:597
 #, fuzzy
 msgid ""
 "This message is not signed.  There is no guarantee the sender of the message "
@@ -11837,19 +12239,33 @@ msgid ""
 msgstr ""
 "Mesej ini ditandatangani secara digital dan tidak dapat dibuktikan sah."
 
-#: mail/em-format-html-display.c:571
+#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#, fuzzy
+msgid "Valid signature"
+msgstr "Tandatangan buruk"
+
+#: mail/em-format-html-display.c:598
 msgid ""
 "This message is signed and is valid, the sender of this message is very "
 "likely who they claim to be."
 msgstr ""
 
-#: mail/em-format-html-display.c:572
+#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Tandatangan buruk"
+
+#: mail/em-format-html-display.c:599
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:573
+#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:600
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -11858,42 +12274,65 @@ msgstr ""
 "Token_input mengandungi tandatangan tak sah, atau tandatangan yang tidak "
 "dapat disah betul."
 
-#: mail/em-format-html-display.c:579
+#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Disampuk"
+
+#: mail/em-format-html-display.c:606
 msgid ""
 "This message is not encrypted.  It's content may be viewed in transit across "
 "The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:580
+#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+#, fuzzy
+msgid "Encrypted, weak"
+msgstr "Kandungan badan indeks"
+
+#: mail/em-format-html-display.c:607
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:581
+#: mail/em-format-html-display.c:608 mail/em-format-html.c:575
+#, fuzzy
+msgid "Encrypted"
+msgstr "Penyulitan PGP"
+
+#: mail/em-format-html-display.c:608
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 
-#: mail/em-format-html-display.c:582
+#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "Kandungan badan indeks"
+
+#: mail/em-format-html-display.c:609
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:703 mail/em-format-html.c:591
+#: mail/em-format-html-display.c:779 mail/em-format-html.c:645
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Tidak dapat menghuraikan mesej S/MIME. Ralat tak diketahui."
 
-#: mail/em-format-html-display.c:826
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
-msgstr ""
-"Mesej ini ditandatangani secara digital. Klik ikon kunci untuk keterangan "
-"lanjut."
+#: mail/em-format-html-display.c:814 mail/em-format-html.c:1042
+#: mail/em-format.c:1196
+msgid "Unsupported signature format"
+msgstr "Format tandatangan yang tidak disokong"
+
+#: mail/em-format-html-display.c:822 mail/em-format-html.c:1050
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Tidak dapat mengesah betul tandatangan dedaun"
 
 #: mail/em-format-html-display.c:917
 msgid "_View Inline"
@@ -11908,102 +12347,85 @@ msgstr "_Sembunyikan"
 msgid "Page %d of %d"
 msgstr "Halaman %d daripada %d"
 
-#: mail/em-format-html.c:454 mail/em-format-html.c:456
+#: mail/em-format-html.c:457 mail/em-format-html.c:459
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Mendapatkan semula %s"
 
-#: mail/em-format-html.c:803
+#: mail/em-format-html.c:826
 msgid "Malformed external-body part."
 msgstr "Bahagian badan luaran tidak sempurna."
 
-#: mail/em-format-html.c:833
+#: mail/em-format-html.c:856
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Penuding ke tapak FTP (%s)"
 
-#: mail/em-format-html.c:844
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Penuding ke fail setempat (%s) sah di tapak \"%s\""
 
-#: mail/em-format-html.c:846
+#: mail/em-format-html.c:869
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Penuding ke fail setempat (%s)"
 
-#: mail/em-format-html.c:867
+#: mail/em-format-html.c:890
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Penuding ke data jauh (%s)"
 
-#: mail/em-format-html.c:878
+#: mail/em-format-html.c:901
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Penuding ke data luaran yang tak diketahui (jenis \"%s\")"
 
-#: mail/em-format-html.c:1000 mail/em-format.c:1215
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Mesej ini ditandatangani secara digital dan tidak dapat dibuktikan sah."
-
-#: mail/em-format-html.c:1001 mail/em-format.c:1213
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "Mesej ini ditandatangani secara digital dan didapati sah."
-
-#: mail/em-format-html.c:1023 mail/em-format.c:1188
-msgid "Session not initialised"
-msgstr "Sesi tidak dapat dimulakan"
-
-#: mail/em-format-html.c:1034 mail/em-format.c:1199
-msgid "Unsupported signature format"
-msgstr "Format tandatangan yang tidak disokong"
-
-#: mail/em-format-html.c:1083
+#: mail/em-format-html.c:1029
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Tidak dapat menghuraikan mesej MIME. Dipaparkan sebagai sumber."
 
-#: mail/em-format-html.c:1172
+#: mail/em-format-html.c:1141
 msgid "Formatting message"
 msgstr "Memformat mesej"
 
-#: mail/em-format-html.c:1447 mail/em-format.c:673
+#: mail/em-format-html.c:1423 mail/em-format.c:673
 #: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
 msgid "From"
 msgstr "Daripada"
 
-#: mail/em-format-html.c:1449 mail/em-format.c:674
+#: mail/em-format-html.c:1425 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Balas Kepada"
 
-#: mail/em-format-html.c:1451 mail/em-format.c:675
+#: mail/em-format-html.c:1427 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kepada"
 
-#: mail/em-format-html.c:1453 mail/em-format.c:676
+#: mail/em-format-html.c:1429 mail/em-format.c:676
 msgid "Cc"
 msgstr "Sk"
 
-#: mail/em-format-html.c:1455 mail/em-format.c:677
+#: mail/em-format-html.c:1431 mail/em-format.c:677
 msgid "Bcc"
 msgstr "St"
 
-#: mail/em-format-html.c:1474
+#: mail/em-format-html.c:1450
 msgid "Mailer"
 msgstr "Pengemel"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1501
+#: mail/em-format-html.c:1477
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1504
+#: mail/em-format-html.c:1480
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1515 mail/em-format.c:679
+#: mail/em-format-html.c:1491 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarikh"
@@ -12013,61 +12435,111 @@ msgstr "Tarikh"
 msgid "%s attachment"
 msgstr "lampiran %s"
 
-#: mail/em-popup.c:598
+#: mail/em-format.c:1185
+msgid "Session not initialised"
+msgstr "Sesi tidak dapat dimulakan"
+
+#: mail/em-format.c:1210
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Mesej ini ditandatangani secara digital dan didapati sah."
+
+#: mail/em-format.c:1212
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Mesej ini ditandatangani secara digital dan tidak dapat dibuktikan sah."
+
+#: mail/em-junk-filter.c:72
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: mail/em-migrate.c:120
+#, fuzzy
+msgid "Migrating..."
+msgstr "Sedang menunggu..."
+
+#: mail/em-migrate.c:128
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: mail/em-migrate.c:161
+#, fuzzy, c-format
+msgid "Migrating `%s':"
+msgstr "%s berdenting"
+
+#: mail/em-migrate.c:627
+#, fuzzy, c-format
+msgid "Failed to migrate `%s': %s"
+msgstr "Gagal untuk cache %s: %s"
+
+#: mail/em-migrate.c:653 mail/em-migrate.c:670
+#, fuzzy, c-format
+msgid "Failed to create directory `%s': %s"
+msgstr "Gagal mewujudkan saluran bagi '%s': %s"
+
+#: mail/em-migrate.c:682
+#, fuzzy, c-format
+msgid "Failed to open store for `%s': %s"
+msgstr "Gagal menyelesaikan hos `%s': %s"
+
+#: mail/em-popup.c:599
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
-#: mail/em-popup.c:646
+#: mail/em-popup.c:647
 msgid "Set as _Background"
 msgstr "Set sebagai _Latar belakang"
 
-#: mail/em-popup.c:648
+#: mail/em-popup.c:649
 msgid "_Reply to sender"
 msgstr "_Balas kepada penghantar"
 
-#: mail/em-popup.c:685
+#: mail/em-popup.c:697
 msgid "_Open Link in Browser"
 msgstr "_Buka Pautan dalam Pelayar"
 
-#: mail/em-popup.c:686
+#: mail/em-popup.c:698
 msgid "Se_nd message to..."
 msgstr "Ha_ntar mesej ke..."
 
-#: mail/em-popup.c:687
+#: mail/em-popup.c:699
 msgid "_Add to Addressbook"
 msgstr "_Tambah ke Buku Alamat"
 
-#: mail/em-popup.c:793
+#: mail/em-popup.c:805
 #, c-format
 msgid "Open in %s..."
 msgstr "Buka dalam %s..."
 
-#: mail/em-subscribe-editor.c:579
+#: mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or the are not enabled."
 msgstr "Stor ini tidak menyokong langganan, atau ia tidak diaktifkan."
 
-#: mail/em-subscribe-editor.c:608
+#: mail/em-subscribe-editor.c:612
 msgid "Subscribed"
 msgstr "Dilanggan"
 
-#: mail/em-subscribe-editor.c:612
+#: mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "Folder"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:799
+#: mail/em-subscribe-editor.c:803
 msgid "Please select a server."
 msgstr "Sila pilih pelayan."
 
-#: mail/em-subscribe-editor.c:820
+#: mail/em-subscribe-editor.c:824
 msgid "No server has been selected"
 msgstr "Pelayan tidak dipilih"
 
-#: mail/em-utils.c:88
+#: mail/em-utils.c:93
 msgid "Don't show this message again."
 msgstr "Jangan tunjukkan mesej ini lagi."
 
-#: mail/em-utils.c:270
+#: mail/em-utils.c:275
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12076,25 +12548,25 @@ msgstr ""
 "Ralat ketika memuatkan maklumat penapis:\n"
 "%s"
 
-#: mail/em-utils.c:279
+#: mail/em-utils.c:284
 msgid "Filters"
 msgstr "Penapis"
 
-#: mail/em-utils.c:486
+#: mail/em-utils.c:491
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mesej Yang Disampaikan --------"
 
-#: mail/em-utils.c:1039
+#: mail/em-utils.c:1044
 msgid "an unknown sender"
 msgstr "penghantar tak diketahui"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1049
+#: mail/em-utils.c:1054
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Pada %a, %Y-%m-%d di %H:%M %%+05d, %%s menulis:"
 
-#: mail/em-utils.c:1325
+#: mail/em-utils.c:1330
 #, c-format
 msgid ""
 "Cannot save to `%s'\n"
@@ -12103,7 +12575,7 @@ msgstr ""
 "Tidak dapat menyimpan dalam `%s'\n"
 " %s"
 
-#: mail/em-utils.c:1330
+#: mail/em-utils.c:1335
 #, c-format
 msgid ""
 "`%s' already exists.\n"
@@ -12112,23 +12584,39 @@ msgstr ""
 "`%s' telah wujud.\n"
 "Tulis gantinya?"
 
-#: mail/em-utils.c:1373
+#: mail/em-utils.c:1378
 msgid "message"
 msgstr "mesej"
 
-#: mail/em-utils.c:1430
+#: mail/em-utils.c:1435
 msgid "Save Message..."
 msgstr "Simpan Mesej..."
 
-#: mail/em-utils.c:1893
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Tidak dapat mewujudkan direktori sementara: %s"
+#: mail/em-utils.c:1473
+#, fuzzy
+msgid "Add address"
+msgstr "Alamat"
+
+#: mail/em-utils.c:2262
+#, fuzzy, c-format
+msgid ""
+"This operation will permanently remove all deleted messages in the folder `%"
+"s'. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Pengendalian ini akan memadamkan secara kekal semua mesej yang ditandakan "
+"sebagai\n"
+"dihapuskan. Jika anda meneruskannya, anda tidak akan dapat memulihkan mesej "
+"ini.\n"
+"\n"
+"Anda pasti ingin menghapuskan mesej ini?"
 
-#: mail/em-utils.c:2211
+#: mail/em-utils.c:2288
+#, fuzzy
 msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
+"This operation will permanently remove all deleted messages in all folders. "
+"If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -12139,6 +12627,388 @@ msgstr ""
 "\n"
 "Anda pasti ingin menghapuskan mesej ini?"
 
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "_Kesan pautan secara automatik"
+
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "_Kesan pautan secara automatik"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight colour"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight colour."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
+msgid "Default charset in which to compose messages"
+msgstr "Tajuk piawai bagi mesej."
+
+#: mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
+msgid "Default charset in which to compose messages."
+msgstr "Tajuk piawai bagi mesej."
+
+#: mail/evolution-mail.schemas.in.in.h:8
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Cari teks dalam badan mesej yang dipaparkan"
+
+#: mail/evolution-mail.schemas.in.in.h:9
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Cari teks dalam badan mesej yang dipaparkan"
+
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default forward style"
+msgstr "_Gaya untuk menyampaikan:"
+
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default reply style"
+msgstr "_Gaya Balasan:"
+
+#: mail/evolution-mail.schemas.in.in.h:12
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "Kosongkan _folder sampah apabila keluar"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Kosongkan _folder sampah apabila keluar"
+
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:16
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:19
+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 "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "List of Labels and their associated colours"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "List of accounts"
+msgstr "Akaun Mel"
+
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:colour where colour uses the HTML hex encoding."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:27
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Melaksanakan tindakan"
+
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:36
+#, fuzzy
+msgid "New Mail Notify sound file"
+msgstr "Pemberitahuan Mel Baru"
+
+#: mail/evolution-mail.schemas.in.in.h:37
+#, fuzzy
+msgid "New Mail Notify type"
+msgstr "Pemberitahuan Mel Baru"
+
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"_Penggesa apabila menghantar mesej HTML kepada kenalan yang tidak mahukannya"
+
+#: mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "Penggesa apabila menghantar mesej dengan hanya penerima St ditentukan"
+
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "S3kr3t 0pt10n"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "S3kr3t 0pt10n."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "Hantar Mel HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:52
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "Hantar Mel HTML?"
+
+#: mail/evolution-mail.schemas.in.in.h:53
+#, fuzzy
+msgid "Show Animations"
+msgstr "_Tunjukkan imej animasi"
+
+#: mail/evolution-mail.schemas.in.in.h:54
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "_Tunjukkan imej animasi"
+
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Tunjukkan mesej dalam gaya normal"
+
+#: mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Pralihat Anak Tetingkap"
+
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "_Mainkan fail bunyi apabila ada mel baru"
+
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
+msgid "Spell check inline"
+msgstr "Semak _Ejaan"
+
+#: mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
+msgid "Terminal font"
+msgstr "_Fon Terminal:"
+
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:64
+#, fuzzy
+msgid "The variable width font for mail display"
+msgstr "Pilih fon lebar pemboleh ubah HTML untuk pencetakan"
+
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Thread the message list."
+msgstr "Senarai Mesej yang Disambungkan"
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "Senarai Mesej yang Disambungkan"
+
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "UID string of the default account."
+msgstr "_Jadikan ini akaun piawai saya"
+
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Use custom fonts"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Variable width font"
+msgstr "L_ebar Pemboleh ubah:"
+
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 msgid "Evolution Elm importer"
 msgstr "Pengimport Elm Evolution"
@@ -12267,10 +13137,6 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution sedang mengimport data Netscape lama anda"
 
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1119
-msgid "Trash"
-msgstr "Sampah"
-
 #: mail/importers/netscape-importer.c:1995
 msgid "Scanning mail filters"
 msgstr "Mengimbas penapis mel"
@@ -12279,7 +13145,7 @@ msgstr "Mengimbas penapis mel"
 msgid "Scanning directory"
 msgstr "Mengimbas direktori"
 
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:556
+#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
 msgid "Starting import"
 msgstr "Memulakan import"
 
@@ -12354,19 +13220,19 @@ msgid "You have not filled in all of the required information."
 msgstr "Anda tidak mengisi semua maklumat yang diperlukan."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Editor Akaun Evolution"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
 msgid "_Host:"
 msgstr "_Hos:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:123
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Nama_pengguna:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:156
+#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
 msgid "_Path:"
 msgstr "_Laluan:"
 
@@ -12379,35 +13245,35 @@ msgstr "Anda tidak boleh mewujudkan dua akaun dengan nama yang sama."
 msgid "Mail to %s"
 msgstr "Mel ke %s"
 
-#: mail/mail-autofilter.c:257
+#: mail/mail-autofilter.c:260
 #, c-format
 msgid "Subject is %s"
 msgstr "Tajuk adalah %s "
 
-#: mail/mail-autofilter.c:273
+#: mail/mail-autofilter.c:276
 #, c-format
 msgid "Mail from %s"
 msgstr "Mel dari %s"
 
-#: mail/mail-autofilter.c:290
+#: mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s senarai mel"
 
-#: mail/mail-autofilter.c:314
+#: mail/mail-autofilter.c:317
 #, fuzzy, c-format
 msgid "Replies to %s"
 msgstr "Jawapan kepada"
 
-#: mail/mail-autofilter.c:367
+#: mail/mail-autofilter.c:370
 msgid "Add Filter Rule"
 msgstr "Tambahkan Peraturan Penapis"
 
-#: mail/mail-autofilter.c:416
+#: mail/mail-autofilter.c:419
 msgid "The following filter rule(s):\n"
 msgstr "Peraturan penapis berikut:\n"
 
-#: mail/mail-autofilter.c:422
+#: mail/mail-autofilter.c:425
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12418,30 +13284,30 @@ msgstr ""
 "    '%s'\n"
 "Dan telah dikemaskinikan."
 
-#: mail/mail-component.c:211
+#: mail/mail-component.c:214
 msgid "On this Computer"
 msgstr "Atas komputer ini"
 
-#: mail/mail-component.c:362
+#: mail/mail-component.c:379
 msgid "New Mail Message"
 msgstr "Mesej Mel Baru"
 
-#: mail/mail-component.c:363
+#: mail/mail-component.c:380
 msgid "_Mail Message"
 msgstr "_Mesej Mel"
 
-#: mail/mail-component.c:364
+#: mail/mail-component.c:381
 msgid "Compose a new mail message"
 msgstr "Gubah mesej mel baru"
 
-#: mail/mail-component.c:445
+#: mail/mail-component.c:472
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
+#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
 msgid "Identity"
 msgstr "Pengenalan"
 
@@ -12501,11 +13367,11 @@ msgstr ""
 "ini dalam ruang di bawah. Nama ini akan digunakan untuk tujuan paparan "
 "sahaja."
 
-#: mail/mail-config.c:1086
+#: mail/mail-config.c:1090
 msgid "Checking Service"
 msgstr "Menyemak Khidmat"
 
-#: mail/mail-config.c:1164 mail/mail-config.c:1168
+#: mail/mail-config.c:1168 mail/mail-config.c:1172
 msgid "Connecting to server..."
 msgstr "Sedang disambungkan ke pelayan..."
 
@@ -12589,26 +13455,35 @@ msgid "C_olors"
 msgstr "W_arna"
 
 #: mail/mail-config.glade.h:26
+#, fuzzy
+msgid "Check _Incoming Mail"
+msgstr "Menyemak Mel Baru"
+
+#: mail/mail-config.glade.h:27
 msgid "Check spelling while I _type"
 msgstr "Semak ejaan sambil saya _menaip"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:28
 msgid "Checking for New Mail"
 msgstr "Menyemak Mel Baru"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:29
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "Warna bagi _kata yang salah eja:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Menggubah Mesej"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Konfigurasi"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12624,133 +13499,138 @@ msgstr ""
 "\n"
 "Klik \"Guna\" untuk menyimpan seting anda."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "Pia_wai"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Peri laku Piawai"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Pengekodan aksara _piawai:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Menghapuskan Mel"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "_Sentiasa tandatangan mesej keluar apabila menggunakan akaun ini"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Jangan petik mesej asal"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Jangan tandatangani _permintaan mesyuarat (bagi keserasian Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Selesai"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Folder _draf:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "Bo_lehkan"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Email Accounts"
 msgstr "Akaun E-mel"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "Alamat _e-mel:"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Kosongkan _folder sampah apabila keluar"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "Sijil Kenalan"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 msgid "Evolution Account Assistant"
 msgstr "Pembantu Akaun Evolution"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Laksanakan Arahan..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Le_bar -tetap:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
+#, fuzzy
+msgid "Filter Options"
+msgstr "Penapis"
+
+#: mail/mail-config.glade.h:59
 msgid "Font Properties"
 msgstr "Ciri-ciri Fon"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:60
 msgid "Format messages in _HTML"
 msgstr "Formatkan mesej dalam _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "Tonjolkan _petikan dengan"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Dalam Talian"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Label dan Warna"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Memuatkan Imej"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "Konfigurasi Mel"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Lokasi peti mel"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Penggubah Mesej"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Paparan Mesej"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:75
 msgid "Message Fonts"
 msgstr "Fon Mesej"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Pemberitahuan Mel Baru"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:79
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12758,140 +13638,140 @@ msgstr ""
 "Nota: anda tidak akan digesa untuk memberikan kata laluan sehinggalah anda "
 "disambungkan buat pertama kali"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Maklumat Opsyenal"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Or_ganisasi:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _ID Kekunci:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Pilih warna"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Penggesa apabila menghantar mesej dengan hanya penerima St ditentukan"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Kebersendirian Agak Baik (PGP/GPG)"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:90
 msgid "Printed Fonts"
 msgstr "Fon Tercetak"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Dirmel Qmail "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:92
 msgid "Quote original message"
 msgstr "Petik mesej asal"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Dipetik"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "I_ngat kata laluan ini"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Jawapan Kepada:"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Receiving Email"
 msgstr "Menerima E-mel"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "Menerima _Opsyen"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Ingat kata laluan _ini"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Maklumat yang Diminta"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Restore Defaults"
 msgstr "Simpan semula Piawai"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "K_eselamatan"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME Terjamin (S/MIME)"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr "Pilih fon lebar tetap HTML"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr "Pilih fon lebar tetap HTML untuk pencetakan"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr "Pilih fon lebar pemboleh ubah HTML"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr "Pilih fon lebar pemboleh ubah HTML untuk pencetakan"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:108
 msgid "Sending Email"
 msgstr "Menghantar E-mel"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Folder _mesej Dihantar:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Mesej Dihantar dan Didraf"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Pe_layan memerlukan pengesahan"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Konfigurasi Pelayan"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Jenis _Pelayan:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Sijil tandatangan tidak dijumpai"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Specify _filename:"
 msgstr "Tetapkan _nama fail:"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Spell _Checking"
 msgstr "Semak _Ejaan"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Standard Unix mbox"
 msgstr "Peti mel Unix piawai"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12901,7 +13781,7 @@ msgstr ""
 "anda. Nama yang anda tetapkan akan digunakan\n"
 "untuk tujuan paparan sahaja. "
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -12911,7 +13791,7 @@ msgstr ""
 "semakan ejaan. Senarai bahasa di sini hanya menunjukkan bahasa yang terdapat "
 "dalam kamus yang telah dimasukkan."
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12919,11 +13799,15 @@ msgstr ""
 "Taip nama yang ingin anda gunakan bagi akaun ini.\n"
 "Contohnya: \"Kerja\" or \"Peribadi\""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:126
+msgid "Use _Daemon"
+msgstr ""
+
+#: mail/mail-config.glade.h:128
 msgid "V_ariable-width:"
 msgstr "L_ebar Pemboleh ubah:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12933,161 +13817,170 @@ msgstr ""
 "\n"
 "Klik \"Sampaikan\" untuk bermula. "
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "_Add Signature"
 msgstr "_Tambahkan Tandatangan"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid "_Always load images off the net"
 msgstr "_Sentiasa muatkan imej daripada internet"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:136
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Sentiasa tandatangan mesej keluar apabila menggunakan akaun ini"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:137
 msgid "_Authentication Type: "
 msgstr "_Jenis Pengesahan:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid "_Authentication type: "
 msgstr "_Jenis Pengesahan:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:139
 msgid "_Automatically check for new mail every"
 msgstr "_Secara automatik semak mel baru setiap"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid "_Automatically insert smiley images"
 msgstr "_Secara automatik sisipkan imej smiley"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:141
 msgid "_Beep when new mail arrives"
 msgstr "_Bunyi bip apabila ada mesej baru"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:142
 msgid "_Confirm when expunging a folder"
 msgstr "_Sahkan apabila membuang folder"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:143
 msgid "_Default signature:"
 msgstr "_Tandatangan piawai:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid "_Defaults"
 msgstr "_Piawai"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:145
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Jangan beritahu saya apabila ada mel baru"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "_Enable"
 msgstr "_Bolehkan"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:148
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:149
 msgid "_Forward style:"
 msgstr "_Gaya untuk menyampaikan:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Full name:"
 msgstr "_Nama penuh:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:152
 msgid "_HTML Mail"
 msgstr "_Mel HTML"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:154
 msgid "_Identity"
 msgstr "_Pengenalan"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:155
+#, fuzzy
+msgid "_Junk"
+msgstr "Jun"
+
+#: mail/mail-config.glade.h:156
 msgid "_Load images if sender is in addressbook"
 msgstr "_Muatkan imej jika penghantar ada dalam buku alamat"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:157
+msgid "_Local Tests Only"
+msgstr ""
+
+#: mail/mail-config.glade.h:158
 msgid "_Make this my default account"
 msgstr "_Jadikan ini akaun piawai saya"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:159
 msgid "_Mark messages as read after"
 msgstr "_Tandakan mesej sebagai telah dibaca selepas"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:160
 msgid "_Name:"
 msgstr "_Nama:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:161
 msgid "_Never load images off the net"
 msgstr "_Jangan muatkan imej daripada internet"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:163
 msgid "_Play sound file when new mail arrives"
 msgstr "_Mainkan fail bunyi apabila ada mel baru"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Penggesa apabila menghantar mesej HTML kepada kenalan yang tidak mahukannya"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Penggesa tapabila menghantar mesej tanpa tajuk"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:166
 msgid "_Receiving Mail"
 msgstr "_Menerima Mel"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:167
 msgid "_Reply style:"
 msgstr "_Gaya Balasan:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:168
 msgid "_Restore defaults"
 msgstr "_Simpan semula piawai"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_Skrip:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Select..."
 msgstr "_Hapuskan..."
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:171
 msgid "_Sending Mail"
 msgstr "_Menghantar Mel"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:172
 msgid "_Show animated images"
 msgstr "_Tunjukkan imej animasi"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:173
 msgid "_Signatures"
 msgstr "_Tandatangan"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:174
 msgid "_Standard Font:"
 msgstr "_Fon Piawai:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:175
 msgid "_Terminal Font:"
 msgstr "_Fon Terminal:"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:176
 msgid "_Use secure connection (SSL):"
 msgstr "_Gunakan sambungan terjamin (SSL):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:177
 msgid "_Use the same fonts as other applications"
 msgstr "_Gunakan fon yang sama seperti aplikasi lain"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:179
 msgid "description"
 msgstr "huraian"
 
@@ -13096,7 +13989,7 @@ msgstr "huraian"
 msgid "Pinging %s"
 msgstr "%s berdenting"
 
-#: mail/mail-mt.c:256
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13105,7 +13998,7 @@ msgstr ""
 "Ralat semasa '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:263
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13114,7 +14007,7 @@ msgstr ""
 "Ralat semasa melakukan pengendalian:\n"
 "%s"
 
-#: mail/mail-mt.c:910
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Berfungsi"
 
@@ -13183,11 +14076,6 @@ msgstr "Menyalin mesej ke %s"
 msgid "Scanning folders in \"%s\""
 msgstr "Mengimbas folder dalam \"%s\""
 
-#: mail/mail-ops.c:1125
-#, fuzzy
-msgid "Junk"
-msgstr "Jun"
-
 #: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Mesej yang disampaikan"
@@ -13229,22 +14117,22 @@ msgstr "Mengosongkan tong sampah dalam '%s'"
 msgid "Local Folders"
 msgstr "Folder Setempat"
 
-#: mail/mail-ops.c:1758
+#: mail/mail-ops.c:1766
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Mendapatkan semula mesej %s"
 
-#: mail/mail-ops.c:1830
+#: mail/mail-ops.c:1838
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Mendapatkan semula %d mesej"
 
-#: mail/mail-ops.c:1914
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Menyimpan %d mesej"
 
-#: mail/mail-ops.c:1962
+#: mail/mail-ops.c:1970
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13253,7 +14141,7 @@ msgstr ""
 "Tidak dapat mewujudkan fail output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1990
+#: mail/mail-ops.c:1998
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13262,11 +14150,11 @@ msgstr ""
 "Ralat ketika menyimpan mesej ke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2061
+#: mail/mail-ops.c:2069
 msgid "Saving attachment"
 msgstr "Menyimpan lampiran"
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2086
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13275,22 +14163,22 @@ msgstr ""
 "Tidak dapat mewujudkan fail output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2108
+#: mail/mail-ops.c:2116
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: mail/mail-ops.c:2256
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Terputus daripada %s"
 
-#: mail/mail-ops.c:2256
+#: mail/mail-ops.c:2264
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Disambungkan semula ke %s"
 
-#: mail/mail-ops.c:2358
+#: mail/mail-ops.c:2366
 msgid "Changing junk status"
 msgstr ""
 
@@ -13310,6 +14198,21 @@ msgstr "Cari:"
 msgid "Search"
 msgstr "Cari"
 
+#: mail/mail-security.glade.h:2
+#, fuzzy
+msgid "Digital Signature"
+msgstr "Edit tandatangan"
+
+#: mail/mail-security.glade.h:3
+#, fuzzy
+msgid "Encryption"
+msgstr "Pengecualian"
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Maklumat Akaun"
+
 #: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Sedang membatalkan..."
@@ -13345,24 +14248,24 @@ msgstr "Sedang mengemaskinikan..."
 msgid "Waiting..."
 msgstr "Sedang menunggu..."
 
-#: mail/mail-session.c:231
+#: mail/mail-session.c:234
 msgid "User canceled operation."
 msgstr "Pengguna membatalkan pengendalian."
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:267
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Masukkan Kata Laluan bagi %s"
 
-#: mail/mail-session.c:266
+#: mail/mail-session.c:269
 msgid "Enter Password"
 msgstr "Masukkan Kata Laluan"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:292
 msgid "_Remember this password"
 msgstr "_Ingat kata laluan ini"
 
-#: mail/mail-session.c:290
+#: mail/mail-session.c:293
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Ingat kata laluan ini bagi sesi seterusnya"
 
@@ -13410,17 +14313,22 @@ msgstr "Mesej yang disampaikan - %s"
 msgid "Forwarded message"
 msgstr "Mesej yang disampaikan"
 
-#: mail/mail-vfolder.c:90
+#: mail/mail-tools.c:313
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Membuka folder %s"
+
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Menyediakan vfolder: %s"
 
-#: mail/mail-vfolder.c:208
+#: mail/mail-vfolder.c:205
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Mengemaskinikan vfolder bagi uri: %s"
 
-#: mail/mail-vfolder.c:466
+#: mail/mail-vfolder.c:463
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13433,88 +14341,88 @@ msgstr ""
 "    '%s'\n"
 "Dan telah dikemaskinikan."
 
-#: mail/mail-vfolder.c:777
+#: mail/mail-vfolder.c:774
 msgid "VFolders"
 msgstr "VFolder"
 
-#: mail/mail-vfolder.c:836
+#: mail/mail-vfolder.c:833
 msgid "vFolders"
 msgstr "vFolder"
 
-#: mail/mail-vfolder.c:875
+#: mail/mail-vfolder.c:872
 msgid "Edit VFolder"
 msgstr "Edit vFolder"
 
-#: mail/mail-vfolder.c:895
+#: mail/mail-vfolder.c:892
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Cuba mengedit vFolder '%s' yang tidak wujud."
 
-#: mail/mail-vfolder.c:967
+#: mail/mail-vfolder.c:964
 msgid "New VFolder"
 msgstr "VFolder Baru"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:904
 msgid "Unseen"
 msgstr "Belum dilihat"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:905
 msgid "Seen"
 msgstr "Dilihat"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:906
 msgid "Answered"
 msgstr "Dijawab"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:907
 msgid "Multiple Unseen Messages"
 msgstr "Pelbagai Mesej yang Belum Dilihat"
 
-#: mail/message-list.c:906
+#: mail/message-list.c:908
 msgid "Multiple Messages"
 msgstr "Pelbagai Mesej"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:912
 msgid "Lowest"
 msgstr "Paling rendah"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:913
 msgid "Lower"
 msgstr "Lebih rendah"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:917
 msgid "Higher"
 msgstr "Lebih tinggi"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:918
 msgid "Highest"
 msgstr " Paling tinggi"
 
-#: mail/message-list.c:1233
+#: mail/message-list.c:1241
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1240
+#: mail/message-list.c:1248
 msgid "Today %l:%M %p"
 msgstr "Hari ini %l:%M %p"
 
-#: mail/message-list.c:1249
+#: mail/message-list.c:1257
 msgid "Yesterday %l:%M %p"
 msgstr "Semalam %l:%M %p"
 
-#: mail/message-list.c:1261
+#: mail/message-list.c:1269
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1277
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1271
+#: mail/message-list.c:1279
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3073
+#: mail/message-list.c:3082
 msgid "Generating message list"
 msgstr "Menjana senarai mesej"
 
@@ -13570,11 +14478,11 @@ msgstr "Sampaikan"
 msgid "No Response Necessary"
 msgstr "Maklum Balas Tidak Perlu"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:81
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
 msgid "Reply"
 msgstr "Balas"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:82
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
 msgid "Reply to All"
 msgstr "Balas kepada Semua"
 
@@ -13634,22 +14542,125 @@ msgstr "Buat konfigurasi folder khas dan peri laku folder luar talian di sini"
 msgid "Evolution Shell"
 msgstr "Cangkerang Evolution"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr "Kawalan konfigurasi seting folder Evolution"
-
 #: shell/GNOME_Evolution_Shell.server.in.in.h:4
 msgid "Folder Settings"
 msgstr "Seting Folder"
 
-#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" dalam \"%s\""
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default shortcut group"
+msgstr "Namakan semula kumpulan jalan pintas ini"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Toggle sama ada ingin menunjukkan bar folder atau tidak"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default width of the shortcut bar pane"
+msgstr "Sembunyikan bar jalan pintas"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window height"
+msgstr "Keutamaan Piawai:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
+msgid "Default window width"
+msgstr "Keutamaan Piawai:"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Antara muka konfigurasi Mel Evolution"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "Tandakan lampiran yang akan ditunjukkan dalam talian secara piawai."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:9
+msgid ""
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Path to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
+msgid "Path to the default contacts folder"
+msgstr "Membuka folder tugas piawai"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "Path to the default mail folder"
+msgstr "Membuka folder tugas piawai"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
+msgid "Path to the default tasks folder"
+msgstr "Membuka folder tugas piawai"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "Physical URI to the default calendar folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "Physical URI to the default contacts folder"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:18
+msgid "Physical URI to the default mail folder"
+msgstr ""
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Tambahkan Folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
+msgid "Physical URI to the default tasks folder"
+msgstr "Membuka folder tugas piawai"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:20
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether to show the folder bar"
+msgstr "Toggle sama ada ingin menunjukkan bar folder atau tidak"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
+msgid "Whether to show the shortcut bar"
+msgstr "Toggle sama ada ingin menunjukkan bar jalan pintas atau tidak"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
+msgid "mail"
+msgstr "E-mel"
 
 #: shell/e-setup.c:144
 msgid "Could not update files correctly"
@@ -13775,11 +14786,6 @@ msgstr ""
 msgid "Really delete folder \"%s\"?"
 msgstr "Anda pasti ingin menghapuskan folder \"%s\"?"
 
-#: shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Hapuskan \"%s\""
-
 #: shell/e-shell-folder-commands.c:489
 #, c-format
 msgid ""
@@ -13789,26 +14795,12 @@ msgstr ""
 "Tidak dapat menamakan semula folder:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Namakan semula folder \"%s\" kepada:"
-
-#: shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Namakan semula Folder"
-
 #: shell/e-shell-folder-commands.c:547
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Nama folder yang ditetapkan tak sah: %s"
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "Folder bernama \"%s\" telah wujud. Sila gunakan nama yang lain."
-
 #: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
 msgstr "Folder yang dipilih bukannya milik pengguna yang lain"
@@ -13831,19 +14823,15 @@ msgstr ""
 "Tidak dapat mewujudkan folder yang ditetapkan:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Wujudkan Folder Baru"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Tak Berjudul)"
 
-#: shell/e-shell-importer.c:139
+#: shell/e-shell-importer.c:138
 msgid "Choose the type of importer to run:"
 msgstr "Pilih jenis pengimport yang akan dijalankan:"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -13857,11 +14845,11 @@ msgstr ""
 "Anda boleh pilih \"Automatik\" jika anda tidak tahu, dan Evolution akan cuba "
 "menyelesaikannya."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
 msgid "Please select the information that you would like to import:"
 msgstr "Sila pilih maklumat yang ingin anda import:"
 
-#: shell/e-shell-importer.c:151
+#: shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -13873,7 +14861,7 @@ msgstr ""
 "yang dapat diimport apabila dijumpai. Jika anda mahu mencuba\n"
 "lagi, sila klik butang \"Kembali\".\n"
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13882,21 +14870,21 @@ msgstr ""
 "Mengimport %s\n"
 "Mengimport item %d."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:322
 msgid "Select importer"
 msgstr "Pilih pengimport"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:463
 #, c-format
 msgid "File %s does not exist"
 msgstr "Fail %s tidak wujud"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:464 shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:523
 msgid "Evolution Error"
 msgstr "Ralat Evolution"
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:480
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -13905,11 +14893,11 @@ msgstr ""
 "Tidak ada pengimport yang boleh mengendalikan\n"
 "%s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:489
 msgid "Importing"
 msgstr "Mengimport"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:496
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -13918,17 +14906,17 @@ msgstr ""
 "Mengimport %s.\n"
 "Memulakan %s"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:508
 #, c-format
 msgid "Error starting %s"
 msgstr "Ralat ketika memulakan %s"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:522
 #, c-format
 msgid "Error loading %s"
 msgstr "Ralat ketika memuatkan %s"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:539
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -13937,31 +14925,31 @@ msgstr ""
 "Mengimport %s\n"
 "Mengimport item 1."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:593
 msgid "Automatic"
 msgstr "Automatik"
 
-#: shell/e-shell-importer.c:643
+#: shell/e-shell-importer.c:642
 msgid "_Filename:"
 msgstr "_Namafail:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:647
 msgid "Select a file"
 msgstr "Pilih fail"
 
-#: shell/e-shell-importer.c:658
+#: shell/e-shell-importer.c:657
 msgid "File _type:"
 msgstr "_Jenis fail:"
 
-#: shell/e-shell-importer.c:684
+#: shell/e-shell-importer.c:683
 msgid "Import data and settings from _older programs"
 msgstr "Import data dan seting daripada program _lama"
 
-#: shell/e-shell-importer.c:687
+#: shell/e-shell-importer.c:686
 msgid "Import a _single file"
 msgstr "Import fail _tunggal"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -13969,46 +14957,27 @@ msgstr ""
 "Sila tunggu...\n"
 "Sedang mengimbas persediaan sedia ada"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:757
 msgid "Starting Intelligent Importers"
 msgstr "Memulakan Pengimport Cerdas"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
 #, c-format
 msgid "From %s:"
 msgstr "Daripada %s:"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1061
 msgid "Select a destination folder for importing this data"
 msgstr "Pilih folder destinasi untuk mengimport data ini"
 
-#: shell/e-shell-importer.c:1191
+#: shell/e-shell-importer.c:1190
 msgid "_Import"
 msgstr "_Import"
 
-#: shell/e-shell-offline-handler.c:592
+#: shell/e-shell-offline-handler.c:596
 msgid "Closing connections..."
 msgstr "Sedang menutup sambungan..."
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Ralat ketika menyegerakkan \"%s\":\n"
-"%s"
-
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Menyegerakkan Folder"
-
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Sedang menyegerakkan \"%s\" (%d daripada %d)..."
-
 #: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Seting Evolution"
@@ -14043,7 +15012,7 @@ msgstr "Tidak dapat membuka folder kongsi: %s."
 msgid "Cannot find the specified shared folder."
 msgstr "Tidak dapat mencari folder kongsi yang ditetapkan."
 
-#: shell/e-shell-startup-wizard.c:771
+#: shell/e-shell-startup-wizard.c:778
 msgid ""
 "If you quit the Evolution Setup Assistant now, all of the information that "
 "you have entered will be forgotten. You will need to run this assistant "
@@ -14057,7 +15026,7 @@ msgstr ""
 "\n"
 "Adakah anda mahu berhenti menggunakan Pembantu ini sekarang?"
 
-#: shell/e-shell-startup-wizard.c:782
+#: shell/e-shell-startup-wizard.c:789
 msgid "Quit Assistant"
 msgstr "Keluar dari Pembantu"
 
@@ -14132,19 +15101,37 @@ msgstr "_Bekerja Luar Talian"
 msgid "Work Offline"
 msgstr "Bekerja Luar Talian"
 
-#: shell/e-shell.c:987
+#: shell/e-shell-window.c:324
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution dalam talian sekarang.  Klik butang ini untuk bekerja luar "
+"talian."
+
+#: shell/e-shell-window.c:331
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution adalah dalam proses menjadi luar talian."
+
+#: shell/e-shell-window.c:337
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution luar talian sekarang.  Klik butang ini untuk bekerja dalam "
+"talian."
+
+#: shell/e-shell.c:1003
 msgid "Invalid arguments"
 msgstr "Argumen tak sah"
 
-#: shell/e-shell.c:989
+#: shell/e-shell.c:1005
 msgid "Cannot register on OAF"
 msgstr "Tidak dapat mendaftarkan dalam OAF"
 
-#: shell/e-shell.c:991
+#: shell/e-shell.c:1007
 msgid "Configuration Database not found"
 msgstr "Pangkalan Data Konfigurasi tidak dijumpai"
 
-#: shell/e-shell.c:993
+#: shell/e-shell.c:1009
 msgid "Generic error"
 msgstr "Ralat generik"
 
@@ -14248,10 +15235,6 @@ msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Buka folder yang dipautkan ke jalan pintas ini dalam tetingkap baru"
 
 #: shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Namakan semula"
-
-#: shell/e-shortcuts-view.c:427
 msgid "Rename this shortcut"
 msgstr "Namakan semula jalan pintas ini"
 
@@ -14285,6 +15268,17 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% siap)"
 
+#: shell/e-user-creatable-items-handler.c:600
+#: shell/e-user-creatable-items-handler.c:641
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Baru"
+
+#: shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" dalam \"%s\""
+
 #: shell/evolution-shell-component-utils.c:124
 #, c-format
 msgid ""
@@ -14322,66 +15316,6 @@ msgstr ""
 "Ralat daripada sistem pengaktifan ialah:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Ralat CORBA"
-
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Disampuk"
-
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Argumen tak sah"
-
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Sudah mempunyai pemilik"
-
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Tiada pemilik"
-
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Tidak dijumpai"
-
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Jenis yang tidak disokong"
-
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Skema yang tidak disokong"
-
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Pengendalian yang tidak disokong"
-
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Ralat dalaman"
-
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Wujud"
-
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "URI tak sah"
-
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Mempunyai subfolder"
-
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Tiada lagi ruang"
-
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Pemilik lama telah meninggal dunia"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Sambungan Aktif"
@@ -14410,18 +15344,10 @@ msgstr "_Mel:"
 msgid "_Tasks:"
 msgstr "_Tugas:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "Nama _folder:"
-
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder _type:"
 msgstr "Jenis _folder:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Tetapkan di mana folder akan diwujudkan:"
-
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr "Buka Folder Pengguna Lain"
@@ -14518,7 +15444,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Pengimport"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:27
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Import"
 
@@ -14534,7 +15460,7 @@ msgstr "Jangan tanya saya lagi"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution boleh mengimport data daripada fail berikut:"
 
-#: shell/main.c:114 shell/main.c:557
+#: shell/main.c:114 shell/main.c:559
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -14610,27 +15536,27 @@ msgstr "Tidak dapat mencapai cangkerang Ximian Evolution."
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Tidak dapat memulakan cangkerang Ximian Evolution: %s"
 
-#: shell/main.c:524
+#: shell/main.c:526
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:526
+#: shell/main.c:528
 msgid "Start in offline mode"
 msgstr "Mulakan dalam mod luar talian"
 
-#: shell/main.c:528
+#: shell/main.c:530
 msgid "Start in online mode"
 msgstr "Mulakan dalam mod dalam talian"
 
-#: shell/main.c:531
+#: shell/main.c:533
 msgid "Forcibly shut down all evolution components"
 msgstr "Tamatkan semua komponen Evolution secara paksa"
 
-#: shell/main.c:534
+#: shell/main.c:536
 msgid "Send the debugging output of all components to a file."
 msgstr "Hantarkan output penyahpijatan bagi semua komponen ke fail."
 
-#: shell/main.c:561
+#: shell/main.c:563
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14639,32 +15565,56 @@ msgstr ""
 "%s: --dalam talian dan --luar talian tidak dapat digunakan bersama.\n"
 "  Gunakan %s --bantuan untuk keterangan lanjut.\n"
 
-#: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:275
-#: smime/gui/certificate-manager.c:408
+#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
+#: smime/gui/certificate-manager.c:395
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Pilih pengimport"
+
+#: smime/gui/certificate-manager.c:156 smime/gui/certificate-manager.c:317
+#: smime/gui/certificate-manager.c:473
 msgid "Certificate Name"
 msgstr "Nama Sijil"
 
-#: smime/gui/certificate-manager.c:140 smime/gui/certificate-manager.c:287
+#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
 msgid "Purposes"
 msgstr "Tujuan"
 
-#: smime/gui/certificate-manager.c:146 smime/gui/smime-ui.glade.h:35
+#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:512
 msgid "Serial Number"
 msgstr "Nombor Siri"
 
-#: smime/gui/certificate-manager.c:152
+#: smime/gui/certificate-manager.c:174
 msgid "Expires"
 msgstr "Tamat tempoh"
 
-#: smime/gui/certificate-manager.c:196 smime/gui/certificate-manager.c:330
-#, fuzzy
-msgid "Select a cert to import..."
-msgstr "Pilih pengimport"
-
-#: smime/gui/certificate-manager.c:281
+#: smime/gui/certificate-manager.c:323
 msgid "E-Mail Address"
 msgstr "Alamat E-mel"
 
+#: smime/gui/certificate-viewer.c:281
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+"Sijil tamat tempoh: %s\n"
+"Pengeluar: %s"
+
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:116
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: smime/gui/e-cert-selector.c:117
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Not Part of Certificate>"
@@ -14719,125 +15669,364 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
 #, fuzzy
 msgid "Certificate"
 msgstr "Sijil"
 
 #: smime/gui/smime-ui.glade.h:15
 #, fuzzy
+msgid "Certificate Authority Trust"
+msgstr "Sijil tak dipercayai"
+
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
 msgid "Certificate details"
 msgstr "Sijil"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:17
 msgid "Common Name (CN)"
 msgstr "Nama Biasa (CN)"
 
-#: smime/gui/smime-ui.glade.h:17
+#: smime/gui/smime-ui.glade.h:18
 msgid "Contact Certificates"
 msgstr "Sijil Kenalan"
 
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:21
 #, no-c-format
 msgid "Do you want to trust \"%s\" for the following purposes?"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:21
+#: smime/gui/smime-ui.glade.h:22
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:23
 msgid "Edit"
 msgstr "Edit"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "E-mel Sijil Penerima"
 
-#: smime/gui/smime-ui.glade.h:24
+#: smime/gui/smime-ui.glade.h:25
 msgid "Email Signer Certificate"
 msgstr "E-mel Sijil Penandatangan"
 
-#: smime/gui/smime-ui.glade.h:25
+#: smime/gui/smime-ui.glade.h:26
 msgid "Expires On"
 msgstr "Tamat Tempoh Pada"
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:29
 msgid "Issued On"
 msgstr "Dikeluarkan Pada"
 
-#: smime/gui/smime-ui.glade.h:29
+#: smime/gui/smime-ui.glade.h:30
 msgid "MD5 Fingerprint"
 msgstr "Cap jari MD5"
 
-#: smime/gui/smime-ui.glade.h:30
+#: smime/gui/smime-ui.glade.h:31
 msgid "Organization (O)"
 msgstr "Organisasi (O)"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:32
 msgid "Organizational Unit (OU)"
 msgstr "Unit Organisasi (OU)"
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:33
 msgid "SHA1 Fingerprint"
 msgstr "Cap jari SHA1"
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
 msgid "SSL Client Certificate"
 msgstr "Sijil Pelanggan SSL"
 
-#: smime/gui/smime-ui.glade.h:34
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
 msgid "SSL Server Certificate"
 msgstr "Sijil Pelayan SSL"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/gui/smime-ui.glade.h:37
 msgid "Trust this CA to identify email users."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:37
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify software developers."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify web sites."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "View"
 msgstr "Lihat"
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 #, fuzzy
 msgid "View Certificate"
 msgstr "Sijil"
 
-#: smime/gui/smime-ui.glade.h:41
+#: smime/gui/smime-ui.glade.h:42
 #, fuzzy
 msgid "You have been asked to trust a new Certificate Authority (CA)."
 msgstr "Kuasa Sijil Tak Sah (CA)"
 
-#: smime/gui/smime-ui.glade.h:42
+#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Anda mempunyai sijil daripada organisasi ini yang mengecam anda:"
 
-#: smime/gui/smime-ui.glade.h:43
+#: smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "Anda mempunyai sijil pada fail yang mengecam kesahihan sijil ini:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr "Anda mempunyai sijil pada fail yang mengecam orang-orang ini:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
 msgstr "Sijil Anda"
 
-#: smime/lib/e-cert-db.c:443
+#: smime/lib/e-cert-db.c:494
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "ID Kenalan telah wujud"
 
+#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
+
+#: smime/lib/e-cert.c:473
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
+
+#: smime/lib/e-cert.c:488
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:491
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:494
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermillion"
+
+#: smime/lib/e-cert.c:576
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:579
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:582
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:585
+#, fuzzy
+msgid "C"
+msgstr " C"
+
+#: smime/lib/e-cert.c:588
+#, fuzzy
+msgid "CN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:591
+msgid "OU"
+msgstr ""
+
+#: smime/lib/e-cert.c:594
+#, fuzzy
+msgid "O"
+msgstr "OK"
+
+#: smime/lib/e-cert.c:597
+msgid "L"
+msgstr ""
+
+#: smime/lib/e-cert.c:600
+#, fuzzy
+msgid "DN"
+msgstr "N"
+
+#: smime/lib/e-cert.c:603
+msgid "DC"
+msgstr ""
+
+#: smime/lib/e-cert.c:606
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
+
+#: smime/lib/e-cert.c:609
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: smime/lib/e-cert.c:612
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "Nama Sijil"
+
+#: smime/lib/e-cert.c:615
+#, fuzzy
+msgid "Netscape Certificate Type"
+msgstr "Nama Sijil"
+
+#: smime/lib/e-cert.c:618
+#, fuzzy
+msgid "Certificate Authority Key Identifier"
+msgstr "Sijil tak dipercayai"
+
+#: smime/lib/e-cert.c:621
+#, fuzzy
+msgid "UID"
+msgstr "ID"
+
+#: smime/lib/e-cert.c:630
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: smime/lib/e-cert.c:681
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: smime/lib/e-cert.c:689
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: smime/lib/e-cert.c:711
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: smime/lib/e-cert.c:716
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: smime/lib/e-cert.c:731
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Tajuk adalah %s "
+
+#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Tidak dapat memproses folder spul"
+
+#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+msgid "Object Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:777
+#, fuzzy
+msgid "SSL Certificate Authority"
+msgstr "Kuasa Sijil Tak Sah (CA)"
+
+#: smime/lib/e-cert.c:781
+#, fuzzy
+msgid "Email Certificate Authority"
+msgstr "Kuasa Sijil Tak Sah (CA)"
+
+#: smime/lib/e-cert.c:809
+#, fuzzy
+msgid "Signing"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:813
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Tiada Maklumat"
+
+#: smime/lib/e-cert.c:817
+msgid "Key Encipherment"
+msgstr ""
+
+#: smime/lib/e-cert.c:821
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "lampiran"
+
+#: smime/lib/e-cert.c:825
+msgid "Key Agreement"
+msgstr ""
+
+#: smime/lib/e-cert.c:829
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "Nama Sijil"
+
+#: smime/lib/e-cert.c:833
+msgid "CRL Signer"
+msgstr ""
+
+#: smime/lib/e-cert.c:881
+#, fuzzy
+msgid "Critical"
+msgstr "Curitiba"
+
+#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Not Critical"
+msgstr "Carolina Utara"
+
+#: smime/lib/e-cert.c:907
+#, fuzzy
+msgid "Extensions"
+msgstr "Ungkapan"
+
+#: smime/lib/e-cert.c:978
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s semasa %s"
+
+#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#, fuzzy
+msgid "Certificate Signature Algorithm"
+msgstr "Kegagalan tandatangan sijil"
+
+#: smime/lib/e-cert.c:1043
+#, fuzzy
+msgid "Issuer"
+msgstr "Dikeluarkan Pada"
+
+#: smime/lib/e-cert.c:1097
+#, fuzzy
+msgid "Issuer Unique ID"
+msgstr "ID Unik"
+
+#: smime/lib/e-cert.c:1116
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "ID Unik"
+
+#: smime/lib/e-cert.c:1159
+#, fuzzy
+msgid "Certificate Signature Value"
+msgstr "Kegagalan tandatangan sijil"
+
+#: smime/lib/e-pkcs12.c:246
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: smime/lib/e-pkcs12.c:246
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Masukkan Kata Laluan bagi %s"
+
+#: smime/lib/e-pkcs12.c:379
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "Sijil Anda"
+
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
 msgstr "Lampiran yang akan ditambahkan."
@@ -14912,7 +16101,7 @@ msgid "Previews the contacts to be printed"
 msgstr "Pralihat kenalan yang akan dicetak"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:22
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:77
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:79
 #: ui/evolution-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Pralihat Ce_takan"
@@ -14961,7 +16150,7 @@ msgstr "Lihat kenalan semasa"
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:105
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:23
 msgid "_Actions"
@@ -15370,7 +16559,7 @@ msgstr "Tandakan Semua sebagai _Dibaca"
 msgid "Mark all visible messages as read"
 msgstr "Tandakan semua mesej yang dapat dilihat sebagai telah dibaca"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
 msgid "Paste message(s) from the clipboard"
 msgstr "Tampal mesej daripada papan keratan"
 
@@ -15422,10 +16611,6 @@ msgstr "_Folder"
 msgid "_Invert Selection"
 msgstr "_Songsangkan Pemilihan"
 
-#: ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Ciri-ciri..."
-
 #: ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr "_Senarai Mesej yang Disambungkan"
@@ -15586,261 +16771,266 @@ msgstr "Sampaikan mesej yang dipilih kepada seseorang sebagai lampiran"
 msgid "Increase the text size"
 msgstr "Tambahkan saiz teks"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:47
 msgid "Load _Images"
 msgstr "Muatkan _Imej"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark as I_mportant"
 msgstr "Tandakan sebagai P_enting"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark as U_nread"
 msgstr "Tandakan sebagai B_elum Dibaca"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as Unimp_ortant"
 msgstr "Tandakan sebagai Tida_k Penting"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as having been read"
 msgstr "Tandakan mesej yang dipilih sebagai telah dibaca"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as important"
 msgstr "Tandakan mesej yang dipilih sebagai penting"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Mark the selected message(s) as junk"
 msgstr "Tandakan mesej yang dipilih sebagai tidak penting"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Tandakan mesej yang dipilih sebagai belum dibaca"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Tandakan mesej yang dipilih sebagai belum dibaca"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Tandakan mesej yang dipilih sebagai tidak penting"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected messages for deletion"
 msgstr "Tandakan mesej yang dipilih untuk dihapuskan"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move"
 msgstr "Alihkan"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:62
 msgid "Move selected message(s) to another folder"
 msgstr "Alihkan mesej yang dipilih ke folder lain"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next"
 msgstr "Seterusnya"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Important Message"
 msgstr "Mesej _Penting Seterusnya"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Thread"
 msgstr "Bebenang _Seterusnya"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Unread Message"
 msgstr "Mesej _Belum Dibaca Seterusnya"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Not Junk"
+msgstr "Tidak dijumpai"
+
+#: ui/evolution-mail-message.xml.h:68
 msgid "Open the selected message in a new window"
 msgstr "Buka mesej yang dipilih dalam tetingkap baru"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Buka mesej yang dipilih dalam penggubah untuk menghantarnya semula"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Original Si_ze"
 msgstr "Saiz As_al"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "P_revious Unread Message"
 msgstr "Mesej Belum Dibaca Sebelumnya"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "Post a Repl_y"
 msgstr "Kirimkan Balas_an"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:74
 msgid "Post a reply to a message in a Public folder"
 msgstr "Kirimkan balasan bagi mesej dalam Folder Awam"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 msgid "Pr_evious Important Message"
 msgstr "Mesej Penting Se_belumnya"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Preview the message to be printed"
 msgstr "Pralihat mesej yang akan dicetak"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Print this message"
 msgstr "Cetak mesej ini"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Re_direct"
 msgstr "Hantar _semula"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Hantar semula (lantun) mesej yang dipilih kepada seseorang"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reset the text to its original size"
 msgstr "Set semula teks kepada saiznya yang asal"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "S_earch in Message..."
 msgstr "C_ari dalam Mesej..."
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "S_maller"
 msgstr "L_ebih kecil"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "Save the message as a text file"
 msgstr "Simpan mesej sebagai fail teks"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Cari teks dalam badan mesej yang dipaparkan"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "Sediakan seting halaman bagi pencetak semasa anda"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show Email _Source"
 msgstr "Tunjukkan Sumber _E-mel"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show Full _Headers"
 msgstr "Tunjukkan Pengepala _Penuh"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Tunjukkan kursor berkelip-kelip dalam badan mesej yang dipaparkan"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Tunjukkan mesej dalam gaya normal"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Tunjukkan mesej dengan semua pengepala e-mel"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Tunjukkan sumber e-mel mentah bagi mesej"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Text Si_ze"
 msgstr "Saiz Te_ks"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Un-delete the selected messages"
 msgstr "Batalkan hapus mesej yang dipilih"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder bagi Senarai _Mel..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on Se_nder..."
 msgstr "VFolder bagi Pe_nghantar..."
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on _Recipients..."
 msgstr "VFolder bagi _Penerima..."
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on _Subject..."
 msgstr "VFolder bagi _Tajuk"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Attached"
 msgstr "_Dilampirkan"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Copy to Folder"
 msgstr "_Salin ke Folder"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Create Filter From Message"
 msgstr "_Wujudkan Penapis Daripada Mesej"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Forward Message"
 msgstr "_Sampaikan Mesej"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Go To"
 msgstr "_Pergi Ke"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "_Dalam Talian"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Larger"
 msgstr "_Lebih Besar"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Message Display"
 msgstr "_Paparan Mesej"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Move to Folder"
 msgstr "_Alihkan ke Folder"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Next Message"
 msgstr "_Mesej Seterusnya"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Normal Display"
 msgstr "_Paparan Normal"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Open Message"
 msgstr "_Buka Mesej"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Previous Message"
 msgstr "_Mesej Sebelumnya"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Quoted"
 msgstr "_Disebut"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:125
 msgid "_Resend..."
 msgstr "_Hantar semula..."
 
-#: ui/evolution-mail-message.xml.h:125 ui/evolution.xml.h:31
+#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Alatan"
 
-#: ui/evolution-mail-message.xml.h:126
+#: ui/evolution-mail-message.xml.h:128
 msgid "_Undelete"
 msgstr "_Batalkan hapus"
 
@@ -15854,11 +17044,6 @@ msgstr "Tutup tetingkap ini"
 msgid "_Close"
 msgstr "_Tutup"
 
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:32
-msgid "_View"
-msgstr "_Lihat"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Lampirkan"
@@ -16432,10 +17617,6 @@ msgstr "Ukranian"
 msgid "Visual"
 msgstr "Tampak"
 
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Baru"
-
 #: widgets/misc/e-charset-picker.c:168
 #, c-format
 msgid "Unknown character set: %s"
@@ -16507,6 +17688,125 @@ msgstr "Teks"
 msgid "Find _Now"
 msgstr "Cari Sekarang"
 
+#~ msgid "Configure access to LDAP directory servers here"
+#~ msgstr "Buat konfigurasi capaian ke pelayan direktori LDAP di sini"
+
+#~ msgid "Directory Servers"
+#~ msgstr "Pelayan Direktori"
+
+#~ msgid "Evolution Addressbook LDAP Configuration Control"
+#~ msgstr "Kawalan Konfigurasi LDAP Buku Alamat Evolution"
+
+#~ msgid "Account Name"
+#~ msgstr "Nama Akaun"
+
+#~ msgid "Server Name"
+#~ msgstr "Nama Pelayan"
+
+#~ msgid "LDAP was not enabled in this build of Evolution"
+#~ msgstr "LDAP tidak dibolehkan dalam binaan Evolution ini"
+
+#~ msgid "Other Contacts"
+#~ msgstr "Kenalan Lain"
+
+#~ msgid "Add LDAP Server"
+#~ msgstr "Tambahkan Pelayan LDAP"
+
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Langkah 4: Paparkan Nama"
+
+#~ msgid "Find contact in"
+#~ msgstr "Cari kenalan dalam"
+
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Klik di sini untuk menambahkan kenalan *"
+
+#~ msgid "Business Address"
+#~ msgstr "Alamat Perniagaan"
+
+#~ msgid "Department"
+#~ msgstr "Jabatan"
+
+#~ msgid "Free-busy URL"
+#~ msgstr "URL Bebas-sibuk"
+
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
+
+#~ msgid "Profession"
+#~ msgstr "Profesion"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Send anyway?"
+#~ msgstr "Tetap hantarkan?"
+
+#~ msgid "Folder _name"
+#~ msgstr "Nama _folder"
+
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Mesej ini ditandatangani secara digital. Klik ikon kunci untuk keterangan "
+#~ "lanjut."
+
+#~ msgid "Add a Folder"
+#~ msgstr "Tambahkan Folder"
+
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ralat ketika menyegerakkan \"%s\":\n"
+#~ "%s"
+
+#~ msgid "Syncing Folder"
+#~ msgstr "Menyegerakkan Folder"
+
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Sedang menyegerakkan \"%s\" (%d daripada %d)..."
+
+#~ msgid "CORBA error"
+#~ msgstr "Ralat CORBA"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Argumen tak sah"
+
+#~ msgid "Already has an owner"
+#~ msgstr "Sudah mempunyai pemilik"
+
+#~ msgid "No owner"
+#~ msgstr "Tiada pemilik"
+
+#~ msgid "Unsupported type"
+#~ msgstr "Jenis yang tidak disokong"
+
+#~ msgid "Unsupported schema"
+#~ msgstr "Skema yang tidak disokong"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Pengendalian yang tidak disokong"
+
+#~ msgid "Internal error"
+#~ msgstr "Ralat dalaman"
+
+#~ msgid "Exists"
+#~ msgstr "Wujud"
+
+#~ msgid "Invalid URI"
+#~ msgstr "URI tak sah"
+
+#~ msgid "Has subfolders"
+#~ msgstr "Mempunyai subfolder"
+
+#~ msgid "No space left"
+#~ msgstr "Tiada lagi ruang"
+
+#~ msgid "Old owner has died"
+#~ msgstr "Pemilik lama telah meninggal dunia"
+
 #~ msgid "e_book_add_contact called on book before e_book_load_uri"
 #~ msgstr "e_book_add_contact dipanggil dalam buku sebelum e_book_load_uri"
 
@@ -16594,15 +17894,6 @@ msgstr "Cari Sekarang"
 #~ msgid "e_book_load_uri: Could not create EBookListener"
 #~ msgstr "e_book_load_uri: Tidak dapat mewujudkan PendengarEBook"
 
-#~ msgid "Unique ID"
-#~ msgstr "ID Unik"
-
-#~ msgid "Given Name"
-#~ msgstr "Nama Diberi"
-
-#~ msgid "Family Name"
-#~ msgstr "Nama Keluarga"
-
 #~ msgid "Address List"
 #~ msgstr "Senarai Alamat"
 
@@ -16696,9 +17987,6 @@ msgstr "Cari Sekarang"
 #~ msgid "VCard (.vcf, .gcrd)"
 #~ msgstr "VCard (.vcf, .gcrd)"
 
-#~ msgid "Loading..."
-#~ msgstr "Sedang memuatkan..."
-
 #~ msgid "Searching..."
 #~ msgstr "Sedang mencari..."
 
@@ -16869,15 +18157,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Could not open source folder: %s"
 #~ msgstr "Tidak dapat membuka folder sumber: %s"
 
-#~ msgid "Could not create temporary mbox store: %s"
-#~ msgstr "Tidak dapat mewujudkan stor mbox sementara: %s"
-
-#~ msgid "Could not create temporary mbox folder: %s"
-#~ msgstr "Tidak dapat mewujudkan folder mbox sementara: %s"
-
-#~ msgid "Could not copy messages to temporary mbox folder: %s"
-#~ msgstr "Tidak dapat menyalin mesej ke folder mbox sementara: %s"
-
 #~ msgid ""
 #~ "Some of your mail settings seem corrupt, please check that everything is "
 #~ "in order."
@@ -16885,40 +18164,12 @@ msgstr "Cari Sekarang"
 #~ "Beberapa seting mel anda tampaknya rosak, sila semak untuk memastikan "
 #~ "semuanya dalam keadaan baik."
 
-#~ msgid "Select destination to copy folder into"
-#~ msgstr "Pilih destinasi untuk folder ini disalin"
-
 #~ msgid "Select destination to move folder into"
 #~ msgstr "Pilih destinasi untuk folder ini dialih"
 
-#~ msgid "Create folder"
-#~ msgstr "Wujudkan folder"
-
-#~ msgid "Could not delete folder: %s"
-#~ msgstr "Tidak dapat menghapuskan folder: %s"
-
-#~ msgid "Really delete folder \"%s\" and all of its subfolders?"
-#~ msgstr ""
-#~ "Anda pasti ingin menghapuskan folder \"%s\" dan semua subfolder dalamnya?"
-
 #~ msgid "A folder named \"%s\" already exists.  Please use a different name."
 #~ msgstr "Folder bernama \"%s\" telah wujud. Sila gunakan nama yang lain."
 
-#~ msgid "Folder properties"
-#~ msgstr "Ciri-ciri Folder"
-
-#~ msgid "Properties"
-#~ msgstr "Ciri-ciri"
-
-#~ msgid "Folder Name"
-#~ msgstr "Nama Folder"
-
-#~ msgid "_Move"
-#~ msgstr "_Alih"
-
-#~ msgid "_New Folder..."
-#~ msgstr "_Folder Baru..."
-
 #~ msgid "Alwa_ys sign outgoing messages when using this account"
 #~ msgstr "Sentia_sa tandatangan mesej keluar apabila menggunakan akaun ini"
 
@@ -16956,23 +18207,6 @@ msgstr "Cari Sekarang"
 #~ msgid "(None)"
 #~ msgstr "(Tiada)"
 
-#~ msgid ""
-#~ "Ximian Evolution is currently online.  Click on this button to work "
-#~ "offline."
-#~ msgstr ""
-#~ "Ximian Evolution dalam talian sekarang.  Klik butang ini untuk bekerja "
-#~ "luar talian."
-
-#~ msgid "Ximian Evolution is in the process of going offline."
-#~ msgstr "Ximian Evolution adalah dalam proses menjadi luar talian."
-
-#~ msgid ""
-#~ "Ximian Evolution is currently offline.  Click on this button to work "
-#~ "online."
-#~ msgstr ""
-#~ "Ximian Evolution luar talian sekarang.  Klik butang ini untuk bekerja "
-#~ "dalam talian."
-
 #~ msgid "A folder with the same name already exists"
 #~ msgstr "Folder dengan nama yang sama telah wujud"
 
@@ -17027,9 +18261,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Create a new all-day event"
 #~ msgstr "Wujudkan perisitiwa baru sepanjang hari"
 
-#~ msgid "Create a new task"
-#~ msgstr "Wujudkan tugas baru"
-
 #~ msgid "New _Appointment"
 #~ msgstr "Temu Janji _Baru"
 
@@ -17072,9 +18303,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Callback"
 #~ msgstr "Panggil balik"
 
-#~ msgid "Company"
-#~ msgstr "Syarikat"
-
 #~ msgid "Comp"
 #~ msgstr "Syarikat"
 
@@ -17141,9 +18369,6 @@ msgstr "Cari Sekarang"
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "Phone"
-#~ msgstr "Telefon"
-
 #~ msgid "Birth date"
 #~ msgstr "Tarikh lahir"
 
@@ -17156,9 +18381,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Arbitrary"
 #~ msgstr "Sebarangan"
 
-#~ msgid "ID"
-#~ msgstr "ID"
-
 #~ msgid "Last Use"
 #~ msgstr "Kali Terakhir Guna"
 
@@ -17171,9 +18393,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Folder containing contact information"
 #~ msgstr "Folder mengandungi maklumat kenalan"
 
-#~ msgid "LDAP Server"
-#~ msgstr "Pelayan LDAP"
-
 #~ msgid "LDAP server containing contact information"
 #~ msgstr "Pelayan LDAP mengandungi maklumat kenalan"
 
@@ -17198,9 +18417,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Is New Card"
 #~ msgstr "Ialah Kad Baru"
 
-#~ msgid "TTY/TDD"
-#~ msgstr "TTY/TDD"
-
 #~ msgid "No cards"
 #~ msgstr "Tiada kad"
 
@@ -17250,12 +18466,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Folder awam mengandungi item yang perlu dibuat"
 
-#~ msgid "New task"
-#~ msgstr "Tugas baru"
-
-#~ msgid "_Task"
-#~ msgstr "_Tugas"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Tidak dapat mengemaskinikan objek tak sah"
 
@@ -17286,9 +18496,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Opening calendar at %s"
 #~ msgstr "Membuka kalendar pada %s"
 
-#~ msgid "Opening default tasks folder"
-#~ msgstr "Membuka folder tugas piawai"
-
 #, fuzzy
 #~ msgid "Purging event %s"
 #~ msgstr "%s berdenting"
@@ -17330,9 +18537,6 @@ msgstr "Cari Sekarang"
 #~ "Evolution telah menjumpai fail GnomeCard.\n"
 #~ "Adakah anda ingin mengimportnya ke dalam Evolution?"
 
-#~ msgid "Evolution Mail configuration interface"
-#~ msgstr "Antara muka konfigurasi Mel Evolution"
-
 #~ msgid "Folder containing mail"
 #~ msgstr "Folder yang mengandungi mel"
 
@@ -17348,9 +18552,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Virtual Trash folder"
 #~ msgstr "Folder Sampah Maya"
 
-#~ msgid "Properties..."
-#~ msgstr "Ciri-ciri..."
-
 #~ msgid "Change this folder's properties"
 #~ msgstr "Ubah ciri-ciri folder ini"
 
@@ -19204,9 +20405,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Cumberland"
 #~ msgstr "Cumberland"
 
-#~ msgid "Curitiba"
-#~ msgstr "Curitiba"
-
 #~ msgid "Curitiba Apt"
 #~ msgstr "Curitiba Apt"
 
@@ -22198,9 +23396,6 @@ msgstr "Cari Sekarang"
 #~ msgid "North Bend"
 #~ msgstr "North Bend"
 
-#~ msgid "North Carolina"
-#~ msgstr "Carolina Utara"
-
 #~ msgid "North Conway"
 #~ msgstr "Conway Utara"
 
@@ -23812,9 +25007,6 @@ msgstr "Cari Sekarang"
 #~ msgid "State College"
 #~ msgstr "State College"
 
-#~ msgid "Stauning"
-#~ msgstr "Stauning"
-
 #~ msgid "Staunton"
 #~ msgstr "Staunton"
 
@@ -24406,9 +25598,6 @@ msgstr "Cari Sekarang"
 #~ msgid "United Arab Emirates "
 #~ msgstr "Emiriyah Arab Bersatu"
 
-#~ msgid "Unst"
-#~ msgstr "Unst"
-
 #~ msgid "Upington"
 #~ msgstr "Upington"
 
@@ -24517,12 +25706,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Veracruz"
 #~ msgstr "Veracruz"
 
-#~ msgid "Vermillion"
-#~ msgstr "Vermillion"
-
-#~ msgid "Vermont"
-#~ msgstr "Vermont"
-
 #~ msgid "Vernal"
 #~ msgstr "Vernal"
 
@@ -25054,9 +26237,6 @@ msgstr "Cari Sekarang"
 #~ msgid " F"
 #~ msgstr " F"
 
-#~ msgid " C"
-#~ msgstr " C"
-
 #~ msgid "knots"
 #~ msgstr "simpulan"
 
@@ -26047,12 +27227,6 @@ msgstr "Cari Sekarang"
 #~ msgstr ""
 #~ "Keluarkan folder yang ditambahkan dengan \"Buka Folder Pengguna Lain\""
 
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "Toggle sama ada ingin menunjukkan bar folder atau tidak"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "Toggle sama ada ingin menunjukkan bar jalan pintas atau tidak"
-
 #~ msgid "View the selected folder"
 #~ msgstr "Lihat folder yang dipilih"
 
@@ -26167,9 +27341,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Font Preferences"
 #~ msgstr "Keutamaan Fon"
 
-#~ msgid "Automatically _detect links"
-#~ msgstr "_Kesan pautan secara automatik"
-
 #~ msgid "Emacs"
 #~ msgstr "Akaun e-mel"