Updated initial Malay Translation by MIMOS Open Source Development Group

2003-11-18  Hasbullah Bin Pit <sebol@ikhlas.com>

        * ms.po: Updated initial Malay Translation by
        MIMOS Open Source Development Group <ismas@mimos.my>

svn path=/trunk/; revision=23433

2 files changed, 1765 insertions, 1700 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 6029dbeb3c..6301f694ea 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-18  Hasbullah Bin Pit <sebol@ikhlas.com>
+
+	* ms.po: Updated initial Malay Translation by
+	MIMOS Open Source Development Group <ismas@mimos.my>
+
 2003-11-17  Arkadiusz Lipiec <arkadiusz.lipiec@gazeta.pl>
 
 	* pl.po: Updated Polish translation
diff --git a/po/ms.po b/po/ms.po
index 5936c130a6..36b9742c0d 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,9 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution HEAD\n"
-"POT-Creation-Date: 2003-11-07 01:11-0500\n"
-"PO-Revision-Date: 2003-07-21 08:00+0800\n"
-"Last-Translator: Mimos Open Source Development Group <syed@mimos.my>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-11-19 11:10+0800\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"
@@ -20,15 +21,140 @@ msgstr "Alamat Segerak Piawai:"
 
 #: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
-#, fuzzy
 msgid "Could not load addressbook"
-msgstr "Tidak dapat memuatkan %s %s"
+msgstr "Tidak dapat memuatkan buku alamat"
 
 #: addressbook/conduit/address-conduit.c:1214
 #: addressbook/conduit/address-conduit.c:1217
 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
+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"
+
+#. 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/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
+msgid "Evolution Addressbook address viewer"
+msgstr "Pelihat alamat Buku Alamat Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook card viewer"
+msgstr "Pelihat kad Buku Alamat Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook component"
+msgstr "Komponen Buku Alamat Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook folder viewer"
+msgstr "Pelihat folder Buku Alamat Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Kawalan Pengurusan Sijil S/Mime 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
+#, fuzzy
+msgid "New Addressbook"
+msgstr "Buku Alamat"
+
+#: addressbook/gui/component/addressbook-component.c:126
+#: 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
+#: 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
+#, fuzzy
+msgid "Rename"
+msgstr "_Namakan semula"
+
+#: addressbook/gui/component/addressbook-component.c:185
+#, fuzzy
+msgid "New Contact"
+msgstr "Kenalan Baru:"
+
+#: addressbook/gui/component/addressbook-component.c:186
+msgid "_Contact"
+msgstr "_Kenalan"
+
+#: addressbook/gui/component/addressbook-component.c:187
+msgid "Create a new contact"
+msgstr "Wujudkan kenalan baru"
+
+#: addressbook/gui/component/addressbook-component.c:192
+msgid "New Contact List"
+msgstr "Senarai Kenalan Baru"
+
+#: addressbook/gui/component/addressbook-component.c:193
+#, fuzzy
+msgid "Contact _List"
+msgstr "Senarai Kenalan Baru"
+
+#: addressbook/gui/component/addressbook-component.c:194
+msgid "Create a new contact list"
+msgstr "Wujudkan senarai kenalan baru"
+
+#: addressbook/gui/component/addressbook-component.c:336
+#: calendar/gui/calendar-component.c:639
+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
+#: 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
+#: shell/e-config-upgrade.c:1455
+msgid "Work"
+msgstr "Kerja"
+
 #: addressbook/gui/component/addressbook-config.c:205
 msgid "Failed to connect to LDAP server"
 msgstr "Gagal disambungkan ke pelayan LDAP"
@@ -200,70 +326,8 @@ msgid "Any Category"
 msgstr "Sebarang Kategori"
 
 #: addressbook/gui/component/addressbook.c:1102
-#, fuzzy
 msgid "URI of the contacts that the control will display"
-msgstr "URI yang akan dipaparkan oleh kalendar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Certificates"
-msgstr "_ID 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"
-
-#. 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/tools/evolution-addressbook-export-list-folders.c:51
-#: mail/importers/netscape-importer.c:1844 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1087
-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
-msgid "Evolution Addressbook address viewer"
-msgstr "Pemandang alamat Buku Alamat Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Pemandang kad Buku Alamat Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Komponen Buku Alamat Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook folder viewer"
-msgstr "Pemandang folder Buku Alamat Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Kawalan keutamaan Mel Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+msgstr "URI bagi kenalan yang akan dipaparkan oleh kawalan"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
@@ -361,9 +425,8 @@ msgid "Edit LDAP Server"
 msgstr "Edit Pelayan LDAP"
 
 #: addressbook/gui/component/ldap-config.glade.h:22
-#, fuzzy
 msgid "Email address:"
-msgstr "Alamat _e-mel:"
+msgstr "Alamat e-mel:"
 
 #: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Evolution will use this DN to authenticate you with the server"
@@ -383,7 +446,7 @@ msgstr "Selesai"
 
 #: addressbook/gui/component/ldap-config.glade.h:26
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:20
+#: smime/gui/smime-ui.glade.h:26
 msgid "General"
 msgstr "Am"
 
@@ -422,7 +485,7 @@ 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/gnome-cal.c:587
+#: calendar/gui/gnome-cal.c:585
 msgid "Searching"
 msgstr "Sedang mencari"
 
@@ -552,7 +615,6 @@ msgstr ""
 "pepohon direktori."
 
 #: addressbook/gui/component/ldap-config.glade.h:61
-#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -568,7 +630,6 @@ msgstr ""
 "asas anda.\n"
 
 #: addressbook/gui/component/ldap-config.glade.h:65
-#, fuzzy
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -578,11 +639,11 @@ msgid ""
 "this information."
 msgstr ""
 "Pembantu ini akan membantu anda mencapai khidmat direktori dalam talian\n"
-"dengan menggunakan pelayan LDAP (Protokol Capai Direktori Ringan). \n"
+"dengan menggunakan pelayan LDAP (Lightweight Directory Access Protocol). \n"
 "\n"
-"Menambahkan pelayan LDAP baru memerlukan maklumat khas\n"
-"tentang pelayan. Sila hubungi pentadbir sistem anda jika anda \n"
-"memerlukan bantuan untuk mendapatkan maklumat ini."
+"Menambahkan pelayan LDAP baru memerlukan maklumat khas tentang pelayan. Sila "
+"hubungi pentadbir sistem anda jika anda memerlukan bantuan untuk mendapatkan "
+"maklumat ini."
 
 #: addressbook/gui/component/ldap-config.glade.h:69
 msgid ""
@@ -663,7 +724,7 @@ 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
-#: ui/evolution-calendar.xml.h:45 ui/evolution-composer-entries.xml.h:8
+#: 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
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
@@ -707,11 +768,9 @@ msgstr "tab am"
 msgid "searching-tab"
 msgstr "tab cari"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Nama"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Antara muka pemilihan nama Buku Alamat Evolution"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:205
 msgid "Remove All"
@@ -745,6 +804,12 @@ msgstr "Tambahkan Kenalan"
 msgid "Unnamed Contact"
 msgstr "Kenalan Tanpa Nama"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Nama"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 msgid "Source"
@@ -758,10 +823,6 @@ msgstr "Pilih Kenalan daripada Buku Alamat"
 msgid "Find contact in"
 msgstr "Cari kenalan dalam"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Antara muka pemilihan nama Buku Alamat Evolution"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Find"
 msgstr "Cari"
@@ -795,14 +856,12 @@ msgid "_Folder:"
 msgstr "_Folder:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
-#, fuzzy
 msgid " B_usiness:"
-msgstr "Perniagaan"
+msgstr "P_erniagaan:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-#, fuzzy
 msgid "A_ddress..."
-msgstr "Ala_mat..."
+msgstr "A_lamat..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "A_ssistant's name:"
@@ -817,14 +876,12 @@ msgid "Birthda_y:"
 msgstr "Hari lahi_r:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#, fuzzy
 msgid "Blog address:"
-msgstr "Alamat _e-mel:"
+msgstr "Alamat blog:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#, fuzzy
 msgid "Business fa_x:"
-msgstr "Faks Perniagaan"
+msgstr "Fa_ks perniagaan:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "Collaboration"
@@ -841,7 +898,7 @@ 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:15
+#: calendar/gui/dialogs/task-editor.c:201 smime/gui/smime-ui.glade.h:18
 msgid "Details"
 msgstr "Perincian"
 
@@ -850,9 +907,8 @@ msgid "F_ree/Busy URL:"
 msgstr "U_RL Bebas/Sibuk:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
-#, fuzzy
 msgid "File a_s:"
-msgstr "Failkan S_ebagai:"
+msgstr "Failkan s_ebagai:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Full _Name..."
@@ -885,9 +941,8 @@ msgid "P_rofession:"
 msgstr "P_rofesion:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
-#, fuzzy
 msgid "Primary _email:"
-msgstr "E-mel Utama"
+msgstr "_E-mel primer:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "S_pouse:"
@@ -902,44 +957,38 @@ msgid "_Add"
 msgstr "_Tambah"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
 msgid "_Business:"
-msgstr "Perniagaan"
+msgstr "_Perniagaan:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#, fuzzy
 msgid "_Categories..."
-msgstr "Ka_tegori..."
+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:681
-#: mail/mail-component.c:2088 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:104
-#: ui/evolution-tasks.xml.h:18
+#: 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
 msgid "_Delete"
 msgstr "_Hapus"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#, fuzzy
 msgid "_Home:"
-msgstr "Rumah"
+msgstr "_Rumah:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "_Gelaran jawatan:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
-#, fuzzy
 msgid "_Manager's name:"
-msgstr "_Nama Pengurus:"
+msgstr "_Nama pengurus:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#, fuzzy
 msgid "_Mobile:"
-msgstr "Telefon Bimbit"
+msgstr "_Telefon Bimbit:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Nickname:"
@@ -954,9 +1003,8 @@ msgid "_Public Calendar URL:"
 msgstr "_URL Kalendar Awam:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-#, fuzzy
 msgid "_This is the mailing address"
-msgstr "Ini _alamat mel"
+msgstr "_Ini merupakan alamat surat menyurat"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Web page address:"
@@ -1930,9 +1978,8 @@ msgid "Contact"
 msgstr "Kenalan"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:198
-#, fuzzy
 msgid "Is New Contact"
-msgstr "Kenalan Baru"
+msgstr "Merupakan Kenalan Baru"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:205
 msgid "Writable Fields"
@@ -1992,28 +2039,24 @@ msgid "Contact Quick-Add"
 msgstr "Tambah Cepat Kenalan"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:293
-#, fuzzy
 msgid "_Edit Full"
-msgstr "Edit Penuh "
+msgstr "_Edit Penuh "
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#, fuzzy
 msgid "_Full Name:"
-msgstr "_Nama penuh:"
+msgstr "_Nama Penuh:"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:317
-#, fuzzy
 msgid "E-_mail:"
-msgstr "E-mel"
+msgstr "E-mel:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Alamat _2:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:3
-#, fuzzy
 msgid "Ci_ty:"
-msgstr "_Bandar:"
+msgstr "Ba_ndar:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
@@ -2117,14 +2160,12 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Sembunyikan alamat apabila menghantar mel ke senarai ini"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#, fuzzy
 msgid "_List name:"
-msgstr "Senaraikan _nama:"
+msgstr "Nama _senarai:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-#, fuzzy
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "Taip alamat e-mel atau seret kenalan ke dalam senarai di bawah:"
+msgstr "_Taip alamat e-mel atau seret kenalan ke dalam senarai di bawah:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "contact-list-editor"
@@ -2143,11 +2184,27 @@ msgstr "Editor Senarai Kenalan"
 msgid "Save List as VCard"
 msgstr "Simpan Senarai sebagai VCard"
 
-#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Kenalan Diubah:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Kenalan Bercanggah:"
+
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Duplikasi Kenalan Dikesan"
 
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"E-mel atau nama kenalan ini yang diubah sudah\n"
+"ada dalam folder ini.  Adakah anda tetap ingin menambahnya?"
+
 #: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Kenalan Baru:"
@@ -2164,22 +2221,6 @@ msgstr ""
 "Nama atau alamat e-mel kenalan ini telah wujud\n"
 "dalam folder ini. Adakah anda tetap ingin menambahnya?"
 
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Kenalan Diubah:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Kenalan Bercanggah:"
-
-#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"E-mel atau nama kenalan ini yang diubah sudah\n"
-"ada dalam folder ini.  Adakah anda tetap ingin menambahnya?"
-
 #. FIXME: get the toplevel window...
 #: addressbook/gui/search/e-addressbook-search-dialog.c:116
 #: widgets/misc/e-filter-bar.c:148
@@ -2187,19 +2228,17 @@ msgid "Advanced Search"
 msgstr "Carian Lanjutan"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:148
-#, fuzzy
 msgid "No contacts"
-msgstr "Tunjukkan Kenalan"
+msgstr "Tiada kenalan"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy
 msgid "1 contact"
-msgstr "Kenalan"
+msgstr "1 kenalan"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:154
-#, fuzzy, c-format
+#, c-format
 msgid "%d contacts"
-msgstr "Kenalan"
+msgstr "%d kenalan"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:305
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
@@ -2280,7 +2319,7 @@ msgstr "Hantar Mesej kepada Kenalan"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:897 calendar/gui/print.c:2453
 #: 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:72
+#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:76
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Cetak"
@@ -2313,14 +2352,6 @@ msgstr "Salin"
 msgid "Paste"
 msgstr "Tampal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: calendar/gui/calendar-component.c:206 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/widgets/e-addressbook-view.c:914
 #: calendar/gui/e-cal-view.c:1265
 msgid "Current View"
@@ -2575,38 +2606,32 @@ msgstr "Mempunyai Kursor"
 
 #: addressbook/gui/widgets/eab-contact-display.c:93
 #: addressbook/gui/widgets/eab-contact-display.c:114
-#, fuzzy
 msgid "Map It"
-msgstr "Mayport"
+msgstr "Petakannya"
 
 #: addressbook/gui/widgets/eab-contact-display.c:198
 #: addressbook/gui/widgets/eab-contact-display.c:324
-#, fuzzy
 msgid "List Members"
-msgstr "Ahli"
+msgstr "Senaraikan Ahli"
 
 #: addressbook/gui/widgets/eab-contact-display.c:214
 #: addressbook/gui/widgets/eab-contact-display.c:344
-#, fuzzy
 msgid "Job Title"
-msgstr "_Gelaran jawatan:"
+msgstr "Gelaran Jawatan"
 
 #: addressbook/gui/widgets/eab-contact-display.c:222
-#, fuzzy
 msgid "Work Address"
-msgstr "Alamat Rumah"
+msgstr "Alamat Tempat Kerja"
 
 #: addressbook/gui/widgets/eab-contact-display.c:227
 #: addressbook/gui/widgets/eab-contact-display.c:375
-#, fuzzy
 msgid "Home page"
-msgstr "Faks Rumah"
+msgstr "Laman web"
 
 #: addressbook/gui/widgets/eab-contact-display.c:228
 #: addressbook/gui/widgets/eab-contact-display.c:383
-#, fuzzy
 msgid "Blog"
-msgstr "Bologna"
+msgstr "Blog"
 
 #: addressbook/gui/widgets/eab-gui-util.c:45
 #: shell/evolution-shell-component.c:1183
@@ -2617,8 +2642,8 @@ msgstr "Berjaya"
 #: 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:914
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1222
+#: camel/providers/pop3/camel-pop3-store.c:543 shell/e-shell.c:995
+#: shell/evolution-shell-component.c:1222
 msgid "Unknown error"
 msgstr "Ralat tak diketahui"
 
@@ -2626,20 +2651,18 @@ msgstr "Ralat tak diketahui"
 msgid "Repository offline"
 msgstr "Repositori luar talian"
 
-#: addressbook/gui/widgets/eab-gui-util.c:48 shell/e-storage.c:587
+#: addressbook/gui/widgets/eab-gui-util.c:48
 #: shell/evolution-shell-component.c:1213
 msgid "Permission denied"
 msgstr "Kebenaran dinafikan"
 
 #: addressbook/gui/widgets/eab-gui-util.c:49
-#, fuzzy
 msgid "Contact not found"
-msgstr "Kad tidak dijumpai"
+msgstr "Kenalan tidak dijumpai"
 
 #: addressbook/gui/widgets/eab-gui-util.c:50
-#, fuzzy
 msgid "Contact ID already exists"
-msgstr "ID Kad telah wujud"
+msgstr "ID Kenalan telah wujud"
 
 #: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Protocol not supported"
@@ -2647,8 +2670,8 @@ msgstr "Protokol tidak disokong"
 
 #: addressbook/gui/widgets/eab-gui-util.c:52
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:604
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-tasks.c:211
+#: 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
 #: camel/camel-service.c:772 camel/camel-service.c:856
 #: camel/camel-service.c:896 camel/providers/pop3/camel-pop3-store.c:453
@@ -2690,18 +2713,16 @@ msgstr "Ralat ketika menambahkan senarai"
 
 #: addressbook/gui/widgets/eab-gui-util.c:105
 #: addressbook/gui/widgets/eab-gui-util.c:459
-#, fuzzy
 msgid "Error adding contact"
-msgstr "Ralat ketika menambahkan kad"
+msgstr "Ralat ketika menambahkan kenalan"
 
 #: addressbook/gui/widgets/eab-gui-util.c:114
 msgid "Error modifying list"
 msgstr "Ralat ketika mengubahsuaikan senarai"
 
 #: addressbook/gui/widgets/eab-gui-util.c:114
-#, fuzzy
 msgid "Error modifying contact"
-msgstr "Ralat ketika mengubah suai kad"
+msgstr "Ralat ketika mengubah suai kenalan"
 
 #: addressbook/gui/widgets/eab-gui-util.c:124
 msgid "Error removing list"
@@ -2709,18 +2730,17 @@ msgstr "Ralat ketika mengeluarkan senarai"
 
 #: addressbook/gui/widgets/eab-gui-util.c:124
 #: addressbook/gui/widgets/eab-gui-util.c:417
-#, fuzzy
 msgid "Error removing contact"
-msgstr "Ralat ketika mengeluarkan kad"
+msgstr "Ralat ketika mengeluarkan kenalan"
 
 #: addressbook/gui/widgets/eab-gui-util.c:206
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
-"Membuka %d kad akan turut membuka %d tetingkap baru.\n"
-"Adakah anda benar-benar ingin memaparkan semua kad ini?"
+"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
 #, c-format
@@ -2750,24 +2770,20 @@ msgid "list"
 msgstr "senarai"
 
 #: addressbook/gui/widgets/eab-gui-util.c:514
-#, fuzzy
 msgid "Move contact to"
-msgstr "Alihkan kad ke"
+msgstr "Alihkan kenalan ke"
 
 #: addressbook/gui/widgets/eab-gui-util.c:516
-#, fuzzy
 msgid "Copy contact to"
-msgstr "Salin kad ke"
+msgstr "Salin kenalan ke"
 
 #: addressbook/gui/widgets/eab-gui-util.c:519
-#, fuzzy
 msgid "Move contacts to"
-msgstr "Alihkan kad ke"
+msgstr "Alihkan kenalan ke"
 
 #: addressbook/gui/widgets/eab-gui-util.c:521
-#, fuzzy
 msgid "Copy contacts to"
-msgstr "Salin kad ke"
+msgstr "Salin kenalan ke"
 
 #: addressbook/gui/widgets/eab-gui-util.c:710
 msgid "Multiple VCards"
@@ -2818,25 +2834,22 @@ msgid "Merge E-Mail Address"
 msgstr "Cantumkan Alamat E-mel"
 
 #: addressbook/gui/widgets/eab-vcard-control.c:140
-#, fuzzy, c-format
+#, c-format
 msgid "and %d other contacts."
-msgstr "dan %d kad lain."
+msgstr "dan %d kenalan lain."
 
 #: addressbook/gui/widgets/eab-vcard-control.c:142
-#, fuzzy
 msgid "and one other contact."
-msgstr "dan satu kad lain."
+msgstr "dan satu kenalan lain."
 
 #: addressbook/gui/widgets/eab-vcard-control.c:225
 #: addressbook/gui/widgets/eab-vcard-control.c:275
-#, fuzzy
 msgid "Show Full VCard"
-msgstr "Tunjukkan Pengepala _Penuh"
+msgstr "Tunjukkan Vcard Penuh"
 
 #: addressbook/gui/widgets/eab-vcard-control.c:229
-#, fuzzy
 msgid "Show Compact VCard"
-msgstr "Simpan Kenalan sebagai VCard"
+msgstr "Tunjukkan VCard Padat"
 
 #: addressbook/gui/widgets/eab-vcard-control.c:280
 msgid "Save in addressbook"
@@ -2852,17 +2865,17 @@ msgstr "Pandangan Ppepohon GTK"
 
 #: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
-msgstr ""
+msgstr "Ujian Aliran Semula"
 
 #: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr ""
+msgstr "Hakcipta (C) 2000, Ximian, Inc."
 
 #: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
-msgstr ""
+msgstr "Ini sepatutnya menguji item kanvas aliran semula"
 
 #: addressbook/printing/e-contact-print-envelope.c:212
 #: addressbook/printing/e-contact-print-envelope.c:233
@@ -2870,15 +2883,13 @@ msgid "Print envelope"
 msgstr "Cetak sampul surat"
 
 #: addressbook/printing/e-contact-print.c:1003
-#, fuzzy
 msgid "Print contacts"
-msgstr "Cetak kenalan yang dipilih"
+msgstr "Cetak kenalan"
 
 #: addressbook/printing/e-contact-print.c:1069
 #: addressbook/printing/e-contact-print.c:1096
