Updated Malay translation.

2004-10-15  Hasbullah Bin Pit  <sebol@my-penguin.org>

        * ms.po: Updated Malay translation.

svn path=/trunk/; revision=27597

2 files changed, 2259 insertions, 2130 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 8d57d7b248..91311db14c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-15  Hasbullah Bin Pit  <sebol@my-penguin.org>
+
+	* ms.po: Updated Malay translation.
+
 2004-10-15  Alexander Shopov  <ash@contact.bg>
 
 	* bg.po: Updated Bulgarian translation by
diff --git a/po/ms.po b/po/ms.po
index cbc2be73a9..0df10ceb59 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Evolution HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-13 02:19+0800\n"
+"POT-Creation-Date: 2004-10-16 02:05+0800\n"
 "PO-Revision-Date: 2004-08-25 08:56+0730\n"
 "Last-Translator: Hasbullah Bin Pit <sebol@my-penguin.org>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang@lists.sf.net>\n"
@@ -112,8 +112,20 @@ msgstr ""
 msgid "Could not remove addressbook."
 msgstr "Tidak dapat membuang buku alamat."
 
-#. addressbook:edit-categories primary
+#. addressbook:ask-delete-addressbook primary
 #: addressbook/addressbook-errors.xml.h:22
+#, fuzzy
+msgid "Delete address book '{0}'?"
+msgstr "Pilih buku alamat sasaran."
+
+#. addressbook:ask-delete-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:24
+#, fuzzy
+msgid "This address book will be removed permanently."
+msgstr "Buku alamat ini tidak dapat dibuka."
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:26
 msgid "Category editor not available."
 msgstr "Editor kategori tidak ada."
 
@@ -128,9 +140,9 @@ msgstr "Editor kategori tidak ada."
 #. mail:session-message-error-cancel secondary
 #. mail:ask-session-password secondary
 #. mail:filter-load-error secondary
-#: addressbook/addressbook-errors.xml.h:24
-#: addressbook/addressbook-errors.xml.h:32
-#: addressbook/addressbook-errors.xml.h:36 mail/mail-errors.xml.h:70
+#: addressbook/addressbook-errors.xml.h:28
+#: addressbook/addressbook-errors.xml.h:36
+#: addressbook/addressbook-errors.xml.h:40 mail/mail-errors.xml.h:70
 #: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
 #: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
 #: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
@@ -144,33 +156,33 @@ msgstr "{0}"
 #. addressbook:generic-error secondary
 #. mail-composer:no-attach secondary
 #. mail:no-save-path secondary
-#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:30
 #: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
 msgid "{1}"
 msgstr "{1}"
 
 #. addressbook:load-error title
-#: addressbook/addressbook-errors.xml.h:28
+#: addressbook/addressbook-errors.xml.h:32
 msgid "Unable to open addressbook"
 msgstr "Tak dapat membuka buku alamat"
 
 #. addressbook:load-error primary
-#: addressbook/addressbook-errors.xml.h:30
+#: addressbook/addressbook-errors.xml.h:34
 msgid "Error loading addressbook."
 msgstr "Ralat ketika memuatkan buku alamat."
 
 #. addressbook:search-error primary
-#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38
 msgid "Unable to perform search."
 msgstr "Tak dapat ketika membuat carian."
 
 #. addressbook:prompt-save primary
-#: addressbook/addressbook-errors.xml.h:38
+#: addressbook/addressbook-errors.xml.h:42
 msgid "Would you like to save your changes?"
 msgstr "Adakah anda ingin menyimpan perubahan?"
 
 #. addressbook:prompt-save secondary
-#: addressbook/addressbook-errors.xml.h:40
+#: addressbook/addressbook-errors.xml.h:44
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
@@ -178,17 +190,17 @@ msgstr ""
 "Anda telah membuat pengubahsuaian pada kenalan ini. Adakah anda ingin "
 "menyimpan perubahan ini?"
 
-#: addressbook/addressbook-errors.xml.h:41
+#: addressbook/addressbook-errors.xml.h:45
 msgid "_Discard"
 msgstr "_Buang"
 
 #. addressbook:prompt-move primary
-#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/addressbook-errors.xml.h:47
 msgid "Cannot move contact."
 msgstr "Tak dapat memindah kenalan."
 
 #. addressbook:prompt-move secondary
-#: addressbook/addressbook-errors.xml.h:45
+#: addressbook/addressbook-errors.xml.h:49
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -198,37 +210,57 @@ msgstr ""
 "sebaliknya?"
 
 #. addressbook:save-error primary
-#: addressbook/addressbook-errors.xml.h:47
+#: addressbook/addressbook-errors.xml.h:51
 msgid "Unable to save contact(s)."
 msgstr "Tidak dapat menyimpan kenalan."
 
 #. addressbook:save-error secondary
-#: addressbook/addressbook-errors.xml.h:49
+#: addressbook/addressbook-errors.xml.h:53
 msgid "Error saving contacts to {0}: {1}"
 msgstr "Ralat ketika menyimpan kenalan ke  {0}: {1}"
 
 #. addressbook:backend-died primary
-#: addressbook/addressbook-errors.xml.h:51
+#: addressbook/addressbook-errors.xml.h:55
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Buku alamat Evolution telah keluar tanda diduga."
 
 #. addressbook:backend-died secondary
-#: addressbook/addressbook-errors.xml.h:53
+#: addressbook/addressbook-errors.xml.h:57
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "Kenalan anda bagi {0} tak akan ada sehingga Evolution diulanghidupkan."
 
+#. addressbook:ask-list-add-exists primary
+#: addressbook/addressbook-errors.xml.h:59
+#, fuzzy
+msgid "Address '{0}' already exists."
+msgstr "Folder telah wujud"
+
+#. addressbook:ask-list-add-exists secondary
+#: addressbook/addressbook-errors.xml.h:61
+#, fuzzy
+msgid ""
+"A contact already exists with this address.  Would you like to add a new "
+"card with the same address anyway?"
+msgstr ""
+"Nama atau alamat e-mel kenalan ini telah wujud\n"
+"dalam folder ini. Adakah anda tetap ingin menambahnya?"
+
+#: addressbook/addressbook-errors.xml.h:62 mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Tambah"
+
 #: addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "Alamat Segerak Default:"
 
-#: addressbook/conduit/address-conduit.c:1181
-#: addressbook/conduit/address-conduit.c:1182
+#: addressbook/conduit/address-conduit.c:1183
+#: addressbook/conduit/address-conduit.c:1184
 msgid "Could not load addressbook"
 msgstr "Tidak dapat memuatkan buku alamat"
 
-#: addressbook/conduit/address-conduit.c:1250
-#: addressbook/conduit/address-conduit.c:1253
+#: addressbook/conduit/address-conduit.c:1252
+#: addressbook/conduit/address-conduit.c:1255
 msgid "Could not read pilot's Address application block"
 msgstr "Tidak dapat membaca blok aplikasi Alamat pilot"
 
@@ -250,7 +282,7 @@ msgstr "Konfigurasikan auto-penyempurnaan di sini"
 
 #. Create the contacts group
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: addressbook/gui/component/addressbook-view.c:1144
+#: addressbook/gui/component/addressbook-view.c:1102
 #: calendar/gui/migration.c:377
 msgid "Contacts"
 msgstr "Kenalan"
@@ -312,7 +344,7 @@ msgid "Create a new contact list"
 msgstr "Cipta senarai kenalan baru"
 
 #: addressbook/gui/component/addressbook-component.c:109
-#: addressbook/gui/component/addressbook-view.c:813
+#: addressbook/gui/component/addressbook-view.c:743
 msgid "New Address Book"
 msgstr "Buku Alamat Baru"
 
@@ -342,9 +374,9 @@ msgstr "Memigrasikan '%s':"
 #. create the local source group
 #. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:493
-#: calendar/gui/migration.c:450 calendar/gui/migration.c:532
+#: calendar/gui/migration.c:451 calendar/gui/migration.c:544
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-component.c:249 mail/mail-vfolder.c:218
+#: mail/mail-component.c:252 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Pada Komputer Ini"
 
@@ -354,9 +386,9 @@ msgstr "Pada Komputer Ini"
 #. orange
 #: addressbook/gui/component/addressbook-migrate.c:501
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/migration.c:458 calendar/gui/migration.c:540
+#: calendar/gui/migration.c:459 calendar/gui/migration.c:552
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:99
 msgid "Personal"
 msgstr "Peribadi"
 
@@ -416,14 +448,9 @@ msgstr ""
 "Sila bersabar sementara Evolution memigrasikan data penyegerakan Pilot "
 "anda..."
 
-#: addressbook/gui/component/addressbook-view.c:711
-#, c-format
-msgid "Address book '%s' will be removed. Are you sure you want to continue?"
-msgstr "Buku alamat '%s' akan dibuang. Anda pasti untuk teruskan?"
-
-#: addressbook/gui/component/addressbook-view.c:814
-#: addressbook/gui/widgets/e-addressbook-view.c:1124
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:376
+#: addressbook/gui/component/addressbook-view.c:744
+#: addressbook/gui/widgets/e-addressbook-view.c:933
+#: calendar/gui/calendar-component.c:384 calendar/gui/tasks-component.c:330
 #: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:3
@@ -432,8 +459,8 @@ msgstr "Buku alamat '%s' akan dibuang. Anda pasti untuk teruskan?"
 msgid "Delete"
 msgstr "Padam"
 
-#: addressbook/gui/component/addressbook-view.c:815
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:378
+#: addressbook/gui/component/addressbook-view.c:745
+#: calendar/gui/calendar-component.c:385 calendar/gui/tasks-component.c:331
 msgid "Properties..."
 msgstr "Ciri-ciri..."
 
@@ -442,35 +469,70 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Mengakses Pelayan LDAP secara anonymous"
 
 #: addressbook/gui/component/addressbook.c:184
-#: camel/providers/groupwise/camel-gw-listener.c:420
+#: camel/providers/groupwise/camel-gw-listener.c:460
 msgid "Failed to authenticate.\n"
 msgstr "Gagal untuk mengautentikasi.\n"
 
 #: addressbook/gui/component/addressbook.c:191