-#, fuzzy
 msgid "Print contact"
-msgstr "Cetak kenalan yang dipilih"
+msgstr "Cetak kenalan"
 
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3049,98 +3060,93 @@ msgid "_Font..."
 msgstr "_Fon..."
 
 #: addressbook/printing/test-contact-print-style-editor.c:53
-#, fuzzy
 msgid "Contact Print Style Editor Test"
-msgstr "Editor Senarai Kenalan"
+msgstr "Ujian Editor Gaya Cetakan Kenalan"
 
 #: addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
-msgstr ""
+msgstr "Ini sepatutnya menguji widget editor gaya cetakan kenalan"
 
 #: addressbook/printing/test-print.c:52
-#, fuzzy
 msgid "Contact Print Test"
-msgstr "Senarai _Kenalan"
+msgstr "Ujian Cetakan Kenalan"
 
 #: addressbook/printing/test-print.c:55
 msgid "This should test the contact print code"
-msgstr ""
+msgstr "Ini sepatutnya menguji kod cetakan kenalan"
 
 #: addressbook/tools/evolution-addressbook-export-list-cards.c:629
 #: addressbook/tools/evolution-addressbook-export-list-cards.c:667
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:58
-#, fuzzy
 msgid "Can not open file"
-msgstr "Tidak dapat membuka mesej"
+msgstr "Tidak dapat membuka fail"
 
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
 msgid "Can not load URI"
-msgstr "Kad tidak dijumpai"
+msgstr "Tidak dapat menuatkan URI"
 
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
-msgstr ""
+msgstr "Menentukan fail output bukannya output piawai"
 
 #: addressbook/tools/evolution-addressbook-export.c:57
 msgid "OUTPUTFILE"
-msgstr ""
+msgstr "OUTPUTFILE"
 
 #: addressbook/tools/evolution-addressbook-export.c:58
-#, fuzzy
 msgid "List local addressbook folders"
-msgstr "dengan semua folder jauh yang setempat dan aktif"
+msgstr "Senaraikan folder buku alamat setempat"
 
 #: addressbook/tools/evolution-addressbook-export.c:60
 msgid "Show cards as vcard or csv file"
-msgstr ""
+msgstr "Tunjukkan kad sebagai vcard atau fail csv"
 
 #: addressbook/tools/evolution-addressbook-export.c:60
-#, fuzzy
 msgid "[vcard|csv]"
-msgstr "kad"
+msgstr "[vcard][csv]"
 
 #: addressbook/tools/evolution-addressbook-export.c:61
 msgid "Export in asynchronous mode "
-msgstr ""
+msgstr "Eksport dalam mod segerak "
 
 #: addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
 "The number of cards in one output file in asychronous mode,default size 100."
 msgstr ""
+"Bilangan kad dalam satu fail output dalam mod segerak, saiz piawai 100."
 
 #: addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
-msgstr ""
+msgstr "NUMBER"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
+"Ralat argumen baris arahan, sila gunakan opsyen --help untuk lihat "
+"kegunaannya."
 
 #: addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
-msgstr ""
+msgstr "Hanya menyokong format csv atau vcard."
 
 #: addressbook/tools/evolution-addressbook-export.c:114
 msgid "In async mode, output must be file."
-msgstr ""
+msgstr "Dalam mod segerak, output mesti fail."
 
 #: addressbook/tools/evolution-addressbook-export.c:122
 msgid "In normal mode, there should not need size option."
-msgstr ""
+msgstr "Dalam mod normal, opsyen saiz sepatutnya tidak perlu."
 
 #: addressbook/tools/evolution-addressbook-export.c:153
-#, fuzzy
 msgid "Impossible internal error."
-msgstr "Ralat dalaman"
+msgstr "Ralat dalaman mustahil."
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Ralat ketika memuatkan buku alamat piawai."
 
 #: addressbook/tools/evolution-addressbook-import.c:67
-#, fuzzy
 msgid "Input File"
 msgstr "Fail Input"
 
@@ -3156,18 +3162,18 @@ msgstr "Senarai Tanpa Nama"
 msgid "Split Multi-Day Events:"
 msgstr "Pisahkan Peristiwa Berbilang Hari:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1349
-#: calendar/conduits/todo/todo-conduit.c:887
+#: calendar/conduits/calendar/calendar-conduit.c:1320
+#: calendar/conduits/todo/todo-conduit.c:857
 msgid "Could not start wombat server"
 msgstr "Tidak dapat memulakan pelayan wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1350
-#: calendar/conduits/todo/todo-conduit.c:888
+#: calendar/conduits/calendar/calendar-conduit.c:1321
+#: calendar/conduits/todo/todo-conduit.c:858
 msgid "Could not start wombat"
 msgstr "Tidak dapat memulakan wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
-#: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1436
+#: calendar/conduits/calendar/calendar-conduit.c:1439
 msgid "Could not read pilot's Calendar application block"
 msgstr "Tidak dapat membaca blok aplikasi Kalendar rintis"
 
@@ -3175,11 +3181,67 @@ msgstr "Tidak dapat membaca blok aplikasi Kalendar rintis"
 msgid "Default Priority:"
 msgstr "Keutamaan Piawai:"
 
-#: calendar/conduits/todo/todo-conduit.c:975
-#: calendar/conduits/todo/todo-conduit.c:978
+#: calendar/conduits/todo/todo-conduit.c:945
+#: calendar/conduits/todo/todo-conduit.c:948
 msgid "Could not read pilot's ToDo application block"
 msgstr "Tidak dapat membaca blok aplikasi ToDo rintis"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Kalendar dan Tugas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Calendars"
+msgstr "Kalendar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Buat konfigurasi zon waktu, Kalendar dan Senarai Tugas anda di sini "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendar dan Tugas Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Kawalan konfigurasi Kalendar Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Pemandang mesej penjadualan Kalendar Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar viewer"
+msgstr "Pemandang Kalendar Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor Kalendar/Tugas Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Tasks viewer"
+msgstr "Pemandang Tugas Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Komponen Kalendar Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+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
+#: mail/importers/netscape-importer.c:1845 shell/e-shortcuts.c:1087
+msgid "Tasks"
+msgstr "Tugas"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Khidmat pemberitahuan penggera Kalendar Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Bermula:"
@@ -3228,6 +3290,10 @@ msgid ""
 "Starting at %s\n"
 "Ending at %s"
 msgstr ""
+"Bunyi amaran pasa %s\n"
+"%s\n"
+"Bermula pada %s\n"
+"Berakhir pada %s"
 
 #: calendar/gui/alarm-notify/alarm-queue.c:980
 #: calendar/gui/alarm-notify/alarm-queue.c:1004
@@ -3267,23 +3333,19 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Jangan tanya saya lagi tentang atur cara ini."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Khidmat pemberitahuan penggera Kalendar Evolution"
-
-#: calendar/gui/alarm-notify/notify-main.c:172
+#: calendar/gui/alarm-notify/notify-main.c:154
 msgid "Could not initialize Bonobo"
 msgstr "Tidak dapat memulakan Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:157
 msgid "Could not initialize gnome-vfs"
 msgstr "Tidak dapat memulakan gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:166
 msgid "Could not create the alarm notify service factory"
 msgstr "Tidak dapat mewujudkan penggera, maklumkan kilang khidmat"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:109
+#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
 msgid "invalid time"
 msgstr "masa tak sah"
 
@@ -3299,108 +3361,125 @@ msgstr "Huraian mengandungi"
 msgid "Comment contains"
 msgstr "Ulasan mengandungi"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1124
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1134
 msgid "Unmatched"
 msgstr "Tidak padan"
 
-#: calendar/gui/calendar-commands.c:422
-#, fuzzy
+#: calendar/gui/calendar-commands.c:370
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
-"Pengendalian ini akan memadamkan terus semua tugas yang ditandakan sebagai "
-"siap. Jika anda meneruskannya, anda tidak akan dapat memulihkan tugas ini.\n"
-"\n"
-"Anda pasti ingin memadamkan tugas ini?"
+"Pengendalian ini akan memadamkan terus semua peristiwa yang lebih lama dari "
+"jumlah masa yang dipilih. Jika anda meneruskannya, anda tidak akan dapat "
+"memulihkan tugas ini. "
 
-#: calendar/gui/calendar-commands.c:428
+#: calendar/gui/calendar-commands.c:376
 msgid "Purge events older than"
-msgstr ""
+msgstr "Singkirkan peristiwa yang lebih lama dari"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:381
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
 msgid "days"
 msgstr "hari"
 
-#: calendar/gui/calendar-commands.c:531
+#: calendar/gui/calendar-commands.c:479
 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:534 calendar/gui/e-day-view-top-item.c:692
+#: calendar/gui/calendar-commands.c:482 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:536 calendar/gui/calendar-commands.c:541
-#: calendar/gui/calendar-commands.c:543
+#: calendar/gui/calendar-commands.c:484 calendar/gui/calendar-commands.c:489
+#: calendar/gui/calendar-commands.c:491
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:560 calendar/gui/calendar-commands.c:566
-#: calendar/gui/calendar-commands.c:572 calendar/gui/calendar-commands.c:574
+#: calendar/gui/calendar-commands.c:508 calendar/gui/calendar-commands.c:514
+#: calendar/gui/calendar-commands.c:520 calendar/gui/calendar-commands.c:522
 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:564
+#: calendar/gui/calendar-commands.c:512
 #: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1518
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:177
+#: calendar/gui/calendar-component.c:281
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:205
+#: calendar/gui/calendar-component.c:321
 #, fuzzy
+msgid "Rename this calendar to"
+msgstr "Cetak kalendar ini"
+
+#: calendar/gui/calendar-component.c:341
 msgid "New Calendar"
-msgstr "New Caledonia"
+msgstr "Kalendar Baru"
+
+#: calendar/gui/calendar-component.c:524
+msgid "New appointment"
+msgstr "Temu janji baru"
+
+#: calendar/gui/calendar-component.c:525
+msgid "_Appointment"
+msgstr "_Temu janji"
+
+#: calendar/gui/calendar-component.c:526
+msgid "Create a new appointment"
+msgstr "Wujudkan temu janji baru"
+
+#: calendar/gui/calendar-component.c:531
+msgid "New meeting"
+msgstr "Mesyuarat baru"
 
-#: calendar/gui/calendar-component.c:207
+#: calendar/gui/calendar-component.c:532
+msgid "M_eeting"
+msgstr "M_esyuarat"
+
+#: calendar/gui/calendar-component.c:533
 #, fuzzy
-msgid "Rename"
-msgstr "_Namakan semula"
+msgid "Create a new meeting request"
+msgstr "Wujudkan mesyuarat baru"
 
-#: calendar/gui/calendar-component.c:408
-msgid "On This Computer"
-msgstr ""
+#: calendar/gui/calendar-component.c:538
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Temu Janji Baru Sepanjang Hari"
 
-#. orange
-#: calendar/gui/calendar-component.c:416 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
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Peribadi"
+#: calendar/gui/calendar-component.c:539
+msgid "All _Day Appointment"
+msgstr "Temu Janji _Sepanjang Hari"
 
-#. red
-#: calendar/gui/calendar-component.c:423 filter/filter-label.c:122
-#: mail/mail-config.c:66 mail/mail-config.glade.h:129
-#: shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Kerja"
+#: calendar/gui/calendar-component.c:540
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Wujudkan temu janji baru"
 
 #. create the remote source group
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:663
 msgid "On The Web"
 msgstr ""
 
 #: calendar/gui/calendar-offline-handler.c:190
 #, c-format
 msgid "backend_go_offline(): %s"
-msgstr ""
+msgstr "backend_go_offline(): %s"
 
 #: calendar/gui/calendar-offline-handler.c:212
 #, c-format
 msgid "backend_go_online(): %s"
-msgstr ""
+msgstr "backend_go_online(): %s"
 
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
@@ -3419,9 +3498,8 @@ msgid "Month View"
 msgstr "Pandangan Bulan"
 
 #: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
 msgid "List View"
-msgstr "Pandangan Biasa"
+msgstr "Pandangan Senarai"
 
 #: calendar/gui/comp-editor-factory.c:451
 msgid "Error while opening the calendar"
@@ -3438,7 +3516,7 @@ msgstr "Kebenaran dinafikan untuk membuka kalendar"
 #: calendar/gui/comp-editor-factory.c:516
 #, c-format
 msgid "open_client(): %s"
-msgstr ""
+msgstr "open_client(): %s"
 
 #: calendar/gui/control-factory.c:133
 #, c-format
@@ -3505,7 +3583,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:35
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:46
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -3554,7 +3632,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-tasks.c:166
+#: calendar/gui/e-tasks.c:168
 msgid "Summary:"
 msgstr "Ringkasan:"
 
@@ -3726,7 +3804,7 @@ msgid "Wednesday"
 msgstr "Rabu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:33
 msgid "Work Week"
 msgstr "Minggu Bekerja"
 
@@ -4036,24 +4114,20 @@ 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
-#, fuzzy
 msgid "The event could not be deleted due to an error"
-msgstr "Peristiwa tidak dapat dihapuskan disebabkan oleh ralat corba"
+msgstr "Peristiwa tidak dapat dihapuskan disebabkan oleh satu ralat"
 
 #: calendar/gui/dialogs/delete-error.c:88
-#, fuzzy
 msgid "The task could not be deleted due to an error"
-msgstr "Tugas tidak boleh dihapuskan disebabkan oleh ralat corba"
+msgstr "Tugas tidak boleh dihapuskan disebabkan oleh satu ralat"
 
 #: calendar/gui/dialogs/delete-error.c:91
-#, fuzzy
 msgid "The journal entry could not be deleted due to an error"
-msgstr "Entri jurnal tidak dapat dihapuskan disebabkan oleh ralat corba"
+msgstr "Entri jurnal tidak dapat dihapuskan disebabkan oleh satu ralat"
 
 #: calendar/gui/dialogs/delete-error.c:94
-#, fuzzy
 msgid "The item could not be deleted due to an error"
-msgstr "Item tidak dapat dihapuskan disebabkan oleh ralat corba"
+msgstr "Item tidak dapat dihapuskan disebabkan oleh satu ralat"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Addressbook..."
@@ -4128,9 +4202,8 @@ msgid "Classification"
 msgstr "Pengelasan"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#, fuzzy
 msgid "Co_nfidential"
-msgstr "Sulit"
+msgstr "S_ulit"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4175,9 +4248,9 @@ msgstr "_Masa mula:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:312
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2040
-#: mail/em-account-prefs.c:448 mail/em-folder-view.c:690
-#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1749
+#: 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
+#: mail/mail-account-gui.c:1259 mail/mail-account-gui.c:1783
 #: mail/mail-config.glade.h:75
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:194
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
@@ -4252,7 +4325,7 @@ 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
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4274,7 +4347,7 @@ msgstr "_Jemput Orang Lain..."
 #: calendar/gui/dialogs/new-calendar.c:102
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
+msgstr "Sumber dengan nama '%s' telah wujud dalam kumpulan yang dipilih"
 
 #: calendar/gui/dialogs/new-calendar.c:116
 #, c-format
@@ -4296,32 +4369,27 @@ msgstr ""
 #: calendar/gui/dialogs/new-calendar.c:155
 #, fuzzy
 msgid "Could not create cache for new calendar"
-msgstr "Tidak dapat mewujudkan direktori %s: %s"
+msgstr "Tidak dapat mewujudkan direktori untuk kalendar baru"
 
 #: calendar/gui/dialogs/new-calendar.c:174
-#, fuzzy
 msgid "Could not create directory for new calendar"
-msgstr "Tidak dapat mewujudkan direktori %s: %s"
+msgstr "Tidak dapat mewujudkan direktori untuk kalendar baru"
 
 #: calendar/gui/dialogs/new-calendar.c:254
-#, fuzzy
 msgid "A group must be selected"
-msgstr "Penyusun mestilah ditetapkan."
+msgstr "Satu kumpulan mesti dipilih."
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
-#, fuzzy
 msgid "<b>Calendar options</b>"
-msgstr "Maklumat kalendar"
+msgstr "<b>Opsyen kalendar</b>"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:3
-#, fuzzy
 msgid "Add New Calendar"
-msgstr "New Caledonia"
+msgstr "Tambah Kalendar Baru"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:4
-#, fuzzy
 msgid "Calendar Group"
-msgstr "Ralat iCalendar"
+msgstr "Kumpulan Kalendar"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:5
 #, fuzzy
@@ -4329,9 +4397,8 @@ msgid "Calendar Location"
 msgstr "Maklumat kalendar"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:6
-#, fuzzy
 msgid "Calendar Name"
-msgstr "Kalendar"
+msgstr "Nama Kalendar"
 
 #: calendar/gui/dialogs/recur-comp.c:51
 msgid "You are modifying a recurring event, what would you like to modify?"
@@ -4414,7 +4481,7 @@ msgstr "hari"
 msgid "on the"
 msgstr "semasa"
 
-#: calendar/gui/dialogs/recurrence-page.c:1365
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "kejadian"
 
@@ -4483,13 +4550,12 @@ msgid "year(s)"
 msgstr "tahun"
 
 #: calendar/gui/dialogs/save-comp.c:54
-#, fuzzy
 msgid ""
 "This event has been changed, but has not been saved.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
-"Tandatangan ini telah diubah tetapi tidak disimpan.\n"
+"Peristiwa ini telah diubah tetapi masih belum disimpan.\n"
 "\n"
 "Adakah anda ingin menyimpan perubahan yang dilakukan?"
 
@@ -4498,9 +4564,8 @@ msgid "_Discard Changes"
 msgstr "_Buang Perubahan"
 
 #: calendar/gui/dialogs/save-comp.c:63
-#, fuzzy
 msgid "Save Event"
-msgstr "Peristiwa Kalendar"
+msgstr "Simpan Peristiwa"
 
 #: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
@@ -4523,47 +4588,47 @@ msgid "Completed date is wrong"
 msgstr "Tarikh siap adalah salah"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "% _Complete"
-msgstr "% Siap"
+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:602
+#: 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-meeting-model.c:312 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:208
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:210
 #: calendar/gui/print.c:2318
 msgid "Completed"
-msgstr "Siap"
+msgstr "Selesai"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:229
-#: mail/message-list.c:912
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:231
+#: mail/message-list.c:914
 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:600
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:477
-#: calendar/gui/e-tasks.c:205 calendar/gui/print.c:2315
+#: 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
 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:233
-#: mail/message-list.c:910
+#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:235
+#: mail/message-list.c:912
 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:231 mail/message-list.c:911
+#: calendar/gui/e-tasks.c:233 mail/message-list.c:913
 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:598
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-tasks.c:215
+#: 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
 msgid "Not Started"
 msgstr "Tidak Dimulakan"
@@ -4578,9 +4643,8 @@ msgid "Undefined"
 msgstr "Tidak ditentukan"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#, fuzzy
 msgid "_Date Completed:"
-msgstr "Tarikh Siap:"
+msgstr "_Tarikh Selesai:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
@@ -4591,9 +4655,8 @@ msgid "_Status:"
 msgstr "_Status:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:15
-#, fuzzy
 msgid "_Web Page:"
-msgstr "_Alamat laman web:"
+msgstr "_Laman Web:"
 
 #: calendar/gui/dialogs/task-editor.c:194
 msgid "Basic"
@@ -4611,14 +4674,14 @@ msgstr "Tarikh genap tempoh adalah salah"
 
 #: calendar/gui/dialogs/task-page.c:537
 msgid "Due date is before start date!"
-msgstr ""
+msgstr "Tarikh genap tempoh adalah sebelum tarikh mula!"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Con_fidential"
 msgstr "Su_lit"
 
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:245
+#: 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
 msgid "Description:"
 msgstr "Huraian:"
@@ -4746,9 +4809,8 @@ msgstr "Kategori"
 
 #: calendar/gui/e-cal-list-view.etspec.h:3
 #: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
 msgid "Description"
-msgstr "Huraian:"
+msgstr "Huraian"
 
 #: calendar/gui/e-cal-list-view.etspec.h:4
 #: calendar/gui/e-calendar-table.etspec.h:13
@@ -4756,19 +4818,17 @@ 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:1082
+#: calendar/gui/e-calendar-table.etspec.h:15 shell/e-shortcuts.c:1083
 msgid "Summary"
 msgstr "Ringkasan"
 
-#: calendar/gui/e-cal-list-view.etspec.h:6
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:172
+#: calendar/gui/e-cal-list-view.etspec.h:6 mail/mail-config.glade.h:172
 msgid "color"
 msgstr "warna"
 
 #: calendar/gui/e-cal-list-view.etspec.h:7
-#: calendar/gui/e-calendar-table.etspec.h:20
 msgid "component"
-msgstr ""
+msgstr "komponen"
 
 #: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:455
 msgid "Free"
@@ -4796,7 +4856,7 @@ msgstr "E"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/e-cal-model-tasks.c:550
+#: calendar/gui/e-cal-model-tasks.c:546
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4806,7 +4866,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-model.c:261
 #: calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:529
 #: calendar/gui/e-meeting-model.c:782 calendar/gui/e-meeting-store.c:159
@@ -4814,7 +4874,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Ya"
 
-#: calendar/gui/e-cal-model-tasks.c:937 calendar/gui/e-cal-model.c:841
+#: calendar/gui/e-cal-model-tasks.c:933 calendar/gui/e-cal-model.c:841
 #: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-model.c:273
 #: calendar/gui/e-meeting-model.c:783 calendar/gui/e-meeting-store.c:171
 msgid "No"
@@ -4828,8 +4888,8 @@ msgstr "Tidak"
 #: 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:1619
-#: camel/camel-gpg-context.c:1670 camel/camel-tcp-stream-openssl.c:631
+#: 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
 #: 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
@@ -4857,7 +4917,6 @@ msgid "New _Appointment..."
 msgstr "Temu janji _Baru..."
 
 #: calendar/gui/e-cal-view.c:1251 calendar/gui/e-cal-view.c:1341
-#: ui/evolution-calendar.xml.h:23
 msgid "New All Day _Event"
 msgstr "_Peristiwa Baru Sepanjang Hari"
 
@@ -4872,8 +4931,8 @@ 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
-#: ui/evolution-calendar.xml.h:47 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
+#: 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-tasks.xml.h:21 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Cetak..."
@@ -4881,13 +4940,13 @@ 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
-#: ui/evolution-calendar.xml.h:46 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: 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
 msgid "_Paste"
 msgstr "_Tampal"
 
 #: calendar/gui/e-cal-view.c:1267 calendar/gui/e-cal-view.c:1335
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to _Today"
 msgstr "Pergi ke _Hari Ini"
 
@@ -4895,26 +4954,26 @@ msgstr "Pergi ke _Hari Ini"
 msgid "_Go to Date..."
 msgstr "_Pergi ke Tarikh..."
 
-#: calendar/gui/e-cal-view.c:1272 ui/evolution-calendar.xml.h:48
+#: calendar/gui/e-cal-view.c:1272 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:28
+#: 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:658 shell/e-shortcuts-view.c:422
+#: mail/em-folder-view.c:670 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:660 mail/em-popup.c:584 mail/em-popup.c:640
-#: ui/evolution-mail-message.xml.h:120
+#: mail/em-folder-view.c:672 mail/em-popup.c:589 mail/em-popup.c:645
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Save As..."
 msgstr "_Simpan Sebagai..."
 
@@ -4927,9 +4986,9 @@ 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
-#: mail/mail-component.c:2083 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:101 ui/evolution-tasks.xml.h:17
+#: 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
 msgid "_Copy"
 msgstr "_Salin"
 
@@ -4994,9 +5053,8 @@ msgid "100%"
 msgstr "100%"
 
 #: calendar/gui/e-calendar-table.c:991
-#, fuzzy
 msgid "Open _Web Page"
-msgstr "_Buka Mesej"
+msgstr "Buka Laman _Web"
 
 #: calendar/gui/e-calendar-table.c:1003
 msgid "_Assign Task"
@@ -5032,8 +5090,8 @@ msgstr "% Siap"
 msgid "Alarms"
 msgstr "Penggera"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:579
+#: 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
 msgid "Complete"
 msgstr "Siap"
 
@@ -5118,7 +5176,7 @@ msgstr "petang"
 #: calendar/gui/e-itip-control.c:142
 #, c-format
 msgid "start_calendar_server(): %s"
-msgstr ""
+msgstr "start_calendar_server(): %s"
 
 #: calendar/gui/e-itip-control.c:638
 msgid "Yes. (Complex Recurrence)"
@@ -5228,8 +5286,8 @@ msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
-"Sila kaji semula maklumat berikut, dan kemudian pilih tindakan daripada menu "
-"di bawah."
+"<br>Sila kaji semula maklumat berikut, dan kemudian pilih tindakan daripada "
+"menu di bawah."
 
 #: calendar/gui/e-itip-control.c:983
 msgid "<i>None</i>"
@@ -5240,7 +5298,7 @@ msgid "Location:"
 msgstr "Lokasi:"
 
 #. write status
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:201
+#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-tasks.c:203
 msgid "Status:"
 msgstr "Status:"
 
@@ -5276,7 +5334,7 @@ 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:904 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:985 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -5305,7 +5363,7 @@ msgid "Send Latest Information"
 msgstr "Hantar Maklumat Terkini"
 
 #: calendar/gui/e-itip-control.c:1174 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:441
+#: 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
 msgid "Cancel"
@@ -5768,49 +5826,40 @@ msgstr "Masa mula _mesyuarat:"
 msgid "Meeting _end time:"
 msgstr "Masa akhir _mesyuarat:"
 
-#: calendar/gui/e-tasks.c:179
-#, fuzzy
+#: calendar/gui/e-tasks.c:181
 msgid "Start Date:"
-msgstr "Tar_ikh Mula:"
+msgstr "Tarikh Mula:"
 
-#: calendar/gui/e-tasks.c:195
-#, fuzzy
+#: calendar/gui/e-tasks.c:197
 msgid "Due Date:"
-msgstr "_Tarikh Genap Tempoh:"
+msgstr "Tarikh Genap Tempoh:"
 
 #. write priority
-#: calendar/gui/e-tasks.c:223
-#, fuzzy
+#: calendar/gui/e-tasks.c:225
 msgid "Priority:"
-msgstr "_Keutamaan:"
+msgstr "Keutamaan:"
 
 #. URL
-#: calendar/gui/e-tasks.c:279
-#, fuzzy
+#: calendar/gui/e-tasks.c:281
 msgid "Web Page:"
-msgstr "Halaman"
+msgstr "Laman Web:"
 
-#: calendar/gui/e-tasks.c:715
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Tugas permulaan pada %s"
-
-#: calendar/gui/e-tasks.c:764 calendar/gui/tasks-control.c:199
+#: calendar/gui/e-tasks.c:710 calendar/gui/tasks-control.c:200
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Tidak dapat memuatkan tugas dalam `%s"
 
-#: calendar/gui/e-tasks.c:779
+#: calendar/gui/e-tasks.c:725
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Kaedah yang diperlukan untuk memuatkan `%s tidak disokong"
 
-#: calendar/gui/e-tasks.c:793 calendar/gui/gnome-cal.c:1766
+#: calendar/gui/e-tasks.c:739 calendar/gui/gnome-cal.c:1764
 #, 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:854 calendar/gui/gnome-cal.c:1981
+#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1978
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5819,48 +5868,39 @@ msgstr ""
 "Ralat dalam %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:904
+#: calendar/gui/e-tasks.c:959
 msgid "Completing tasks..."
 msgstr "Menyiapkan tugas..."
 
-#: calendar/gui/e-tasks.c:927
+#: calendar/gui/e-tasks.c:982
 msgid "Deleting selected objects..."
 msgstr "Menghapuskan objek yang dipilih..."
 
-#: calendar/gui/e-tasks.c:967
+#: calendar/gui/e-tasks.c:1007
 msgid "Expunging"
 msgstr "Sedang Buang"
 
-#: calendar/gui/e-tasks.c:1032
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1797 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:713
-#: mail/importers/netscape-importer.c:1845 shell/e-local-storage.c:183
+#: calendar/gui/gnome-cal.c:1603 mail/importers/netscape-importer.c:1843
 #: shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Tugas"
-
-#: calendar/gui/gnome-cal.c:1605 mail/importers/netscape-importer.c:1843
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1085
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: calendar/gui/gnome-cal.c:1738
+#: calendar/gui/gnome-cal.c:1736
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Tidak dapat membuka folder dalam `%s'"
 
-#: calendar/gui/gnome-cal.c:1752
+#: calendar/gui/gnome-cal.c:1750
 #, 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:1809
+#: calendar/gui/gnome-cal.c:1807
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Menambahkan penggera bagi %s"
 
-#: calendar/gui/gnome-cal.c:2002
+#: calendar/gui/gnome-cal.c:1999
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5872,7 +5912,7 @@ msgstr ""
 " telah rosak. Anda perlu memulakan semula Evolution untuk menggunakannya "
 "semula"
 
-#: calendar/gui/gnome-cal.c:2010
+#: calendar/gui/gnome-cal.c:2007
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5884,57 +5924,9 @@ msgstr ""
 " telah rosak. Anda perlu memulakan semula Evolution untuk menggunakannya "
 "semula"
 
-#: calendar/gui/gnome-cal.c:2902
-#, fuzzy
+#: calendar/gui/gnome-cal.c:2847
 msgid "Purging"
-msgstr "Cetak"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalendar dan Tugas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalendar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Buat konfigurasi zon waktu, Kalendar dan Senarai Tugas anda di sini "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalendar dan Tugas Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Kawalan konfigurasi Kalendar Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Pemandang mesej penjadualan Kalendar Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Pemandang Kalendar Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor Kalendar/Tugas Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Pemandang Tugas Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Komponen Kalendar dan Tugas Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Komponen Ujian Evolution"
+msgstr "Menyingkir"
 
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
@@ -6265,7 +6257,7 @@ msgid "Contacts: "
 msgstr "Kenalan: "
 
 #: calendar/gui/print.c:2532 calendar/gui/print.c:2618
-#: calendar/gui/tasks-control.c:564 mail/em-format-html-print.c:147
+#: calendar/gui/tasks-control.c:565 mail/em-format-html-print.c:147
 msgid "Print Preview"
 msgstr "Pralihat Cetakan"
 
@@ -6281,7 +6273,7 @@ msgstr "Persediaan Cetakan"
 msgid "The URI of the tasks folder to display"
 msgstr "URI bagi folder tugas akan memaparkan"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:449
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6293,11 +6285,11 @@ msgstr ""
 "\n"
 "Anda pasti ingin memadamkan tugas ini?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:452
 msgid "Do not ask me again."
 msgstr "Jangan tanya saya lagi."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:594
 msgid "Print Tasks"
 msgstr "Cetak Tugas"
 
@@ -6325,15 +6317,15 @@ msgstr "Fail iCalendar (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "Fail vCalendar (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:466
+#: calendar/importers/icalendar-importer.c:464
 msgid "Reminder!!"
 msgstr "Peringatan!!"
 
-#: calendar/importers/icalendar-importer.c:706
+#: calendar/importers/icalendar-importer.c:704
 msgid "Calendar Events"
 msgstr "Peristiwa Kalendar"
 
-#: calendar/importers/icalendar-importer.c:731
+#: calendar/importers/icalendar-importer.c:729
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6341,7 +6333,7 @@ msgstr ""
 "Evolution telah menjumpai fail Kalendar Gnome.\n"
 "Adakah anda ingin mengimportnya ke dalam Evolution?"
 
-#: calendar/importers/icalendar-importer.c:738
+#: calendar/importers/icalendar-importer.c:736
 msgid "Gnome Calendar"
 msgstr "Kalendar Gnome"
 
@@ -7874,27 +7866,27 @@ msgstr "Pasifik/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pasifik/Yap"
 
-#: camel/camel-cipher-context.c:99
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Tandatangan tidak disokong oleh sifer ini"
 
-#: camel/camel-cipher-context.c:139
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Mengesah betul tidak disokong oleh sifer ini"
 
-#: camel/camel-cipher-context.c:181
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Penyulitan tidak disokong oleh sifer ini"
 
-#: camel/camel-cipher-context.c:220
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Penyahsulitan tidak disokong oleh sifer ini"
 
-#: camel/camel-cipher-context.c:256
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr "Anda tidak boleh mengimport kekunci dengan sifer ini"
 
-#: camel/camel-cipher-context.c:286
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr "Anda tidak boleh mengeksport kekunci dengan sifer ini"
 
@@ -7936,7 +7928,7 @@ msgstr "Menyegerakkan semula dengan pelayan"
 
 #: camel/camel-disco-folder.c:90
 msgid "Downloading new messages for offline mode"
-msgstr ""
+msgstr "Memuat turun mesej baru untuk mod bukan dalam talian"
 
 #: camel/camel-disco-folder.c:351
 #, c-format
@@ -7947,13 +7939,13 @@ msgstr "Menyediakan folder '%s' untuk luar talian"
 msgid "You must be working online to complete this operation"
 msgstr "Anda mestilah berada dalam talian untuk melengkapkan pengendalian ini"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 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:551
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:553
 #: camel/camel-process.c:92
 #, c-format
 msgid "Failed to create create child process '%s': %s"
@@ -7964,69 +7956,69 @@ msgstr "Gagal mewujudkan proses anak '%s': %s"
 msgid "Invalid message stream received from %s: %s"
 msgstr "Aliran mesej tak sah diterima daripada %s: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:948
 msgid "Syncing folders"
 msgstr "Menyegerakkan folder"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1037 camel/camel-filter-driver.c:1410
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Ralat ketika menghuraikan penapis : %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1046 camel/camel-filter-driver.c:1416
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Ralat ketika melaksanakan penapis :%s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1113
 msgid "Unable to open spool folder"
 msgstr "Tidak dapat membuka folder spul"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1122
 msgid "Unable to process spool folder"
 msgstr "Tidak dapat memproses folder spul"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1137
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Mendapatkan mesej %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1141
 msgid "Cannot open message"
 msgstr "Tidak dapat membuka mesej"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1142 camel/camel-filter-driver.c:1154
 #, c-format
 msgid "Failed on message %d"
 msgstr "Gagal pada mesej %d"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1168 camel/camel-filter-driver.c:1262
 msgid "Syncing folder"
 msgstr "Menyegerakkan folder"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1229
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Mendapatkan mesej %d daripada %d"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1244
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Gagal pada mesej %d daripada %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Gagal mendapatkan semula mesej"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr "Argumen tak sah pada (bendera sistem)"
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argumen tak sah pada (tag pengguna)"
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:676 camel/camel-filter-search.c:684
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Ralat ketika melaksanakan carian penapis: %s: %s"
@@ -8082,9 +8074,8 @@ msgid "Copying messages"
 msgstr "Menyalin mesej"
 
 #: camel/camel-folder.c:1571
-#, fuzzy
 msgid "Filtering new message(s)"
-msgstr "Mendapatkan semula %d mesej"
+msgstr "Menapis mesej baru"
 
 #: camel/camel-gpg-context.c:696
 #, c-format
@@ -8115,8 +8106,8 @@ msgstr ""
 "pengguna:  \"%s\""
 
 #: camel/camel-gpg-context.c:763 camel/camel-gpg-context.c:1253
-#: camel/camel-gpg-context.c:1388 camel/camel-gpg-context.c:1465
-#: camel/camel-gpg-context.c:1570 mail/mail-send-recv.c:575
+#: camel/camel-gpg-context.c:1410 camel/camel-gpg-context.c:1490
+#: camel/camel-gpg-context.c:1597 mail/mail-send-recv.c:572
 msgid "Cancelled."
 msgstr "Batal."
 
@@ -8153,21 +8144,21 @@ msgstr ""
 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:351
+#: camel/camel-gpg-context.c:1232 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:1618
-#: camel/camel-gpg-context.c:1669
+#: camel/camel-gpg-context.c:1246 camel/camel-gpg-context.c:1646
+#: camel/camel-gpg-context.c:1697
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Gagal melaksanakan gpg: %s"
 
-#: camel/camel-gpg-context.c:1270 camel/camel-gpg-context.c:1380
-#: camel/camel-gpg-context.c:1458 camel/camel-gpg-context.c:1481
-#: camel/camel-gpg-context.c:1563 camel/camel-gpg-context.c:1587
-#: camel/camel-gpg-context.c:1640 camel/camel-gpg-context.c:1691
+#: 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
 msgid "Failed to execute gpg."
 msgstr "Gagal melaksanakan gpg."
 
@@ -8175,27 +8166,39 @@ msgstr "Gagal melaksanakan gpg."
 msgid "This is a digitally signed message part"
 msgstr "Ini ialah bahagian mesej yang ditandatangani secara digital"
 
-#: camel/camel-gpg-context.c:1365
+#: camel/camel-gpg-context.c:1369 camel/camel-gpg-context.c:1378
+#: camel/camel-smime-context.c:701 camel/camel-smime-context.c:709
+#, 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
 #, 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:1441
+#: camel/camel-gpg-context.c:1466
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: camel/camel-gpg-context.c:1499
+#: camel/camel-gpg-context.c:1524
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Ini ialah bahagian mesej yang ditandatangani secara digital"
 
-#: camel/camel-gpg-context.c:1595
+#: camel/camel-gpg-context.c:1621 camel/camel-smime-context.c:963
 #, fuzzy
+msgid "Encrypted content"
+msgstr "Kandungan badan indeks"
+
+#: camel/camel-gpg-context.c:1625
 msgid "Unable to parse message content"
-msgstr "Tidak boleh mendapatkan semula mesej daripada editor"
+msgstr "Tidak dapat menghuraikan kandungan mesej"
 
 #: camel/camel-lock-client.c:100
 #, c-format
@@ -8292,15 +8295,15 @@ msgstr "Ralat ketika menulis fail sementara mel: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Ralat ketika menyalin fail sementara mel: %s"
 
-#: camel/camel-multipart-encrypted.c:228 camel/camel-multipart-encrypted.c:243
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Gagal menyahsulitkan bahagian MIME: ralat protokol"
 
-#: camel/camel-multipart-encrypted.c:256
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Gagal menyahsulitkan bahagian MIME: struktur tak sah"
 
-#: camel/camel-multipart-signed.c:687
+#: camel/camel-multipart-signed.c:691
 msgid "parse error"
 msgstr "ralat hurai"
 
@@ -8596,9 +8599,9 @@ msgid "Failure in name lookup: %s"
 msgstr "Gagal dalam carian nama: %s"
 
 #: camel/camel-service.c:791 camel/camel-service.c:915
-#, fuzzy, c-format
+#, c-format
 msgid "Host lookup failed: cannot create thread: %s"
-msgstr "Carian hos gagal: sebab tak diketahui"
+msgstr "Carian hos gagal: tidak dapat mewujudkan bebenang: %s"
 
 #: camel/camel-service.c:804
 #, c-format
@@ -8644,68 +8647,61 @@ msgstr ""
 "Tidak dapat mewujudkan direktori %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:167
-#, fuzzy, c-format
+#: camel/camel-smime-context.c:96
+#, c-format
 msgid "Enter security pass-phrase for `%s'"
-msgstr "Masukkan Kata Laluan bagi %s"
+msgstr "Masukkan kata laluan sekuriti bagi %s"
 
-#: camel/camel-smime-context.c:446
-#, fuzzy
+#: camel/camel-smime-context.c:501
 msgid "Unverified"
-msgstr "Tidak ditentukan"
+msgstr "Tidak disahkan"
 
-#: camel/camel-smime-context.c:448
-#, fuzzy
+#: camel/camel-smime-context.c:503
 msgid "Good signature"
-msgstr "Edit tandatangan"
+msgstr "Tandatangan elok"
 
-#: camel/camel-smime-context.c:450
-#, fuzzy
+#: camel/camel-smime-context.c:505
 msgid "Bad signature"
-msgstr "Edit tandatangan"
+msgstr "Tandatangan buruk"
 
-#: camel/camel-smime-context.c:452
+#: camel/camel-smime-context.c:507
 msgid "Content tampered with or altered in transit"
-msgstr ""
+msgstr "Kandungan cuba dirosakkan atau diubah dalam peralihan"
 
-#: camel/camel-smime-context.c:454
-#, fuzzy
+#: camel/camel-smime-context.c:509
 msgid "Signing certificate not found"
-msgstr "Sijil swatandatangan dalam rantaian"
+msgstr "Sijil tandatangan tidak dijumpai"
 
-#: camel/camel-smime-context.c:456
-#, fuzzy
+#: camel/camel-smime-context.c:511
 msgid "Signing certificate not trusted"
-msgstr "Sijil tak dipercayai"
+msgstr "Sijil tandatangan tidak dipercayai"
 
-#: camel/camel-smime-context.c:458
+#: camel/camel-smime-context.c:513
 msgid "Signature algorithm unknown"
-msgstr ""
+msgstr "Algoritma tandatangan tidak diketahui"
 
-#: camel/camel-smime-context.c:460
+#: camel/camel-smime-context.c:515
 msgid "Siganture algorithm unsupported"
-msgstr ""
+msgstr "Algoritma tandatangan tidak disokong"
 
-#: camel/camel-smime-context.c:462
-#, fuzzy
+#: camel/camel-smime-context.c:517
 msgid "Malformed signature"
-msgstr "Simpan tandatangan"
+msgstr "Tandatangan cacat"
 
-#: camel/camel-smime-context.c:464
-#, fuzzy
+#: camel/camel-smime-context.c:519
 msgid "Processing error"
-msgstr "Ralat hurai"
+msgstr "Memproses ralat"
 
-#: camel/camel-smime-context.c:593
-#, fuzzy, c-format
+#: camel/camel-smime-context.c:634
+#, c-format
 msgid "Signer: %s <%s>: %s\n"
-msgstr "Pelayan: %s, Jenis: %s"
+msgstr "Penandatangan: %s <%s>: %s\n"
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:217
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Tidak dapat memperoleh folder: pengendalian tak sah pada simpanan ini"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:273
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Tidak dapat mewujudkan folder: pengendalian tak sah pada simpanan ini"
 
@@ -8917,7 +8913,7 @@ msgstr ""
 "Senarai pembatalan sijil tamat tempoh: %s\n"
 "Pengeluar: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:146