-#: camel/providers/groupwise/camel-gw-listener.c:409
+#: camel/providers/groupwise/camel-gw-listener.c:449
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sMasukkan kata laluan bagi %s (pengguna %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
-msgid "EFolderList xml for the list of completion uris"
+#, fuzzy
+msgid "EFolderList XML for the list of completion URIs"
 msgstr "xml EFolderList bagi senarai uri penyempurnaan"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#, fuzzy
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "xml EFolderList bagi senarai uri penyempurnaan"
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 msgid "Position of the vertical pane in main view"
 msgstr "POsisi bagi jendela menegak pada paparan utama"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#, fuzzy
+msgid "Position of the vertical pane in main view."
+msgstr "POsisi bagi jendela menegak pada paparan utama"
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: mail/evolution-mail.schemas.in.in.h:71
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Pralihat Anak Tetingkap"
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid ""
 "The number of characters that must be typed before evolution will attempt to "
 "autocomplete"
 msgstr ""
 "Bilangan aksara yang mesti ditaip sebelum evolution akan cuba auto-sempurna"
 
-#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+#, fuzzy
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete."
+msgstr ""
+"Bilangan aksara yang mesti ditaip sebelum evolution akan cuba auto-sempurna"
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI bagi folder terakhir digunakan pada dialog nama pilihan"
 
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#, fuzzy
+msgid "URI for the folder last used in the select names dialog."
+msgstr "URI bagi folder terakhir digunakan pada dialog nama pilihan"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -545,8 +607,7 @@ msgstr "Tambah Buku Alamat"
 msgid "Address Book Properties"
 msgstr "Ciri-ciri Buku Alamat"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:86
 msgid "Always"
 msgstr "Sentiasa"
 
@@ -584,7 +645,8 @@ msgstr "Cari Asas Carian yang boleh"
 
 #: addressbook/gui/component/ldap-config.glade.h:23
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
+#: mail/em-folder-properties.c:212 mail/mail-config.glade.h:82
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Umum"
 
@@ -592,8 +654,7 @@ msgstr "Umum"
 msgid "Lo_gin:"
 msgstr "Log _masuk:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:102
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:88
 msgid "Never"
 msgstr "Tidak sekali"
 
@@ -716,8 +777,7 @@ msgstr "Menggunakan nama berbeza (NB)"
 msgid "Using email address"
 msgstr "Menggunakan alamat emel"
 
-#: addressbook/gui/component/ldap-config.glade.h:42 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:156
+#: addressbook/gui/component/ldap-config.glade.h:42 mail/mail-account-gui.c:87
 msgid "Whenever Possible"
 msgstr "Apabila Boleh"
 
@@ -738,7 +798,7 @@ msgid "_Log in method:"
 msgstr "_Kaedah log masuk:"
 
 #: addressbook/gui/component/ldap-config.glade.h:47
-#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:158
 msgid "_Name:"
 msgstr "_Nama:"
 
@@ -769,7 +829,6 @@ msgstr "kad"
 #: addressbook/gui/component/ldap-config.glade.h:54
 #: calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
-#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minit"
 
@@ -782,8 +841,8 @@ msgid "Remove All"
 msgstr "Buang Semua"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
-#: addressbook/gui/component/select-names/e-select-names.c:702
-#: calendar/gui/dialogs/cal-prefs-dialog.c:724
+#: addressbook/gui/component/select-names/e-select-names.c:690
+#: calendar/gui/dialogs/cal-prefs-dialog.c:723
 msgid "Remove"
 msgstr "Buang"
 
@@ -801,7 +860,7 @@ msgid "Send HTML Mail?"
 msgstr "Hantar Mel HTML?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Tambahkan ke Kenalan"
 
@@ -887,7 +946,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Kerja</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "AIM"
 msgstr "AIM"
@@ -921,7 +980,7 @@ msgid "Company:"
 msgstr "Syarikat:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: addressbook/gui/contact-editor/e-contact-editor.c:271
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:172
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -929,7 +988,7 @@ msgid "Contact"
 msgstr "Kenalan"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:526
+#: addressbook/gui/contact-editor/e-contact-editor.c:525
 msgid "Contact Editor"
 msgstr "Editor Kenalan"
 
@@ -1022,9 +1081,9 @@ msgstr "Log Web:"
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:200
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:143
 msgid "Work"
 msgstr "Kerja"
 
@@ -1041,7 +1100,7 @@ msgid "_File under:"
 msgstr "_Failkan di:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
 msgid "_Where:"
 msgstr "_Dimana:"
 
@@ -1054,10 +1113,10 @@ msgstr "Alamat"
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-editor/e-contact-editor.c:292
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:186
 #: addressbook/gui/widgets/e-addressbook-model.c:309
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
 #: addressbook/gui/widgets/e-minicard-label.c:164
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:498
@@ -2038,7 +2097,7 @@ msgid "AOL Instant Messenger"
 msgstr "Pemesejan Segera AOL"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Jabber"
 msgstr "Jabber"
@@ -2048,7 +2107,7 @@ msgid "Yahoo Messenger"
 msgstr "Pemesejan Yahoo!"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
 #: addressbook/gui/widgets/eab-contact-display.c:335
 msgid "ICQ"
 msgstr "ICQ"
@@ -2058,7 +2117,7 @@ msgid "Service"
 msgstr "Servis"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/dialogs/cal-prefs-dialog.c:577
 #: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Location"
 msgstr "Lokasi"
@@ -2068,63 +2127,63 @@ msgid "Username"
 msgstr "Namapengguna:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 msgid "Home"
 msgstr "Rumah"
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Other"
 msgstr "Lain"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/widgets/eab-contact-display.c:338
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
 #: addressbook/gui/widgets/eab-contact-display.c:337
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "GroupWise"
 msgstr "Groupwise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Buku Sumber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:265
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Buku Sasaran"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:279
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Merupakan Kenalan Baru"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:286
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Medan Boleh Tulis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:300
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Diubah"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2457
+#: addressbook/gui/contact-editor/e-contact-editor.c:2456
 msgid "This contact belongs to these categories:"
 msgstr "Kenalan ini tergolong dalam kategori ini:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2550
+#: addressbook/gui/contact-editor/e-contact-editor.c:2549
 msgid "Please select an image for this contact"
 msgstr "Sila pilih imej bagi kelanan ini"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2551
+#: addressbook/gui/contact-editor/e-contact-editor.c:2550
 msgid "No image"
 msgstr "Tiada imej"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2779
+#: addressbook/gui/contact-editor/e-contact-editor.c:2778
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2132,7 +2191,7 @@ msgstr ""
 "Data kenalan tak sah:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2807
+#: addressbook/gui/contact-editor/e-contact-editor.c:2806
 msgid "Invalid contact."
 msgstr "Kenalan tak sah."
 
@@ -2145,7 +2204,7 @@ msgid "_Edit Full"
 msgstr "_Edit Penuh "
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:153
 msgid "_Full Name:"
 msgstr "_Nama Penuh:"
 
@@ -2295,42 +2354,42 @@ msgid "Add an email to the List"
 msgstr "Tambah emel ke senarai"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:813
+msgid "Contact List Editor"
+msgstr "Editor Senarai Kenalan"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Insert email adresses from Adress Book"
 msgstr "Masukkan alamat emel daripada Buku Alamat"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:714
 msgid "Members"
 msgstr "Ahli"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
 msgstr "Buang alamat emel yang daripada Senarai"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "Select"
 msgstr "Pilih"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 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:10
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_List name:"
 msgstr "Nama _senarai:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 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:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#: smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialog1"
-
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:165
 #: addressbook/gui/widgets/e-addressbook-model.c:295
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:377
 #: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:484
@@ -2347,10 +2406,6 @@ msgstr "Ialah Senarai Baru"
 msgid "Required Participants"
 msgstr "Peserta yang Diperlukan"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:813
-msgid "Contact List Editor"
-msgstr "Editor Senarai Kenalan"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Kenalan Diubah:"
@@ -2406,7 +2461,7 @@ msgstr[0] "%d kenalan"
 msgstr[1] "%d kenalan"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
 #: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:491
@@ -2417,7 +2472,7 @@ msgstr "Pertanyaan"
 msgid "Error getting book view"
 msgstr "Ralat ketika mendapatkan pandangan buku"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 msgid "Model"
 msgstr "Model"
 
@@ -2457,97 +2512,68 @@ msgstr "Lanjutan..."
 msgid "Type"
 msgstr "Jenis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:544
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Buku Alamat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
-#: addressbook/gui/widgets/e-addressbook-view.c:2098
+#: addressbook/gui/widgets/e-addressbook-view.c:802
+#: addressbook/gui/widgets/e-addressbook-view.c:920
+#: addressbook/gui/widgets/e-addressbook-view.c:1971
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Simpan sebagai VCard..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1095
+#: addressbook/gui/widgets/e-addressbook-view.c:916
 msgid "New Contact..."
 msgstr "Kenalan Baru..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1096
+#: addressbook/gui/widgets/e-addressbook-view.c:917
 msgid "New Contact List..."
 msgstr "Senarai Kenalan Baru..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-msgid "Go to Folder..."
-msgstr "Pergi ke Folder..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
-msgid "Import..."
-msgstr "Import..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1102
-msgid "Search for Contacts..."
-msgstr "Carian Kenalan..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1103
-msgid "Address Book Sources..."
-msgstr "Sumber Buku Alamat..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1105
-msgid "Pilot Settings..."
-msgstr "Tetapan Pilot..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:921
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Majukan Kenalan"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1110
+#: addressbook/gui/widgets/e-addressbook-view.c:922
 msgid "Send Message to Contact"
 msgstr "Hantar Mesej kepada Kenalan"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1111 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:923 calendar/gui/print.c:2483
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Cetak"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
-msgid "Print Envelope"
-msgstr "Cetak Sampul Surat"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: addressbook/gui/widgets/e-addressbook-view.c:926
 msgid "Copy to Address Book..."
 msgstr "Salin ke Buku Alamat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1118
+#: addressbook/gui/widgets/e-addressbook-view.c:927
 msgid "Move to Address Book..."
 msgstr "Alih ke Buku Alamat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1121
+#: addressbook/gui/widgets/e-addressbook-view.c:930
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Potong"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1122
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:374
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: calendar/gui/calendar-component.c:383 calendar/gui/tasks-component.c:329
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Salin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: addressbook/gui/widgets/e-addressbook-view.c:932
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Tampal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1128
-#: calendar/gui/e-calendar-view.c:1418
-msgid "Current View"
-msgstr "Paparan Semasa"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1683
+#: addressbook/gui/widgets/e-addressbook-view.c:1525
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Sebarang Kategori"
@@ -2581,6 +2607,7 @@ msgid "Car Phone"
 msgstr "Telefon Kereta"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
 #: calendar/gui/e-cal-list-view.etspec.h:1
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Categories"
@@ -2596,12 +2623,12 @@ msgid "Email"
 msgstr "Emel"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/eab-popup-control.c:441
 msgid "Email 2"
 msgstr "Emel 2"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/eab-popup-control.c:451
 msgid "Email 3"
 msgstr "Emel 3"
 
@@ -2901,11 +2928,10 @@ msgstr "Protokol tidak disokong"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-cal-model-tasks.c:353 calendar/gui/e-cal-model-tasks.c:656
-#: calendar/gui/e-calendar-table.c:473 calendar/gui/print.c:2349
-#: camel/camel-service.c:724 camel/camel-service.c:762
-#: camel/camel-service.c:846 camel/camel-service.c:886
-#: camel/providers/pop3/camel-pop3-store.c:456
-#: camel/providers/pop3/camel-pop3-store.c:537
+#: calendar/gui/e-calendar-table.c:457 calendar/gui/print.c:2352
+#: camel/camel-service.c:724 camel/camel-service.c:886
+#: camel/camel-service.c:1017 camel/providers/pop3/camel-pop3-store.c:421
+#: camel/providers/pop3/camel-pop3-store.c:502
 msgid "Cancelled"
 msgstr "Batal"
 
@@ -2916,6 +2942,7 @@ msgstr "Tidak dapat membatal"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: addressbook/gui/widgets/eab-gui-util.c:63
+#: calendar/gui/comp-editor-factory.c:428
 msgid "Authentication Failed"
 msgstr "Autentikasi Gagal"
 
@@ -3109,37 +3136,37 @@ msgstr "VCard bagi %s"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:199
+#: addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(tiada)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:432
+#: addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Emel Utama"
 
-#: addressbook/gui/widgets/eab-popup-control.c:568
+#: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Pilih Aksi"
 
-#: addressbook/gui/widgets/eab-popup-control.c:576
+#: addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Cipta kenalan baru \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:592
+#: addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Tambahkan alamat pada kenalan sedia ada \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:870
+#: addressbook/gui/widgets/eab-popup-control.c:869
 msgid "Querying Address Book..."
 msgstr "Mengkueri Buku Alamat..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:953
+#: addressbook/gui/widgets/eab-popup-control.c:952
 msgid "Edit Contact Info"
 msgstr "Edit Maklumat Kenalan"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1008
+#: addressbook/gui/widgets/eab-popup-control.c:1007
 msgid "Merge E-Mail Address"
 msgstr "Cantumkan Alamat E-mel"
 
@@ -3308,6 +3335,11 @@ msgid "Number of columns:"
 msgstr "Bilangan lajur:"
 
 #: addressbook/printing/e-contact-print.glade.h:23
+#: camel/providers/groupwise/camel-groupwise-provider.c:59
+#: camel/providers/imap/camel-imap-provider.c:64
+#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:79
+#: camel/providers/local/camel-local-provider.c:99
 msgid "Options"
 msgstr "Opsyen"
 
@@ -3466,12 +3498,12 @@ msgid "In async mode, output must be file."
 msgstr "Dalam mod segerak, output mesti fail."
 
 #: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
+msgid "In normal mode, there is no need for the size option."
 msgstr "Dalam mod normal, opsyen saiz sepatutnya tidak perlu."
 
 #: addressbook/tools/evolution-addressbook-export.c:153
-msgid "Impossible internal error."
-msgstr "Ralat dalaman mustahil."
+msgid "Unhandled error"
+msgstr "Ralat tak diketahui"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3485,7 +3517,7 @@ msgstr "Fail Input"
 msgid "No filename provided."
 msgstr "Tiada nama fail diberikan. "
 
-#: addressbook/util/e-destination.c:577
+#: addressbook/util/e-destination.c:578
 msgid "Unnamed List"
 msgstr "Senarai Tanpa Nama"
 
@@ -3668,7 +3700,6 @@ msgid "You have made changes to this appointment, but not yet saved them."
 msgstr "Anda telah membuat perubahan pada temujanji ini, tapi belum disimpan."
 
 #: calendar/calendar-errors.xml.h:73 calendar/calendar-errors.xml.h:81
-#: composer/mail-composer-errors.xml.h:33
 msgid "Discard Changes"
 msgstr "Buang Perubahan"
 
@@ -3774,7 +3805,27 @@ msgstr "Kalendar Evolution telah keluar tanpa diduga."
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Kalendar anda tidak akan ada sehingga Evolution diulanghidupkan."
 
-#: calendar/common/authentication.c:48 calendar/gui/e-pub-utils.c:301
+#. calendar:prompt-delete-calendar primary
+#: calendar/calendar-errors.xml.h:116
+msgid "Delete calendar '{0}'?"
+msgstr "Padam Kalendar '{0}'?"
+
+#. calendar:prompt-delete-calendar secondary
+#: calendar/calendar-errors.xml.h:118
+msgid "This calendar will be removed permanently."
+msgstr "Kalendar ini akan dipadam secara kekal."
+
+#. calendar:prompt-delete-task-list primary
+#: calendar/calendar-errors.xml.h:120
+msgid "Delete task list '{0}'?"
+msgstr "Padma senarai tugas '{0}'?"
+
+#. calendar:prompt-delete-task-list secondary
+#: calendar/calendar-errors.xml.h:122
+msgid "This task list will be removed permanently."
+msgstr "Senarai tugas ini akan dibuang secara kekal."
+
+#: calendar/common/authentication.c:49 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Masukkan Kata Laluan"
@@ -3783,17 +3834,17 @@ msgstr "Masukkan Kata Laluan"
 msgid "Split Multi-Day Events:"
 msgstr "Pisahkan Peristiwa Berbilang Hari:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1356
-#: calendar/conduits/calendar/calendar-conduit.c:1357
+#: calendar/conduits/calendar/calendar-conduit.c:1359
+#: calendar/conduits/calendar/calendar-conduit.c:1360
 #: calendar/conduits/todo/todo-conduit.c:879
 #: calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "Tidak dapat memulakan pevolution-data-server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1465
 #: calendar/conduits/calendar/calendar-conduit.c:1468
+#: calendar/conduits/calendar/calendar-conduit.c:1471
 msgid "Could not read pilot's Calendar application block"
-msgstr "Tidak dapat membaca blok aplikasi Kalendar rintis"
+msgstr "Tidak dapat membaca blok aplikasi Kalendar pilot"
 
 #: calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
@@ -3802,14 +3853,14 @@ msgstr "Prioriti Default:"
 #: calendar/conduits/todo/todo-conduit.c:959
 #: calendar/conduits/todo/todo-conduit.c:962
 msgid "Could not read pilot's ToDo application block"
-msgstr "Tidak dapat membaca blok aplikasi ToDo rintis"
+msgstr "Tidak dapat membaca blok aplikasi ToDo pilot"
 
 #: 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
-#: calendar/gui/calendar-component.c:1079
+#: calendar/gui/calendar-component.c:1063
 msgid "Calendars"
 msgstr "Kalendar"
 
@@ -3842,11 +3893,11 @@ msgid "Evolution's Tasks component"
 msgstr "Komponen ujian Evolution"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: calendar/gui/e-tasks.c:1199 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:419 calendar/gui/tasks-component.c:889
-#: calendar/gui/tasks-control.c:408 calendar/importers/icalendar-importer.c:83
+#: calendar/gui/e-tasks.c:1199 calendar/gui/print.c:1822
+#: calendar/gui/tasks-component.c:401 calendar/gui/tasks-component.c:871
+#: calendar/gui/tasks-control.c:410 calendar/importers/icalendar-importer.c:83
 #: calendar/importers/icalendar-importer.c:709
-#: camel/providers/groupwise/camel-gw-listener.c:332
+#: camel/providers/groupwise/camel-gw-listener.c:372
 msgid "Tasks"
 msgstr "Tugas"
 
@@ -3893,24 +3944,24 @@ msgstr "_Edit temu janji"
 msgid "_Snooze"
 msgstr "Tidur sekejap"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:904
+#: calendar/gui/alarm-notify/alarm-queue.c:856
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Buka"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:906
+#: calendar/gui/alarm-notify/alarm-queue.c:857
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:908
+#: calendar/gui/alarm-notify/alarm-queue.c:858
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:973
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Tidak ada huraian."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:992
+#: calendar/gui/alarm-notify/alarm-queue.c:968
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3923,12 +3974,12 @@ msgstr ""
 "Bermula pada %s\n"
 "Berakhir pada %s"
 
+#: calendar/gui/alarm-notify/alarm-queue.c:1068
 #: calendar/gui/alarm-notify/alarm-queue.c:1092
-#: calendar/gui/alarm-notify/alarm-queue.c:1116
 msgid "Warning"
 msgstr "Amaran"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1096
+#: calendar/gui/alarm-notify/alarm-queue.c:1072
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3940,7 +3991,7 @@ msgstr ""
 "dikonfigurasikan untuk menghantar e-mel. Evolution sebaliknya akan\n"
 "memaparkan kotak dialog peringatan yang normal."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1122
+#: calendar/gui/alarm-notify/alarm-queue.c:1098
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3957,7 +4008,7 @@ msgstr ""
 "\n"
 "Adakah anda pasti ingin menjalankan atur cara ini?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1136
+#: calendar/gui/alarm-notify/alarm-queue.c:1112
 msgid "Do not ask me about this program again."
 msgstr "Jangan tanya saya lagi tentang atur cara ini."
 
@@ -4054,9 +4105,8 @@ msgid "Programs that can run as part of alarms"
 msgstr "Program yang dilaksanakan sebagai sebahagian penggera"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
-#, fuzzy
 msgid "Show where events end in week and month views"
-msgstr "_Tunjukkan masa akhir temu janji dalam pandangan minggu dan bulan"
+msgstr "Papar dimana acara berakhir pada paparan mingguan dan bulanan"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Time last alarm ran"
@@ -4076,16 +4126,15 @@ msgstr "Hari bekerja bermula pada"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Whether or not to use the notification tray for display alarms"
-msgstr ""
+msgstr "Samada menggunakan dulang pemakluman bagi memapar penggera"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Samada bertanya kepastian pada memadaman temujanji"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
-#, fuzzy
 msgid "Whether to ask for confirmation when folder is expunged"
-msgstr "Minta pengesahan apabila memadam item"
+msgstr "Samada minta kepastian bila folder diexpunge"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
@@ -4119,19 +4168,19 @@ msgstr "Ulasan mengandungi"
 msgid "Location contains"
 msgstr "Lokasi mengandungi"
 
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:343
 msgid "Unmatched"
 msgstr "Tidak padan"
 
-#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:564
+#: calendar/gui/calendar-commands.c:119 calendar/gui/calendar-component.c:548
 #: calendar/gui/dialogs/select-source-dialog.c:112
-#: calendar/gui/gnome-cal.c:1859
-#: camel/providers/groupwise/camel-gw-listener.c:331
-#: camel/providers/groupwise/camel-gw-listener.c:361
+#: calendar/gui/gnome-cal.c:1912
+#: camel/providers/groupwise/camel-gw-listener.c:371
+#: camel/providers/groupwise/camel-gw-listener.c:401
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: calendar/gui/calendar-commands.c:352
+#: calendar/gui/calendar-commands.c:354
 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 "
@@ -4141,66 +4190,61 @@ msgstr ""
 "jumlah masa yang dipilih. Jika anda meneruskannya, anda tidak akan dapat "
 "memulihkan tugas ini. "
 
-#: calendar/gui/calendar-commands.c:358
+#: calendar/gui/calendar-commands.c:360
 msgid "Purge events older than"
 msgstr "Singkirkan peristiwa yang lebih lama dari"
 
-#: calendar/gui/calendar-commands.c:363
+#: calendar/gui/calendar-commands.c:365
 #: calendar/gui/dialogs/alarm-dialog.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "hari"
 
-#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
+#: calendar/gui/calendar-commands.c:446 calendar/gui/calendar-component.c:505
+#: calendar/gui/calendar-component.c:510 calendar/gui/calendar-component.c:512
+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.
 #. strftime format %a = abbreviated weekday name,
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:519
+#: calendar/gui/calendar-commands.c:439 calendar/gui/calendar-component.c:503
 #: calendar/gui/e-day-view-top-item.c:714 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:521
-#: calendar/gui/calendar-component.c:526 calendar/gui/calendar-component.c:528
-msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
-
-#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
-#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-commands.c:463 calendar/gui/calendar-commands.c:467
+#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
 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:465
-#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
+#: calendar/gui/calendar-commands.c:469
+#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1501
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:370
-#, c-format
-msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
-msgstr "Kalendar '%s' akan dibuang. Anda pasti untuk teruskan?"
-
-#: calendar/gui/calendar-component.c:426
+#: calendar/gui/calendar-component.c:382
 msgid "New Calendar"
 msgstr "Kalendar Baru"
 
-#: calendar/gui/calendar-component.c:516
+#: calendar/gui/calendar-component.c:500
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
-#: calendar/gui/calendar-component.c:540 calendar/gui/calendar-component.c:547
-#: calendar/gui/calendar-component.c:553 calendar/gui/calendar-component.c:555
+#: calendar/gui/calendar-component.c:524 calendar/gui/calendar-component.c:531
+#: calendar/gui/calendar-component.c:537 calendar/gui/calendar-component.c:539
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -4209,79 +4253,79 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-component.c:545
+#: calendar/gui/calendar-component.c:529
 #: calendar/gui/e-day-view-top-item.c:718 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/calendar-component.c:635
+#: calendar/gui/calendar-component.c:619
 msgid "Failed upgrading calendars."
 msgstr "Gagal meningkatupaya kalendar."
 
-#: calendar/gui/calendar-component.c:931
+#: calendar/gui/calendar-component.c:915
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Gagal membuka kalendar '%s' untuk mencipta acara dan mensyuarat"
 
-#: calendar/gui/calendar-component.c:947
+#: calendar/gui/calendar-component.c:931
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Tiada kalendar untuk mencipta acara dan mensyuarat"
 
-#: calendar/gui/calendar-component.c:1245
+#: calendar/gui/calendar-component.c:1229
 msgid "New appointment"
 msgstr "Temu janji baru"
 
-#: calendar/gui/calendar-component.c:1246
+#: calendar/gui/calendar-component.c:1230
 msgid "_Appointment"
 msgstr "_Temu janji"
 
-#: calendar/gui/calendar-component.c:1247
+#: calendar/gui/calendar-component.c:1231
 msgid "Create a new appointment"
 msgstr "Cipta temu janji baru"
 
-#: calendar/gui/calendar-component.c:1253
+#: calendar/gui/calendar-component.c:1237
 msgid "New meeting"
 msgstr "Mesyuarat baru"
 
-#: calendar/gui/calendar-component.c:1254
+#: calendar/gui/calendar-component.c:1238
 msgid "M_eeting"
 msgstr "M_esyuarat"
 
-#: calendar/gui/calendar-component.c:1255
+#: calendar/gui/calendar-component.c:1239
 msgid "Create a new meeting request"
 msgstr "Cipta permintaan mesyuarat baru"
 
-#: calendar/gui/calendar-component.c:1261
+#: calendar/gui/calendar-component.c:1245
 msgid "New all day appointment"
 msgstr "Temu Janji baru sepanjang hari"
 
-#: calendar/gui/calendar-component.c:1262
+#: calendar/gui/calendar-component.c:1246
 msgid "All Day A_ppointment"
 msgstr "Temu Janji _Sepanjang Hari"
 
-#: calendar/gui/calendar-component.c:1263
+#: calendar/gui/calendar-component.c:1247
 msgid "Create a new all-day appointment"
 msgstr "Cipta temu janji baru sepanjang hari"
 
-#: calendar/gui/calendar-component.c:1269
+#: calendar/gui/calendar-component.c:1253
 msgid "New calendar"
 msgstr "Kalendar baru"
 
-#: calendar/gui/calendar-component.c:1270
+#: calendar/gui/calendar-component.c:1254
 msgid "Cale_ndar"
 msgstr "Kale_ndar"
 
-#: calendar/gui/calendar-component.c:1271
+#: calendar/gui/calendar-component.c:1255
 msgid "Create a new calendar"
 msgstr "Cipta kalendar baru"
 
-#: calendar/gui/calendar-offline-handler.c:192
+#: calendar/gui/calendar-offline-handler.c:191
 #, c-format
 msgid "backend_go_offline(): %s"
 msgstr "backend_go_offline(): %s"
 
-#: calendar/gui/calendar-offline-handler.c:215
+#: calendar/gui/calendar-offline-handler.c:214
 #, c-format
 msgid "backend_go_online(): %s"
 msgstr "backend_go_online(): %s"
@@ -4302,19 +4346,29 @@ msgstr "Paparan Minggu"
 msgid "Month View"
 msgstr "Paparan Bulan"
 
-#: calendar/gui/comp-editor-factory.c:409
+#: calendar/gui/comp-editor-factory.c:410
 msgid "Error while opening the calendar"
 msgstr "Ralat ketika membuka kalendar"
 
-#: calendar/gui/comp-editor-factory.c:420
+#: calendar/gui/comp-editor-factory.c:416
 msgid "Method not supported when opening the calendar"
 msgstr "Kaedah tidak disokong semasa membuka kalendar"
 
-#: calendar/gui/comp-editor-factory.c:426
+#: calendar/gui/comp-editor-factory.c:422
 msgid "Permission denied to open the calendar"
 msgstr "Kebenaran dinafikan untuk membuka kalendar"
 
-#: calendar/gui/comp-editor-factory.c:474
+#: calendar/gui/comp-editor-factory.c:434
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:260
+#: camel/providers/pop3/camel-pop3-store.c:508
+#: camel/providers/pop3/camel-pop3-store.c:515
+#: camel/providers/pop3/camel-pop3-store.c:521 shell/e-shell.c:1230
+msgid "Unknown error"
+msgstr "Ralat tak diketahui"
+
+#: calendar/gui/comp-editor-factory.c:478
 #, c-format
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
@@ -4421,6 +4475,23 @@ msgid "minute(s)"
 msgstr "minit"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:28
+msgid "option menu to choose alarm action"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:29
+#, fuzzy
+msgid "option menu to choose alarm relative"
+msgstr "Menu opsyen untuk memilih penggera."
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:30
+msgid "option menu to choose alarm time"
+msgstr "menu opsyen untuk memilih masa penggera."
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:31
+msgid "option menu to choose alarm value units"
+msgstr "menu opsyen untuk memilih unit nilai penggera"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:32
 msgid "start of appointment"
 msgstr "temu janji bermula"
 
@@ -4438,34 +4509,34 @@ msgstr "Penggera"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
-#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
+#: calendar/gui/dialogs/cal-prefs-dialog.c:566 mail/em-account-prefs.c:481
+#: mail/em-composer-prefs.c:678 mail/em-composer-prefs.c:937
 msgid "Enabled"
 msgstr "Dihidupkan"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:720
 msgid "Are you sure you want to remove this URL?"
 msgstr "Adakah anda pasti ingin membuang URL ini?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:729
+#: calendar/gui/dialogs/cal-prefs-dialog.c:728
 msgid "Don't Remove"
 msgstr "Jangan Buang"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:778
-#: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
-#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
-#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
-#: mail/em-composer-prefs.c:684
+#: calendar/gui/dialogs/cal-prefs-dialog.c:777
+#: calendar/gui/dialogs/cal-prefs-dialog.c:810
+#: calendar/gui/dialogs/cal-prefs-dialog.c:843 mail/em-account-prefs.c:328
+#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:387
+#: mail/em-composer-prefs.c:597 mail/em-composer-prefs.c:655
+#: mail/em-composer-prefs.c:685
 msgid "Disable"
 msgstr "Dimatikan"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:778
-#: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
-#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
-#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
-#: mail/em-composer-prefs.c:684
+#: calendar/gui/dialogs/cal-prefs-dialog.c:777
+#: calendar/gui/dialogs/cal-prefs-dialog.c:810
+#: calendar/gui/dialogs/cal-prefs-dialog.c:845 mail/em-account-prefs.c:328
+#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:389
+#: mail/em-composer-prefs.c:597 mail/em-composer-prefs.c:655
+#: mail/em-composer-prefs.c:685
 msgid "Enable"
 msgstr "Hidupkan"
 
@@ -4534,7 +4605,7 @@ msgid "Display"
 msgstr "Papar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:72
 msgid "E_nable"
 msgstr "Bo_lehkan"
 
@@ -4543,7 +4614,7 @@ msgid "Free/Busy Publishing"
 msgstr "Penerbitan Bebas/Sibuk"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:739
 msgid "Friday"
 msgstr "Jumaat"
@@ -4557,7 +4628,7 @@ msgid "Minutes"
 msgstr "Minit"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:735
 msgid "Monday"
 msgstr "Isnin"
@@ -4567,7 +4638,7 @@ msgid "S_un"
 msgstr "A_had"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:740
 msgid "Saturday"
 msgstr "Sabtu"
@@ -4581,7 +4652,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Tunjukkan bilangan _minggu dalam pemandu arah tarikh"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1040
+#: calendar/gui/dialogs/recurrence-page.c:1051
 #: calendar/gui/e-itip-control.c:734
 msgid "Sunday"
 msgstr "Ahad"
@@ -4595,7 +4666,7 @@ msgid "T_hu"
 msgstr "K_hamis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/dialogs/recurrence-page.c:1048
 #: calendar/gui/e-itip-control.c:738
 msgid "Thursday"
 msgstr "Khamis"
@@ -4609,7 +4680,7 @@ msgid "Time format:"
 msgstr "Format masa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:736
 msgid "Tuesday"
 msgstr "Selasa"
@@ -4619,7 +4690,7 @@ msgid "W_eek starts:"
 msgstr "M_inggu bermula:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:737
 msgid "Wednesday"
 msgstr "Rabu"
@@ -4654,7 +4725,7 @@ msgstr "_Hari bermula:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 #: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
-#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:149 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 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:43
@@ -4703,6 +4774,14 @@ msgstr "_Rabu"
 msgid "before every appointment"
 msgstr "sebelum setiap temu janji"
 
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+msgid "option menu to choose reminder units"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+msgid "option menu to choose time units"
+msgstr ""
+
 #: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "Anda mestilah nyatakan lokasi untuk memperoleh kalendar."
@@ -4743,7 +4822,7 @@ msgstr "Tambah Senarai Tugas"
 msgid "C_olor:"
 msgstr "W_arna:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:100
 msgid "Pick a color"
 msgstr "Pilih warna"
 
@@ -4824,23 +4903,23 @@ msgstr "%s  Anda tidak membuat sebarang perubahan, kemas kini editor?"
 msgid "Validation error: %s"
 msgstr "Ralat pengesahan: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2261
 msgid " to "
 msgstr " kepada "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2265
 msgid " (Completed "
 msgstr "(Siap "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2267
 msgid "Completed "
 msgstr "Siap "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2272
 msgid " (Due "
 msgstr " (Genap Tempoh "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2274
 msgid "Due "
 msgstr "Genap Tempoh"
 
@@ -4848,42 +4927,42 @@ msgstr "Genap Tempoh"
 msgid "Could not update object"
 msgstr "Tidak dapat mengemas kini objek"
 
-#: calendar/gui/dialogs/comp-editor.c:878
-#: calendar/gui/dialogs/comp-editor.c:915
+#: calendar/gui/dialogs/comp-editor.c:870
+#: calendar/gui/dialogs/comp-editor.c:907
 msgid "Edit Appointment"
 msgstr "Edit Temu Janji"
 
-#: calendar/gui/dialogs/comp-editor.c:883
-#: calendar/gui/dialogs/comp-editor.c:920
+#: calendar/gui/dialogs/comp-editor.c:875
+#: calendar/gui/dialogs/comp-editor.c:912
 #, c-format
 msgid "Appointment - %s"
 msgstr "Temu janji - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:886
-#: calendar/gui/dialogs/comp-editor.c:923
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 #, c-format
 msgid "Task - %s"
 msgstr "Tugas - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:889
-#: calendar/gui/dialogs/comp-editor.c:926
+#: calendar/gui/dialogs/comp-editor.c:881
+#: calendar/gui/dialogs/comp-editor.c:918
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entri jurnal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:900
-#: calendar/gui/dialogs/comp-editor.c:936
+#: calendar/gui/dialogs/comp-editor.c:892
+#: calendar/gui/dialogs/comp-editor.c:928
 msgid "No summary"
 msgstr "Tiada ringkasan"
 
-#: calendar/gui/dialogs/comp-editor.c:1302
-#: calendar/gui/dialogs/comp-editor.c:1335
-#: calendar/gui/dialogs/comp-editor.c:1359
+#: calendar/gui/dialogs/comp-editor.c:1294
+#: calendar/gui/dialogs/comp-editor.c:1327
+#: calendar/gui/dialogs/comp-editor.c:1351
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Perubahan yang dibuat pada item ini boleh dibuang jika kemas kini dilakukan"
 
-#: calendar/gui/dialogs/comp-editor.c:1383
+#: calendar/gui/dialogs/comp-editor.c:1375
 msgid "Unable to use current version!"
 msgstr "Tidak dapat menggunakan versi semasa!"
 
@@ -4959,7 +5038,7 @@ msgstr "Ditugaskan Kepada:"
 msgid "Enter Delegate"
 msgstr "Masukkan Ditugaskan"
 
-#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2298
 msgid "Appointment"
 msgstr "Temu janji"
 
@@ -5008,21 +5087,21 @@ msgstr "Masa akhir adalah salah"
 msgid "Unable to open the calendar '%s'."
 msgstr "Tak dapat membuka kalendar '%s'."
 
-#: calendar/gui/dialogs/event-page.c:1804
+#: calendar/gui/dialogs/event-page.c:1802
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d hari sebelum temu janji"
 msgstr[1] "%d hari sebelum setiap temu janji"
 
-#: calendar/gui/dialogs/event-page.c:1812
+#: calendar/gui/dialogs/event-page.c:1810
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d jam sebelum temu janji"
 msgstr[1] "%d jam sebelum temu janji"
 
-#: calendar/gui/dialogs/event-page.c:1820
+#: calendar/gui/dialogs/event-page.c:1818
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -5067,61 +5146,66 @@ msgid "Cale_ndar:"
 msgstr "Kale_ndar:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Classi_fication:"
 msgstr "Peng_kelasan:"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:355 calendar/gui/e-calendar-table.c:377
+#: calendar/gui/dialogs/task-page.glade.h:7 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:355 calendar/gui/e-calendar-table.c:361
 msgid "Confidential"
 msgstr "Sulit"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
+#, fuzzy
+msgid "Event Description"
+msgstr "Huraian:"
+
+#: calendar/gui/dialogs/event-page.glade.h:14
 msgid "Locat_ion:"
 msgstr "Lokas_i:"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:353 calendar/gui/e-calendar-table.c:376
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:353 calendar/gui/e-calendar-table.c:360
 msgid "Private"
 msgstr "Persendirian"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
-#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:344 calendar/gui/e-cal-model.c:351
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:344
+#: calendar/gui/e-cal-model.c:351 calendar/gui/e-calendar-table.c:359
 msgid "Public"
 msgstr "Awam"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:17
 msgid "Show time as _busy"
 msgstr "Papar masa sebagai _sibuk"
 
-#: calendar/gui/dialogs/event-page.glade.h:17
-#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:18
+#: calendar/gui/dialogs/task-page.glade.h:12
 msgid "Su_mmary:"
 msgstr "Ri_ngkasan:"
 
-#: calendar/gui/dialogs/event-page.glade.h:18
+#: calendar/gui/dialogs/event-page.glade.h:19
 msgid "This appointment has customized alarms"
 msgstr "temujanji ini mempunyai penggera tersendiri"
 
-#: calendar/gui/dialogs/event-page.glade.h:19
+#: calendar/gui/dialogs/event-page.glade.h:20
 msgid "_Alarm"
 msgstr "_Penggera"
 
-#: calendar/gui/dialogs/event-page.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:21
 msgid "_Description:"
 msgstr "_Huraian:"
 
-#: calendar/gui/dialogs/event-page.glade.h:21
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:640
 msgid "_End time:"
 msgstr "_Masa akhir:"
 
-#: calendar/gui/dialogs/event-page.glade.h:22
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/dialogs/event-page.glade.h:23
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_Start time:"
 msgstr "_Masa mula:"
 
@@ -5131,37 +5215,36 @@ msgstr "_Masa mula:"
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:316
+#: calendar/gui/dialogs/meeting-page.c:315
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-cal-model-tasks.c:648 calendar/gui/e-itip-control.c:1111
-#: composer/e-msg-composer.c:2097 filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:933
-#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1968
-#: mail/mail-config.glade.h:103
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:442 mail/em-folder-view.c:962
+#: mail/mail-account-gui.c:1578 mail/mail-account-gui.c:2023
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Tiada"
 
-#: calendar/gui/dialogs/meeting-page.c:449
+#: calendar/gui/dialogs/meeting-page.c:448
 msgid "The organizer selected no longer has an account."
 msgstr "Penyusun yang dipilih tidak lagi mempunyai akaun."
 
-#: calendar/gui/dialogs/meeting-page.c:455
+#: calendar/gui/dialogs/meeting-page.c:454
 msgid "An organizer is required."
 msgstr "Penyusun diperlukan."
 
-#: calendar/gui/dialogs/meeting-page.c:470
+#: calendar/gui/dialogs/meeting-page.c:469
 msgid "At least one attendee is required."
 msgstr "Sekurang-kurangnya seorang peserta diperlukan."
 
-#: calendar/gui/dialogs/meeting-page.c:793
+#: calendar/gui/dialogs/meeting-page.c:794
 msgid "_Delegate To..."
 msgstr "_Ditugaskan Kepada..."
 
 #: calendar/gui/dialogs/meeting-page.c:797
-#: composer/e-msg-composer-attachment-bar.c:453
+#: composer/e-msg-composer-attachment-bar.c:440
 msgid "_Remove"
 msgstr "_Buang"
 
@@ -5225,7 +5308,7 @@ msgid "C_hange Organizer"
 msgstr "_Ubah Penyusun"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:415
+#: calendar/gui/e-meeting-time-sel.c:426
 msgid "Con_tacts..."
 msgstr "_Kenalan..."
 
@@ -5234,6 +5317,11 @@ msgid "Or_ganizer:"
 msgstr "_Penyusun:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "Organizer"
+msgstr "Penyusun:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:8
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Penyusun:"
@@ -5314,51 +5402,51 @@ msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Temu janji ini mengandungi perulangan yang tidak boleh diedit oleh Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:806
+#: calendar/gui/dialogs/recurrence-page.c:817
 msgid "Recurrence date is invalid"
 msgstr "Tarikh perulangan tak sah"
 
-#: calendar/gui/dialogs/recurrence-page.c:917
+#: calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "pada"
 
-#: calendar/gui/dialogs/recurrence-page.c:978
+#: calendar/gui/dialogs/recurrence-page.c:989
 msgid "first"
 msgstr "pertama"
 
-#: calendar/gui/dialogs/recurrence-page.c:979
+#: calendar/gui/dialogs/recurrence-page.c:990
 msgid "second"
 msgstr "kedua"
 
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:991
 msgid "third"
 msgstr "ketiga"
 
-#: calendar/gui/dialogs/recurrence-page.c:981
+#: calendar/gui/dialogs/recurrence-page.c:992
 msgid "fourth"
 msgstr "keempat"
 
-#: calendar/gui/dialogs/recurrence-page.c:982
+#: calendar/gui/dialogs/recurrence-page.c:993
 msgid "last"
 msgstr "terakhir"
 
-#: calendar/gui/dialogs/recurrence-page.c:1005
+#: calendar/gui/dialogs/recurrence-page.c:1016
 msgid "Other Date"
 msgstr "Tarikh Lain"
 
-#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/dialogs/recurrence-page.c:1044
 msgid "day"
 msgstr "hari"
 
-#: calendar/gui/dialogs/recurrence-page.c:1170
+#: calendar/gui/dialogs/recurrence-page.c:1181
 msgid "on the"
 msgstr "semasa"
 
-#: calendar/gui/dialogs/recurrence-page.c:1356
+#: calendar/gui/dialogs/recurrence-page.c:1367
 msgid "occurrences"
 msgstr "kejadian"
 
-#: calendar/gui/dialogs/recurrence-page.c:2309
+#: calendar/gui/dialogs/recurrence-page.c:2320
 msgid "Date/Time"
 msgstr "Tarikh/Masa"
 
@@ -5418,7 +5506,8 @@ msgstr "_Destinasi"
 msgid "Task List"
 msgstr "Senarai Tugas"
 
-#: calendar/gui/dialogs/task-details-page.c:427
+#: calendar/gui/dialogs/task-details-page.c:428
+#: calendar/gui/dialogs/task-details-page.c:447
 msgid "Completed date is wrong"
 msgstr "Tarikh siap adalah salah"
 
@@ -5435,42 +5524,42 @@ msgstr "<span weight=\"bold\">Status</span>"
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
 #: calendar/gui/e-cal-model-tasks.c:351 calendar/gui/e-cal-model-tasks.c:654
-#: calendar/gui/e-calendar-table.c:472 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-itip-control.c:903
 #: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
-#: calendar/gui/print.c:2346
+#: calendar/gui/print.c:2349
 msgid "Completed"
 msgstr "Selesai"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:397 mail/message-list.c:1012
+#: calendar/gui/e-calendar-table.c:381 mail/message-list.c:1013
 msgid "High"
 msgstr "Tinggi"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
 #: calendar/gui/e-cal-model-tasks.c:349 calendar/gui/e-cal-model-tasks.c:652
-#: calendar/gui/e-cal-model-tasks.c:727 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/print.c:2343
+#: calendar/gui/e-cal-model-tasks.c:727 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/print.c:2346
 msgid "In Progress"
 msgstr "Dalam Progres"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:399 mail/message-list.c:1010
+#: calendar/gui/e-calendar-table.c:383 mail/message-list.c:1011
 msgid "Low"
 msgstr "Rendah"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:943
-#: calendar/gui/e-calendar-table.c:398 mail/message-list.c:1011
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:949
+#: calendar/gui/e-calendar-table.c:382 mail/message-list.c:1012
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
 #: calendar/gui/e-cal-model-tasks.c:347 calendar/gui/e-cal-model-tasks.c:650
-#: calendar/gui/e-calendar-table.c:470 calendar/gui/print.c:2340
+#: calendar/gui/e-calendar-table.c:454 calendar/gui/print.c:2343
 msgid "Not Started"
 msgstr "Tidak Dimulakan"
 
@@ -5479,7 +5568,7 @@ msgid "P_ercent complete:"
 msgstr "Pe_ratus Selesai:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:384
 msgid "Undefined"
 msgstr "Tak ditakrif"
 
@@ -5499,7 +5588,7 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Laman Web:"
 
-#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2300
 msgid "Task"
 msgstr "Tugas"
 
@@ -5526,20 +5615,25 @@ msgstr "<span weight=\"bold\">Asas</span>"
 msgid "<span weight=\"bold\">Date and Time</span>"
 msgstr "<span weight=\"bold\">Tarikh dan Masa</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "D_escription:"
 msgstr "_Huraian:"
 
-#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Sta_rt date:"
 msgstr "Tarikh _mula:"
 
-#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "Task Description"
+msgstr "Huraian:"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
 #, fuzzy
 msgid "_Due date:"
 msgstr "_Tarikh Genap Tempoh:"
 
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "_Group:"
 msgstr "_Kumpulan:"
 
@@ -5662,7 +5756,7 @@ msgstr "%s semasa %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s bagi jenis cetusan yang tak diketahui"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2385
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2431
 #, c-format
 msgid "Click to open %s"
 msgstr "Klik untuk membuka %s"
@@ -5697,7 +5791,7 @@ msgstr "Prioriti:"
 
 #: calendar/gui/e-cal-component-preview.c:268
 #: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:67
 msgid "Description:"
 msgstr "Huraian:"
 
@@ -5718,12 +5812,12 @@ msgstr "Tarikh Mula"
 msgid "Summary"
 msgstr "Ringkasan"
 
-#: calendar/gui/e-cal-model-calendar.c:175 calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-cal-model-calendar.c:181 calendar/gui/e-calendar-table.c:433
 msgid "Free"
 msgstr "Bebas"
 
-#: calendar/gui/e-cal-model-calendar.c:178 calendar/gui/e-calendar-table.c:450
-#: calendar/gui/e-meeting-time-sel.c:399
+#: calendar/gui/e-cal-model-calendar.c:184 calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "Busy"
 msgstr "Sibuk"
 
@@ -5753,13 +5847,13 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:1013 calendar/gui/e-cal-model.c:949
+#: calendar/gui/e-cal-model-tasks.c:1013 calendar/gui/e-cal-model.c:955
 #: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Ya"
 
-#: calendar/gui/e-cal-model-tasks.c:1013 calendar/gui/e-cal-model.c:949
+#: calendar/gui/e-cal-model-tasks.c:1013 calendar/gui/e-cal-model.c:955
 #: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Tidak"
@@ -5776,161 +5870,154 @@ msgstr "Tidak"
 #: camel/providers/imap4/camel-imap4-engine.c:1432
 #: camel/providers/imap4/camel-imap4-engine.c:1464
 #: camel/providers/imap4/camel-imap4-engine.c:1506
-#: camel/providers/imap4/camel-imap4-store.c:1223
+#: camel/providers/imap4/camel-imap4-store.c:1194
 #: camel/providers/imap4/camel-imap4-utils.c:457
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1155
+#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:216 mail/em-utils.c:1155
 #: shell/e-component-registry.c:207 shell/e-component-registry.c:211
 #: widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Tak diketahui"
 
-#: calendar/gui/e-cal-model.c:945
+#: calendar/gui/e-cal-model.c:951
 msgid "Recurring"
 msgstr "Berulang"
 
-#: calendar/gui/e-cal-model.c:947
+#: calendar/gui/e-cal-model.c:953
 msgid "Assigned"
 msgstr "Diumpukkan"
 
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:403
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:404
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:405
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:422
+#: calendar/gui/e-calendar-table.c:406
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:407
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:408
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:409
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:410
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:411
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:412
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:413
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:703 calendar/gui/e-calendar-view.c:658
+#: calendar/gui/e-calendar-table.c:687 calendar/gui/e-calendar-view.c:656
 msgid "Deleting selected objects"
 msgstr "Memadam objek yang dipilih"
 
-#: calendar/gui/e-calendar-table.c:867 calendar/gui/e-calendar-view.c:762
+#: calendar/gui/e-calendar-table.c:851 calendar/gui/e-calendar-view.c:760
 msgid "Updating objects"
 msgstr "Mengemaskinikan objek"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1084
-#: calendar/gui/e-calendar-view.c:1431 calendar/gui/e-calendar-view.c:1512
-#: mail/em-folder-view.c:899 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-view.c:1055
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Simpan sebagai..."
+
+#: calendar/gui/e-calendar-table.c:1130 calendar/gui/e-calendar-view.c:1377
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Buka"
 
-#: calendar/gui/e-calendar-table.c:1044
+#: calendar/gui/e-calendar-table.c:1131
 msgid "Open _Web Page"
 msgstr "Buka Laman _Web"
 
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1090
-#: calendar/gui/e-calendar-view.c:1432 calendar/gui/e-calendar-view.c:1518
-#: mail/em-folder-view.c:901 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1132 calendar/gui/e-calendar-view.c:1378
+#: mail/em-folder-view.c:930 mail/em-popup.c:496
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Simpan Sebagai..."
 
-#: calendar/gui/e-calendar-table.c:1046 calendar/gui/e-calendar-table.c:1088
-#: calendar/gui/e-calendar-view.c:1410 calendar/gui/e-calendar-view.c:1433
-#: calendar/gui/e-calendar-view.c:1516 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1133 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1379 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Cetak..."
 
-#: calendar/gui/e-calendar-table.c:1050 calendar/gui/e-calendar-table.c:1079
-#: calendar/gui/e-calendar-view.c:1438 calendar/gui/e-calendar-view.c:1482
+#: calendar/gui/e-calendar-table.c:1137 calendar/gui/e-calendar-view.c:1383
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Potong"
 
-#: calendar/gui/e-calendar-table.c:1051 calendar/gui/e-calendar-table.c:1077
-#: calendar/gui/e-calendar-view.c:1439 calendar/gui/e-calendar-view.c:1480
-#: mail/em-folder-tree.c:1013 mail/message-list.c:1702
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
-#: ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-calendar-view.c:1384
+#: composer/e-msg-composer.c:2879 mail/em-folder-tree.c:1024
+#: mail/message-list.c:1709 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Salin"
 
-#: calendar/gui/e-calendar-table.c:1052 calendar/gui/e-calendar-table.c:1086
-#: calendar/gui/e-calendar-view.c:1414 calendar/gui/e-calendar-view.c:1440
-#: calendar/gui/e-calendar-view.c:1514 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1139 calendar/gui/e-calendar-view.c:1361
+#: calendar/gui/e-calendar-view.c:1385 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Tampal"
 
-#: calendar/gui/e-calendar-table.c:1056
+#: calendar/gui/e-calendar-table.c:1143
 msgid "_Assign Task"
 msgstr "_Umpukkan Tugas"
 
-#: calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1144
 msgid "_Forward as iCalendar"
 msgstr "_Majukan sebagai iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1058
+#: calendar/gui/e-calendar-table.c:1145
 msgid "_Mark as Complete"
 msgstr "_Tandakan sebagai Siap"
 
-#: calendar/gui/e-calendar-table.c:1059
+#: calendar/gui/e-calendar-table.c:1146
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Tandakan Tugas yang Dipilih sebagai Siap"
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/e-calendar-table.c:1063 calendar/gui/e-calendar-table.c:1081
-#: calendar/gui/e-calendar-view.c:1451 calendar/gui/e-calendar-view.c:1484
-#: mail/em-folder-tree.c:2710 mail/em-folder-view.c:924
+#: calendar/gui/e-calendar-table.c:1150 calendar/gui/e-calendar-view.c:1396
+#: mail/em-folder-tree.c:2742 mail/em-folder-view.c:953
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "Pa_dam"
 
-#: calendar/gui/e-calendar-table.c:1064 calendar/gui/e-calendar-table.c:1082
+#: calendar/gui/e-calendar-table.c:1151
 msgid "_Delete Selected Tasks"
 msgstr "Pa_dam Tugas yang Dipilih"
 
-#: calendar/gui/e-calendar-table.c:1196 calendar/gui/e-calendar-view.c:1060
-#: composer/e-msg-composer.c:1178
-msgid "Save as..."
-msgstr "Simpan sebagai..."
-
-#: calendar/gui/e-calendar-table.c:1374
+#: calendar/gui/e-calendar-table.c:1295
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klik untuk menambahkan tugas"
@@ -5941,7 +6028,7 @@ msgid "% Complete"
 msgstr "% Siap"
 
 #: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
-#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:616
 msgid "Complete"
 msgstr "Siap"
 
@@ -5966,82 +6053,76 @@ msgstr "Tarikh mula"
 msgid "Task sort"
 msgstr "Isihan tugas"
 
-#: calendar/gui/e-calendar-view.c:1176
+#: calendar/gui/e-calendar-view.c:1170
 msgid "Moving items"
 msgstr "Mengalihkan item"
 
-#: calendar/gui/e-calendar-view.c:1178
+#: calendar/gui/e-calendar-view.c:1172
 msgid "Copying items"
 msgstr "Menyalin item"
 
-#: calendar/gui/e-calendar-view.c:1403 calendar/gui/e-calendar-view.c:1492
+#: calendar/gui/e-calendar-view.c:1352
 msgid "New _Appointment..."
 msgstr "Temu janji Ba_ru..."
 
-#: calendar/gui/e-calendar-view.c:1404 calendar/gui/e-calendar-view.c:1497
+#: calendar/gui/e-calendar-view.c:1353
 msgid "New All Day _Event"
 msgstr "Acara Sepanjang Hari Baru"
 
-#: calendar/gui/e-calendar-view.c:1405 calendar/gui/e-calendar-view.c:1502
+#: calendar/gui/e-calendar-view.c:1354
 msgid "New Meeting"
 msgstr "Mesyuarat Baru"
 
-#: calendar/gui/e-calendar-view.c:1406 calendar/gui/e-calendar-view.c:1507
+#: calendar/gui/e-calendar-view.c:1355
 msgid "New Task"
 msgstr "Tugas Baru"
 
-#: calendar/gui/e-calendar-view.c:1420 ui/evolution-calendar.xml.h:26
+#. FIXME: hook in this somehow
+#: calendar/gui/e-calendar-view.c:1365
+msgid "Current View"
+msgstr "Paparan Semasa"
+
+#: calendar/gui/e-calendar-view.c:1367 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Pilih _Hari ini"
 
-#: calendar/gui/e-calendar-view.c:1421
+#: calendar/gui/e-calendar-view.c:1368
 msgid "_Select Date..."
 msgstr "_PIlih Tarikh..."
 
-#: calendar/gui/e-calendar-view.c:1425 ui/evolution-calendar.xml.h:45
+#. TODO: Why is this in a context menu when it applies globally?
+#: calendar/gui/e-calendar-view.c:1373 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Terbitkan Maklumat Bebas/Sibuk"
 
-#: calendar/gui/e-calendar-view.c:1444
+#: calendar/gui/e-calendar-view.c:1389
 msgid "Cop_y to Calendar..."
 msgstr "_Salin ke Kalendar..."
 
-#: calendar/gui/e-calendar-view.c:1445
+#: calendar/gui/e-calendar-view.c:1390
 msgid "Mo_ve to Calendar..."
 msgstr "_Alihkan ke Kalendar..."
 
-#: calendar/gui/e-calendar-view.c:1446
+#: calendar/gui/e-calendar-view.c:1391
 msgid "_Schedule Meeting..."
 msgstr "_Jadualkan Mesyuarat..."
 
-#: calendar/gui/e-calendar-view.c:1447
+#: calendar/gui/e-calendar-view.c:1392
 msgid "_Forward as iCalendar..."
 msgstr "_Majukan sebagai iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1452
+#: calendar/gui/e-calendar-view.c:1397
 msgid "Make this Occurrence _Movable"
 msgstr "Jadikan Kejadian ini _Boleh alih"
 
-#: calendar/gui/e-calendar-view.c:1453 calendar/gui/e-calendar-view.c:1485
+#: calendar/gui/e-calendar-view.c:1398
 msgid "Delete this _Occurrence"
 msgstr "Padam Kejadian _ini"
 
-#: calendar/gui/e-calendar-view.c:1454 calendar/gui/e-calendar-view.c:1486
+#: calendar/gui/e-calendar-view.c:1399
 msgid "Delete _All Occurrences"
 msgstr "Padam _Semua Kejadian"
 
-#: calendar/gui/e-calendar-view.c:1488
-msgid "Go to _Today"
-msgstr "Pergi ke _Hari Ini"
-
-#: calendar/gui/e-calendar-view.c:1490
-msgid "_Go to Date..."
-msgstr "_Pergi ke Tarikh..."
-
-#: calendar/gui/e-calendar-view.c:1520 ui/evolution.xml.h:35
-msgid "_Settings..."
-msgstr "_Tetapan..."
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format.
@@ -6085,19 +6166,19 @@ msgstr "%02i bahagian minit"
 #. order but don't change the specifiers or add
 #. anything.
 #: calendar/gui/e-day-view-top-item.c:710 calendar/gui/e-day-view.c:1571
-#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
+#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:583
-#: calendar/gui/print.c:838
+#: calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:586
-#: calendar/gui/print.c:840
+#: calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
 
@@ -6207,17 +6288,17 @@ msgstr "Lokasi:"
 
 #: calendar/gui/e-itip-control.c:1144 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
-#: calendar/gui/itip-utils.c:422
+#: calendar/gui/itip-utils.c:421
 msgid "Accepted"
 msgstr "Diterima"
 
-#: calendar/gui/e-itip-control.c:1148 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:1148 calendar/gui/itip-utils.c:424
 msgid "Tentatively Accepted"
 msgstr "Diterima Sementara"
 
 #: calendar/gui/e-itip-control.c:1152 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
-#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
+#: calendar/gui/itip-utils.c:427 calendar/gui/itip-utils.c:453
 msgid "Declined"
 msgstr "Ditolak"
 
@@ -6408,86 +6489,86 @@ msgstr "Mesej tidak terbentuk dengan sempurna"
 msgid "The message contains only unsupported requests."
 msgstr "Mesej mengandungi permintaan yang tidak disokong sahaja."
 
-#: calendar/gui/e-itip-control.c:1648
+#: calendar/gui/e-itip-control.c:1650
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Lampiran tidak mengandungi mesej kalendar yang sah"
 
-#: calendar/gui/e-itip-control.c:1680
+#: calendar/gui/e-itip-control.c:1682
 msgid "The attachment has no viewable calendar items"
 msgstr "Lampiran mempunyai item kalendar yang tidak dapat dilihat"
 
-#: calendar/gui/e-itip-control.c:1914
+#: calendar/gui/e-itip-control.c:1916
 msgid "Update complete\n"
 msgstr "Pengemaskinian siap\n"
 
-#: calendar/gui/e-itip-control.c:1942
+#: calendar/gui/e-itip-control.c:1944
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objek tak sah dan tidak dapat dikemas kini\n"
 
-#: calendar/gui/e-itip-control.c:1952
+#: calendar/gui/e-itip-control.c:1954
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Maklum balas ini bukannya daripada peserta semasa.  Tambahkan sebagai "
 "peserta?"
 
-#: calendar/gui/e-itip-control.c:1964
+#: calendar/gui/e-itip-control.c:1966
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Status peserta tidak dapat dikemaskinikan kerana status tak sah!\n"
 
-#: calendar/gui/e-itip-control.c:1981
+#: calendar/gui/e-itip-control.c:1983
 msgid "Attendee status updated\n"
 msgstr "Status peserta dikemaskinikan\n"
 
-#: calendar/gui/e-itip-control.c:1984
+#: calendar/gui/e-itip-control.c:1986
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Status peserta tidak dapat dikemaskinikan kerana item tidak lagi wujud"
 
-#: calendar/gui/e-itip-control.c:2011
+#: calendar/gui/e-itip-control.c:2013
 msgid "Removal Complete"
 msgstr "Pengeluaran Selesai"
 
-#: calendar/gui/e-itip-control.c:2034 calendar/gui/e-itip-control.c:2082
+#: calendar/gui/e-itip-control.c:2036 calendar/gui/e-itip-control.c:2084
 msgid "Item sent!\n"
 msgstr "Item dihantar!\n"
 
-#: calendar/gui/e-itip-control.c:2036 calendar/gui/e-itip-control.c:2086
+#: calendar/gui/e-itip-control.c:2038 calendar/gui/e-itip-control.c:2088
 msgid "The item could not be sent!\n"
 msgstr "Item tidak dapat dihantar!\n"
 
-#: calendar/gui/e-itip-control.c:2166
+#: calendar/gui/e-itip-control.c:2168
 msgid "Choose an action:"
 msgstr "Pilih tindakan:"
 
-#: calendar/gui/e-itip-control.c:2237
+#: calendar/gui/e-itip-control.c:2239
 msgid "Update"
 msgstr "Kemas kini"
 
-#: calendar/gui/e-itip-control.c:2265
+#: calendar/gui/e-itip-control.c:2267
 msgid "Accept"
 msgstr "Terima"
 
-#: calendar/gui/e-itip-control.c:2266
+#: calendar/gui/e-itip-control.c:2268
 msgid "Tentatively accept"
 msgstr "Terima sementara"
 
-#: calendar/gui/e-itip-control.c:2267
+#: calendar/gui/e-itip-control.c:2269
 msgid "Decline"
 msgstr "Tolak"
 
-#: calendar/gui/e-itip-control.c:2296
+#: calendar/gui/e-itip-control.c:2298
 msgid "Send Free/Busy Information"
 msgstr "Hantar Maklumat Bebas/Sibuk"
 
-#: calendar/gui/e-itip-control.c:2324
+#: calendar/gui/e-itip-control.c:2326
 msgid "Update respondent status"
 msgstr "Kemas kini status responden"
 
-#: calendar/gui/e-itip-control.c:2352
+#: calendar/gui/e-itip-control.c:2354
 msgid "Send Latest Information"
 msgstr "Hantar Maklumat Terkini"
 
-#: calendar/gui/e-itip-control.c:2380 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
+#: calendar/gui/e-itip-control.c:2382 calendar/gui/itip-utils.c:441
+#: mail/mail-send-recv.c:411 mail/mail-send-recv.c:465
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Batal"
@@ -6587,7 +6668,7 @@ msgid "Needs Action"
 msgstr "Memerlukan Tindakan"
 
 #: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
+#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:409
 msgid "Tentative"
 msgstr "Sementara"
 
@@ -6603,7 +6684,7 @@ msgstr "Dalam Proses"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:452
-#: calendar/gui/e-meeting-time-sel.c:2069
+#: calendar/gui/e-meeting-time-sel.c:2096
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -6614,7 +6695,7 @@ msgstr "%A, %B %d, %Y"
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2102 e-util/e-time-utils.c:203
+#: calendar/gui/e-meeting-time-sel.c:2129 e-util/e-time-utils.c:203
 #: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
@@ -6630,55 +6711,55 @@ msgstr "%a %m/%d/%Y"
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:411 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Di Luar Pejabat"
 
-#: calendar/gui/e-meeting-time-sel.c:401
+#: calendar/gui/e-meeting-time-sel.c:412
 msgid "No Information"
 msgstr "Tiada Maklumat"
 
-#: calendar/gui/e-meeting-time-sel.c:432
+#: calendar/gui/e-meeting-time-sel.c:443
 msgid "O_ptions"
 msgstr "O_psyen"
 
-#: calendar/gui/e-meeting-time-sel.c:449
+#: calendar/gui/e-meeting-time-sel.c:460
 msgid "Show _only working hours"
 msgstr "Papar _hanya jam bekerja"
 
-#: calendar/gui/e-meeting-time-sel.c:459
+#: calendar/gui/e-meeting-time-sel.c:470
 msgid "Show _zoomed out"
 msgstr "Papar _zum ke luar"
 
-#: calendar/gui/e-meeting-time-sel.c:474
+#: calendar/gui/e-meeting-time-sel.c:485
 msgid "_Update free/busy"
 msgstr "_Kemaskini bebas/sibuk"
 
-#: calendar/gui/e-meeting-time-sel.c:489
+#: calendar/gui/e-meeting-time-sel.c:500
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:507
+#: calendar/gui/e-meeting-time-sel.c:518
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:533
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:550
 msgid "_All people and resources"
 msgstr "_Semua orang dan sumber"
 
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:559
 msgid "All _people and one resource"
 msgstr "Semua _orang dan satu sumber"
 
-#: calendar/gui/e-meeting-time-sel.c:557
+#: calendar/gui/e-meeting-time-sel.c:568
 msgid "_Required people"
 msgstr "Orang yang di_perlukan"
 
-#: calendar/gui/e-meeting-time-sel.c:566
+#: calendar/gui/e-meeting-time-sel.c:577
 msgid "Required people and _one resource"
 msgstr "Orang yang Diperlukan dan _satu sumber"
 
@@ -6687,7 +6768,7 @@ msgstr "Orang yang Diperlukan dan _satu sumber"
 msgid "Enter the password for %s"
 msgstr "Masukkan kata laluan bagi %s"
 
-#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2262
+#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2416
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6717,26 +6798,45 @@ msgstr "Memadam objek yang dipilih..."
 msgid "Expunging"
 msgstr "Sedang Buang"
 
-#: calendar/gui/gnome-cal.c:705
+#: calendar/gui/e-timezone-entry.c:142
+#, fuzzy
+msgid "Timezone Button"
+msgstr "Zon masa "
+
+#: calendar/gui/gnome-cal.c:724
 msgid "Updating query"
 msgstr "Mengemaskinikan kueri"
 
-#: calendar/gui/gnome-cal.c:2039
+#. bonobo displays this string so it must be in locale
+#: calendar/gui/gnome-cal.c:2027 widgets/menus/gal-view-menus.c:351
+msgid "Custom View"
+msgstr "Paparan Biasa"
+
+#: calendar/gui/gnome-cal.c:2028
+#, fuzzy
+msgid "Save Custom View"
+msgstr "Simpan Paparan Biasa..."
+
+#: calendar/gui/gnome-cal.c:2033 widgets/menus/gal-view-menus.c:373
+msgid "Define Views..."
+msgstr "Takrif Paparan..."
+
+#: calendar/gui/gnome-cal.c:2193
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Memuatkan temu janji pada %s"
 
-#: calendar/gui/gnome-cal.c:2058
+#: calendar/gui/gnome-cal.c:2212
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Memuatkan tugas pada %s"
 
-#: calendar/gui/gnome-cal.c:2151
+#: calendar/gui/gnome-cal.c:2305
 #, c-format
 msgid "Opening %s"
 msgstr "Membuka %s"
 
-#: calendar/gui/gnome-cal.c:3120
+#: calendar/gui/gnome-cal.c:3274
 msgid "Purging"
 msgstr "Menyingkir"
 
@@ -6796,57 +6896,57 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Pilih Hari ini"
 
-#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
-#: calendar/gui/itip-utils.c:351
+#: calendar/gui/itip-utils.c:270 calendar/gui/itip-utils.c:318
+#: calendar/gui/itip-utils.c:350
 msgid "An organizer must be set."
 msgstr "Penyusun mestilah ditetapkan."
 
-#: calendar/gui/itip-utils.c:306
+#: calendar/gui/itip-utils.c:305
 msgid "At least one attendee is necessary"
 msgstr "Sekurang-kurangnya seorang peserta adalah perlu"
 
-#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
+#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
 msgid "Event information"
 msgstr "Maklumat peristiwa"
 
-#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
+#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
 msgid "Task information"
 msgstr "Maklumat tugas"
 
-#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
+#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:506
 msgid "Journal information"
 msgstr "Maklumat jurnal"
 
-#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
+#: calendar/gui/itip-utils.c:399 calendar/gui/itip-utils.c:524
 msgid "Free/Busy information"
 msgstr "Maklumat Bebas/Sibuk"
 
-#: calendar/gui/itip-utils.c:402
+#: calendar/gui/itip-utils.c:401
 msgid "Calendar information"
 msgstr "Maklumat kalendar"
 
-#: calendar/gui/itip-utils.c:438
+#: calendar/gui/itip-utils.c:437
 msgid "Updated"
 msgstr "Dikemaskinikan"
 
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/itip-utils.c:445
 msgid "Refresh"
 msgstr "Segarkan"
 
-#: calendar/gui/itip-utils.c:450
+#: calendar/gui/itip-utils.c:449
 msgid "Counter-proposal"
 msgstr "Cadangan balas"
 
-#: calendar/gui/itip-utils.c:521
+#: calendar/gui/itip-utils.c:520
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Maklumat Bebas/Sibuk (%s hingga %s)"
 
-#: calendar/gui/itip-utils.c:531
+#: calendar/gui/itip-utils.c:530
 msgid "iCalendar information"
 msgstr "Maklumat iCalendar"
 
-#: calendar/gui/itip-utils.c:673
+#: calendar/gui/itip-utils.c:672
 msgid "You must be an attendee of the event."
 msgstr "Anda mestilah peserta peristiwa itu."
 
@@ -6871,328 +6971,323 @@ msgid "Birthdays & Anniversaries"
 msgstr "Hari lahir & Ulangtahun"
 
 #. Create the Webcal source group
-#: calendar/gui/migration.c:466 calendar/gui/migration.c:548
+#: calendar/gui/migration.c:478 calendar/gui/migration.c:571
 msgid "On The Web"
 msgstr "Pada Web"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:712 calendar/gui/migration.c:864
+#: calendar/gui/migration.c:735 calendar/gui/migration.c:887
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Tak dapat memigrasikan tetapan lama drpd evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:741
+#: calendar/gui/migration.c:764
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Tak dapat memigrasikan kalendar '%s'"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:893
+#: calendar/gui/migration.c:916
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Tak dapat memigrasikan tugas '%s'"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:495
+#: calendar/gui/print.c:498
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "Su"
 msgstr "Ahd"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "Mo"
 msgstr "Isn"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "Tu"
 msgstr "Sel"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "We"
 msgstr "Rab"
 
-#: calendar/gui/print.c:571
+#: calendar/gui/print.c:574
 msgid "Th"
 msgstr "Kha"
 
-#: calendar/gui/print.c:571
+#: calendar/gui/print.c:574
 msgid "Fr"
 msgstr "Jum"
 
-#: calendar/gui/print.c:571
+#: calendar/gui/print.c:574
 msgid "Sa"
 msgstr "Sab"
 
 #. Day
-#: calendar/gui/print.c:1914
+#: calendar/gui/print.c:1917
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Hari yang dipilih (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
+#: calendar/gui/print.c:1942 calendar/gui/print.c:1946
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1940
+#: calendar/gui/print.c:1943
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
-#: calendar/gui/print.c:1947
+#: calendar/gui/print.c:1947 calendar/gui/print.c:1949
+#: calendar/gui/print.c:1950
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1951
+#: calendar/gui/print.c:1954
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Minggu yang dipilih (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1959
+#: calendar/gui/print.c:1962
 msgid "Selected month (%b %Y)"
 msgstr "Bulan yang dipilih (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1966
+#: calendar/gui/print.c:1969
 msgid "Selected year (%Y)"
 msgstr "Tahun yang dipilih (%Y)"
 
-#: calendar/gui/print.c:2356
+#: calendar/gui/print.c:2359
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2373
+#: calendar/gui/print.c:2376
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioriti: %s"
 
-#: calendar/gui/print.c:2385
+#: calendar/gui/print.c:2388
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Peratus Siap: %i"
 
-#: calendar/gui/print.c:2397
+#: calendar/gui/print.c:2400
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2411
+#: calendar/gui/print.c:2414
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategori: %s"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2425
 msgid "Contacts: "
 msgstr "Kenalan: "
 
-#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
+#: calendar/gui/print.c:2562 calendar/gui/print.c:2648
+#: calendar/gui/print.c:2740 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Prebiu Cetakan"
 
-#: calendar/gui/print.c:2593
+#: calendar/gui/print.c:2596
 msgid "Print Item"
 msgstr "Cetak Item"
 
-#: calendar/gui/print.c:2759
+#: calendar/gui/print.c:2762
 msgid "Print Setup"
 msgstr "Persediaan Cetakan"
 
-#: calendar/gui/tasks-component.c:314
-#, c-format
-msgid "Task List '%s' will be removed. Are you sure you want to continue?"
-msgstr "Senarai Tugas '%s' akan dibuang. Adakah anda pasti untuk teruskan?"
-
-#: calendar/gui/tasks-component.c:372
+#: calendar/gui/tasks-component.c:328
 msgid "New Task List"
 msgstr "Senarai Tugas Baru"
 
-#: calendar/gui/tasks-component.c:415
+#: calendar/gui/tasks-component.c:397
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tugas"
 msgstr[1] "%d tugas"
 
-#: calendar/gui/tasks-component.c:417 mail/mail-component.c:502
+#: calendar/gui/tasks-component.c:399 mail/mail-component.c:516
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d dipilih"
 msgstr[1] "%d dipilih"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:446
 msgid "Failed upgrading tasks."
 msgstr "Gagal meningkatupaya tugas."
 
-#: calendar/gui/tasks-component.c:758
+#: calendar/gui/tasks-component.c:740
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Tak dapat membuka senarai tugas '%s' untuk mencipta acara dan mesyuarat"
 
-#: calendar/gui/tasks-component.c:773
+#: calendar/gui/tasks-component.c:755
 msgid "There is no calendar available for creating tasks"
 msgstr "Tiada kalendar untuk mencipta tugas"
 
-#: calendar/gui/tasks-component.c:1047
+#: calendar/gui/tasks-component.c:1029
 msgid "New task"
 msgstr "Tugas baru"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1030
 msgid "_Task"
 msgstr "_Tugas"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1031
 msgid "Create a new task"
 msgstr "Cipta tugas baru"
 
-#: calendar/gui/tasks-component.c:1055
+#: calendar/gui/tasks-component.c:1037
 msgid "New assigned task"
 msgstr "Tugas yang baru diberi"
 
-#: calendar/gui/tasks-component.c:1056
+#: calendar/gui/tasks-component.c:1038
 msgid "Assigne_d Task"
 msgstr "_Umpukkan Tugas"
 
-#: calendar/gui/tasks-component.c:1057
+#: calendar/gui/tasks-component.c:1039
 msgid "Create a new assigned task"
 msgstr "Cipta tugas baru diberi"
 
-#: calendar/gui/tasks-component.c:1063
+#: calendar/gui/tasks-component.c:1045
 msgid "New task list"
 msgstr "Senarai tugas baru"
 
-#: calendar/gui/tasks-component.c:1064
+#: calendar/gui/tasks-component.c:1046
 msgid "Task l_ist"
 msgstr "_Senarai Tugas"
 
-#: calendar/gui/tasks-component.c:1065
+#: calendar/gui/tasks-component.c:1047
 msgid "Create a new task list"
 msgstr "Cipta senarai tugas baru"
 
-#: calendar/gui/tasks-control.c:370
+#: calendar/gui/tasks-control.c:372
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -7204,11 +7299,11 @@ msgstr ""
 "\n"
 "Anda pasti ingin memadamkan tugas ini?"
 
-#: calendar/gui/tasks-control.c:373
+#: calendar/gui/tasks-control.c:375
 msgid "Do not ask me again."
 msgstr "Jangan tanya saya lagi."
 
-#: calendar/gui/tasks-control.c:431
+#: calendar/gui/tasks-control.c:433
 msgid "Print Tasks"
 msgstr "Cetak Tugas"
 
@@ -7789,7 +7884,7 @@ msgstr "Amerika/Montserrat"
 msgid "America/Nassau"
 msgstr "Amerika/Nassau"
 
-#: calendar/zones.h:138
+#: calendar/zones.h:138 widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
 msgstr "Amerika/New_York"
 
@@ -8789,56 +8884,56 @@ msgstr "Pasifik/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pasifik/Yap"
 
-#: camel/camel-cipher-context.c:102
+#: camel/camel-cipher-context.c:103
 msgid "Signing is not supported by this cipher"
 msgstr "Tandatangan tidak disokong oleh sifer ini"
 
-#: camel/camel-cipher-context.c:128
+#: camel/camel-cipher-context.c:129
 msgid "Signing message"
 msgstr "Menandatangani mesej"
 
-#: camel/camel-cipher-context.c:145
+#: camel/camel-cipher-context.c:146
 msgid "Verifying is not supported by this cipher"
 msgstr "Penentusahan tidak disokong oleh sifer ini"
 
-#: camel/camel-cipher-context.c:171
+#: camel/camel-cipher-context.c:172
 msgid "Verifying message"
 msgstr "Menentusahan mesej"
 
-#: camel/camel-cipher-context.c:189
+#: camel/camel-cipher-context.c:190
 msgid "Encryption is not supported by this cipher"
 msgstr "Pengenkripsian tidak disokong oleh sifer ini"
 
-#: camel/camel-cipher-context.c:215
+#: camel/camel-cipher-context.c:216
 msgid "Encrypting message"
 msgstr "Mengenkripsikan mesej"
 
-#: camel/camel-cipher-context.c:232
+#: camel/camel-cipher-context.c:233
 msgid "Decryption is not supported by this cipher"
 msgstr "Pengnyahenkripsian tidak disokong oleh sifer ini"
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:255
 msgid "Decrypting message"
 msgstr "Nyah-enkripsi mesej"
 
-#: camel/camel-cipher-context.c:271
+#: camel/camel-cipher-context.c:272
 msgid "You may not import keys with this cipher"
 msgstr "Anda tidak boleh mengimport kekunci dengan sifer ini"
 
-#: camel/camel-cipher-context.c:301
+#: camel/camel-cipher-context.c:302
 msgid "You may not export keys with this cipher"
 msgstr "Anda tidak boleh mengeksport kekunci dengan sifer ini"
 
-#: camel/camel-data-cache.c:133
+#: camel/camel-data-cache.c:134
 msgid "Unable to create cache path"
 msgstr "Tidak dapat mewujudkan laluan cache"
 
-#: camel/camel-data-cache.c:375
+#: camel/camel-data-cache.c:376
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Tidak dapat mengeluarkan entri cache: %s: %s"
 
-#: camel/camel-disco-diary.c:194
+#: camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8850,7 +8945,7 @@ msgstr ""
 "apabila anda\n"
 "disambungkan semula ke rangkaian."
 
-#: camel/camel-disco-diary.c:257
+#: camel/camel-disco-diary.c:258
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8861,24 +8956,24 @@ msgstr ""
 "%s\n"
 "Perubahan yang dibuat pada folder ini tidak akan disegerakkan semula."
 
-#: camel/camel-disco-diary.c:293
+#: camel/camel-disco-diary.c:294
 msgid "Resynchronizing with server"
 msgstr "Menyegerakkan semula dengan pelayan"
 
-#: camel/camel-disco-folder.c:41
+#: camel/camel-disco-folder.c:42
 msgid "Copy folder content locally for offline operation"
 msgstr "Salin kandungan folder secara setempat bagi operasi luartalian"
 
-#: camel/camel-disco-folder.c:103
+#: camel/camel-disco-folder.c:104
 msgid "Downloading new messages for offline mode"
 msgstr "Memuat turun mesej baru untuk mod luartalian"
 
-#: camel/camel-disco-folder.c:466
+#: camel/camel-disco-folder.c:467
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Menyediakan folder '%s' untuk luartalian"
 
-#: camel/camel-disco-store.c:404
+#: camel/camel-disco-store.c:405
 msgid "You must be working online to complete this operation"
 msgstr "Anda mestilah berada dalam talian untuk melengkapkan pengendalian ini"
 
@@ -8907,7 +9002,7 @@ msgstr "Menyegerakkan folder"
 msgid "Error parsing filter: %s: %s"
 msgstr "Ralat ketika menghuraikan penapis : %s: %s"
 
-#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1429
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Ralat ketika melaksanakan penapis :%s: %s"
@@ -8971,7 +9066,7 @@ msgstr "Gagal mewujudkan proses anak '%s': %s"
 msgid "Error executing filter search: %s: %s"
 msgstr "Ralat ketika melaksanakan carian penapis: %s: %s"
 
-#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#: camel/camel-folder-search.c:356 camel/camel-folder-search.c:477
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8980,7 +9075,7 @@ msgstr ""
 "Tidak dapat menghuraikan ungkapan carian: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#: camel/camel-folder-search.c:366 camel/camel-folder-search.c:487
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8989,66 +9084,66 @@ msgstr ""
 "Ralat ketika melaksanakan ungkapan carian: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+#: camel/camel-folder-search.c:673 camel/camel-folder-search.c:706
 msgid "(match-all) requires a single bool result"
 msgstr "(padan dengan semua) memerlukan hasil bool tunggal"
 
-#: camel/camel-folder-search.c:755
+#: camel/camel-folder-search.c:756
 msgid "(match-threads) not allowed inside match-all"
 msgstr ""
 
-#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
+#: camel/camel-folder-search.c:759 camel/camel-folder-search.c:763
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:784
+#: camel/camel-folder-search.c:785
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(padan dengan semua) memerlukan hasil bool tunggal"
 
-#: camel/camel-folder-search.c:790
+#: camel/camel-folder-search.c:791
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(padan dengan semua) memerlukan hasil bool tunggal"
 
-#: camel/camel-folder-search.c:879
+#: camel/camel-folder-search.c:880
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Membuat pertanyaan pada pengepala yang tak diketahui:  %s"
 
-#: camel/camel-folder.c:653
+#: camel/camel-folder.c:651
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Pengendalian tidak disokong: tambahkan mesej: bagi %s"
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1260
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Pengendalian tidak disokong: cari mengikut ungkapan: bagi %s"
 
-#: camel/camel-folder.c:1302
+#: camel/camel-folder.c:1300
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Pengendalian tidak disokong: cari mengikut uids: bagi %s"
 
-#: camel/camel-folder.c:1416
+#: camel/camel-folder.c:1414
 msgid "Moving messages"
 msgstr "Mengalihkan mesej"
 
-#: camel/camel-folder.c:1416
+#: camel/camel-folder.c:1414
 msgid "Copying messages"
 msgstr "Menyalin mesej"
 
-#: camel/camel-folder.c:1665
+#: camel/camel-folder.c:1663
 #, fuzzy
 msgid "Learning junk"
 msgstr "Lansing"
 
-#: camel/camel-folder.c:1682
+#: camel/camel-folder.c:1680
 msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1701
+#: camel/camel-folder.c:1699
 msgid "Filtering new message(s)"
 msgstr "Menapis mesej baru"
 
@@ -9082,9 +9177,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:804 camel/camel-gpg-context.c:1314
 #: camel/camel-gpg-context.c:1498 camel/camel-gpg-context.c:1589
-#: camel/camel-gpg-context.c:1697 camel/providers/nntp/camel-nntp-store.c:1231
-#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
-#: mail/mail-send-recv.c:611
+#: camel/camel-gpg-context.c:1697 camel/providers/nntp/camel-nntp-store.c:1236
+#: mail/mail-ops.c:717 mail/mail-send-recv.c:612
 msgid "Cancelled."
 msgstr "Dibatal."
 
@@ -9117,7 +9211,7 @@ msgstr ""
 msgid "Failed to GPG %s: %s\n"
 msgstr "Gagal untuk GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:420
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Tidak dapat menjana data tandatangan: %s"
@@ -9140,8 +9234,8 @@ msgid "This is a digitally signed message part"
 msgstr "Ini ialah bahagian mesej yang ditandatangani secara digital"
 
 #: camel/camel-gpg-context.c:1431 camel/camel-gpg-context.c:1437
-#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:721
-#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:723
+#: camel/camel-smime-context.c:734 camel/camel-smime-context.c:741
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Tidak dapat menentusahkan tandatangan mesej: Format mesej salah"
 
@@ -9161,7 +9255,7 @@ msgstr "Tidak dapat menjana data pengenkripsian: %s"
 msgid "This is a digitally encrypted message part"
 msgstr "Ini ialah bahagian mesej yang dienkripsikan secara digital"
 
-#: camel/camel-gpg-context.c:1721 camel/camel-smime-context.c:995
+#: camel/camel-gpg-context.c:1721 camel/camel-smime-context.c:997
 msgid "Encrypted content"
 msgstr "Kandungan terenkripsi"
 
@@ -9210,69 +9304,69 @@ msgstr "Gagal mendapatkan kunci dengan menggunakan fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Gagal mendapatkan kunci dengan menggunakan flock(2): %s"
 
-#: camel/camel-movemail.c:107
+#: camel/camel-movemail.c:104
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Tidak dapat menyemak fail mel %s: %s"
 
-#: camel/camel-movemail.c:120
+#: camel/camel-movemail.c:117
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Tidak dapat membuka fail mel %s: %s"
 
-#: camel/camel-movemail.c:128
+#: camel/camel-movemail.c:125
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Tidak dapat membuka fail mel sementara %s: %s"
 
-#: camel/camel-movemail.c:157
+#: camel/camel-movemail.c:154
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Gagal menyimpan mel dalam fail sementara %s: %s"
 
-#: camel/camel-movemail.c:187
+#: camel/camel-movemail.c:184
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Tidak dapat mewujudkan saluran: %s"
 
-#: camel/camel-movemail.c:199
+#: camel/camel-movemail.c:196
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Tidak dapat memisahkan: %s"
 
-#: camel/camel-movemail.c:237
+#: camel/camel-movemail.c:234
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Atur cara mel alih gagal: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:235
 msgid "(Unknown error)"
 msgstr "(Ralat tak diketahui)"
 
-#: camel/camel-movemail.c:261
+#: camel/camel-movemail.c:258
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Ralat ketika membaca fail mel: %s"
 
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:269
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Ralat ketika menulis fail sementara mel: %s"
 
-#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
+#: camel/camel-movemail.c:462 camel/camel-movemail.c:529
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Ralat ketika menyalin fail sementara mel: %s"
 
-#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
+#: camel/camel-multipart-encrypted.c:230 camel/camel-multipart-encrypted.c:245
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Gagal menyahsulitkan bahagian MIME: ralat protokol"
 
-#: camel/camel-multipart-encrypted.c:257
+#: camel/camel-multipart-encrypted.c:258
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "Gagal menyahsulitkan bahagian MIME: struktur tak sah"
 
-#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
+#: camel/camel-multipart-signed.c:674 camel/camel-multipart-signed.c:725
 msgid "parse error"
 msgstr "ralat hurai"
 
@@ -9300,7 +9394,7 @@ msgstr "Tidak dapat memuatkan %s %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Tidak dapat memuatkan %s: Tiada kod pengawalan dalam modul."
 
-#: camel/camel-provider.c:356 camel/camel-session.c:160
+#: camel/camel-provider.c:356 camel/camel-session.c:161
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Tidak ada penyedia bagi protokol `%s'"
@@ -9315,7 +9409,7 @@ msgstr ""
 "Opsyen ini akan disambungkan ke pelayan dengan menggunakan log masuk tanpa "
 "nama."
 
-#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:87
+#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:88
 msgid "Authentication failed."
 msgstr "Pengesahan gagal."
 
@@ -9346,11 +9440,11 @@ msgstr ""
 "Maklumat surih tak sah:\n"
 "%s"
 
-#: camel/camel-sasl-cram-md5.c:35
+#: camel/camel-sasl-cram-md5.c:36
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: camel/camel-sasl-cram-md5.c:37
+#: camel/camel-sasl-cram-md5.c:38
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -9358,11 +9452,11 @@ msgstr ""
 "Opsyen ini akan disambungkan ke pelayan dengan menggunakan kata laluan CRAM-"
 "MD5 yang terjamin, jika pelayan menyokongnya."
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:49
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:50
+#: camel/camel-sasl-digest-md5.c:51
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -9370,27 +9464,27 @@ msgstr ""
 "Opsyen ini akan disambungkan ke pelayan dengan menggunakan kata laluan "
 "DIGEST-MD5 yang terjamin, jika pelayan menyokongnya."
 
-#: camel/camel-sasl-digest-md5.c:813
+#: camel/camel-sasl-digest-md5.c:814
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Cabaran pelayan terlalu lama (>2048 oktet)\n"
 
-#: camel/camel-sasl-digest-md5.c:822
+#: camel/camel-sasl-digest-md5.c:823
 msgid "Server challenge invalid\n"
 msgstr "Cabaran pelayan tak sah\n"
 
-#: camel/camel-sasl-digest-md5.c:828
+#: camel/camel-sasl-digest-md5.c:829
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr "Cabaran pelayan mengandungi token \"Kualiti Perlindungan\" tak sah\n"
 
-#: camel/camel-sasl-digest-md5.c:850
+#: camel/camel-sasl-digest-md5.c:859
 msgid "Server response did not contain authorization data\n"
 msgstr "Maklum balas pelayan tidak mengandungi data sah kuasa\n"
 
-#: camel/camel-sasl-digest-md5.c:868
+#: camel/camel-sasl-digest-md5.c:877
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Maklum balas pelayan mengandungi data sah kuasa yang tidak lengkap\n"
 
-#: camel/camel-sasl-digest-md5.c:878
+#: camel/camel-sasl-digest-md5.c:887
 msgid "Server response does not match\n"
 msgstr "Maklum balas pelayan tidak padan\n"
 
@@ -9464,19 +9558,14 @@ msgstr "Semakan ketekalan yang dilakukan pada bukti kelayakan gagal."
 msgid "The referenced credentials have expired."
 msgstr "Bukti kelayakan yang dirujuk telah tamat tempoh."
 
-#: camel/camel-sasl-gssapi.c:193 camel/camel-sasl-gssapi.c:242
-#: camel/camel-sasl-gssapi.c:278 camel/camel-sasl-gssapi.c:293
-#: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/camel-sasl-gssapi.c:193 camel/camel-sasl-gssapi.c:241
+#: camel/camel-sasl-gssapi.c:277 camel/camel-sasl-gssapi.c:292
+#: camel/camel-sasl-kerberos4.c:225
+#: camel/providers/imap/camel-imap-store.c:1198
 msgid "Bad authentication response from server."
 msgstr "Maklum balas pengesahan yang salah daripada pelayan."
 
-#: camel/camel-sasl-gssapi.c:217
-#, c-format
-msgid "Failed to resolve host `%s': %s"
-msgstr "Gagal menyelesaikan hos `%s': %s"
-
-#: camel/camel-sasl-gssapi.c:303
+#: camel/camel-sasl-gssapi.c:302
 msgid "Unsupported security layer."
 msgstr "Lapisan keselamatan tidak disokong."
 
@@ -9490,7 +9579,7 @@ msgstr ""
 "Opsyen ini akan disambungkan ke pelayan dengan menggunakan pengesahan "
 "Kerberos 4."
 
-#: camel/camel-sasl-kerberos4.c:162
+#: camel/camel-sasl-kerberos4.c:168
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -9499,25 +9588,25 @@ msgstr ""
 "Tidak dapat memperoleh tiket Kerberos:\n"
 "%s"
 
-#: camel/camel-sasl-login.c:32
+#: camel/camel-sasl-login.c:33
 msgid "Login"
 msgstr "Log masuk"
 
-#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:35 camel/camel-sasl-plain.c:35
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 "Opsyen ini akan disambungkan ke pelayan dengan menggunakan kata laluan yang "
 "mudah."
 
-#: camel/camel-sasl-login.c:127
+#: camel/camel-sasl-login.c:128
 msgid "Unknown authentication state."
 msgstr "Keadaan pengesahan tak diketahui."
 
-#: camel/camel-sasl-ntlm.c:31
+#: camel/camel-sasl-ntlm.c:32
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: camel/camel-sasl-ntlm.c:33
+#: camel/camel-sasl-ntlm.c:34
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -9525,89 +9614,85 @@ msgstr ""
 "Opsyen ini akan disambungkan ke pelayan berasaskan Windows dengan "
 "menggunakan Pengesahan Kata Laluan NTLM / Terjamin."
 
-#: camel/camel-sasl-plain.c:32
+#: camel/camel-sasl-plain.c:33
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:37
 msgid "POP before SMTP"
 msgstr "POP sebelum SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:38
+#: camel/camel-sasl-popb4smtp.c:39
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Opsyen ini akan mengizinkan sambungan POP sebelum mencuba SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:103
+#: camel/camel-sasl-popb4smtp.c:104
 msgid "POP Source URI"
 msgstr "URI Sumber POP"
 
-#: camel/camel-sasl-popb4smtp.c:106
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr ""
 "POP Sebelum sah kuasa SMTP dengan menggunakan pengangkutan yang tak diketahui"
 
-#: camel/camel-sasl-popb4smtp.c:111
+#: camel/camel-sasl-popb4smtp.c:112
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP sebelum sah kuasa SMTP dengan menggunakan sumber bukan pop"
 
-#: camel/camel-search-private.c:114
+#: camel/camel-search-private.c:151
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Pengkompilan ungkapan biasa gagal: %s: %s"
 
-#: camel/camel-service.c:271
+#: camel/camel-service.c:274
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' memerlukan komponen nama pengguna"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:278
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' memerlukan komponen hos"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' memerlukan komponen laluan"
 
-#: camel/camel-service.c:729
+#: camel/camel-service.c:743
+#, fuzzy
+msgid "cannot create thread"
+msgstr "Tidak dapat cipta mesej CMS"
+
+#: camel/camel-service.c:890
 #, c-format
 msgid "Resolving: %s"
 msgstr "Menyelesaikan: %s"
 
-#: camel/camel-service.c:760 camel/camel-service.c:884
-#, c-format
-msgid "Failure in name lookup: %s"
-msgstr "Gagal dalam carian nama: %s"
-
-#: camel/camel-service.c:781 camel/camel-service.c:905
-#, c-format
-msgid "Host lookup failed: cannot create thread: %s"
-msgstr "Carian hos gagal: tidak dapat mewujudkan bebenang: %s"
+#: camel/camel-service.c:912
+#, fuzzy
+msgid "Host lookup failed"
+msgstr "Carian hos gagal: sebab tak diketahui"
 
-#: camel/camel-service.c:794
-#, c-format
-msgid "Host lookup failed: %s: host not found"
+#: camel/camel-service.c:914
+#, fuzzy, c-format
+msgid "Host lookup failed: %s: %s"
 msgstr "Carian hos gagal: %s: hos tidak dijumpai"
 
-#: camel/camel-service.c:797
-#, c-format
-msgid "Host lookup failed: %s: unknown reason"
-msgstr "Carian hos gagal: %s sebab tak diketahui"
-
-#: camel/camel-service.c:851
+#: camel/camel-service.c:1021
 msgid "Resolving address"
 msgstr "Mengubah alamat"
 
-#: camel/camel-service.c:920
-msgid "Host lookup failed: host not found"
-msgstr "Carian hos gagal: hos tidak dijumpai"
+#: camel/camel-service.c:1041
+msgid "Name lookup failed"
+msgstr ""
 
-#: camel/camel-service.c:923
-msgid "Host lookup failed: unknown reason"
-msgstr "Carian hos gagal: sebab tak diketahui"
+#: camel/camel-service.c:1044
+#, fuzzy, c-format
+msgid "Name lookup failed: %s"
+msgstr "Arahan NNTP gagal: %s"
 
-#: camel/camel-session.c:282
+#: camel/camel-session.c:283
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9616,253 +9701,266 @@ msgstr ""
 "Tidak dapat mewujudkan direktori %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:104
+#: camel/camel-smime-context.c:105
 #, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Masukkan frasa laluan sekuriti bagi '%s'"
 
-#: camel/camel-smime-context.c:261
+#: camel/camel-smime-context.c:262
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Tak dapat menjumpai sijil bagi '%s'"
 
-#: camel/camel-smime-context.c:267
+#: camel/camel-smime-context.c:268
 msgid "Cannot create CMS message"
 msgstr "Tidak dapat mencipta mesej CMS"
 
-#: camel/camel-smime-context.c:272
-msgid "Cannot create CMS signedData"
+#: camel/camel-smime-context.c:273
+#, fuzzy
+msgid "Cannot create CMS signed data"
 msgstr "Tak dapat mencipta signedData CMS"
 
-#: camel/camel-smime-context.c:278
-msgid "Cannot attach CMS signedData"
+#: camel/camel-smime-context.c:279
+#, fuzzy
+msgid "Cannot attach CMS signed data"
 msgstr "Tidak dapat melampirkan signedData CMS"
 
-#: camel/camel-smime-context.c:285
+#: camel/camel-smime-context.c:286
 msgid "Cannot attach CMS data"
 msgstr "Tidak dapat melampirkan data CMS"
 
-#: camel/camel-smime-context.c:291
-msgid "Cannot create CMS SignerInfo"
-msgstr ""
+#: camel/camel-smime-context.c:292
+#, fuzzy
+msgid "Cannot create CMS Signer information"
+msgstr "Tak dapat mencipta signedData CMS"
 
-#: camel/camel-smime-context.c:297
-msgid "Cannot find cert chain"
-msgstr ""
+#: camel/camel-smime-context.c:298
+#, fuzzy
+msgid "Cannot find certificate chain"
+msgstr "Tak menjumpai mencari sijil bagi '%s'."
 
-#: camel/camel-smime-context.c:303
-msgid "Cannot add CMS SigningTime"
-msgstr ""
+#: camel/camel-smime-context.c:304
+#, fuzzy
+msgid "Cannot add CMS Signing time"
+msgstr "Tak dapat menambah SignerInfo CMS"
 
-#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
-#, c-format
-msgid "Encryption cert for '%s' does not exist"
+#: camel/camel-smime-context.c:326 camel/camel-smime-context.c:338
+#, fuzzy, c-format
+msgid "Encryption certificate for '%s' does not exist"
 msgstr "Sijil pengenkripsian bagi '%s' tidak wujud."
 
-#: camel/camel-smime-context.c:344
+#: camel/camel-smime-context.c:345
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Tak dapat menambah atribut SMIMEEncKeyPrefs"
 
-#: camel/camel-smime-context.c:349
+#: camel/camel-smime-context.c:350
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Tak dapat menambah atribut MS SMIMEEncKeyPrefs"
 
-#: camel/camel-smime-context.c:354
+#: camel/camel-smime-context.c:355
 msgid "Cannot add encryption certificate"
 msgstr "Tak dapat menambah sijil pengenkripsian"
 
-#: camel/camel-smime-context.c:360
-msgid "Cannot add CMS SignerInfo"
+#: camel/camel-smime-context.c:361
+#, fuzzy
+msgid "Cannot add CMS Signer information"
 msgstr "Tak dapat menambah SignerInfo CMS"
 
-#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
+#: camel/camel-smime-context.c:431 camel/camel-smime-context.c:879
 msgid "Cannot create encoder context"
 msgstr "Tidak dapat mencipta konteks pengenkod"
 
-#: camel/camel-smime-context.c:436
+#: camel/camel-smime-context.c:437
 msgid "Failed to add data to CMS encoder"
 msgstr "Gagal untuk menambah data ke pengenkod CMS"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
+#: camel/camel-smime-context.c:442 camel/camel-smime-context.c:896
 msgid "Failed to encode data"
 msgstr "Gagal mengenkod data"
 
-#: camel/camel-smime-context.c:514
+#: camel/camel-smime-context.c:515
 msgid "Unverified"
 msgstr "Tidak ditentusahkan"
 
-#: camel/camel-smime-context.c:516
+#: camel/camel-smime-context.c:517
 msgid "Good signature"
 msgstr "Tandatangan elok"
 
-#: camel/camel-smime-context.c:518
+#: camel/camel-smime-context.c:519
 msgid "Bad signature"
 msgstr "Tandatangan teruk"
 
-#: camel/camel-smime-context.c:520
+#: camel/camel-smime-context.c:521
 msgid "Content tampered with or altered in transit"
 msgstr "Kandungan cuba dirosakkan atau diubah dalam peralihan"
 
-#: camel/camel-smime-context.c:522
+#: camel/camel-smime-context.c:523
 msgid "Signing certificate not found"
 msgstr "Sijil tandatangan tidak dijumpai"
 
-#: camel/camel-smime-context.c:524
+#: camel/camel-smime-context.c:525
 msgid "Signing certificate not trusted"
 msgstr "Sijil tandatangan tidak dipercayai"
 
-#: camel/camel-smime-context.c:526
+#: camel/camel-smime-context.c:527
 msgid "Signature algorithm unknown"
 msgstr "Algoritma tandatangan tidak diketahui"
 
-#: camel/camel-smime-context.c:528
+#: camel/camel-smime-context.c:529
 msgid "Signature algorithm unsupported"
 msgstr "Alkhwarizmi tandatangan tidak disokong"
 
-#: camel/camel-smime-context.c:530
+#: camel/camel-smime-context.c:531
 msgid "Malformed signature"
 msgstr "Tandatangan cacat"
 
-#: camel/camel-smime-context.c:532
+#: camel/camel-smime-context.c:533
 msgid "Processing error"
 msgstr "Memproses ralat"
 
-#: camel/camel-smime-context.c:569
-msgid "No signedData in signature"
+#: camel/camel-smime-context.c:570
+#, fuzzy
+msgid "No signed data in signature"
 msgstr "Tiada signedData pada tandatangan"
 
-#: camel/camel-smime-context.c:576
+#: camel/camel-smime-context.c:577
 msgid "Digests missing from enveloped data"
 msgstr "Jilid hilang drüd data disampul"
 
-#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
+#: camel/camel-smime-context.c:590 camel/camel-smime-context.c:600
 msgid "Cannot calculate digests"
 msgstr "Tidak dapat mengira jilid"
 
-#: camel/camel-smime-context.c:604
+#: camel/camel-smime-context.c:605
 #, fuzzy
 msgid "Cannot set message digests"
 msgstr "Tidak boleh mendapatkan mesej %s: %s"
 
-#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
+#: camel/camel-smime-context.c:615 camel/camel-smime-context.c:620
 msgid "Certificate import failed"
 msgstr "Gagal mengimport sijil"
 
-#: camel/camel-smime-context.c:628
-msgid "Certificate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:630
+#, fuzzy
+msgid "Certificate is the only message, cannot verify certificates"
 msgstr "Sijilkan hanya mesej, tak dapat tentusahkan sijil"
 
-#: camel/camel-smime-context.c:631
-msgid "Certificate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:633
+#, fuzzy
+msgid "Certificate is the only message, certificates imported and verified"
 msgstr "Sijilkan hanya mesej, sijil diimport dan ditentusahkan"
 
-#: camel/camel-smime-context.c:635
+#: camel/camel-smime-context.c:637
 msgid "Cannot find signature digests"
 msgstr "Tak dapat tandatangan jilid"
 
-#: camel/camel-smime-context.c:651
+#: camel/camel-smime-context.c:653
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Penandatangan: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:752
+#: camel/camel-smime-context.c:754
 msgid "Decoder failed"
 msgstr "Pengdekod gagal"
 
-#: camel/camel-smime-context.c:804
+#: camel/camel-smime-context.c:806
 #, c-format
 msgid "Cannot find certificate for `%s'"
 msgstr "Tak menjumpai mencari sijil bagi '%s'."
 
-#: camel/camel-smime-context.c:811
+#: camel/camel-smime-context.c:813
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Gagal mencari algoritma pengenkripsian pukal sepunya."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:820
+#: camel/camel-smime-context.c:822
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Tak dapat memperuntukkan slot bagi kekunci pengenkripsian pukal"
 
-#: camel/camel-smime-context.c:831
+#: camel/camel-smime-context.c:833
 msgid "Cannot create CMS Message"
 msgstr "Tidak dapat cipta mesej CMS"
 
-#: camel/camel-smime-context.c:837
-msgid "Cannot create CMS EnvelopedData"
+#: camel/camel-smime-context.c:839
+#, fuzzy
+msgid "Cannot create CMS Enveloped data"
 msgstr "Tidak dapat cipta EnvelopedData CMS"
 
-#: camel/camel-smime-context.c:843
-msgid "Cannot attach CMS EnvelopedData"
+#: camel/camel-smime-context.c:845
+#, fuzzy
+msgid "Cannot attach CMS Enveloped data"
 msgstr "Tidak dapat melampirkan EnvelopedData CMS"
 
-#: camel/camel-smime-context.c:849
+#: camel/camel-smime-context.c:851
 msgid "Cannot attach CMS data object"
 msgstr "Tidak dapat melampirkan data CMS"
 
-#: camel/camel-smime-context.c:858
-msgid "Cannot create CMS RecipientInfo"
+#: camel/camel-smime-context.c:860
+#, fuzzy
+msgid "Cannot create CMS Recipient information"
 msgstr "Tidak dapat  mencipta RecipientInfo CMS"
 
-#: camel/camel-smime-context.c:863
-msgid "Cannot add CMS RecipientInfo"
+#: camel/camel-smime-context.c:865
+#, fuzzy
+msgid "Cannot add CMS Recipient information"
 msgstr "Tidak dapat menambah RecipientInfo CMS"
 
-#: camel/camel-smime-context.c:888
+#: camel/camel-smime-context.c:890
 msgid "Failed to add data to encoder"
 msgstr "Gagal menambah data ke pengenkod"
 
-#: camel/camel-smime-context.c:975
+#: camel/camel-smime-context.c:977
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr "Pengdekod gagal, ralat %d"
 
-#: camel/camel-smime-context.c:982
+#: camel/camel-smime-context.c:984
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "Nyah-ekripsi S/MIME: Tiada kandungan terenkripsi dijumpai"
 
-#: camel/camel-smime-context.c:1009
+#: camel/camel-smime-context.c:1011
 msgid "import keys: unimplemented"
 msgstr "import kekunci: tidak dilaksanakan"
 
-#: camel/camel-smime-context.c:1017
+#: camel/camel-smime-context.c:1019
 msgid "export keys: unimplemented"
 msgstr "eksport kekunci: tidak dilaksanakan"
 
-#: camel/camel-store.c:213
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Tidak dapat memperoleh folder: pengendalian tak sah pada simpanan ini"
 
-#: camel/camel-store.c:243
+#: camel/camel-store.c:244
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Tidak dapat mencipta folder '%s': folder telah wujud"
 
-#: camel/camel-store.c:297
+#: camel/camel-store.c:298
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Tidak dapat mewujudkan folder: pengendalian tak sah pada simpanan ini"
 
-#: camel/camel-store.c:325
+#: camel/camel-store.c:326
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Tidak dapat mencipta folder: %s: folder telah wujud"
 
-#: camel/camel-store.c:389 camel/camel-vee-store.c:351
+#: camel/camel-store.c:390 camel/camel-vee-store.c:367
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Tidak dapat memadam folder: %s: Pengendalian tak sah"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:388
-#: camel/providers/local/camel-maildir-store.c:232
+#: camel/camel-store.c:440 camel/camel-vee-store.c:404
+#: camel/providers/local/camel-maildir-store.c:233
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
 
-#: camel/camel-store.c:777
+#: camel/camel-store.c:778
 msgid "Trash"
 msgstr "Sampah"
 
-#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
-#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:780 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:90 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Jun"
@@ -9983,7 +10081,7 @@ msgstr "Penggunaan kunci tidak menyokong tandatangan sijil"
 msgid "Error in application verification"
 msgstr "Ralat dalam pengesahbetulan aplikasi"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:827
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9996,11 +10094,11 @@ msgstr ""
 "Cap jari:          %s\n"
 "Tandatangan:       %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833
 msgid "BAD"
 msgstr "BAD"
 
@@ -10024,7 +10122,7 @@ msgstr ""
 "Adakah anda mahu menerimanya?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:836
+#: camel/camel-tcp-stream-ssl.c:837
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -10039,7 +10137,7 @@ msgstr ""
 "\n"
 "Adakah anda mahu menerimanya?"
 
-#: camel/camel-tcp-stream-ssl.c:880
+#: camel/camel-tcp-stream-ssl.c:881
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -10048,7 +10146,7 @@ msgstr ""
 "Masalah sijil: %s\n"
 "Pengeluar: %s"
 
-#: camel/camel-tcp-stream-ssl.c:932
+#: camel/camel-tcp-stream-ssl.c:933
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -10057,7 +10155,7 @@ msgstr ""
 "Domain sijil salah: %s\n"
 "Pengeluar: %s"
 
-#: camel/camel-tcp-stream-ssl.c:950
+#: camel/camel-tcp-stream-ssl.c:951
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -10066,7 +10164,7 @@ msgstr ""
 "Sijil tamat tempoh: %s\n"
 "Pengeluar: %s"
 
-#: camel/camel-tcp-stream-ssl.c:967
+#: camel/camel-tcp-stream-ssl.c:968
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -10075,142 +10173,133 @@ msgstr ""
 "Senarai pembatalan sijil tamat tempoh: %s\n"
 "Pengeluar: %s"
 
-#: camel/camel-url.c:292
+#: camel/camel-url.c:293
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Tidak dapat menghuraikan URL `%s'"
 
-#: camel/camel-vee-folder.c:633
+#: camel/camel-vee-folder.c:604
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Ralat ketika menyimpan `%s': %s"
 
-#: camel/camel-vee-folder.c:675
+#: camel/camel-vee-folder.c:646
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Tiada mesej %s tersebut dalam %s"
 
-#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
+#: camel/camel-vee-folder.c:813 camel/camel-vee-folder.c:819
 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:374
+#: camel/camel-vee-store.c:390
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Tidak dapat memadam folder: %s: Folder tersebut tidak ada"
 
-#: camel/camel-vee-store.c:396
+#: camel/camel-vee-store.c:412
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Tidak dapat menamakan semula folder: %s: Folder tersebut tidak ada"
 
-#: camel/camel-vtrash-folder.c:44
+#: camel/camel-vtrash-folder.c:45
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Tidak dapat menyalin mesej ke folder Sampah"
 
-#: camel/camel-vtrash-folder.c:46
+#: camel/camel-vtrash-folder.c:47
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Tidak dapat menyalin mesej ke folder Junks"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:53
-#: camel/providers/imap4/camel-imap4-provider.c:35
+#: camel/providers/groupwise/camel-groupwise-provider.c:54
+#: camel/providers/imap4/camel-imap4-provider.c:36
 msgid "Checking for new mail"
 msgstr "Menyemak mel baru"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap/camel-imap-provider.c:45
-#: camel/providers/imap4/camel-imap4-provider.c:37
+#: camel/providers/groupwise/camel-groupwise-provider.c:56
+#: camel/providers/imap/camel-imap-provider.c:46
+#: camel/providers/imap4/camel-imap4-provider.c:38
 msgid "Check for new messages in all folders"
 msgstr "Menyemak mesej baru dalam semua folder"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:59
+#: camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Apply filters to new messages in Inbox on this server"
 msgstr "Terapkan penapis bagi mesej baru dalam Inbox dalam pelayan ini"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:61
-#: camel/providers/imap/camel-imap-provider.c:66
+#: camel/providers/groupwise/camel-groupwise-provider.c:63
+#: camel/providers/imap/camel-imap-provider.c:68
 #, fuzzy
 msgid "Check new messages for Junk contents"
 msgstr "Menyemak mesej baru dalam semua folder"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:63
-#: camel/providers/imap/camel-imap-provider.c:68
+#: camel/providers/groupwise/camel-groupwise-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:70
 #, fuzzy
 msgid "Only check for Junk messages in the INBOX folder"
 msgstr "Menyemak mesej baru dalam semua folder"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:65
-#: camel/providers/imap/camel-imap-provider.c:70
+#: camel/providers/groupwise/camel-groupwise-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:72
 msgid "Automatically synchronize remote mail locally"
 msgstr "Secara automatik segerakkan mel jauh secara setempat"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: camel/providers/groupwise/camel-groupwise-provider.c:72
 msgid "Address Book and Calendar"
 msgstr "Buku Alamat dan Kalendar"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
+#: camel/providers/groupwise/camel-groupwise-provider.c:75
 msgid "Post Office Agent:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:75
+#: camel/providers/groupwise/camel-groupwise-provider.c:78
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:78
+#: camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Use Secure Connection (SSL)"
 msgstr "Gunakan Sambungan Selamat (SSL)"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:92
+#: camel/providers/groupwise/camel-groupwise-provider.c:94
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:94
+#: camel/providers/groupwise/camel-groupwise-provider.c:96
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:109
-#: camel/providers/imap/camel-imap-provider.c:93
-#: camel/providers/imap4/camel-imap4-provider.c:70
-#: camel/providers/imapp/camel-imapp-provider.c:65
-#: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
+#: camel/providers/groupwise/camel-groupwise-provider.c:111
+#: camel/providers/imap/camel-imap-provider.c:96
+#: camel/providers/imap4/camel-imap4-provider.c:71
+#: camel/providers/imapp/camel-imapp-provider.c:66
+#: camel/providers/nntp/camel-nntp-provider.c:72
+#: camel/providers/pop3/camel-pop3-provider.c:72
 msgid "Password"
 msgstr "Kata laluan"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:111
-#: camel/providers/imap/camel-imap-provider.c:95
-#: camel/providers/imapp/camel-imapp-provider.c:67
+#: camel/providers/groupwise/camel-groupwise-provider.c:113
+#: camel/providers/imap/camel-imap-provider.c:98
+#: camel/providers/imapp/camel-imapp-provider.c:68
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Opsyen ini akan disambungkan ke pelayan IMAP dengan menggunakan kata laluan "
 "teks biasa."
 
-#: camel/providers/groupwise/camel-gw-listener.c:362
+#: camel/providers/groupwise/camel-gw-listener.c:402
 msgid "Checklist"
 msgstr "Senarai semak"
 
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3220
+#: camel/providers/imap/camel-imap-store.c:3182
 msgid "Operation cancelled"
 msgstr "Pengendalian dibatalkan"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3223
+#: camel/providers/imap/camel-imap-store.c:3185
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Pelayan terputus tanpa dijangkakan: %s"
 
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/imap4/camel-imap4-store.c:283
-#: camel/providers/pop3/camel-pop3-store.c:543
-#: camel/providers/pop3/camel-pop3-store.c:550
-#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1220
-msgid "Unknown error"
-msgstr "Ralat tak diketahui"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10279,15 +10368,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1975
-#: camel/providers/local/camel-maildir-folder.c:244
-#: camel/providers/local/camel-mbox-folder.c:418
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:245
+#: camel/providers/local/camel-mbox-folder.c:416
+#: camel/providers/local/camel-mh-folder.c:203
 msgid "No such message"
 msgstr "Mesej tersebut tidak ada"
 
 #: camel/providers/imap/camel-imap-folder.c:2017
 #: camel/providers/imap/camel-imap-folder.c:2620
-#: camel/providers/nntp/camel-nntp-folder.c:220
+#: camel/providers/nntp/camel-nntp-folder.c:221
 msgid "This message is not currently available"
 msgstr "Mesej ini tidak ada pada masa ini"
 
@@ -10316,159 +10405,165 @@ msgstr ""
 msgid "Could not find message body in FETCH response."
 msgstr "Tidak dapat mencari badan mesej dalam maklum balas FETCH."
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap/camel-imap-message-cache.c:156
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Tidak dapat membuka direktori cache: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:252
-#: camel/providers/imap/camel-imap-message-cache.c:309
-#: camel/providers/imap/camel-imap-message-cache.c:340
-#: camel/providers/imap/camel-imap-message-cache.c:372
+#: camel/providers/imap/camel-imap-message-cache.c:253
+#: camel/providers/imap/camel-imap-message-cache.c:310
+#: camel/providers/imap/camel-imap-message-cache.c:341
+#: camel/providers/imap/camel-imap-message-cache.c:373
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Gagal untuk cache mesej %s: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:417
+#: camel/providers/imap/camel-imap-message-cache.c:418
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr "Gagal untuk cache %s: %s"
 
-#: camel/providers/imap/camel-imap-provider.c:43
+#: camel/providers/imap/camel-imap-provider.c:44
 msgid "Checking for New Mail"
 msgstr "Menyemak Mel Baru"
 
-#: camel/providers/imap/camel-imap-provider.c:48
+#: camel/providers/imap/camel-imap-provider.c:49
 msgid "Connection to Server"
 msgstr "Menyambungkan ke Pelayan"
 
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:51
 msgid "Use custom command to connect to server"
 msgstr "Guna arahan tersendiri untuk menyambungkan ke pelayan"
 
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:53
 msgid "Command:"
 msgstr "Arahan:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/nntp/camel-nntp-provider.c:41
+#: camel/providers/imap/camel-imap-provider.c:56
+#: camel/providers/imap4/camel-imap4-provider.c:41
+#: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "Folders"
 msgstr "Folder"
 
-#: camel/providers/imap/camel-imap-provider.c:57
-#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:58
+#: camel/providers/imap4/camel-imap4-provider.c:43
 msgid "Show only subscribed folders"
 msgstr "Tunjukkan folder yang dilanggan sahaja"
 
-#: camel/providers/imap/camel-imap-provider.c:59
-#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:60
+#: camel/providers/imap4/camel-imap4-provider.c:45
 msgid "Override server-supplied folder namespace"
 msgstr "Menolak ruang nama folder yang disediakan oleh pelayan"
 
-#: camel/providers/imap/camel-imap-provider.c:61
-#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:62
+#: camel/providers/imap4/camel-imap4-provider.c:47
 msgid "Namespace"
 msgstr "Ruang nama"
 
-#: camel/providers/imap/camel-imap-provider.c:64
+#: camel/providers/imap/camel-imap-provider.c:66
 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:76
+#: camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:78
+#: camel/providers/imap/camel-imap-provider.c:81
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Untuk membaca dan menyimpan mel dalam pelayan IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap/camel-imap-store.c:422
 #: camel/providers/imap4/camel-imap4-store.c:177
 #, c-format
 msgid "IMAP server %s"
 msgstr "Pelayan IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap/camel-imap-store.c:424
 #: camel/providers/imap4/camel-imap4-store.c:179
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Khidmat IMAP bagi %s pada %s"
 
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imap4/camel-imap4-store.c:214
-#: camel/providers/imap4/camel-imap4-store.c:230
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/smtp/camel-smtp-transport.c:285
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
+#: camel/providers/imap/camel-imap-store.c:534
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:209
+#: camel/providers/imap4/camel-imap4-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:197
+#: camel/providers/nntp/camel-nntp-store.c:212
+#: camel/providers/pop3/camel-pop3-store.c:165
+#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:253
+#: camel/providers/smtp/camel-smtp-transport.c:268
+#, fuzzy, c-format
+msgid "Could not connect to %s: %s"
 msgstr "Tidak dapat disambungkan ke %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/imap4/camel-imap4-store.c:216
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
+#: camel/providers/imap/camel-imap-store.c:535
+#: camel/providers/imap4/camel-imap4-store.c:210
+#: camel/providers/nntp/camel-nntp-store.c:198
+#: camel/providers/pop3/camel-pop3-store.c:166
+#: camel/providers/smtp/camel-smtp-transport.c:254
 msgid "SSL unavailable"
 msgstr "SSL tidak Ada"
 
-#: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:841
-#: camel/providers/imap4/camel-imap4-store.c:227
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
+#: camel/providers/imap/camel-imap-store.c:546
+#: camel/providers/imap/camel-imap-store.c:809
+#: camel/providers/imap4/camel-imap4-store.c:221
+#: camel/providers/imapp/camel-imapp-store.c:237
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/nntp/camel-nntp-store.c:228
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:265
 msgid "Connection cancelled"
 msgstr "Sambungan dibatalkan"
 
+#: camel/providers/imap/camel-imap-store.c:653
 #: camel/providers/imap/camel-imap-store.c:675
-#: camel/providers/imap/camel-imap-store.c:706
-#: camel/providers/imap4/camel-imap4-store.c:282
+#: camel/providers/imap4/camel-imap4-store.c:246
+#: camel/providers/imap4/camel-imap4-store.c:259
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Gagal disambungkan ke pelayan IMAP %s dalam mod terjamin: %s"
 
-#: camel/providers/imap/camel-imap-store.c:676
-#: camel/providers/pop3/camel-pop3-store.c:233
-msgid "SSL/TLS extension not supported."
+#: camel/providers/imap/camel-imap-store.c:654
+#: camel/providers/smtp/camel-smtp-transport.c:321
+#, fuzzy
+msgid "STARTTLS not supported"
 msgstr "Sambungan SSL/TLS tidak disokong."
 
-#: camel/providers/imap/camel-imap-store.c:707
-#: camel/providers/pop3/camel-pop3-store.c:274
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/imap4/camel-imap4-store.c:247
+#: camel/providers/pop3/camel-pop3-store.c:243
 msgid "SSL negotiations failed"
 msgstr "Rundingan SSL gagal"
 
-#: camel/providers/imap/camel-imap-store.c:844
+#: camel/providers/imap/camel-imap-store.c:812
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Tidak dapat disambungkan dengan arahan \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1268
+#: camel/providers/imap/camel-imap-store.c:1230
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Pelayan IMAP %s tidak menyokong jenis pengesahan yang diminta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1278
-#: camel/providers/smtp/camel-smtp-transport.c:486
+#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/smtp/camel-smtp-transport.c:474
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Tiada sokongan bagi jenis pengesahan %s"
 
-#: camel/providers/imap/camel-imap-store.c:1301
-#: camel/providers/imapp/camel-imapp-store.c:344
+#: camel/providers/imap/camel-imap-store.c:1263
+#: camel/providers/imapp/camel-imapp-store.c:353
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sSila masukkan kata laluan IMAP bagi %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1315
+#: camel/providers/imap/camel-imap-store.c:1277
 msgid "You didn't enter a password."
 msgstr "Anda tidak memasukkan kata laluan."
 
-#: camel/providers/imap/camel-imap-store.c:1344
+#: camel/providers/imap/camel-imap-store.c:1306
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10479,34 +10574,34 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1863
-#: camel/providers/imap/camel-imap-store.c:2053
+#: camel/providers/imap/camel-imap-store.c:1825
+#: camel/providers/imap/camel-imap-store.c:2015
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder tersebut tidak ada%s"
 
-#: camel/providers/imap/camel-imap-store.c:1881
-#: camel/providers/imap/camel-imap-store.c:2259
-#: camel/providers/imap4/camel-imap4-store.c:764
+#: camel/providers/imap/camel-imap-store.c:1843
+#: camel/providers/imap/camel-imap-store.c:2221
+#: camel/providers/imap4/camel-imap4-store.c:735
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Nama folder \"%s\" tak sah kerana ia mengandungi aksara \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:1939
-#: camel/providers/imap/camel-imap-store.c:2320
+#: camel/providers/imap/camel-imap-store.c:1901
+#: camel/providers/imap/camel-imap-store.c:2282
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Folder ibu tidak dibenarkan mengandungi subfolder"
 
-#: camel/providers/imap/camel-imap-store.c:1994
-#: camel/providers/local/camel-maildir-store.c:139
-#: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:236
+#: camel/providers/imap/camel-imap-store.c:1956
+#: camel/providers/local/camel-maildir-store.c:140
+#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/local/camel-mh-store.c:237
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Tidak boleh mencipta folder: %s: folder telah wujud."
 
-#: camel/providers/imap/camel-imap-store.c:2270
+#: camel/providers/imap/camel-imap-store.c:2232
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Folder induk tak diketahui: %s"
@@ -10612,17 +10707,17 @@ msgstr ""
 "Tidak boleh mendapatkan mesej: %s dari folder %s\n"
 "  %s"
 
-#: camel/providers/imap4/camel-imap4-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:54
 #, fuzzy
 msgid "IMAPv4rev1"
 msgstr "IMAPv4"
 
-#: camel/providers/imap4/camel-imap4-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:56
 #, fuzzy
 msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
 msgstr "Untuk membaca dan menyimpan mel dalam pelayan IMAP."
 
-#: camel/providers/imap4/camel-imap4-provider.c:72
+#: camel/providers/imap4/camel-imap4-provider.c:73
 #, fuzzy
 msgid ""
 "This option will connect to the IMAPv4rev1 server using a plaintext password."
@@ -10630,14 +10725,7 @@ msgstr ""
 "Opsyen ini akan disambungkan ke pelayan IMAP dengan menggunakan kata laluan "
 "teks biasa."
 
-#: camel/providers/imap4/camel-imap4-store.c:257
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Gagal disambungkan ke pelayan IMAP %s dalam mod terjamin: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:363
+#: camel/providers/imap4/camel-imap4-store.c:334
 #, fuzzy, c-format
 msgid ""
 "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
@@ -10645,87 +10733,87 @@ msgstr ""
 "Tidak dapat disambungkan ke pelayan POP %s: Tiada sokongan bagi mekanisme "
 "pengesahan yang diminta."
 
-#: camel/providers/imap4/camel-imap4-store.c:408
+#: camel/providers/imap4/camel-imap4-store.c:379
 #, fuzzy, c-format
 msgid "%sPlease enter the IMAP password for %s on host %s"
 msgstr "%sSila masukkan kata laluan SMTP bagi %s@%s"
 
-#: camel/providers/imap4/camel-imap4-store.c:478
+#: camel/providers/imap4/camel-imap4-store.c:449
 #, fuzzy, c-format
 msgid "Cannot authenticate to IMAP server %s using %s"
 msgstr "Gagal disahkan pada pelayan POP %s: %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:701
+#: camel/providers/imap4/camel-imap4-store.c:672
 #, fuzzy, c-format
 msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Tidak boleh mendapatkan folder: %s: %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:815
+#: camel/providers/imap4/camel-imap4-store.c:786
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': Invalid mailbox name"
 msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
 
-#: camel/providers/imap4/camel-imap4-store.c:821
+#: camel/providers/imap4/camel-imap4-store.c:792
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': Bad command"
 msgstr "Tidak boleh mewujudkan folder: %s: %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:852
+#: camel/providers/imap4/camel-imap4-store.c:823
 #, fuzzy, c-format
 msgid "Cannot delete folder `%s': Special folder"
 msgstr "Tidak dapat memadam folder: %s: Folder tersebut tidak ada"
 
-#: camel/providers/imap4/camel-imap4-store.c:911
+#: camel/providers/imap4/camel-imap4-store.c:882
 #, fuzzy, c-format
 msgid "Cannot delete folder `%s': Invalid mailbox name"
 msgstr "Tidak dapat memadam folder: %s: Pengendalian tak sah"
 
-#: camel/providers/imap4/camel-imap4-store.c:916
+#: camel/providers/imap4/camel-imap4-store.c:887
 #, fuzzy, c-format
 msgid "Cannot delete folder `%s': Bad command"
 msgstr "Tidak dapat memadam folder: %s: Pengendalian tak sah"
 
-#: camel/providers/imap4/camel-imap4-store.c:936
+#: camel/providers/imap4/camel-imap4-store.c:907
 #, fuzzy, c-format
 msgid "Cannot rename folder `%s' to `%s': Special folder"
 msgstr "Tidak dapat memadam folder: %s: Folder tersebut tidak ada"
 
-#: camel/providers/imap4/camel-imap4-store.c:968
+#: camel/providers/imap4/camel-imap4-store.c:939
 #, fuzzy, c-format
 msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
 msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
 
-#: camel/providers/imap4/camel-imap4-store.c:973
+#: camel/providers/imap4/camel-imap4-store.c:944
 #, fuzzy, c-format
 msgid "Cannot rename folder `%s' to `%s': Bad command"
 msgstr "Tidak boleh mewujudkan folder: %s: %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:1221
+#: camel/providers/imap4/camel-imap4-store.c:1192
 #, c-format
 msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1223
+#: camel/providers/imap4/camel-imap4-store.c:1194
 #, fuzzy
 msgid "Bad command"
 msgstr "Syarikat"
 
-#: camel/providers/imap4/camel-imap4-store.c:1299
+#: camel/providers/imap4/camel-imap4-store.c:1270
 #, fuzzy, c-format
 msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
 msgstr "Tidak dapat memadam folder: %s: Pengendalian tak sah"
 
-#: camel/providers/imap4/camel-imap4-store.c:1304
+#: camel/providers/imap4/camel-imap4-store.c:1275
 #, fuzzy, c-format
 msgid "Cannot subscribe to folder `%s': Bad command"
 msgstr "Tidak boleh mewujudkan folder: %s: %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:1364
+#: camel/providers/imap4/camel-imap4-store.c:1335
 #, fuzzy, c-format
 msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
 
-#: camel/providers/imap4/camel-imap4-store.c:1369
+#: camel/providers/imap4/camel-imap4-store.c:1340
 #, fuzzy, c-format
 msgid "Cannot unsubscribe from folder `%s': Bad command"
 msgstr "Tidak boleh mewujudkan folder: %s: %s"
@@ -10745,16 +10833,16 @@ msgstr "Tiada tugas"
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "Pelayan terputus tanpa dijangkakan: %s"
 
-#: camel/providers/imapp/camel-imapp-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
+#: camel/providers/imapp/camel-imapp-provider.c:40
+#: camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Message storage"
 msgstr "Storan mesej"
 
-#: camel/providers/imapp/camel-imapp-provider.c:47
+#: camel/providers/imapp/camel-imapp-provider.c:48
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: camel/providers/imapp/camel-imapp-provider.c:49
+#: camel/providers/imapp/camel-imapp-provider.c:50
 msgid ""
 "Experimental IMAP 4(.1) client\n"
 "This is untested and unsupported code, you want to use plain imap instead.\n"
@@ -10766,7 +10854,12 @@ msgstr ""
 "\n"
 " !!!JANGAN GUNAKAN INI UNTUK EMEL PENGELUARAN\t!!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:328
+#: camel/providers/imapp/camel-imapp-store.c:240
+#, fuzzy, c-format
+msgid "Could not connect to %s (port %s): %s"
+msgstr "Tidak dapat disambungkan ke %s (port %d): %s"
+
+#: camel/providers/imapp/camel-imapp-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Tidak dapat disambungkan ke pelayan POP pada %s"
@@ -10776,41 +10869,41 @@ msgid "Index message body data"
 msgstr "Data kandungan mesej indeks"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:388
+#: camel/providers/local/camel-local-folder.c:391
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:392
 #: camel/providers/local/camel-local-folder.c:395
+#: camel/providers/local/camel-local-folder.c:398
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "peti mel:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:399
+#: camel/providers/local/camel-local-folder.c:402
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: camel/providers/local/camel-local-provider.c:43
+#: camel/providers/local/camel-local-provider.c:45
 msgid "Use the `.folders' folder summary file (exmh)"
 msgstr "Gunakan fail ringkasan folder `.folders' (exmh)"
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:52
 msgid "MH-format mail directories"
 msgstr "Direktori mel format MH"
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:53
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Untuk menyimpan mel setempat dalam direktori mel seperti MH."
 
-#: camel/providers/local/camel-local-provider.c:65
+#: camel/providers/local/camel-local-provider.c:68
 msgid "Local delivery"
 msgstr "Penyerahan setempat"
 
-#: camel/providers/local/camel-local-provider.c:66
+#: camel/providers/local/camel-local-provider.c:69
 msgid ""
 "For retrieving (moving) local mail from standard mbox formated spools into "
 "folders managed by Evolution."
@@ -10818,28 +10911,28 @@ msgstr ""
 "Untuk mendapatkan semula (mengalihkan) mel setempat daripada spul berformat "
 "peti mel piawai ke dalam folder yang diuruskan oleh Evolution."
 
-#: camel/providers/local/camel-local-provider.c:77
-#: camel/providers/local/camel-local-provider.c:94
+#: camel/providers/local/camel-local-provider.c:81
+#: camel/providers/local/camel-local-provider.c:100
 msgid "Apply filters to new messages in INBOX"
 msgstr "Gunakan penapis bagi mesej baru dalam INBOX"
 
-#: camel/providers/local/camel-local-provider.c:83
+#: camel/providers/local/camel-local-provider.c:88
 msgid "Maildir-format mail directories"
 msgstr "Direktori mel format maildir"
 
-#: camel/providers/local/camel-local-provider.c:84
+#: camel/providers/local/camel-local-provider.c:89
 msgid "For storing local mail in maildir directories."
 msgstr "Untuk menyimpan mel setempat dalam direktori maildir."
 
-#: camel/providers/local/camel-local-provider.c:95
+#: camel/providers/local/camel-local-provider.c:101
 msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr "Simpan status pengepala dalam format Elm/Pine/Mutt"
 
-#: camel/providers/local/camel-local-provider.c:101
+#: camel/providers/local/camel-local-provider.c:108
 msgid "Standard Unix mbox spool or directory"
 msgstr "Spul atau direktori peti mel Unix piawai"
 
-#: camel/providers/local/camel-local-provider.c:102
+#: camel/providers/local/camel-local-provider.c:109
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -10848,99 +10941,102 @@ msgstr ""
 "luaran.\n"
 "Boleh juga digunakan untuk membaca pepohon folder gaya Elm, Pine, atau Mutt."
 
-#: camel/providers/local/camel-local-store.c:142
-#: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:355
-#: camel/providers/local/camel-spool-store.c:116
+#: camel/providers/local/camel-local-store.c:143
+#: camel/providers/local/camel-local-store.c:254
+#: camel/providers/local/camel-mbox-store.c:353
+#: camel/providers/local/camel-spool-store.c:117
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Punca simpanan %s bukan laluan mutlak"
 
-#: camel/providers/local/camel-local-store.c:149
+#: camel/providers/local/camel-local-store.c:150
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Punca simpanan %s bukan direktori biasa"
 
-#: camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-local-store.c:166
-#: camel/providers/local/camel-local-store.c:264
+#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:167
+#: camel/providers/local/camel-local-store.c:265
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Tidak boleh mendapatkan folder: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:178
+#: camel/providers/local/camel-local-store.c:179
 msgid "Local stores do not have an inbox"
 msgstr "Simpanan setempat tidak mempunyai kotak masuk"
 
-#: camel/providers/local/camel-local-store.c:224
+#: camel/providers/local/camel-local-store.c:225
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fail mel setempat %s"
 
-#: camel/providers/local/camel-local-store.c:333
+#: camel/providers/local/camel-local-store.c:334
 #, c-format
 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:398
+#: camel/providers/local/camel-local-store.c:399
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Tidak dapat menamakan semula '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:423
-#: camel/providers/local/camel-mbox-store.c:284
+#: camel/providers/local/camel-local-store.c:424
+#: camel/providers/local/camel-mbox-store.c:282
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Tidak dapat memadam fail ringkasan folder `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:433
-#: camel/providers/local/camel-mbox-store.c:296
+#: camel/providers/local/camel-local-store.c:434
+#: camel/providers/local/camel-mbox-store.c:294
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Tidak dapat memadam fail indeks folder `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:456
-#: camel/providers/local/camel-mbox-store.c:320
+#: camel/providers/local/camel-local-store.c:457
+#: camel/providers/local/camel-mbox-store.c:318
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr "Tidak dapat memadam fail meta folder `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:405
+#: camel/providers/local/camel-local-summary.c:406
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Tidak dapat menyimpan ringkasan: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:464
+#: camel/providers/local/camel-local-summary.c:465
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Tidak dapat menambahkan mesej ke ringkasan: sebab tak diketahui"
 
 #. Inbox is always first
-#: camel/providers/local/camel-maildir-folder.c:74
-#: camel/providers/local/camel-maildir-store.c:232
-#: camel/providers/local/camel-maildir-store.c:248
+#. translators: standard local mailbox names
+#: camel/providers/local/camel-maildir-folder.c:75
+#: camel/providers/local/camel-maildir-store.c:233
+#: camel/providers/local/camel-maildir-store.c:249
+#: camel/providers/local/camel-spool-store.c:452
 #: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+#: mail/mail-component.c:136
 msgid "Inbox"
 msgstr "Kotak masuk"
 
-#: camel/providers/local/camel-maildir-folder.c:214
+#: camel/providers/local/camel-maildir-folder.c:215
 msgid "Maildir append message cancelled"
 msgstr "Mesej tambahan maildir dibatalkan"
 
-#: camel/providers/local/camel-maildir-folder.c:217
+#: camel/providers/local/camel-maildir-folder.c:218
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Tidak dapat menambahkan mesej pada folder maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:243
-#: camel/providers/local/camel-maildir-folder.c:257
-#: camel/providers/local/camel-maildir-folder.c:266
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mbox-folder.c:436
-#: camel/providers/local/camel-mbox-folder.c:467
-#: camel/providers/local/camel-mbox-folder.c:475
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:212
-#: camel/providers/local/camel-mh-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:244
+#: camel/providers/local/camel-maildir-folder.c:258
+#: camel/providers/local/camel-maildir-folder.c:267
+#: camel/providers/local/camel-mbox-folder.c:415
+#: camel/providers/local/camel-mbox-folder.c:434
+#: camel/providers/local/camel-mbox-folder.c:465
+#: camel/providers/local/camel-mbox-folder.c:473
+#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:222
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -10949,118 +11045,118 @@ msgstr ""
 "Tidak boleh mendapatkan mesej: %s dari folder %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:267
+#: camel/providers/local/camel-maildir-folder.c:268
 msgid "Invalid message contents"
 msgstr "Kandungan mesej tak sah"
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:154
-#: camel/providers/local/camel-mh-store.c:204
+#: camel/providers/local/camel-maildir-store.c:110
+#: camel/providers/local/camel-mbox-store.c:152
+#: camel/providers/local/camel-mh-store.c:205
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Tidak dapat peroleh folder '%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mbox-store.c:162
-#: camel/providers/local/camel-mh-store.c:211
+#: camel/providers/local/camel-maildir-store.c:114
+#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mh-store.c:212
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Tidak dapat peroleh folder '%s': folder tidak wujud."
 
-#: camel/providers/local/camel-maildir-store.c:121
-#: camel/providers/local/camel-mbox-store.c:184
-#: camel/providers/local/camel-mbox-store.c:196
+#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-mbox-store.c:182
+#: camel/providers/local/camel-mbox-store.c:194
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Tidak dapat mencipta folder: '%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:136
+#: camel/providers/local/camel-maildir-store.c:137
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Tidak dapat peroleh folder '%s': bukan direktori maildir."
 
-#: camel/providers/local/camel-maildir-store.c:175
-#: camel/providers/local/camel-maildir-store.c:213
-#: camel/providers/local/camel-mh-store.c:260
+#: camel/providers/local/camel-maildir-store.c:176
+#: camel/providers/local/camel-maildir-store.c:214
+#: camel/providers/local/camel-mh-store.c:261
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Tidak dapat memadam folder `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:177
+#: camel/providers/local/camel-maildir-store.c:178
 msgid "not a maildir directory"
 msgstr "Bukan direktori maildir"
 
-#: camel/providers/local/camel-maildir-store.c:355
-#: camel/providers/local/camel-spool-store.c:284
-#: camel/providers/local/camel-spool-store.c:314
+#: camel/providers/local/camel-maildir-store.c:356
+#: camel/providers/local/camel-spool-store.c:319
+#: camel/providers/local/camel-spool-store.c:333
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Tidak dapat mengimbas folder `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:419
-#: camel/providers/local/camel-maildir-summary.c:550
+#: camel/providers/local/camel-maildir-summary.c:420
+#: camel/providers/local/camel-maildir-summary.c:551
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Tidak dapat membuka laluan direktori maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:543
+#: camel/providers/local/camel-maildir-summary.c:544
 msgid "Checking folder consistency"
 msgstr "Menyemak ketekalan folder"
 
-#: camel/providers/local/camel-maildir-summary.c:646
+#: camel/providers/local/camel-maildir-summary.c:647
 msgid "Checking for new messages"
 msgstr "Menyemak mesej baru"
 
-#: camel/providers/local/camel-maildir-summary.c:735
-#: camel/providers/local/camel-mbox-summary.c:369
-#: camel/providers/local/camel-mbox-summary.c:542
-#: camel/providers/local/camel-mbox-summary.c:633
-#: camel/providers/local/camel-spool-summary.c:137
+#: camel/providers/local/camel-maildir-summary.c:736
+#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:543
+#: camel/providers/local/camel-mbox-summary.c:634
+#: camel/providers/local/camel-spool-summary.c:138
 msgid "Storing folder"
 msgstr "Menyimpan folder"
 
-#: camel/providers/local/camel-mbox-folder.c:225
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:223
+#: camel/providers/local/camel-spool-folder.c:176
 #, 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:284
+#: camel/providers/local/camel-mbox-folder.c:282
 #, 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:344
+#: camel/providers/local/camel-mbox-folder.c:342
 msgid "Mail append cancelled"
 msgstr "Tambahan mel dibatalkan"
 
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:345
 #, 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:468
+#: camel/providers/local/camel-mbox-folder.c:466
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Folder rosak dan tidak dapat dipulihkan."
 
-#: camel/providers/local/camel-mbox-folder.c:476
-#: camel/providers/local/camel-mh-folder.c:222
+#: camel/providers/local/camel-mbox-folder.c:474
+#: camel/providers/local/camel-mh-folder.c:223
 msgid "Message construction failed."
 msgstr "Binaan mesej gagal."
 
-#: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:361
+#: camel/providers/local/camel-mbox-store.c:174
+#: camel/providers/local/camel-mbox-store.c:359
 msgid "Cannot create a folder by this name."
 msgstr "Tidak dapat mewujudkan folder dengan nama ini"
 
-#: camel/providers/local/camel-mbox-store.c:206
+#: camel/providers/local/camel-mbox-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': not a regular file."
 msgstr "Tidak dapat peroleh folder '%s': bukan fail biasa."
 
-#: camel/providers/local/camel-mbox-store.c:236
-#: camel/providers/local/camel-mbox-store.c:247
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-mbox-store.c:234
+#: camel/providers/local/camel-mbox-store.c:245
+#: camel/providers/local/camel-mbox-store.c:268
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -11069,157 +11165,157 @@ msgstr ""
 "Tidak dapat memadam folder `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:255
+#: camel/providers/local/camel-mbox-store.c:253
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' bukan fail biasa."
 
-#: camel/providers/local/camel-mbox-store.c:262
+#: camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folder `%s' tidak kosong. Tidak dihapuskan."
 
-#: camel/providers/local/camel-mbox-store.c:374
+#: camel/providers/local/camel-mbox-store.c:372
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Tidak dapat mewujudkan direktori '%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:386
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Tidak boleh mewujudkan folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:390
+#: camel/providers/local/camel-mbox-store.c:388
 msgid "Folder already exists"
 msgstr "Folder telah wujud"
 
-#: camel/providers/local/camel-mbox-store.c:472
+#: camel/providers/local/camel-mbox-store.c:470
 msgid "The new folder name is illegal."
 msgstr "Nama folder baru tidak sah."
 
-#: camel/providers/local/camel-mbox-store.c:485
+#: camel/providers/local/camel-mbox-store.c:483
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Tidak dapat menukarnama '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:560
+#: camel/providers/local/camel-mbox-store.c:558
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Tidak dapat menukarnama '%s' ke %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:375
+#: camel/providers/local/camel-mbox-summary.c:376
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Tidak dapat membuka folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:423
+#: camel/providers/local/camel-mbox-summary.c:424
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Ralat mati penghurai mel berdekatan kedudukan %ld dalam folder %s"
 
-#: camel/providers/local/camel-mbox-summary.c:479
+#: camel/providers/local/camel-mbox-summary.c:480
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Tidak dapat menyemak folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:547
-#: camel/providers/local/camel-mbox-summary.c:638
-#: camel/providers/local/camel-spool-summary.c:142
+#: camel/providers/local/camel-mbox-summary.c:548
+#: camel/providers/local/camel-mbox-summary.c:639
+#: camel/providers/local/camel-spool-summary.c:143
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Tidak dapat membuka fail: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:559
-#: camel/providers/local/camel-spool-summary.c:162
+#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-spool-summary.c:163
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Tidak dapat membuka peti mel sementara: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:572
-#: camel/providers/local/camel-mbox-summary.c:736
+#: camel/providers/local/camel-mbox-summary.c:573
+#: camel/providers/local/camel-mbox-summary.c:737
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Tidak dapat menutup folder sumber %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:581
+#: camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Tidak dapat menutup folder sementara: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592
+#: camel/providers/local/camel-mbox-summary.c:593
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Tidak dapat menamakan semula folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:676
-#: camel/providers/local/camel-mbox-summary.c:684
-#: camel/providers/local/camel-mbox-summary.c:877
-#: camel/providers/local/camel-mbox-summary.c:885
+#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:685
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-mbox-summary.c:886
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Ringkasan dan folder tidak padan, walaupun selepas penyegerakan"
 
-#: camel/providers/local/camel-mbox-summary.c:811
-#: camel/providers/local/camel-spool-summary.c:334
+#: camel/providers/local/camel-mbox-summary.c:812
+#: camel/providers/local/camel-spool-summary.c:335
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ralat tak diketahui: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:846
+#: camel/providers/local/camel-mbox-summary.c:847
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Tidak dapat menyimpan folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:940
-#: camel/providers/local/camel-mbox-summary.c:966
+#: camel/providers/local/camel-mbox-summary.c:941
+#: camel/providers/local/camel-mbox-summary.c:967
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Ralat ketika menulis ke peti mel sementara: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:957
+#: camel/providers/local/camel-mbox-summary.c:958
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Gagal menulis ke peti mel sementara: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:174
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "Mesej tambahan MH dibatalkan"
 
-#: camel/providers/local/camel-mh-folder.c:177
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Tidak dapat menambahkan mesej ke folder mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:219
+#: camel/providers/local/camel-mh-store.c:220
 #, c-format
 msgid "Could not create folder `%s': %s"
 msgstr "Tidak dapat mencipta folder `%s': %s"
 
-#: camel/providers/local/camel-mh-store.c:231
+#: camel/providers/local/camel-mh-store.c:232
 #, c-format
 msgid "Cannot get folder `%s': not a directory."
 msgstr "Tidak dapat peroleh folder '%s': bukan satu direktori"
 
-#: camel/providers/local/camel-mh-summary.c:244
+#: camel/providers/local/camel-mh-summary.c:245
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Tidak dapat membuka laluan direktori MH: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:122
+#: camel/providers/local/camel-spool-store.c:123
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Spul `%s' tidak dapat dibuka: %s"
 
-#: camel/providers/local/camel-spool-store.c:134
+#: camel/providers/local/camel-spool-store.c:135
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "Spul `%s' bukan fail atau direktori biasa"
 
-#: camel/providers/local/camel-spool-store.c:153
+#: camel/providers/local/camel-spool-store.c:154
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Folder `%s/%s' tidak wujud."
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -11228,12 +11324,12 @@ msgstr ""
 "Tidak dapat membuka folder `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-spool-store.c:167
+#: camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Folder `%s' tidak wujud."
 
-#: camel/providers/local/camel-spool-store.c:172
+#: camel/providers/local/camel-spool-store.c:173
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -11242,48 +11338,48 @@ msgstr ""
 "Tidak dapat mewujudkan folder `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-spool-store.c:180
+#: camel/providers/local/camel-spool-store.c:181
 #, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "`%s' bukan fail peti mel."
 
-#: camel/providers/local/camel-spool-store.c:197
+#: camel/providers/local/camel-spool-store.c:198
 msgid "Store does not support an INBOX"
 msgstr "Simpanan tidak menyokong INBOX"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:210
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Fail mel spul %s"
 
-#: camel/providers/local/camel-spool-store.c:209
+#: camel/providers/local/camel-spool-store.c:210
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Pepohon folder spul %s"
 
-#: camel/providers/local/camel-spool-store.c:217
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be renamed"
 msgstr "Folder spul tidak dapat dinamakan semula"
 
-#: camel/providers/local/camel-spool-store.c:225
+#: camel/providers/local/camel-spool-store.c:226
 msgid "Spool folders cannot be deleted"
 msgstr "Folder spul tidak dapat dihapuskan"
 
-#: camel/providers/local/camel-spool-summary.c:175
-#: camel/providers/local/camel-spool-summary.c:185
-#: camel/providers/local/camel-spool-summary.c:195
+#: camel/providers/local/camel-spool-summary.c:176
+#: camel/providers/local/camel-spool-summary.c:186
+#: camel/providers/local/camel-spool-summary.c:196
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Tidak dapat menyegerakkan folder sementara %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:211
+#: camel/providers/local/camel-spool-summary.c:212
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Tidak dapat menyegerakkan folder spul %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:242
-#: camel/providers/local/camel-spool-summary.c:261
-#: camel/providers/local/camel-spool-summary.c:274
+#: camel/providers/local/camel-spool-summary.c:243
+#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:275
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -11293,7 +11389,7 @@ msgstr ""
 "Folder mungkin rosak, salinan disimpan dalam `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:1126
+#: camel/providers/nntp/camel-nntp-store.c:1128
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Sila masukkan kata laluan NNTP bagi %s@%s"
@@ -11310,47 +11406,47 @@ msgstr "Gagal untuk menghantar nama pengguna ke pelayan"
 msgid "Server rejected username/password"
 msgstr "Pelayan menolak nama pengguna/kata laluan"
 
-#: camel/providers/nntp/camel-nntp-folder.c:147
-#: camel/providers/nntp/camel-nntp-folder.c:149
-#: camel/providers/nntp/camel-nntp-folder.c:158
-#: camel/providers/nntp/camel-nntp-folder.c:234
-#: camel/providers/pop3/camel-pop3-folder.c:433
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: camel/providers/pop3/camel-pop3-folder.c:512
+#: camel/providers/nntp/camel-nntp-folder.c:148
+#: camel/providers/nntp/camel-nntp-folder.c:150
+#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/nntp/camel-nntp-folder.c:235
+#: camel/providers/pop3/camel-pop3-folder.c:434
+#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:502
+#: camel/providers/pop3/camel-pop3-folder.c:513
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Tidak boleh mendapatkan mesej %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:156
-#: camel/providers/nntp/camel-nntp-folder.c:232
-#: camel/providers/nntp/camel-nntp-folder.c:371
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
+#: camel/providers/nntp/camel-nntp-folder.c:157
+#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/nntp/camel-nntp-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:263
+#: camel/providers/pop3/camel-pop3-folder.c:431
+#: camel/providers/pop3/camel-pop3-folder.c:492
+#: camel/providers/pop3/camel-pop3-folder.c:510
 msgid "User cancelled"
 msgstr "Pengguna dibatalkan"
 
-#: camel/providers/nntp/camel-nntp-folder.c:176
-#: camel/providers/nntp/camel-nntp-folder.c:208
+#: camel/providers/nntp/camel-nntp-folder.c:177
+#: camel/providers/nntp/camel-nntp-folder.c:209
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Ralat dalaman: uid dalam format tak sah: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:328
-#: camel/providers/nntp/camel-nntp-folder.c:331
-#: camel/providers/nntp/camel-nntp-folder.c:373
-#: camel/providers/nntp/camel-nntp-folder.c:375
+#: camel/providers/nntp/camel-nntp-folder.c:329
+#: camel/providers/nntp/camel-nntp-folder.c:332
+#: camel/providers/nntp/camel-nntp-folder.c:374
+#: camel/providers/nntp/camel-nntp-folder.c:376
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Pengeposan gagal: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:393
+#: camel/providers/nntp/camel-nntp-folder.c:394
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Anda tak boleh mengepos mesej NNTP ketika bekerja luartalian!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:404
+#: camel/providers/nntp/camel-nntp-folder.c:405
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Tidak dapat menyalin mesej ke folder NNTP!"
 
@@ -11369,26 +11465,26 @@ msgstr "Tidak dapat memuatkan fail senarai kumpulan untuk %s: %s"
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Tidak dapat menyimpan fail senarai kumpulan untuk %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:43
+#: camel/providers/nntp/camel-nntp-provider.c:44
 msgid ""
 "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:45
+#: camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription dialog, show relative folder names"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:52
+#: camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "Berita USENET"
 
-#: camel/providers/nntp/camel-nntp-provider.c:54
+#: camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Ini ialah penyedia untuk membaca daripada dan mengirim kepada kumpulan "
 "berita USENET."
 
-#: camel/providers/nntp/camel-nntp-provider.c:73
+#: camel/providers/nntp/camel-nntp-provider.c:74
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -11396,29 +11492,28 @@ msgstr ""
 "Opsyen ini akan disahkan dengan pelayan NNTP dengan menggunakan kata laluan "
 "teks biasa."
 
-#: camel/providers/nntp/camel-nntp-store.c:118
-#: camel/providers/nntp/camel-nntp-store.c:1233
-#: camel/providers/nntp/camel-nntp-store.c:1331
+#: camel/providers/nntp/camel-nntp-store.c:113
+#: camel/providers/nntp/camel-nntp-store.c:1238
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "Arahan NNTP gagal: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:227
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Tidak dapat membaca aluan daripada %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:239
+#: camel/providers/nntp/camel-nntp-store.c:243
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Pelayan NNTP %s mengembalikan kod ralat %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:403
+#: camel/providers/nntp/camel-nntp-store.c:404
 #, c-format
 msgid "USENET News via %s"
 msgstr "Berita USENET melalui %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:777
+#: camel/providers/nntp/camel-nntp-store.c:783
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11428,131 +11523,131 @@ msgstr ""
 "Ralat ketika menyimpan mesej ke: %s:\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:872
+#: camel/providers/nntp/camel-nntp-store.c:877
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:904
+#: camel/providers/nntp/camel-nntp-store.c:909
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:929
+#: camel/providers/nntp/camel-nntp-store.c:934
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:937
+#: camel/providers/nntp/camel-nntp-store.c:942
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Tidak dapat menamakan semula folder %s ke %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:945
+#: camel/providers/nntp/camel-nntp-store.c:950
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Tidak dapat mengalihkan folder ke dalam salah satu turunannya."
 
-#: camel/providers/nntp/camel-nntp-store.c:1118
+#: camel/providers/nntp/camel-nntp-store.c:1120
 #, fuzzy
-msgid "Authentication requested but not username provided"
+msgid "Authentication requested but no username provided"
 msgstr "Pengesahan diperlukan"
 
-#: camel/providers/nntp/camel-nntp-store.c:1146
+#: camel/providers/nntp/camel-nntp-store.c:1150
 #, fuzzy, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "Gagal disahkan pada pelayan POP %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:1262
+#: camel/providers/nntp/camel-nntp-store.c:1267
 #, fuzzy
 msgid "Not connected."
 msgstr "Tiada kenalan"
 
-#: camel/providers/nntp/camel-nntp-store.c:1311
+#: camel/providers/nntp/camel-nntp-store.c:1318
 #, c-format
 msgid "No such folder: %s"
 msgstr "Folder tersebut tidak ada: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:218
-#: camel/providers/nntp/camel-nntp-summary.c:314
+#: camel/providers/nntp/camel-nntp-summary.c:219
+#: camel/providers/nntp/camel-nntp-summary.c:315
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Mengimbas mesej baru"
 
-#: camel/providers/nntp/camel-nntp-summary.c:225
+#: camel/providers/nntp/camel-nntp-summary.c:226
 #, fuzzy, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Maklum balas yang tidak dijangkakan daripada pelayan IMAP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:328
+#: camel/providers/nntp/camel-nntp-summary.c:329
 #, fuzzy, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Maklum balas yang tidak dijangkakan daripada GnuPG: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:368
+#: camel/providers/nntp/camel-nntp-summary.c:369
 msgid "Use cancel"
 msgstr "Penggunaan batal"
 
-#: camel/providers/nntp/camel-nntp-summary.c:370
+#: camel/providers/nntp/camel-nntp-summary.c:371
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Pengendalian gagal: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:246
+#: camel/providers/pop3/camel-pop3-folder.c:247
 msgid "Retrieving POP summary"
 msgstr "Mendapatkan semula ringkasan POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:265
+#: camel/providers/pop3/camel-pop3-folder.c:266
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Tidak boleh mendapatkan ringkasan POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:308
+#: camel/providers/pop3/camel-pop3-folder.c:309
 msgid "Expunging deleted messages"
 msgstr "Membuang mesej yang dihapuskan"
 
-#: camel/providers/pop3/camel-pop3-folder.c:404
+#: camel/providers/pop3/camel-pop3-folder.c:405
 #, c-format
 msgid "No message with uid %s"
 msgstr "Tiada mesej dengan uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:412
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Mendapatkan semula mesej POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1210
-#: composer/e-msg-composer.c:1231
+#: camel/providers/pop3/camel-pop3-folder.c:502 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Sebab tak diketahui"
 
-#: camel/providers/pop3/camel-pop3-provider.c:40
+#: camel/providers/pop3/camel-pop3-provider.c:41
 msgid "Leave messages on server"
 msgstr "Tinggalkan mesej dalam pelayan"
 
-#: camel/providers/pop3/camel-pop3-provider.c:43
+#: camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
 msgid "Delete after %s day(s)"
 msgstr "Hapuskan selepas %s hari"
 
-#: camel/providers/pop3/camel-pop3-provider.c:46
+#: camel/providers/pop3/camel-pop3-provider.c:47
 msgid "Disable support for all POP3 extensions"
 msgstr "Melumpuhkan sokongan untuk semua sambungan POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
+#: camel/providers/pop3/camel-pop3-provider.c:55
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:56
+#: camel/providers/pop3/camel-pop3-provider.c:57
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Untuk disambungkan ke dan memuat turun mel dari pelayan POP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:73
+#: camel/providers/pop3/camel-pop3-provider.c:74
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -11561,7 +11656,7 @@ msgstr ""
 "teks biasa. Ini ialah satu-satunya opsyen yang disokong oleh banyak pelayan "
 "POP."
 
-#: camel/providers/pop3/camel-pop3-provider.c:83
+#: camel/providers/pop3/camel-pop3-provider.c:84
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -11571,30 +11666,30 @@ msgstr ""
 "yang disulitkan melalui protokol APOP. Ini mungkin tidak boleh digunakan "
 "oleh semua pengguna walaupun dalam pelayan yang dikatakan menyokongnya."
 
-#: camel/providers/pop3/camel-pop3-store.c:195
-#, c-format
-msgid "Could not connect to POP server %s (port %d): %s"
-msgstr "Tidak dapat disambungkan ke pelayan POP %s (port %d): %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:214
-#, c-format
-msgid "Failed to read a valid greeting from POP server %s (port %d)"
+#: camel/providers/pop3/camel-pop3-store.c:200
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Gagal membaca ucap selamat yg sah drpd pelayan POP %s: (liang %d)"
 
-#: camel/providers/pop3/camel-pop3-store.c:232
-#: camel/providers/pop3/camel-pop3-store.c:261
-#: camel/providers/pop3/camel-pop3-store.c:273
+#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/pop3/camel-pop3-store.c:230
+#: camel/providers/pop3/camel-pop3-store.c:242
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Gagal disambungkan ke pelayan POP %s dalam mod terjamin: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:371
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy
+msgid "STLS not supported"
+msgstr "Sambungan SSL/TLS tidak disokong."
+
+#: camel/providers/pop3/camel-pop3-store.c:336
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Tidak dapat disambungkan ke pelayan POP %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:412
-#: camel/providers/pop3/camel-pop3-store.c:526
+#: camel/providers/pop3/camel-pop3-store.c:377
+#: camel/providers/pop3/camel-pop3-store.c:491
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11603,29 +11698,29 @@ msgstr ""
 "Tidak dapat disambungkan ke pelayan POP %s: Tiada sokongan bagi mekanisme "
 "pengesahan yang diminta."
 
-#: camel/providers/pop3/camel-pop3-store.c:428
+#: camel/providers/pop3/camel-pop3-store.c:393
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "Log masuk SASL `%s' gagal bagi pelayan POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:405
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 "Tidak dapat mengelog masuk ke dalam pelayan POP %s: ralat Protokol SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:459
+#: camel/providers/pop3/camel-pop3-store.c:424
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Gagal disahkan pada pelayan POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:485
+#: camel/providers/pop3/camel-pop3-store.c:450
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sSila masukkan kata laluan POP bagi %s pada hos %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:540
-#: camel/providers/pop3/camel-pop3-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:505
+#: camel/providers/pop3/camel-pop3-store.c:518
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11634,7 +11729,7 @@ msgstr ""
 "Tidak dapat disambungkan ke pelayan POP %s.\n"
 "Ralat ketika menghantar kata laluan: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:547
+#: camel/providers/pop3/camel-pop3-store.c:512
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11643,17 +11738,16 @@ msgstr ""
 "Tidak dapat menyambung ke pelayan POP %s.\n"
 "Ralat ketika menghantar nama pengguna: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:652
+#: camel/providers/pop3/camel-pop3-store.c:617
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Folder tersebut tidak ada `%s'"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:132
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
 msgid "Sendmail"
 msgstr "Hantar mel"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:38
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
@@ -11661,195 +11755,191 @@ msgstr ""
 "Untuk menyerahkan mel dengan menghantarnya ke atur cara \"hantar mel\" dalam "
 "sistem setempat."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:113
+#: camel/providers/sendmail/camel-sendmail-transport.c:114
 msgid "Could not parse recipient list"
 msgstr "Tidak dapat menghuraikan senarai penerima"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:144
+#: camel/providers/sendmail/camel-sendmail-transport.c:145
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Tidak dapat mewujudkan saluran untuk hantar mel: %s: mel tidak dihantar"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:166
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Tidak dapat memisahkan hantar mel: %s: mel tidak dihantar"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:205
+#: camel/providers/sendmail/camel-sendmail-transport.c:206
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Tidak dapat menghantar mesej: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:233
+#: camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "hantar mel keluar dengan isyarat %s: mel tidak dihantar."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:240
+#: camel/providers/sendmail/camel-sendmail-transport.c:241
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Tidak dapat melaksanakan %s: mel tidak dihantar."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:245
+#: camel/providers/sendmail/camel-sendmail-transport.c:246
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "hantar mel keluar dengan status %d: mel tidak dihantar."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:259
+#: camel/providers/sendmail/camel-sendmail-transport.c:260
 msgid "sendmail"
 msgstr "hantarkan mel"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:261
+#: camel/providers/sendmail/camel-sendmail-transport.c:262
 msgid "Mail delivery via the sendmail program"
 msgstr "Penyerahan mel melalui atur cara hantar mel"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
+#: camel/providers/smtp/camel-smtp-provider.c:38
 msgid "SMTP"
 msgstr "SMTP"
 
-#: camel/providers/smtp/camel-smtp-provider.c:39
+#: camel/providers/smtp/camel-smtp-provider.c:40
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "Untuk menghantar mel dengan disambungkan ke hab mel yang jauh dengan "
 "menggunakan SMTP."
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:163
 msgid "Syntax error, command unrecognized"
 msgstr "Ralat sintaks, arahan tidak dicam"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error in parameters or arguments"
 msgstr "Ralat sintaks dalam parameter atau argumen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Command not implemented"
 msgstr "Arahan tidak dilaksanakan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command parameter not implemented"
 msgstr "Parameter arahan tidak dilaksanakan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:171
 msgid "System status, or system help reply"
 msgstr "Status sistem, atau jawapan bantuan sistem"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Help message"
 msgstr "Mesej bantuan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Service ready"
 msgstr "Khidmat boleh digunakan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Service closing transmission channel"
 msgstr "Khidmat menutup saluran penghantaran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service not available, closing transmission channel"
 msgstr "Khidmat tidak ada, menutup saluran penghantaran"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Requested mail action okay, completed"
 msgstr "Tindakan mel yang diminta okey, siap"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "User not local; will forward to <forward-path>"
 msgstr "Bukan pengguna setempat; akan dihalakan ke <laluan halaan>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Tindakan mel yang diminta tidak dilaksanakan: peti surat tidak ada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Tindakan yang diminta tidak dilaksanakan: peti surat tidak ada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested action aborted: error in processing"
 msgstr "Tindakan yang diminta dihenti paksa: ralat dalam memproses"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "User not local; please try <forward-path>"
 msgstr "Bukan pengguna setempat; sila cuba <laluan halaan>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "Tindakan yang diminta tidak dilaksanakan: storan sistem tidak mencukupi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr "Tindakan mel yang diminta dihenti paksa: melebihi peruntukan storan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "Tindakan yang diminta tidak dilaksanakan: nama peti mel tidak dibenarkan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Mulakan input mel; diakhiri dengan <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Transaction failed"
 msgstr "Urus niaga gagal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "A password transition is needed"
 msgstr "Peralihan kata laluan diperlukan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Authentication mechanism is too weak"
 msgstr "Mekanisme pengesahan terlalu lemah"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Penyulitan diperlukan bagi mekanisme pengesahan yang diminta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Temporary authentication failure"
 msgstr "Kegagalan pengesahan sementara"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Authentication required"
 msgstr "Pengesahan diperlukan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:308
+#: camel/providers/smtp/camel-smtp-transport.c:290
 msgid "Welcome response error"
 msgstr "Ralat maklum balas dibenarkan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:320
+#: camel/providers/smtp/camel-smtp-transport.c:353
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Gagal disambungkan ke pelayan SMTP %s dalam mod terjamin: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:344
-msgid "server does not appear to support SSL"
-msgstr "Pelayan tidak menyokong SSL"
-
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:329
 #, c-format
 msgid "STARTTLS command failed: %s"
 msgstr "Arahan  STATTLS gagal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/smtp/camel-smtp-transport.c:344
 msgid "STARTTLS command failed"
 msgstr "Arahan STARTTLS gagal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/smtp/camel-smtp-transport.c:464
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Pelayan SMTP %s tidak menyokong jenis pengesahan yang diminta %s "
 
-#: camel/providers/smtp/camel-smtp-transport.c:514
+#: camel/providers/smtp/camel-smtp-transport.c:502
 #, c-format
 msgid "%sPlease enter the SMTP password for %s on host %s"
 msgstr "%sSila masukkan kata laluan SMTP bagi %s pada hos %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:533
+#: camel/providers/smtp/camel-smtp-transport.c:521
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -11860,93 +11950,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:657
+#: camel/providers/smtp/camel-smtp-transport.c:645
 #, c-format
 msgid "SMTP server %s"
 msgstr "Pelayan SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:659
+#: camel/providers/smtp/camel-smtp-transport.c:647
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Penghantaran mel SMTP melalui %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:677
+#: camel/providers/smtp/camel-smtp-transport.c:665
 msgid "Cannot send message: service not connected."
 msgstr "Tidak dapat menghantar mesej: servis tak disambung."
 
-#: camel/providers/smtp/camel-smtp-transport.c:683
+#: camel/providers/smtp/camel-smtp-transport.c:671
 msgid "Cannot send message: sender address not valid."
 msgstr "Tidak dapat menghantar mesej: alamat penghantar tak sah."
 
-#: camel/providers/smtp/camel-smtp-transport.c:687
+#: camel/providers/smtp/camel-smtp-transport.c:675
 msgid "Sending message"
 msgstr "Menghantar mesej"
 
-#: camel/providers/smtp/camel-smtp-transport.c:702
+#: camel/providers/smtp/camel-smtp-transport.c:690
 msgid "Cannot send message: no recipients defined."
 msgstr "Tidak dapat menghantar mesej: penerima tidak ditentukan."
 
-#: camel/providers/smtp/camel-smtp-transport.c:713
+#: camel/providers/smtp/camel-smtp-transport.c:701
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Tidak dapat menghantar mesej: satu penerima tak sah atau lebih"
 
-#: camel/providers/smtp/camel-smtp-transport.c:885
+#: camel/providers/smtp/camel-smtp-transport.c:870
 msgid "SMTP Greeting"
 msgstr "Aluan SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:934
+#: camel/providers/smtp/camel-smtp-transport.c:887
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "Arahan HELO gagal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:951
+#: camel/providers/smtp/camel-smtp-transport.c:904
 msgid "HELO command failed"
 msgstr "Arahan HELO gagal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1017
+#: camel/providers/smtp/camel-smtp-transport.c:970
 msgid "SMTP Authentication"
 msgstr "Pengautentikasian SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:976
 msgid "Error creating SASL authentication object."
 msgstr "Ralat ketika mewujudkan objek pengesahan SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1040
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: camel/providers/smtp/camel-smtp-transport.c:993
+#: camel/providers/smtp/camel-smtp-transport.c:1004
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "Arahan AUTH gagal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1057
+#: camel/providers/smtp/camel-smtp-transport.c:1010
 msgid "AUTH command failed"
 msgstr "Arahan AUTH gagal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1119
+#: camel/providers/smtp/camel-smtp-transport.c:1072
 msgid "Bad authentication response from server.\n"
 msgstr "Maklum balas pengesahan rosak daripada pelayan.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1144
+#: camel/providers/smtp/camel-smtp-transport.c:1097
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Arahan MAIL FROM gagal: %s: mel tidak dihantar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1161
+#: camel/providers/smtp/camel-smtp-transport.c:1114
 msgid "MAIL FROM command failed"
 msgstr "Arahan MAIL FROM gagal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1185
+#: camel/providers/smtp/camel-smtp-transport.c:1138
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Arahan RCPT TO gagal: %s: mel tidak dihantar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1204
+#: camel/providers/smtp/camel-smtp-transport.c:1157
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> gagal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1243
-#: camel/providers/smtp/camel-smtp-transport.c:1301
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1196
+#: camel/providers/smtp/camel-smtp-transport.c:1254
+#: camel/providers/smtp/camel-smtp-transport.c:1273
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Arahan DATA gagal: %s: mel tidak dihantar"
@@ -11954,67 +12044,66 @@ msgstr "Arahan DATA gagal: %s: mel tidak dihantar"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1260
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1289
 msgid "DATA command failed"
 msgstr "Arahan DATA gagal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1359
+#: camel/providers/smtp/camel-smtp-transport.c:1312
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "Arahan RSET gagal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1375
+#: camel/providers/smtp/camel-smtp-transport.c:1328
 msgid "RSET command failed"
 msgstr "Arahan RSET gagal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1351
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "Arahan QUIT gagal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1412
+#: camel/providers/smtp/camel-smtp-transport.c:1365
 msgid "QUIT command failed"
 msgstr "Arahan QUIT gagal"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:101
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:107
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:436
+#: composer/e-msg-composer-attachment-bar.c:293 mail/em-utils.c:436
 msgid "attachment"
 msgstr "lampiran"
 
-#: composer/e-msg-composer-attachment-bar.c:454
-msgid "Remove selected items from the attachment list"
-msgstr "Keluarkan item yang dipilih daripada senarai lampiran"
+#: composer/e-msg-composer-attachment-bar.c:441 mail/em-folder-tree.c:2746
+#: ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Ciri-ciri"
 
-#: composer/e-msg-composer-attachment-bar.c:494
-msgid "Add attachment..."
+#: composer/e-msg-composer-attachment-bar.c:443
+#, fuzzy
+msgid "_Add attachment..."
 msgstr "Tambahkan lampiran..."
 
-#: composer/e-msg-composer-attachment-bar.c:495
-msgid "Attach a file to the message"
-msgstr "Lampirkan fail ke mesej"
-
-#: composer/e-msg-composer-attachment.c:173
-#: composer/e-msg-composer-attachment.c:189
+#: composer/e-msg-composer-attachment.c:174
+#: composer/e-msg-composer-attachment.c:190
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Tidak dapat melampirkan fail %s: %s"
 
-#: composer/e-msg-composer-attachment.c:181
+#: composer/e-msg-composer-attachment.c:182
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Tidak dapat melampirkan fail %s: bukan fail biasa"
@@ -12032,20 +12121,20 @@ msgid "MIME type:"
 msgstr "Jenis MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:92
-#: composer/e-msg-composer-select-file.c:111
+#: composer/e-msg-composer-select-file.c:93
+#: composer/e-msg-composer-select-file.c:112
 msgid "Suggest automatic display of attachment"
 msgstr "Cadangkan paparan automatik bagi lampiran"
 
-#: composer/e-msg-composer-hdrs.c:512
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Posting destination"
 msgstr "Destinasi Pengiriman"
 
-#: composer/e-msg-composer-hdrs.c:513
+#: composer/e-msg-composer-hdrs.c:514
 msgid "Choose folders to post the message to."
 msgstr "Pilih folder dimana untuk mengepos mesej."
 
-#: composer/e-msg-composer-hdrs.c:547
+#: composer/e-msg-composer-hdrs.c:548
 msgid "Click here for the address book"
 msgstr "Klik di sini bagi buku alamat"
 
@@ -12056,45 +12145,45 @@ msgstr "Klik di sini bagi buku alamat"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:577
+#: composer/e-msg-composer-hdrs.c:578
 msgid "Reply-To:"
 msgstr "Balas Kepada:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:583
+#: composer/e-msg-composer-hdrs.c:584
 msgid "From:"
 msgstr "Daripada:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:589
+#: composer/e-msg-composer-hdrs.c:590
 msgid "Subject:"
 msgstr "Tajuk:"
 
-#: composer/e-msg-composer-hdrs.c:598
+#: composer/e-msg-composer-hdrs.c:599
 msgid "To:"
 msgstr "Kepada:"
 
-#: composer/e-msg-composer-hdrs.c:599
+#: composer/e-msg-composer-hdrs.c:600
 msgid "Enter the recipients of the message"
 msgstr "Masukkan penerima mesej"
 
-#: composer/e-msg-composer-hdrs.c:602
+#: composer/e-msg-composer-hdrs.c:603
 msgid "Cc:"
 msgstr "Salinan kepada (Sk):"
 
-#: composer/e-msg-composer-hdrs.c:603
+#: composer/e-msg-composer-hdrs.c:604
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Masukkan alamat yang akan menerima salinan mesej"
 
-#: composer/e-msg-composer-hdrs.c:606
+#: composer/e-msg-composer-hdrs.c:607
 msgid "Bcc:"
 msgstr "Salinan tersembunyi (St):"
 
-#: composer/e-msg-composer-hdrs.c:607
+#: composer/e-msg-composer-hdrs.c:608
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -12105,26 +12194,26 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:614
+#: composer/e-msg-composer-hdrs.c:615
 msgid "Post To:"
 msgstr "Kirimkan Kepada:"
 
-#: composer/e-msg-composer-hdrs.c:619
+#: composer/e-msg-composer-hdrs.c:620
 msgid "Click here to select folders to post to"
 msgstr "Klik di sini untuk memilih folder untuk diposkan"
 
-#: composer/e-msg-composer-select-file.c:186
+#: composer/e-msg-composer-select-file.c:187
 msgid "Attach file(s)"
 msgstr "Lampirkan fail"
 
-#: composer/e-msg-composer.c:704
+#: composer/e-msg-composer.c:719
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Tak dapat menandatangani mesej keluaran: Tiada set sijil tandatangan bagi "
 "akaun ini"
 
-#: composer/e-msg-composer.c:711
+#: composer/e-msg-composer.c:726
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -12132,64 +12221,76 @@ msgstr ""
 "Tak dapat mengenkripsikan mesej keluaran: Tiada set sijil tandatangan bagi "
 "akaun ini"
 
-#: composer/e-msg-composer.c:1268
+#: composer/e-msg-composer.c:1283
 msgid "Could not open file"
 msgstr "Tidak dapat membuka fail"
 
-#: composer/e-msg-composer.c:1276
+#: composer/e-msg-composer.c:1291
 msgid "Unable to retrieve message from editor"
 msgstr "Tidak boleh mendapatkan semula mesej daripada editor"
 
-#: composer/e-msg-composer.c:1546
+#: composer/e-msg-composer.c:1561
 msgid "Untitled Message"
 msgstr "Mesej Tak Berjudul"
 
-#: composer/e-msg-composer.c:1576
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Buka fail"
 
-#: composer/e-msg-composer.c:1983 mail/mail-account-gui.c:1491
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1498
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
-#: composer/e-msg-composer.c:2082
+#: composer/e-msg-composer.c:2097
 msgid "Signature:"
 msgstr "Tandatangan:"
 
-#: composer/e-msg-composer.c:2283
+#: composer/e-msg-composer.c:2298
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] ""
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2312
+#: composer/e-msg-composer.c:2327
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2315 composer/e-msg-composer.c:3271
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3421
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer.c:2332 composer/e-msg-composer.c:3163
-#: composer/e-msg-composer.c:3164
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3314
+#: composer/e-msg-composer.c:3315
 msgid "Compose a message"
 msgstr "Gubah mesej"
 
-#: composer/e-msg-composer.c:2634
+#: composer/e-msg-composer.c:2649
 #, c-format
 msgid "Attached message - %s"
 msgstr "Mesej dilampirkan - %s"
 
 #. translators, this count will always be >1
-#: composer/e-msg-composer.c:2639 composer/e-msg-composer.c:2783
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2817
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d mesej yang dilampirkan"
 msgstr[1] "%d mesej yang dilampirkan"
 
-#: composer/e-msg-composer.c:4341
+#: composer/e-msg-composer.c:2880 mail/em-folder-tree.c:1025
+#: mail/em-folder-tree.c:2243 mail/em-folder-view.c:824
+#: mail/message-list.c:1710
+msgid "_Move"
+msgstr "_Alih"
+
+#: composer/e-msg-composer.c:2882 mail/em-folder-tree.c:1027
+#: mail/message-list.c:1712
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Batalkan Tugas"
+
+#: composer/e-msg-composer.c:4492
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -12295,8 +12396,14 @@ msgid ""
 "continue the message at a later date."
 msgstr ""
 
+#: composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "_Discard Changes"
+msgstr "Buang Perubahan"
+
 #: composer/mail-composer-errors.xml.h:34
-msgid "Save Message"
+#, fuzzy
+msgid "_Save Message"
 msgstr "Simpan Mesej"
 
 #. mail-composer:no-build-message primary
@@ -12348,7 +12455,7 @@ msgstr ""
 "\n"
 "Sila pastikan versi gtkhtml dan libgtkhtml yang betul dipasang."
 
-#: data/evolution.desktop.in.in.h:1 shell/main.c:503
+#: data/evolution.desktop.in.in.h:1 shell/main.c:517
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -12483,11 +12590,11 @@ msgstr ""
 msgid "Overwrite file?"
 msgstr "Tulis ganti fail?"
 
-#: e-util/e-passwords.c:463
+#: e-util/e-passwords.c:464
 msgid "_Remember this password"
 msgstr "_Ingat kata laluan ini"
 
-#: e-util/e-passwords.c:464
+#: e-util/e-passwords.c:465
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Ingat kata laluan ini bagi sesi seterusnya"
 
@@ -12717,19 +12824,19 @@ msgid "Choose a file"
 msgstr "Pilih fail"
 
 #: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+#: mail/mail-config.c:76 mail/mail-config.glade.h:88
 msgid "Important"
 msgstr "Penting"
 
 #. forest green
 #: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:135
 msgid "To Do"
 msgstr "Perlu Dibuat"
 
 #. blue
 #: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:91
 msgid "Later"
 msgstr "Selepas itu"
 
@@ -12832,7 +12939,7 @@ msgstr "yang lalu"
 msgid "months"
 msgstr "bulan"
 
-#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:170
 msgid "seconds"
 msgstr "saat"
 
@@ -12904,10 +13011,10 @@ msgstr "Kawalan konfigurasi penggubah Mel Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Kawalan keutamaan Mel Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:419
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:427
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:510
-#: mail/mail-component.c:561
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:524
+#: mail/mail-component.c:575
 msgid "Mail"
 msgstr "Mel"
 
@@ -12915,7 +13022,7 @@ msgstr "Mel"
 msgid "Mail Accounts"
 msgstr "Akaun Mel"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:99
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:93
 msgid "Mail Preferences"
 msgstr "Keutamaan Mel"
 
@@ -12924,47 +13031,47 @@ msgid "_Mail"
 msgstr "_Mel"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:418
+#: mail/em-account-prefs.c:433
 msgid "[Default]"
 msgstr "[Default]"
 
-#: mail/em-account-prefs.c:472
+#: mail/em-account-prefs.c:487
 msgid "Account name"
 msgstr "Nama akaun"
 
-#: mail/em-account-prefs.c:474
+#: mail/em-account-prefs.c:489
 msgid "Protocol"
 msgstr "Protokol"
 
-#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
-#: mail/mail-config.c:1045
+#: mail/em-composer-prefs.c:306 mail/em-composer-prefs.c:425
+#: mail/mail-config.c:1049
 msgid "Unnamed"
 msgstr "Tanpa nama"
 
-#: mail/em-composer-prefs.c:909
+#: mail/em-composer-prefs.c:941
 msgid "Language(s)"
 msgstr "Bahasa"
 
-#: mail/em-composer-prefs.c:955
+#: mail/em-composer-prefs.c:987
 msgid "Add signature script"
 msgstr "Tambah skrip tandatangan"
 
-#: mail/em-composer-prefs.c:975
+#: mail/em-composer-prefs.c:1007
 msgid "Signature(s)"
 msgstr "Tandatangan"
 
-#: mail/em-composer-utils.c:889
+#: mail/em-composer-utils.c:890
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mesej Yang Dimajukan --------"
 
-#: mail/em-composer-utils.c:1502
+#: mail/em-composer-utils.c:1506
 msgid "an unknown sender"
 msgstr "penghantar tak diketahui"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: mail/em-composer-utils.c:1549
+#: mail/em-composer-utils.c:1553
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -12977,7 +13084,7 @@ msgid "_Filter Rules"
 msgstr "Per_aturan Penapis"
 
 #: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
-#: mail/mail-account-gui.c:1347
+#: mail/mail-account-gui.c:1354
 msgid "Select Folder"
 msgstr "Pilih Folder"
 
@@ -13111,7 +13218,7 @@ msgstr "tidak ditandai"
 msgid "Junk Test"
 msgstr "Jun"
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:932
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:961
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Label"
@@ -13150,7 +13257,7 @@ msgstr "Paip ke Program"
 msgid "Play Sound"
 msgstr "Mainkan Bunyi"
 
-#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:80
 msgid "Read"
 msgstr "Baca"
 
@@ -13218,9 +13325,9 @@ msgstr "bermula dengan"
 msgid "Stop Processing"
 msgstr "Hentikan Memproses"
 
-#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1550
-#: mail/em-format-quote.c:305 mail/em-format.c:808 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1569
+#: mail/em-format-quote.c:306 mail/em-format.c:824 mail/em-mailer-prefs.c:88
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:330
 #: smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Tajuk"
@@ -13234,28 +13341,28 @@ msgstr "Batalkan Set Status"
 msgid "<b>Then</b>"
 msgstr "<b>Kemudian</b> "
 
-#: mail/em-folder-browser.c:129
+#: mail/em-folder-browser.c:132
 msgid "Create _Virtual Folder From Search..."
 msgstr "Cipta _Folder Maya Daripada Carian..."
 
-#: mail/em-folder-properties.c:122
-msgid "Folder Properties"
-msgstr "Ciri-ciri Folder"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:161
+#: mail/em-folder-properties.c:142
 msgid "Total message:"
 msgid_plural "Total messages:"
 msgstr[0] "Jumlah mesej:"
 msgstr[1] "Jumlah mesej:"
 
-#: mail/em-folder-properties.c:173
+#: mail/em-folder-properties.c:154
 msgid "Unread message:"
 msgid_plural "Unread messages:"
 msgstr[0] "Mesej belum dibaca:"
 msgstr[1] "Mesej belum dibaca:"
 
-#: mail/em-folder-selection-button.c:120
+#: mail/em-folder-properties.c:268
+msgid "Folder Properties"
+msgstr "Ciri-ciri Folder"
+
+#: mail/em-folder-selection-button.c:121
 msgid "<click here to select a folder>"
 msgstr "<klik di sini untuk memilih folder>"
 
@@ -13263,8 +13370,8 @@ msgstr "<klik di sini untuk memilih folder>"
 msgid "Create New Folder"
 msgstr "Cipta Folder Baru"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2430
-#: mail/mail-component.c:711
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2459
+#: mail/mail-component.c:725
 msgid "Specify where to create the folder:"
 msgstr "Nyatakan di mana folder akan dicipta:"
 
@@ -13286,275 +13393,262 @@ msgstr "VFolder"
 msgid "UNMATCHED"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+#: mail/em-folder-tree-model.c:491 mail/em-folder-tree-model.c:795
 msgid "Loading..."
 msgstr "Sedang memuatkan..."
 
-#: mail/em-folder-tree.c:894
+#: mail/em-folder-tree.c:899
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Mengeluarkan folder %s"
 
-#: mail/em-folder-tree.c:896
+#: mail/em-folder-tree.c:901
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Membuka folder %s"
 
-#: mail/em-folder-tree.c:903 mail/message-list.c:1613
+#: mail/em-folder-tree.c:908 mail/message-list.c:1614
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Mengalihkan mesej ke %s"
 
-#: mail/em-folder-tree.c:905 mail/message-list.c:1615
+#: mail/em-folder-tree.c:910 mail/message-list.c:1616
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Menyalin mesej ke %s"
 
-#: mail/em-folder-tree.c:921
+#: mail/em-folder-tree.c:926
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Tidak dapat menyalin atau mengalihkan mesej ke dalam Folder Maya"
 
-#: mail/em-folder-tree.c:1011 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:1022 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Salin ke Folder"
 
-#: mail/em-folder-tree.c:1012 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:1023 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Alihkan ke Folder"
 
-#: mail/em-folder-tree.c:1014 mail/em-folder-tree.c:2216
-#: mail/em-folder-view.c:803 mail/message-list.c:1703
-msgid "_Move"
-msgstr "_Alih"
-
-#: mail/em-folder-tree.c:1016 mail/message-list.c:1705
-#, fuzzy
-msgid "Cancel _Drag"
-msgstr "Batalkan Tugas"
+#: mail/em-folder-tree.c:1722 mail/mail-ops.c:1014
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "Mengimbas folder dalam \"%s\""
 
-#: mail/em-folder-tree.c:2203 mail/em-folder-tree.c:2216
-#: mail/em-folder-view.c:803 mail/em-folder-view.c:817
-#: mail/importers/evolution-mbox-importer.c:119
-#: mail/importers/evolution-outlook-importer.c:133
+#: mail/em-folder-tree.c:2229 mail/em-folder-tree.c:2243
+#: mail/em-folder-view.c:824 mail/em-folder-view.c:839
+#: mail/importers/evolution-mbox-importer.c:120
+#: mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "Pilih folder"
 
-#: mail/em-folder-tree.c:2203 mail/em-folder-view.c:817
+#: mail/em-folder-tree.c:2229 mail/em-folder-view.c:839
 #, fuzzy
 msgid "C_opy"
 msgstr "Salin"
 
-#: mail/em-folder-tree.c:2243
+#: mail/em-folder-tree.c:2270
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Menyimpan folder '%s'"
 
-#: mail/em-folder-tree.c:2430 mail/mail-component.c:711
+#: mail/em-folder-tree.c:2459 mail/mail-component.c:725
 msgid "Create folder"
 msgstr "Cipta folder"
 
-#: mail/em-folder-tree.c:2621
+#: mail/em-folder-tree.c:2652
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Namakan semula folder \"%s\" kepada:"
 
-#: mail/em-folder-tree.c:2623
+#: mail/em-folder-tree.c:2654
 msgid "Rename Folder"
 msgstr "Namakan semula Folder"
 
-#: mail/em-folder-tree.c:2698 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2730 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Lihat"
 
-#: mail/em-folder-tree.c:2699
+#: mail/em-folder-tree.c:2731
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Buka dalam Tetingkap _Baru"
 
-#: mail/em-folder-tree.c:2703
+#: mail/em-folder-tree.c:2735
 msgid "_Copy..."
 msgstr "_Salin..."
 
-#: mail/em-folder-tree.c:2704
+#: mail/em-folder-tree.c:2736
 msgid "_Move..."
 msgstr "_Alihkan..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2708
+#: mail/em-folder-tree.c:2740
 msgid "_New Folder..."
 msgstr "_Folder Baru..."
 
-#: mail/em-folder-tree.c:2711
+#: mail/em-folder-tree.c:2743
 msgid "_Rename..."
 msgstr "_Namakan semula..."
 
-#: mail/em-folder-tree.c:2714 ui/evolution-mail-list.xml.h:27
-#, fuzzy
-msgid "_Properties"
-msgstr "Ciri-ciri"
-
-#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:900 mail/em-popup.c:690
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:929 ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Edit sebagai Mesej Baru..."
 
-#: mail/em-folder-view.c:902
+#: mail/em-folder-view.c:931
 msgid "_Print"
 msgstr "_Cetak"
 
-#: mail/em-folder-view.c:905 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:934 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Balas kepada Penghantar"
 
-#: mail/em-folder-view.c:906 mail/em-popup.c:811
+#: mail/em-folder-view.c:935 mail/em-popup.c:500
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Balas kepada _Senarai"
 
-#: mail/em-folder-view.c:907 mail/em-popup.c:812
+#: mail/em-folder-view.c:936 mail/em-popup.c:501
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Balas kepada _Semua"
 
-#: mail/em-folder-view.c:908 mail/em-popup.c:814
+#: mail/em-folder-view.c:937 mail/em-popup.c:503
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Sampaikan"
 
-#: mail/em-folder-view.c:911
+#: mail/em-folder-view.c:940
 msgid "Follo_w Up..."
 msgstr "Susu_lan..."
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:941
 msgid "Fla_g Completed"
 msgstr "Bendera Siap Ditunjukkan"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:942
 msgid "Cl_ear Flag"
 msgstr "Ko_songkan Bendera"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:945 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Tanda_kan sebagai Telah Dibaca"
 
-#: mail/em-folder-view.c:917
+#: mail/em-folder-view.c:946
 msgid "Mark as _Unread"
 msgstr "Tandakan sebagai _Belum Dibaca"
 
-#: mail/em-folder-view.c:918
+#: mail/em-folder-view.c:947
 msgid "Mark as _Important"
 msgstr "Tandakan sebagai _Penting"
 
-#: mail/em-folder-view.c:919
+#: mail/em-folder-view.c:948
 msgid "_Mark as Unimportant"
 msgstr "_Tandakan sebagai Tidak Penting"
 
-#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:949 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Tandakan sebagai _Belum Dibaca"
 
-#: mail/em-folder-view.c:921 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:950 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Tandakan sebagai _Penting"
 
-#: mail/em-folder-view.c:925
+#: mail/em-folder-view.c:954
 msgid "U_ndelete"
 msgstr "Batalkan hapus"
 
-#: mail/em-folder-view.c:928
+#: mail/em-folder-view.c:957
 msgid "Mo_ve to Folder..."
 msgstr "Alih_kan ke Folder..."
 
-#: mail/em-folder-view.c:929 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:958 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Salin ke Folder..."
 
-#: mail/em-folder-view.c:937
+#: mail/em-folder-view.c:966
 msgid "Add Sender to Address_book"
 msgstr "Tambahkan Penghantar ke Buku_Alamat"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:969
 msgid "Appl_y Filters"
 msgstr "Gunak_an Penapis"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:970
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Peraturan Penapis"
 
-#: mail/em-folder-view.c:944
+#: mail/em-folder-view.c:973
 msgid "Crea_te Rule From Message"
 msgstr "Wujud_kan Peraturan Daripada Mesej"
 
-#: mail/em-folder-view.c:945
+#: mail/em-folder-view.c:974
 msgid "VFolder on _Subject"
 msgstr "VFolder bagi _Tajuk"
 
-#: mail/em-folder-view.c:946
+#: mail/em-folder-view.c:975
 msgid "VFolder on Se_nder"
 msgstr "VFolder bagi Pen_ghantar"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:976
 msgid "VFolder on _Recipients"
 msgstr "VFolder bagi _Penerima"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:977
 msgid "VFolder on Mailing _List"
 msgstr "VFolder bagi Senarai _Mel"
 
-#: mail/em-folder-view.c:952
+#: mail/em-folder-view.c:981
 msgid "Filter on Sub_ject"
 msgstr "Penapis bagi Ta_juk"
 
-#: mail/em-folder-view.c:953
+#: mail/em-folder-view.c:982
 msgid "Filter on Sen_der"
 msgstr "Penapis bagi Peng_hantar"
 
-#: mail/em-folder-view.c:954
+#: mail/em-folder-view.c:983
 msgid "Filter on Re_cipients"
 msgstr "Penapis bagi Pe_nerima"
 
-#: mail/em-folder-view.c:955
+#: mail/em-folder-view.c:984
 msgid "Filter on _Mailing List"
 msgstr "Penapis bagi _Senarai Mel"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1711 mail/em-folder-view.c:1751
-#: mail/mail-config.glade.h:68
+#: mail/em-folder-view.c:1754 mail/em-folder-view.c:1797
 msgid "Default"
 msgstr "Piawai"
 
-#: mail/em-folder-view.c:1848
+#: mail/em-folder-view.c:1894
 msgid "Print Message"
 msgstr "Cetak Mesej"
 
-#: mail/em-folder-view.c:2115
+#: mail/em-folder-view.c:2161
 msgid "_Copy Link Location"
 msgstr "_Salin Lokasi Pautan"
 
-#: mail/em-folder-view.c:2380
+#: mail/em-folder-view.c:2426
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Klik untuk menambahkan tugas"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:410
+#: mail/em-format-html-display.c:405
 #, c-format
 msgid "Matches: %d"
 msgstr "Padanan: %d"
 
-#: mail/em-format-html-display.c:643 mail/em-format-html.c:582
+#: mail/em-format-html-display.c:638 mail/em-format-html.c:580
 #, fuzzy
 msgid "Unsigned"
 msgstr "Diumpukkan"
 
-#: mail/em-format-html-display.c:643
+#: mail/em-format-html-display.c:638
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13562,12 +13656,12 @@ msgid ""
 msgstr ""
 "Mesej ini ditandatangani secara digital dan tidak dapat dibuktikan sah."
 
-#: mail/em-format-html-display.c:644 mail/em-format-html.c:583
+#: mail/em-format-html-display.c:639 mail/em-format-html.c:581
 #, fuzzy
 msgid "Valid signature"
 msgstr "Tandatangan buruk"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:639
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13575,22 +13669,22 @@ msgid ""
 msgstr ""
 "Mesej ini ditandatangani secara digital dan tidak dapat dibuktikan sah."
 
-#: mail/em-format-html-display.c:645 mail/em-format-html.c:584
+#: mail/em-format-html-display.c:640 mail/em-format-html.c:582
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Tandatangan buruk"
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:641
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:641
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -13599,81 +13693,81 @@ msgstr ""
 "Token_input mengandungi tandatangan tak sah, atau tandatangan yang tidak "
 "dapat disah betul."
 
-#: mail/em-format-html-display.c:652 mail/em-format-html.c:591
+#: mail/em-format-html-display.c:647 mail/em-format-html.c:589
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Disampuk"
 
-#: mail/em-format-html-display.c:652
+#: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:653 mail/em-format-html.c:592
+#: mail/em-format-html-display.c:648 mail/em-format-html.c:590
 #, fuzzy
 msgid "Encrypted, weak"
 msgstr "Kandungan badan indeks"
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:648
 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:654 mail/em-format-html.c:593
+#: mail/em-format-html-display.c:649 mail/em-format-html.c:591
 #, fuzzy
 msgid "Encrypted"
 msgstr "Penyulitan PGP"
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:649
 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:655 mail/em-format-html.c:594
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:592
 #, fuzzy
 msgid "Encrypted, strong"
 msgstr "Kandungan badan indeks"
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:650
 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:756 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:751 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "Sijil"
 
-#: mail/em-format-html-display.c:771
+#: mail/em-format-html-display.c:766
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Sijil masih belum sah"
 
-#: mail/em-format-html-display.c:1006
+#: mail/em-format-html-display.c:999
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "oleh %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1014
+#: mail/em-format-html-display.c:1007
 msgid "Overdue:"
 msgstr "Terlewat"
 
-#: mail/em-format-html-display.c:1017
+#: mail/em-format-html-display.c:1010
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "oleh %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1056
+#: mail/em-format-html-display.c:1057
 msgid "_View Inline"
 msgstr "_Lihat Dalam Talian"
 
-#: mail/em-format-html-display.c:1057
+#: mail/em-format-html-display.c:1058
 msgid "_Hide"
 msgstr "_Sembunyikan"
 
@@ -13682,150 +13776,150 @@ msgstr "_Sembunyikan"
 msgid "Page %d of %d"
 msgstr "Halaman %d daripada %d"
 
-#: mail/em-format-html.c:475 mail/em-format-html.c:477
+#: mail/em-format-html.c:473 mail/em-format-html.c:475
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Mendapatkan semula %s"
 
-#: mail/em-format-html.c:585
+#: mail/em-format-html.c:583
 msgid "Valid signature but cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html.c:848
+#: mail/em-format-html.c:869
 msgid "Malformed external-body part."
 msgstr "Bahagian badan luaran tidak sempurna."
 
-#: mail/em-format-html.c:878
+#: mail/em-format-html.c:899
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Penuding ke tapak FTP (%s)"
 
-#: mail/em-format-html.c:889
+#: mail/em-format-html.c:910
 #, 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:891
+#: mail/em-format-html.c:912
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Penuding ke fail setempat (%s)"
 
-#: mail/em-format-html.c:912
+#: mail/em-format-html.c:933
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Penuding ke data jauh (%s)"
 
-#: mail/em-format-html.c:923
+#: mail/em-format-html.c:944
 #, 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:1165
+#: mail/em-format-html.c:1184
 msgid "Formatting message"
 msgstr "Memformat mesej"
 
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:803
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
+#: mail/em-format-html.c:1460 mail/em-format-quote.c:193 mail/em-format.c:819
+#: mail/em-mailer-prefs.c:83 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:326
 msgid "From"
 msgstr "Daripada"
 
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:804
-#: mail/em-mailer-prefs.c:83
+#: mail/em-format-html.c:1460 mail/em-format-quote.c:193 mail/em-format.c:820
+#: mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Balas Kepada"
 
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:805
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1460 mail/em-format-quote.c:193 mail/em-format.c:821
+#: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kepada"
 
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:806
-#: mail/em-mailer-prefs.c:85
+#: mail/em-format-html.c:1460 mail/em-format-quote.c:193 mail/em-format.c:822
+#: mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Sk"
 
-#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:807
-#: mail/em-mailer-prefs.c:86
+#: mail/em-format-html.c:1460 mail/em-format-quote.c:193 mail/em-format.c:823
+#: mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "St"
 
 #. pseudo-header
-#: mail/em-format-html.c:1554 mail/em-format-quote.c:314
-#: mail/em-mailer-prefs.c:939
+#: mail/em-format-html.c:1573 mail/em-format-quote.c:315
+#: mail/em-mailer-prefs.c:976
 msgid "Mailer"
 msgstr "Pengemel"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1581
+#: mail/em-format-html.c:1600
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1584
+#: mail/em-format-html.c:1603
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1594 mail/em-format-quote.c:321 mail/em-format.c:809
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1613 mail/em-format-quote.c:322 mail/em-format.c:825
+#: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarikh"
 
-#: mail/em-format-html.c:1617 mail/em-format.c:810 mail/em-mailer-prefs.c:89
+#: mail/em-format-html.c:1636 mail/em-format.c:826 mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format.c:1059
+#: mail/em-format.c:1075
 #, c-format
 msgid "%s attachment"
 msgstr "lampiran %s"
 
-#: mail/em-format.c:1098 mail/em-format.c:1231
+#: mail/em-format.c:1114 mail/em-format.c:1247
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Tidak dapat menghuraikan mesej S/MIME. Ralat tak diketahui."
 
-#: mail/em-format.c:1221
+#: mail/em-format.c:1237
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1382
+#: mail/em-format.c:1398
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Tidak dapat menghuraikan mesej MIME. Dipaparkan sebagai sumber."
 
-#: mail/em-format.c:1401
+#: mail/em-format.c:1417
 msgid "Unsupported signature format"
 msgstr "Format tandatangan yang tidak disokong"
 
-#: mail/em-format.c:1409
+#: mail/em-format.c:1425
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Tidak dapat mengesah betul tandatangan dedaun"
 
-#: mail/em-format.c:1409
+#: mail/em-format.c:1425
 #, fuzzy
 msgid "Unknown error verifying signature"
 msgstr "Tidak dapat mengesah betul tandatangan dedaun"
 
-#: mail/em-junk-filter.c:86
+#: mail/em-junk-filter.c:87
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:100
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Every time"
 msgstr "Setiap tahun"
 
-#: mail/em-mailer-prefs.c:101
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per day"
 msgstr "_Satu hari"
 
-#: mail/em-mailer-prefs.c:102
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per week"
 msgstr "Satu m_inggu"
 
-#: mail/em-mailer-prefs.c:103
+#: mail/em-mailer-prefs.c:104
 #, fuzzy
 msgid "Once per month"
 msgstr "Satu bul_an"
@@ -13888,63 +13982,63 @@ msgid ""
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:700
+#: mail/em-popup.c:384
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
-#: mail/em-popup.c:718
+#: mail/em-popup.c:403
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Mesej Tak Berjudul"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:497
 msgid "Set as _Background"
 msgstr "Set sebagai _Latar belakang"
 
-#: mail/em-popup.c:810
+#: mail/em-popup.c:499
 msgid "_Reply to sender"
 msgstr "_Balas kepada penghantar"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:551
 msgid "_Open Link in Browser"
 msgstr "_Buka Pautan dalam Pelayar"
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:552
 msgid "Se_nd message to..."
 msgstr "Ha_ntar mesej ke..."
 
-#: mail/em-popup.c:861
+#: mail/em-popup.c:553
 msgid "_Add to Addressbook"
 msgstr "_Tambah ke Buku Alamat"
 
-#: mail/em-popup.c:985
+#: mail/em-popup.c:684
 #, c-format
 msgid "Open in %s..."
 msgstr "Buka dalam %s..."
 
-#: mail/em-subscribe-editor.c:606
+#: mail/em-subscribe-editor.c:613
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Stor ini tidak menyokong langganan, atau ia tidak diaktifkan."
 
-#: mail/em-subscribe-editor.c:635
+#: mail/em-subscribe-editor.c:642
 msgid "Subscribed"
 msgstr "Dilanggan"
 
-#: mail/em-subscribe-editor.c:639
+#: mail/em-subscribe-editor.c:646
 msgid "Folder"
 msgstr "Folder"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:852
+#: mail/em-subscribe-editor.c:861
 msgid "Please select a server."
 msgstr "Sila pilih pelayan."
 
-#: mail/em-subscribe-editor.c:873
+#: mail/em-subscribe-editor.c:882
 msgid "No server has been selected"
 msgstr "Pelayan tidak dipilih"
 
-#: mail/em-utils.c:104
+#: mail/em-utils.c:105
 msgid "Don't show this message again."
 msgstr "Jangan tunjukkan mesej ini lagi."
 
@@ -13976,10 +14070,6 @@ msgstr "Mel dari %s"
 msgid "Virtual _Folders"
 msgstr "Folder Maya"
 
-#: mail/em-vfolder-rule.c:494
-msgid "_Add"
-msgstr "_Tambah"
-
 #: mail/em-vfolder-rule.c:574
 msgid "VFolder source"
 msgstr "Sumber VFolder"
@@ -14307,15 +14397,6 @@ msgstr ""
 msgid "Show deleted messages in the message-list"
 msgstr "Tunjukkan mesej dalam gaya normal"
 
-#: mail/evolution-mail.schemas.in.in.h:71
-#, fuzzy
-msgid "Show the \"Preview\" pane"
-msgstr "_Pralihat Anak Tetingkap"
-
-#: mail/evolution-mail.schemas.in.in.h:72
-msgid "Show the \"Preview\" pane."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "Sound file to play when new mail arrives."
@@ -14509,15 +14590,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution sedang mengimport mel Elm lama anda"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:224
-#: mail/importers/evolution-outlook-importer.c:258
+#: mail/importers/evolution-mbox-importer.c:225
+#: mail/importers/evolution-outlook-importer.c:259
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Sedang mengimport..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:226
-#: mail/importers/evolution-outlook-importer.c:260
+#: mail/importers/evolution-mbox-importer.c:227
+#: mail/importers/evolution-outlook-importer.c:261
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Sila tunggu"
@@ -14539,32 +14620,32 @@ msgstr ""
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/evolution-mbox-importer.c:116
-#: mail/importers/evolution-outlook-importer.c:130
+#: mail/importers/evolution-mbox-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:131
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Hapuskan folder ini"
 
-#: mail/importers/evolution-mbox-importer.c:119
-#: mail/importers/evolution-outlook-importer.c:133
+#: mail/importers/evolution-mbox-importer.c:120
+#: mail/importers/evolution-outlook-importer.c:134
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Pilih pengimport"
 
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:256
-#: mail/importers/mail-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
+#: mail/importers/mail-importer.c:227
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Mengimport"
 
-#: mail/importers/evolution-outlook-importer.c:304
-#: mail/importers/mail-importer.c:140
+#: mail/importers/evolution-outlook-importer.c:305
+#: mail/importers/mail-importer.c:141
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Mengimport Fail"
 
-#: mail/importers/mail-importer.c:361
+#: mail/importers/mail-importer.c:362
 #, c-format
 msgid "Scanning %s"
 msgstr "Mengimbas %s"
@@ -14678,11 +14759,11 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:155
+#: mail/mail-account-editor.c:156
 msgid "Evolution Account Editor"
 msgstr "Editor Akaun Evolution"
 
-#: mail/mail-account-gui.c:246
+#: mail/mail-account-gui.c:253
 #, c-format
 msgid ""
 "\n"
@@ -14691,23 +14772,27 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr ""
 
-#: mail/mail-account-gui.c:252
+#: mail/mail-account-gui.c:259
 #, c-format
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
+#: mail/mail-account-gui.c:964 mail/mail-config.glade.h:154
 msgid "_Host:"
 msgstr "_Hos:"
 
-#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
+#: mail/mail-account-gui.c:968 mail/mail-config.glade.h:138
 msgid "User_name:"
 msgstr "Nama_pengguna:"
 
-#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
+#: mail/mail-account-gui.c:972 mail/mail-config.glade.h:160
 msgid "_Path:"
 msgstr "_Laluan:"
 
+#: mail/mail-account-gui.c:1783 shell/e-shell-importer.c:643
+msgid "Select a file"
+msgstr "Pilih fail"
+
 #: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
@@ -14732,92 +14817,106 @@ msgstr "%s senarai mel"
 msgid "Add Filter Rule"
 msgstr "Tambahkan Peraturan Penapis"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:137
+#, fuzzy
+msgid "Drafts"
+msgstr "Draf"
+
+#: mail/mail-component.c:138
+msgid "Outbox"
+msgstr ""
+
+#: mail/mail-component.c:139
+#, fuzzy
+msgid "Sent"
+msgstr "Kirim"
+
+#: mail/mail-component.c:477
 #, fuzzy, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "Dihapuskan"
 msgstr[1] "Dihapuskan"
 
-#: mail/mail-component.c:465
+#: mail/mail-component.c:479
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:502
 #, fuzzy, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "Draf"
 msgstr[1] "Draf"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:504
 #, fuzzy, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "Tarikh dihantar"
 msgstr[1] "Tarikh dihantar"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:506
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:510
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-component.c:498
+#: mail/mail-component.c:512
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:677
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Mesej Mel Baru"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:678
 msgid "_Mail Message"
 msgstr "_Mesej Mel"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:679
 msgid "Compose a new mail message"
 msgstr "Gubah mesej mel baru"
 
-#: mail/mail-component.c:671
+#: mail/mail-component.c:685
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "VFolder Baru"
 
-#: mail/mail-component.c:672
+#: mail/mail-component.c:686
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Penapis Mel"
 
-#: mail/mail-component.c:673
+#: mail/mail-component.c:687
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Cipta kalendar baru"
 
-#: mail/mail-component.c:805
+#: mail/mail-component.c:819
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
+#: mail/mail-config-druid.c:363 mail/mail-config.glade.h:87
 msgid "Identity"
 msgstr "Pengenalan"
 
-#: mail/mail-config-druid.c:364
+#: mail/mail-config-druid.c:365 mail/mail-config.glade.h:103
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14827,12 +14926,11 @@ msgstr ""
 "bawah tidak perlu diisi, melainkan anda ingin memasukkan maklumat ini dalam "
 "e-mel yang anda hantar."
 
-#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:119
+#: mail/mail-config-druid.c:371 mail/mail-config-druid.c:378
 msgid "Receiving Mail"
 msgstr "Menerima Mel"
 
-#: mail/mail-config-druid.c:372
+#: mail/mail-config-druid.c:373
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -14840,15 +14938,15 @@ msgstr ""
 "Sila masukkan maklumat tentang pelayan mel masuk anda di bawah. Jika anda "
 "tidak pasti, tanya pentadbir sistem anda atau Penyedia Khidmat Internet."
 
-#: mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:104
 msgid "Please select among the following options"
 msgstr "Sila pilih opsyen berikut"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
+#: mail/mail-config-druid.c:383 mail/mail-config.glade.h:120
 msgid "Sending Mail"
 msgstr "Menghantar Mel"
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:385 mail/mail-config.glade.h:102
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14856,11 +14954,11 @@ msgstr ""
 "Sila masukkan maklumat tentang cara anda menghantar mel. Jika anda tidak "
 "pasti, tanya pentadbir sistem anda atau Penyedia Khidmat Internet."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
+#: mail/mail-config-druid.c:390 mail/mail-config.glade.h:36
 msgid "Account Management"
 msgstr "Pengurusan Akaun"
 
-#: mail/mail-config-druid.c:391
+#: mail/mail-config-druid.c:392 mail/mail-config.glade.h:144
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -14878,7 +14976,11 @@ msgstr ""
 msgid "Checking Service"
 msgstr "Menyemak Khidmat"
 
-#: mail/mail-config.c:973 mail/mail-config.c:977
+#. FIXME: make this use e-error.
+#. * It has to be modal otherwise we can get nasty re-entrancy whilst waiting for the
+#. * subthread to complete.
+#. * FIXME: make this whole function async to deal with this issue
+#: mail/mail-config.c:977 mail/mail-config.c:981
 msgid "Connecting to server..."
 msgstr "Sedang disambungkan ke pelayan..."
 
@@ -14928,210 +15030,191 @@ msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:13
-#, fuzzy
-msgid "<span weight=\"bold\">Checking for New Mail</span>"
-msgstr "Menyemak Mel Baru"
-
-#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 #, fuzzy
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "Mesej untuk Dipaparkan:"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Pemberitahuan Mel Baru"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Opsyen</span>"
 
-#: mail/mail-config.glade.h:28
-#, fuzzy
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr "Kebersendirian Agak Baik (PGP/GPG)"
+msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Font Cetakan</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Required Information</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Maklumat Diperlukan</span>"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">MIME Selamat (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Security</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Sekuriti</span>"
 
-#: mail/mail-config.glade.h:33
-#, fuzzy
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "Mesej Dihantar dan Didraf"
+msgstr "<span weight=\"bold\">Mesej Dihantar dan Draf</span>"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Konfigurasi Pelayan</span>"
 
-#: mail/mail-config.glade.h:35
-#, fuzzy
+#: mail/mail-config.glade.h:34
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
-"S_entiasa sulitkan kepada saya sendiri semasa menghantar mel yang disulitkan"
+"_Juga enkripsikan kepada saya sendiri semasa menghantar mel yang "
+"dienkripsikan"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:35
 msgid "Account Editor"
 msgstr "Editor Akaun"
 
-#: mail/mail-config.glade.h:38
-#, fuzzy
+#: mail/mail-config.glade.h:37
 msgid "Add Ne_w Signature..."
-msgstr "Tambahkan tandatangan baru..."
+msgstr "Tambahkan Tandatangan Ba_ru..."
 
-#: mail/mail-config.glade.h:39
-#, fuzzy
+#: mail/mail-config.glade.h:38
 msgid "Add _Script"
-msgstr "Tambahkan Sk_rip"
+msgstr "Tambahkan _Skrip"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
-"Sen_tiasa sulitkan kepada saya sendiri semasa menghantar mel yang disulitkan"
+"_Sentiasa enkripsikan kepada diri sendiri semasa menghantar mel yang "
+"dienkripsikan"
 
-#: mail/mail-config.glade.h:41
-#, fuzzy
+#: mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Sentiasa buat _salinan (Sk) kepada:"
+msgstr "Sentiasa buat _salinan (cc) kepada:"
 
-#: mail/mail-config.glade.h:43
-#, fuzzy
+#: mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Sentiasa buat _salinan tersembunyi (St) kepada:"
+msgstr "Sentiasa buat salinan _tersembunyi (bcc) kepada:"
 
-#: mail/mail-config.glade.h:44
-#, fuzzy
+#: mail/mail-config.glade.h:42
 msgid "Always _sign outgoing messages when using this account"
-msgstr "_Sentiasa tandatangan mesej keluar apabila menggunakan akaun ini"
+msgstr "Sentiasa _tandatangan mesej keluaran apabila menggunakan akaun ini"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
-msgstr "Sentiasa _tekan kekunci dalam gelang kekunci saya semasa menyulitkan"
+msgstr "Sentiasa _percaya kekunci pada keyring saya semasa pengenkripsian"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Lampirkan mesej asal"
 
-#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Lampiran"
 
-#: mail/mail-config.glade.h:48
-#, fuzzy
+#: mail/mail-config.glade.h:46
 msgid "Automatically _insert smiley images"
-msgstr "_Secara automatik sisipkan imej smiley"
-
-#: mail/mail-config.glade.h:49
-#, fuzzy
-msgid "Automatically check for _new mail every"
-msgstr "_Secara automatik semak mel baru setiap"
+msgstr "_Secara automatik sisipkan imej ikon emosi"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltik (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltik (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:52
-#, fuzzy
+#: mail/mail-config.glade.h:49
 msgid "Beep w_hen new mail arrives"
-msgstr "_Bunyi bip apabila ada mesej baru"
+msgstr "_Bunyi bip apabila mel baru tiba"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:50
 msgid "C_haracter set:"
 msgstr "S_et aksara:"
 
-#: mail/mail-config.glade.h:54
-#, fuzzy
+#: mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
-msgstr "_Semak jenis sokongan "
+msgstr "_Semak Jenis Sokongan "
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Check _incoming mail for junk"
 msgstr "Menyemak Mel Baru"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "Semak ejaan sambil saya _menaip"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
 msgid "Color for _misspelled words:"
 msgstr "Warna bagi _kata yang salah eja:"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Colors"
 msgstr "W_arna"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "_Sahkan apabila membuang folder"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15147,121 +15230,113 @@ msgstr ""
 "\n"
 "Klik \"Guna\" untuk menyimpan seting anda."
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:64
 msgid "De_fault"
 msgstr "Pia_wai"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:65
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Pengekodan aksara _piawai:"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Defaults"
 msgstr "_Piawai"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:68
 msgid "Do not quote original message"
 msgstr "Jangan petik mesej asal"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:69
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Jangan tandatangani _permintaan mesyuarat (bagi keserasian Outlook)"
 
-#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:70 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Selesai"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "Folder _draf:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:73
 msgid "Email Accounts"
 msgstr "Akaun E-mel"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "Email _Address:"
 msgstr "Alamat _e-mel:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "Kosongkan _folder sampah apabila keluar"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "Sijil Kenalan"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:77
 msgid "Evolution Account Assistant"
 msgstr "Pembantu Akaun Evolution"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:78
 msgid "Execute Command..."
 msgstr "Laksanakan Arahan..."
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Le_bar -tetap:"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:80
 msgid "Font Properties"
 msgstr "Ciri-ciri Fon"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:81
 msgid "Format messages in _HTML"
 msgstr "Formatkan mesej dalam _HTML"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "HTML Mail"
 msgstr "_Mel HTML"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Headers"
 msgstr "Pengepala"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:85
 msgid "Highlight _quotations with"
 msgstr "Tonjolkan _petikan dengan"
 
-#: mail/mail-config.glade.h:90
-msgid "IMAPv4 "
-msgstr "IMAPv4"
-
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:86
 #, fuzzy
 msgid "I_nclude remote tests"
 msgstr "Termasuk:"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:89
 msgid "Inline"
 msgstr "Dalam Talian"
 
-#: mail/mail-config.glade.h:96
-msgid "Kerberos "
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:92
 msgid "Mail Configuration"
 msgstr "Konfigurasi Mel"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:94
 msgid "Mailbox location"
 msgstr "Lokasi peti mel"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:95
 msgid "Message Composer"
 msgstr "Penggubah Mesej"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:96
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -15269,145 +15344,131 @@ msgstr ""
 "Nota: anda tidak akan digesa untuk memberikan kata laluan sehinggalah anda "
 "disambungkan buat pertama kali"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:97
 msgid "Or_ganization:"
 msgstr "Or_ganisasi:"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:98
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _ID Kekunci:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Mainkan fail bunyi apabila ada mel baru"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:105
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Penggesa apabila menghantar mesej dengan hanya penerima St ditentukan"
 
-#: mail/mail-config.glade.h:113
-msgid "Qmail maildir "
-msgstr "Dirmel Qmail "
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:106
 msgid "Quote original message"
 msgstr "Petik mesej asal"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:107
 msgid "Quoted"
 msgstr "Dipetik"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:108
 #, fuzzy
 msgid "Re_member password"
 msgstr "Ingat kata laluan ini"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:109
 msgid "Re_ply-To:"
 msgstr "Jawapan Kepada:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:110
 msgid "Receiving Email"
 msgstr "Menerima E-mel"
 
-#: mail/mail-config.glade.h:120
-#, fuzzy
-msgid "Receiving Options"
-msgstr "Menerima _Opsyen"
-
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Remember _password"
 msgstr "Ingat kata laluan ini"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "_Fon Piawai:"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Security"
 msgstr "_Keselamatan"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:114
 msgid "Select HTML fixed width font"
 msgstr "Pilih fon lebar tetap HTML"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:115
 msgid "Select HTML fixed width font for printing"
 msgstr "Pilih fon lebar tetap HTML untuk pencetakan"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:116
 msgid "Select HTML variable width font"
 msgstr "Pilih fon lebar pemboleh ubah HTML"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:117
 msgid "Select HTML variable width font for printing"
 msgstr "Pilih fon lebar pemboleh ubah HTML untuk pencetakan"
 
-#: mail/mail-config.glade.h:129
-#, fuzzy
+#: mail/mail-config.glade.h:118
 msgid "Select..."
-msgstr "_Hapuskan..."
+msgstr "Pilih..."
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:119
 msgid "Sending Email"
 msgstr "Menghantar E-mel"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Folder _mesej Dihantar:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:122
 msgid "Ser_ver requires authentication"
 msgstr "Pe_layan memerlukan pengesahan"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:123
 msgid "Server _Type: "
 msgstr "Jenis _Pelayan:"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Sijil tandatangan tidak dijumpai"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:125
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Tandatangan:"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:126
 #, fuzzy
 msgid "Signatures"
 msgstr "_Tandatangan"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:127
 msgid "Specify _filename:"
 msgstr "Tetapkan _nama fail:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Spell Checking"
 msgstr "Semak _Ejaan"
 
-#: mail/mail-config.glade.h:141
-msgid "Standard Unix mbox"
-msgstr "Peti mel Unix piawai"
-
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "_Fon Terminal:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "T_ype: "
 msgstr "Jenis:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:131
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15417,7 +15478,7 @@ msgstr ""
 "anda. Nama yang anda tetapkan akan digunakan\n"
 "untuk tujuan paparan sahaja. "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:134
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15427,7 +15488,7 @@ msgstr ""
 "semakan ejaan. Senarai bahasa di sini hanya menunjukkan bahasa yang terdapat "
 "dalam kamus yang telah dimasukkan."
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:136
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15435,11 +15496,11 @@ msgstr ""
 "Taip nama yang ingin anda gunakan bagi akaun ini.\n"
 "Contohnya: \"Kerja\" or \"Peribadi\""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:139
 msgid "V_ariable-width:"
 msgstr "L_ebar Pemboleh ubah:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:140
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15449,89 +15510,84 @@ msgstr ""
 "\n"
 "Klik \"Sampaikan\" untuk bermula. "
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:145
 msgid "_Add Signature"
 msgstr "_Tambahkan Tandatangan"
 
-#: mail/mail-config.glade.h:159
-#, fuzzy
+#: mail/mail-config.glade.h:146
 msgid "_Always load images from the Internet"
-msgstr "_Sentiasa muatkan imej daripada internet"
+msgstr "_Sentiasa muatkan imej daripada Internet"
 
-#: mail/mail-config.glade.h:160
-#, fuzzy
+#: mail/mail-config.glade.h:147
 msgid "_Digitally sign outgoing messages (by default)"
-msgstr "_Sentiasa tandatangan mesej keluar apabila menggunakan akaun ini"
+msgstr "_Tandatangan digital mesej keluaran (secara default)"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:148
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Jangan beritahu saya apabila ada mel baru"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:150
 msgid "_Enable"
 msgstr "_Bolehkan"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:151
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:152
 msgid "_Forward style:"
 msgstr "_Gaya untuk menyampaikan:"
 
-#: mail/mail-config.glade.h:168
-#, fuzzy
+#: mail/mail-config.glade.h:155
 msgid "_Load images if sender is in address book"
 msgstr "_Muatkan imej jika penghantar ada dalam buku alamat"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:156
 msgid "_Make this my default account"
 msgstr "_Jadikan ini akaun piawai saya"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:157
 msgid "_Mark messages as read after"
 msgstr "_Tandakan mesej sebagai telah dibaca selepas"
 
-#: mail/mail-config.glade.h:172
-#, fuzzy
+#: mail/mail-config.glade.h:159
 msgid "_Never load images from the Internet"
-msgstr "_Jangan muatkan imej daripada internet"
+msgstr "_Jangan muatkan imej daripada Internet"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:161
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
-"_Penggesa apabila menghantar mesej HTML kepada kenalan yang tidak mahukannya"
+"_Maklum apabila menghantar mesej HTML kepada kenalan yang tidak mahukannya"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:162
 msgid "_Prompt when sending messages with an empty subject line"
-msgstr "_Penggesa tapabila menghantar mesej tanpa tajuk"
+msgstr "_Maklum apabila menghantar mesej tanpa tajuk"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:163
 msgid "_Reply style:"
 msgstr "_Gaya Balasan:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:164
 msgid "_Script:"
 msgstr "_Skrip:"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:165
 msgid "_Show animated images"
-msgstr "_Tunjukkan imej animasi"
+msgstr "_Papar imej animasi"
 
-#: mail/mail-config.glade.h:179
-#, fuzzy
-msgid "_Use Secure Connection (SSL):"
-msgstr "_Gunakan sambungan terjamin (SSL):"
+#: mail/mail-config.glade.h:166
+msgid "_Use Secure Connection:"
+msgstr "_Gunakan Sambungan Selamat:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:167
 msgid "_Use the same fonts as other applications"
 msgstr "_Gunakan fon yang sama seperti aplikasi lain"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:168
 msgid "color"
 msgstr "warna"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:169
 msgid "description"
 msgstr "huraian"
 
@@ -15541,24 +15597,25 @@ msgid ""
 " Please read carefully the license agreement displayed\n"
 " below and tick the check box for accepting it\n"
 msgstr ""
+"\n"
+" Sila baca lesen persetujuan yang dipaparkan\n"
+" di bawah dan tanda kekotak semak untuk menerimanya\n"
 
 #: mail/mail-dialogs.glade.h:7
-#, fuzzy
 msgid "<b>vFolder Sources</b>"
-msgstr "Sumber vFolder"
+msgstr "<b>Sumber vFolder</b>"
 
 #: mail/mail-dialogs.glade.h:8
 msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Tandatangan Digital</span>"
 
 #: mail/mail-dialogs.glade.h:9
 msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">Pengenkripsian</span>"
 
 #: mail/mail-dialogs.glade.h:10
-#, fuzzy
 msgid "Accept License"
-msgstr "Diterima"
+msgstr "Terima Lesen"
 
 #: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
 msgid "C_ompleted"
@@ -15566,7 +15623,7 @@ msgstr "S_elesai"
 
 #: mail/mail-dialogs.glade.h:12
 msgid "Case Sensitive"
-msgstr "Peka Huruf"
+msgstr "Peka Huruf Besar/Kecil"
 
 #: mail/mail-dialogs.glade.h:14
 msgid "Find in Message"
@@ -15576,7 +15633,7 @@ msgstr "Cari dalam Mesej"
 msgid "Find:"
 msgstr "Cari:"
 
-#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:295
 #: mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Tandakan untuk membuat Susulan"
@@ -15587,7 +15644,7 @@ msgstr "Langganan Folder"
 
 #: mail/mail-dialogs.glade.h:18
 msgid "License Agreement"
-msgstr ""
+msgstr "Persetujuan Lesen"
 
 #: mail/mail-dialogs.glade.h:19
 msgid "None Selected"
@@ -15598,9 +15655,8 @@ msgid "S_erver:"
 msgstr "P_elayan:"
 
 #: mail/mail-dialogs.glade.h:21
-#, fuzzy
 msgid "Security Information"
-msgstr "Maklumat Akaun"
+msgstr "Maklumat Keselamatan"
 
 #: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
 msgid ""
@@ -15611,18 +15667,16 @@ msgstr ""
 "Sila pilih tindakan susulan daripada menu \"Bendera\"."
 
 #: mail/mail-dialogs.glade.h:25
-#, fuzzy
 msgid "Tick this to accept the license agreement"
-msgstr "Akaun Mel"
+msgstr "Tanda sini untuk menerima persetujuan lesen"
 
 #: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
-#, fuzzy
 msgid "_Due By:"
 msgstr "_Genap tempoh pada:"
 
 #: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
 msgid "_Flag:"
-msgstr "_Bendera:"
+msgstr "_Tanda:"
 
 #: mail/mail-dialogs.glade.h:28
 msgid "_Subscribe"
@@ -15650,22 +15704,22 @@ msgstr "dengan semua folder setempat"
 
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
-#, fuzzy
 msgid "Invalid authentication"
-msgstr "Pengesahan"
+msgstr "Auntentikasi tidak sah"
 
 #. mail:camel-service-auth-invalid secondary
 #: mail/mail-errors.xml.h:4
-#, fuzzy
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
-msgstr "Pelayan SMTP %s tidak menyokong jenis pengesahan yang diminta %s "
+msgstr ""
+"Pelayan ini tak menyokong jenis autentikasi ini dan mungkin tak menyokong "
+"autentikasi "
 
 #. mail:camel-service-auth-failed primary
 #: mail/mail-errors.xml.h:6
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr ""
+msgstr "Logmasuk anda ke pelayan anda \"{0}\" sebagai \"{0}\" gagal."
 
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
@@ -15800,10 +15854,10 @@ msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
-"Keluarkan secara kekal semua mesej yang dihapuskan daripada semua folder"
+"Anda pasti untuk membuangkan semua mesej dipadam pada semua folder secara "
+"kekal?"
 
 #: mail/mail-errors.xml.h:51
-#, fuzzy
 msgid "_Empty Trash"
 msgstr "Kosongkan _Sampah"
 
@@ -15941,21 +15995,18 @@ msgstr ""
 
 #. mail:no-rename-special-folder primary
 #: mail/mail-errors.xml.h:118
-#, fuzzy
 msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Tidak dapat menamakan semula folder: %s: Folder tersebut tidak ada"
+msgstr "Tidak dapat menukarnama atau memindah folder \"{0}\"."
 
 #. mail:ask-delete-folder title
 #: mail/mail-errors.xml.h:122
-#, fuzzy
 msgid "Delete \"{0}\"?"
-msgstr "Hapuskan \"%s\""
+msgstr "Padam \"{0}\"?"
 
 #. mail:ask-delete-folder primary
 #: mail/mail-errors.xml.h:124
-#, fuzzy
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Anda pasti ingin memadam folder \"%s\" dan semua subfolder dalamnya?"
+msgstr "Anda pasti ingin memadam folder \"{0}%\" dan semua subfolder dalamnya?"
 
 #. mail:ask-delete-folder secondary
 #: mail/mail-errors.xml.h:126
@@ -15963,72 +16014,65 @@ msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr ""
+"Jika anda memadam folder, semua kandungannya dan kandungan subfoldernya akan "
+"dipadam secara kekal."
 
 #. mail:no-rename-folder-exists primary
 #. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
-#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "Tidak dapat mengalihkan folder: %s"
+msgstr "Tidak dapat menukarnama  \"{0}\" kepada \"{1}\"."
 
 #. mail:no-rename-folder-exists secondary
 #. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
-#, fuzzy
 msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Folder bernama \"%s\" telah wujud. Sila gunakan nama yang lain."
+msgstr "Folder bernama \"{1}\" telah wujud. Sila gunakan nama yang lain."
 
 #. mail:no-rename-folder secondary
 #: mail/mail-errors.xml.h:134
 msgid "Because \"{2}\"."
-msgstr ""
+msgstr "Kerana \"{2}\"."
 
 #. mail:no-move-folder-nostore primary
 #. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
-#, fuzzy
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Tidak dapat mengalihkan folder: %s"
+msgstr "Tidak dapat memindah folder \"{0}\" ke \"{1}\""
 
 #. mail:no-move-folder-nostore secondary
 #. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
-#, fuzzy
 msgid "Cannot open source \"{2}\"."
-msgstr "Tidak dapat membuka folder sumber: %s"
+msgstr "Tidak dapat membuka sumber \"{2}\"."
 
 #. mail:no-move-folder-to-nostore secondary
 #. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
-#, fuzzy
 msgid "Cannot open target \"{2}\"."
-msgstr "Tidak dapat membuka mesej"
+msgstr "Tidak dapat membuka sasaran \"{2}\"."
 
 #. mail:no-copy-folder-nostore primary
 #. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
-#, fuzzy
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Tidak dapat menyalin folder: %s"
+msgstr "Tidak dapat menyalin folder \"{0}\" ke \"{1}\""
 
 #. mail:no-create-folder-nostore primary
 #: mail/mail-errors.xml.h:152
-#, fuzzy
 msgid "Cannot create folder \"{0}\"."
-msgstr "Tidak boleh mewujudkan folder: %s: %s"
+msgstr "Tidak dapat mencipta folder \"{0}\"."
 
 #. mail:no-create-folder-nostore secondary
 #: mail/mail-errors.xml.h:154
-#, fuzzy
 msgid "Cannot open source \"{1}\""
-msgstr "Tidak dapat membuka folder sumber: %s"
+msgstr "Tidak dapat membuka sumber \"{1}\""
 
 #. mail:account-incomplete primary
 #. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
-#, fuzzy
 msgid "Cannot save changes to account."
-msgstr "dan satu kenalan lain."
+msgstr "Tak dapat menyimpan perubahan ke akaun.."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -16042,9 +16086,8 @@ msgstr "Anda tidak boleh mewujudkan dua akaun dengan nama yang sama."
 
 #. mail:ask-delete-account title
 #: mail/mail-errors.xml.h:164
-#, fuzzy
 msgid "Delete account?"
-msgstr "Hapuskan kenalan yang dipilih"
+msgstr "Padam Akaun?"
 
 #. mail:ask-delete-account primary
 #: mail/mail-errors.xml.h:166
@@ -16054,55 +16097,46 @@ msgstr "Adakah anda pasti ingin memadam akaun ini?"
 #. mail:ask-delete-account secondary
 #: mail/mail-errors.xml.h:168
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
+msgstr "Jika anda teruskan, maklumat akaun akan dipadam secara kekal."
 
 #: mail/mail-errors.xml.h:169
-#, fuzzy
 msgid "Don't delete"
-msgstr "_Batalkan hapus"
+msgstr "Jangan padam"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
-#, fuzzy
 msgid "Could not save signature file."
-msgstr "Tidak dapat menyimpan fail tandatangan: %s"
+msgstr "Tidak dapat menyimpan fail tandatangan."
 
 #. mail:no-save-signature secondary
 #: mail/mail-errors.xml.h:173
 msgid "Because \"{0}\"."
-msgstr ""
+msgstr "Kerana \"{0}\"."
 
 #. mail:signature-notscript primary
 #: mail/mail-errors.xml.h:175
-#, fuzzy
 msgid "Cannot set signature script \"{0}\"."
-msgstr "_Tambahkan Tandatangan"
+msgstr "Tak dapat menetapkan skrip tandatangan \"{0}\"."
 
 #. mail:signature-notscript secondary
 #: mail/mail-errors.xml.h:177
 msgid "The script file must exist and be executable."
-msgstr ""
+msgstr "Fail skrip mesti wujud dan boleh dilaksanakan."
 
 #. mail:ask-signature-changed title
 #: mail/mail-errors.xml.h:179
-#, fuzzy
 msgid "Discard changed?"
-msgstr "_Buang perubahan"
+msgstr "Buang perubahan?"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
-#, fuzzy
 msgid "Do you wish to save your changes?"
 msgstr "Adakah anda ingin menyimpan perubahan?"
 
 #. mail:ask-signature-changed secondary
 #: mail/mail-errors.xml.h:183
-#, fuzzy
 msgid "This signature has been changed, but has not been saved."
-msgstr ""
-"Tandatangan ini telah diubah tetapi tidak disimpan.\n"
-"\n"
-"Adakah anda ingin menyimpan perubahan yang dilakukan?"
+msgstr "Tandatangan ini telah diubah tetapi tidak disimpan."
 
 #: mail/mail-errors.xml.h:184
 msgid "_Discard changes"
@@ -16110,9 +16144,8 @@ msgstr "_Buang perubahan"
 
 #. mail:vfolder-notexist primary
 #: mail/mail-errors.xml.h:186
-#, fuzzy
 msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Folder `%s' tidak wujud."
+msgstr "Tak dapat edit vFolder \"{0}\" tidak wujud."
 
 #. mail:vfolder-notexist secondary
 #: mail/mail-errors.xml.h:188
@@ -16123,20 +16156,16 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
-#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
-msgstr ""
-"Tidak dapat memadam folder:\n"
-"%s"
+msgstr "Tidak dapat menambah vFolder \"{0}\"."
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
 msgid "vFolders automatically updated."
-msgstr ""
+msgstr "vFolder telah dikemaskini secara auomatik."
 
 #. mail:vfolder-updated secondary
 #: mail/mail-errors.xml.h:196
-#, fuzzy
 msgid ""
 "The following vFolder(s):\n"
 "{0}\n"
@@ -16145,18 +16174,18 @@ msgid ""
 "And have been updated."
 msgstr ""
 "VFolder berikut:\n"
-"%sMenggunakan folder yang dikeluarkan:\n"
-"    '%s'\n"
+"{0}\n"
+"Menggunakan folder yang dibuang:\n"
+"    \"{1}\"\n"
 "Dan telah dikemaskinikan."
 
 #. mail:filter-updated primary
 #: mail/mail-errors.xml.h:202
 msgid "Mail filters automatically updated."
-msgstr ""
+msgstr "Penapis emel telah dikemasikini secara automatik."
 
 #. mail:filter-updated secondary
 #: mail/mail-errors.xml.h:204
-#, fuzzy
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -16164,16 +16193,16 @@ msgid ""
 "    \"{1}\"\n"
 "And have been updated."
 msgstr ""
-"VFolder berikut:\n"
-"%sMenggunakan folder yang dikeluarkan:\n"
-"    '%s'\n"
+"Aturan penapis berikut:\n"
+"{0}\n"
+"sMenggunakan folder yang dibuang:\n"
+"    \"{1}\"\n"
 "Dan telah dikemaskinikan."
 
 #. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
-#, fuzzy
 msgid "Missing folder."
-msgstr "Mengeluarkan folder %s"
+msgstr "Kehilangan folder."
 
 #. mail:no-folder secondary
 #: mail/mail-errors.xml.h:212
@@ -16182,15 +16211,13 @@ msgstr "Anda mestilah menetapkan folder."
 
 #. mail:no-name-vfolder secondary
 #: mail/mail-errors.xml.h:216
-#, fuzzy
 msgid "You must name this vFolder."
-msgstr "Anda mestilah menamakan vfolder ini."
+msgstr "Anda mestilah menamakan vFolder ini."
 
 #. mail:vfolder-no-source primary
 #: mail/mail-errors.xml.h:218
-#, fuzzy
 msgid "No sources selected."
-msgstr "Pelayan tidak dipilih"
+msgstr "Tiada sumber dipilih."
 
 #. mail:vfolder-no-source secondary
 #: mail/mail-errors.xml.h:220
@@ -16199,11 +16226,14 @@ msgid ""
 "Either by selecting the folders individually, and/or by selecting\n"
 "all local folders, all remote folders, or both."
 msgstr ""
+"Anda mesti nyatakan sekurang-kurang satu  folder sebagai sumber.\n"
+"Samada dengan memilih folder secara individu dan/ataudengan memilih\n"
+"semua folder setempat, semua folder jauh, atau kedua-duannya."
 
 #. mail:ask-migrate-existing primary
 #: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
-msgstr ""
+msgstr "Masalah memigrasikan folder mel lama \"{0}\"."
 
 #. mail:ask-migrate-existing secondary
 #: mail/mail-errors.xml.h:226
@@ -16213,54 +16243,78 @@ msgid ""
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit.\n"
 msgstr ""
+"Folder bukan kosong pada \"{1}\" sudah wujud.\n"
+"\n"
+"Anda boleh memilih untuk mengabaikan folder ini, append, tindih "
+"kandungannya, atau keluar.\n"
 
 #: mail/mail-errors.xml.h:230
 msgid "Ignore"
-msgstr ""
+msgstr "Abai"
 
 #: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
-#, fuzzy
 msgid "_Overwrite"
-msgstr "Tulis ganti"
+msgstr "_Tindih"
 
 #: mail/mail-errors.xml.h:232
-#, fuzzy
 msgid "_Append"
-msgstr "Aspen"
+msgstr "_Append"
 
-#. mail:gw-accountsetup-error primary
+#. mail:no-load-license primary
 #: mail/mail-errors.xml.h:234
+msgid "Unable to read license file."
+msgstr "Tidak dapat membaca fail lesen."
+
+#. mail:no-load-license secondary
+#: mail/mail-errors.xml.h:236
+msgid ""
+"Cannot read the license file \"{0}\", due to an\n"
+"      installation problem.  You will not be able to use this provider "
+"until\n"
+"      you can accept its license."
+msgstr ""
+"Tak dapat membaca fail lesen \"{0}\", kerana\n"
+"      masalah pemasangan.  Anda tak boleh menggunakan pembekal ini "
+"sehingga \n"
+"      anda boleh menerima lesennya."
+
+#. mail:gw-accountsetup-error primary
+#: mail/mail-errors.xml.h:240
 msgid ""
 "Unable to connect to the GroupWise\n"
 "server."
 msgstr ""
+"Tak dapat menyambung ke pelayan\n"
+"GroupWise."
 
 #. mail:gw-accountsetup-error secondary
-#: mail/mail-errors.xml.h:237
+#: mail/mail-errors.xml.h:243
 msgid ""
 "\n"
 "Please check your account settings and try again.\n"
 msgstr ""
+"\n"
+"Sila periksa tetapan akaun anda dan cuba lagi.\n"
 
-#: mail/mail-folder-cache.c:795
+#: mail/mail-folder-cache.c:807
 #, c-format
 msgid "Pinging %s"
-msgstr "%s berdenting"
+msgstr "Mengping %s"
 
-#: mail/mail-ops.c:98
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Menapis Folder"
 
-#: mail/mail-ops.c:259
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Mengambil Mel"
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:554
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Gagal menggunakan penapis luaran: %s"
 
-#: mail/mail-ops.c:567
+#: mail/mail-ops.c:579
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16269,115 +16323,110 @@ msgstr ""
 "Gagal untuk menambah ke %s: %s\n"
 "Sebagai ganti menambah ke folder 'Hantar' setempat."
 
-#: mail/mail-ops.c:576
+#: mail/mail-ops.c:588
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Gagal untuk menambah ke folder 'Hantar' setempat: %s"
 
-#: mail/mail-ops.c:672
+#: mail/mail-ops.c:684
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Menghantar mesej %d daripada %d"
 
-#: mail/mail-ops.c:703
-#, fuzzy, c-format
+#: mail/mail-ops.c:715
+#, c-format
 msgid "Failed to send %d of %d messages"
-msgstr "Gagal menyahkod mesej."
+msgstr "Gagal menghantar %d drpd %d mesej"
 
-#: mail/mail-ops.c:707
+#: mail/mail-ops.c:719
 msgid "Complete."
 msgstr "Selesai."
 
-#: mail/mail-ops.c:804
+#: mail/mail-ops.c:816
 msgid "Saving message to folder"
 msgstr "Menyimpan mesej ke folder"
 
-#: mail/mail-ops.c:889
+#: mail/mail-ops.c:901
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mengalihkan mesej ke %s"
 
-#: mail/mail-ops.c:889
+#: mail/mail-ops.c:901
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Menyalin mesej ke %s"
 
-#: mail/mail-ops.c:1002
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Mengimbas folder dalam \"%s\""
-
-#: mail/mail-ops.c:1115
+#: mail/mail-ops.c:1127
 msgid "Forwarded messages"
 msgstr "Mesej yang disampaikan"
 
-#: mail/mail-ops.c:1158
+#: mail/mail-ops.c:1170
 #, c-format
 msgid "Opening folder %s"
 msgstr "Membuka folder %s"
 
-#: mail/mail-ops.c:1230
+#: mail/mail-ops.c:1242
 #, c-format
 msgid "Opening store %s"
 msgstr "Membuka simpanan %s"
 
-#: mail/mail-ops.c:1308
+#: mail/mail-ops.c:1320
 #, c-format
 msgid "Removing folder %s"
 msgstr "Mengeluarkan folder %s"
 
-#: mail/mail-ops.c:1402
+#: mail/mail-ops.c:1414
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Menyimpan folder '%s'"
 
-#: mail/mail-ops.c:1467
+#: mail/mail-ops.c:1479
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1468
-#, fuzzy, c-format
+#: mail/mail-ops.c:1480
+#, c-format
 msgid "Storing account '%s'"
-msgstr "Menyimpan folder '%s'"
+msgstr "Menyimpan akaun '%s'"
 
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1535
 msgid "Refreshing folder"
 msgstr "Memuatkan semula folder"
 
-#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
+#: mail/mail-ops.c:1571 mail/mail-ops.c:1622
 msgid "Expunging folder"
 msgstr "Membuang folder"
 
-#: mail/mail-ops.c:1607
+#: mail/mail-ops.c:1619
 #, c-format
 msgid "Emptying trash in '%s'"
-msgstr "Mengosongkan tong sampah dalam '%s'"
+msgstr "Mengosongkan sampah pada '%s'"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1620
 msgid "Local Folders"
 msgstr "Folder Setempat"
 
-#: mail/mail-ops.c:1691
+#: mail/mail-ops.c:1703
 #, c-format
 msgid "Retrieving message %s"
-msgstr "Mendapatkan semula mesej %s"
+msgstr "Memperoleh mesej %s"
 
-#: mail/mail-ops.c:1763
-#, fuzzy, c-format
+#: mail/mail-ops.c:1775
+#, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
-msgstr[0] "Mendapatkan semula mesej %s"
-msgstr[1] "Mendapatkan semula mesej %s"
+msgstr[0] "Memperoleh %d mesej"
+msgstr[1] "Memperoleh %d mesej"
 
-#: mail/mail-ops.c:1849
-#, fuzzy, c-format
+#: mail/mail-ops.c:1861
+#, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
-msgstr[0] "Menghantar mesej"
-msgstr[1] "Menghantar mesej"
+msgstr[0] "Menyimpan %d mesej"
+msgstr[1] "Menyimpan %d mesej"
 
-#: mail/mail-ops.c:1899
+#: mail/mail-ops.c:1911
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16386,7 +16435,7 @@ msgstr ""
 "Tidak dapat mewujudkan fail output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1927
+#: mail/mail-ops.c:1939
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16395,11 +16444,11 @@ msgstr ""
 "Ralat ketika menyimpan mesej ke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:2010
 msgid "Saving attachment"
 msgstr "Menyimpan lampiran"
 
-#: mail/mail-ops.c:2010
+#: mail/mail-ops.c:2022
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16408,68 +16457,68 @@ msgstr ""
 "Tidak dapat mewujudkan fail output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2020
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: mail/mail-ops.c:2168
+#: mail/mail-ops.c:2180
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Terputus daripada %s"
 
-#: mail/mail-ops.c:2168
+#: mail/mail-ops.c:2180
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Disambungkan semula ke %s"
 
-#: mail/mail-send-recv.c:157
+#: mail/mail-send-recv.c:158
 msgid "Cancelling..."
 msgstr "Sedang membatalkan..."
 
-#: mail/mail-send-recv.c:264
+#: mail/mail-send-recv.c:265
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Pelayan: %s, Jenis: %s"
 
-#: mail/mail-send-recv.c:266
+#: mail/mail-send-recv.c:267
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Laluan: %s, Jenis: %s"
 
-#: mail/mail-send-recv.c:268
+#: mail/mail-send-recv.c:269
 #, c-format
 msgid "Type: %s"
 msgstr "Jenis: %s"
 
-#: mail/mail-send-recv.c:320
+#: mail/mail-send-recv.c:321
 msgid "Send & Receive Mail"
-msgstr "Hantarkan dan Terima Mel"
+msgstr "Hantar dan Terima Mel"
 
-#: mail/mail-send-recv.c:323
+#: mail/mail-send-recv.c:324
 msgid "Cancel _All"
 msgstr "Batalkan _Semua"
 
-#: mail/mail-send-recv.c:412
+#: mail/mail-send-recv.c:413
 msgid "Updating..."
-msgstr "Sedang mengemaskinikan..."
+msgstr "Mengemaskini..."
 
-#: mail/mail-send-recv.c:412 mail/mail-send-recv.c:466
+#: mail/mail-send-recv.c:413 mail/mail-send-recv.c:467
 msgid "Waiting..."
-msgstr "Sedang menunggu..."
+msgstr "Menunggu..."
 
-#: mail/mail-session.c:207
+#: mail/mail-session.c:208
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Masukkan Kata Laluan bagi %s"
 
-#: mail/mail-session.c:209
+#: mail/mail-session.c:210
 msgid "Enter Password"
 msgstr "Masukkan Kata Laluan"
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
-msgstr "Pengguna membatalkan pengendalian."
+msgstr "Operasi dibatalkan oleh pengguna."
 
 #: mail/mail-signature-editor.c:371
 msgid "Edit signature"
@@ -16483,46 +16532,44 @@ msgstr "Masukkan nama bagi tandatangan ini."
 msgid "Name:"
 msgstr "Nama:"
 
-#: mail/mail-tools.c:114
-#, fuzzy, c-format
+#: mail/mail-tools.c:115
+#, c-format
 msgid "Could not create spool directory `%s': %s"
-msgstr ""
-"Tidak dapat mewujudkan direktori '%s':\n"
-"%s"
+msgstr "Tidak dapat mencipta direktori spul '%s':%s"
 
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:142
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr ""
+msgstr "Cuba movemail sumber bukan-mbox '%s'"
 
-#: mail/mail-tools.c:276
+#: mail/mail-tools.c:277
 #, c-format
 msgid "Forwarded message - %s"
-msgstr "Mesej yang disampaikan - %s"
+msgstr "Mesej yang dimajukan - %s"
 
-#: mail/mail-tools.c:278
+#: mail/mail-tools.c:279
 msgid "Forwarded message"
-msgstr "Mesej yang disampaikan"
+msgstr "Mesej yang dimajukan"
 
-#: mail/mail-tools.c:319
-#, fuzzy, c-format
+#: mail/mail-tools.c:320
+#, c-format
 msgid "Invalid folder: `%s'"
-msgstr "Membuka folder %s"
+msgstr "Folder tidak sah: '%s'"
 
 #: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
-msgstr "Menyediakan vfolder: %s"
+msgstr "Menetapkan vfolder: %s"
 
 #: mail/mail-vfolder.c:235
-#, fuzzy, c-format
+#, c-format
 msgid "Updating vFolders for '%s:%s'"
-msgstr "Mengemaskinikan vfolder bagi uri: %s"
+msgstr "Mengemaskinikan vfolder bagi '%s:%s'"
 
 #: mail/mail-vfolder.c:242
-#, fuzzy, c-format
+#, c-format
 msgid "Updating vFolders for '%s'"
-msgstr "Mengemaskinikan vfolder bagi uri: %s"
+msgstr "Mengemaskinikan vfolder bagi '%s'"
 
 #: mail/mail-vfolder.c:942
 msgid "vFolders"
@@ -16536,67 +16583,67 @@ msgstr "Edit vFolder"
 msgid "New VFolder"
 msgstr "VFolder Baru"
 
-#: mail/message-list.c:1000
+#: mail/message-list.c:1001
 msgid "Unseen"
 msgstr "Belum dilihat"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1002
 msgid "Seen"
 msgstr "Dilihat"
 
-#: mail/message-list.c:1002
+#: mail/message-list.c:1003
 msgid "Answered"
 msgstr "Dijawab"
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1004
 msgid "Multiple Unseen Messages"
 msgstr "Pelbagai Mesej yang Belum Dilihat"
 
-#: mail/message-list.c:1004
+#: mail/message-list.c:1005
 msgid "Multiple Messages"
 msgstr "Pelbagai Mesej"
 
-#: mail/message-list.c:1008
+#: mail/message-list.c:1009
 msgid "Lowest"
 msgstr "Paling rendah"
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:1010
 msgid "Lower"
 msgstr "Lebih rendah"
 
-#: mail/message-list.c:1013
+#: mail/message-list.c:1014
 msgid "Higher"
 msgstr "Lebih tinggi"
 
-#: mail/message-list.c:1014
+#: mail/message-list.c:1015
 msgid "Highest"
 msgstr " Paling tinggi"
 
-#: mail/message-list.c:1337
+#: mail/message-list.c:1338
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1344
+#: mail/message-list.c:1345
 msgid "Today %l:%M %p"
 msgstr "Hari ini %l:%M %p"
 
-#: mail/message-list.c:1353
+#: mail/message-list.c:1354
 msgid "Yesterday %l:%M %p"
 msgstr "Semalam %l:%M %p"
 
-#: mail/message-list.c:1365
+#: mail/message-list.c:1366
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1373
+#: mail/message-list.c:1374
 msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:1375
+#: mail/message-list.c:1376
 msgid "%b %d %Y"
-msgstr "%b %d %Y"
+msgstr "%d %b %Y"
 
-#: mail/message-list.c:3380
+#: mail/message-list.c:3396
 msgid "Generating message list"
 msgstr "Menjana senarai mesej"
 
@@ -16628,41 +16675,41 @@ msgstr "Diterima"
 msgid "Size"
 msgstr "Saiz"
 
-#: mail/message-tag-followup.c:73
+#: mail/message-tag-followup.c:74
 msgid "Call"
 msgstr "Panggil"
 
-#: mail/message-tag-followup.c:74
+#: mail/message-tag-followup.c:75
 msgid "Do Not Forward"
 msgstr "Jangan Sampaikan"
 
-#: mail/message-tag-followup.c:75
+#: mail/message-tag-followup.c:76
 msgid "Follow-Up"
 msgstr "Susulan"
 
-#: mail/message-tag-followup.c:76
+#: mail/message-tag-followup.c:77
 msgid "For Your Information"
 msgstr "Untuk Pengetahuan Anda"
 
-#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:78 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
-msgstr "Sampaikan"
+msgstr "Majukan"
 
-#: mail/message-tag-followup.c:78
+#: mail/message-tag-followup.c:79
 msgid "No Response Necessary"
 msgstr "Maklum Balas Tidak Perlu"
 
-#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Balas"
 
-#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
+#: mail/message-tag-followup.c:82 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Balas kepada Semua"
 
-#: mail/message-tag-followup.c:82
+#: mail/message-tag-followup.c:83
 msgid "Review"
-msgstr "Kaji semula"
+msgstr "Reviu"
 
 #: mail/searchtypes.xml.h:1
 msgid "Body contains"
@@ -16698,37 +16745,31 @@ msgstr "Tajuk tidak mengandungi"
 
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
-msgstr "Cangkerang Evolution"
+msgstr "Shell Evolution"
 
 #: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
 msgid "Evolution Test"
-msgstr "Evolution"
+msgstr "Ujian Evolution"
 
 #: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
 msgid "Evolution Test component"
 msgstr "Komponen Ujian Evolution"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
-#, fuzzy
 msgid "Default width of the folder bar pane"
-msgstr "Toggle sama ada ingin menunjukkan bar folder atau tidak"
+msgstr "Lebar default bagi jendela bar folder"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-#, fuzzy
 msgid "Default window height"
-msgstr "Keutamaan Piawai:"
+msgstr "Tinggi tetingkap default"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default window width"
-msgstr "Keutamaan Piawai:"
+msgstr "Lebar tetingkap default"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
 msgid "Evolution configuration version"
-msgstr "Antara muka konfigurasi Mel Evolution"
+msgstr "Versi konfigurasi  Evolution"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
@@ -16852,9 +16893,9 @@ msgid "Importing"
 msgstr "Mengimport"
 
 #: shell/e-shell-importer.c:477
-#, fuzzy, c-format
+#, c-format
 msgid "Importing %s.\n"
-msgstr "Mengimport"
+msgstr "Mengimport %s.\n"
 
 #: shell/e-shell-importer.c:487 shell/e-shell-importer.c:488
 #, c-format
@@ -16875,13 +16916,8 @@ msgid "Automatic"
 msgstr "Automatik"
 
 #: shell/e-shell-importer.c:638
-#, fuzzy
 msgid "F_ilename:"
-msgstr "Nama fail:"
-
-#: shell/e-shell-importer.c:643
-msgid "Select a file"
-msgstr "Pilih fail"
+msgstr "Nama fa_il:"
 
 #: shell/e-shell-importer.c:655
 msgid "File _type:"
@@ -16901,7 +16937,7 @@ msgid ""
 "Scanning for existing setups"
 msgstr ""
 "Sila tunggu...\n"
-"Sedang mengimbas persediaan sedia ada"
+"Mengimbas tetapan yang sedia ada"
 
 #: shell/e-shell-importer.c:772
 msgid "Starting Intelligent Importers"
@@ -16913,14 +16949,13 @@ msgid "From %s:"
 msgstr "Daripada %s:"
 
 #: shell/e-shell-importer.c:1092
-#, fuzzy, c-format
+#, c-format
 msgid "No importer available for file %s"
-msgstr "Tidak ada penyedia bagi protokol `%s'"
+msgstr "Tidak ada pengimport bagi fail %s"
 
 #: shell/e-shell-importer.c:1106
-#, fuzzy
 msgid "Unable to execute importer"
-msgstr "Gagal melaksanakan gpg."
+msgstr "Gagal melaksanakan pengimport"
 
 #: shell/e-shell-importer.c:1220
 msgid "_Import"
@@ -16989,27 +17024,35 @@ msgstr "Kawan pepijat tidak dipasang."
 msgid "Bug buddy could not be run."
 msgstr "Kawan pepijat tidak dapat dijalankan."
 
-#: shell/e-shell-window-commands.c:323
+#. The translator-credits string is for translators to list
+#. * per language credits for translation, displayed in the
+#. * about box
+#: shell/e-shell-window-commands.c:425
+msgid "translator-credits"
+msgstr ""
+"MIMOS OpenSource \n"
+"Hasbullah Bin Pit"
+
+#: shell/e-shell-window-commands.c:439
 msgid "Groupware Suite"
 msgstr "Sut Groupware"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:679
 msgid "_Work Online"
 msgstr "_Bekerja Dalam Talian"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:692 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Bekerja Luar Talian"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:705 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Bekerja Luar Talian"
 
 #: shell/e-shell-window.c:337
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
-"Evolution dalam talian sekarang.  Klik butang ini untuk bekerja luar "
-"talian."
+"Evolution dalam talian sekarang.  Klik butang ini untuk bekerja luar talian."
 
 #: shell/e-shell-window.c:344
 msgid "Evolution is in the process of going offline."
@@ -17018,38 +17061,39 @@ msgstr "Evolution adalah dalam proses menjadi luar talian."
 #: shell/e-shell-window.c:350
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
-"Evolution luar talian sekarang.  Klik butang ini untuk bekerja dalam "
-"talian."
+"Evolution luar talian sekarang.  Klik butang ini untuk bekerja dalam talian."
 
 #: shell/e-shell-window.c:637
+#, c-format
 msgid "Switch to %s"
 msgstr "Bertukar ke %s"
 
-#: shell/e-shell.c:585
+#: shell/e-shell.c:589
 msgid "Uknown system error."
 msgstr "Ralat sistem tak diketahui."
 
-#: shell/e-shell.c:789 shell/e-shell.c:790
+#: shell/e-shell.c:797 shell/e-shell.c:798
+#, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%ld %KB"
 
-#: shell/e-shell.c:1210 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1220 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: shell/e-shell.c:1212
+#: shell/e-shell.c:1222
 msgid "Invalid arguments"
 msgstr "Hujah tak sah"
 
-#: shell/e-shell.c:1214
+#: shell/e-shell.c:1224
 msgid "Cannot register on OAF"
 msgstr "Tidak dapat mendaftarkan dalam OAF"
 
-#: shell/e-shell.c:1216
+#: shell/e-shell.c:1226
 msgid "Configuration Database not found"
 msgstr "Pangkalan Data Konfigurasi tidak dijumpai"
 
-#: shell/e-shell.c:1218
+#: shell/e-shell.c:1228
 msgid "Generic error"
 msgstr "Ralat generik"
 
@@ -17170,7 +17214,8 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution boleh mengimport data daripada fail berikut:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:226
+#: shell/main.c:234
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -17207,7 +17252,7 @@ msgstr ""
 "Kami harap anda memperoleh hasil daripada usaha gigih kami, dan kami\n"
 "tidak sabar menunggu sumbangan anda!\n"
 
-#: shell/main.c:250
+#: shell/main.c:258
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17215,35 +17260,43 @@ msgstr ""
 "Terima kasih\n"
 "Pasukan Evolution\n"
 
-#: shell/main.c:257
+#: shell/main.c:265
 msgid "Don't tell me again"
 msgstr "Jangan beritahu saya lagi"
 
-#: shell/main.c:462
+#: shell/main.c:470
 msgid "Start Evolution activating the specified component"
 msgstr "Mulakan Evolution mengaktifkan komponen dinyatakan"
 
-#: shell/main.c:464
+#: shell/main.c:472
 msgid "Start in offline mode"
 msgstr "Mulakan dalam mod luar talian"
 
-#: shell/main.c:466
+#: shell/main.c:474
 msgid "Start in online mode"
 msgstr "Mulakan dalam mod dalam talian"
 
-#: shell/main.c:469
+#: shell/main.c:477
 msgid "Forcibly shut down all evolution components"
 msgstr "Tamatkan semua komponen Evolution secara paksa"
 
-#: shell/main.c:473
+#: shell/main.c:481
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Peningkatan paksa fail daripada Evolution 1.4"
 
-#: shell/main.c:476
+#: shell/main.c:484
 msgid "Send the debugging output of all components to a file."
 msgstr "Hantarkan output penyahpijatan bagi semua komponen ke fail."
 
-#: shell/main.c:507
+#: shell/main.c:487
+msgid "Disable the mono plugin environment."
+msgstr ""
+
+#: shell/main.c:490
+msgid "Disable loading of any plugins."
+msgstr ""
+
+#: shell/main.c:521
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17266,10 +17319,11 @@ msgid ""
 "You will need to make more space available in your home directory before you "
 "can continue."
 msgstr ""
-"Penaiktarafan data dan tetapan anda memerlukan sehingga {0} ruang cakera, tetapi "
-"anda hanya ada {1} .\n"
+"Penaiktarafan data dan tetapan anda memerlukan sehingga {0} ruang cakera, "
+"tetapi anda hanya ada {1} .\n"
 "\n"
-"Anda perlu menyediakan lebih ruang pada direktori rumah anda sebelum anda meneruskan."
+"Anda perlu menyediakan lebih ruang pada direktori rumah anda sebelum anda "
+"meneruskan."
 
 #. shell:upgrade-failed primary
 #: shell/shell-errors.xml.h:8
@@ -17290,7 +17344,8 @@ msgid ""
 msgstr ""
 "{1}\n"
 "\n"
-"Jika anda memilih untuk teruskan, anda tak mempunyai akses kepada data lama anda.\n"
+"Jika anda memilih untuk teruskan, anda tak mempunyai akses kepada data lama "
+"anda.\n"
 
 #: shell/shell-errors.xml.h:15
 msgid "Continue"
@@ -17314,10 +17369,11 @@ msgid ""
 msgstr ""
 "Versi terdahulu evolution menyimpan datanya pada lokasi lain.\n"
 "\n"
-"Jika anda memilih untuk membuang data ini, keseluruhan kandungan direktori \"evolution\" "
-"akan dibuang secara kekal. JIka anda memilih untuk menyimpan data ini,"
-"anda boleh membuang kandungan \"evolution\" mengikut kehendak anda "
-".\n"
+"Jika anda memilih untuk membuang data ini, keseluruhan kandungan direktori "
+"\"evolution\" akan dibuang secara kekal. JIka anda memilih untuk menyimpan "
+"data ini,anda boleh membuang kandungan \"evolution\" mengikut kehendak "
+"anda .\n"
+
 #: shell/shell-errors.xml.h:25
 msgid "_Remind Me Later"
 msgstr "_Ingatkan Daku Kelak"
@@ -17656,6 +17712,10 @@ msgstr "Sijil Anda"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
+
 #. XXX we shouldn't be popping up dialogs in this code.
 #: smime/lib/e-cert-db.c:612
 #, fuzzy
@@ -17962,7 +18022,7 @@ msgstr "Potong pemilihan"
 
 #: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
-msgstr "Hapuskan kenalan yang dipilih"
+msgstr "Padam kenalan yang dipilih"
 
 #: ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
@@ -18073,19 +18133,19 @@ msgstr "Hari"
 
 #: ui/evolution-calendar.xml.h:6
 msgid "Delete All Occurrences"
-msgstr "Hapuskan Semua Kejadian"
+msgstr "Padam Semua Kejadian"
 
 #: ui/evolution-calendar.xml.h:7
 msgid "Delete the appointment"
-msgstr "Hapuskan temu janji"
+msgstr "Padam temujanji"
 
 #: ui/evolution-calendar.xml.h:8
 msgid "Delete this Occurrence"
-msgstr "Hapuskan Kejadian ini"
+msgstr "Padam Kejadian ini"
 
 #: ui/evolution-calendar.xml.h:9
 msgid "Delete this occurrence"
-msgstr "Hapuskan kejadian ini"
+msgstr "Padam kejadian ini"
 
 #: ui/evolution-calendar.xml.h:10
 msgid "Go To"
@@ -18213,7 +18273,7 @@ msgstr "Tutup item ini"
 
 #: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
 msgid "Delete this item"
-msgstr "Hapuskan item ini"
+msgstr "Padam item ini"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
 #: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
@@ -18222,7 +18282,7 @@ msgstr "Bar alatan utama"
 
 #: ui/evolution-comp-editor.xml.h:7
 msgid "Preview the printed item"
-msgstr "Pralihat item yang dicetak"
+msgstr "Prebiu item yang dicetak"
 
 #: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
@@ -18309,7 +18369,7 @@ msgstr "_Simpan"
 
 #: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete this list"
-msgstr "Hapuskan senarai ini"
+msgstr "Padam senarai ini"
 
 #: ui/evolution-contact-list-editor.xml.h:8
 msgid "Save the list and close the dialog box"
@@ -18325,7 +18385,7 @@ msgstr "Hantar _mesej ke senarai..."
 
 #: ui/evolution-contact-list-editor.xml.h:12
 msgid "_Delete..."
-msgstr "_Hapuskan..."
+msgstr "Pa_dam..."
 
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
@@ -18393,8 +18453,7 @@ msgstr "Buka tetingkap untuk menggubah mesej mel"
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
-msgstr ""
-"Keluarkan secara kekal semua mesej yang dihapuskan daripada semua folder"
+msgstr "Buang secara kekal semua mesej yang dipadam drpd semua folder"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Post Ne_w Message"
@@ -18456,7 +18515,7 @@ msgstr "Sembunyikan _Mesej yang Telah Dibaca"
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
-"Sembunyikan mesej yang dihapuskan bukan memaparkannya dengan garis melaluinya"
+"Sembunyikan mesej yang dipadam bukan memaparkannya dengan garis mencoretnya"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as _Read"
@@ -18733,7 +18792,7 @@ msgstr "Tandakan mesej yang dipilih sebagai tidak penting"
 
 #: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
-msgstr "Tandakan mesej yang dipilih untuk dihapuskan"
+msgstr "Tandakan mesej yang dipilih untuk dipadam"
 
 #: ui/evolution-mail-message.xml.h:63
 msgid "Move"
@@ -19188,11 +19247,11 @@ msgstr "Potong tugas yang dipilih"
 
 #: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
-msgstr "Hapuskan tugas yang siap"
+msgstr "Padam tugas yang siap"
 
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
-msgstr "Hapuskan tugas yang dipilih"
+msgstr "Padam tugas yang dipilih"
 
 #: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
@@ -19281,12 +19340,11 @@ msgstr "Hantarkan item berbaris gilir dan dapatkan semula item baru"
 
 #: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
-msgstr "Sediakan konfigurasi Rintis"
+msgstr "Menetapkan konfigurasi Pilot"
 
 #: ui/evolution.xml.h:19
-#, fuzzy
 msgid "Show information about Evolution"
-msgstr "Tunjukkan maklumat tentang Ximian Evolution"
+msgstr "Papar maklumat perihal Evolution"
 
 #: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
@@ -19298,7 +19356,7 @@ msgstr "Serahkan _Laporan Pepijat"
 
 #: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
-msgstr "Serahkan Laporan pepijat dengan menggunakan Kawan Pepijat"
+msgstr "Serahkan Laporan pepijat dengan menggunakan Bug Buddy"
 
 #: ui/evolution.xml.h:23
 #, fuzzy
@@ -19307,12 +19365,11 @@ msgstr "Bar alatan utama"
 
 #: ui/evolution.xml.h:24
 msgid "Toggle whether we are working offline."
-msgstr "Toggle untuk melihat sama ada kami bekerja luar talian atau tidak."
+msgstr "Togol sama ada kami bekerja luar talian atau tidak."
 
 #: ui/evolution.xml.h:26
-#, fuzzy
 msgid "_About Evolution..."
-msgstr "Tentang Ximian Evolution"
+msgstr "_Perihal Evolution..."
 
 #: ui/evolution.xml.h:30
 msgid "_Help"
@@ -19324,21 +19381,23 @@ msgstr "_Import..."
 
 #: ui/evolution.xml.h:32
 msgid "_New"
-msgstr "_baru"
+msgstr "Ba_ru"
 
 #: ui/evolution.xml.h:33
-#, fuzzy
 msgid "_Quick Reference"
-msgstr "Keutamaan Mel"
+msgstr "Rujukan _Cepat"
 
 #: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Hantar / Terima"
 
+#: ui/evolution.xml.h:35
+msgid "_Settings..."
+msgstr "_Tetapan..."
+
 #: ui/evolution.xml.h:38
-#, fuzzy
 msgid "_Window"
-msgstr "_Cari Sekarang"
+msgstr "_Tetingkap"
 
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
@@ -19354,28 +19413,27 @@ msgstr "_Senarai Telefon"
 
 #: views/calendar/galview.xml.h:1
 msgid "W_eek View"
-msgstr "P_andangan Minggu"
+msgstr "Paparan _Mingguan"
 
 #: views/calendar/galview.xml.h:2
 msgid "_Day View"
-msgstr "_Paparan Hari"
+msgstr "Paparan _Harian"
 
 #: views/calendar/galview.xml.h:3
-#, fuzzy
 msgid "_List View"
-msgstr "Paparan Senarai"
+msgstr "Paparan _Senarai"
 
 #: views/calendar/galview.xml.h:4
 msgid "_Month View"
-msgstr "_Paparan Bulan"
+msgstr "_Paparan Bulanan"
 
 #: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
-msgstr "_Paparan Minggu Bekerja"
+msgstr "Paparan Minggu _Bekerja"
 
 #: views/mail/galview.xml.h:1
 msgid "As _Sent Folder"
-msgstr "Sebagai Folder yang _Dihantar"
+msgstr "Sebagai Folder _Dihantar"
 
 #: views/mail/galview.xml.h:2
 msgid "By S_tatus"
@@ -19391,7 +19449,7 @@ msgstr "Mengikut Ta_juk"
 
 #: views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
-msgstr "Mengikut Bendera _Susulan"
+msgstr "Mengikut Tanda _Susulan"
 
 #: views/mail/galview.xml.h:6
 msgid "_Messages"
@@ -19403,30 +19461,27 @@ msgid "With _Due Date"
 msgstr "_Tarikh Genap Tempoh:"
 
 #: views/tasks/galview.xml.h:2
-#, fuzzy
 msgid "With _Status"
-msgstr "Set Status"
+msgstr "Sengan _Status"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:640
 msgid "UTC"
 msgstr "UTC"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Time Zones</b>"
-msgstr "Zon Masa"
+msgstr "<b>Zon Masa</b>"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
-#, fuzzy
 msgid "<b>_Selection</b>"
-msgstr "L_okasi:"
+msgstr "<b>Pe_milihan</b>"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "Select a Time Zone"
 msgstr "Pilih Zon Masa"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -19440,24 +19495,15 @@ msgstr ""
 msgid "_Current View"
 msgstr "_Paparan Semasa"
 
-#. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:351
-msgid "Custom View"
-msgstr "Paparan Biasa"
-
 #: widgets/menus/gal-view-menus.c:360
 msgid "Save Custom View..."
-msgstr "Simpan Paparan Biasa..."
-
-#: widgets/menus/gal-view-menus.c:373
-msgid "Define Views..."
-msgstr "Takrif Paparan..."
+msgstr "Simpan Paparan Tersendiri..."
 
 #. 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:423
 msgid "MTWTFSS"
-msgstr "MTWTFSS"
+msgstr "ISRKJSA"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1128
@@ -19468,7 +19514,7 @@ msgstr "%B %Y"
 msgid "Now"
 msgstr "Sekarang"
 
-#: widgets/misc/e-cell-date-edit.c:805
+#: widgets/misc/e-cell-date-edit.c:810
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Masa mestilah dalam format: %s"
@@ -19515,16 +19561,15 @@ msgstr "Turki"
 
 #: widgets/misc/e-charset-picker.c:72
 msgid "Unicode"
-msgstr "Ekakod"
+msgstr "Unicode"
 
 #: widgets/misc/e-charset-picker.c:73
 msgid "Western European"
 msgstr "Eropah Barat"
 
 #: widgets/misc/e-charset-picker.c:74
-#, fuzzy
 msgid "Western European, New"
-msgstr "Eropah Barat"
+msgstr "Eropah Barat, Baru"
 
 #: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
 #: widgets/misc/e-charset-picker.c:93
@@ -19551,7 +19596,7 @@ msgstr "Set aksara tak diketahui: %s"
 
 #: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
 msgid "Character Encoding"
-msgstr "Pengekodan Aksara"
+msgstr "Pengenkodan Aksara"
 
 #: widgets/misc/e-charset-picker.c:231
 msgid "Enter the character set to use"
@@ -19572,45 +19617,42 @@ msgstr "Ralat Evolution"
 
 #: widgets/misc/e-error.c:85 widgets/misc/e-error.c:86
 #: widgets/misc/e-error.c:124
-#, fuzzy
 msgid "Evolution Warning"
-msgstr "Mel Evolution"
+msgstr "Amaran Evolution"
 
 #: widgets/misc/e-error.c:123
-#, fuzzy
 msgid "Evolution Information"
-msgstr "Maklumat Mesyuarat"
+msgstr "Maklumat Evolution"
 
 #: widgets/misc/e-error.c:125
-#, fuzzy
 msgid "Evolution Query"
-msgstr "Ringkasan Evolution"
+msgstr "Kueri Evolution"
 
 #. setup a dummy error
 #: widgets/misc/e-error.c:421
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr "Mesej Dihantar dan Didraf"
+msgstr ""
+"<span weight=\"bold\">Ralat dalaman, ralat tak diketahui '%s' dipinta</span>"
 
+#
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
 msgstr "B_uang"
 
 #: widgets/misc/e-expander.c:182
-#, fuzzy
 msgid "Whether or not the expander is expanded"
-msgstr "_Minta pengesahan apabila memadam item"
+msgstr "Samada pengembang dikembangkan"
 
 #: widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
-msgstr ""
+msgstr "Teks bagi label pengembang"
 
 #: widgets/misc/e-expander.c:197
-#, fuzzy
 msgid "Use underline"
-msgstr "Tidak ditentukan"
+msgstr "Guna garisbawah"
 
 #: widgets/misc/e-expander.c:198
 msgid ""
@@ -19619,41 +19661,38 @@ msgid ""
 msgstr ""
 
 #: widgets/misc/e-expander.c:205
-#, fuzzy
 msgid "Spacing"
-msgstr "Sepanyol"
+msgstr "Ruangjarak"
 
 #: widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
-msgstr ""
+msgstr "Ruang diantara label dan anaknya"
 
 #: widgets/misc/e-expander.c:215
 msgid "Label widget"
-msgstr ""
+msgstr "Wiget Label"
 
 #: widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
-msgstr ""
+msgstr "Wiget untuk memapar pada label pengembang biasa"
 
 #: widgets/misc/e-expander.c:222
 msgid "Expander Size"
-msgstr ""
+msgstr "Saiz Pengembang"
 
 #: widgets/misc/e-expander.c:223
 msgid "Size of the expander arrow"
-msgstr ""
+msgstr "Saiz bagi panah pengembang"
 
 #: widgets/misc/e-expander.c:231
-#, fuzzy
 msgid "Indicator Spacing"
-msgstr "Indian Springs"
+msgstr "Ruangjarak Penunjuk"
 
 #: widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
-msgstr ""
+msgstr "Ruang sekeliling panah pengembang"
 
 #: widgets/misc/e-filter-bar.c:195
-#, fuzzy
 msgid "_Searches"
 msgstr "_Cari"
 
@@ -19679,14 +19718,12 @@ msgid "_Advanced..."
 msgstr "_Lanjutan..."
 
 #: widgets/misc/e-image-chooser.c:172
-#, fuzzy
 msgid "Choose Image"
-msgstr "Pilih fail"
+msgstr "Pilih Imej"
 
 #: widgets/misc/e-pilot-settings.c:103
-#, fuzzy
 msgid "Sync with:"
-msgstr "berakhir dengan"
+msgstr "Segerak dengan:"
 
 #: widgets/misc/e-pilot-settings.c:111
 msgid "Sync Private Records:"
@@ -19721,38 +19758,28 @@ msgid "Text"
 msgstr "Teks"
 
 #: widgets/misc/e-search-bar.c:931
-#, fuzzy
 msgid "Find _Now"
-msgstr "Cari Sekarang"
+msgstr "Cari _Sekarang"
 
 #. system:ask-save-file-exists-overwrite primary
 #: widgets/misc/e-system-errors.xml.h:4
 msgid "File exists \"{0}\"."
-msgstr ""
+msgstr "Fail wujud \"{0}\"."
 
 #. system:ask-save-file-exists-overwrite secondary
 #: widgets/misc/e-system-errors.xml.h:6
-#, fuzzy
 msgid "Do you wish to overwrite it?"
-msgstr ""
-"%s telah wujud\n"
-"Adakah anda ingin menulis gantinya?"
+msgstr "Adakah anda ingin menulis gantinya?"
 
 #. system:no-save-file primary
 #: widgets/misc/e-system-errors.xml.h:9
-#, fuzzy
 msgid "Cannot save file \"{0}\"."
-msgstr ""
-"Tidak dapat menyimpan dalam `%s'\n"
-" %s"
+msgstr "Tidak dapat menyimpan fail \"{0}\"."
 
 #. system:no-load-file primary
 #: widgets/misc/e-system-errors.xml.h:13
-#, fuzzy
 msgid "Cannot open file \"{0}\"."
-msgstr ""
-"Tidak dapat menyimpan dalam `%s'\n"
-" %s"
+msgstr "Tidak dapat membuka fail \"{0}\"."
 
 #: widgets/misc/e-task-widget.c:212
 #, c-format
@@ -19764,6 +19791,104 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% siap)"
 
+#~ msgid ""
+#~ "Address book '%s' will be removed. Are you sure you want to continue?"
+#~ msgstr "Buku alamat '%s' akan dibuang. Anda pasti untuk teruskan?"
+
+#~ msgid "Go to Folder..."
+#~ msgstr "Pergi ke Folder..."
+
+#~ msgid "Import..."
+#~ msgstr "Import..."
+
+#~ msgid "Search for Contacts..."
+#~ msgstr "Carian Kenalan..."
+
+#~ msgid "Address Book Sources..."
+#~ msgstr "Sumber Buku Alamat..."
+
+#~ msgid "Pilot Settings..."
+#~ msgstr "Tetapan Pilot..."
+
+#~ msgid "Print Envelope"
+#~ msgstr "Cetak Sampul Surat"
+
+#~ msgid "Impossible internal error."
+#~ msgstr "Ralat dalaman mustahil."
+
+#~ msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
+#~ msgstr "Kalendar '%s' akan dibuang. Anda pasti untuk teruskan?"
+
+#~ msgid "Go to _Today"
+#~ msgstr "Pergi ke _Hari Ini"
+
+#~ msgid "_Go to Date..."
+#~ msgstr "_Pergi ke Tarikh..."
+
+#~ msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+#~ msgstr "Senarai Tugas '%s' akan dibuang. Adakah anda pasti untuk teruskan?"
+
+#~ msgid "Failed to resolve host `%s': %s"
+#~ msgstr "Gagal menyelesaikan hos `%s': %s"
+
+#~ msgid "Failure in name lookup: %s"
+#~ msgstr "Gagal dalam carian nama: %s"
+
+#~ msgid "Host lookup failed: cannot create thread: %s"
+#~ msgstr "Carian hos gagal: tidak dapat mewujudkan bebenang: %s"
+
+#~ msgid "Host lookup failed: %s: unknown reason"
+#~ msgstr "Carian hos gagal: %s sebab tak diketahui"
+
+#~ msgid "Host lookup failed: host not found"
+#~ msgstr "Carian hos gagal: hos tidak dijumpai"
+
+#, fuzzy
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr "Gagal disambungkan ke pelayan IMAP %s dalam mod terjamin: %s"
+
+#~ msgid "Could not connect to POP server %s (port %d): %s"
+#~ msgstr "Tidak dapat disambungkan ke pelayan POP %s (port %d): %s"
+
+#~ msgid "server does not appear to support SSL"
+#~ msgstr "Pelayan tidak menyokong SSL"
+
+#~ msgid "Remove selected items from the attachment list"
+#~ msgstr "Keluarkan item yang dipilih daripada senarai lampiran"
+
+#~ msgid "Attach a file to the message"
+#~ msgstr "Lampirkan fail ke mesej"
+
+#, fuzzy
+#~ msgid "<span weight=\"bold\">Checking for New Mail</span>"
+#~ msgstr "Menyemak Mel Baru"
+
+#, fuzzy
+#~ msgid "Automatically check for _new mail every"
+#~ msgstr "_Secara automatik semak mel baru setiap"
+
+#~ msgid "IMAPv4 "
+#~ msgstr "IMAPv4"
+
+#~ msgid "Kerberos "
+#~ msgstr "Kerberos"
+
+#~ msgid "Qmail maildir "
+#~ msgstr "Dirmel Qmail "
+
+#, fuzzy
+#~ msgid "Receiving Options"
+#~ msgstr "Menerima _Opsyen"
+
+#~ msgid "Standard Unix mbox"
+#~ msgstr "Peti mel Unix piawai"
+
+#, fuzzy
+#~ msgid "_Use Secure Connection (SSL):"
+#~ msgstr "_Gunakan sambungan terjamin (SSL):"
+
 #~ msgid "*Control*F2"
 #~ msgstr "*Control*F2"