+#: camel/camel-url.c:290 mail/mail-tools.c:138
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Tidak dapat menghuraikan URL `%s'"
@@ -8936,22 +8932,22 @@ msgstr "Tiada mesej %s tersebut dalam %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Tidak dapat menyalin atau mengalihkan mesej ke dalam Folder Maya"
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:278
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Tidak dapat menghapuskan folder: %s: Pengendalian tak sah"
 
-#: camel/camel-vee-store.c:280
+#: camel/camel-vee-store.c:299
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Tidak dapat menghapuskan folder: %s: Folder tersebut tidak ada"
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-vee-store.c:312
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
 
-#: camel/camel-vee-store.c:301
+#: camel/camel-vee-store.c:320
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Tidak dapat menamakan semula folder: %s: Folder tersebut tidak ada"
@@ -9031,7 +9027,7 @@ msgstr "Tidak boleh mendapatkan semula mesej: %s"
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 #: camel/providers/local/camel-mh-folder.c:210
 #: camel/providers/local/camel-mh-folder.c:219
@@ -9045,7 +9041,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1923
 #: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
+#: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "Mesej tersebut tidak ada"
@@ -9090,7 +9086,7 @@ msgstr "Menyemak mel baru"
 msgid "Check for new messages in all folders"
 msgstr "Menyemak mesej baru dalam semua folder"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
+#: camel/providers/imap/camel-imap-provider.c:48
 msgid "Folders"
 msgstr "Folder"
 
@@ -9111,9 +9107,8 @@ 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
-#, fuzzy
 msgid "Automatically synchronize remote mail locally"
-msgstr "_Secara automatik semak mel baru setiap"
+msgstr "Secara automatik segerakkan mel jauh secara setempat"
 
 #: camel/providers/imap/camel-imap-provider.c:65
 msgid "IMAP"
@@ -9161,9 +9156,8 @@ msgstr "Tidak dapat disambungkan ke %s (port %d): %s"
 #: camel/providers/imap/camel-imap-store.c:584
 #: camel/providers/pop3/camel-pop3-store.c:179
 #: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
 msgid "SSL unavailable"
-msgstr "TLS tidak Ada"
+msgstr "SSL tidak Ada"
 
 #: camel/providers/imap/camel-imap-store.c:599
 #: camel/providers/imap/camel-imap-store.c:831
@@ -9191,9 +9185,9 @@ msgid "SSL negotiations failed"
 msgstr "Rundingan SSL gagal"
 
 #: camel/providers/imap/camel-imap-store.c:834
-#, fuzzy, c-format
+#, c-format
 msgid "Could not connect with command \"%s\": %s"
-msgstr "Tidak dapat disambungkan ke %s (port %d): %s"
+msgstr "Tidak dapat disambungkan dengan arahan \"%s\": %s"
 
 #: camel/providers/imap/camel-imap-store.c:1247
 #, c-format
@@ -9254,9 +9248,8 @@ msgid "Message storage"
 msgstr "Storan mesej"
 
 #: camel/providers/imapp/camel-imapp-provider.c:47
-#, fuzzy
 msgid "IMAP+"
-msgstr "IMAP"
+msgstr "IMAP+"
 
 #: camel/providers/imapp/camel-imapp-provider.c:49
 msgid ""
@@ -9265,16 +9258,19 @@ msgid ""
 "\n"
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
+"Pelayan eksperimen IMAP 4(.1)\n"
+"Ini merupakan kod yang belum diuji dan disokong, guna imap kosong sahaja.\n"
+"\n"
+" !!!JANGAN GUNAKAN INI UNTUK EMEL PENGELUARAN\t!!!\n"
 
 #: camel/providers/imapp/camel-imapp-store.c:333
-#, fuzzy, c-format
+#, c-format
 msgid "Could not connect to POP server on %s"
-msgstr "Tidak dapat disambungkan ke pelayan POP %s"
+msgstr "Tidak dapat disambungkan ke pelayan POP pada %s"
 
 #: camel/providers/local/camel-local-folder.c:179
-#, fuzzy
 msgid "Index message body data"
-msgstr "Hantarkan mesej kepada kenalan"
+msgstr "Data kandungan mesej indeks"
 
 #. $HOME relative path + protocol string
 #: camel/providers/local/camel-local-folder.c:382
@@ -9384,7 +9380,7 @@ msgid "Could not rename folder %s to %s: %s"
 msgstr "Tidak dapat menamakan semula folder %s ke %s: %s"
 
 #: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-mbox-store.c:475
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Tidak dapat menamakan semula '%s': %s"
@@ -9499,29 +9495,29 @@ msgstr "Menyemak mesej baru"
 msgid "Storing folder"
 msgstr "Menyimpan folder"
 
-#: camel/providers/local/camel-mbox-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:225
 #: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Tidak dapat mewujudkan kunci folder dalam %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Tidak dapat membuka peti mel: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Tambahan mel dibatalkan"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Tidak dapat menambahkan mesej pada fail peti mel: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:435
+#: camel/providers/local/camel-mbox-folder.c:466
+#: camel/providers/local/camel-mbox-folder.c:474
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9530,11 +9526,11 @@ msgstr ""
 "Tidak boleh mendapatkan mesej: %s dari folder %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:467
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Folder rosak dan tidak dapat dipulihkan."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:475
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Binaan mesej gagal: Peti mel rosak?"
 
@@ -9548,12 +9544,12 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:166
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not create directory `%s':\n"
 "%s"
 msgstr ""
-"Tidak dapat mewujudkan direktori %s:\n"
+"Tidak dapat mewujudkan direktori '%s':\n"
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:178
@@ -9588,29 +9584,32 @@ msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folder `%s' tidak kosong. Tidak dihapuskan."
 
 #: camel/providers/local/camel-mbox-store.c:311
-#, fuzzy
 msgid "Cannot create a folder by this name."
-msgstr "Tidak dapat mewujudkan folder dengan nama itu"
+msgstr "Tidak dapat mewujudkan folder dengan nama ini"
 
 #: camel/providers/local/camel-mbox-store.c:324
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot create directory `%s': %s."
-msgstr "Tidak dapat mewujudkan direktori %s: %s"
+msgstr "Tidak dapat mewujudkan direktori '%s': %s."
 
 #: camel/providers/local/camel-mbox-store.c:338
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot create folder: %s: %s"
-msgstr "Tidak boleh mendapatkan folder: %s: %s"
+msgstr "Tidak boleh mewujudkan folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:408
-#, fuzzy, c-format
+#: camel/providers/local/camel-mbox-store.c:340
+#, fuzzy
+msgid "Folder already exists"
+msgstr "ID objek telah wujud"
+
+#: camel/providers/local/camel-mbox-store.c:409
+#, c-format
 msgid "Could not rename %s to %s: %s"
-msgstr "Tidak dapat menamakan semula folder %s ke %s: %s"
+msgstr "Tidak dapat menamakan semula %s ke %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:427
-#, fuzzy
+#: camel/providers/local/camel-mbox-store.c:428
 msgid "The new folder name is illegal."
-msgstr "Nama folder yang ditetapkan tak sah: %s"
+msgstr "Nama folder baru tidak sah."
 
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
@@ -9651,7 +9650,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 mail/mail-component.c:1885
+#: camel/providers/local/camel-mbox-summary.c:560
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Tidak dapat menamakan semula folder: %s"
@@ -9770,27 +9769,26 @@ msgstr ""
 "Folder mungkin rosak, salinan disimpan dalam `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter the NNTP password for %s@%s"
-msgstr "%sSila masukkan kata laluan SMTP bagi %s@%s"
+msgstr "Sila masukkan kata laluan NNTP bagi %s@%s"
 
 #: camel/providers/nntp/camel-nntp-auth.c:64
 msgid "Server rejected username"
-msgstr ""
+msgstr "Pelayan menolak nama pengguna"
 
 #: camel/providers/nntp/camel-nntp-auth.c:70
-#, fuzzy
 msgid "Failed to send username to server"
-msgstr "Gagal disambungkan ke pelayan LDAP"
+msgstr "Gagal untuk menghantar nama pengguna ke pelayan"
 
 #: camel/providers/nntp/camel-nntp-auth.c:79
 msgid "Server rejected username/password"
-msgstr ""
+msgstr "Pelayan menolak nama pengguna/kata laluan"
 
 #: camel/providers/nntp/camel-nntp-folder.c:114
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
-msgstr ""
+msgstr "Ralat dalaman: uid dalam format tak sah: %s"
 
 #: camel/providers/nntp/camel-nntp-folder.c:155
 #: camel/providers/nntp/camel-nntp-folder.c:161
@@ -9811,24 +9809,19 @@ msgid "User cancelled"
 msgstr "Pengguna dibatalkan"
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:45
-#, fuzzy
 msgid "Could not get group list from server."
-msgstr "Tidak boleh mendapatkan kumpulan: %s"
+msgstr "Tidak boleh mendapatkan senarai kumpulan dar pelayan."
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:98
 #: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-"Tidak dapat mewujudkan fail output: %s\n"
-" %s"
+msgstr "Tidak dapat memuatkan fail senarai kumpulan untuk %s: %s"
 
 #: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-"Tidak dapat mewujudkan fail output: %s\n"
-" %s"
+msgstr "Tidak dapat menyimpan fail senarai kumpulan untuk %s: %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
@@ -9938,7 +9931,7 @@ msgstr "Hapuskan selepas %s hari"
 
 #: camel/providers/pop3/camel-pop3-provider.c:46
 msgid "Disable support for all POP3 extensions"
-msgstr ""
+msgstr "Melumpuhkan sokongan untuk semua sambungan POP3"
 
 #: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:81
 msgid "POP"
@@ -10256,7 +10249,7 @@ msgstr "Penghantaran mel SMTP melalui %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "Tidak dapat menghantar mesej: alamat penghantar tak sah."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:635
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
 msgid "Sending message"
 msgstr "Menghantar mesej"
 
@@ -10422,11 +10415,8 @@ msgid "Suggest automatic display of attachment"
 msgstr "Cadangkan paparan automatik bagi lampiran"
 
 #: composer/e-msg-composer-hdrs.c:289
-#, fuzzy
 msgid "You need to configure an account before you can compose mail."
-msgstr ""
-"Anda perlu membuat konfigurasi akaun\n"
-"sebelum anda boleh menggubah mel."
+msgstr "Anda perlu mengkonfigurasikan akaun sebelum anda boleh menggubah mel."
 
 #: composer/e-msg-composer-hdrs.c:482
 msgid "Click here for the address book"
@@ -10713,7 +10703,6 @@ msgid "Unread mail (local)"
 msgstr "Mel belum dibaca (setempat)"
 
 #: designs/OOA/ooa.glade.h:1
-#, fuzzy
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
 "\n"
@@ -10721,27 +10710,25 @@ msgid ""
 msgstr ""
 "<b>Status anda sekarang adalah \"Luar Pejabat\". </b>\n"
 "\n"
-"Anda ingin mengubah status anda kepada \"Dalam Pejabat\"? "
+"Adakah anda ingin mengubah status anda kepada \"Dalam Pejabat\"? "
 
 #: designs/OOA/ooa.glade.h:4
-#, fuzzy
 msgid "<b>Out of Office Message:</b>"
-msgstr "<b>Mesej Luar Pejabat:</b>"
+msgstr "<b>Luar Dari Mesej Pejabat:</b>"
 
 #: designs/OOA/ooa.glade.h:5
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
 #: designs/OOA/ooa.glade.h:6
-#, fuzzy
 msgid ""
 "<small>The message specified below will be automatically sent to each person "
 "who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
-"<kecil>Mesej yang ditetapkan di bawah akan dihantar secara automatik kepada "
+"<small>Mesej yang ditetapkan di bawah akan dihantar secara automatik kepada "
 "setiap orang yang menghantar\n"
-"mel kepada anda semasa anda berada di luar pejabat.</kecil>"
+"mel kepada anda semasa anda berada di luar pejabat.</small>"
 
 #: designs/OOA/ooa.glade.h:8
 msgid "I am currently in the office"
@@ -10768,31 +10755,28 @@ msgid "      "
 msgstr "      "
 
 #: designs/read_receipts/read.glade.h:2
-#, fuzzy
 msgid "<b>Receiving Email</b>"
-msgstr "Menerima E-mel"
+msgstr "<b>Menerima E-mel</b>"
 
 #: designs/read_receipts/read.glade.h:3
-#, fuzzy
 msgid "<b>Sending Email:</b>"
-msgstr "Menghantar E-mel"
+msgstr "<b>Menghantar E-mel</b>"
 
 #: designs/read_receipts/read.glade.h:4
-#, fuzzy
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
 "sent is read, and to specify what Evolution should do when someone requests "
 "a receipt from you.</small>"
 msgstr ""
-"<kecil>Halaman ini membolehkan anda memilih sekiranya anda ingin dimaklumkan "
-"melalui penerimaan telah dibaca apabila mesej yang anda\n"
+"<small>Halaman ini membolehkan anda memilih sekiranya anda ingin dimaklumkan "
+"melalui isyarat penerimaan apabila mesej yang anda\n"
 "hantar dibaca, dan untuk menetapkan apakah yang patut dibuat oleh Evolution "
-"apabila orang lain meminta isyarat penerimaan daripada anda.</kecil>"
+"apabila orang lain meminta isyarat penerimaan daripada anda.</small>"
 
 #: designs/read_receipts/read.glade.h:6
 msgid "Always send back a read reciept"
-msgstr "Sentiasa hantar balik penerimaan telah dibaca"
+msgstr "Sentiasa hantar balik isyarat penerimaan"
 
 #: designs/read_receipts/read.glade.h:7
 msgid "Ask me if I want to send back a read receipt"
@@ -11048,7 +11032,7 @@ msgstr "Kemudian"
 msgid "You must specify a folder."
 msgstr "Anda mestilah menetapkan folder."
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:437
+#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
 #: mail/mail-account-gui.c:1099
 msgid "Select Folder"
 msgstr "Pilih Folder"
@@ -11079,7 +11063,7 @@ msgstr "Perkara yang Perlu Dibuat"
 msgid "Later"
 msgstr "Selepas itu"
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+#: filter/filter-part.c:531
 msgid "Test"
 msgstr "Ujian"
 
@@ -11276,7 +11260,7 @@ msgstr "Ungkapan"
 msgid "Follow Up"
 msgstr "Susulan"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:689
+#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:703
 msgid "Label"
 msgstr "Label"
 
@@ -11346,112 +11330,117 @@ msgid "Source Account"
 msgstr "Akaun Sumber"
 
 #: filter/libfilter-i18n.h:35
+#, fuzzy
+msgid "Spam"
+msgstr "Percikan"
+
+#: filter/libfilter-i18n.h:36
 msgid "Specific header"
 msgstr "Pengepala yang khusus"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
 msgid "Stop Processing"
 msgstr "Hentikan Memproses"
 
-#: filter/libfilter-i18n.h:38 mail/em-format-html.c:1369 mail/em-format.c:678
+#: filter/libfilter-i18n.h:39 mail/em-format-html.c:1462 mail/em-format.c:678
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
 msgid "Subject"
 msgstr "Tajuk"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
 msgid "Unset Status"
 msgstr "Batalkan Set Status"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
 msgid "contains"
 msgstr "mengandungi"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
 msgid "does not contain"
 msgstr "tidak mengandungi"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:43
 msgid "does not end with"
 msgstr "tidak berakhir dengan"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:44
 msgid "does not exist"
 msgstr "tidak wujud"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:45
 msgid "does not return"
 msgstr "tidak kembali"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:46
 msgid "does not sound like"
 msgstr "tidak seperti "
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:47
 msgid "does not start with"
 msgstr "tidak dimulakan dengan"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:48
 msgid "ends with"
 msgstr "berakhir dengan"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:49
 msgid "exists"
 msgstr "wujud"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:50
 msgid "is Flagged"
 msgstr "ditandai"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:51
 msgid "is after"
 msgstr "adalah selepas"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:52
 msgid "is before"
 msgstr "adalah sebelum"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:53
 msgid "is greater than"
 msgstr "lebih besar daripada"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:54
 msgid "is less than"
 msgstr "kurang daripada"
 
-#: filter/libfilter-i18n.h:54
+#: filter/libfilter-i18n.h:55
 msgid "is not Flagged"
 msgstr "tidak ditandai"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:56
 msgid "is not"
 msgstr "tidak"
 
-#: filter/libfilter-i18n.h:56
+#: filter/libfilter-i18n.h:57
 msgid "is"
 msgstr "adalah"
 
-#: filter/libfilter-i18n.h:57
+#: filter/libfilter-i18n.h:58
 msgid "returns greater than"
 msgstr "kembalikan lebih besar daripada"
 
-#: filter/libfilter-i18n.h:58
+#: filter/libfilter-i18n.h:59
 msgid "returns less than"
 msgstr "kembalikan kurang daripada"
 
-#: filter/libfilter-i18n.h:59
+#: filter/libfilter-i18n.h:60
 msgid "returns"
 msgstr "kembali"
 
-#: filter/libfilter-i18n.h:60
+#: filter/libfilter-i18n.h:61
 msgid "sounds like"
 msgstr "seperti"
 
-#: filter/libfilter-i18n.h:61
+#: filter/libfilter-i18n.h:62
 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:921
+#: mail/mail-vfolder.c:918
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr "Tajuk peraturan '%s' tidak unik, pilih yang lain."
@@ -11476,19 +11465,81 @@ msgstr "Tajuk peraturan"
 msgid "Score Rules"
 msgstr "Peraturan Skor"
 
-#: filter/vfolder-rule.c:207
+#: filter/vfolder-rule.c:209
 msgid "You must name this vfolder."
 msgstr "Anda mestilah menamakan vfolder ini."
 
-#: filter/vfolder-rule.c:221
+#: filter/vfolder-rule.c:223
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 "Anda mestilah menetapkan sekurang-kurangnya satu folder sebagai sumber."
 
-#: filter/vfolder-rule.c:534
+#: filter/vfolder-rule.c:539
 msgid "VFolder source"
 msgstr "Sumber VFolder"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Keutamaan Penggubah"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Buat konfigurasi keutamaan mel, termasuk keselamatan dan paparan mesej, di "
+"sini"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Buat konfigurasi semakan ejaan, tandatangan dan penggubah mesej di sini"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Buat konfigurasi akaun e-mel anda di sini"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Mel Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Kawalan konfigurasi akaun Mel Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Komponen Mel Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Penggubah Mel Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Kawalan konfigurasi penggubah Mel Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail folder viewer"
+msgstr "Pemandang folder Mel Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+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/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
+#: mail/importers/pine-importer.c:572
+msgid "Mail"
+msgstr "Mel"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Akaun Mel"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
+msgid "Mail Preferences"
+msgstr "Keutamaan Mel"
+
 #: mail/em-account-prefs.c:233
 msgid "Are you sure you want to delete this account?"
 msgstr "Adakah anda pasti ingin menghapuskan akaun ini?"
@@ -11613,359 +11664,393 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Wujudkan _Folder Maya Daripada Carian..."
 
-#: mail/em-folder-browser.c:773 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572
-msgid "Mail"
-msgstr "Mel"
-
-#: mail/em-folder-selection-button.c:66
+#: mail/em-folder-selection-button.c:116
 #: shell/evolution-folder-selector-button.c:100
 msgid "<click here to select a folder>"
 msgstr "<klik di sini untuk memilih folder>"
 
-#: mail/em-folder-selection-button.c:89 shell/e-folder-list.c:122
-#: shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\" dalam \"%s\""
-
-#: mail/em-folder-selector.c:267
-#, fuzzy
+#: mail/em-folder-selector.c:234
 msgid "Folder _name"
-msgstr "Nama _folder:"
+msgstr "Nama _folder"
 
-#: mail/em-folder-view.c:577 mail/em-folder-view.c:591
-#: mail/mail-component.c:1632 mail/mail-component.c:1643
+#: mail/em-folder-view.c:589 mail/em-folder-view.c:603
 #: shell/e-shell-importer.c:1061
 msgid "Select folder"
 msgstr "Pilih folder"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:659 mail/em-popup.c:583
+#: mail/em-folder-view.c:671 mail/em-popup.c:588
 msgid "_Edit as New Message..."
 msgstr "_Edit sebagai Mesej Baru..."
 
-#: mail/em-folder-view.c:661
+#: mail/em-folder-view.c:673
 msgid "_Print"
 msgstr "_Cetak"
 
-#: mail/em-folder-view.c:664 ui/evolution-mail-message.xml.h:118
+#: mail/em-folder-view.c:676 ui/evolution-mail-message.xml.h:122
 msgid "_Reply to Sender"
 msgstr "_Balas kepada Penghantar"
 
-#: mail/em-folder-view.c:665 mail/em-popup.c:644
-#: ui/evolution-mail-message.xml.h:80
+#: mail/em-folder-view.c:677 mail/em-popup.c:649
+#: ui/evolution-mail-message.xml.h:84
 msgid "Reply to _List"
 msgstr "Balas kepada _Senarai"
 
-#: mail/em-folder-view.c:666 mail/em-popup.c:645
-#: ui/evolution-mail-message.xml.h:79
+#: mail/em-folder-view.c:678 mail/em-popup.c:650
+#: ui/evolution-mail-message.xml.h:83
 msgid "Reply to _All"
 msgstr "Balas kepada _Semua"
 
-#: mail/em-folder-view.c:667 mail/em-popup.c:647
+#: mail/em-folder-view.c:679 mail/em-popup.c:652
 msgid "_Forward"
 msgstr "_Sampaikan"
 
-#: mail/em-folder-view.c:670
+#: mail/em-folder-view.c:682
 msgid "Follo_w Up..."
 msgstr "Susu_lan..."
 
-#: mail/em-folder-view.c:671
+#: mail/em-folder-view.c:683
 msgid "Fla_g Completed"
 msgstr "Bendera Siap Ditunjukkan"
 
-#: mail/em-folder-view.c:672
+#: mail/em-folder-view.c:684
 msgid "Cl_ear Flag"
 msgstr "Ko_songkan Bendera"
 
-#: mail/em-folder-view.c:675 ui/evolution-mail-message.xml.h:47
+#: mail/em-folder-view.c:687 ui/evolution-mail-message.xml.h:47
 msgid "Mar_k as Read"
 msgstr "Tanda_kan sebagai Telah Dibaca"
 
-#: mail/em-folder-view.c:676
+#: mail/em-folder-view.c:688
 msgid "Mark as _Unread"
 msgstr "Tandakan sebagai _Belum Dibaca"
 
-#: mail/em-folder-view.c:677
+#: mail/em-folder-view.c:689
 msgid "Mark as _Important"
 msgstr "Tandakan sebagai _Penting"
 
-#: mail/em-folder-view.c:678
+#: mail/em-folder-view.c:690
 msgid "_Mark as Unimportant"
 msgstr "_Tandakan sebagai Tidak Penting"
 
-#: mail/em-folder-view.c:682
+#: mail/em-folder-view.c:691 ui/evolution-mail-message.xml.h:51
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Tandakan sebagai _Belum Dibaca"
+
+#: mail/em-folder-view.c:692 ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Tandakan sebagai _Penting"
+
+#: mail/em-folder-view.c:696
 msgid "U_ndelete"
 msgstr "Batalkan hapus"
 
-#: mail/em-folder-view.c:685
+#: mail/em-folder-view.c:699
 msgid "Mo_ve to Folder..."
 msgstr "Alih_kan ke Folder..."
 
-#: mail/em-folder-view.c:686 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:700 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Salin ke Folder..."
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:708
 msgid "Add Sender to Address_book"
 msgstr "Tambahkan Penghantar ke Buku_Alamat"
 
-#: mail/em-folder-view.c:697
+#: mail/em-folder-view.c:711
 msgid "Appl_y Filters"
 msgstr "Gunak_an Penapis"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:714
 msgid "Crea_te Rule From Message"
 msgstr "Wujud_kan Peraturan Daripada Mesej"
 
-#: mail/em-folder-view.c:701
+#: mail/em-folder-view.c:715
 msgid "VFolder on _Subject"
 msgstr "VFolder bagi _Tajuk"
 
-#: mail/em-folder-view.c:702
+#: mail/em-folder-view.c:716
 msgid "VFolder on Se_nder"
 msgstr "VFolder bagi Pen_ghantar"
 
-#: mail/em-folder-view.c:703
+#: mail/em-folder-view.c:717
 msgid "VFolder on _Recipients"
 msgstr "VFolder bagi _Penerima"
 
-#: mail/em-folder-view.c:704
+#: mail/em-folder-view.c:718
 msgid "VFolder on Mailing _List"
 msgstr "VFolder bagi Senarai _Mel"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:720
 #, fuzzy
 msgid "VFolder on Thread"
 msgstr "VFolder bagi Pen_ghantar"
 
-#: mail/em-folder-view.c:710
+#: mail/em-folder-view.c:724
 msgid "Filter on Sub_ject"
 msgstr "Penapis bagi Ta_juk"
 
-#: mail/em-folder-view.c:711
+#: mail/em-folder-view.c:725
 msgid "Filter on Sen_der"
 msgstr "Penapis bagi Peng_hantar"
 
-#: mail/em-folder-view.c:712
+#: mail/em-folder-view.c:726
 msgid "Filter on Re_cipients"
 msgstr "Penapis bagi Pe_nerima"
 
-#: mail/em-folder-view.c:713
+#: mail/em-folder-view.c:727
 msgid "Filter on _Mailing List"
 msgstr "Penapis bagi _Senarai Mel"
 
-#: mail/em-folder-view.c:715
+#: mail/em-folder-view.c:729
 #, fuzzy
 msgid "Filter on Thread"
 msgstr "Penapis bagi Peng_hantar"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1487 mail/em-folder-view.c:1525
+#: mail/em-folder-view.c:1507 mail/em-folder-view.c:1545
 #: mail/mail-config.glade.h:38
 msgid "Default"
 msgstr "Piawai"
 
-#: mail/em-folder-view.c:1559
+#: mail/em-folder-view.c:1579
 msgid "Print Message"
 msgstr "Cetak Mesej"
 
-#: mail/em-folder-view.c:1800
-#, fuzzy
+#: mail/em-folder-view.c:1820
 msgid "_Copy Link Location"
-msgstr "Salin Lokasi Pautan"
+msgstr "_Salin Lokasi Pautan"
 
 #. message-search popup match count string
 #: mail/em-format-html-display.c:343
-#, fuzzy, c-format
+#, c-format
 msgid "Matches: %d"
-msgstr "Padanan:"
+msgstr "Padanan: %d"
+
+#: mail/em-format-html-display.c:570
+#, fuzzy
+msgid ""
+"This message is not signed.  There is no guarantee the sender of the message "
+"is authentic."
+msgstr ""
+"Mesej ini ditandatangani secara digital dan tidak dapat dibuktikan sah."
+
+#: mail/em-format-html-display.c:571
+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
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:573
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"Token_input mengandungi tandatangan tak sah, atau tandatangan yang tidak "
+"dapat disah betul."
+
+#: mail/em-format-html-display.c:579
+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
+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
+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:638
+#: mail/em-format-html-display.c:582
+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
+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:728
-#, fuzzy
+#: mail/em-format-html-display.c:917
 msgid "_View Inline"
-msgstr "Lihat Dalam Talian"
+msgstr "_Lihat Dalam Talian"
 
-#: mail/em-format-html-display.c:729
-#, fuzzy
+#: mail/em-format-html-display.c:918
 msgid "_Hide"
-msgstr "Sembunyikan"
+msgstr "_Sembunyikan"
 
 #: mail/em-format-html-print.c:99
 #, c-format
 msgid "Page %d of %d"
 msgstr "Halaman %d daripada %d"
 
-#: mail/em-format-html.c:451 mail/em-format-html.c:453
-#, fuzzy, c-format
+#: mail/em-format-html.c:454 mail/em-format-html.c:456
+#, c-format
 msgid "Retrieving `%s'"
-msgstr "Mendapatkan semula mesej %s"
+msgstr "Mendapatkan semula %s"
 
-#: mail/em-format-html.c:708
+#: mail/em-format-html.c:803
 msgid "Malformed external-body part."
 msgstr "Bahagian badan luaran tidak sempurna."
 
-#: mail/em-format-html.c:738
+#: mail/em-format-html.c:833
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Penuding ke tapak FTP (%s)"
 
-#: mail/em-format-html.c:749
+#: mail/em-format-html.c:844
 #, 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:751
+#: mail/em-format-html.c:846
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Penuding ke fail setempat (%s)"
 
-#: mail/em-format-html.c:772
+#: mail/em-format-html.c:867
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Penuding ke data jauh (%s)"
 
-#: mail/em-format-html.c:783
+#: mail/em-format-html.c:878
 #, 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:905 mail/em-format.c:1219
+#: 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:906 mail/em-format.c:1217
+#: 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:930 mail/em-format.c:1190
-msgid "No signature present"
-msgstr ""
-
-#: mail/em-format-html.c:932 mail/em-format.c:1192
-#, fuzzy
+#: mail/em-format-html.c:1023 mail/em-format.c:1188
 msgid "Session not initialised"
-msgstr "Tidak dapat memulakan Bonobo"
+msgstr "Sesi tidak dapat dimulakan"
 
-#: mail/em-format-html.c:943 mail/em-format.c:1203
-#, fuzzy
+#: mail/em-format-html.c:1034 mail/em-format.c:1199
 msgid "Unsupported signature format"
-msgstr "Skema yang tidak disokong"
+msgstr "Format tandatangan yang tidak disokong"
 
-#: mail/em-format-html.c:992
+#: mail/em-format-html.c:1083
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Tidak dapat menghuraikan mesej MIME. Dipaparkan sebagai sumber."
 
-#: mail/em-format-html.c:1079
-#, fuzzy
+#: mail/em-format-html.c:1172
 msgid "Formatting message"
-msgstr "Mengalihkan mesej"
+msgstr "Memformat mesej"
 
-#: mail/em-format-html.c:1354 mail/em-format.c:673
+#: mail/em-format-html.c:1447 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:1356 mail/em-format.c:674
+#: mail/em-format-html.c:1449 mail/em-format.c:674
 msgid "Reply-To"
 msgstr "Balas Kepada"
 
-#: mail/em-format-html.c:1358 mail/em-format.c:675
+#: mail/em-format-html.c:1451 mail/em-format.c:675
 #: mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kepada"
 
-#: mail/em-format-html.c:1360 mail/em-format.c:676
+#: mail/em-format-html.c:1453 mail/em-format.c:676
 msgid "Cc"
 msgstr "Sk"
 
-#: mail/em-format-html.c:1362 mail/em-format.c:677
+#: mail/em-format-html.c:1455 mail/em-format.c:677
 msgid "Bcc"
 msgstr "St"
 
-#: mail/em-format-html.c:1381
+#: mail/em-format-html.c:1474
 msgid "Mailer"
 msgstr "Pengemel"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1408
+#: mail/em-format-html.c:1501
 msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
+msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1411
+#: mail/em-format-html.c:1504
 msgid "<I> (%R %Z)</I>"
-msgstr ""
+msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1422 mail/em-format.c:679
+#: mail/em-format-html.c:1515 mail/em-format.c:679
 #: mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarikh"
 
-#: mail/em-format.c:893
+#: mail/em-format.c:892
 #, c-format
 msgid "%s attachment"
 msgstr "lampiran %s"
 
-#: mail/em-format.c:1259
-#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Tidak dapat menghuraikan mesej MIME. Dipaparkan sebagai sumber."
-
-#: mail/em-popup.c:593
+#: mail/em-popup.c:598
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
-#: mail/em-popup.c:641
+#: mail/em-popup.c:646
 msgid "Set as _Background"
-msgstr ""
+msgstr "Set sebagai _Latar belakang"
 
-#: mail/em-popup.c:643
-#, fuzzy
+#: mail/em-popup.c:648
 msgid "_Reply to sender"
-msgstr "_Balas kepada Penghantar"
+msgstr "_Balas kepada penghantar"
 
-#: mail/em-popup.c:680
-#, fuzzy
+#: mail/em-popup.c:685
 msgid "_Open Link in Browser"
-msgstr "Buka Pautan dalam Pelayar"
+msgstr "_Buka Pautan dalam Pelayar"
 
-#: mail/em-popup.c:681
-#, fuzzy
+#: mail/em-popup.c:686
 msgid "Se_nd message to..."
-msgstr "Hantar _mesej ke senarai..."
+msgstr "Ha_ntar mesej ke..."
 
-#: mail/em-popup.c:682
-#, fuzzy
+#: mail/em-popup.c:687
 msgid "_Add to Addressbook"
-msgstr "Tambahkan Penghantar ke Buku Alamat"
+msgstr "_Tambah ke Buku Alamat"
 
-#: mail/em-popup.c:788
+#: mail/em-popup.c:793
 #, c-format
 msgid "Open in %s..."
 msgstr "Buka dalam %s..."
 
 #: mail/em-subscribe-editor.c:579
-#, fuzzy
 msgid "This store does not support subscriptions, or the are not enabled."
-msgstr "Pelayan ini tidak menyokong maklumat skema LDAPv3"
+msgstr "Stor ini tidak menyokong langganan, atau ia tidak diaktifkan."
 
 #: mail/em-subscribe-editor.c:608
-#, fuzzy
 msgid "Subscribed"
-msgstr "Langgan"
+msgstr "Dilanggan"
 
-#: mail/em-subscribe-editor.c:612 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:612
 msgid "Folder"
 msgstr "Folder"
 
@@ -11996,9 +12081,8 @@ msgid "Filters"
 msgstr "Penapis"
 
 #: mail/em-utils.c:486
-#, fuzzy
 msgid "-------- Forwarded Message --------"
-msgstr "Mesej yang disampaikan"
+msgstr "-------- Mesej Yang Disampaikan --------"
 
 #: mail/em-utils.c:1039
 msgid "an unknown sender"
@@ -12007,9 +12091,8 @@ 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
-#, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "Pada %a, %Y-%m-%d di %H:%M, %%s menulis:"
+msgstr "Pada %a, %Y-%m-%d di %H:%M %%+05d, %%s menulis:"
 
 #: mail/em-utils.c:1325
 #, c-format
@@ -12030,16 +12113,14 @@ msgstr ""
 "Tulis gantinya?"
 
 #: mail/em-utils.c:1373
-#, fuzzy
 msgid "message"
-msgstr "Mesej"
+msgstr "mesej"
 
 #: mail/em-utils.c:1430
-#, fuzzy
 msgid "Save Message..."
-msgstr "Simpan Mesej Sebagai..."
+msgstr "Simpan Mesej..."
 
-#: mail/em-utils.c:1893 mail/mail-component.c:501
+#: mail/em-utils.c:1893
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Tidak dapat mewujudkan direktori sementara: %s"
@@ -12058,61 +12139,33 @@ msgstr ""
 "\n"
 "Anda pasti ingin menghapuskan mesej ini?"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Keutamaan Penggubah"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Buat konfigurasi keutamaan mel, termasuk keselamatan dan paparan mesej, di "
-"sini"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Buat konfigurasi semakan ejaan, tandatangan dan penggubah mesej di sini"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Buat konfigurasi akaun e-mel anda di sini"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Mel Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Kawalan konfigurasi akaun Mel Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Komponen Mel Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Pengimport Elm Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Penggubah Mel Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
+msgid "Evolution mbox importer"
+msgstr "Pengimport peti mel Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Kawalan konfigurasi penggubah Mel Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
+msgid "MBox (mbox)"
+msgstr "Peti Mel (peti mel)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Pemandang folder Mel Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Netscape Mail importer"
+msgstr "Pengimport Mel Netscape Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Kawalan keutamaan Mel Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Pengimport Outlook Express 4 Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Akaun Mel"
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:68
-msgid "Mail Preferences"
-msgstr "Keutamaan Mel"
+#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+msgid "Evolution Pine importer"
+msgstr "Pengimport Pine Evolution"
 
 #: mail/importers/elm-importer.c:105
 msgid "Evolution is importing your old Elm mail"
@@ -12152,34 +12205,6 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Pengimport Elm Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "Pengimport peti mel Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "Peti Mel (peti mel)"
-
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
-msgstr "Pengimport Mel Netscape Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Pengimport Outlook Express 4 Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
-msgstr "Pengimport Pine Evolution"
-
 #: mail/importers/netscape-importer.c:75
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -12242,9 +12267,7 @@ msgstr ""
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution sedang mengimport data Netscape lama anda"
 
-#. Fill in the new fields
-#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1110
-#: shell/e-local-storage.c:184
+#: mail/importers/netscape-importer.c:1842 mail/mail-ops.c:1119
 msgid "Trash"
 msgstr "Sampah"
 
@@ -12347,7 +12370,7 @@ msgstr "Nama_pengguna:"
 msgid "_Path:"
 msgstr "_Laluan:"
 
-#: mail/mail-account-gui.c:1946
+#: mail/mail-account-gui.c:1970
 msgid "You may not create two accounts with the same name."
 msgstr "Anda tidak boleh mewujudkan dua akaun dengan nama yang sama."
 
@@ -12395,142 +12418,29 @@ msgstr ""
 "    '%s'\n"
 "Dan telah dikemaskinikan."
 
-#: mail/mail-component.c:194
-msgid "Connecting..."
-msgstr "Sedang disambungkan..."
-
-#: mail/mail-component.c:351
+#: mail/mail-component.c:211
 msgid "On this Computer"
-msgstr ""
+msgstr "Atas komputer ini"
 
-#: mail/mail-component.c:373
-msgid "This folder cannot contain messages."
-msgstr "Folder ini tidak boleh mengandungi mesej."
+#: mail/mail-component.c:362
+msgid "New Mail Message"
+msgstr "Mesej Mel Baru"
 
-#: mail/mail-component.c:487
-#, fuzzy, c-format
-msgid "Could not open source folder: %s"
-msgstr "Tidak dapat membuka folder kongsi: %s."
-
-#: mail/mail-component.c:516
-#, fuzzy, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "Tidak dapat mewujudkan direktori sementara: %s"
+#: mail/mail-component.c:363
+msgid "_Mail Message"
+msgstr "_Mesej Mel"
 
-#: mail/mail-component.c:532
-#, fuzzy, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "Tidak dapat mewujudkan fail sementara '%s': %s"
+#: mail/mail-component.c:364
+msgid "Compose a new mail message"
+msgstr "Gubah mesej mel baru"
 
-#: mail/mail-component.c:553
-#, fuzzy, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "Tidak dapat menutup folder sementara: %s"
-
-#: mail/mail-component.c:1014
+#: mail/mail-component.c:445
 #, c-format
 msgid ""
 "The following error occured while migrating your mail data:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-component.c:1632
-#, fuzzy
-msgid "Select destination to copy folder into"
-msgstr "Pilih folder destinasi untuk mengimport data ini"
-
-#: mail/mail-component.c:1643
-#, fuzzy
-msgid "Select destination to move folder into"
-msgstr "Pilih folder destinasi untuk mengimport data ini"
-
-#: mail/mail-component.c:1707
-#, fuzzy
-msgid "Create folder"
-msgstr "Wujudkan folder baru"
-
-#: mail/mail-component.c:1707
-#: 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/mail-component.c:1788
-#, fuzzy, c-format
-msgid "Could not delete folder: %s"
-msgstr "Tidak dapat menghapuskan folder `%s': %s"
-
-#: mail/mail-component.c:1812
-#, fuzzy, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Anda pasti ingin menghapuskan folder \"%s\"?"
-
-#: mail/mail-component.c:1821 shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Hapuskan \"%s\""
-
-#: mail/mail-component.c:1842 shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Namakan semula folder \"%s\" kepada:"
-
-#: mail/mail-component.c:1844 shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Namakan semula Folder"
-
-#: mail/mail-component.c:1849 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"
-
-#: mail/mail-component.c:1860
-#, c-format
-msgid "A folder named \"%s\" already exists.  Please use a different name."
-msgstr ""
-
-#: mail/mail-component.c:1967
-#, fuzzy
-msgid "Folder properties"
-msgstr "Ciri-ciri Fon"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/mail-component.c:1975
-msgid "Properties"
-msgstr "Ciri-ciri"
-
-#: mail/mail-component.c:1979
-#, fuzzy
-msgid "Folder Name"
-msgstr "_Nama Folder:"
-
-#: mail/mail-component.c:2078 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:30
-msgid "_View"
-msgstr "_Lihat"
-
-#: mail/mail-component.c:2079
-#, fuzzy
-msgid "Open in _New Window"
-msgstr "Buka dalam Tetingkap Baru"
-
-#: mail/mail-component.c:2084
-#, fuzzy
-msgid "_Move"
-msgstr "Alihkan"
-
-#: mail/mail-component.c:2087
-msgid "_New Folder..."
-msgstr "_Folder Baru..."
-
-#: mail/mail-component.c:2089 shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Namakan semula"
-
-#: mail/mail-component.c:2092 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Ciri-ciri..."
-
 #: mail/mail-config-druid.c:367 mail/mail-config.glade.h:60
 msgid "Identity"
 msgstr "Pengenalan"
@@ -12770,7 +12680,7 @@ msgstr "Kosongkan _folder sampah apabila keluar"
 #: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Encry_ption certificate:"
-msgstr "_ID Sijil:"
+msgstr "Sijil Kenalan"
 
 #: mail/mail-config.glade.h:53
 msgid "Evolution Account Assistant"
@@ -12967,7 +12877,7 @@ msgstr "Jenis _Pelayan:"
 #: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Si_gning certificate:"
-msgstr "Sijil swatandatangan dalam rantaian"
+msgstr "Sijil tandatangan tidak dijumpai"
 
 #: mail/mail-config.glade.h:113
 msgid "Specify _filename:"
@@ -13147,7 +13057,7 @@ msgstr "_Skrip:"
 #: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Select..."
-msgstr "Hapuskan..."
+msgstr "_Hapuskan..."
 
 #: mail/mail-config.glade.h:165
 msgid "_Sending Mail"
@@ -13181,12 +13091,12 @@ msgstr "_Gunakan fon yang sama seperti aplikasi lain"
 msgid "description"
 msgstr "huraian"
 
-#: mail/mail-folder-cache.c:830
+#: mail/mail-folder-cache.c:776
 #, c-format
 msgid "Pinging %s"
 msgstr "%s berdenting"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:256
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13195,7 +13105,7 @@ msgstr ""
 "Ralat semasa '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:260
+#: mail/mail-mt.c:259
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13204,7 +13114,7 @@ msgstr ""
 "Ralat semasa melakukan pengendalian:\n"
 "%s"
 
-#: mail/mail-mt.c:911
+#: mail/mail-mt.c:910
 msgid "Working"
 msgstr "Berfungsi"
 
@@ -13216,118 +13126,125 @@ msgstr "Menapis Folder"
 msgid "Fetching Mail"
 msgstr "Mengambil Mel"
 
-#: mail/mail-ops.c:561
-#, fuzzy, c-format
+#: mail/mail-ops.c:558
+#, c-format
 msgid "Failed to apply outgoing filters: %s"
-msgstr "Gagal menyimpan mel dalam fail sementara %s: %s"
+msgstr "Gagal menggunakan penapis luaran: %s"
 
-#: mail/mail-ops.c:582
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
+"Gagal untuk menambah ke %s: %s\n"
+"Sebagai ganti menambah ke folder 'Hantar' setempat."
 
-#: mail/mail-ops.c:591
-#, fuzzy, c-format
+#: mail/mail-ops.c:588
+#, c-format
 msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Gagal menyimpan mel dalam fail sementara %s: %s"
+msgstr "Gagal untuk menambah ke folder 'Hantar' setempat: %s"
 
-#: mail/mail-ops.c:633
+#: mail/mail-ops.c:630
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Menghantar \"%s\""
 
-#: mail/mail-ops.c:751
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Menghantar mesej %d daripada %d"
 
-#: mail/mail-ops.c:770
+#: mail/mail-ops.c:767
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Gagal pada mesej %d daripada %d"
 
-#: mail/mail-ops.c:772
+#: mail/mail-ops.c:769
 msgid "Complete."
 msgstr "Selesai."
 
-#: mail/mail-ops.c:866
+#: mail/mail-ops.c:863
 msgid "Saving message to folder"
 msgstr "Menyimpan mesej ke folder"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mengalihkan mesej ke %s"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Menyalin mesej ke %s"
 
-#: mail/mail-ops.c:1060
+#: mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Mengimbas folder dalam \"%s\""
 
-#: mail/mail-ops.c:1248
+#: mail/mail-ops.c:1125
+#, fuzzy
+msgid "Junk"
+msgstr "Jun"
+
+#: mail/mail-ops.c:1260
 msgid "Forwarded messages"
 msgstr "Mesej yang disampaikan"
 
-#: mail/mail-ops.c:1291
+#: mail/mail-ops.c:1303
 #, c-format
 msgid "Opening folder %s"
 msgstr "Membuka folder %s"
 
-#: mail/mail-ops.c:1363
+#: mail/mail-ops.c:1375
 #, c-format
 msgid "Opening store %s"
 msgstr "Membuka simpanan %s"
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1453
 #, c-format
 msgid "Removing folder %s"
 msgstr "Mengeluarkan folder %s"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1547
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Menyimpan folder '%s'"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1598
 msgid "Refreshing folder"
 msgstr "Memuatkan semula folder"
 
-#: mail/mail-ops.c:1622 mail/mail-ops.c:1673
+#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
 msgid "Expunging folder"
 msgstr "Membuang folder"
 
-#: mail/mail-ops.c:1670
-#, fuzzy, c-format
+#: mail/mail-ops.c:1682
+#, c-format
 msgid "Emptying trash in '%s'"
-msgstr "Mengimport %s sebagai %s"
+msgstr "Mengosongkan tong sampah dalam '%s'"
 
-#: mail/mail-ops.c:1671 shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1683
 msgid "Local Folders"
 msgstr "Folder Setempat"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1758
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Mendapatkan semula mesej %s"
 
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1830
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Mendapatkan semula %d mesej"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:1914
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Menyimpan %d mesej"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1962
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13336,7 +13253,7 @@ msgstr ""
 "Tidak dapat mewujudkan fail output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1978
+#: mail/mail-ops.c:1990
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13345,11 +13262,11 @@ msgstr ""
 "Ralat ketika menyimpan mesej ke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2049
+#: mail/mail-ops.c:2061
 msgid "Saving attachment"
 msgstr "Menyimpan lampiran"
 
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2078
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13358,21 +13275,25 @@ msgstr ""
 "Tidak dapat mewujudkan fail output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2096
+#: mail/mail-ops.c:2108
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2256
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Terputus daripada %s"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2256
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Disambungkan semula ke %s"
 
+#: mail/mail-ops.c:2358
+msgid "Changing junk status"
+msgstr ""
+
 #: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Peka Huruf"
@@ -13389,59 +13310,59 @@ msgstr "Cari:"
 msgid "Search"
 msgstr "Cari"
 
-#: mail/mail-send-recv.c:148
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Sedang membatalkan..."
 
-#: mail/mail-send-recv.c:256
+#: mail/mail-send-recv.c:253
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Pelayan: %s, Jenis: %s"
 
-#: mail/mail-send-recv.c:258
+#: mail/mail-send-recv.c:255
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Laluan: %s, Jenis: %s"
 
-#: mail/mail-send-recv.c:260
+#: mail/mail-send-recv.c:257
 #, c-format
 msgid "Type: %s"
 msgstr "Jenis: %s"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Hantarkan dan Terima Mel"
 
-#: mail/mail-send-recv.c:310
+#: mail/mail-send-recv.c:307
 msgid "Cancel _All"
 msgstr "Batalkan _Semua"
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:388
 msgid "Updating..."
 msgstr "Sedang mengemaskinikan..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:443
+#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
 msgid "Waiting..."
 msgstr "Sedang menunggu..."
 
-#: mail/mail-session.c:230
+#: mail/mail-session.c:231
 msgid "User canceled operation."
 msgstr "Pengguna membatalkan pengendalian."
 
-#: mail/mail-session.c:263
+#: mail/mail-session.c:264
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Masukkan Kata Laluan bagi %s"
 
-#: mail/mail-session.c:265
+#: mail/mail-session.c:266
 msgid "Enter Password"
 msgstr "Masukkan Kata Laluan"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:289
 msgid "_Remember this password"
 msgstr "_Ingat kata laluan ini"
 
-#: mail/mail-session.c:289
+#: mail/mail-session.c:290
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Ingat kata laluan ini bagi sesi seterusnya"
 
@@ -13480,26 +13401,26 @@ msgstr "Masukkan nama bagi tandatangan ini."
 msgid "Name:"
 msgstr "Nama:"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:271
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mesej yang disampaikan - %s"
 
-#: mail/mail-tools.c:281
+#: mail/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Mesej yang disampaikan"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-vfolder.c:90
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Menyediakan vfolder: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:208
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Mengemaskinikan vfolder bagi uri: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:466
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13512,88 +13433,88 @@ msgstr ""
 "    '%s'\n"
 "Dan telah dikemaskinikan."
 
-#: mail/mail-vfolder.c:780
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "VFolder"
 
-#: mail/mail-vfolder.c:839
+#: mail/mail-vfolder.c:836
 msgid "vFolders"
 msgstr "vFolder"
 
-#: mail/mail-vfolder.c:878
+#: mail/mail-vfolder.c:875
 msgid "Edit VFolder"
 msgstr "Edit vFolder"
 
-#: mail/mail-vfolder.c:898
+#: mail/mail-vfolder.c:895
 #, 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:970
+#: mail/mail-vfolder.c:967
 msgid "New VFolder"
 msgstr "VFolder Baru"
 
-#: mail/message-list.c:900
+#: mail/message-list.c:902
 msgid "Unseen"
 msgstr "Belum dilihat"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:903
 msgid "Seen"
 msgstr "Dilihat"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:904
 msgid "Answered"
 msgstr "Dijawab"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:905
 msgid "Multiple Unseen Messages"
 msgstr "Pelbagai Mesej yang Belum Dilihat"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:906
 msgid "Multiple Messages"
 msgstr "Pelbagai Mesej"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:910
 msgid "Lowest"
 msgstr "Paling rendah"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:911
 msgid "Lower"
 msgstr "Lebih rendah"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:915
 msgid "Higher"
 msgstr "Lebih tinggi"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:916
 msgid "Highest"
 msgstr " Paling tinggi"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1233
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1240
 msgid "Today %l:%M %p"
 msgstr "Hari ini %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1249
 msgid "Yesterday %l:%M %p"
 msgstr "Semalam %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1261
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1269
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1271
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:3073
 msgid "Generating message list"
 msgstr "Menjana senarai mesej"
 
@@ -13649,11 +13570,11 @@ msgstr "Sampaikan"
 msgid "No Response Necessary"
 msgstr "Maklum Balas Tidak Perlu"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:81
 msgid "Reply"
 msgstr "Balas"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:82
 msgid "Reply to All"
 msgstr "Balas kepada Semua"
 
@@ -13705,41 +13626,36 @@ msgstr "_Langgan"
 msgid "_Unsubscribe"
 msgstr "_Batalkan langganan"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Tidak dapat memindahkan folder:\n"
-"%s"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr "Buat konfigurasi folder khas dan peri laku folder luar talian di sini"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Tambahkan Folder"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell"
+msgstr "Cangkerang Evolution"
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Draf"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+msgid "Evolution folder settings configuration control"
+msgstr "Kawalan konfigurasi seting folder Evolution"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Kotak masuk"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
+msgid "Folder Settings"
+msgstr "Seting Folder"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Kotak keluar"
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
+#, c-format
+msgid "\"%s\" in \"%s\""
+msgstr "\"%s\" dalam \"%s\""
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Dihantar"
+#: shell/e-folder-list.c:338
+msgid "Add a Folder"
+msgstr "Tambahkan Folder"
 
-#: shell/e-setup.c:145
+#: shell/e-setup.c:144
 msgid "Could not update files correctly"
 msgstr "Tidak dapat mengemaskinikan fail dengan betul"
 
-#: shell/e-setup.c:166
+#: shell/e-setup.c:165
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -13750,7 +13666,7 @@ msgstr ""
 "%s\n"
 "Ralat: %s"
 
-#: shell/e-setup.c:177
+#: shell/e-setup.c:176
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -13759,7 +13675,7 @@ msgstr ""
 "Ada ralat ketika menyalin fail ke dalam\n"
 "`%s'."
 
-#: shell/e-setup.c:243
+#: shell/e-setup.c:242
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -13770,7 +13686,7 @@ msgstr ""
 "Sila alihkannya untuk membolehkan pemasangan\n"
 "fail pengguna Evolution."
 
-#: shell/e-setup.c:252
+#: shell/e-setup.c:251
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -13859,6 +13775,11 @@ 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 ""
@@ -13868,10 +13789,25 @@ 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 ""
+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"
@@ -13932,6 +13868,10 @@ msgid ""
 "that could be imported where found. If you would like to\n"
 "try again, please click the \"Back\" button.\n"
 msgstr ""
+"Evolution ditanda bagi seting untuk mengimportnya daripada\n"
+"aplikasi berikut: Pine, Netscape, Elm, iCalendar. Tiada seting\n"
+"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
 #, c-format
@@ -14002,28 +13942,24 @@ msgid "Automatic"
 msgstr "Automatik"
 
 #: shell/e-shell-importer.c:643
-#, fuzzy
 msgid "_Filename:"
-msgstr "Nama fail:"
+msgstr "_Namafail:"
 
 #: shell/e-shell-importer.c:648
 msgid "Select a file"
 msgstr "Pilih fail"
 
 #: shell/e-shell-importer.c:658
-#, fuzzy
 msgid "File _type:"
-msgstr "Jenis fail"
+msgstr "_Jenis fail:"
 
 #: shell/e-shell-importer.c:684
-#, fuzzy
 msgid "Import data and settings from _older programs"
-msgstr "Import data dan seting daripada atur cara lama"
+msgstr "Import data dan seting daripada program _lama"
 
 #: shell/e-shell-importer.c:687
-#, fuzzy
 msgid "Import a _single file"
-msgstr "Import fail tunggal"
+msgstr "Import fail _tunggal"
 
 #: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
 msgid ""
@@ -14047,9 +13983,8 @@ msgid "Select a destination folder for importing this data"
 msgstr "Pilih folder destinasi untuk mengimport data ini"
 
 #: shell/e-shell-importer.c:1191
-#, fuzzy
 msgid "_Import"
-msgstr "Import"
+msgstr "_Import"
 
 #: shell/e-shell-offline-handler.c:592
 msgid "Closing connections..."
@@ -14116,17 +14051,15 @@ msgid ""
 "\n"
 "Do you want to quit using the Assistant now?"
 msgstr ""
+"Jika anda keluar dari pembantu persediaan Evolution sekarang, semua maklumat "
+"yang anda masukkan akan hilang. Anda perlu melarikan semula pembantu ini "
+"semula sebelum menggunakan Evolution.\n"
+"\n"
+"Adakah anda mahu berhenti menggunakan Pembantu ini sekarang?"
 
 #: shell/e-shell-startup-wizard.c:782
-#, fuzzy
 msgid "Quit Assistant"
-msgstr "Pembantu"
-
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Baru"
+msgstr "Keluar dari Pembantu"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -14185,64 +14118,33 @@ msgstr "Wujudkan Jalan Pintas Baru"
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Pilih folder yang ingin dituding oleh jalan pintas:"
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:279
+#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
 msgid "_Work Online"
 msgstr "_Bekerja Dalam Talian"
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:292
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
+#: ui/evolution.xml.h:34
 msgid "_Work Offline"
 msgstr "_Bekerja Luar Talian"
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:305
-#: ui/evolution.xml.h:19
+#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
+#: ui/evolution.xml.h:20
 msgid "Work Offline"
 msgstr "Bekerja Luar Talian"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Tiada folder dipaparkan)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Tiada)"
-
-#: shell/e-shell-view.c:2083
-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-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution adalah dalam proses menjadi luar talian."
-
-#: shell/e-shell-view.c:2096
-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:906
+#: shell/e-shell.c:987
 msgid "Invalid arguments"
 msgstr "Argumen tak sah"
 
-#: shell/e-shell.c:908
+#: shell/e-shell.c:989
 msgid "Cannot register on OAF"
 msgstr "Tidak dapat mendaftarkan dalam OAF"
 
-#: shell/e-shell.c:910
+#: shell/e-shell.c:991
 msgid "Configuration Database not found"
 msgstr "Pangkalan Data Konfigurasi tidak dijumpai"
 
-#: shell/e-shell.c:912 shell/e-storage.c:571
+#: shell/e-shell.c:993
 msgid "Generic error"
 msgstr "Ralat generik"
 
@@ -14346,6 +14248,10 @@ 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"
 
@@ -14357,74 +14263,18 @@ msgstr "Ke_luarkan"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Keluarkan jalan pintas ini daripada bar jalan pintas"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:650
 msgid "Error saving shortcuts."
 msgstr "Ralat ketika menyimpan jalan pintas."
 
-#: shell/e-shortcuts.c:1096
+#: shell/e-shortcuts.c:1085
+msgid "Inbox"
+msgstr "Kotak masuk"
+
+#: shell/e-shortcuts.c:1097
 msgid "Shortcuts"
 msgstr "Jalan pintas"
 
-#: shell/e-storage.c:569
-msgid "No error"
-msgstr "Tiada ralat"
-
-#: shell/e-storage.c:573
-msgid "A folder with the same name already exists"
-msgstr "Folder dengan nama yang sama telah wujud"
-
-#: shell/e-storage.c:575
-msgid "The specified folder type is not valid"
-msgstr "Jenis folder  yang ditetapkan tak sah"
-
-#: shell/e-storage.c:577
-msgid "I/O error"
-msgstr "Ralat I/O"
-
-#: shell/e-storage.c:579
-msgid "Not enough space to create the folder"
-msgstr "Tidak cukup ruang untuk mewujudkan folder"
-
-#: shell/e-storage.c:581
-msgid "The folder is not empty"
-msgstr "Folder tidak kosong"
-
-#: shell/e-storage.c:583
-msgid "The specified folder was not found"
-msgstr "Folder yang ditetapkan tidak dijumpai"
-
-#: shell/e-storage.c:585
-msgid "Function not implemented in this storage"
-msgstr "Fungsi tidak dilaksanakan dalam storan ini"
-
-#: shell/e-storage.c:589
-msgid "Operation not supported"
-msgstr "Pengendalian tidak disokong"
-
-#: shell/e-storage.c:591
-msgid "The specified type is not supported in this storage"
-msgstr "Jenis yang ditetapkan tidak disokong dalam storan ini"
-
-#: shell/e-storage.c:593
-msgid "The specified folder cannot be modified or removed"
-msgstr "Folder yang ditetapkan tidak boleh diubah suai atau dikeluarkan"
-
-#: shell/e-storage.c:595
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Tidak dapat membuat folder anak daripada salah satu turunannya"
-
-#: shell/e-storage.c:597
-msgid "Cannot create a folder with that name"
-msgstr "Tidak dapat mewujudkan folder dengan nama itu"
-
-#: shell/e-storage.c:599
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Pengendalian ini tidak dapat dijalankan dalam mod luar talian"
-
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Kotak semak"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -14532,14 +14382,6 @@ msgstr "Tiada lagi ruang"
 msgid "Old owner has died"
 msgstr "Pemilik lama telah meninggal dunia"
 
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr "Jenis ujian"
-
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr "Komponen Ujian Evolution"
-
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active Connections"
 msgstr "Sambungan Aktif"
@@ -14576,6 +14418,10 @@ msgstr "Nama _folder:"
 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"
@@ -14634,22 +14480,6 @@ msgstr ""
 "\n"
 "Klik butang \"Guna\" untuk menyimpan seting anda. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr "Buat konfigurasi folder khas dan peri laku folder luar talian di sini"
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-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/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klik \"Import\" untuk mula mengimport fail ke dalam Evolution. "
@@ -14688,7 +14518,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Pengimport"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:21
+#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:27
 msgid "Import"
 msgstr "Import"
 
@@ -14704,16 +14534,16 @@ 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:109 shell/main.c:561
+#: shell/main.c:114 shell/main.c:557
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:115
+#: shell/main.c:120
 msgid "Evolution is now exiting ..."
 msgstr "Evolution akan keluar dari..."
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:265
+#: shell/main.c:270
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -14751,7 +14581,7 @@ msgstr ""
 "Kami harap anda memperoleh hasil daripada usaha gigih kami, dan kami\n"
 "tidak sabar menunggu sumbangan anda!\n"
 
-#: shell/main.c:289
+#: shell/main.c:294
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -14759,36 +14589,48 @@ msgstr ""
 "Terima kasih\n"
 "Pasukan Ximian Evolution\n"
 
-#: shell/main.c:297
+#: shell/main.c:302
 msgid "Don't tell me again"
 msgstr "Jangan beritahu saya lagi"
 
-#: shell/main.c:389
+#: shell/main.c:352
+#, c-format
+msgid ""
+"Warning: Evolution could not upgrade all your data from version %s.\n"
+"The data hasn't been deleted, but it will not be seen by this version of "
+"Evolution.\n"
+msgstr ""
+
+#: shell/main.c:411
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Tidak dapat mencapai cangkerang Ximian Evolution."
 
-#: shell/main.c:398
+#: shell/main.c:420
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Tidak dapat memulakan cangkerang Ximian Evolution: %s"
 
-#: shell/main.c:530
+#: shell/main.c:524
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: shell/main.c:526
 msgid "Start in offline mode"
 msgstr "Mulakan dalam mod luar talian"
 
-#: shell/main.c:532
+#: shell/main.c:528
 msgid "Start in online mode"
 msgstr "Mulakan dalam mod dalam talian"
 
-#: shell/main.c:535
+#: shell/main.c:531
 msgid "Forcibly shut down all evolution components"
 msgstr "Tamatkan semua komponen Evolution secara paksa"
 
-#: shell/main.c:538
+#: shell/main.c:534
 msgid "Send the debugging output of all components to a file."
 msgstr "Hantarkan output penyahpijatan bagi semua komponen ke fail."
 
-#: shell/main.c:565
+#: shell/main.c:561
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -14797,173 +14639,204 @@ msgstr ""
 "%s: --dalam talian dan --luar talian tidak dapat digunakan bersama.\n"
 "  Gunakan %s --bantuan untuk keterangan lanjut.\n"
 
-#: smime/gui/certificate-manager.c:74 smime/gui/certificate-manager.c:115
-#: smime/gui/certificate-manager.c:168
-#, fuzzy
+#: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:275
+#: smime/gui/certificate-manager.c:408
 msgid "Certificate Name"
-msgstr "_ID Sijil:"
+msgstr "Nama Sijil"
 
-#: smime/gui/certificate-manager.c:80 smime/gui/certificate-manager.c:127
-#, fuzzy
+#: smime/gui/certificate-manager.c:140 smime/gui/certificate-manager.c:287
 msgid "Purposes"
-msgstr "Perkembangan"
+msgstr "Tujuan"
 
-#: smime/gui/certificate-manager.c:86 smime/gui/smime-ui.glade.h:29
+#: smime/gui/certificate-manager.c:146 smime/gui/smime-ui.glade.h:35
 msgid "Serial Number"
-msgstr ""
+msgstr "Nombor Siri"
 
-#: smime/gui/certificate-manager.c:92
-#, fuzzy
+#: smime/gui/certificate-manager.c:152
 msgid "Expires"
-msgstr "Ungkapan"
+msgstr "Tamat tempoh"
 
-#: smime/gui/certificate-manager.c:121
+#: 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
 msgid "E-Mail Address"
 msgstr "Alamat E-mel"
 
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
-msgstr ""
+msgstr "<Not Part of Certificate>"
 
 #: smime/gui/smime-ui.glade.h:2
-#, fuzzy
 msgid "<b>Certificate Fields</b>"
-msgstr "Sijil Dibatalkan"
+msgstr "<b>Medan Sijil</b>"
 
 #: smime/gui/smime-ui.glade.h:3
 msgid "<b>Certificate Hierarchy</b>"
-msgstr ""
+msgstr "<b>Hirarki Sijil</b>"
 
 #: smime/gui/smime-ui.glade.h:4
-#, fuzzy
 msgid "<b>Field Value</b>"
-msgstr "Menghantar E-mel"
+msgstr "<b>Nilai Medan</b>"
 
 #: smime/gui/smime-ui.glade.h:5
 msgid "<b>Fingerprints</b>"
-msgstr ""
+msgstr "<b>Cap jari</b>"
 
 #: smime/gui/smime-ui.glade.h:6
-#, fuzzy
 msgid "<b>Issued By</b>"
-msgstr "<b>Genap tempoh:</b> "
+msgstr "<b>Dikeluarkan Oleh</b> "
 
 #: smime/gui/smime-ui.glade.h:7
-#, fuzzy
 msgid "<b>Issued To</b>"
-msgstr "<b>Genap tempoh:</b> "
+msgstr "<b>Dikeluarkan Kepada</b> "
 
 #: smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr ""
+msgstr "<b>Sijil ini telah disahkan untuk kegunaan berikut:</b>"
 
 #: smime/gui/smime-ui.glade.h:9
-#, fuzzy
 msgid "<b>Validity</b>"
-msgstr "<b>Status:</b>"
+msgstr "<b>Kesahihan</b>"
 
 #: smime/gui/smime-ui.glade.h:10
-#, fuzzy
 msgid "Authorities"
-msgstr "Poitiers"
+msgstr "Kebenaran"
 
 #: smime/gui/smime-ui.glade.h:11
-#, fuzzy
 msgid "Backup"
-msgstr "Blackpool"
+msgstr "Sandaran"
 
 #: smime/gui/smime-ui.glade.h:12
-#, fuzzy
 msgid "Backup All"
-msgstr "Blackpool"
+msgstr "Sandar Semua"
 
 #: smime/gui/smime-ui.glade.h:13
-#, fuzzy
-msgid "Common Name (CN)"
-msgstr "Nama Biasa"
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:14
 #, fuzzy
-msgid "Contact Certificates"
-msgstr "_ID Sijil:"
+msgid "Certificate"
+msgstr "Sijil"
 
-#: smime/gui/smime-ui.glade.h:16
+#: smime/gui/smime-ui.glade.h:15
 #, fuzzy
-msgid "Edit"
-msgstr "_Edit"
+msgid "Certificate details"
+msgstr "Sijil"
+
+#: smime/gui/smime-ui.glade.h:16
+msgid "Common Name (CN)"
+msgstr "Nama Biasa (CN)"
 
 #: smime/gui/smime-ui.glade.h:17
-msgid "Email Recipient Certificate"
+msgid "Contact Certificates"
+msgstr "Sijil Kenalan"
+
+#: smime/gui/smime-ui.glade.h:20
+#, no-c-format
+msgid "Do you want to trust \"%s\" for the following purposes?"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:18
-#, fuzzy
+#: smime/gui/smime-ui.glade.h:21
+msgid "Dummy window only"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:22
+msgid "Edit"
+msgstr "Edit"
+
+#: smime/gui/smime-ui.glade.h:23
+msgid "Email Recipient Certificate"
+msgstr "E-mel Sijil Penerima"
+
+#: smime/gui/smime-ui.glade.h:24
 msgid "Email Signer Certificate"
-msgstr "Gagal mengesah betul sijil."
+msgstr "E-mel Sijil Penandatangan"
 
-#: smime/gui/smime-ui.glade.h:19
-#, fuzzy
+#: smime/gui/smime-ui.glade.h:25
 msgid "Expires On"
-msgstr "Ungkapan"
+msgstr "Tamat Tempoh Pada"
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:28
 msgid "Issued On"
-msgstr ""
+msgstr "Dikeluarkan Pada"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:29
 msgid "MD5 Fingerprint"
-msgstr ""
+msgstr "Cap jari MD5"
 
-#: smime/gui/smime-ui.glade.h:24
-#, fuzzy
+#: smime/gui/smime-ui.glade.h:30
 msgid "Organization (O)"
-msgstr "Organisasi"
+msgstr "Organisasi (O)"
 
-#: smime/gui/smime-ui.glade.h:25
-#, fuzzy
+#: smime/gui/smime-ui.glade.h:31
 msgid "Organizational Unit (OU)"
-msgstr "Unit Organisasi"
+msgstr "Unit Organisasi (OU)"
 
-#: smime/gui/smime-ui.glade.h:26
+#: smime/gui/smime-ui.glade.h:32
 msgid "SHA1 Fingerprint"
-msgstr ""
+msgstr "Cap jari SHA1"
 
-#: smime/gui/smime-ui.glade.h:27
+#: smime/gui/smime-ui.glade.h:33
 msgid "SSL Client Certificate"
-msgstr ""
+msgstr "Sijil Pelanggan SSL"
 
-#: smime/gui/smime-ui.glade.h:28
+#: smime/gui/smime-ui.glade.h:34
 msgid "SSL Server Certificate"
+msgstr "Sijil Pelayan SSL"
+
+#: smime/gui/smime-ui.glade.h:36
+msgid "Trust this CA to identify email users."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:30
-#, fuzzy
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:39
 msgid "View"
-msgstr "_Lihat"
+msgstr "Lihat"
 
-#: smime/gui/smime-ui.glade.h:31
+#: smime/gui/smime-ui.glade.h:40
+#, fuzzy
+msgid "View Certificate"
+msgstr "Sijil"
+
+#: smime/gui/smime-ui.glade.h:41
+#, 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
 msgid "You have certificates from these organizations that identify you:"
-msgstr ""
+msgstr "Anda mempunyai sijil daripada organisasi ini yang mengecam anda:"
 
-#: smime/gui/smime-ui.glade.h:32
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
-msgstr ""
+msgstr "Anda mempunyai sijil pada fail yang mengecam kesahihan sijil ini:"
 
-#: smime/gui/smime-ui.glade.h:33
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
-msgstr ""
+msgstr "Anda mempunyai sijil pada fail yang mengecam orang-orang ini:"
 
-#: smime/gui/smime-ui.glade.h:34
-#, fuzzy
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
-msgstr "_ID Sijil:"
+msgstr "Sijil Anda"
 
-#: smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert-db.c:443
 #, fuzzy
-msgid "import"
-msgstr "Import"
+msgid "Certificate already exists"
+msgstr "ID Kenalan telah wujud"
 
 #: tools/evolution-launch-composer.c:324
 msgid "An attachment to add."
@@ -15014,7 +14887,7 @@ msgstr "Salin pemilihan"
 msgid "Copy to Folder..."
 msgstr "Salin ke Folder..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
 msgid "Cut the selection"
 msgstr "Potong pemilihan"
 
@@ -15030,7 +14903,7 @@ msgstr "Alihkan Kenalan ke Folder Lain..."
 msgid "Move to Folder..."
 msgstr "Alihkan ke Folder..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:28
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
 msgid "Paste the clipboard"
 msgstr "Tampalkan papan keratan"
 
@@ -15038,8 +14911,8 @@ msgstr "Tampalkan papan keratan"
 msgid "Previews the contacts to be printed"
 msgstr "Pralihat kenalan yang akan dicetak"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:30
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
+#: 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-tasks.xml.h:13
 msgid "Print Pre_view"
 msgstr "Pralihat Ce_takan"
@@ -15084,13 +14957,13 @@ msgstr "Berhenti Memuatkan"
 msgid "View the current contact"
 msgstr "Lihat kenalan semasa"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:42
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
 #: 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-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:22
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:103
+#: 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"
 msgstr "_Tindakan"
 
@@ -15119,143 +14992,106 @@ msgid "_Send Message to Contact..."
 msgstr "_Hantarkan Mesej kepada Kenalan..."
 
 #: ui/evolution-calendar.xml.h:3
-#, fuzzy
-msgid "Create a new all-day event"
-msgstr "Wujudkan temu janji baru sepanjang hari"
-
-#: ui/evolution-calendar.xml.h:4
-msgid "Create a new appointment"
-msgstr "Wujudkan temu janji baru"
-
-#: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a new calendar"
-msgstr "Wujudkan folder baru"
-
-#: ui/evolution-calendar.xml.h:6
-#, fuzzy
-msgid "Create a new meeting"
-msgstr "Wujudkan permintaan mesyuarat baru"
-
-#: ui/evolution-calendar.xml.h:7
-msgid "Create a new task"
-msgstr "Wujudkan tugas baru"
+msgstr "Wujudkan kalendar baru"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:5
 msgid "Day"
 msgstr "Hari"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
 msgstr "Hapuskan Semua Kejadian"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
 msgstr "Hapuskan temu janji"
 
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
 msgstr "Hapuskan Kejadian ini"
 
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
 msgstr "Hapuskan kejadian ini"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr "Pergi Ke"
 
-#: ui/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Pergi balik"
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Pergi ke depan"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to _Date"
 msgstr "Pergi ke _Tarikh"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Pergi ke tarikh yang ditetapkan"
 
-#: ui/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to today"
 msgstr "Pergi ke hari ini"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "Senarai"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Bulan"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "New _Appointment"
-msgstr "Temu Janji _Baru"
-
-#: ui/evolution-calendar.xml.h:25
-#, fuzzy
+#: ui/evolution-calendar.xml.h:19
 msgid "New _Calendar"
-msgstr "New Caledonia"
-
-#: ui/evolution-calendar.xml.h:26
-#, fuzzy
-msgid "New _Meeting"
-msgstr "Mesyuarat Baru"
-
-#: ui/evolution-calendar.xml.h:27
-#, fuzzy
-msgid "New _Task"
-msgstr "Tugas Baru"
+msgstr "_Kalendar Baru"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:21
 msgid "Previews the calendar to be printed"
 msgstr "Pralihat kalendar yang akan dicetak"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:23
 msgid "Print this calendar"
 msgstr "Cetak kalendar ini"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:24
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Siarkan maklumat Bebas/Sibuk bagi kalendar ini"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:15
-#, fuzzy
+#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
 msgid "Purg_e"
-msgstr "Bourges"
+msgstr "Buan_g"
 
-#: ui/evolution-calendar.xml.h:34
-#, fuzzy
+#: ui/evolution-calendar.xml.h:26
 msgid "Purge old appointments and meetings"
-msgstr "Folder awam mengandungi temu janji dan peristiwa"
+msgstr "Buang temu janji dan mesyuarat lama"
 
-#: ui/evolution-calendar.xml.h:35
-#, fuzzy
+#: ui/evolution-calendar.xml.h:27
 msgid "Show as list"
-msgstr "Tunjukkan Perincian"
+msgstr "Tunjukkan sebagai senarai"
 
-#: ui/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:28
 msgid "Show one day"
 msgstr "Tunjukkan satu hari"
 
-#: ui/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:29
 msgid "Show one month"
 msgstr "Tunjukkan satu bulan"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one week"
 msgstr "Tunjukkan satu minggu"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:31
 msgid "Show the working week"
 msgstr "Tunjukkan minggu bekerja"
 
-#: ui/evolution-calendar.xml.h:40
+#: ui/evolution-calendar.xml.h:32
 msgid "Week"
 msgstr "Minggu"
 
@@ -15303,9 +15139,8 @@ msgstr "Simpan dan Tutup"
 #: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
 #: ui/evolution-contact-list-editor.xml.h:7
 #: ui/evolution-signature-editor.xml.h:8
-#, fuzzy
 msgid "Save and _Close"
-msgstr "Simpan dan Tutup"
+msgstr "Simpan dan _Tutup"
 
 #: ui/evolution-comp-editor.xml.h:14
 msgid "Save the item and close the dialog box"
@@ -15320,7 +15155,7 @@ msgstr "Simpan item ini ke dalam cakera"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "_Fail"
 
@@ -15385,9 +15220,8 @@ msgid "Send _message to list..."
 msgstr "Hantar _mesej ke senarai..."
 
 #: ui/evolution-contact-list-editor.xml.h:12
-#, fuzzy
 msgid "_Delete..."
-msgstr "Hapuskan..."
+msgstr "_Hapuskan..."
 
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
@@ -15463,9 +15297,8 @@ msgstr ""
 "Keluarkan secara kekal semua mesej yang dihapuskan daripada semua folder"
 
 #: ui/evolution-mail-global.xml.h:11
-#, fuzzy
 msgid "Post Ne_w Message"
-msgstr "Kirimkan Mesej Baru"
+msgstr "Kirimkan Mesej Ba_ru"
 
 #: ui/evolution-mail-global.xml.h:12
 msgid "Post a message to a Public folder"
@@ -15508,9 +15341,8 @@ msgid "Cut selected message(s) to the clipboard"
 msgstr "Potong mesej yang dipilih ke papan keratan"
 
 #: ui/evolution-mail-list.xml.h:4
-#, fuzzy
 msgid "E_xpunge"
-msgstr "_Buang"
+msgstr "B_uang"
 
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
@@ -15531,15 +15363,14 @@ msgstr ""
 "Sembunyikan mesej yang dihapuskan bukan memaparkannya dengan garis melaluinya"
 
 #: ui/evolution-mail-list.xml.h:9
-#, fuzzy
 msgid "Mark All as _Read"
-msgstr "Tandakan Semua sebagai T_elah Dibaca"
+msgstr "Tandakan Semua sebagai _Dibaca"
 
 #: ui/evolution-mail-list.xml.h:10
 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:66
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:70
 msgid "Paste message(s) from the clipboard"
 msgstr "Tampal mesej daripada papan keratan"
 
@@ -15591,20 +15422,14 @@ 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"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Tutup tetingkap ini"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:23
-msgid "_Close"
-msgstr "_Tutup"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Addressbook"
 msgstr "Tam_bahkan Penghantar ke Buku Alamat"
@@ -15622,9 +15447,8 @@ msgid "Apply filter rules to the selected messages"
 msgstr "Gunakan peraturan penapis bagi mesej yang dipilih"
 
 #: ui/evolution-mail-message.xml.h:5
-#, fuzzy
 msgid "Caret _Mode"
-msgstr "Model Teks"
+msgstr "_Mod Tanda ^"
 
 #: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
@@ -15778,241 +15602,263 @@ msgstr "Tandakan sebagai B_elum Dibaca"
 msgid "Mark as Unimp_ortant"
 msgstr "Tandakan sebagai Tida_k Penting"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as having been read"
 msgstr "Tandakan mesej yang dipilih sebagai telah dibaca"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as important"
 msgstr "Tandakan mesej yang dipilih sebagai penting"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Tandakan mesej yang dipilih sebagai tidak penting"
+
+#: ui/evolution-mail-message.xml.h:56
+#, 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
 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:54
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Tandakan mesej yang dipilih sebagai tidak penting"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected messages for deletion"
 msgstr "Tandakan mesej yang dipilih untuk dihapuskan"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:60
 msgid "Move"
 msgstr "Alihkan"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:61
 msgid "Move selected message(s) to another folder"
 msgstr "Alihkan mesej yang dipilih ke folder lain"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:62
 msgid "Next"
 msgstr "Seterusnya"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:63
 msgid "Next _Important Message"
 msgstr "Mesej _Penting Seterusnya"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:64
 msgid "Next _Thread"
 msgstr "Bebenang _Seterusnya"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:65
 msgid "Next _Unread Message"
 msgstr "Mesej _Belum Dibaca Seterusnya"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:66
 msgid "Open the selected message in a new window"
 msgstr "Buka mesej yang dipilih dalam tetingkap baru"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:67
 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:64
+#: ui/evolution-mail-message.xml.h:68
 msgid "Original Si_ze"
 msgstr "Saiz As_al"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:69
 msgid "P_revious Unread Message"
 msgstr "Mesej Belum Dibaca Sebelumnya"
 
-#: ui/evolution-mail-message.xml.h:67
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:71
 msgid "Post a Repl_y"
-msgstr "Kirimkan Balasan"
+msgstr "Kirimkan Balas_an"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:72
 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:69
+#: ui/evolution-mail-message.xml.h:73
 msgid "Pr_evious Important Message"
 msgstr "Mesej Penting Se_belumnya"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:74
 msgid "Preview the message to be printed"
 msgstr "Pralihat mesej yang akan dicetak"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:78
 msgid "Print this message"
 msgstr "Cetak mesej ini"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:79
 msgid "Re_direct"
 msgstr "Hantar _semula"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:80
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Hantar semula (lantun) mesej yang dipilih kepada seseorang"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:85
 msgid "Reset the text to its original size"
 msgstr "Set semula teks kepada saiznya yang asal"
 
-#: ui/evolution-mail-message.xml.h:82
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:86
 msgid "S_earch in Message..."
-msgstr "C_ari Mesej..."
+msgstr "C_ari dalam Mesej..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:87
 msgid "S_maller"
 msgstr "L_ebih kecil"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:88
 msgid "Save the message as a text file"
 msgstr "Simpan mesej sebagai fail teks"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:89
 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:86
+#: ui/evolution-mail-message.xml.h:90
 msgid "Set up the page settings for your current printer"
 msgstr "Sediakan seting halaman bagi pencetak semasa anda"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:91
 msgid "Show Email _Source"
 msgstr "Tunjukkan Sumber _E-mel"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:92
 msgid "Show Full _Headers"
 msgstr "Tunjukkan Pengepala _Penuh"
 
-#: ui/evolution-mail-message.xml.h:89
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:93
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Cari teks dalam badan mesej yang dipaparkan"
+msgstr "Tunjukkan kursor berkelip-kelip dalam badan mesej yang dipaparkan"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:94
 msgid "Show message in the normal style"
 msgstr "Tunjukkan mesej dalam gaya normal"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show message with all email headers"
 msgstr "Tunjukkan mesej dengan semua pengepala e-mel"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "Tunjukkan sumber e-mel mentah bagi mesej"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:97
 msgid "Text Si_ze"
 msgstr "Saiz Te_ks"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:98
 msgid "Un-delete the selected messages"
 msgstr "Batalkan hapus mesej yang dipilih"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:99
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder bagi Senarai _Mel..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:100
 msgid "VFolder on Se_nder..."
 msgstr "VFolder bagi Pe_nghantar..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:101
 msgid "VFolder on _Recipients..."
 msgstr "VFolder bagi _Penerima..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:102
 msgid "VFolder on _Subject..."
 msgstr "VFolder bagi _Tajuk"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Attached"
 msgstr "_Dilampirkan"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Copy to Folder"
 msgstr "_Salin ke Folder"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Create Filter From Message"
 msgstr "_Wujudkan Penapis Daripada Mesej"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Forward Message"
 msgstr "_Sampaikan Mesej"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "_Pergi Ke"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Inline"
 msgstr "_Dalam Talian"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:112
 msgid "_Larger"
 msgstr "_Lebih Besar"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Message Display"
 msgstr "_Paparan Mesej"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Move to Folder"
 msgstr "_Alihkan ke Folder"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Next Message"
 msgstr "_Mesej Seterusnya"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Normal Display"
 msgstr "_Paparan Normal"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Open Message"
 msgstr "_Buka Mesej"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:119
 msgid "_Previous Message"
 msgstr "_Mesej Sebelumnya"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Quoted"
 msgstr "_Disebut"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:123
 msgid "_Resend..."
 msgstr "_Hantar semula..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:29
+#: ui/evolution-mail-message.xml.h:125 ui/evolution.xml.h:31
 msgid "_Tools"
 msgstr "_Alatan"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Undelete"
 msgstr "_Batalkan hapus"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Tutup tetingkap ini"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:24
+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"
@@ -16266,9 +16112,8 @@ msgid "Mar_k as Complete"
 msgstr "Tanda_kan sebagai Siap"
 
 #: ui/evolution-tasks.xml.h:9
-#, fuzzy
 msgid "Mark selected tasks as complete"
-msgstr "_Tandakan Tugas yang Dipilih sebagai Siap"
+msgstr "Tandakan tugas yang dipilih sebagai siap"
 
 #: ui/evolution-tasks.xml.h:11
 msgid "Paste task from the clipboard"
@@ -16291,12 +16136,13 @@ msgid "Change Evolution's settings"
 msgstr "Ubah seting Evolution"
 
 #: ui/evolution.xml.h:5
-msgid "E_xit"
-msgstr "K_eluar"
+#, fuzzy
+msgid "Create a new window"
+msgstr "Wujudkan mesyuarat baru"
 
 #: ui/evolution.xml.h:6
-msgid "Evolution _Window"
-msgstr "Tetingkap _Evolution"
+msgid "E_xit"
+msgstr "K_eluar"
 
 #: ui/evolution.xml.h:7
 msgid "Exit the program"
@@ -16308,61 +16154,74 @@ msgstr "Import data dari atur cara lain"
 
 #: ui/evolution.xml.h:10
 #, fuzzy
-msgid "Open a new Evolution window"
-msgstr "Tetingkap _Evolution"
+msgid "Open a new window"
+msgstr "Buka dalam Tetingkap Baru"
 
 #: ui/evolution.xml.h:11
 msgid "Pi_lot Settings..."
 msgstr "Seting Rin_tis..."
 
 #: ui/evolution.xml.h:12
+msgid "Send / Receive"
+msgstr "Hantar / Terima"
+
+#: ui/evolution.xml.h:13
+msgid "Send queued items and retrieve new items"
+msgstr "Hantarkan item berbaris gilir dan dapatkan semula item baru"
+
+#: ui/evolution.xml.h:14
 msgid "Set up Pilot configuration"
 msgstr "Sediakan konfigurasi Rintis"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Show information about Ximian Evolution"
 msgstr "Tunjukkan maklumat tentang Ximian Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Submit Bug Report"
 msgstr "Serahkan Laporan Pepijat"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Submit _Bug Report"
 msgstr "Serahkan _Laporan Pepijat"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Serahkan Laporan pepijat dengan menggunakan Kawan Pepijat"
 
-#: ui/evolution.xml.h:17
-msgid "Toggle"
-msgstr "Toggle"
-
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether we are working offline."
 msgstr "Toggle untuk melihat sama ada kami bekerja luar talian atau tidak."
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _Soalan Lazim"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "_About Ximian Evolution..."
 msgstr "_Tentang Ximian Evolution..."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Help"
 msgstr "_Bantuan"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 msgid "_New"
 msgstr "_baru"
 
+#: ui/evolution.xml.h:29
+msgid "_Send / Receive"
+msgstr "_Hantar / Terima"
+
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Window"
+msgstr "_Cari Sekarang"
+
 #: ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Cetak Ringkasan"
@@ -16408,34 +16267,28 @@ msgid "_Work Week View"
 msgstr "_Pandangan Minggu Bekerja"
 
 #: views/mail/galview.xml.h:1
-#, fuzzy
 msgid "As _Sent Folder"
-msgstr "Sebagai Folder yang Dihantar"
+msgstr "Sebagai Folder yang _Dihantar"
 
 #: views/mail/galview.xml.h:2
-#, fuzzy
 msgid "By S_tatus"
-msgstr "Mengikut Status"
+msgstr "Mengikut S_tatus"
 
 #: views/mail/galview.xml.h:3
-#, fuzzy
 msgid "By Se_nder"
-msgstr "Mengikut Penghantar"
+msgstr "Mengikut Pe_nghantar"
 
 #: views/mail/galview.xml.h:4
-#, fuzzy
 msgid "By Su_bject"
-msgstr "Mengikut Tajuk"
+msgstr "Mengikut Ta_juk"
 
 #: views/mail/galview.xml.h:5
-#, fuzzy
 msgid "By _Follow Up Flag"
-msgstr "Mengikut Bendera Susulan"
+msgstr "Mengikut Bendera _Susulan"
 
 #: views/mail/galview.xml.h:6
-#, fuzzy
 msgid "_Messages"
-msgstr "Mesej"
+msgstr "_Mesej"
 
 #: views/tasks/galview.xml.h:1
 msgid "With _Category"
@@ -16459,20 +16312,18 @@ msgid "Time Zones"
 msgstr "Zon Masa"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
-#, fuzzy
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
-"Gunakan butang kiri tetikus untuk mengezum ke dalam kawasan pada peta dan "
-"memilih zonmasa.\n"
-" Gunakan butang kanan tetikus untuk mengezum ke luar."
+"Gunakan butang kiri tetikus untuk zum ke dalam kawasan pada peta dan memilih "
+"zon masa.\n"
+"Gunakan butang kanan tetikus untuk zum ke luar."
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
-#, fuzzy
 msgid "_Selection:"
-msgstr "Pemilihan:"
+msgstr "_Pemilihan:"
 
 #: widgets/menus/gal-view-menus.c:290
 msgid "_Current View"
@@ -16493,12 +16344,12 @@ msgstr "Tentukan Pandangan..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -16581,6 +16432,10 @@ 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"
@@ -16631,7 +16486,7 @@ msgstr "_Cari"
 msgid "_Find Now"
 msgstr "_Cari Sekarang"
 
-#: widgets/misc/e-search-bar.c:538
+#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
 msgid "_Clear"
 msgstr "_Kosongkan"
 
@@ -16647,71 +16502,157 @@ msgstr "ID Subitem"
 msgid "Text"
 msgstr "Teks"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Kosongkan"
-
 #: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
+#, fuzzy
+msgid "Find _Now"
 msgstr "Cari Sekarang"
 
-#, fuzzy
+#~ 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"
+
+#~ msgid "book busy"
+#~ msgstr "buku sibuk"
+
+#~ msgid "Corba exception making Book::addContact call"
+#~ msgstr "Pengecualian Corba membuat panggilan Book::addContact"
+
+#~ msgid "e_book_commit_contact called on book before e_book_load_uri"
+#~ msgstr "e_book_commit_contact dipanggil pada buku sebelum e_book_load_uri"
+
+#~ msgid "Corba exception making Book::modifyContact call"
+#~ msgstr "Pengecualian Corba membuat panggilan Book::modifyContact"
+
+#~ msgid "e_book_get_supported_fields on book before e_book_load_uri"
+#~ msgstr "e_book_get_supported_fields pada buku sebelum e_book_load_uri"
+
+#~ msgid "Corba exception making Book::getSupportedFields call"
+#~ msgstr "Pengecualian Corba membuat panggilan Book::getSupportedFields"
+
+#~ msgid "e_book_get_supported_auth_methods on book before e_book_load_uri"
+#~ msgstr "e_book_get_supported_auth_methods pada buku sebelum e_book_load_uri"
+
+#~ msgid "Corba exception making Book::getSupportedAuthMethods call"
+#~ msgstr "Pengecualian Corba membuat panggilan Book::getSupportedAuthMethods"
+
+#~ msgid "e_book_authenticate_user on book before e_book_load_uri"
+#~ msgstr "e_book_authenticate_user pada buku sebelum e_book_load_uri"
+
+#~ msgid "Corba exception making Book::authenticateUser call"
+#~ msgstr "Pengecualian Corba membuat panggilan Book::authenticateUser"
+
+#~ msgid "e_book_get_contact on book before e_book_load_uri"
+#~ msgstr "e_book_get_contact pada buku sebelum e_book_load_uri"
+
+#~ msgid "Corba exception making Book::getContact call"
+#~ msgstr "Pengecualian Corba membuat panggilan Book::getContact"
+
+#~ msgid "e_book_remove_contact on book before e_book_load_uri"
+#~ msgstr "e_book_remove_contact pada buku sebelum e_book_load_uri"
+
+#~ msgid "e_book_remove_contacts on book before e_book_load_uri"
+#~ msgstr "e_book_remove_contact pada buku sebelum e_book_load_uri"
+
+#~ msgid "Corba exception making Book::removeContacts call"
+#~ msgstr "Pengecualian Corba membuat panggilan Book::removeContact"
+
+#~ msgid "e_book_get_book_view on book before e_book_load_uri"
+#~ msgstr "e_book_get_book_view pada buku sebelum e_book_load_uri"
+
+#~ msgid "Corba exception making Book::getBookView call"
+#~ msgstr "Pengecualian Corba membuat panggilan Book::getBookView"
+
+#~ msgid "e_book_get_contacts on book before e_book_load_uri"
+#~ msgstr "e_book_get_contact pada buku sebelum e_book_load_uri"
+
+#~ msgid "Corba exception making Book::getContactList call"
+#~ msgstr "Pengecualian Corba membuat panggilan Book::getContactList"
+
+#~ msgid "e_book_get_changes on book before e_book_load_uri"
+#~ msgstr "e_book_get_changes pada buku sebelum e_book_load_uri"
+
+#~ msgid "Corba exception making Book::getChanges call"
+#~ msgstr "Pengecualian Corba membuat panggilan Book::getChanges"
+
 #~ msgid "e_book_cancel: there is no current operation"
-#~ msgstr "Batalkan pengendalian mel semasa"
+#~ msgstr "e_book_cancel: tidak ada operasi semasa"
+
+#~ msgid "Corba exception making Book::cancelOperation call"
+#~ msgstr "Pengecualian Corba membuat panggilan Book::cancelOperation"
+
+#~ msgid "e_book_cancel: couldn't cancel"
+#~ msgstr "e_book_cancel: tidak dapat batalkan"
+
+#~ msgid "e_book_remove on book before e_book_load_uri"
+#~ msgstr "e_book_remove pada buku sebelum e_book_load_uri"
+
+#~ msgid "Corba exception making Book::remove call"
+#~ msgstr "Pengecualian Corba membuat panggilan Book::remove"
+
+#~ msgid "e_book_load_uri: no factories available for uri `%s'"
+#~ msgstr "e_book_load_uri: tiada kilang yang ada untuk uri '%s'"
+
+#~ msgid "e_book_load_uri: Could not create EBookListener"
+#~ msgstr "e_book_load_uri: Tidak dapat mewujudkan PendengarEBook"
+
+#~ msgid "Unique ID"
+#~ msgstr "ID Unik"
 
-#, fuzzy
 #~ msgid "Given Name"
-#~ msgstr "Nama Medan"
+#~ msgstr "Nama Diberi"
 
 #~ msgid "Family Name"
 #~ msgstr "Nama Keluarga"
 
-#, fuzzy
 #~ msgid "Address List"
-#~ msgstr "Alamat"
+#~ msgstr "Senarai Alamat"
 
-#, fuzzy
 #~ msgid "Home Address Label"
-#~ msgstr "Label Alamat"
+#~ msgstr "Label Alamat Rumah"
 
-#, fuzzy
 #~ msgid "Work Address Label"
-#~ msgstr "Label Alamat"
+#~ msgstr "Label Alamat Tempat Kerja"
 
-#, fuzzy
 #~ msgid "Other Address Label"
-#~ msgstr "Label Alamat"
+#~ msgstr "Label Alamat Lain"
 
-#, fuzzy
 #~ msgid "Email List"
-#~ msgstr "E-mel 2"
+#~ msgstr "Senarai E-mel "
 
-#, fuzzy
 #~ msgid "Email 1"
-#~ msgstr "E-mel 3"
+#~ msgstr "E-mel 1"
 
-#, fuzzy
 #~ msgid "Wants HTML Mail"
-#~ msgstr "Inginkan HTML"
+#~ msgstr "Inginkan Mel HTML"
+
+#~ msgid "AIM Screen Name List"
+#~ msgstr "Senarai Nama Skrin AIM"
 
-#, fuzzy
 #~ msgid "Jabber Id List"
-#~ msgstr "Senarai Tanpa Nama"
+#~ msgstr "Senarai Id Jabber"
+
+#~ msgid "Yahoo! Screen Name List"
+#~ msgstr "Senarai Nama Skrin Yahoo!"
+
+#~ msgid "MSN Screen Name List"
+#~ msgstr "Senarai Nama Skrin MSN"
 
-#, fuzzy
 #~ msgid "ICQ Id List"
 #~ msgstr "Ialah Senarai Baru"
 
 #~ msgid "Organizational Unit"
 #~ msgstr "Unit Organisasi"
 
-#, fuzzy
+#~ msgid "Homepage URL"
+#~ msgstr "URL Laman web"
+
+#~ msgid "Weblog URL"
+#~ msgstr "URL log web"
+
 #~ msgid "Photo"
-#~ msgstr "Porto"
+#~ msgstr "Foto"
 
-#, fuzzy
 #~ msgid "Logo"
-#~ msgstr "Togo"
+#~ msgstr "Logo"
 
 #~ msgid "Category List"
 #~ msgstr "Senarai Kategori"
@@ -16725,9 +16666,8 @@ msgstr "Cari Sekarang"
 #~ msgid "ICS Calendar"
 #~ msgstr "Kalendar ICS"
 
-#, fuzzy
 #~ msgid "Spouse's Name"
-#~ msgstr "Pasangan"
+#~ msgstr "Nama Pasangan"
 
 #~ msgid "Birth Date"
 #~ msgstr "Tarikh Lahir"
@@ -16741,9 +16681,8 @@ msgstr "Cari Sekarang"
 #~ msgid "Evolution LDIF importer"
 #~ msgstr "Pengimport LDIF Evolution"
 
-#, fuzzy
 #~ msgid "Evolution LDIF importer factory"
-#~ msgstr "Pengimport LDIF Evolution"
+#~ msgstr "Kilang pengimport LDIF Evolution"
 
 #~ msgid "LDAP Data Interchange Format (.ldif)"
 #~ msgstr "Format Saling Tukar Data LDAP (.ldif)"
@@ -16772,17 +16711,14 @@ msgstr "Cari Sekarang"
 #~ msgid "Reconnecting to LDAP server..."
 #~ msgstr "Menyambungkan semula ke pelayan LDAP..."
 
-#, fuzzy
 #~ msgid "Adding contact to LDAP server..."
-#~ msgstr "Menambahkan kad ke pelayan LDAP..."
+#~ msgstr "Menambahkan kenalan ke pelayan LDAP..."
 
-#, fuzzy
 #~ msgid "Removing contact from LDAP server..."
-#~ msgstr "Mengeluarkan kad dari pelayan LDAP..."
+#~ msgstr "Mengeluarkan kenalan dari pelayan LDAP..."
 
-#, fuzzy
 #~ msgid "Modifying contact from LDAP server..."
-#~ msgstr "Mengubahsuaikan kad dari pelayan LDAP..."
+#~ msgstr "Mengubahsuaikan kenalan dari pelayan LDAP..."
 
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "Menerima hasil carian LDAP..."
@@ -16790,45 +16726,48 @@ msgstr "Cari Sekarang"
 #~ msgid "Error performing search"
 #~ msgstr "Ralat ketika membuat carian"
 
-#, fuzzy
+#~ msgid "Backend is busy"
+#~ msgstr "Bahagian belakang sibuk"
+
 #~ msgid "Repository is offline"
-#~ msgstr "Repositori luar talian"
+#~ msgstr "Repositori sedang di luar talian"
 
-#, fuzzy
 #~ msgid "No such calendar"
-#~ msgstr "Folder tersebut tidak ada%s"
+#~ msgstr "Tidak ada kalendar seperti itu"
 
-#, fuzzy
 #~ msgid "Object not found"
-#~ msgstr "Objek tidak dapat dijumpai\n"
+#~ msgstr "Objek tidak dijumpai"
 
-#, fuzzy
 #~ msgid "Invalid object"
-#~ msgstr "Tujuan tak sah"
+#~ msgstr "Objek tak sah"
 
-#, fuzzy
 #~ msgid "URI not loaded"
-#~ msgstr "EBook tidak dimuatkan\n"
+#~ msgstr "URI tidak dimuatkan"
 
-#, fuzzy
-#~ msgid "Object ID already exists"
-#~ msgstr "ID Kad telah wujud"
+#~ msgid "URI already loaded"
+#~ msgstr "URI telah dimuatkan"
 
-#, fuzzy
 #~ msgid "Operation has been cancelled"
-#~ msgstr "Pengendalian dibatalkan"
+#~ msgstr "Pengendalian telah dibatalkan"
 
-#, fuzzy
 #~ msgid "Could not cancel operation"
-#~ msgstr "Batalkan Pengendalian"
+#~ msgstr "Tidak dapat batalkan pengendalian"
 
-#, fuzzy
 #~ msgid "Authentication failed"
 #~ msgstr "Pengesahan gagal."
 
+#~ msgid "A CORBA esception has occurred"
+#~ msgstr "Pengecualian CORBA telah berlaku"
+
+#~ msgid "No error"
+#~ msgstr "Tiada ralat"
+
 #~ msgid "Untitled appointment"
 #~ msgstr "Temu janji tak berjudul"
 
+#~ msgid "Opening tasks at %s"
+#~ msgstr "Tugas permulaan pada %s"
+
 #~ msgid "Can't save calendar data: Malformed URI."
 #~ msgstr "Tidak dapat menyimpan data kalendar: URI pincang bentuk."
 
@@ -16893,13 +16832,11 @@ msgstr "Cari Sekarang"
 #~ "mengandungi? menjangkakan argumen 1 sebagai salah satu daripada \"sebarang"
 #~ "\", \"ringkasan\", \"huraian\""
 
-#, fuzzy
 #~ msgid "has-alarms? expects at least 1 argument"
-#~ msgstr "mempunyai kategori? menjangkakan sekurang-kurangnya 1 argumen"
+#~ msgstr "mempunyai-tanda amaran? menjangkakan sekurang-kurangnya 1 argumen"
 
-#, fuzzy
 #~ msgid "has-alarms? excepts argument to be a boolean"
-#~ msgstr "mengandungi? menjangkakan argumen 2 sebagai rentetan"
+#~ msgstr "mempunyai-tanda amaran? menjangkakan argumen sebagai boolean"
 
 #~ msgid "has-categories? expects at least 1 argument"
 #~ msgstr "mempunyai kategori? menjangkakan sekurang-kurangnya 1 argumen"
@@ -16920,6 +16857,27 @@ msgstr "Cari Sekarang"
 #~ msgid "completed-before? expects argument 1 to be a time_t"
 #~ msgstr "siap sebelum? menjangkakan argumen 1 sebagai masa_t"
 
+#~ msgid "No signature present"
+#~ msgstr "Tiada tandatangan yang ada"
+
+#~ msgid "Connecting..."
+#~ msgstr "Sedang disambungkan..."
+
+#~ msgid "This folder cannot contain messages."
+#~ msgstr "Folder ini tidak boleh mengandungi mesej."
+
+#~ 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."
@@ -16927,6 +16885,40 @@ 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"
 
@@ -16939,15 +16931,134 @@ msgstr "Cari Sekarang"
 #~ msgid "_Certificate ID:"
 #~ msgstr "_ID Sijil:"
 
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Tidak dapat memindahkan folder:\n"
+#~ "%s"
+
+#~ msgid "Drafts"
+#~ msgstr "Draf"
+
+#~ msgid "Outbox"
+#~ msgstr "Kotak keluar"
+
+#~ msgid "Sent"
+#~ msgstr "Dihantar"
+
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Tiada folder dipaparkan)"
+
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
+
+#~ 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"
+
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Jenis folder  yang ditetapkan tak sah"
+
+#~ msgid "I/O error"
+#~ msgstr "Ralat I/O"
+
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Tidak cukup ruang untuk mewujudkan folder"
+
+#~ msgid "The folder is not empty"
+#~ msgstr "Folder tidak kosong"
+
+#~ msgid "The specified folder was not found"
+#~ msgstr "Folder yang ditetapkan tidak dijumpai"
+
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Fungsi tidak dilaksanakan dalam storan ini"
+
+#~ msgid "Operation not supported"
+#~ msgstr "Pengendalian tidak disokong"
+
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Jenis yang ditetapkan tidak disokong dalam storan ini"
+
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Folder yang ditetapkan tidak boleh diubah suai atau dikeluarkan"
+
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Tidak dapat membuat folder anak daripada salah satu turunannya"
+
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Tidak dapat mewujudkan folder dengan nama itu"
+
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Pengendalian ini tidak dapat dijalankan dalam mod luar talian"
+
+#~ msgid "Checkbox"
+#~ msgstr "Kotak semak"
+
+#~ msgid "Test type"
+#~ msgstr "Jenis ujian"
+
+#~ msgid "Evolution Test Component"
+#~ msgstr "Komponen Ujian Evolution"
+
+#~ msgid "import"
+#~ msgstr "import"
+
+#~ 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"
+
+#~ msgid "New _Meeting"
+#~ msgstr "_Mesyuarat Baru"
+
+#~ msgid "New _Task"
+#~ msgstr "_Tugas Baru"
+
+#~ msgid "Evolution _Window"
+#~ msgstr "Tetingkap _Evolution"
+
+#~ msgid "Open a new Evolution window"
+#~ msgstr "Buka tetingkap Evolution baru"
+
+#~ msgid "Toggle"
+#~ msgstr "Toggle"
+
+#~ msgid "Clear"
+#~ msgstr "Kosongkan"
+
 #~ msgid "Evolution Addressbook local/LDAP backend"
 #~ msgstr "Bahagian belakang setempat/LDAP Buku Alamat Evolution"
 
 #~ msgid "Evolution Calendar local file backend"
 #~ msgstr "Bahagian belakang fail setempat Kalendar Evolution"
 
-#, fuzzy
 #~ msgid "Evolution Addressbook local backend"
-#~ msgstr "Bahagian belakang setempat/LDAP Buku Alamat Evolution"
+#~ msgstr "Bahagian belakang setempat Buku Alamat Evolution"
 
 #~ msgid "Primary"
 #~ msgstr "Utama"
@@ -17072,18 +17183,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Folder awam mengandungi maklumat kenalan"
 
-#~ msgid "_Contact"
-#~ msgstr "_Kenalan"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Wujudkan kenalan baru"
-
-#~ msgid "New Contact List"
-#~ msgstr "Senarai Kenalan Baru"
-
-#~ msgid "Create a new contact list"
-#~ msgstr "Wujudkan senarai kenalan baru"
-
 #~ msgid "The URI that the Folder Browser will display"
 #~ msgstr "URI yang akan dipaparkan oleh Pelayar Folder"
 
@@ -17151,30 +17250,12 @@ msgstr "Cari Sekarang"
 #~ msgid "Public folder containing to-do items"
 #~ msgstr "Folder awam mengandungi item yang perlu dibuat"
 
-#~ msgid "New appointment"
-#~ msgstr "Temu janji baru"
-
-#~ msgid "_Appointment"
-#~ msgstr "_Temu janji"
-
-#~ msgid "New meeting"
-#~ msgstr "Mesyuarat baru"
-
-#~ msgid "M_eeting"
-#~ msgstr "M_esyuarat"
-
 #~ msgid "New task"
 #~ msgstr "Tugas baru"
 
 #~ msgid "_Task"
 #~ msgstr "_Tugas"
 
-#~ msgid "New All Day Appointment"
-#~ msgstr "Temu Janji Baru Sepanjang Hari"
-
-#~ msgid "All _Day Appointment"
-#~ msgstr "Temu Janji _Sepanjang Hari"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Tidak dapat mengemaskinikan objek tak sah"
 
@@ -17279,15 +17360,6 @@ msgstr "Cari Sekarang"
 #~ msgid "You have unsent messages, do you wish to quit anyway?"
 #~ msgstr "Anda mempunyai mesej yang belum dihantar, anda tetap ingin keluar?"
 
-#~ msgid "New Mail Message"
-#~ msgstr "Mesej Mel Baru"
-
-#~ msgid "_Mail Message"
-#~ msgstr "_Mesej Mel"
-
-#~ msgid "Compose a new mail message"
-#~ msgstr "Gubah mesej mel baru"
-
 #~ msgid "New Message Post"
 #~ msgstr "Kiriman Mesej Baru"
 
@@ -25603,9 +25675,6 @@ msgstr "Cari Sekarang"
 #~ msgid "Freezing haze"
 #~ msgstr "Jerebu menyejuk"
 
-#~ msgid "Spray"
-#~ msgstr "Percikan"
-
 #~ msgid "Spray in the vicinity"
 #~ msgstr "Percikan di kawasan sekitar"
 
@@ -25978,12 +26047,6 @@ msgstr "Cari Sekarang"
 #~ msgstr ""
 #~ "Keluarkan folder yang ditambahkan dengan \"Buka Folder Pengguna Lain\""
 
-#~ msgid "Send / Receive"
-#~ msgstr "Hantar / Terima"
-
-#~ msgid "Send queued items and retrieve new items"
-#~ msgstr "Hantarkan item berbaris gilir dan dapatkan semula item baru"
-
 #~ msgid "Toggle whether to show the folder bar"
 #~ msgstr "Toggle sama ada ingin menunjukkan bar folder atau tidak"
 
@@ -26017,9 +26080,6 @@ msgstr "Cari Sekarang"
 #~ msgid "_Rename..."
 #~ msgstr "_Namakan semula..."
 
-#~ msgid "_Send / Receive"
-#~ msgstr "_Hantar / Terima"
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Bar Jalan Pintas"