removed outdated strings and run "mak update-po".

svn path=/trunk/; revision=30341

1 files changed, 3030 insertions, 4591 deletions

diff --git a/po/xh.po b/po/xh.po
index 978812ad0d..2e73d702b7 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-21 13:59+0800\n"
+"POT-Creation-Date: 2005-09-11 17:30+0200\n"
 "PO-Revision-Date: 2005-03-23 09:33+0200\n"
 "Last-Translator: Canonical Ltd <translations@canonical.com>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
@@ -24,12 +24,12 @@ msgid "evolution addressbook"
 msgstr "I-evolution sencwadi yedilesi"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:196
+#: ../addressbook/gui/component/addressbook-component.c:225
 msgid "New Contact"
 msgstr "Abatsha Oqhagamshelana Nabo"
 
 #: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:204
+#: ../addressbook/gui/component/addressbook-component.c:233
 msgid "New Contact List"
 msgstr "Uluhlu Lwabatsha Oqhagamshelana Nabo"
 
@@ -98,7 +98,7 @@ msgstr "Idinga Elitsha"
 msgid "New All Day Event"
 msgstr "Isiganeko Esitsha Sosuku Lonke"
 
-#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1483
+#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1505
 msgid "New Meeting"
 msgstr "Intlanganiso Entsha"
 
@@ -157,7 +157,7 @@ msgstr "i-%A %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1516
+#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1510
 #: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "i-%a %d %b"
@@ -190,14 +190,14 @@ msgstr "i-%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1532
+#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1526
 #: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "i-%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:247
 #: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:726
+#: ../calendar/importers/icalendar-importer.c:738
 msgid "Gnome Calendar"
 msgstr "Ikhalenda ye-Gnome"
 
@@ -403,6 +403,11 @@ msgstr "I-Evolution yencwadi yedilesi iphume ngokungalindelekanga."
 
 #: ../addressbook/addressbook.error.xml.h:16
 msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:17
+msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
@@ -411,20 +416,20 @@ msgstr ""
 "msebenzi okanye kusenokuba ayakhekanga kakuhle. Cela umlawuli wakho akunike "
 "isiseko sokukhangela esixhaswayo."
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "This address book will be removed permanently."
 msgstr "Le ncwadi yedilesi iza kususwa ngokusisigxina."
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "This addressbook could not be opened."
 msgstr "Le ncwadi yedilesi ayikwazanga ukuvulwa."
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "This addressbook server does not have any suggested search bases."
 msgstr ""
 "Le seva yencwadi yedilesi ayinaso isiseko esiphakanyiswayo sokukhangela."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -432,28 +437,28 @@ msgstr ""
 "Le seva yencwadi yedilesi isenokungafumaneki okanye kusenokuba alipelwanga "
 "kakuhle igama leseva okanye unxulumano lwe-intanethi yakho alusebenzi."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Le seva ayiwuxhasi umzobo wolwazi we-LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "Unable to open addressbook"
 msgstr "Ayinako ukuvula incwadi yedilesi"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Unable to perform search."
 msgstr "Ayinako ukukhangela."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
 #, fuzzy
 msgid "Unable to save {0}."
 msgstr "Ayinako ukugcina oqhagamshelana nabo."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "Would you like to save your changes?"
 msgstr "Ungathanda na ukugcina iinguqu zakho?"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 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?"
@@ -461,7 +466,7 @@ msgstr ""
 "Uzama ukususa oqhagamshelana naye kwenye incwadi yedilesi umsa kwenye kodwa "
 "ayinakususwa kulo mthombo. Ingaba ufuna ukugcina ikopi kusini na?"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 #: ../calendar/calendar.error.xml.h:59
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
@@ -469,34 +474,37 @@ msgid ""
 "a supported version"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr ""
 "Uguqule okuthile kolu qhagamshelwano. Ingaba ufuna zigcinwe na ezo nguqu?"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Abakho oqhagamshelwano nabo {0} abazi kufumaneka de i-Evolution iqalise "
 "kwakhona."
 
-#: ../addressbook/addressbook.error.xml.h:30 ../mail/em-vfolder-rule.c:494
+#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:494
+#: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "_Yongeza"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "_Discard"
 msgstr "_Lahla"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "{0}"
 msgstr "I-{0}"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "{1}"
 msgstr "I-{1}"
 
@@ -533,7 +541,7 @@ msgstr "Apha akha isigqibezeli-ngokuzenzekelayo"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1119
+#: ../addressbook/gui/component/addressbook-view.c:1133
 #: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
 msgid "Contacts"
 msgstr "Abantu Oqhagamshelana Nabo"
@@ -571,13 +579,13 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Lawula apha izatifiketi sakho se-S/MIME"
 
 #. create the local source group
-#. On This Computer is always first and vFolders is always last
-#: ../addressbook/gui/component/addressbook-component.c:133
-#: ../addressbook/gui/component/addressbook-migrate.c:493
+#. On This Computer is always first and Search Folders is always last
+#: ../addressbook/gui/component/addressbook-component.c:137
+#: ../addressbook/gui/component/addressbook-migrate.c:502
 #: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
 #: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
 #: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
-#: ../mail/mail-component.c:291 ../mail/mail-vfolder.c:223
+#: ../mail/mail-component.c:292 ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "Kule Khompyutha"
 
@@ -586,8 +594,8 @@ msgstr "Kule Khompyutha"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:141
-#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/component/addressbook-component.c:145
+#: ../addressbook/gui/component/addressbook-migrate.c:510
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
 #: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
@@ -597,100 +605,100 @@ msgid "Personal"
 msgstr "Yeyakho buqu"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:149
-#: ../addressbook/gui/component/addressbook-migrate.c:509
+#: ../addressbook/gui/component/addressbook-component.c:155
+#: ../addressbook/gui/component/addressbook-migrate.c:520
 msgid "On LDAP Servers"
 msgstr "Ikwiiseva ze-LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:197
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "_Contact"
 msgstr "_Qhagamshelana"
 
-#: ../addressbook/gui/component/addressbook-component.c:198
+#: ../addressbook/gui/component/addressbook-component.c:227
 msgid "Create a new contact"
 msgstr "Yenza uqhagamshelwano olutsha"
 
-#: ../addressbook/gui/component/addressbook-component.c:205
+#: ../addressbook/gui/component/addressbook-component.c:234
 msgid "Contact _List"
 msgstr "Uluhlu _Loqhagamshelana Nabo"
 
-#: ../addressbook/gui/component/addressbook-component.c:206
+#: ../addressbook/gui/component/addressbook-component.c:235
 msgid "Create a new contact list"
 msgstr "Yenza uluhlu olutsha loqhagamshelana nabo"
 
-#: ../addressbook/gui/component/addressbook-component.c:212
-#: ../addressbook/gui/component/addressbook-config.c:1120
-#: ../addressbook/gui/component/addressbook-view.c:757
+#: ../addressbook/gui/component/addressbook-component.c:241
+#: ../addressbook/gui/component/addressbook-config.c:1118
+#: ../addressbook/gui/component/addressbook-view.c:763
 msgid "New Address Book"
 msgstr "Incwadi Entsha Yedilesi"
 
-#: ../addressbook/gui/component/addressbook-component.c:213
+#: ../addressbook/gui/component/addressbook-component.c:242
 msgid "Address _Book"
 msgstr "Incwadi _Yedilesi"
 
-#: ../addressbook/gui/component/addressbook-component.c:214
+#: ../addressbook/gui/component/addressbook-component.c:243
 msgid "Create a new address book"
 msgstr "Yenza incwadi entsha yedilesi"
 
-#: ../addressbook/gui/component/addressbook-component.c:287
+#: ../addressbook/gui/component/addressbook-component.c:385
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 "Ayiphumelelanga ukunyusa izakhelo okanye uvimba weefayili yeNcwadi yedilesi."
 
-#: ../addressbook/gui/component/addressbook-config.c:315
+#: ../addressbook/gui/component/addressbook-config.c:313
 msgid "Base"
 msgstr "Isiseko"
 
-#: ../addressbook/gui/component/addressbook-config.c:510
+#: ../addressbook/gui/component/addressbook-config.c:508
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Uhlobo:"
 
-#: ../addressbook/gui/component/addressbook-config.c:609
+#: ../addressbook/gui/component/addressbook-config.c:607
 msgid "Copy book content locally for offline operation"
 msgstr ""
 "Khuphela okuqulethwe yincwadi ebotshelelweyo ukuze uyisebenzise xa ungekho "
 "kwi-intanethi"
 
-#: ../addressbook/gui/component/addressbook-config.c:904
+#: ../addressbook/gui/component/addressbook-config.c:902
 #: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/dialogs/calendar-setup.c:377
 #: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Jikelele"
 
-#: ../addressbook/gui/component/addressbook-config.c:905
-#: ../mail/importers/pine-importer.c:479
+#: ../addressbook/gui/component/addressbook-config.c:903
+#: ../mail/importers/pine-importer.c:393
 msgid "Addressbook"
 msgstr "Incwadi Yedilesi"
 
-#: ../addressbook/gui/component/addressbook-config.c:909
+#: ../addressbook/gui/component/addressbook-config.c:907
 msgid "Server Information"
 msgstr "Ulwazi Ngeseva"
 
-#: ../addressbook/gui/component/addressbook-config.c:911
+#: ../addressbook/gui/component/addressbook-config.c:909
 msgid "Authentication"
 msgstr "Ubungqina Bobunyani"
 
-#: ../addressbook/gui/component/addressbook-config.c:914
+#: ../addressbook/gui/component/addressbook-config.c:912
 #: ../addressbook/gui/component/ldap-config.glade.h:18
-#: ../mail/mail-dialogs.glade.h:8 ../smime/gui/smime-ui.glade.h:20
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Iinkcukacha"
 
-#: ../addressbook/gui/component/addressbook-config.c:915
+#: ../addressbook/gui/component/addressbook-config.c:913
 msgid "Searching"
 msgstr "Iyakhangela"
 
-#: ../addressbook/gui/component/addressbook-config.c:917
+#: ../addressbook/gui/component/addressbook-config.c:915
 msgid "Downloading"
 msgstr "Ukukhuphela ulwazi"
 
-#: ../addressbook/gui/component/addressbook-config.c:1118
+#: ../addressbook/gui/component/addressbook-config.c:1116
 #: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Iimpawu Zencwadi Yedilesi"
@@ -706,15 +714,15 @@ msgstr "Efudukayo..."
 msgid "Migrating `%s':"
 msgstr "Efudukayo `%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:637
+#: ../addressbook/gui/component/addressbook-migrate.c:648
 msgid "LDAP Servers"
 msgstr "Iiseva ze-LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:752
+#: ../addressbook/gui/component/addressbook-migrate.c:763
 msgid "Autocompletion Settings"
 msgstr "Imimiselo Ezigqibezela Ngokwayo"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1123
+#: ../addressbook/gui/component/addressbook-migrate.c:1134
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -726,7 +734,7 @@ msgstr ""
 "\n"
 " Nceda ube nomonde ngelixa i-Evolution ifudusa iifayili zakho..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1148
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -735,7 +743,7 @@ msgstr ""
 "Ubume boluhlu loqhagamshelana nabo buguqukile.\n"
 "Nceda ube nomonde ngelixa i-Evolution ifudusa iziqulathi zeefayili zakho..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1146
+#: ../addressbook/gui/component/addressbook-migrate.c:1157
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -745,7 +753,7 @@ msgstr ""
 "\n"
 "Nceda ube nomonde ngelixa i-Evolution ifudusa uvimba wakho weefayili..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1156
+#: ../addressbook/gui/component/addressbook-migrate.c:1167
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -756,22 +764,22 @@ msgstr ""
 "\n"
 "Nceda ube nomonde ngelixa i-Evolution ifudusa i-Pilot Sync data yakho..."
 
-#: ../addressbook/gui/component/addressbook-view.c:758
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
+#: ../addressbook/gui/component/addressbook-view.c:764
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
 #: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-tasks.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Cima"
 
-#: ../addressbook/gui/component/addressbook-view.c:760
+#: ../addressbook/gui/component/addressbook-view.c:766
 #: ../calendar/gui/calendar-component.c:538
 #: ../calendar/gui/tasks-component.c:442
 msgid "Properties..."
 msgstr "Iimpawu..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1130
+#: ../addressbook/gui/component/addressbook-view.c:1144
 #, fuzzy
 msgid "Contact Source Selector"
 msgstr "Isikhethi Somthombo Wekhalenda"
@@ -780,13 +788,13 @@ msgstr "Isikhethi Somthombo Wekhalenda"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Ukufikelela kwiseva ye-LDAP ngokungaziwayo"
 
-#: ../addressbook/gui/component/addressbook.c:193
-#: ../plugins/groupwise-features/camel-gw-listener.c:478
+#: ../addressbook/gui/component/addressbook.c:191
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:485
 msgid "Failed to authenticate.\n"
 msgstr "Ayiphumelelanga ukuzisa ubungqina bobunyani.\n"
 
-#: ../addressbook/gui/component/addressbook.c:200
-#: ../plugins/groupwise-features/camel-gw-listener.c:461
+#: ../addressbook/gui/component/addressbook.c:198
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:464
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Faka i-password kwi-%s (umsebenzisi %s)"
@@ -860,9 +868,14 @@ msgstr "Bonisa i \"Khangela Phambi Kokuyishicilela\" igilasi yefestile."
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/mail-dialogs.glade.h:2 ../mail/message-tags.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #: ../plugins/groupwise-features/properties.glade.h:1
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
 msgid "*"
 msgstr "*"
 
@@ -916,7 +929,7 @@ msgid "Add Address Book"
 msgstr "Yongeza Incwadi Yedilesi"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:757
+#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
 msgid "Always"
 msgstr "Rhoqo"
 
@@ -952,7 +965,7 @@ msgid "Lo_gin:"
 msgstr "N_gena:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:756
+#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
 msgid "Never"
 msgstr "Nakanye"
 
@@ -1103,7 +1116,8 @@ msgstr "_Indlela yokungena:"
 #: ../addressbook/gui/component/ldap-config.glade.h:47
 #: ../calendar/gui/dialogs/calendar-setup.c:244
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:164
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
 msgid "_Name:"
 msgstr "_Igama:"
 
@@ -1116,6 +1130,7 @@ msgid "_Search scope:"
 msgstr "_Ummandla okhangela kuwo:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../mail/mail-config.glade.h:171
 msgid "_Server:"
 msgstr "I_seva:"
 
@@ -1135,9 +1150,9 @@ msgstr "iikhadi"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1940
+#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
 #: ../plugins/calendar-http/calendar-http.c:263
-#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
 msgstr "imizuzu"
 
@@ -1178,21 +1193,23 @@ msgid "<b>Work</b>"
 msgstr "<b>Umsebenzi</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
 #: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "I-AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:181
+#: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
 msgstr "Qhagamshelana"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:531
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:525
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
 msgid "Contact Editor"
 msgstr "Umhleli woqhagamshelwano"
 
@@ -1233,7 +1250,7 @@ msgstr "Ifowuni"
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
 #: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
 #: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
 msgid "Work"
@@ -1257,7 +1274,7 @@ msgid "_Birthday:"
 msgstr "_Usuku lokuzalwa:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1631
+#: ../plugins/itip-formatter/itip-view.c:1662
 msgid "_Calendar:"
 msgstr "I_khalenda:"
 
@@ -1358,14 +1375,15 @@ msgstr "Idilesi"
 #: ../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:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:519
-#: ../addressbook/gui/widgets/e-minicard.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:520
+#: ../addressbook/gui/widgets/e-minicard.c:175
+#: ../widgets/menus/gal-define-views-model.c:181
 #: ../widgets/table/e-cell-text.c:1768 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
 #: ../widgets/text/e-text.c:3585
@@ -2341,6 +2359,8 @@ msgid "Zimbabwe"
 msgstr "I-Zimbabwe"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: ../plugins/exchange-operations/exchange-delegates.c:936
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
 #: ../plugins/plugin-manager/plugin-manager.c:44
 #: ../plugins/save-attachments/save-attachments.c:362
 #: ../widgets/menus/gal-view-new-dialog.c:73
@@ -2352,7 +2372,7 @@ msgid "AOL Instant Messenger"
 msgstr "Isigidimi esikhawulezayo se-AOL"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
 #: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "I-Jabber"
@@ -2362,7 +2382,7 @@ msgid "Yahoo Messenger"
 msgstr "Isigidimi se-Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "I-ICQ"
@@ -2383,63 +2403,69 @@ msgid "Username"
 msgstr "Igama lomsebenzisi"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Ekhaya"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Okunye"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "I-Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "I-MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "I-Groupwise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Incwadi Yemvelaphi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Incwadi Ekukhutshelwa Kuyo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Omtsha Oqhagamshelwana Naye"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Indawo Yokusabalalisa Onokubhala Kuyo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
 msgid "Required Fields"
 msgstr "Iindawo Ezifunekayo Zokusabalalisa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
 msgid "Changed"
 msgstr "Eguqulweyo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:535
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
+#, fuzzy, c-format
+msgid "Contact Editor - %s"
+msgstr "Umhleli woqhagamshelwano"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
 msgid "Please select an image for this contact"
 msgstr "Nceda ukhethe umfanekiso wolu qhagamshelwano"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
 msgid "No image"
 msgstr "Akukho mfanekiso"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2855
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2447,7 +2473,7 @@ msgstr ""
 "I-data yolu qhagamshelwano ayivumelekanga:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2907
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
 msgid "Invalid contact."
 msgstr "Uqhagamshelwano olungavumelekanga."
 
@@ -2600,7 +2626,9 @@ msgid "_IM Service:"
 msgstr "_Inkonzo ye-IM:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../plugins/calendar-weather/calendar-weather.c:410
+#: ../plugins/calendar-weather/calendar-weather.c:409
+#: ../plugins/exchange-operations/exchange-calendar.c:215
+#: ../plugins/exchange-operations/exchange-contacts.c:193
 msgid "_Location:"
 msgstr "_Indawo:"
 
@@ -2613,7 +2641,7 @@ msgid "Add an email to the List"
 msgstr "Yongeza i-imeyili kuluhlu"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:834
 msgid "Contact List Editor"
 msgstr "Umhleli Woluhlu Loqhagamshelwano"
 
@@ -2651,9 +2679,9 @@ msgstr ""
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:505
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
 msgstr "Incwadi"
 
@@ -2725,9 +2753,9 @@ msgstr[1] "Akukho mntu ungaqhagamshelana naye"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:512
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
 msgstr "Buza"
 
@@ -2749,35 +2777,35 @@ msgstr "Imodeli"
 msgid "Error modifying card"
 msgstr "Impazamo ekulungiseni ikhadi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:168
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "Igama liqala nge"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:169
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "I-imeyili iqala nge"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
 #: ../calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Udidi yi"
 
 #. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Any field contains"
 msgstr "Nayiphi na indawo iqulethe"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../addressbook/gui/widgets/e-addressbook-view.c:177
+#: ../addressbook/gui/widgets/e-addressbook-view.c:173
+#: ../addressbook/gui/widgets/e-addressbook-view.c:178
 msgid "Advanced..."
 msgstr "Ephambili..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Umthombo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:370
@@ -2785,73 +2813,94 @@ msgstr "Umthombo"
 msgid "Type"
 msgstr "Uhlobo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:543
+#: ../addressbook/gui/widgets/e-addressbook-view.c:544
 msgid "Address Book"
 msgstr "Incwadi Yedilesi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:806
-#: ../addressbook/gui/widgets/e-addressbook-view.c:924
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1986
+#: ../addressbook/gui/widgets/e-addressbook-view.c:807
+#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2011
 #: ../ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Yigcine njenge-VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:920
+#: ../addressbook/gui/widgets/e-addressbook-view.c:930
+#: ../calendar/gui/e-calendar-table.c:1154
+#: ../calendar/gui/e-calendar-view.c:1528 ../ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_Vula"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
 msgid "New Contact..."
 msgstr "Abatsha Ongaqhagamshelana Nabo..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:921
+#: ../addressbook/gui/widgets/e-addressbook-view.c:933
 msgid "New Contact List..."
 msgstr "Uluhlu Olutsha Loqhagamshelana Nabo..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:925
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 #: ../ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Dlulisa Uqhagamshelwano"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:926
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#, fuzzy
+msgid "Forward Contacts"
+msgstr "Dlulisa Uqhagamshelwano"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "Send Message to Contact"
 msgstr "Thumela Umyalezo koQhagamshelana naye"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:927
-#: ../calendar/gui/calendar-commands.c:120 ../calendar/gui/print.c:2501
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#, fuzzy
+msgid "Send Message to List"
+msgstr "Thumela Umyalezo koQhagamshelana naye"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#, fuzzy
+msgid "Send Message to Contacts"
+msgstr "Thumela Umyalezo koQhagamshelana naye"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
 #: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:74 ../ui/evolution-tasks.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Shicilela"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:930
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Copy to Address Book..."
 msgstr "Khuphela Kwincwadi Yedilesi..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:931
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "Move to Address Book..."
 msgstr "Yiya Kwincwadi Yedilesi..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:934
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 #: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Sika"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 #: ../calendar/gui/calendar-component.c:536
 #: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:11 ../ui/evolution-tasks.xml.h:2
+#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 #: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Ncamathelisa"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1539
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1562
 #: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "Naluphi Na Udidi"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1738
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1761
 #, fuzzy
 msgid "Print cards"
 msgstr "Shicilela Imisebenzi"
@@ -2896,7 +2945,7 @@ msgid "Company Phone"
 msgstr "Umnxeba Wenkampani"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
 #: ../smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "I-imeyile"
@@ -2994,6 +3043,7 @@ msgstr "Unomathotholo"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
 #: ../calendar/gui/e-meeting-list-view.c:378
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
 msgid "Role"
 msgstr "Indima"
 
@@ -3028,34 +3078,38 @@ msgid "Web Site"
 msgstr "I-Web Site"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:137
+#: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
 #: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
 #: ../widgets/table/e-table-click-to-add.c:517
 #: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-field-chooser-item.c:667
+#: ../widgets/table/e-table-group-container.c:971
+#: ../widgets/table/e-table-group-container.c:972
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3012 ../widgets/table/e-table-item.c:3013
 #: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
 msgid "Width"
 msgstr "Ububanzi"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:144
+#: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
 #: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-field-chooser-item.c:674
+#: ../widgets/table/e-table-group-container.c:964
+#: ../widgets/table/e-table-group-container.c:965
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
 #: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
 msgid "Height"
 msgstr "Ubude"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:152
+#: ../addressbook/gui/widgets/e-minicard.c:153
 msgid "Has Focus"
 msgstr "Inomgqaliselo"
 
@@ -3079,7 +3133,7 @@ msgstr "Ubude begama lendawo obubobona bukhulu"
 msgid "Column Width"
 msgstr "Ububanzi bekholam"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:171
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
 msgid ""
 "\n"
 "\n"
@@ -3093,7 +3147,7 @@ msgstr ""
 "\n"
 "okanye cofa apha kube kabini ukwenza Uqhagamshelwano olutsha."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:174
+#: ../addressbook/gui/widgets/e-minicard-view.c:175
 msgid ""
 "\n"
 "\n"
@@ -3107,7 +3161,7 @@ msgstr ""
 "\n"
 "Cofa apha kube kabini ukwenza Uqhagamshelwano olutsha."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:179
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3117,7 +3171,7 @@ msgstr ""
 "\n"
 "Funa oqhagamshelana naye."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -3127,15 +3181,15 @@ msgstr ""
 "\n"
 "Akukho nto inokuboniswa kulo mboniso."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:498
+#: ../addressbook/gui/widgets/e-minicard-view.c:499
 msgid "Adapter"
 msgstr "Isihlanganisi"
 
-#: ../addressbook/gui/widgets/e-minicard.c:160
+#: ../addressbook/gui/widgets/e-minicard.c:161
 msgid "Selected"
 msgstr "Ekhethiweyo"
 
-#: ../addressbook/gui/widgets/e-minicard.c:167
+#: ../addressbook/gui/widgets/e-minicard.c:168
 msgid "Has Cursor"
 msgstr "Inekhesa"
 
@@ -3150,7 +3204,7 @@ msgid "map"
 msgstr "umzobo obonisa ubume bovimba wolwazi"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:276
-#: ../addressbook/gui/widgets/eab-contact-display.c:543
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Amalungu Oluhlu"
 
@@ -3185,7 +3239,7 @@ msgid "WWW"
 msgstr "I-WWW"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:378
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Blog"
 msgstr "I-Blog"
 
@@ -3193,11 +3247,11 @@ msgstr "I-Blog"
 msgid "personal"
 msgstr "yeyakho buqu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Job Title"
 msgstr "Umsebenzi Owenzayo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:591
 msgid "Home page"
 msgstr "Iphepha lokuqala"
 
@@ -3231,6 +3285,7 @@ msgstr "Akukho Luhagamshelwano Buqu Luchaziweyo"
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
 #: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "Permission denied"
 msgstr "Imvume ikhatyiwe"
 
@@ -3253,9 +3308,9 @@ msgstr "Iimpawu nemithetho elawulayo ayixhaswa"
 #: ../addressbook/gui/widgets/eab-gui-util.c:61
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:232
-#: ../calendar/gui/e-cal-model-tasks.c:347
-#: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2364
+#: ../calendar/gui/e-cal-model-tasks.c:348
+#: ../calendar/gui/e-cal-model-tasks.c:661
+#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2364
 msgid "Cancelled"
 msgstr "Irhoxisiwe"
 
@@ -3266,7 +3321,7 @@ msgstr "Ayikwazanga ukuyirhoxisa"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../calendar/gui/comp-editor-factory.c:431
+#: ../calendar/gui/comp-editor-factory.c:438
 msgid "Authentication Failed"
 msgstr "Ubungqina abuphumelelanga"
 
@@ -3286,12 +3341,24 @@ msgstr "Ayifumaneki i-TLS"
 msgid "No such source"
 msgstr "Akukho mthombo unjalo"
 
-#. E_BOOK_ERROR_OTHER_ERROR
+#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
 #: ../addressbook/gui/widgets/eab-gui-util.c:68
+#, fuzzy
+msgid "Not available in offline mode"
+msgstr "Yiqalise ungekho kwi-intanethi"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Other error"
 msgstr "Enye impazamo"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:90
+#. E_BOOK_ERROR_INVALID_SERVER_VERSION
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#, fuzzy
+msgid "Invalid server version"
+msgstr "Ulwazi Ngeseva"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:93
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3302,15 +3369,16 @@ msgstr ""
 "ayikakhutshelwa ukusebenza ingekho kwi-intanethi. Nceda ukhuphele incwadi "
 "yedilesi nje ukuba ibe kwi-intanethi ukuze ukhuphele nekuquletheyo"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:98
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy, c-format
 msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
+"We were unable to open this addressbook.  Please check that the path %s "
+"exists and that you have permission to access it."
 msgstr ""
 "Asibanga nako ukuyivula le ncwadi yedilesi.  Nceda ukhangele ukuba ikho na "
 "indlela nokuba unayo na imvume yokufikelela kuyo."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:105
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3318,7 +3386,7 @@ msgstr ""
 "Asibanga nako ukuyivula le ncwadi yedilesi.  Oku kusenokuthetha ukuba ungene "
 "kwi-URI engachanekanga, okanye iseva ye-LDAP ayifikeleleki."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:115
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3328,7 +3396,7 @@ msgstr ""
 "ukusebenzisa i-LDAP kwi-Evolution, kufuneka ufake umqulu wenkqubo ovumela i-"
 "Evolution ye-LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:122
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3336,7 +3404,7 @@ msgstr ""
 "Asibanga nako ukuvula le ncwadi yedilesi.  Oku kunokuthetha ukuba ungene kwi-"
 "URI engachanekanga, okanye iseva yakho ayifumaneki."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:145
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3349,7 +3417,7 @@ msgstr ""
 "kwi\n"
 "iseva yovimba weefayili okhethelwe le ncwadi yedilesi."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:143
+#: ../addressbook/gui/widgets/eab-gui-util.c:151
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3361,49 +3429,49 @@ msgstr ""
 "kube kokukhethekileyo okanye nyusa ixesha olimiseleyo kuluhlu lwezinto\n"
 "ezikhethwa kwiseva yovimba weefayili wale ncwadi yedilesi."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:149
+#: ../addressbook/gui/widgets/eab-gui-util.c:157
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Unxulumano lwe-intanethi yale ncwadi yedilesi alubanganako ukutolika ulwimi "
 "lwalo mbuzo."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:160
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "Unxulumano lwe-intanethi yale ncwadi yedilesi ayivumanga ukuphendula lo "
 "mbuzo."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:155
+#: ../addressbook/gui/widgets/eab-gui-util.c:163
 msgid "This query did not complete successfully."
 msgstr "Lo mbuzo awugqitywanga ngempumelelo."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:185
 msgid "Error adding list"
 msgstr "Impazamo ngelixa kusongezwa uluhlu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
-#: ../addressbook/gui/widgets/eab-gui-util.c:675
+#: ../addressbook/gui/widgets/eab-gui-util.c:185
+#: ../addressbook/gui/widgets/eab-gui-util.c:693
 msgid "Error adding contact"
 msgstr "Impazamo ngelixa kusongezwa oqhagamshelana naye"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:196
 msgid "Error modifying list"
 msgstr "Impazamo ngelixa kulungiswa uluhlu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:196
 msgid "Error modifying contact"
 msgstr "Impazamo ngelixa kulungiswa oqhagamshelana naye"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:200
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
 msgid "Error removing list"
 msgstr "Impazamo ngelixa kususwa uluhlu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:200
-#: ../addressbook/gui/widgets/eab-gui-util.c:633
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:648
 msgid "Error removing contact"
 msgstr "Impazamo ngelixa kususwa oqhagamshelana naye"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:282
+#: ../addressbook/gui/widgets/eab-gui-util.c:290
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3414,7 +3482,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:311
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3423,15 +3491,15 @@ msgstr ""
 "%s sele ikho\n"
 "Ingaba ufuna ukubhala phezu kwayo?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:315
+#: ../addressbook/gui/widgets/eab-gui-util.c:323
 msgid "Overwrite"
 msgstr "Ukubhala phezu kokubhaliweyo"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:360
-#: ../addressbook/gui/widgets/eab-gui-util.c:363
+#: ../addressbook/gui/widgets/eab-gui-util.c:368
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
 #, fuzzy
 msgid "contact"
 msgid_plural "contacts"
@@ -3439,39 +3507,39 @@ msgstr[0] "Qhagamshelana"
 msgstr[1] "Qhagamshelana"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:410
+#: ../addressbook/gui/widgets/eab-gui-util.c:418
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:580
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "uluhlu"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:729
+#: ../addressbook/gui/widgets/eab-gui-util.c:754
 msgid "Move contact to"
 msgstr "Susa oqhagamshelana naye umse ku"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:731
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Copy contact to"
 msgstr "Khuphela oqhagamshelana naye kwi"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:734
+#: ../addressbook/gui/widgets/eab-gui-util.c:759
 msgid "Move contacts to"
 msgstr "Susa oqhagamshelwana nabo ubase ku"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:736
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Copy contacts to"
 msgstr "Khuphela oqhagamshelana nabo kwi"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:739
+#: ../addressbook/gui/widgets/eab-gui-util.c:764
 msgid "Select target addressbook."
 msgstr "Khetha incwadi yedilesi ojolise kuyo."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:962
+#: ../addressbook/gui/widgets/eab-gui-util.c:987
 msgid "Multiple VCards"
 msgstr "Ii-VCards ezininzi"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:965
+#: ../addressbook/gui/widgets/eab-gui-util.c:990
 #, c-format
 msgid "VCard for %s"
 msgstr "I-VCard ye%s"
@@ -3507,7 +3575,7 @@ msgstr "Yongeza idilesi koqhagamshelana naye nosele ekho kwi-\"%s\""
 msgid "Querying Address Book..."
 msgstr "Ukubuza Ngencwadi Yedilesi..."
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:970
+#: ../addressbook/gui/widgets/eab-popup-control.c:968
 msgid "Merge E-Mail Address"
 msgstr "Dibanisa Idilesi ye-Imeyili"
 
@@ -3539,22 +3607,30 @@ msgstr "Isibonisi-khadi"
 msgid "GTK Tree View"
 msgstr "Isibonisi semo-mthi i-GTK"
 
-#: ../addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
-msgstr "I-Evolution yesingenisi se-LDIF"
+#: ../addressbook/importers/evolution-ldif-importer.c:486
+#: ../addressbook/importers/evolution-vcard-importer.c:249
+#: ../calendar/importers/icalendar-importer.c:311
+#: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
+#, fuzzy
+msgid "Importing ..."
+msgstr "Ukungenisa..."
 
-#: ../addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+#: ../addressbook/importers/evolution-ldif-importer.c:652
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "I-LDAP eyi-format yokutshintsha-tshintsha i-data (.ldif)"
 
-#: ../addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Evolution VCard Importer"
-msgstr "I-Evolution yesingenisi se-VCard"
+#: ../addressbook/importers/evolution-ldif-importer.c:653
+msgid "Evolution LDIF importer"
+msgstr "I-Evolution yesingenisi se-LDIF"
 
-#: ../addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#: ../addressbook/importers/evolution-vcard-importer.c:529
 msgid "VCard (.vcf, .gcrd)"
 msgstr "I-VCard (.vcf, .gcrd)"
 
+#: ../addressbook/importers/evolution-vcard-importer.c:530
+msgid "Evolution VCard Importer"
+msgstr "I-Evolution yesingenisi se-VCard"
+
 #: ../addressbook/printing/e-contact-print-envelope.c:213
 #: ../addressbook/printing/e-contact-print-envelope.c:234
 msgid "Print envelope"
@@ -3718,7 +3794,11 @@ msgstr "Amacandelo:"
 msgid "Shading"
 msgstr "Faka umbala"
 
+#. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
+#: ../plugins/exchange-operations/exchange-account-setup.c:917
+#: ../plugins/exchange-operations/exchange-calendar.c:205
+#: ../plugins/exchange-operations/exchange-contacts.c:176
 msgid "Size:"
 msgstr "Ubungakanani:"
 
@@ -3769,8 +3849,8 @@ msgstr "Ukuvavanya Ushicilelo Loqhagamshelwano"
 msgid "This should test the contact print code"
 msgstr "Le kufuneka ivavanye ikhowudi yoshicilelo loqhagamshelwano"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:664
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:700
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Ayikwazi ukuvula ifayili"
@@ -4074,7 +4154,7 @@ msgid "Save Changes"
 msgstr "Gcina Iinguqu"
 
 #: ../calendar/calendar.error.xml.h:40
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Send"
 msgstr "Thumela"
 
@@ -4184,13 +4264,12 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Imisebenzi yakho ayinakufumaneka de i-Evolution iqalwe kwakhona."
 
 #: ../calendar/calendar.error.xml.h:64
-#: ../ui/evolution-message-composer.xml.h:49
-#: ../ui/evolution-signature-editor.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_Save"
 msgstr "_Gcina"
 
 #: ../calendar/calendar.error.xml.h:65
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:118
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
 msgid "_Send"
 msgstr "_Thumela"
 
@@ -4207,15 +4286,15 @@ msgstr "Faka i-password"
 msgid "Split Multi-Day Events:"
 msgstr "Usuku Olunezehlo Ezininzi Ezahlukahlukanisiweyo:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1359
-#: ../calendar/conduits/calendar/calendar-conduit.c:1360
+#: ../calendar/conduits/calendar/calendar-conduit.c:1365
+#: ../calendar/conduits/calendar/calendar-conduit.c:1366
 #: ../calendar/conduits/todo/todo-conduit.c:879
 #: ../calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
 msgstr "Ayikwazanga ukuqala i-evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1468
-#: ../calendar/conduits/calendar/calendar-conduit.c:1471
+#: ../calendar/conduits/calendar/calendar-conduit.c:1474
+#: ../calendar/conduits/calendar/calendar-conduit.c:1477
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "Ayikwazanga ukufunda ikhalenda yolwimi lokwenza izinto zokufunda kwibhloko "
@@ -4236,7 +4315,7 @@ msgid "Calendar and Tasks"
 msgstr "Ikhalenda neMisebenzi"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1292
+#: ../calendar/gui/calendar-component.c:1309
 msgid "Calendars"
 msgstr "Iikhalenda"
 
@@ -4269,12 +4348,14 @@ msgid "Evolution's Tasks component"
 msgstr "Ilungu lemisebenzi ye-Evolution"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1222 ../calendar/gui/print.c:1822
-#: ../calendar/gui/tasks-component.c:519 ../calendar/gui/tasks-component.c:994
-#: ../calendar/gui/tasks-control.c:408
-#: ../calendar/importers/icalendar-importer.c:83
-#: ../calendar/importers/icalendar-importer.c:701
-#: ../plugins/groupwise-features/camel-gw-listener.c:383
+#: ../calendar/gui/e-tasks.c:1257 ../calendar/gui/print.c:1822
+#: ../calendar/gui/tasks-component.c:519
+#: ../calendar/gui/tasks-component.c:1006 ../calendar/gui/tasks-control.c:457
+#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/importers/icalendar-importer.c:707
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:582
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Imisebenzi"
 
@@ -4297,12 +4378,12 @@ msgid_plural "minutes"
 msgstr[0] "umzuzu"
 msgstr[1] "imizuzu"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:248
 #, fuzzy
 msgid "Start time"
 msgstr "Ixesha lokuqala:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:312
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:347
 #, c-format
 msgid ""
 "<big><b>%s</b></big>\n"
@@ -4310,14 +4391,15 @@ msgid ""
 msgstr ""
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
 #, fuzzy
 msgid "Appointments"
 msgstr "Idinga"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1118
-#: ../plugins/itip-formatter/itip-view.c:863
+#: ../calendar/gui/e-itip-control.c:1120
+#: ../plugins/itip-formatter/itip-view.c:884
 msgid "Location:"
 msgstr "Indawo:"
 
@@ -4329,13 +4411,14 @@ msgstr "Ixesha _elinika iziqabu:"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:13
 #: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:8
 #: ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-message-composer.xml.h:42
-#: ../ui/evolution-signature-editor.xml.h:12
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:22
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-signature-editor.xml.h:23
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution.xml.h:35
 msgid "_Edit"
 msgstr "_Hlela"
 
@@ -4425,11 +4508,11 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Musa ukundibuza ngale nkqubo kwakhona."
 
-#: ../calendar/gui/alarm-notify/notify-main.c:139
+#: ../calendar/gui/alarm-notify/notify-main.c:140
 msgid "Could not initialize Bonobo"
 msgstr "Ayikwazi ukuqala i-Bonobo"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:150
+#: ../calendar/gui/alarm-notify/notify-main.c:151
 msgid "Could not create the alarm notify service factory"
 msgstr "Ayikwazanga ukwenza inkampani yenkonzo yesandi sokwazisa"
 
@@ -4802,16 +4885,17 @@ msgstr "Indawo iqulethe"
 msgid "Unmatched"
 msgstr "Ezingahambelaniyo"
 
-#: ../calendar/gui/calendar-commands.c:120
+#: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:1974
-#: ../plugins/groupwise-features/camel-gw-listener.c:382
-#: ../plugins/groupwise-features/camel-gw-listener.c:412
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/gnome-cal.c:2094
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
 msgid "Calendar"
 msgstr "Ikhalenda"
 
-#: ../calendar/gui/calendar-commands.c:355
+#: ../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 "
@@ -4821,15 +4905,15 @@ msgstr ""
 "ebezilikhethelwe. Ukuba uyaqhubeka, awunakuba nako ukuzifumana kwakhona ezo "
 "zehlo."
 
-#: ../calendar/gui/calendar-commands.c:361
+#: ../calendar/gui/calendar-commands.c:360
 msgid "Purge events older than"
 msgstr "Susa iziganeko ezindala kune"
 
-#: ../calendar/gui/calendar-commands.c:366
+#: ../calendar/gui/calendar-commands.c:365
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
 #: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
-#: ../plugins/calendar-weather/calendar-weather.c:566
+#: ../plugins/calendar-weather/calendar-weather.c:565
 #: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
 msgstr "iintsuku"
@@ -4853,72 +4937,72 @@ msgid "Weather"
 msgstr "Imozulu"
 
 #: ../calendar/gui/calendar-component.c:535
-#: ../calendar/gui/dialogs/calendar-setup.c:450
+#: ../calendar/gui/dialogs/calendar-setup.c:449
 msgid "New Calendar"
 msgstr "Ikhalenda Entsha"
 
-#: ../calendar/gui/calendar-component.c:843
+#: ../calendar/gui/calendar-component.c:858
 msgid "Failed upgrading calendars."
 msgstr "Ayiphumelelanga ukuphucula iikhalenda."
 
-#: ../calendar/gui/calendar-component.c:1139
+#: ../calendar/gui/calendar-component.c:1154
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Ayinako ukuvula ikhalenda '%s' yokwenza iziganeko neentlanganiso"
 
-#: ../calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1170
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Akukho khalenda ifumanekayo ukwenza iziganeko neentlanganiso"
 
-#: ../calendar/gui/calendar-component.c:1267
+#: ../calendar/gui/calendar-component.c:1284
 msgid "Calendar Source Selector"
 msgstr "Isikhethi Somthombo Wekhalenda"
 
-#: ../calendar/gui/calendar-component.c:1458
+#: ../calendar/gui/calendar-component.c:1475
 msgid "New appointment"
 msgstr "Idinga elitsha"
 
-#: ../calendar/gui/calendar-component.c:1459
+#: ../calendar/gui/calendar-component.c:1476
 msgid "_Appointment"
 msgstr "_Idinga"
 
-#: ../calendar/gui/calendar-component.c:1460
+#: ../calendar/gui/calendar-component.c:1477
 msgid "Create a new appointment"
 msgstr "Yenza idinga elitsha"
 
-#: ../calendar/gui/calendar-component.c:1466
+#: ../calendar/gui/calendar-component.c:1483
 msgid "New meeting"
 msgstr "Intlanganiso entsha"
 
-#: ../calendar/gui/calendar-component.c:1467
+#: ../calendar/gui/calendar-component.c:1484
 msgid "M_eeting"
 msgstr "Intla_nganiso"
 
-#: ../calendar/gui/calendar-component.c:1468
+#: ../calendar/gui/calendar-component.c:1485
 msgid "Create a new meeting request"
 msgstr "Yenza isicelo sentlanganiso entsha"
 
-#: ../calendar/gui/calendar-component.c:1474
+#: ../calendar/gui/calendar-component.c:1491
 msgid "New all day appointment"
 msgstr "Idinga elitsha losuku lonke"
 
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1492
 msgid "All Day A_ppointment"
 msgstr "I_dinga Losuku Lonke"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1493
 msgid "Create a new all-day appointment"
 msgstr "Yenza idinga elitsha losuku-lonke"
 
-#: ../calendar/gui/calendar-component.c:1482
+#: ../calendar/gui/calendar-component.c:1499
 msgid "New calendar"
 msgstr "Ikhalenda entsha"
 
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1500
 msgid "Cale_ndar"
 msgstr "Ikha_lenda"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1501
 msgid "Create a new calendar"
 msgstr "Yenza ikhalenda entsha"
 
@@ -4938,19 +5022,19 @@ msgstr "Ukujonga ubume beveki"
 msgid "Month View"
 msgstr "Ukujonga ubume benyanga"
 
-#: ../calendar/gui/comp-editor-factory.c:413
+#: ../calendar/gui/comp-editor-factory.c:420
 msgid "Error while opening the calendar"
 msgstr "Impazamo ngelixa kuvulwa ikhalenda"
 
-#: ../calendar/gui/comp-editor-factory.c:419
+#: ../calendar/gui/comp-editor-factory.c:426
 msgid "Method not supported when opening the calendar"
 msgstr "Indlela ayixhaswanga ngelixa kuvulwa ikhalenda"
 
-#: ../calendar/gui/comp-editor-factory.c:425
+#: ../calendar/gui/comp-editor-factory.c:432
 msgid "Permission denied to open the calendar"
 msgstr "Imvume yokuvula ikhalenda ayamkelwanga"
 
-#: ../calendar/gui/comp-editor-factory.c:437 ../shell/e-shell.c:1288
+#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1267
 msgid "Unknown error"
 msgstr "Impazamo engaziwayo"
 
@@ -5050,7 +5134,7 @@ msgstr "i(i)yure"
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
 #: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:565
+#: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "hours"
 msgstr "iiyure"
 
@@ -5076,48 +5160,62 @@ msgstr "Izandi ezilumkisayo"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:110
 #: ../composer/e-msg-composer-attachment-bar.c:105
+#: ../widgets/misc/e-attachment-bar.c:106
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:113
 #: ../composer/e-msg-composer-attachment-bar.c:108
+#: ../widgets/misc/e-attachment-bar.c:109
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:116
 #: ../composer/e-msg-composer-attachment-bar.c:111
+#: ../widgets/misc/e-attachment-bar.c:112
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:311
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:438
+#: ../calendar/gui/dialogs/comp-editor.c:2440
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
+#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
 msgid "attachment"
 msgstr "isiqhoboshelo"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/meeting-page.c:889
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/meeting-page.c:887
 #: ../composer/e-msg-composer-attachment-bar.c:470
+#: ../composer/e-msg-composer.c:3400
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Susa"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
+#: ../calendar/gui/dialogs/comp-editor.c:1084
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:28
+#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2047
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "_Iimpawu"
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:476
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 #: ../composer/e-msg-composer-attachment-bar.c:473
+#: ../composer/e-msg-composer.c:3403
 msgid "_Add attachment..."
 msgstr "_Yongeza isiqhoboshelo..."
 
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:736
 #: ../composer/e-msg-composer-attachment-bar.c:740
+#: ../widgets/misc/e-attachment-bar.c:963
 msgid "Attachment Bar"
 msgstr "Uphawu Lwesiqhoboshelo"
 
@@ -5125,13 +5223,14 @@ msgstr "Uphawu Lwesiqhoboshelo"
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:6
-#: ../composer/e-msg-composer-select-file.c:96
-#: ../composer/e-msg-composer-select-file.c:116
+#: ../composer/e-msg-composer-select-file.c:97
+#: ../composer/e-msg-composer-select-file.c:117
+#: ../widgets/misc/e-attachment.glade.h:6
 msgid "Suggest automatic display of attachment"
 msgstr "Cebisa indlela ezenzekelayo yokubonisa isiqhoboshelo kwiskrini"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:235
+#: ../composer/e-msg-composer-select-file.c:241
 msgid "Attach file(s)"
 msgstr "Qhoboshela i(ii)fayili"
 
@@ -5143,6 +5242,8 @@ msgstr "Qhoboshela i(ii)fayili"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
+#: ../widgets/misc/e-attachment.c:221 ../widgets/misc/e-attachment.c:237
+#: ../widgets/misc/e-attachment.c:425 ../widgets/misc/e-attachment.c:441
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Ayikwazi ukuqhoboshela ifayili %s: %s"
@@ -5151,37 +5252,41 @@ msgstr "Ayikwazi ukuqhoboshela ifayili %s: %s"
 #: ../calendar/gui/dialogs/cal-attachment.c:327
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
+#: ../widgets/misc/e-attachment.c:229 ../widgets/misc/e-attachment.c:433
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Ayikwazi ukuqhoboshela ifayili %s: asiyofayili iqhelekileyo"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
 #: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Iimpawu Zesiqhoboshelo"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1164
+#: ../calendar/gui/e-itip-control.c:1166
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
 msgid "Description:"
 msgstr "Inkcazelo:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:4
 #: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
 msgid "File name:"
 msgstr "Igama lefayili:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:5
 #: ../composer/e-msg-composer-attachment.glade.h:5
+#: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "Uhlobo lwe-MIME:"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:476 ../mail/em-composer-prefs.c:888
+#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:891
 #: ../plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Yenziwe ukuba isebenze"
@@ -5201,16 +5306,16 @@ msgstr "Musa Ukususa"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
-#: ../mail/em-account-prefs.c:323 ../mail/em-account-prefs.c:351
-#: ../mail/em-account-prefs.c:382
+#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
+#: ../mail/em-account-prefs.c:406
 msgid "Disable"
 msgstr "Yenza ukuba ingasebenzi"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
-#: ../mail/em-account-prefs.c:323 ../mail/em-account-prefs.c:351
-#: ../mail/em-account-prefs.c:384
+#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
+#: ../mail/em-account-prefs.c:408
 msgid "Enable"
 msgstr "Ukwenza ukuba isebenze"
 
@@ -5304,8 +5409,8 @@ msgid "Free/Busy"
 msgstr "Engahlawulwayo/Ixakekile"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Friday"
 msgstr "Ulwesihlanu"
 
@@ -5318,8 +5423,8 @@ msgid "Minutes"
 msgstr "Imizuzu"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1042
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Monday"
 msgstr "Umvulo"
 
@@ -5333,8 +5438,8 @@ msgid "S_un"
 msgstr "I_langa"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Saturday"
 msgstr "Umgqibelo"
 
@@ -5347,8 +5452,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Bonisa iinombolo_zeveki kumhloli onemihla"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Sunday"
 msgstr "Icawe"
 
@@ -5365,8 +5470,8 @@ msgid "Template:"
 msgstr "Isikhokelo:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Thursday"
 msgstr "Ulwesine"
 
@@ -5379,8 +5484,8 @@ msgid "Time format:"
 msgstr "Ukumiswa kwexesha:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Tuesday"
 msgstr "Ulwesibini"
 
@@ -5389,8 +5494,8 @@ msgid "W_eek starts:"
 msgstr "Ukuqala kweve_ki:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Wednesday"
 msgstr "Ulwesithathu"
 
@@ -5482,16 +5587,16 @@ msgstr ""
 "Khuphela okuqulethwe yincwadi ebotshelelweyo ukuze uyisebenzise xa ungekho "
 "kwi-intanethi"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:341
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "U_mbala:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:378
 msgid "Tasks List"
 msgstr "Uluhlu Lwemisebenzi"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:448
+#: ../calendar/gui/dialogs/calendar-setup.c:447
 msgid "Calendar Properties"
 msgstr "Iimpawu Zekhalenda"
 
@@ -5522,7 +5627,7 @@ msgstr "_Yongeza Uluhlu Lomsebenzi"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 #: ../plugins/calendar-http/calendar-http.c:248
-#: ../plugins/calendar-weather/calendar-weather.c:549
+#: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
 msgstr "_Hlaziya:"
 
@@ -5533,7 +5638,7 @@ msgstr "I-_URL:"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:15
 #: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
-#: ../plugins/calendar-weather/calendar-weather.c:567
+#: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
 msgstr "iiveki"
 
@@ -5606,105 +5711,105 @@ msgstr " (Ilindelekile "
 msgid "Due "
 msgstr "Ilindelekile "
 
-#: ../calendar/gui/dialogs/comp-editor.c:184 ../composer/e-msg-composer.c:2654
+#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
 #, c-format
 msgid "Attached message - %s"
 msgstr "Umyalezo oqhotyoshelweyo - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:189
-#: ../calendar/gui/dialogs/comp-editor.c:358 ../composer/e-msg-composer.c:2659
-#: ../composer/e-msg-composer.c:2835
+#: ../calendar/gui/dialogs/comp-editor.c:195
+#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
+#: ../composer/e-msg-composer.c:2846
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Umyalezo oqhotyoshelweyo"
 msgstr[1] "%d Imiyalezo eqhotyoshelweyo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:421
-#: ../calendar/gui/e-calendar-table.c:1164
-#: ../calendar/gui/e-calendar-view.c:1513 ../composer/e-msg-composer.c:2899
-#: ../mail/em-folder-tree.c:1047 ../mail/em-folder-view.c:1033
+#: ../calendar/gui/dialogs/comp-editor.c:428
+#: ../calendar/gui/e-calendar-table.c:1162
+#: ../calendar/gui/e-calendar-view.c:1535 ../composer/e-msg-composer.c:2911
+#: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
 #: ../mail/message-list.c:1708 ../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:100 ../ui/evolution-tasks.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
 msgid "_Copy"
 msgstr "_Kopa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:422 ../composer/e-msg-composer.c:2900
-#: ../mail/em-folder-tree.c:1048 ../mail/em-folder-utils.c:383
-#: ../mail/em-folder-view.c:929 ../mail/message-list.c:1709
+#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
+#: ../mail/em-folder-tree.c:975 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
 msgid "_Move"
 msgstr "_Shenxisa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:424 ../composer/e-msg-composer.c:2902
-#: ../mail/em-folder-tree.c:1050 ../mail/message-list.c:1711
+#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
+#: ../mail/em-folder-tree.c:977 ../mail/message-list.c:1711
 msgid "Cancel _Drag"
 msgstr "Rhoxisa _Utsalo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:697
+#: ../calendar/gui/dialogs/comp-editor.c:774
 msgid "Could not update object"
 msgstr "Akunako ukuhlaziya le nto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:883 ../composer/e-msg-composer.c:2308
+#: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
 #, fuzzy, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Ifayili iqhotyoshelwe"
 msgstr[1] "<b>%d</b> Iifayili ziqhotyoshelwe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:978
+#: ../calendar/gui/dialogs/comp-editor.c:1249
 #, fuzzy
 msgid "_Attachment Bar (drop attachments here)"
 msgstr "Fihla _Uphawu Lwesiqhoboshelo (zibeke apha iziqhoboshelo)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1588
-#: ../calendar/gui/dialogs/comp-editor.c:1631
+#: ../calendar/gui/dialogs/comp-editor.c:1850
+#: ../calendar/gui/dialogs/comp-editor.c:1893
 msgid "Edit Appointment"
 msgstr "Hlela Idinga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1594
-#: ../calendar/gui/dialogs/comp-editor.c:1637
+#: ../calendar/gui/dialogs/comp-editor.c:1856
+#: ../calendar/gui/dialogs/comp-editor.c:1899
 #, c-format
 msgid "Meeting - %s"
 msgstr "Intlanganiso - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1596
-#: ../calendar/gui/dialogs/comp-editor.c:1639
+#: ../calendar/gui/dialogs/comp-editor.c:1858
+#: ../calendar/gui/dialogs/comp-editor.c:1901
 #, c-format
 msgid "Appointment - %s"
 msgstr "Idinga - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1600
-#: ../calendar/gui/dialogs/comp-editor.c:1643
+#: ../calendar/gui/dialogs/comp-editor.c:1862
+#: ../calendar/gui/dialogs/comp-editor.c:1905
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Umsebenzi owunikiweyo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1602
-#: ../calendar/gui/dialogs/comp-editor.c:1645
+#: ../calendar/gui/dialogs/comp-editor.c:1864
+#: ../calendar/gui/dialogs/comp-editor.c:1907
 #, c-format
 msgid "Task - %s"
 msgstr "Umsebenzi - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1605
-#: ../calendar/gui/dialogs/comp-editor.c:1648
+#: ../calendar/gui/dialogs/comp-editor.c:1867
+#: ../calendar/gui/dialogs/comp-editor.c:1910
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Okungenisiweyo kwijenali - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1616
-#: ../calendar/gui/dialogs/comp-editor.c:1658
+#: ../calendar/gui/dialogs/comp-editor.c:1878
+#: ../calendar/gui/dialogs/comp-editor.c:1920
 msgid "No summary"
 msgstr "Akukho sishwankathelo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2137
-#: ../calendar/gui/dialogs/comp-editor.c:2170
-#: ../calendar/gui/dialogs/comp-editor.c:2194
+#: ../calendar/gui/dialogs/comp-editor.c:2528
+#: ../calendar/gui/dialogs/comp-editor.c:2561
+#: ../calendar/gui/dialogs/comp-editor.c:2585
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Iinguquko ezenziwe kule nto zingalahlwa xa kunokufika uhlaziyo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2218
+#: ../calendar/gui/dialogs/comp-editor.c:2609
 msgid "Unable to use current version!"
 msgstr "Ayinako ukusebenzisa uhlobo olukhoyo ngoku!"
 
@@ -5773,6 +5878,7 @@ msgid "Contacts..."
 msgstr "Abantu oqhagamshelana nabo..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-delegates.c:421
 msgid "Delegate To:"
 msgstr "Thumela u:"
 
@@ -5788,72 +5894,72 @@ msgstr "Idinga"
 msgid "Recurrence"
 msgstr "Ukwenzeka kwakhona"
 
-#: ../calendar/gui/dialogs/event-editor.c:166
-#: ../calendar/gui/dialogs/event-editor.c:249
+#: ../calendar/gui/dialogs/event-editor.c:164
+#: ../calendar/gui/dialogs/event-editor.c:248
 #: ../calendar/gui/dialogs/event-editor.c:422
 msgid "Scheduling"
 msgstr "Ukumisa uludwe lweenkqubo"
 
-#: ../calendar/gui/dialogs/event-editor.c:175
+#: ../calendar/gui/dialogs/event-editor.c:174
 #, fuzzy
 msgid "Delegatees"
 msgstr "Othunyiweyo"
 
-#: ../calendar/gui/dialogs/event-editor.c:179
+#: ../calendar/gui/dialogs/event-editor.c:178
 #, fuzzy
 msgid "Attendees"
 msgstr "Okhoyo"
 
-#: ../calendar/gui/dialogs/event-editor.c:252
+#: ../calendar/gui/dialogs/event-editor.c:251
 #: ../calendar/gui/dialogs/event-editor.c:425
 msgid "Invitations"
 msgstr "Izimemo"
 
-#: ../calendar/gui/dialogs/event-page.c:725
+#: ../calendar/gui/dialogs/event-page.c:731
 msgid "Event with no start date"
 msgstr "Isehlo esingenawo umhla wokuqalisa"
 
-#: ../calendar/gui/dialogs/event-page.c:728
+#: ../calendar/gui/dialogs/event-page.c:734
 msgid "Event with no end date"
 msgstr "Isehlo esingenawo umhla wokuyeka"
 
-#: ../calendar/gui/dialogs/event-page.c:894
+#: ../calendar/gui/dialogs/event-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:556
 msgid "Start date is wrong"
 msgstr "Umhla wokuqalisa awuchanekanga"
 
-#: ../calendar/gui/dialogs/event-page.c:904
+#: ../calendar/gui/dialogs/event-page.c:910
 msgid "End date is wrong"
 msgstr "Umhla wokuyeka awuchanekanga"
 
-#: ../calendar/gui/dialogs/event-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:933
 msgid "Start time is wrong"
 msgstr "Ixesha lokuqalisa alichanekanga"
 
-#: ../calendar/gui/dialogs/event-page.c:934
+#: ../calendar/gui/dialogs/event-page.c:940
 msgid "End time is wrong"
 msgstr "Ixesha lokuyeka awuchanekanga"
 
-#: ../calendar/gui/dialogs/event-page.c:1680
+#: ../calendar/gui/dialogs/event-page.c:1686
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Ayiphumelelanga ukuvula ikhalenda '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:1886
+#: ../calendar/gui/dialogs/event-page.c:1892
 #, fuzzy, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "Usuku olunye ngaphambi kwedinga"
 msgstr[1] "Usuku olunye ngaphambi kwedinga"
 
-#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/event-page.c:1900
 #, fuzzy, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "Iyure enye ngaphambi kwedinga"
 msgstr[1] "Iyure enye ngaphambi kwedinga"
 
-#: ../calendar/gui/dialogs/event-page.c:1902
+#: ../calendar/gui/dialogs/event-page.c:1908
 #, fuzzy, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -5916,8 +6022,8 @@ msgstr "Uhl_elo:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:8
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:305
-#: ../calendar/gui/e-calendar-table.c:362
+#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:360
 msgid "Confidential"
 msgstr "Yimfihlo"
 
@@ -5931,15 +6037,15 @@ msgstr "Inda_wo:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 #: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:303
-#: ../calendar/gui/e-calendar-table.c:361
+#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:359
 msgid "Private"
 msgstr "Yabucala"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:18
 #: ../calendar/gui/dialogs/task-page.glade.h:11
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:294
-#: ../calendar/gui/e-cal-model.c:301 ../calendar/gui/e-calendar-table.c:360
+#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:358
 msgid "Public"
 msgstr "Uwonkewonke"
 
@@ -5991,33 +6097,34 @@ msgstr "<b>Ekhaya</b>"
 #. is not permitted.
 #: ../calendar/gui/dialogs/meeting-page.c:313
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:652
-#: ../calendar/gui/e-itip-control.c:1104 ../composer/e-msg-composer.c:2112
+#: ../calendar/gui/e-cal-model-tasks.c:653
+#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
 #: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1346 ../mail/em-account-prefs.c:437
-#: ../mail/em-folder-view.c:1062
-#: ../plugins/calendar-weather/calendar-weather.c:371
-#: ../plugins/calendar-weather/calendar-weather.c:425
-#: ../plugins/itip-formatter/itip-formatter.c:1539
+#: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
+#: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
+#: ../plugins/calendar-weather/calendar-weather.c:370
+#: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/itip-formatter/itip-formatter.c:1627
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
 #: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
 #: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
 msgid "None"
 msgstr "Nanye"
 
-#: ../calendar/gui/dialogs/meeting-page.c:463
+#: ../calendar/gui/dialogs/meeting-page.c:461
 msgid "The organizer selected no longer has an account."
 msgstr "Lo mququzeleli umkhethileyo akasenayo i-akhawunti."
 
-#: ../calendar/gui/dialogs/meeting-page.c:469
+#: ../calendar/gui/dialogs/meeting-page.c:467
 msgid "An organizer is required."
 msgstr "Kufuneka umququzeleli."
 
-#: ../calendar/gui/dialogs/meeting-page.c:484
+#: ../calendar/gui/dialogs/meeting-page.c:482
 msgid "At least one attendee is required."
 msgstr "Kufuneka kubekho umntu omnye ubuncinane."
 
-#: ../calendar/gui/dialogs/meeting-page.c:886
+#: ../calendar/gui/dialogs/meeting-page.c:884
 msgid "_Delegate To..."
 msgstr "_Thumela ku..."
 
@@ -6134,87 +6241,92 @@ msgstr "Iqela Loluhlu Lomsebenzi"
 msgid "Task List Name"
 msgstr "Igama Loluhlu Lomsebenzi"
 
-#: ../calendar/gui/dialogs/recur-comp.c:51
+#: ../calendar/gui/dialogs/recur-comp.c:52
 msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr "Ulungisa isehlo esiziphindaphindayo, yintoni ofuna ukuyilungisa?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:54
+#, fuzzy
+msgid "You are delegating a recurring event, what would like to delegate?"
+msgstr "Ulungisa isehlo esiziphindaphindayo, yintoni ofuna ukuyilungisa?"
+
+#: ../calendar/gui/dialogs/recur-comp.c:58
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Ulungisa umsebenzi oziphindaphindayo, yintoni ofuna ukuyilungisa?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:62
 msgid ""
 "You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 "Ulungisa ingeniso yejenali eziphindaphindayo, yintoni ofuna ukuyilungisa?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "Kweli Tyeli Kuphela"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "Kweli naKwelingaphambili Ityeli"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "Kweli Nakwelizayo Ityeli"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "Kuwo onke Amatyeli"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:494
+#: ../calendar/gui/dialogs/recurrence-page.c:496
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Eli dinga liqulethe izenzo eziphindaphindayo yaye i-Evolution ayikwazi "
 "ukuzihlela."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:815
+#: ../calendar/gui/dialogs/recurrence-page.c:817
 msgid "Recurrence date is invalid"
 msgstr "Umhla wezenzo eziphindaphindayo awusebenzi"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:926
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "ivuliwe"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:986
+#: ../calendar/gui/dialogs/recurrence-page.c:988
 msgid "first"
 msgstr "kuqala"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:987
+#: ../calendar/gui/dialogs/recurrence-page.c:989
 msgid "second"
 msgstr "isibini"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:988
+#: ../calendar/gui/dialogs/recurrence-page.c:990
 msgid "third"
 msgstr "isithathu"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:989
+#: ../calendar/gui/dialogs/recurrence-page.c:991
 msgid "fourth"
 msgstr "isine"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#: ../calendar/gui/dialogs/recurrence-page.c:992
 msgid "last"
 msgstr "okugqibela"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1013
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 msgid "Other Date"
 msgstr "Omnye Umhla"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "day"
 msgstr "usuku"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1178
+#: ../calendar/gui/dialogs/recurrence-page.c:1180
 msgid "on the"
 msgstr "ngomhla we-"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1367
+#: ../calendar/gui/dialogs/recurrence-page.c:1369
 msgid "occurrences"
 msgstr "izenzeko"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2323
+#: ../calendar/gui/dialogs/recurrence-page.c:2325
 msgid "Date/Time"
 msgstr "Umhla/Ixesha"
 
@@ -6264,7 +6376,7 @@ msgid "year(s)"
 msgstr "u(imi)nyaka"
 
 #: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:429
+#: ../calendar/gui/dialogs/task-details-page.c:430
 msgid "Completed date is wrong"
 msgstr "Umhla ozalisiweyo awuchanekanga"
 
@@ -6284,9 +6396,9 @@ msgstr "<span weight=\"bold\">Ubume</span>"
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
 #: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-cal-model-tasks.c:345
-#: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/e-itip-control.c:896
+#: ../calendar/gui/e-cal-model-tasks.c:346
+#: ../calendar/gui/e-cal-model-tasks.c:659
+#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/e-itip-control.c:898
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
 #: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
@@ -6294,37 +6406,37 @@ msgstr "Egqityiweyo"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1008
+#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1008
 msgid "High"
 msgstr "Phezulu"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
 #: ../calendar/gui/e-cal-component-preview.c:226
-#: ../calendar/gui/e-cal-model-tasks.c:343
-#: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-cal-model-tasks.c:731
-#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2358
+#: ../calendar/gui/e-cal-model-tasks.c:344
+#: ../calendar/gui/e-cal-model-tasks.c:657
+#: ../calendar/gui/e-cal-model-tasks.c:732
+#: ../calendar/gui/e-calendar-table.c:454 ../calendar/gui/print.c:2358
 msgid "In Progress"
 msgstr "Eqhubekayo"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:384 ../mail/message-list.c:1006
+#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
 msgid "Low"
 msgstr "Phantsi"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:899 ../calendar/gui/e-calendar-table.c:383
+#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:381
 #: ../mail/message-list.c:1007
 msgid "Normal"
 msgstr "Eqhelekileyo"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
 #: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:341
-#: ../calendar/gui/e-cal-model-tasks.c:654
-#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/print.c:2355
+#: ../calendar/gui/e-cal-model-tasks.c:342
+#: ../calendar/gui/e-cal-model-tasks.c:655
+#: ../calendar/gui/e-calendar-table.c:453 ../calendar/gui/print.c:2355
 msgid "Not Started"
 msgstr "Ayiqaliswanga"
 
@@ -6333,7 +6445,7 @@ msgid "P_ercent complete:"
 msgstr "I_pesenti egqityiweyo:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
-#: ../calendar/gui/e-calendar-table.c:385
+#: ../calendar/gui/e-calendar-table.c:383
 msgid "Undefined"
 msgstr "Engachazwanga"
 
@@ -6358,9 +6470,9 @@ msgstr "i-_Web Page:"
 msgid "Task"
 msgstr "Umsebenzi"
 
-#: ../calendar/gui/dialogs/task-editor.c:163
-#: ../calendar/gui/dialogs/task-editor.c:225
-#: ../calendar/gui/dialogs/task-editor.c:379
+#: ../calendar/gui/dialogs/task-editor.c:162
+#: ../calendar/gui/dialogs/task-editor.c:224
+#: ../calendar/gui/dialogs/task-editor.c:378
 msgid "Assignment"
 msgstr "Umsebenzi"
 
@@ -6518,7 +6630,7 @@ msgstr "i-%s e-%s"
 msgid "%s for an unknown trigger type"
 msgstr "i-%s ngohlobo olungaziwayo lwenkcukumiso"
 
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2693
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2703
 #, c-format
 msgid "Click to open %s"
 msgstr "Cofa ukuvula i-%s"
@@ -6528,7 +6640,7 @@ msgid "Untitled"
 msgstr "Engenasihloko"
 
 #: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1110
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Isishwankathelo:"
@@ -6543,12 +6655,11 @@ msgid "Due Date:"
 msgstr "Umhla elindeleke ngawo:"
 
 #. write status
-#. translators: exchange out of office status header
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1132
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:227
-#: ../plugins/itip-formatter/itip-view.c:888
+#: ../calendar/gui/e-itip-control.c:1134
+#: ../plugins/exchange-operations/exchange-account-setup.c:263
+#: ../plugins/itip-formatter/itip-view.c:909
 msgid "Status:"
 msgstr "Ubume:"
 
@@ -6570,22 +6681,22 @@ msgstr "Umhla wokuqalisa"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../mail/mail-dialogs.glade.h:17 ../plugins/save-calendar/csv-format.c:386
+#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Isishwankathelo"
 
-#: ../calendar/gui/e-cal-model-calendar.c:179
-#: ../calendar/gui/e-calendar-table.c:434
+#: ../calendar/gui/e-cal-model-calendar.c:180
+#: ../calendar/gui/e-calendar-table.c:432
 msgid "Free"
 msgstr "Iyafumaneka"
 
-#: ../calendar/gui/e-cal-model-calendar.c:182
-#: ../calendar/gui/e-calendar-table.c:435
+#: ../calendar/gui/e-cal-model-calendar.c:183
+#: ../calendar/gui/e-calendar-table.c:433
 #: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "Ixakekile"
 
-#: ../calendar/gui/e-cal-model-tasks.c:606
+#: ../calendar/gui/e-cal-model-tasks.c:607
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6595,7 +6706,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1017 ../calendar/gui/e-cal-model.c:905
+#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
 #: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
 #: ../calendar/gui/e-meeting-store.c:808
@@ -6603,7 +6714,7 @@ msgstr ""
 msgid "Yes"
 msgstr "Ewe"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1017 ../calendar/gui/e-cal-model.c:905
+#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
 #: ../calendar/gui/e-meeting-list-view.c:193
 #: ../calendar/gui/e-meeting-store.c:180
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -6611,159 +6722,155 @@ msgid "No"
 msgstr "Hayi"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:307 ../calendar/gui/e-cal-model.c:310
-#: ../calendar/gui/e-itip-control.c:1149 ../calendar/gui/e-itip-control.c:1290
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1175
-#: ../plugins/itip-formatter/itip-formatter.c:235
-#: ../plugins/itip-formatter/itip-formatter.c:1564
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
+#: ../plugins/itip-formatter/itip-formatter.c:240
+#: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../shell/e-component-registry.c:205 ../shell/e-component-registry.c:211
+#: ../widgets/misc/e-attachment-bar.c:659
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Engaziwayo"
 
-#: ../calendar/gui/e-cal-model.c:901
+#: ../calendar/gui/e-cal-model.c:921
 msgid "Recurring"
 msgstr "Ukwenzeka kwakhona"
 
-#: ../calendar/gui/e-cal-model.c:903
+#: ../calendar/gui/e-cal-model.c:923
 msgid "Assigned"
 msgstr "Yabelwe"
 
-#: ../calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:402
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:403
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:404
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:406
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:407
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:516
+#: ../calendar/gui/e-calendar-table.c:514
 #, fuzzy
 msgid "Task Table"
 msgstr "Ukuhlaziya Umsebenzi"
 
-#: ../calendar/gui/e-calendar-table.c:694
-#: ../calendar/gui/e-calendar-view.c:653
+#: ../calendar/gui/e-calendar-table.c:692
+#: ../calendar/gui/e-calendar-view.c:661
 msgid "Deleting selected objects"
 msgstr "Yosula into ekhethiweyo"
 
-#: ../calendar/gui/e-calendar-table.c:873
-#: ../calendar/gui/e-calendar-view.c:780
+#: ../calendar/gui/e-calendar-table.c:871
+#: ../calendar/gui/e-calendar-view.c:789
 msgid "Updating objects"
 msgstr "Hlaziya izinto"
 
-#: ../calendar/gui/e-calendar-table.c:1014
-#: ../calendar/gui/e-calendar-view.c:1083 ../composer/e-msg-composer.c:1241
+#: ../calendar/gui/e-calendar-table.c:1012
+#: ../calendar/gui/e-calendar-view.c:1105 ../composer/e-msg-composer.c:1243
 msgid "Save as..."
 msgstr "Gcina njenge..."
 
-#: ../calendar/gui/e-calendar-table.c:1156
-#: ../calendar/gui/e-calendar-view.c:1506 ../ui/evolution-addressbook.xml.h:37
-msgid "_Open"
-msgstr "_Vula"
-
-#: ../calendar/gui/e-calendar-table.c:1157
+#: ../calendar/gui/e-calendar-table.c:1155
 msgid "Open _Web Page"
 msgstr "Vula i-_Web Page"
 
-#: ../calendar/gui/e-calendar-table.c:1158
-#: ../calendar/gui/e-calendar-view.c:1507 ../mail/em-folder-view.c:1043
-#: ../mail/em-popup.c:494
+#: ../calendar/gui/e-calendar-table.c:1156
+#: ../calendar/gui/e-calendar-view.c:1529 ../mail/em-folder-view.c:1045
+#: ../mail/em-popup.c:541 ../mail/em-popup.c:552
 msgid "_Save As..."
 msgstr "_Gcina Njenge..."
 
-#: ../calendar/gui/e-calendar-table.c:1159
-#: ../calendar/gui/e-calendar-view.c:1487
-#: ../calendar/gui/e-calendar-view.c:1508 ../mail/em-folder-view.c:1044
+#: ../calendar/gui/e-calendar-table.c:1157
+#: ../calendar/gui/e-calendar-view.c:1509
+#: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
+#: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:117 ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
 msgid "_Print..."
 msgstr "_Shicilela..."
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:1512 ../ui/evolution-addressbook.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1161
+#: ../calendar/gui/e-calendar-view.c:1534 ../ui/evolution-addressbook.xml.h:1
 #: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "S_ika"
 
-#: ../calendar/gui/e-calendar-table.c:1165
-#: ../calendar/gui/e-calendar-view.c:1490
-#: ../calendar/gui/e-calendar-view.c:1514 ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-table.c:1163
+#: ../calendar/gui/e-calendar-view.c:1512
+#: ../calendar/gui/e-calendar-view.c:1536 ../ui/evolution-addressbook.xml.h:38
 #: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
-#: ../ui/evolution-tasks.xml.h:24
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Paste"
 msgstr "_Ncamathelisa"
 
-#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-table.c:1167 ../ui/evolution-tasks.xml.h:20
 msgid "_Assign Task"
 msgstr "_Nika umsebenzi"
 
-#: ../calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-table.c:1168 ../ui/evolution-tasks.xml.h:24
 msgid "_Forward as iCalendar"
 msgstr "_Dlulisa njenge-iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1171
+#: ../calendar/gui/e-calendar-table.c:1169
 msgid "_Mark as Complete"
 msgstr "_Yiphawule njengeGqityiweyo"
 
-#: ../calendar/gui/e-calendar-table.c:1172
+#: ../calendar/gui/e-calendar-table.c:1170
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Phawula Imisebenzi Ekhethiweyo njengeGqityiweyo"
 
 #. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1526 ../mail/em-folder-tree.c:2119
-#: ../mail/em-folder-view.c:1047 ../ui/evolution-addressbook.xml.h:33
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:26
-#: ../ui/evolution-tasks.xml.h:21
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2043
+#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-tasks.xml.h:22
 msgid "_Delete"
 msgstr "_Cima"
 
-#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-table.c:1175
 msgid "_Delete Selected Tasks"
 msgstr "_Cima le misebenzi Ekhethiweyo"
 
-#: ../calendar/gui/e-calendar-table.c:1328
+#: ../calendar/gui/e-calendar-table.c:1326
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Cofa ukongeza umsebenzi"
@@ -6798,74 +6905,74 @@ msgstr "Umhla wokuqalisa"
 msgid "Task sort"
 msgstr "Ukuhlela umsebenzi"
 
-#: ../calendar/gui/e-calendar-view.c:1204
+#: ../calendar/gui/e-calendar-view.c:1231
 msgid "Moving items"
 msgstr "Shenxisa izinto"
 
-#: ../calendar/gui/e-calendar-view.c:1206
+#: ../calendar/gui/e-calendar-view.c:1233
 msgid "Copying items"
 msgstr "Ukukopa izinto"
 
-#: ../calendar/gui/e-calendar-view.c:1481
+#: ../calendar/gui/e-calendar-view.c:1503
 msgid "New _Appointment..."
 msgstr "Idinga _Elitsha..."
 
-#: ../calendar/gui/e-calendar-view.c:1482
+#: ../calendar/gui/e-calendar-view.c:1504
 msgid "New All Day _Event"
 msgstr "Isiganeko _Esitsha Sosuku Lonke"
 
-#: ../calendar/gui/e-calendar-view.c:1484
+#: ../calendar/gui/e-calendar-view.c:1506
 msgid "New Task"
 msgstr "Umsebenzi Omtsha"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1494
+#: ../calendar/gui/e-calendar-view.c:1516
 msgid "Current View"
 msgstr "Okubona Ngoku"
 
-#: ../calendar/gui/e-calendar-view.c:1496 ../ui/evolution-calendar.xml.h:26
+#: ../calendar/gui/e-calendar-view.c:1518 ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Khetha _Namhlanje"
 
-#: ../calendar/gui/e-calendar-view.c:1497
+#: ../calendar/gui/e-calendar-view.c:1519
 msgid "_Select Date..."
 msgstr "_Khetha Umhla..."
 
 #. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1502 ../ui/evolution-calendar.xml.h:45
+#: ../calendar/gui/e-calendar-view.c:1524 ../ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Shicilela Ulwazi Olufumanekayo/Oluxakekileyo"
 
-#: ../calendar/gui/e-calendar-view.c:1518
+#: ../calendar/gui/e-calendar-view.c:1540
 msgid "Cop_y to Calendar..."
 msgstr "Kop_ela kwiKhalenda..."
 
-#: ../calendar/gui/e-calendar-view.c:1519
+#: ../calendar/gui/e-calendar-view.c:1541
 msgid "Mo_ve to Calendar..."
 msgstr "She_nxisela kwiKhalenda..."
 
-#: ../calendar/gui/e-calendar-view.c:1520
+#: ../calendar/gui/e-calendar-view.c:1542
 #, fuzzy
 msgid "_Delegate Meeting..."
 msgstr "_Ceba intlanganiso..."
 
-#: ../calendar/gui/e-calendar-view.c:1521
+#: ../calendar/gui/e-calendar-view.c:1543
 msgid "_Schedule Meeting..."
 msgstr "_Ceba intlanganiso..."
 
-#: ../calendar/gui/e-calendar-view.c:1522
+#: ../calendar/gui/e-calendar-view.c:1544
 msgid "_Forward as iCalendar..."
 msgstr "_Dlulisa njenge-iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1527
+#: ../calendar/gui/e-calendar-view.c:1549
 msgid "Make this Occurrence _Movable"
 msgstr "Yenza esi Senzeko _Sishenxiseke"
 
-#: ../calendar/gui/e-calendar-view.c:1528
+#: ../calendar/gui/e-calendar-view.c:1550
 msgid "Delete this _Occurrence"
 msgstr "Cima esi _Senzeko"
 
-#: ../calendar/gui/e-calendar-view.c:1529
+#: ../calendar/gui/e-calendar-view.c:1551
 msgid "Delete _All Occurrences"
 msgstr "Cima _Zonke Izenzeko"
 
@@ -6911,120 +7018,120 @@ msgstr "i-%02i izahlulo ezincinane"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1499
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
 #: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "i-%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:752 ../calendar/gui/e-week-view.c:512
+#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "kusasa"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:755 ../calendar/gui/e-week-view.c:515
+#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
 #: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "emva kwemini"
 
-#: ../calendar/gui/e-itip-control.c:761
+#: ../calendar/gui/e-itip-control.c:763
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ewe. (Isenzekho esineenkcukacha eziziphindaphindayp)"
 
-#: ../calendar/gui/e-itip-control.c:772
+#: ../calendar/gui/e-itip-control.c:774
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Minyaka le"
 msgstr[1] "Ngayo yonke le %d minyaka"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:779
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Ngeveki ngo "
 msgstr[1] "Zonke %d iiveki ngo "
 
-#: ../calendar/gui/e-itip-control.c:779
+#: ../calendar/gui/e-itip-control.c:781
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Ngeveki ngo "
 msgstr[1] "Zonke %d iiveki ngo "
 
-#: ../calendar/gui/e-itip-control.c:787
+#: ../calendar/gui/e-itip-control.c:789
 msgid " and "
 msgstr " ne-"
 
-#: ../calendar/gui/e-itip-control.c:794
+#: ../calendar/gui/e-itip-control.c:796
 #, c-format
 msgid "The %s day of "
 msgstr "Olu %s lusuku lwe "
 
-#: ../calendar/gui/e-itip-control.c:807
+#: ../calendar/gui/e-itip-control.c:809
 #, c-format
 msgid "The %s %s of "
 msgstr "Le %s %s ye "
 
-#: ../calendar/gui/e-itip-control.c:814
+#: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "ngenyanga"
 msgstr[1] "ngazo zonke ezi %d nyanga"
 
-#: ../calendar/gui/e-itip-control.c:818
+#: ../calendar/gui/e-itip-control.c:820
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Minyaka le"
 msgstr[1] "Ngayo yonke le %d minyaka"
 
-#: ../calendar/gui/e-itip-control.c:829
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "ixesha lilonke %d"
 msgstr[1] "amaxesha ewonke %d"
 
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:840
 msgid ", ending on "
 msgstr ", ephela nge-"
 
-#: ../calendar/gui/e-itip-control.c:862
+#: ../calendar/gui/e-itip-control.c:864
 msgid "Starts"
 msgstr "Qalisa"
 
-#: ../calendar/gui/e-itip-control.c:875
+#: ../calendar/gui/e-itip-control.c:877
 msgid "Ends"
 msgstr "Yeka"
 
-#: ../calendar/gui/e-itip-control.c:909
+#: ../calendar/gui/e-itip-control.c:911
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Ilindelekile"
 
-#: ../calendar/gui/e-itip-control.c:949 ../calendar/gui/e-itip-control.c:1006
+#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Information"
 msgstr "Ulwazi lwe-iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:966
+#: ../calendar/gui/e-itip-control.c:968
 msgid "iCalendar Error"
 msgstr "Impazamo kwi-iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1038 ../calendar/gui/e-itip-control.c:1054
-#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1082
-#: ../plugins/itip-formatter/itip-view.c:333
-#: ../plugins/itip-formatter/itip-view.c:334
-#: ../plugins/itip-formatter/itip-view.c:401
-#: ../plugins/itip-formatter/itip-view.c:402
+#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
+#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
+#: ../plugins/itip-formatter/itip-view.c:338
+#: ../plugins/itip-formatter/itip-view.c:339
+#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:407
 msgid "An unknown person"
 msgstr "Umntu ongaziwayo"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1089
+#: ../calendar/gui/e-itip-control.c:1091
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7032,290 +7139,292 @@ msgstr ""
 "<br> Nceda uhlaziye olu lwazi lulandelayo, ze ukhethe isenzo kwimenyu "
 "engezantsi."
 
-#: ../calendar/gui/e-itip-control.c:1137
+#: ../calendar/gui/e-itip-control.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:547
-#: ../plugins/itip-formatter/itip-formatter.c:1552
+#: ../calendar/gui/itip-utils.c:548
+#: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "Accepted"
 msgstr "Ivunyiwe"
 
-#: ../calendar/gui/e-itip-control.c:1141 ../calendar/gui/itip-utils.c:550
-#: ../plugins/itip-formatter/itip-formatter.c:1555
+#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
+#: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr "Ivunywe Ngokuthandabuzisayo"
 
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-itip-control.c:1147
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:553 ../calendar/gui/itip-utils.c:582
-#: ../plugins/itip-formatter/itip-formatter.c:1558
+#: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
+#: ../plugins/itip-formatter/itip-formatter.c:1646
 msgid "Declined"
 msgstr "Ilandulwe"
 
-#: ../calendar/gui/e-itip-control.c:1229
+#: ../calendar/gui/e-itip-control.c:1231
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 msgstr "Intlanganiso irhoxisiwe, nakuba ingafumanekanga kwiikhalenda zakho"
 
-#: ../calendar/gui/e-itip-control.c:1231
+#: ../calendar/gui/e-itip-control.c:1233
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
 "Umsebenzi urhozisiwe, nakuba ungafumanekanga kuluhlu lwakho lwemisebenzi"
 
-#: ../calendar/gui/e-itip-control.c:1310
+#: ../calendar/gui/e-itip-control.c:1312
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "i-<b>%s</b> ipapashe ulwazi ngentlanganiso."
 
-#: ../calendar/gui/e-itip-control.c:1311
+#: ../calendar/gui/e-itip-control.c:1313
 msgid "Meeting Information"
 msgstr "Ulwazi ngeNtlanganiso"
 
-#: ../calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "u-<b>%s</b> ucela ukuba abekho u-%s kwintlanganiso."
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "u-<b>%s</b> ucela ukuba ubekho kwintlanganiso."
 
-#: ../calendar/gui/e-itip-control.c:1320
+#: ../calendar/gui/e-itip-control.c:1322
 msgid "Meeting Proposal"
 msgstr "Isindululo Sentlanganiso"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "u-<b>%s</b> unqwenela ukongeza kwintlanganiso esele ikho."
 
-#: ../calendar/gui/e-itip-control.c:1327
+#: ../calendar/gui/e-itip-control.c:1329
 msgid "Meeting Update"
 msgstr "Ukuhlaziywa Intlanganiso"
 
-#: ../calendar/gui/e-itip-control.c:1331
+#: ../calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "u-<b>%s</b> unqwenela ukufumana ulwazi olutsha lwentlanganiso."
 
-#: ../calendar/gui/e-itip-control.c:1332
+#: ../calendar/gui/e-itip-control.c:1334
 msgid "Meeting Update Request"
 msgstr "Isicelo Sokuhlaziywa Intlanganiso"
 
-#: ../calendar/gui/e-itip-control.c:1339
+#: ../calendar/gui/e-itip-control.c:1341
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "u-<b>%s</b> uphendule kwisicelo sentlanganiso."
 
-#: ../calendar/gui/e-itip-control.c:1340
+#: ../calendar/gui/e-itip-control.c:1342
 msgid "Meeting Reply"
 msgstr "Impendulo Ngentlanganiso"
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1349
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "u-<b>%s</b> uyirhoxisile intlanganiso."
 
-#: ../calendar/gui/e-itip-control.c:1348
+#: ../calendar/gui/e-itip-control.c:1350
 msgid "Meeting Cancellation"
 msgstr "Ukurhoxiswa kweNtlanganiso"
 
-#: ../calendar/gui/e-itip-control.c:1358 ../calendar/gui/e-itip-control.c:1435
-#: ../calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1477
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "u-<b>%s</b> selethumele umyalezo ongaqondakaliyo."
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1361
 msgid "Bad Meeting Message"
 msgstr "Umyalezo wentlanganiso awuvakalanga"
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1388
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "u-<b>%s</b> sele elupapashile ulwazi ngomsebenzi."
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1389
 msgid "Task Information"
 msgstr "Ulwazi Lomsebenzi"
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1396
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "u-<b>%s</b> ucela %s ukwenza lo msebenzi."
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "u-<b>%s</b> ucela ukuba uwenze lo msebenzi."
 
-#: ../calendar/gui/e-itip-control.c:1397
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Task Proposal"
 msgstr "Isindululo Somsebenzi"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1405
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "u-<b>%s</b> unqwenela ukongeza kumsebenzi osele ukho."
 
-#: ../calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1406
 msgid "Task Update"
 msgstr "Ukuhlaziya Umsebenzi"
 
-#: ../calendar/gui/e-itip-control.c:1408
+#: ../calendar/gui/e-itip-control.c:1410
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "u-<b>%s</b> unqwenela ukufumana ulwazi olutsha lomsebenzi."
 
-#: ../calendar/gui/e-itip-control.c:1409
+#: ../calendar/gui/e-itip-control.c:1411
 msgid "Task Update Request"
 msgstr "Isicelo Sokuhlaziya Umsebenzi"
 
-#: ../calendar/gui/e-itip-control.c:1416
+#: ../calendar/gui/e-itip-control.c:1418
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "u-<b>%s</b> sele ephendule ngomsebenzi awunikiweyo."
 
-#: ../calendar/gui/e-itip-control.c:1417
+#: ../calendar/gui/e-itip-control.c:1419
 msgid "Task Reply"
 msgstr "Impendulo ngoMsebenzi"
 
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1426
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "u-<b>%s</b> uwurhoxisile umsebenzi."
 
-#: ../calendar/gui/e-itip-control.c:1425
+#: ../calendar/gui/e-itip-control.c:1427
 msgid "Task Cancellation"
 msgstr "Ukurhoxisa Umsebenzi"
 
-#: ../calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1438
 msgid "Bad Task Message"
 msgstr "Umyalezo womsebenzi awuvakalanga"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "u-<b>%s</b> sele elupapashile ulwazi olufumanekayo/olusasetyenziswayo."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Free/Busy Information"
 msgstr "Ulwazi Olufumanekayo/Oluxakekileyo"
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "u-<b>%s</b> ucela ulwazi ngolwazi lwakho olufumanekayo/olusebenzisayo."
 
-#: ../calendar/gui/e-itip-control.c:1466
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Free/Busy Request"
 msgstr "Isicelo Esifumanekayo/Esixakekeileyo"
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1472
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> uphendule kwisicelo esifumanekanyo/esisetyenziswayo."
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1473
 msgid "Free/Busy Reply"
 msgstr "Impendulo Efumanekanyo/Exakekileyo"
 
-#: ../calendar/gui/e-itip-control.c:1476
+#: ../calendar/gui/e-itip-control.c:1478
 msgid "Bad Free/Busy Message"
 msgstr "Umyalezo Ongalunganga Ofumanekanyo/Oxakekileyo"
 
-#: ../calendar/gui/e-itip-control.c:1551
+#: ../calendar/gui/e-itip-control.c:1553
 msgid "The message does not appear to be properly formed"
 msgstr "Lo myalezo awubonakali wenziwe kakuhle"
 
-#: ../calendar/gui/e-itip-control.c:1610
+#: ../calendar/gui/e-itip-control.c:1612
 msgid "The message contains only unsupported requests."
 msgstr "Lo myalezo uqulethe izicelo ezixhaswanga kuphela."
 
-#: ../calendar/gui/e-itip-control.c:1643
+#: ../calendar/gui/e-itip-control.c:1645
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Esi siqhobosheli asiqulathanga myalezo wekhalenda ulungileyo"
 
-#: ../calendar/gui/e-itip-control.c:1675
+#: ../calendar/gui/e-itip-control.c:1677
 msgid "The attachment has no viewable calendar items"
 msgstr "Esi siqhobosheli asinazinto zekhalenda zinokuboniswa"
 
-#: ../calendar/gui/e-itip-control.c:1909
+#: ../calendar/gui/e-itip-control.c:1911
 msgid "Update complete\n"
 msgstr "Lugqityiwe uhlaziyo\n"
 
-#: ../calendar/gui/e-itip-control.c:1937
+#: ../calendar/gui/e-itip-control.c:1939
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Le nto ayilunganga ngako oko ayinakuhlaziywa\n"
 
-#: ../calendar/gui/e-itip-control.c:1947
+#: ../calendar/gui/e-itip-control.c:1949
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Le mpendulo ayiveli kokhoyo ngoku.  Ongezwe njengokhoyo?"
 
-#: ../calendar/gui/e-itip-control.c:1959
+#: ../calendar/gui/e-itip-control.c:1961
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Ubume bokhoyo abungehlaziywa ngenxa yobume obungasebenziyoyo!\n"
 
-#: ../calendar/gui/e-itip-control.c:1976
+#: ../calendar/gui/e-itip-control.c:1978
 msgid "Attendee status updated\n"
 msgstr "Buhlaziywe ubume bokhoyo\n"
 
-#: ../calendar/gui/e-itip-control.c:1979
-#: ../plugins/itip-formatter/itip-formatter.c:974
+#: ../calendar/gui/e-itip-control.c:1981
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Ubume bokhoyo abunakuhlaziywa ngenxa yokuba le nto ayisekho"
 
-#: ../calendar/gui/e-itip-control.c:2006
+#: ../calendar/gui/e-itip-control.c:2011
 msgid "Removal Complete"
 msgstr "Ukushenxiswa sele kugqityiwe"
 
-#: ../calendar/gui/e-itip-control.c:2029 ../calendar/gui/e-itip-control.c:2077
+#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
 msgid "Item sent!\n"
 msgstr "Le nto sele ithunyelwe!\n"
 
-#: ../calendar/gui/e-itip-control.c:2031 ../calendar/gui/e-itip-control.c:2081
+#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
 msgid "The item could not be sent!\n"
 msgstr "Le nto ayithunyelwanga!\n"
 
-#: ../calendar/gui/e-itip-control.c:2161
+#: ../calendar/gui/e-itip-control.c:2166
 msgid "Choose an action:"
 msgstr "Khetha omawukwenze:"
 
-#: ../calendar/gui/e-itip-control.c:2232
+#: ../calendar/gui/e-itip-control.c:2237
 msgid "Update"
 msgstr "Hlaziya"
 
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2265
+#: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Yamkela"
 
-#: ../calendar/gui/e-itip-control.c:2261
+#: ../calendar/gui/e-itip-control.c:2266
 msgid "Tentatively accept"
 msgstr "Amkela ngokulinganayo"
 
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2267
+#: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Landula"
 
-#: ../calendar/gui/e-itip-control.c:2291
+#: ../calendar/gui/e-itip-control.c:2296
 msgid "Send Free/Busy Information"
 msgstr "Thumela Ulwazi Olufumanekanyo/Oluxakekileyo"
 
-#: ../calendar/gui/e-itip-control.c:2319
+#: ../calendar/gui/e-itip-control.c:2324
 msgid "Update respondent status"
 msgstr "Hlaziya ubume bophendulayo"
 
-#: ../calendar/gui/e-itip-control.c:2347
+#: ../calendar/gui/e-itip-control.c:2352
 msgid "Send Latest Information"
 msgstr "Thumela Uwazi Olutsha"
 
-#: ../calendar/gui/e-itip-control.c:2375 ../calendar/gui/itip-utils.c:570
+#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
 #: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7383,6 +7492,8 @@ msgstr "Umntu ngamnye"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../widgets/table/e-table-config-no-group.glade.h:7
+#: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Iqela"
 
@@ -7431,8 +7542,8 @@ msgstr "Oyilingayo"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/itip-utils.c:556
-#: ../plugins/itip-formatter/itip-formatter.c:1561
+#: ../calendar/gui/itip-utils.c:557
+#: ../plugins/itip-formatter/itip-formatter.c:1649
 msgid "Delegated"
 msgstr "Othunyiweyo"
 
@@ -7443,7 +7554,7 @@ msgstr "Isaqhutywa"
 #. 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:444
-#: ../calendar/gui/e-meeting-time-sel.c:2104
+#: ../calendar/gui/e-meeting-time-sel.c:2102
 msgid "%A, %B %d, %Y"
 msgstr "i-%A, %B %d, %Y"
 
@@ -7454,7 +7565,7 @@ msgstr "i-%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:448
-#: ../calendar/gui/e-meeting-time-sel.c:2137 ../e-util/e-time-utils.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:2135 ../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 "i-%a %m/%d/%Y"
@@ -7527,7 +7638,7 @@ msgstr "Abantu abafunekayo no_vimba omnye"
 msgid "Enter the password for %s"
 msgstr "Faka i-password ye-%s"
 
-#: ../calendar/gui/e-tasks.c:763 ../calendar/gui/gnome-cal.c:2412
+#: ../calendar/gui/e-tasks.c:798 ../calendar/gui/gnome-cal.c:2532
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7536,24 +7647,24 @@ msgstr ""
 "Kwenzeke impazamo kwi-%s:\n"
 " %s"
 
-#: ../calendar/gui/e-tasks.c:811
+#: ../calendar/gui/e-tasks.c:846
 msgid "Loading tasks"
 msgstr "Imisebenzi yokufaka okuthile kwikhompyutha"
 
-#: ../calendar/gui/e-tasks.c:895
+#: ../calendar/gui/e-tasks.c:930
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Imisebenzi yokuvula e-%s"
 
-#: ../calendar/gui/e-tasks.c:1091
+#: ../calendar/gui/e-tasks.c:1126
 msgid "Completing tasks..."
 msgstr "Ukwenza imisebenzi..."
 
-#: ../calendar/gui/e-tasks.c:1114
+#: ../calendar/gui/e-tasks.c:1149
 msgid "Deleting selected objects..."
 msgstr "Ukucima izinto ezikhethiweyo..."
 
-#: ../calendar/gui/e-tasks.c:1141
+#: ../calendar/gui/e-tasks.c:1176
 msgid "Expunging"
 msgstr "Cima"
 
@@ -7568,40 +7679,42 @@ msgstr "Iqhosha Lexesha Kwindawo Ethile"
 msgid "%d %B"
 msgstr "i-%d %B"
 
-#: ../calendar/gui/gnome-cal.c:723
+#: ../calendar/gui/gnome-cal.c:789
 msgid "Updating query"
 msgstr "Ukuhlaziya umbuzo"
 
 #. bonobo displays this string so it must be in locale
-#: ../calendar/gui/gnome-cal.c:2089 ../widgets/menus/gal-view-menus.c:350
+#: ../calendar/gui/gnome-cal.c:2209 ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Okuboniswa Umthengi kwiskrini"
 
-#: ../calendar/gui/gnome-cal.c:2090
+#: ../calendar/gui/gnome-cal.c:2210 ../widgets/menus/gal-view-instance.c:586
 msgid "Save Custom View"
 msgstr "Gcina Okuboniswa Umthengi"
 
-#: ../calendar/gui/gnome-cal.c:2095 ../widgets/menus/gal-view-menus.c:372
+#: ../calendar/gui/gnome-cal.c:2215 ../widgets/menus/gal-view-instance.c:590
+#: ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
 msgstr "Chaza Okuboniswa Kwiskrini..."
 
-#: ../calendar/gui/gnome-cal.c:2258
+#: ../calendar/gui/gnome-cal.c:2378
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Ukufaka amadinga kwi-%s"
 
-#: ../calendar/gui/gnome-cal.c:2277
+#: ../calendar/gui/gnome-cal.c:2397
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Ukufaka imisebenzi kwi-%s"
 
-#: ../calendar/gui/gnome-cal.c:2378
+#: ../calendar/gui/gnome-cal.c:2498
 #, c-format
 msgid "Opening %s"
 msgstr "Ukuvula i-%s"
 
 # Translation much longer than original. Nothing shorter?
-#: ../calendar/gui/gnome-cal.c:3268
+#: ../calendar/gui/gnome-cal.c:3388
 msgid "Purging"
 msgstr "Ukucima okungabalulekanga"
 
@@ -7661,57 +7774,57 @@ msgstr "Septemba"
 msgid "_Select Today"
 msgstr "_Khetha Namhlanje"
 
-#: ../calendar/gui/itip-utils.c:352 ../calendar/gui/itip-utils.c:401
-#: ../calendar/gui/itip-utils.c:441
+#: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
+#: ../calendar/gui/itip-utils.c:442
 msgid "An organizer must be set."
 msgstr "Kufuneka kumiselwe umlungiseleli."
 
-#: ../calendar/gui/itip-utils.c:388
+#: ../calendar/gui/itip-utils.c:389
 msgid "At least one attendee is necessary"
 msgstr "Kubalulekile ukuba kubekho ubuncinane abe mnye okhoyo"
 
-#: ../calendar/gui/itip-utils.c:509 ../calendar/gui/itip-utils.c:631
+#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
 msgid "Event information"
 msgstr "Ulwazi ngesehlo"
 
-#: ../calendar/gui/itip-utils.c:511 ../calendar/gui/itip-utils.c:633
+#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
 msgid "Task information"
 msgstr "Ulwazi ngomsebenzi"
 
-#: ../calendar/gui/itip-utils.c:513 ../calendar/gui/itip-utils.c:635
+#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:636
 msgid "Journal information"
 msgstr "Ulwazi ngejenali"
 
-#: ../calendar/gui/itip-utils.c:515 ../calendar/gui/itip-utils.c:653
+#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:654
 msgid "Free/Busy information"
 msgstr "Ulwazi olufumanekayo/okuxakekileyo"
 
-#: ../calendar/gui/itip-utils.c:517
+#: ../calendar/gui/itip-utils.c:518
 msgid "Calendar information"
 msgstr "Ulwazi ngeKhalenda"
 
-#: ../calendar/gui/itip-utils.c:566
+#: ../calendar/gui/itip-utils.c:567
 msgid "Updated"
 msgstr "Ehlaziyiweyo"
 
-#: ../calendar/gui/itip-utils.c:574
+#: ../calendar/gui/itip-utils.c:575
 msgid "Refresh"
 msgstr "Hlaziya"
 
-#: ../calendar/gui/itip-utils.c:578
+#: ../calendar/gui/itip-utils.c:579
 msgid "Counter-proposal"
 msgstr "Isiphakamiso esiphikisayo"
 
-#: ../calendar/gui/itip-utils.c:649
+#: ../calendar/gui/itip-utils.c:650
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ulwazi Olufumanekayo/Oluxakekileyo (%s luya %s)"
 
-#: ../calendar/gui/itip-utils.c:659
+#: ../calendar/gui/itip-utils.c:660
 msgid "iCalendar information"
 msgstr "Ulwazi lwe-iCalendar"
 
-#: ../calendar/gui/itip-utils.c:814
+#: ../calendar/gui/itip-utils.c:815
 msgid "You must be an attendee of the event."
 msgstr "Kufuneka ube uzile kweso sehlo."
 
@@ -8000,7 +8113,7 @@ msgid_plural "%d tasks"
 msgstr[0] "Umsebenzi omtsha"
 msgstr[1] "Umsebenzi omtsha"
 
-#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:545
+#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8011,56 +8124,56 @@ msgstr[1] "%d zicinyiwe"
 msgid "Failed upgrading tasks."
 msgstr "Ayiphumelelanga ukuhlaziya imisebenzi."
 
-#: ../calendar/gui/tasks-component.c:860
+#: ../calendar/gui/tasks-component.c:872
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Ayinako ukuvula uluhlu lomsebenzi '%s' wokwenza izehlo neentlanganiso"
 
-#: ../calendar/gui/tasks-component.c:875
+#: ../calendar/gui/tasks-component.c:887
 msgid "There is no calendar available for creating tasks"
 msgstr "Akukho khalenda yokwenza imisebenzi efumanekayo"
 
-#: ../calendar/gui/tasks-component.c:969
+#: ../calendar/gui/tasks-component.c:981
 msgid "Task Source Selector"
 msgstr "Isikhethi Somthombo Womsebenzi"
 
-#: ../calendar/gui/tasks-component.c:1152
+#: ../calendar/gui/tasks-component.c:1164
 msgid "New task"
 msgstr "Umsebenzi omtsha"
 
-#: ../calendar/gui/tasks-component.c:1153
+#: ../calendar/gui/tasks-component.c:1165
 msgid "_Task"
 msgstr "_Umsebenzi"
 
-#: ../calendar/gui/tasks-component.c:1154
+#: ../calendar/gui/tasks-component.c:1166
 msgid "Create a new task"
 msgstr "Yenza umsebenzi omtsha"
 
-#: ../calendar/gui/tasks-component.c:1160
+#: ../calendar/gui/tasks-component.c:1172
 msgid "New assigned task"
 msgstr "Umsebenzi omtsha owunikiweyo"
 
-#: ../calendar/gui/tasks-component.c:1161
+#: ../calendar/gui/tasks-component.c:1173
 msgid "Assigne_d Task"
 msgstr "Umsebenzi owunikiwe_yo"
 
-#: ../calendar/gui/tasks-component.c:1162
+#: ../calendar/gui/tasks-component.c:1174
 msgid "Create a new assigned task"
 msgstr "Yenza umsebenzi omtsha owunikiweyo"
 
-#: ../calendar/gui/tasks-component.c:1168
+#: ../calendar/gui/tasks-component.c:1180
 msgid "New task list"
 msgstr "Uluhlu olutsha lomsebenzi"
 
-#: ../calendar/gui/tasks-component.c:1169
+#: ../calendar/gui/tasks-component.c:1181
 msgid "Task l_ist"
 msgstr "Ul_uhlu Lomsebenzi"
 
-#: ../calendar/gui/tasks-component.c:1170
+#: ../calendar/gui/tasks-component.c:1182
 msgid "Create a new task list"
 msgstr "Yenza uluhlu olutsha lomsebenzi"
 
-#: ../calendar/gui/tasks-control.c:370
+#: ../calendar/gui/tasks-control.c:419
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8073,11 +8186,11 @@ msgstr ""
 "\n"
 "Uqinisekile uyafuna ukosula le misebenzi?"
 
-#: ../calendar/gui/tasks-control.c:373
+#: ../calendar/gui/tasks-control.c:422
 msgid "Do not ask me again."
 msgstr "Ungandibuzi kwakhona."
 
-#: ../calendar/gui/tasks-control.c:408
+#: ../calendar/gui/tasks-control.c:457
 msgid "Print Tasks"
 msgstr "Shicilela Imisebenzi"
 
@@ -8086,45 +8199,43 @@ msgstr "Shicilela Imisebenzi"
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
-#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
-msgid "Evolution Calendar intelligent importer"
-msgstr "Isingenisi-data esikhaliphileyo seKhalenda ye-Evolution"
-
-#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
-msgid "Evolution iCalendar importer"
-msgstr "Isingenisi-data se-iCalender ye-Evolution"
+#: ../calendar/importers/icalendar-importer.c:78
+msgid "Appointments and Meetings"
+msgstr "Amadinga neeNtlanganiso"
 
-#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
-msgid "Evolution vCalendar importer"
-msgstr "Isingenisi-data se-vCalender ye-Evolution"
+#: ../calendar/importers/icalendar-importer.c:336
+#: ../calendar/importers/icalendar-importer.c:586
+#, fuzzy
+msgid "Opening calendar"
+msgstr "Ikhalenda entsha"
 
-#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+#: ../calendar/importers/icalendar-importer.c:429
 msgid "iCalendar files (.ics)"
 msgstr "Iifayili ze-iCalendar (.ics)"
 
-#: ../calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
-msgid "vCalendar files (.vcf)"
-msgstr "iifayili ze-vCalendar (.vcf)"
-
-#: ../calendar/importers/icalendar-importer.c:82
-msgid "Appointments and Meetings"
-msgstr "Amadinga neeNtlanganiso"
+#: ../calendar/importers/icalendar-importer.c:430
+msgid "Evolution iCalendar importer"
+msgstr "Isingenisi-data se-iCalender ye-Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:486
+#: ../calendar/importers/icalendar-importer.c:494
 msgid "Reminder!!"
 msgstr "Isikhumbuzi!!"
 
-#: ../calendar/importers/icalendar-importer.c:694
+#: ../calendar/importers/icalendar-importer.c:539
+msgid "vCalendar files (.vcf)"
+msgstr "iifayili ze-vCalendar (.vcf)"
+
+#: ../calendar/importers/icalendar-importer.c:540
+msgid "Evolution vCalendar importer"
+msgstr "Isingenisi-data se-vCalender ye-Evolution"
+
+#: ../calendar/importers/icalendar-importer.c:702
 msgid "Calendar Events"
 msgstr "Izehlo ezikwiKhalenda"
 
-#: ../calendar/importers/icalendar-importer.c:719
-msgid ""
-"Evolution has found Gnome Calendar files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"I-Evolution ifumene iifayili Zekhalenda ye-Gnome.\n"
-"Ungathanda kusini na ukuzidlulisela Kwi-Evolution?"
+#: ../calendar/importers/icalendar-importer.c:739
+msgid "Evolution Calendar intelligent importer"
+msgstr "Isingenisi-data esikhaliphileyo seKhalenda ye-Evolution"
 
 #.
 #. * These are the timezone names from the Olson timezone data.
@@ -9656,15 +9767,15 @@ msgstr "E-Pacific/I-Wallis"
 msgid "Pacific/Yap"
 msgstr "E-Pacific/I-Yap"
 
-#: ../composer/e-msg-composer-hdrs.c:525
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Posting destination"
 msgstr "Indawo eya kuyo iposi"
 
-#: ../composer/e-msg-composer-hdrs.c:526
+#: ../composer/e-msg-composer-hdrs.c:559
 msgid "Choose folders to post the message to."
 msgstr "Khetha iziqulathi zeefayili ukuthumela umyalezo ku."
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:593
 msgid "Click here for the address book"
 msgstr "Cofa apha xa ufuna incwadi yeedilesi"
 
@@ -9675,45 +9786,45 @@ msgstr "Cofa apha xa ufuna incwadi yeedilesi"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:590
+#: ../composer/e-msg-composer-hdrs.c:623
 msgid "_Reply-To:"
 msgstr "_Phendulela-Ku:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:597
+#: ../composer/e-msg-composer-hdrs.c:630
 msgid "Fr_om:"
 msgstr "Iv_ela:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:604
+#: ../composer/e-msg-composer-hdrs.c:637
 msgid "S_ubject:"
 msgstr "I_sihloko:"
 
-#: ../composer/e-msg-composer-hdrs.c:614
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_To:"
 msgstr "_Iya:"
 
-#: ../composer/e-msg-composer-hdrs.c:615
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the recipients of the message"
 msgstr "Faka abamkeli bomyalezo"
 
-#: ../composer/e-msg-composer-hdrs.c:618
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Cc:"
 msgstr "_Kopela naku:"
 
-#: ../composer/e-msg-composer-hdrs.c:619
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Faka iidilesi eziza kufumana ikopi yomyalezo"
 
-#: ../composer/e-msg-composer-hdrs.c:622
+#: ../composer/e-msg-composer-hdrs.c:654
 msgid "_Bcc:"
 msgstr "_Kopela ngokufihliweyo:"
 
-#: ../composer/e-msg-composer-hdrs.c:623
+#: ../composer/e-msg-composer-hdrs.c:655
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9724,31 +9835,31 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:630
+#: ../composer/e-msg-composer-hdrs.c:662
 msgid "_Post To:"
 msgstr "_Posela Ku:"
 
-#: ../composer/e-msg-composer-hdrs.c:635
+#: ../composer/e-msg-composer-hdrs.c:667
 msgid "Click here to select folders to post to"
 msgstr "Cofa apha ukuchonga iziqulathi zeefayili oposela kuzo"
 
-#: ../composer/e-msg-composer-hdrs.c:641
+#: ../composer/e-msg-composer-hdrs.c:673
 msgid "Post To:"
 msgstr "Posela Ku:"
 
-#: ../composer/e-msg-composer-select-file.c:81
+#: ../composer/e-msg-composer-select-file.c:82
 #, fuzzy
 msgid "A_ttach"
 msgstr "Qhoboshela"
 
-#: ../composer/e-msg-composer.c:737
+#: ../composer/e-msg-composer.c:738
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Ayikwazi ukusayina umyalezo ophumayo: Akukho kusayina satifiketi kumiselwe "
 "le akhawunti"
 
-#: ../composer/e-msg-composer.c:744
+#: ../composer/e-msg-composer.c:745
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -9756,47 +9867,48 @@ msgstr ""
 "Ayikwazi ukukhowuda umyalezo ophumayo: Akukho kukhowuda satifiketi kumiselwe "
 "le akhawunti"
 
-#: ../composer/e-msg-composer.c:1222 ../composer/e-msg-composer.c:1255
+#: ../composer/e-msg-composer.c:1224 ../composer/e-msg-composer.c:1257
+#: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Isizathu esingaziwayo"
 
-#: ../composer/e-msg-composer.c:1292
+#: ../composer/e-msg-composer.c:1294
 msgid "Could not open file"
 msgstr "Ayikwazanga ukuvula ifayili"
 
-#: ../composer/e-msg-composer.c:1300
+#: ../composer/e-msg-composer.c:1302
 msgid "Unable to retrieve message from editor"
 msgstr "Ayinakho ukuphinda ifumane umyalezo ovela kumhleli"
 
-#: ../composer/e-msg-composer.c:1570
+#: ../composer/e-msg-composer.c:1572
 msgid "Untitled Message"
 msgstr "Umyalezo Ongenasihloko"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1604
+#: ../composer/e-msg-composer.c:1606
 msgid "Open File"
 msgstr "Vula iFayili"
 
-#: ../composer/e-msg-composer.c:1996 ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:698
+#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:588
+#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
 msgid "Autogenerated"
 msgstr "Owenziwe ngokuzenzekela"
 
-#: ../composer/e-msg-composer.c:2095
+#: ../composer/e-msg-composer.c:2105
 msgid "Si_gnature:"
 msgstr "Usa_yino:"
 
-#: ../composer/e-msg-composer.c:2337 ../composer/e-msg-composer.c:3373
-#: ../composer/e-msg-composer.c:3374
+#: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
+#: ../composer/e-msg-composer.c:3528
 msgid "Compose a message"
 msgstr "Bhala umyalezo"
 
-#: ../composer/e-msg-composer.c:3484
+#: ../composer/e-msg-composer.c:3643
 #, fuzzy
 msgid "_Attachment Bar"
 msgstr "Uphawu Lwesiqhoboshelo"
 
-#: ../composer/e-msg-composer.c:4557
+#: ../composer/e-msg-composer.c:4718
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -9828,7 +9940,7 @@ msgstr ""
 "Kuba \"{0}\", kungafuneka ukhethe olwahlukileyo lona ukhetho lwe-imeyili."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:17
 #, fuzzy
 msgid "Because &quot;{1}&quot;."
 msgstr "Kuba \"{1}\"."
@@ -9953,7 +10065,9 @@ msgstr "_Lahla Iinguquko"
 msgid "_Save Message"
 msgstr "_Gcina Umyalezo"
 
-#: ../data/evolution.desktop.in.in.h:1 ../shell/main.c:509
+#: ../data/evolution.desktop.in.in.h:1
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:509
 msgid "Evolution"
 msgstr "I-Evolution"
 
@@ -10131,7 +10245,7 @@ msgstr "Ingaba unqwenela ukubhala phezu kwayo?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Le fayili sele ikho \"{0}\"."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:117
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
 msgid "_Overwrite"
 msgstr "_Bhala phezu kwenye"
 
@@ -10237,69 +10351,69 @@ msgstr "%I %p"
 msgid "The orientation of the tray."
 msgstr "Ukuqhelaniswa kwetreyi."
 
-#: ../filter/filter-datespec.c:73
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 umzuzwana odlulileyo"
 msgstr[1] "%d imizuzwana edlulileyo"
 
-#: ../filter/filter-datespec.c:74
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 umzuzu"
 msgstr[1] "%d imizuzu"
 
-#: ../filter/filter-datespec.c:75
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 iyure edlulileyo"
 msgstr[1] "%d iiyure ezidlulileyo"
 
-#: ../filter/filter-datespec.c:76
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 usuku oludlulileyo"
 msgstr[1] "%diintsuku ezidlulileyo"
 
-#: ../filter/filter-datespec.c:77
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 inyanga edlulileyo"
 msgstr[1] "%d iinyanga ezidlulileyo"
 
-#: ../filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 inyanga edlulileyo"
 msgstr[1] "%d iinyanga ezidlulileyo"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 unyaka odlulileyo"
 msgstr[1] "%d iminyaka edlulileyo"
 
-#: ../filter/filter-datespec.c:280
+#: ../filter/filter-datespec.c:285
 msgid "<click here to select a date>"
 msgstr "<cofa apha ukukhetha umhla>"
 
-#: ../filter/filter-datespec.c:283 ../filter/filter-datespec.c:294
+#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
 msgid "now"
 msgstr "ngoku"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:290
+#: ../filter/filter-datespec.c:295
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:406
+#: ../filter/filter-datespec.c:415
 msgid "Select a time to compare against"
 msgstr "Chonga ixesha oza kuthelekisa nalo"
 
@@ -10367,10 +10481,11 @@ msgid "Include threads"
 msgstr "Iquka imisonto"
 
 #: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:291
 msgid "Incoming"
 msgstr "Ezingenayo"
 
-#: ../filter/filter-rule.c:978
+#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
 msgid "Outgoing"
 msgstr "Ephumayo"
 
@@ -10397,7 +10512,7 @@ msgstr "Umhla ongafumanekiyo."
 msgid "Missing file name."
 msgstr "Igama lefayili lilahlekile."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:62
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:65
 msgid "Missing name."
 msgstr "Igama elilahlekileyo."
 
@@ -10486,15 +10601,15 @@ msgstr "ixesha olichazileyo"
 msgid "years"
 msgstr "iminyaka"
 
-#: ../filter/rule-editor.c:285
+#: ../filter/rule-editor.c:290
 msgid "Add Rule"
 msgstr "Yongeza Umthetho"
 
-#: ../filter/rule-editor.c:361
+#: ../filter/rule-editor.c:366
 msgid "Edit Rule"
 msgstr "Hlela Umthetho"
 
-#: ../filter/rule-editor.c:693
+#: ../filter/rule-editor.c:698
 msgid "Rule name"
 msgstr "Igama Lomthetho"
 
@@ -10543,11 +10658,12 @@ msgstr "Ulawulo lokumiselwa kweenkqubo zabenzi be-Evolution Ye-imeyili"
 msgid "Evolution Mail preferences control"
 msgstr "Ulawulo olukhethiweyo lwe-Evolution Ye-imeyili"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:493
-#: ../mail/importers/elm-importer.c:418
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:494
+#: ../mail/importers/elm-importer.c:342
 #: ../mail/importers/netscape-importer.c:1902
-#: ../mail/importers/pine-importer.c:474 ../mail/mail-component.c:558
-#: ../mail/mail-component.c:645
+#: ../mail/importers/pine-importer.c:388 ../mail/mail-component.c:561
+#: ../mail/mail-component.c:648
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "I-imeyili"
 
@@ -10587,99 +10703,101 @@ msgstr ""
 msgid "Select Folder"
 msgstr "Khetha Isiqulathi Seefayili"
 
-#: ../mail/em-account-editor.c:758
+#: ../mail/em-account-editor.c:760
 #, fuzzy
 msgid "Ask for each message"
 msgstr "Akukho myalezo unjalo"
 
-#: ../mail/em-account-editor.c:1719 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "Isazisi"
 
-#: ../mail/em-account-editor.c:1755 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1760 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "Fumana I-imeyili"
 
-#: ../mail/em-account-editor.c:1932
+#: ../mail/em-account-editor.c:1943
 msgid "Automatically check for _new mail every"
 msgstr "Ukujonga yonke i-imeyili _entsha ngokuzenzekelayo"
 
-#: ../mail/em-account-editor.c:2100 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
 msgid "Sending Email"
 msgstr "Ukuthumela I-imeyile"
 
-#: ../mail/em-account-editor.c:2148 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Ezimiselweyo"
 
-#: ../mail/em-account-editor.c:2207 ../mail/mail-config.glade.h:122
+#. Security settings
+#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:122
+#: ../plugins/exchange-operations/exchange-account-setup.c:311
 msgid "Security"
 msgstr "Ukhuseleko"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2244 ../mail/em-account-editor.c:2318
+#: ../mail/em-account-editor.c:2260 ../mail/em-account-editor.c:2334
 msgid "Receiving Options"
 msgstr "Ukufumana ukhetho"
 
-#: ../mail/em-account-editor.c:2245 ../mail/em-account-editor.c:2319
+#: ../mail/em-account-editor.c:2261 ../mail/em-account-editor.c:2335
 msgid "Checking for New Mail"
 msgstr "Ukukhangela I-imeyili Entsha"
 
-#: ../mail/em-account-editor.c:2643 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Umhleli We-akhawunti"
 
-#: ../mail/em-account-editor.c:2643 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Umncedisi Kwi-akhawunti Ye-Evolution"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:428
+#: ../mail/em-account-prefs.c:455
 msgid "[Default]"
 msgstr "[Emiselweyo]"
 
-#: ../mail/em-account-prefs.c:482
+#: ../mail/em-account-prefs.c:510
 msgid "Account name"
 msgstr "Igama le-akhawunti"
 
-#: ../mail/em-account-prefs.c:484
+#: ../mail/em-account-prefs.c:512
 msgid "Protocol"
 msgstr "Imithetho yokusebenza"
 
-#: ../mail/em-account-prefs.c:489
+#: ../mail/em-account-prefs.c:517
 #, fuzzy
 msgid "Mail Accounts Table"
 msgstr "Ii-akhawunti Ye-imeyili"
 
-#: ../mail/em-composer-prefs.c:306 ../mail/em-composer-prefs.c:429
-#: ../mail/mail-config.c:935
+#: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
+#: ../mail/mail-config.c:958
 msgid "Unnamed"
 msgstr "Ayithiywanga gama"
 
-#: ../mail/em-composer-prefs.c:894
+#: ../mail/em-composer-prefs.c:897
 msgid "Language(s)"
 msgstr "U(Ii)lwimi"
 
-#: ../mail/em-composer-prefs.c:937
+#: ../mail/em-composer-prefs.c:940
 msgid "Add signature script"
 msgstr "Yongeza iskripti sosayino"
 
-#: ../mail/em-composer-prefs.c:957
+#: ../mail/em-composer-prefs.c:960
 msgid "Signature(s)"
 msgstr "U(iint)sayino"
 
-#: ../mail/em-composer-utils.c:852
+#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Umyalezo Ogqithiisiweyo --------"
 
-#: ../mail/em-composer-utils.c:1644
+#: ../mail/em-composer-utils.c:1648
 msgid "an unknown sender"
 msgstr "umthumeli ongaziwayo"
 
 #. 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:1691
+#: ../mail/em-composer-utils.c:1695
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10817,7 +10935,7 @@ msgid "is not Flagged"
 msgstr "ayiphawulwanga"
 
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
-#: ../ui/evolution-mail-message.xml.h:47
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Ulwazi olungasebenziyo"
 
@@ -10825,7 +10943,7 @@ msgstr "Ulwazi olungasebenziyo"
 msgid "Junk Test"
 msgstr "Uvavanyo Lwento Engenamsebenzi"
 
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1061
+#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1063
 #: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Ilebhile"
@@ -10934,8 +11052,8 @@ msgstr "iqala nge-"
 msgid "Stop Processing"
 msgstr "Nqumamisa Ukuphumeza"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1541
-#: ../mail/em-format-quote.c:310 ../mail/em-format.c:848
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1572
+#: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
 #: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:330
 #: ../plugins/groupwise-features/properties.glade.h:7
@@ -10954,7 +11072,7 @@ msgstr "<b>Emva koko</b>"
 
 #: ../mail/em-folder-browser.c:134
 #, fuzzy
-msgid "Create _vFolder From Search..."
+msgid "C_reate Search Folder From Search..."
 msgstr "Yenza _Isiqulathi seefayili Esingeyonyani Kolu Khangelo..."
 
 #. TODO: can this be done in a loop?
@@ -10988,33 +11106,34 @@ msgid "Folder _name:"
 msgstr "Igama _lesiqulathi seefayili"
 
 #: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
-#: ../mail/mail-vfolder.c:900 ../mail/mail-vfolder.c:970
-msgid "vFolders"
-msgstr "Ii-vFolders"
+#: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
+#, fuzzy
+msgid "Search Folders"
+msgstr "Khetha Isiqulathi Seefayili"
 
 #. UNMATCHED is always last
 #: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
 msgid "UNMATCHED"
 msgstr "AZIHAMBELANI"
 
-#: ../mail/em-folder-tree-model.c:468 ../mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:469 ../mail/mail-component.c:144
 msgid "Drafts"
 msgstr "Iidrafti"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:471 ../mail/mail-component.c:142
+#: ../mail/em-folder-tree-model.c:472 ../mail/mail-component.c:143
 msgid "Inbox"
 msgstr "Ibhokisi yezingenayo"
 
-#: ../mail/em-folder-tree-model.c:474 ../mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:145
 msgid "Outbox"
 msgstr "Ibhokisi ye-imeyili ephumayo"
 
-#: ../mail/em-folder-tree-model.c:476 ../mail/mail-component.c:145
+#: ../mail/em-folder-tree-model.c:477 ../mail/mail-component.c:146
 msgid "Sent"
 msgstr "Ithunyelwe"
 
-#: ../mail/em-folder-tree-model.c:495 ../mail/em-folder-tree-model.c:799
+#: ../mail/em-folder-tree-model.c:498 ../mail/em-folder-tree-model.c:802
 msgid "Loading..."
 msgstr "Isafaka..."
 
@@ -11022,68 +11141,68 @@ msgstr "Isafaka..."
 msgid "Mail Folder Tree"
 msgstr "Umthe Wesiqulathi seefayili Zee-imeyili"
 
-#: ../mail/em-folder-tree.c:922
+#: ../mail/em-folder-tree.c:849
 #, c-format
 msgid "Moving folder %s"
 msgstr "Ukushenxisa isiqulathi seefayili %s"
 
-#: ../mail/em-folder-tree.c:924
+#: ../mail/em-folder-tree.c:851
 #, c-format
 msgid "Copying folder %s"
 msgstr "Ukukopa isiqulathi seefayili %s"
 
-#: ../mail/em-folder-tree.c:931 ../mail/message-list.c:1613
+#: ../mail/em-folder-tree.c:858 ../mail/message-list.c:1613
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Ukushenxisa imiyalezo uyise kwisiqulathi seefayili %s"
 
-#: ../mail/em-folder-tree.c:933 ../mail/message-list.c:1615
+#: ../mail/em-folder-tree.c:860 ../mail/message-list.c:1615
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Ukukopa imiyalezo uyise kwisiqulathi seefayili %s"
 
-#: ../mail/em-folder-tree.c:949
+#: ../mail/em-folder-tree.c:876
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ayikwazi ukubeka u(imi)yalezo kuvimba okwinqanaba eliphezulu"
 
-#: ../mail/em-folder-tree.c:1045 ../ui/evolution-mail-message.xml.h:101
+#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "_Kopela Kwisiqulathi Seefayili"
 
-#: ../mail/em-folder-tree.c:1046 ../ui/evolution-mail-message.xml.h:111
+#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:114
 msgid "_Move to Folder"
 msgstr "_Shenxisela Kwisiqulathi Seefayili"
 
-#: ../mail/em-folder-tree.c:1751 ../mail/mail-ops.c:1055
+#: ../mail/em-folder-tree.c:1678 ../mail/mail-ops.c:1057
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ukuskena iziqulathi zeefayili kwi-\"%s\""
 
-#: ../mail/em-folder-tree.c:2107 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
+#: ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:52 ../ui/evolution.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
 msgid "_View"
 msgstr "_Yikhangele"
 
-#: ../mail/em-folder-tree.c:2108
+#: ../mail/em-folder-tree.c:2032
 msgid "Open in _New Window"
 msgstr "Yivule _Kwifestile Entsha"
 
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2036
 msgid "_Copy..."
 msgstr "_Kopa..."
 
-#: ../mail/em-folder-tree.c:2113
+#: ../mail/em-folder-tree.c:2037
 msgid "_Move..."
 msgstr "_Shenxa..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2117
+#: ../mail/em-folder-tree.c:2041
 msgid "_New Folder..."
 msgstr "Isiqulathi Seefayili _Esitsha..."
 
-#: ../mail/em-folder-tree.c:2120 ../ui/evolution-mail-list.xml.h:29
+#: ../mail/em-folder-tree.c:2044 ../ui/evolution-mail-list.xml.h:30
 msgid "_Rename..."
 msgstr "_Yinike elinye igama..."
 
@@ -11092,196 +11211,206 @@ msgstr "_Yinike elinye igama..."
 msgid "Copying `%s' to `%s'"
 msgstr "Ukukopa imiyalezo uyise %s"
 
-#: ../mail/em-folder-utils.c:367 ../mail/em-folder-utils.c:383
-#: ../mail/em-folder-view.c:929 ../mail/em-folder-view.c:944
-#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:931
+#: ../mail/em-folder-view.c:946 ../mail/importers/evolution-mbox-importer.c:85
 #: ../mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "Khetha isiqulathi seefayili"
 
-#: ../mail/em-folder-utils.c:367 ../mail/em-folder-view.c:944
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:946
 msgid "C_opy"
 msgstr "K_opa"
 
-#: ../mail/em-folder-utils.c:521
+#: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Yinike elinye igama esi \"%s\" siqulathi seefayili siya ku:"
 
-#: ../mail/em-folder-utils.c:523
+#: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "Yinike Elinye Igama"
 
-#: ../mail/em-folder-utils.c:529
+#: ../mail/em-folder-utils.c:511
 #, fuzzy
 msgid "Folder names cannot contain '/'"
 msgstr "Igama lesiqulathi seefayili alikwazi ukuqulatha olu phawu \"/\"."
 
-#: ../mail/em-folder-utils.c:599
-#: ../plugins/groupwise-features/share-folder-common.c:140
+#: ../mail/em-folder-utils.c:581
+#: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Ukwenza isiqulathi seefayili `%s'"
 
-#: ../mail/em-folder-utils.c:748
-#: ../plugins/groupwise-features/install-shared.c:156
-#: ../plugins/groupwise-features/share-folder-common.c:382
+#: ../mail/em-folder-utils.c:730
+#: ../plugins/groupwise-features/install-shared.c:164
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Create folder"
 msgstr "Yenza isiqulathi seefayili"
 
-#: ../mail/em-folder-utils.c:748
-#: ../plugins/groupwise-features/install-shared.c:156
-#: ../plugins/groupwise-features/share-folder-common.c:382
+#: ../mail/em-folder-utils.c:730
+#: ../plugins/groupwise-features/install-shared.c:164
+#: ../plugins/groupwise-features/share-folder-common.c:387
 msgid "Specify where to create the folder:"
 msgstr "Balula indawo esenziwe kuyo esi siqulathi seefayili:"
 
-#: ../mail/em-folder-view.c:1037 ../mail/em-popup.c:499
+#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:546 ../mail/em-popup.c:557
 msgid "Reply to _All"
 msgstr "Phendulela ku_Bo bonke"
 
-#: ../mail/em-folder-view.c:1038 ../ui/evolution-mail-message.xml.h:119
+#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
 msgid "_Reply to Sender"
 msgstr "_Phendulela kuMthumeli"
 
-#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:501
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Forward"
 msgstr "_Dlulisa"
 
-#: ../mail/em-folder-view.c:1042 ../ui/evolution-mail-message.xml.h:103
+#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_Hlela njengoMyalezo Omtsha..."
 
-#: ../mail/em-folder-view.c:1048
+#: ../mail/em-folder-view.c:1050
 msgid "U_ndelete"
 msgstr "Musa_ukucima"
 
-#: ../mail/em-folder-view.c:1049
-msgid "Mo_ve to Folder..."
-msgstr "She_nxisela Kwisiqulathi Seefayili..."
+#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
+msgid "_Move to Folder..."
+msgstr "_Shenxisela Kwisiqulathi Seefayili..."
 
-#: ../mail/em-folder-view.c:1050 ../ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopela Kwisiqulathi Seefayili..."
 
-#: ../mail/em-folder-view.c:1053
+#: ../mail/em-folder-view.c:1055
 msgid "Mar_k as Read"
 msgstr "Yiphawu_le njengeFundiweyo"
 
-#: ../mail/em-folder-view.c:1054
-msgid "Mark as U_nread"
+#: ../mail/em-folder-view.c:1056
+#, fuzzy
+msgid "Mark as _Unread"
 msgstr "Phawula njengoN_gafundwanga"
 
-#: ../mail/em-folder-view.c:1055
+#: ../mail/em-folder-view.c:1057
 msgid "Mark as _Important"
 msgstr "Yiphawule njenge_Balulekileyo"
 
-#: ../mail/em-folder-view.c:1056
+#: ../mail/em-folder-view.c:1058
 msgid "_Mark as Unimportant"
 msgstr "_Yiphawule njengeNgabalulekanga"
 
-#: ../mail/em-folder-view.c:1057
+#: ../mail/em-folder-view.c:1059
 msgid "Mark as _Junk"
 msgstr "Yiphawule njenge_Ngasebenziyo"
 
-#: ../mail/em-folder-view.c:1058
+#: ../mail/em-folder-view.c:1060
 msgid "Mark as _Not Junk"
 msgstr "Yiphawule njenge_Sebenzayo"
 
-#: ../mail/em-folder-view.c:1059
+#: ../mail/em-folder-view.c:1061
 #, fuzzy
 msgid "Mark for Follo_w Up..."
 msgstr "Yila_ndele..."
 
-#: ../mail/em-folder-view.c:1067
+#: ../mail/em-folder-view.c:1069
 msgid "Fla_g Completed"
 msgstr "Fle_ga Igqityiwe"
 
-#: ../mail/em-folder-view.c:1068
+#: ../mail/em-folder-view.c:1070
 msgid "Cl_ear Flag"
 msgstr "Su_la iFlegi"
 
-#: ../mail/em-folder-view.c:1071
+#: ../mail/em-folder-view.c:1073
 msgid "Crea_te Rule From Message"
 msgstr "Yen_za Umthetho Ovela Kumyalezo"
 
-#: ../mail/em-folder-view.c:1072
-msgid "vFolder on _Subject"
+#: ../mail/em-folder-view.c:1074
+#, fuzzy
+msgid "Search Folder from _Subject"
 msgstr "I-vFolder ekwi _Sihloko"
 
-#: ../mail/em-folder-view.c:1073
-msgid "vFolder on Se_nder"
+#: ../mail/em-folder-view.c:1075
+#, fuzzy
+msgid "Search Folder from Se_nder"
 msgstr "I-vFolder kuMth_umeli"
 
-#: ../mail/em-folder-view.c:1074
-msgid "vFolder on _Recipients"
+#: ../mail/em-folder-view.c:1076
+#, fuzzy
+msgid "Search Folder from _Recipients"
 msgstr "I-vFolder eku_Bamkeli"
 
-#: ../mail/em-folder-view.c:1075
-msgid "vFolder on Mailing _List"
+#: ../mail/em-folder-view.c:1077
+#, fuzzy
+msgid "Search Folder from Mailing _List"
 msgstr "I-vFolder ekuLuhlu _Lwabantu Oqhagamshelana nabo nge-imeyili"
 
-#: ../mail/em-folder-view.c:1079
+#: ../mail/em-folder-view.c:1081
 msgid "Filter on Sub_ject"
 msgstr "Hluza kwiSihl_oko"
 
-#: ../mail/em-folder-view.c:1080
+#: ../mail/em-folder-view.c:1082
 msgid "Filter on Sen_der"
 msgstr "Hluza kuMthume_li"
 
-#: ../mail/em-folder-view.c:1081
+#: ../mail/em-folder-view.c:1083
 msgid "Filter on Re_cipients"
 msgstr "Hluza ku_Bamkeli"
 
-#: ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-view.c:1084
 msgid "Filter on _Mailing List"
 msgstr "Hluza ku_Luhlu Lwabantu Oqhagamshelana nabo"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1922 ../mail/em-folder-view.c:1966
+#: ../mail/em-folder-view.c:1921 ../mail/em-folder-view.c:1965
 msgid "Default"
 msgstr "Misela"
 
-#: ../mail/em-folder-view.c:2065
+#: ../mail/em-folder-view.c:2064
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
+#: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Umyalezo Woshicilelo"
 
-#: ../mail/em-folder-view.c:2403
+#: ../mail/em-folder-view.c:2220
+#, fuzzy
+msgid "Unable to retrieve message"
+msgstr "Ayinakho ukuphinda ifumane lo myalezo: %s"
+
+#: ../mail/em-folder-view.c:2413
 msgid "_Copy Link Location"
 msgstr "_Kopa Indawo Yokunxulumanisa"
 
-#: ../mail/em-folder-view.c:2405
+#: ../mail/em-folder-view.c:2415
 #, fuzzy
-msgid "Create _vFolder"
-msgstr "Yenza isiqulathi seefayili"
+msgid "Create _Search Folder"
+msgstr "Yenza Isiqulathi Seefayili Esitsha"
 
-#: ../mail/em-folder-view.c:2406
+#: ../mail/em-folder-view.c:2416
 #, fuzzy
 msgid "_From this Address"
 msgstr "Idilesi Yasekhaya"
 
-#: ../mail/em-folder-view.c:2407
+#: ../mail/em-folder-view.c:2417
 #, fuzzy
 msgid "_To this Address"
 msgstr "Enye idilesi"
 
-#: ../mail/em-folder-view.c:2688
+#: ../mail/em-folder-view.c:2698
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cofa kwi-imeyili %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:406
+#: ../mail/em-format-html-display.c:445
 #, c-format
 msgid "Matches: %d"
 msgstr "Iyahambelana: %d"
 
-#: ../mail/em-format-html-display.c:653 ../mail/em-format-html.c:578
+#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
 msgid "Unsigned"
 msgstr "Ayisayinwanga"
 
-#: ../mail/em-format-html-display.c:653
+#: ../mail/em-format-html-display.c:696
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11289,11 +11418,11 @@ msgstr ""
 "Awusayinwanga lo myalezo. Akukho siqinisekiso singqina ubunyaniso balo "
 "myalezo."
 
-#: ../mail/em-format-html-display.c:654 ../mail/em-format-html.c:579
+#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
 msgid "Valid signature"
 msgstr "Usayino olusemthethweni"
 
-#: ../mail/em-format-html-display.c:654
+#: ../mail/em-format-html-display.c:697
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11301,11 +11430,11 @@ msgstr ""
 "Lo myalezo usayiniwe yaye nentsingiselo yesigunyaziso ingqina ukuba lo "
 "myalezo uyinyani."
 
-#: ../mail/em-format-html-display.c:655 ../mail/em-format-html.c:580
+#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
 msgid "Invalid signature"
 msgstr "Usayino olungagunyaziswanga"
 
-#: ../mail/em-format-html-display.c:655
+#: ../mail/em-format-html-display.c:698
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11313,11 +11442,11 @@ msgstr ""
 "Usayino lwalo myalezo alunakuqinisekiswa, kungenzeka ukuba iguqulwe ngelixa "
 "uhanjiswa."
 
-#: ../mail/em-format-html-display.c:656
+#: ../mail/em-format-html-display.c:699
 msgid "Valid signature, cannot verify sender"
 msgstr "Usayino olugunyazisiweyo, ayikwazi ukuqinisekisa umthumeli"
 
-#: ../mail/em-format-html-display.c:656
+#: ../mail/em-format-html-display.c:699
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11325,11 +11454,11 @@ msgstr ""
 "Lo myalezo usayinwe ngosayino olusemthethweni, kodwa umthumeli walo myalezo "
 "akanakuqinisekiswa."
 
-#: ../mail/em-format-html-display.c:662 ../mail/em-format-html.c:587
+#: ../mail/em-format-html-display.c:705 ../mail/em-format-html.c:606
 msgid "Unencrypted"
 msgstr "Engakhowudwanga"
 
-#: ../mail/em-format-html-display.c:662
+#: ../mail/em-format-html-display.c:705
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11337,11 +11466,11 @@ msgstr ""
 "Awukhowudwanga lo myalezo.  okuqulethweyo kungabonwa ngelixa uhanjiswa kwi-"
 "intanethi."
 
-#: ../mail/em-format-html-display.c:663 ../mail/em-format-html.c:588
+#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:607
 msgid "Encrypted, weak"
 msgstr "Ekhowudiweyo, ibuthathaka"
 
-#: ../mail/em-format-html-display.c:663
+#: ../mail/em-format-html-display.c:706
 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 "
@@ -11351,11 +11480,11 @@ msgstr ""
 "kodwa akunakungenzeki ukuba ongaphandle abone okuqulethwe ngulo myalezo xa "
 "ezinika ixesha."
 
-#: ../mail/em-format-html-display.c:664 ../mail/em-format-html.c:589
+#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:608
 msgid "Encrypted"
 msgstr "Ekhowudiweyo"
 
-#: ../mail/em-format-html-display.c:664
+#: ../mail/em-format-html-display.c:707
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11363,11 +11492,11 @@ msgstr ""
 "Lo myalezo ukhowudiwe. Kunganzima kowangaphandle ukubona okuqulethwe ngulo "
 "myalezo."
 
-#: ../mail/em-format-html-display.c:665 ../mail/em-format-html.c:590
+#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:609
 msgid "Encrypted, strong"
 msgstr "Ekhowudiweyo, inamandla"
 
-#: ../mail/em-format-html-display.c:665
+#: ../mail/em-format-html-display.c:708
 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 "
@@ -11376,175 +11505,213 @@ msgstr ""
 "Lo myalezo ukhowudwe ngemithetho eqinile yokukhowuda. Kunganzima kakhulu "
 "kowangaphandle ukubona okuqulethwe kulo myalezo naxa enokuzinika ixesha."
 
-#: ../mail/em-format-html-display.c:766 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:809 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Khangela Isatifiketi"
 
-#: ../mail/em-format-html-display.c:781
+#: ../mail/em-format-html-display.c:824
 msgid "This certificate is not viewable"
 msgstr "Esi satifiketi asinakubonwa"
 
-#: ../mail/em-format-html-display.c:1011
+#: ../mail/em-format-html-display.c:1106
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Igqitywe ngo-%B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1019
+#: ../mail/em-format-html-display.c:1114
 msgid "Overdue:"
 msgstr "Idlulelwe lixesha:"
 
-#: ../mail/em-format-html-display.c:1022
+#: ../mail/em-format-html-display.c:1117
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "ngu-%B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1064
+#: ../mail/em-format-html-display.c:1177
 msgid "_View Inline"
 msgstr "_Khangela Kwingxelo Ekwinkqubo"
 
-#: ../mail/em-format-html-display.c:1065
+#: ../mail/em-format-html-display.c:1178
 msgid "_Hide"
 msgstr "_Fihla"
 
-#: ../mail/em-format-html-display.c:1309
+#: ../mail/em-format-html-display.c:1179
+#, fuzzy
+msgid "_Fit to Width"
+msgstr "Ububanzi be-Clip"
+
+#: ../mail/em-format-html-display.c:1180
+#, fuzzy
+msgid "Show _Original Size"
+msgstr "Ubu_ngakanani Bokuqala"
+
+#: ../mail/em-format-html-display.c:1550
 msgid "Attachment Button"
 msgstr "Iqhosha Lokuqhoboshela"
 
+#: ../mail/em-format-html-display.c:1757
+#, fuzzy
+msgid "Select folder to save all attachments..."
+msgstr "Gcina zonke iziqhoboshelo"
+
+#: ../mail/em-format-html-display.c:1796
+msgid "Select folder to save selected attachments..."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1804
+#, fuzzy
+msgid "Save Selected..."
+msgstr "Ayikho Ekhethiweyo"
+
+#. Cant i put in the number of attachments here ?
+#: ../mail/em-format-html-display.c:1871
+#, fuzzy, c-format
+msgid "%d attachment"
+msgid_plural "%d attachments"
+msgstr[0] "I-%s isiqhobosheli"
+msgstr[1] "I-%s isiqhobosheli"
+
+#: ../mail/em-format-html-display.c:1935
+#, fuzzy
+msgid "No Attachment"
+msgstr "Isiqhoboshelo"
+
+#: ../mail/em-format-html-display.c:1938
+#, fuzzy
+msgid "Save All"
+msgstr "Gcina Njenge"
+
 #: ../mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Iphepha %d le %d"
 
-#: ../mail/em-format-html.c:471 ../mail/em-format-html.c:473
+#: ../mail/em-format-html.c:473 ../mail/em-format-html.c:475
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Ukufumana kwakhona `%s'"
 
-#: ../mail/em-format-html.c:581
+#: ../mail/em-format-html.c:600
 msgid "Valid signature but cannot verify sender"
 msgstr "Ukusayina okusemthethweni kodwa ayikwazi ukuqinisekisa umthumeli"
 
-#: ../mail/em-format-html.c:839
+#: ../mail/em-format-html.c:870
 msgid "Malformed external-body part."
 msgstr "Ukungemi kakuhle kwenxalenye yomzimba ongaphandle."
 
-#: ../mail/em-format-html.c:869
+#: ../mail/em-format-html.c:900
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Isalathisi esalatha kwindawo yeFTP (%s)"
 
-#: ../mail/em-format-html.c:880
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 "Isalathisi esalatha kwifayili zangaphakathi (%s) isemthethweni kule ndawo \"%"
 "s\""
 
-#: ../mail/em-format-html.c:882
+#: ../mail/em-format-html.c:913
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Isalathisi esalatha kwifayili zangaphakathi (%s)"
 
-#: ../mail/em-format-html.c:903
+#: ../mail/em-format-html.c:934
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Isalathisi esalatha kwi-data ekwenye indawo (%s)"
 
-#: ../mail/em-format-html.c:914
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Isalathisi esalatha kwi-data engaphandle (\"%s\" uhlobo)"
 
-#: ../mail/em-format-html.c:1140
+#: ../mail/em-format-html.c:1171
 msgid "Formatting message"
 msgstr "Ubume bomyalezo"
 
-#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
-#: ../mail/em-format.c:843 ../mail/em-mailer-prefs.c:83
+#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
 msgid "From"
 msgstr "Ivela"
 
-#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:84
 msgid "Reply-To"
 msgstr "Phendulela-Ku"
 
-#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:85
+#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Iya"
 
-#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
-#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:86
 msgid "Cc"
 msgstr "Kopela ku"
 
-#: ../mail/em-format-html.c:1433 ../mail/em-format-quote.c:197
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:87
 msgid "Bcc"
 msgstr "Kopela ngokufihliweyo"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1545 ../mail/em-format-quote.c:319
-#: ../mail/em-mailer-prefs.c:986
+#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:987
 msgid "Mailer"
 msgstr "Umthumeli we-imeyili"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1572
+#: ../mail/em-format-html.c:1603
 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:1575
+#: ../mail/em-format-html.c:1606
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1585 ../mail/em-format-quote.c:326
-#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
 #: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Umhla"
 
-#: ../mail/em-format-html.c:1608 ../mail/em-format.c:850
+#: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:90
 msgid "Newsgroups"
 msgstr "Amaqela eendaba"
 
-#: ../mail/em-format.c:1099
+#: ../mail/em-format.c:1102
 #, c-format
 msgid "%s attachment"
 msgstr "I-%s isiqhobosheli"
 
-#: ../mail/em-format.c:1138 ../mail/em-format.c:1271
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1288 ../mail/em-format.c:1575
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Ayikwazanga ukwahlula ngezijungqu umyalezo we-S/MIME: Impazamo ayaziwa"
 
-#: ../mail/em-format.c:1261
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Uhlobo olungaxhaswanga lokukhowudela inxalenye eninzi/ezikhowudiweyo"
-
-#: ../mail/em-format.c:1409
+#: ../mail/em-format.c:1270 ../mail/em-format.c:1426
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Ayikwazanga ukwahlula ngezijungqu umyalezo we-MIME. Iboniswa njengomthombo."
 
-#: ../mail/em-format.c:1428
+#: ../mail/em-format.c:1278
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Uhlobo olungaxhaswanga lokukhowudela inxalenye eninzi/ezikhowudiweyo"
+
+#: ../mail/em-format.c:1445
 msgid "Unsupported signature format"
 msgstr "Ubume bosayino olungaxhaswanga"
 
-#: ../mail/em-format.c:1436
+#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
 msgid "Error verifying signature"
 msgstr "Impazamo xa kuqinisekiswa usayino"
 
-#: ../mail/em-format.c:1436
+#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
 msgid "Unknown error verifying signature"
 msgstr "Impazamo engaziwayo ngelixa kuqinisekiswa usayino"
 
-#: ../mail/em-junk-filter.c:111
-msgid "Spamassassin (built-in)"
-msgstr "i-Spamassassin (esakhelweyo)"
-
 #: ../mail/em-mailer-prefs.c:101
 msgid "Every time"
 msgstr "Lonke ixesha"
@@ -11622,63 +11789,64 @@ msgstr ""
 "Ayinakho ukufunda imimiselo evela ekufakweni kwi-Evolution edlulileyo, i-"
 "`evolution/config.xmldb' ayikho okanye yonakele."
 
-#: ../mail/em-popup.c:382
+#: ../mail/em-popup.c:399
 msgid "Save As..."
 msgstr "Gcina Njenge..."
 
-#: ../mail/em-popup.c:401
+#: ../mail/em-popup.c:424
 #, c-format
 msgid "untitled_image.%s"
 msgstr "umfanekiso_ongenasihloko.%s"
 
-#: ../mail/em-popup.c:495
+#: ../mail/em-popup.c:542 ../mail/em-popup.c:553
 msgid "Set as _Background"
 msgstr "Misela njengo _Kungasemva Kwiskrini"
 
-#: ../mail/em-popup.c:497
+#: ../mail/em-popup.c:544 ../mail/em-popup.c:555
 msgid "_Reply to sender"
 msgstr "_Phendulela kumthumeli"
 
-#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/em-popup.c:545 ../mail/em-popup.c:556
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reply to _List"
 msgstr "Phendulela ku_Luhlu"
 
-#: ../mail/em-popup.c:549
+#: ../mail/em-popup.c:607
 msgid "_Open Link in Browser"
 msgstr "_Vula Unxulumano kwiSikhangeli"
 
-#: ../mail/em-popup.c:550
+#: ../mail/em-popup.c:608
 #, fuzzy
 msgid "_Send New Message To..."
 msgstr "Thu_mela umyalezo ku..."
 
-#: ../mail/em-popup.c:551
+#: ../mail/em-popup.c:609
 msgid "_Add to Addressbook"
 msgstr "_Yongeza kwiNcwadi yedilesi"
 
-#: ../mail/em-popup.c:666
+#: ../mail/em-popup.c:762
 #, c-format
 msgid "Open in %s..."
 msgstr "Vula kwi-%s..."
 
-#: ../mail/em-subscribe-editor.c:611
+#: ../mail/em-subscribe-editor.c:614
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Lo vimba akakuxhasi ukuzibophelela, okanye abavulwanga."
 
-#: ../mail/em-subscribe-editor.c:640
+#: ../mail/em-subscribe-editor.c:643
 msgid "Subscribed"
 msgstr "Uzibophelele"
 
-#: ../mail/em-subscribe-editor.c:644
+#: ../mail/em-subscribe-editor.c:647
 msgid "Folder"
 msgstr "Isiqulathi seefayili"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:859
+#: ../mail/em-subscribe-editor.c:862
 msgid "Please select a server."
 msgstr "Nceda ukhethe iseva."
 
-#: ../mail/em-subscribe-editor.c:880
+#: ../mail/em-subscribe-editor.c:883
 msgid "No server has been selected"
 msgstr "Akukho seva ikhethiweyo"
 
@@ -11686,35 +11854,37 @@ msgstr "Akukho seva ikhethiweyo"
 msgid "Don't show this message again."
 msgstr "Musa ukubonisa lo myalezo kwakhona."
 
-#: ../mail/em-utils.c:294
+#: ../mail/em-utils.c:299
 msgid "Filters"
 msgstr "Izihluzi"
 
-#: ../mail/em-utils.c:436
+#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
 msgid "message"
 msgstr "umyalezo"
 
-#: ../mail/em-utils.c:545
+#: ../mail/em-utils.c:614
 msgid "Save Message..."
 msgstr "Thumela Umyalezo..."
 
-#: ../mail/em-utils.c:594
+#: ../mail/em-utils.c:663
 msgid "Add address"
 msgstr "Yongeza idilesi"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1073
+#: ../mail/em-utils.c:1142
 #, c-format
 msgid "Messages from %s"
 msgstr "Umyalezo uvela %s"
 
 #: ../mail/em-vfolder-editor.c:104
-msgid "v_Folders"
-msgstr "Ii_vFolders"
+#, fuzzy
+msgid "Search _Folders"
+msgstr "Khetha Isiqulathi Seefayili"
 
 #: ../mail/em-vfolder-rule.c:574
-msgid "vFolder source"
-msgstr "Umthombo we-vFolder"
+#, fuzzy
+msgid "Search Folder source"
+msgstr "Khetha Isiqulathi Seefayili"
 
 #: ../mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
@@ -12218,93 +12388,61 @@ msgstr ""
 "Nokuba ngaba ubuyela ekwenzeni iinkqubo ngaxeshanye ngokwezihloko ukuba "
 "imiyalezo ayiqulathanga i-XA UPHENDULELA KU okanye izihloko Obhekisa kuzo."
 
-#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#: ../mail/importers/elm-importer.c:193
+msgid "Importing Elm data"
+msgstr "Ukungenisa i-data ye-Elm"
+
+#: ../mail/importers/elm-importer.c:382
 msgid "Evolution Elm importer"
 msgstr "I-Evolution yesingenisi se-Elm"
 
-#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "I-Evolution Yesingenisi Se-imeyili se-Netscape"
-
-#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "I-Evolution yesingenisi se-Outlook Express"
+#: ../mail/importers/elm-importer.c:383
+#, fuzzy
+msgid "Import mail from Elm."
+msgstr "Ukungenisa ibhokisi ye-imeyili"
 
-#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "I-Evolution yesingenisi se-Pine"
+#: ../mail/importers/evolution-mbox-importer.c:82
+#: ../mail/importers/evolution-outlook-importer.c:131
+msgid "Destination folder:"
+msgstr "Isiqulathi Seefayile Sendawo eya kuyo:"
 
-#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "I-Evolution yesingenisi se-mbox"
+#: ../mail/importers/evolution-mbox-importer.c:85
+#: ../mail/importers/evolution-outlook-importer.c:134
+msgid "Select folder to import into"
+msgstr "Khetha isiqulathi seefayili oza kungenisa kuso"
 
-#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "I-MBox (i-mbox)"
+#: ../mail/importers/evolution-mbox-importer.c:216
+msgid "Berkeley Mailbox (mbox)"
+msgstr ""
 
-#: ../mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "I-Outlook Express 4 (.mbx)"
+#: ../mail/importers/evolution-mbox-importer.c:217
+msgid "Importer Berkeley Mailbox format folders"
+msgstr ""
 
-#: ../mail/importers/elm-importer.c:88
-msgid "Evolution is importing your old Elm mail"
-msgstr "I-Evolution ingenisa i-imeyili ye-Elm yakho endala"
+#: ../mail/importers/evolution-outlook-importer.c:257
+#: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
+#, c-format
+msgid "Importing `%s'"
+msgstr "Ukungenisa `%s'"
 
-#: ../mail/importers/elm-importer.c:89
-#: ../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 "Ukungenisa..."
 
-#: ../mail/importers/elm-importer.c:91
-#: ../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
+#: ../plugins/startup-wizard/startup-wizard.c:236
+#: ../shell/e-shell-importer.c:523
 msgid "Please wait"
 msgstr "Nceda ulinde"
 
-#: ../mail/importers/elm-importer.c:244
-msgid "Importing Elm data"
-msgstr "Ukungenisa i-data ye-Elm"
-
-#: ../mail/importers/elm-importer.c:436
-msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"I-Evolution ifumene iifayili zomyalezo ze-Elm\n"
-"Ungathanda kusini na ukuzingenisa kwi-Evolution?"
-
-#: ../mail/importers/elm-importer.c:444
-msgid "Elm"
-msgstr "i-Elm"
-
-#: ../mail/importers/evolution-mbox-importer.c:117
-#: ../mail/importers/evolution-outlook-importer.c:131
-msgid "Destination folder:"
-msgstr "Isiqulathi Seefayile Sendawo eya kuyo:"
-
-#: ../mail/importers/evolution-mbox-importer.c:120
-#: ../mail/importers/evolution-outlook-importer.c:134
-msgid "Select folder to import into"
-msgstr "Khetha isiqulathi seefayili oza kungenisa kuso"
-
-#: ../mail/importers/evolution-mbox-importer.c:223
-#: ../mail/importers/evolution-outlook-importer.c:257
-#: ../mail/importers/mail-importer.c:226
-#, c-format
-msgid "Importing `%s'"
-msgstr "Ukungenisa `%s'"
-
 #: ../mail/importers/evolution-outlook-importer.c:305
-#: ../mail/importers/mail-importer.c:140
+#: ../mail/importers/mail-importer.c:144
 msgid "Importing mailbox"
 msgstr "Ukungenisa ibhokisi ye-imeyili"
 
-#: ../mail/importers/mail-importer.c:363
+#: ../mail/importers/mail-importer.c:373
 #, c-format
 msgid "Scanning %s"
 msgstr "Ukuskena %s"
@@ -12393,25 +12531,18 @@ msgstr ""
 "I-Evolution ifumene iifayili ze-imeyile ze-Netscape.\n"
 "Ungathanda ukuba zingeniswe kwi-Evolution yakho?"
 
-#: ../mail/importers/pine-importer.c:116
-msgid "Evolution is importing your old Pine data"
-msgstr "I-Evolution ingenisa i-data yakho endala evela kwi-Pine"
-
-#: ../mail/importers/pine-importer.c:314
+#: ../mail/importers/pine-importer.c:230
 msgid "Importing Pine data"
 msgstr "Ukungenisa i-data ye-Pine"
 
-#: ../mail/importers/pine-importer.c:498
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-"I-Evolution ifumene iifayili ze-imeyile ze-Pine.\n"
-"Ungathanda ukuba zingeniswe kwi-Evolution yakho?"
+#: ../mail/importers/pine-importer.c:434
+msgid "Evolution Pine importer"
+msgstr "I-Evolution yesingenisi se-Pine"
 
-#: ../mail/importers/pine-importer.c:506
-msgid "Pine"
-msgstr "I-Pine"
+#: ../mail/importers/pine-importer.c:435
+#, fuzzy
+msgid "Import mail from Pine."
+msgstr "Ngenisa ifayile e_nye"
 
 #: ../mail/mail-autofilter.c:78
 #, c-format
@@ -12437,85 +12568,87 @@ msgstr "I-%s yoluhlu lwe-imeyili"
 msgid "Add Filter Rule"
 msgstr "Yongeza Umthetho Wesihluzi"
 
-#: ../mail/mail-component.c:506
+#: ../mail/mail-component.c:509
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d icinyiwe"
 msgstr[1] "%d zicinyiwe"
 
-#: ../mail/mail-component.c:508
+#: ../mail/mail-component.c:511
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d esetyenziswayo"
 msgstr[1] "%d ezisetyenziswayo"
 
-#: ../mail/mail-component.c:531
+#: ../mail/mail-component.c:534
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d idrafti"
 msgstr[1] "%d iidrafti"
 
-#: ../mail/mail-component.c:533
+#: ../mail/mail-component.c:536
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d uthunyelwe"
 msgstr[1] "%d ithunyelwe"
 
-#: ../mail/mail-component.c:535
+#: ../mail/mail-component.c:538
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d awuthunyelwanga"
 msgstr[1] "%d ayithunyelwanga"
 
-#: ../mail/mail-component.c:539
+#: ../mail/mail-component.c:542
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d uwonke"
 msgstr[1] "%d iyonke"
 
-#: ../mail/mail-component.c:541
+#: ../mail/mail-component.c:544
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", %d awufundwanga"
 msgstr[1] ", %d ayifundwanga"
 
-#: ../mail/mail-component.c:761
+#: ../mail/mail-component.c:765
 msgid "New Mail Message"
 msgstr "Umyalezo Omtsha We-imeyili"
 
-#: ../mail/mail-component.c:762
+#: ../mail/mail-component.c:766
 msgid "_Mail Message"
 msgstr "_Thumela Umyalezo"
 
-#: ../mail/mail-component.c:763
+#: ../mail/mail-component.c:767
 msgid "Compose a new mail message"
 msgstr "Bhala umyalezo omtsha we-imeyili"
 
-#: ../mail/mail-component.c:769
+#: ../mail/mail-component.c:773
 msgid "New Mail Folder"
 msgstr "Isiqulathi Seefayili Esitsha Se-imeyili"
 
-#: ../mail/mail-component.c:770
+#: ../mail/mail-component.c:774
 msgid "Mail _Folder"
 msgstr "Isiqulathi Seefayili _Ye-imeyili"
 
-#: ../mail/mail-component.c:771
+#: ../mail/mail-component.c:775
 msgid "Create a new mail folder"
 msgstr "Yenza isiqulathi sefayili esitsha se-imeyili"
 
-#: ../mail/mail-component.c:893
+#: ../mail/mail-component.c:919
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 "Ayiphumelelanga ukunyusa imimiselo okanye iziqulathi zeefayili ze-Imeyili."
 
 #: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -12581,7 +12714,7 @@ msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Okukhethwa Kwisihluzi</span>"
 
 #: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../plugins/itip-formatter/itip-formatter.c:1977
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Jikelele</span>"
 
@@ -13091,44 +13224,40 @@ msgid "_Full Name:"
 msgstr "_Igama Ngokuzeleyo:"
 
 #: ../mail/mail-config.glade.h:161
-msgid "_Host:"
-msgstr "_Umququzeleli:"
-
-#: ../mail/mail-config.glade.h:162
 msgid "_Load images in mail from contacts"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "_Yenze ibe yi-akhawunti emiselwe mna"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "_Phawula imiyalezo njengefundwe emva"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "_Ungakhe ufake imifanekiso evela kwi-Intanethi"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "_Indlela:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Bonisa xa uthumela imiyalezo nge-HTML kubamkeli abangayifuniyo "
 "imiyalezoenjalo"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Bonisa isikhumbuzi xa uthumela imiyalezo engenasihloko"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "_Isimbo sokuphendula:"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "I_skripti:"
 
@@ -13152,60 +13281,61 @@ msgstr "umbala"
 msgid "description"
 msgstr "inkcazelo"
 
-#: ../mail/mail-dialogs.glade.h:3
-msgid "<b>vFolder Sources</b>"
+#: ../mail/mail-dialogs.glade.h:2
+#, fuzzy
+msgid "<b>Search Folder Sources</b>"
 msgstr "<b>Imithombo ye-vFolder</b>"
 
-#: ../mail/mail-dialogs.glade.h:4
+#: ../mail/mail-dialogs.glade.h:3
 msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr "<span weight=\"bold\">Usayino Olwenziwe Ngamanani</span>"
 
-#: ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.glade.h:4
 msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Ukukhowuda</span>"
 
-#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.glade.h:5
 msgid "Case _Sensitive"
 msgstr "Iyabeva _Oonobumba"
 
-#: ../mail/mail-dialogs.glade.h:7 ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "Igqi_tyiwe"
 
-#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:8
 msgid "F_ind:"
 msgstr "F_umana:"
 
-#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Find in Message"
 msgstr "Ifunyenwe Kumyalezo"
 
-#: ../mail/mail-dialogs.glade.h:11 ../mail/message-tag-followup.c:295
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:295
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Flega Ukulandela Oku"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
 msgstr "Iziqulathi Zeefayili Onokuzibophelela Kuzo"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:12
 msgid "License Agreement"
 msgstr "Isivumelwano Sephepha-mvume"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
 msgid "None Selected"
 msgstr "Ayikho Ekhethiweyo"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
 msgstr "Is_eva:"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
 msgid "Security Information"
 msgstr "Ulwazi Lokhuseleko"
 
-#: ../mail/mail-dialogs.glade.h:18 ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13213,67 +13343,67 @@ msgstr ""
 "Le miyalezo idweliswe apha ngezantsi yile uyikhethele ukuba uyilandele.\n"
 "Nceda ukhethe isenzo sokuyilandela kule menyu \"I-flegi\""
 
-#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "_Yamkela iphepha-mvume"
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Ilindeleke Ngo:"
 
-#: ../mail/mail-dialogs.glade.h:22 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "I-_flegi:"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:22
 msgid "_Subscribe"
 msgstr "_Zibophelele"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:23
 msgid "_Tick this to accept the license agreement"
 msgstr "_Phawula oku ukwamkela isivumelwano sephepha-mvume"
 
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:24
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Phuma kwisibophelelo"
 
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:25
 msgid "specific folders only"
 msgstr "iziqulathi zeefayili ezikhethekileyo kuphela"
 
-#: ../mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:26
 msgid "with all active remote folders"
 msgstr "nazo zonke iziqulathi zeefayili ezikude nezisebenzayo"
 
-#: ../mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:27
 msgid "with all local and active remote folders"
 msgstr "nazo zonke iziqulathi zeefayili zangaphakathi ezikude nezisebenzayo"
 
-#: ../mail/mail-dialogs.glade.h:29
+#: ../mail/mail-dialogs.glade.h:28
 msgid "with all local folders"
 msgstr "nazo zonke iziqulathi zeefayili zangaphakathi"
 
-#: ../mail/mail-folder-cache.c:813
+#: ../mail/mail-folder-cache.c:855
 #, c-format
 msgid "Pinging %s"
 msgstr "Khupha isandi %s"
 
-#: ../mail/mail-ops.c:101
+#: ../mail/mail-ops.c:102
 msgid "Filtering Folder"
 msgstr "Ukuhluza isiqulathi seefayili"
 
-#: ../mail/mail-ops.c:262
+#: ../mail/mail-ops.c:263
 msgid "Fetching Mail"
 msgstr "Ukuphuthuma I-imeyili"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:562
+#: ../mail/mail-ops.c:563
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ayiphumelelanga ukusebenzisa izihluzi eziphumayo: %s"
 
-#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13282,116 +13412,116 @@ msgstr ""
 "Ayiphumelelanga ukuhlomela kwi-%s: %s\n"
 "Ukuhlomela kwisiqulathi seefayili sangaphakathi esithi `Ithunyelwe'."
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:621
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 "Ayiphumelelanga ukuhlomela isiqulathi seefayili sangaphakathi esithi "
 "'Ithunyelwe': %s"
 
-#: ../mail/mail-ops.c:731
+#: ../mail/mail-ops.c:733
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sithumela Umyalezo %d of %d"
 
-#: ../mail/mail-ops.c:756
+#: ../mail/mail-ops.c:758
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Ayiphumelelanga ukuthumela imiyalezo i-%d of %d"
 
-#: ../mail/mail-ops.c:758 ../mail/mail-send-recv.c:613
+#: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
 msgid "Cancelled."
 msgstr "Irhoxisiwe."
 
-#: ../mail/mail-ops.c:760
+#: ../mail/mail-ops.c:762
 msgid "Complete."
 msgstr "Gqibezela."
 
-#: ../mail/mail-ops.c:857
+#: ../mail/mail-ops.c:859
 msgid "Saving message to folder"
 msgstr "Ukugcina umyalezo kwisiqulathi seefayili"
 
-#: ../mail/mail-ops.c:942
+#: ../mail/mail-ops.c:944
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Ukushenxisa Imiyalezo uyise %s"
 
-#: ../mail/mail-ops.c:942
+#: ../mail/mail-ops.c:944
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Ukukopa imiyalezo uyise %s"
 
-#: ../mail/mail-ops.c:1168
+#: ../mail/mail-ops.c:1167
 msgid "Forwarded messages"
 msgstr "Imiyalezo edlulisiweyo"
 
-#: ../mail/mail-ops.c:1211
+#: ../mail/mail-ops.c:1210
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ukuvula isiqulathi seefayili %s"
 
-#: ../mail/mail-ops.c:1283
+#: ../mail/mail-ops.c:1282
 #, c-format
 msgid "Opening store %s"
 msgstr "Ukuvula uvimba %s"
 
-#: ../mail/mail-ops.c:1361
+#: ../mail/mail-ops.c:1360
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ukushenxisa isiqulathi seefayili %s"
 
-#: ../mail/mail-ops.c:1455
+#: ../mail/mail-ops.c:1454
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ukugcina isiqulathi seefayili '%s'"
 
-#: ../mail/mail-ops.c:1520
+#: ../mail/mail-ops.c:1519
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Ukucima nokugcina iakhawunti '%s'"
 
-#: ../mail/mail-ops.c:1521
+#: ../mail/mail-ops.c:1520
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Ukugcina i-akhawunti '%s'"
 
-#: ../mail/mail-ops.c:1576
+#: ../mail/mail-ops.c:1575
 msgid "Refreshing folder"
 msgstr "Ukuhlaziya isiqulathi seefayili"
 
-#: ../mail/mail-ops.c:1612 ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
 msgid "Expunging folder"
 msgstr "Ukucima isiqulathi seefayili"
 
-#: ../mail/mail-ops.c:1660
+#: ../mail/mail-ops.c:1659
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Ukuchitha Umgqomo '%s'"
 
-#: ../mail/mail-ops.c:1661
+#: ../mail/mail-ops.c:1660
 msgid "Local Folders"
 msgstr "Iziqulathi zeefayili Zangaphakathi"
 
-#: ../mail/mail-ops.c:1744
+#: ../mail/mail-ops.c:1743
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Ukuvula umyalezo %s"
 
-#: ../mail/mail-ops.c:1816
+#: ../mail/mail-ops.c:1853
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Ukuvula %d umyalezo"
 msgstr[1] "Ukuvula %d imiyalezo"
 
-#: ../mail/mail-ops.c:1902
+#: ../mail/mail-ops.c:1939
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Ukugcina %d umyalezo"
 msgstr[1] "Ukugcina %d imiyalezo"
 
-#: ../mail/mail-ops.c:1952
+#: ../mail/mail-ops.c:1989
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13400,7 +13530,7 @@ msgstr ""
 "Ayinako ukwenza ifayili yesiphumo: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:1980
+#: ../mail/mail-ops.c:2017
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13409,11 +13539,11 @@ msgstr ""
 "Kwenzeke impazamo ngelixa kugcinwa imiyalezo kwi- %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2051
+#: ../mail/mail-ops.c:2088
 msgid "Saving attachment"
 msgstr "Ukugcina isiqhoboshelo"
 
-#: ../mail/mail-ops.c:2063
+#: ../mail/mail-ops.c:2100
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13422,22 +13552,22 @@ msgstr ""
 "Ayikwazi ukwenza ifayili yesiphumo: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2073
+#: ../mail/mail-ops.c:2110
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ayikwazanga ukubhala i-data: %s"
 
-#: ../mail/mail-ops.c:2223
+#: ../mail/mail-ops.c:2260
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ukuphuma kunxulumano lwe- %s"
 
-#: ../mail/mail-ops.c:2223
+#: ../mail/mail-ops.c:2260
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ukungena kwakhona kunxulumano lwe- %s"
 
-#: ../mail/mail-ops.c:2339
+#: ../mail/mail-ops.c:2376
 msgid "Checking Service"
 msgstr "Ukukhangela Inkonzo"
 
@@ -13476,16 +13606,21 @@ msgstr "Hlaziya..."
 msgid "Waiting..."
 msgstr "Isalindile..."
 
-#: ../mail/mail-session.c:208
+#: ../mail/mail-send-recv.c:699
+#, fuzzy
+msgid "Checking for new mail"
+msgstr "Ukukhangela I-imeyili Entsha"
+
+#: ../mail/mail-session.c:207
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Faka I-password ye %s"
 
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:209
 msgid "Enter Password"
 msgstr "Faka I-password"
 
-#: ../mail/mail-session.c:239
+#: ../mail/mail-session.c:244
 msgid "User canceled operation."
 msgstr "Umsebenzisi uwurhoxisile lo msebenzi."
 
@@ -13527,27 +13662,29 @@ msgid "Invalid folder: `%s'"
 msgstr "Isiqulathi seefayili esingagunyaziswanga: `%s'"
 
 #: ../mail/mail-vfolder.c:91
-#, c-format
-msgid "Setting up vFolder: %s"
+#, fuzzy, c-format
+msgid "Setting up Search Folder: %s"
 msgstr "Ukumisela i-vFolder: %s"
 
 #: ../mail/mail-vfolder.c:240
-#, c-format
-msgid "Updating vFolders for '%s:%s'"
+#, fuzzy, c-format
+msgid "Updating Search Folders for '%s:%s'"
 msgstr "Ukuhlaziya ii-vFolders zisenzelwa '%s:%s'"
 
 #: ../mail/mail-vfolder.c:247
-#, c-format
-msgid "Updating vFolders for '%s'"
+#, fuzzy, c-format
+msgid "Updating Search Folders for '%s'"
 msgstr "kuhlaziya ii-vFolders zisenzelwa '%s'"
 
-#: ../mail/mail-vfolder.c:1009
-msgid "Edit vFolder"
-msgstr "Hlela i-vFolder"
+#: ../mail/mail-vfolder.c:1046
+#, fuzzy
+msgid "Edit Search Folder"
+msgstr "Khetha Isiqulathi Seefayili"
 
-#: ../mail/mail-vfolder.c:1093
-msgid "New vFolder"
-msgstr "I-vFolder Entsha"
+#: ../mail/mail-vfolder.c:1130
+#, fuzzy
+msgid "New Search Folder"
+msgstr "Khetha Isiqulathi Seefayili"
 
 #: ../mail/mail.error.xml.h:1
 #, fuzzy
@@ -13585,17 +13722,22 @@ msgstr ""
 "bakho uluvo lwento engayo i-imeyili yakho."
 
 #: ../mail/mail.error.xml.h:8
-msgid "Are you sure you want to delete this account?"
+#, fuzzy
+msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Uqinisekile ufuna ukuyicima le akhawunti?"
 
 #: ../mail/mail.error.xml.h:9
+msgid "Are you sure you want to delete this account?"
+msgstr "Uqinisekile ufuna ukuyicima le akhawunti?"
+
+#: ../mail/mail.error.xml.h:10
 #, fuzzy
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr ""
 "Uqinisekile na ukuba ufuna ukuthumela umyalezo okopela kubamkeli "
 "abafihliweyo kuphela?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13603,7 +13745,7 @@ msgstr ""
 "Uqinisekile na ukuba ufuna ukususa ngokusisigxina yonke imiyalezo ecinyiweyo "
 "kuzo zonke iziqulathi zeefayili?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:12
 #, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
@@ -13612,93 +13754,93 @@ msgstr ""
 "Uqinisekile ukuba ufuna ukususa ngokusisigxina yonke imiyalezo ecinyiweyo "
 "kwisiqulathi seefayili \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr ""
 "Ingaba uqinisekile na ukuba ufuna ukuthumela lo myalezo ngobume be-HTML?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Uqinisekile na ukuba ufuna ukuthumela umyalezo okopela kubamkeli "
 "abafihliweyo kuphela?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message without a subject?"
 msgstr ""
 "Ingaba uqinisekile na ukuba ufuna ukuthumela lo myalezo ngaphandle "
 "kwesihloko?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:16
 #, fuzzy
 msgid "Because &quot;{0}&quot;."
 msgstr "Kuba \"{0}\"."
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:18
 #, fuzzy
 msgid "Because &quot;{2}&quot;."
 msgstr "Kuba \"{2}\"."
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:19
 #, fuzzy
-msgid "Cannot add vFolder &quot;{0}&quot;."
+msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Ayikwazi ukongeza i-vFolder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
 #, fuzzy
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Ayikwazi ukukopa isiqulathi seefayili \"{0}\" to \"{1}\"."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:21
 #, fuzzy
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Ayikwazi ukwenza isiqulathi seefayili \"{0}\"."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot create temporary save directory."
 msgstr "Ayikwazi ukwenza uvimba weefayili ongagcina kuye okwexeshana."
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:23
 #, fuzzy
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Ayikwazi ukwenza uvimba weefayili ongagcina kuye, ngenxa \"{1}\""
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:24
 #, fuzzy
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Ayikwazi ukucima isiqulathi seefayili \"{0}\"."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:25
 #, fuzzy
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Ayikwazi ukucima isixokelelwano sesiqulathi seefayili \"{0}\"."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:26
 #, fuzzy
-msgid "Cannot edit vFolder &quot;{0}&quot; as it does not exist."
+msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "Ayikwazi ukuhlela i-vFolder \"{0}\" kuba ayikho kwayona."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:27
 #, fuzzy
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Ayikwazi ukususa isiqulathi seefayili \"{0}\" isise \"{1}\"."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:28
 #, fuzzy
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Ayikwazi ukuvula umthombo \"{1}\""
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:29
 #, fuzzy
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Ayikwazi ukuvula lo mthombo \"{2}\"."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:30
 #, fuzzy
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Ayikwazi ukuvula le nto ujolise kuyo \"{2}\"."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:31
 #, fuzzy
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
@@ -13709,38 +13851,38 @@ msgstr ""
 "     ngxaki yoseko-zixhobo.  Awunakuba nako ukusebenzisa esi sinikezeli de\n"
 "     ube nako ukwamkela iphepha-mvume laso."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:32
 #, fuzzy
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Ayikwazi ukunika elinye igama \"{0}\" to \"{1}\"."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:33
 #, fuzzy
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr ""
 "Ayikwazi ukunika elinye igama okanye ishenxise isixokelelwano sesiqulathi "
 "seefayili \"{0}\"."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot save changes to account."
 msgstr "Ayikwazi ukugcina iinguquko kwi-akhawunti."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:35
 #, fuzzy
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Ayikwazi ukugcina kuvimba weefayili \"{0}\"."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:36
 #, fuzzy
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Ayikwazi ukugcina kwifayili \"{0}\"."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:37
 #, fuzzy
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Awukwazi ukumisela iskripti sosayino \"{0}\"."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:38
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13749,64 +13891,64 @@ msgstr ""
 "ngokuchanekileyo.  Khumbula ukuba amagama amaninzi ayimfihlo ayabeva "
 "oonobumba; kusenokwenzeka ukuba uvule isitshixo soonobumba."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:39
 msgid "Could not save signature file."
 msgstr "Ayikwazanga ukugcina ifayile yosayino."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:40
 #, fuzzy
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Cima \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:41
 msgid "Delete account?"
 msgstr "Icinywe le akhawunti?"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:42
 msgid "Discard changed?"
 msgstr "Kungabi salahlwa?"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:44
 msgid "Do you wish to save your changes?"
 msgstr "Ingaba uyafuna na ukugcina inguqulo ozenzileyo?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
 msgid "Don't delete"
 msgstr "Musa ukucima"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:46
 msgid "Enter password."
 msgstr "Faka i-password."
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:47
 msgid "Error loading filter definitions."
 msgstr "Impazamo ngelixa kufakwa iinkcazelo zesihluzi."
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Error while performing operation."
 msgstr "Impazamo ngelixa kusenziwa lo msebenzi."
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Error while {0}."
 msgstr "Impazamo ngelixa {0}."
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "File exists but cannot overwrite it."
 msgstr "Ikho le fayili kodwa ayikwazi ukubhala phezu kwayo."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "File exists but is not a regular file."
 msgstr "Ikho le fayili kodwa asiyofayili iqhelekileyo."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Ukuba uyaqhubeka, awunakuba nako ukuphinda uyifumane le miyalezo."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -13814,12 +13956,20 @@ msgstr ""
 "Ukuba uyasicima esi siqulathi seefayili, konke ekuquletheyo kunye "
 "neziqulathi zeefayili ezingaphakathi ziza kucinywa ngokusisigxina."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
+#, fuzzy
+msgid ""
+"If you proceed, the account information and\n"
+"all proxy information will be deleted permanently."
+msgstr ""
+"Ukuba uyaqhubeka, olu lwazi lwale akhawunti luza kucinywa ngokusisigxina."
+
+#: ../mail/mail.error.xml.h:56
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 "Ukuba uyaqhubeka, olu lwazi lwale akhawunti luza kucinywa ngokusisigxina."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13827,19 +13977,19 @@ msgstr ""
 "Ukuba uyaphuma, le miyalezo ayinakuthunyelwa de inkqubo ye-Evolution "
 "iqaliswe kwakhona."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:58
 msgid "Ignore"
 msgstr "Ungayinanzi"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:59
 msgid "Invalid authentication"
 msgstr "Ubungqina obungagunyaziswanga"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:60
 msgid "Mail filters automatically updated."
 msgstr "Ezi zihluzi ze-imeyili zinyuswe ngokuzenzekela."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:61
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13851,36 +14001,36 @@ msgstr ""
 "bonke abamkeli kumyalezo wakho nakanjani na. Ukuvika oku kufuneka ufake u-"
 "Iya- omnye okanye u-Kopela ku-: umamkeli."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:62
 #, fuzzy
 msgid "Mark all messages as read"
 msgstr "Phawula yonke imiyalezo ebonakalayo njengefundiweyo"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:63
 #, fuzzy
 msgid "Mark all messages as read in the selected folder"
 msgstr "_Phawula imiyalezo njengefundwe emva"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:64
 msgid "Missing folder."
 msgstr "Isiqulathi seefayili elahlekileyo."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:66
 msgid "No sources selected."
 msgstr "Akukho mithombo ichongiweyo."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
 #, fuzzy
 msgid "Please check your account settings and try again."
 msgstr ""
 "\n"
 "Nceda ukhangele ukumiselwa kwe-akhawunti yakho ze uzame kwakhona.\n"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:69
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -13889,7 +14039,7 @@ msgstr ""
 "iidilesi zee-imeyili ngokucofa kwiqhosha elithi, Iya: ecaleni kwebhokisi "
 "yezingenayo."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13901,41 +14051,46 @@ msgstr ""
 "{0}\n"
 "Sithumele nokuba kunjalo?"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
 msgid "Please wait."
 msgstr "Nceda ulinde."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
 #, fuzzy
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Kube nengxaki ngelixa kufuduswa isiqulathi seefayili ezindala \"{0}\"."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid "Querying server"
 msgstr "Ukubuza ngeseva"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Ukubuza iseva ngoluhlu lweendlela ezingqina inkxaso."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 #, fuzzy
 msgid "Read receipt requested."
 msgstr "Funda iirisithi"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
 #, fuzzy
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr ""
 "Sicinywe nyhani na esi siqulathi seefayili \"{0}\" nazo zonke iziqulathi "
 "zifayili ezingaphakathi?"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
+#, fuzzy
+msgid "Search Folders automatically updated."
+msgstr "Le vFolder inyuswe ngokuzenzekela."
+
+#: ../mail/mail.error.xml.h:80
 #, fuzzy
 msgid "Send Receipt"
 msgstr "Funda iirisithi"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -13944,7 +14099,7 @@ msgstr ""
 "Evolution isebenze ngokuchanekileyo yaye awukwazi ukuyithiya ngokutsha, "
 "ukuyishenxisa okanye ukuyicima."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13961,37 +14116,37 @@ msgstr ""
 "bonke abamkeli kumyalezo wakho. Ukuvika oku kufuneka ufake u-Iya- omnye "
 "okanye u-Kopela ku-: umamkeli. "
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:85
 #, fuzzy
 msgid ""
-"The following filter rule(s):\n"
+"The following Search Folder(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
 "    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
-"Lo m(mi)thetho ulandelayo:\n"
+"Le vFolder(s) ilandelayo:\n"
 "{0}\n"
-"Ubusebenzisa esi siqulathi fayili sishenxisiweyo:\n"
+"Ibisebenzisa isiqulathi seefayili esesisusiwe ngoku:\n"
 "    \"{1}\"\n"
-"Yaye sele zihlaziyiwe."
+"Yaye sele ihlaziyiwe."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:90
 #, fuzzy
 msgid ""
-"The following vFolder(s):\n"
+"The following filter rule(s):\n"
 "{0}\n"
 "Used the now removed folder:\n"
 "    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
-"Le vFolder(s) ilandelayo:\n"
+"Lo m(mi)thetho ulandelayo:\n"
 "{0}\n"
-"Ibisebenzisa isiqulathi seefayili esesisusiwe ngoku:\n"
+"Ubusebenzisa esi siqulathi fayili sishenxisiweyo:\n"
 "    \"{1}\"\n"
-"Yaye sele ihlaziyiwe."
+"Yaye sele zihlaziyiwe."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:95
 #, fuzzy
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application.  "
@@ -14005,26 +14160,26 @@ msgstr ""
 "Lo myalezo ugcinwe kwisiqulathi seefayili semiyalezo ephumayo.  Khangela lo "
 "myalezo ususe impazamo ze uwuthumele ngokutsha."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:97
 msgid "The script file must exist and be executable."
 msgstr "Kufuneka sibekho size siphunyezwe esi skripti sefayili."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:98
 #, fuzzy
 msgid ""
-"This folder may have been added implicitly, go to the vFolder editor to add "
-"it explicitly, if required."
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 "Kusenokwenzeka ukuba esi siqulathi seefayili sesiqulwe, yiya kumhleli "
 "wesiqulathi seefayili esiyinyani ukuyifaka ngokuphandle ukuba ufuna njalo."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 "Lo myalezo awukwazi ukuthunyelwa kuba awuchazanga ukuba ngubani na uMamkeli"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14032,18 +14187,18 @@ msgstr ""
 "Le seva ayiluxhasi olu hlobo lobungqina yaye isenokuxhasi bungqina konke "
 "konke."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:102
 msgid "This signature has been changed, but has not been saved."
 msgstr "Olu sayino sele luguqulwe, kodwa alukagcinwa."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:103
 #, fuzzy
 msgid "Unable to connect to the GroupWise server."
 msgstr ""
 "Ayinako ukunxulumana neseva\n"
 "i-GroupWise."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
@@ -14051,40 +14206,41 @@ msgstr ""
 "Ayinako ukuvula isiqulathi seefayili seedrafti kule akhawunti.  Sebenzisa "
 "isixokelelwano sesiqulathi seefayili zedrafti endaweni yoku?"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:105
 msgid "Unable to read license file."
 msgstr "Ayinako ukufunda ifayili yephepha-mvume."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:106
 msgid "Use _Default"
 msgstr "Sebenzisa _Ummiselo"
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:107
 msgid "Use default drafts folder?"
 msgstr "Sisebenzise isiqulathi seefayili esimiselwe iidrafti?"
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:108
 msgid "You have not filled in all of the required information."
 msgstr "Awuluzalisanga lonke ulwazi olufunekayo."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:109
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Usenemiyalezo engathunyelwanga, ingaba unqwenela ukuphuma nakuba kunjalo?"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:110
 msgid "You may not create two accounts with the same name."
 msgstr "Awunakwenza akhawunti ezimbini ezinamagama afanayo."
 
-#: ../mail/mail.error.xml.h:106
-msgid "You must name this vFolder."
+#: ../mail/mail.error.xml.h:111
+#, fuzzy
+msgid "You must name this Search Folder."
 msgstr "Kufuneka unike le-vFolder igama."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:112
 msgid "You must specify a folder."
 msgstr "Kufuneka uchaze isiqulathi seefayili."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:113
 #, fuzzy
 msgid ""
 "You must specify at least one folder as a source.\n"
@@ -14097,41 +14253,37 @@ msgstr ""
 "zonke iziqulathi zeefayili zangaphakathi, zonke iziqulathi zeefayili ezikude "
 "okanye zombini."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:115
 #, fuzzy
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Ukungena kwakho kwiseva yakho \"{0}\" njengo \"{0}\" akuphumelelanga."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:116
 #, fuzzy
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "Umyalezo wakho osihloko sithi \"{0}\" awuhambanga."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:117
 msgid "_Append"
 msgstr "_Hlomela"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:118
 msgid "_Discard changes"
 msgstr "_Zilahle ezi nguqulo"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:119
 msgid "_Empty Trash"
 msgstr "_Chitha Umgqomo"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:120
 msgid "_Expunge"
 msgstr "_Sula"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:121
 #, fuzzy
 msgid "_Open Messages"
 msgstr "_Vula Umyalezo"
 
-#: ../mail/mail.error.xml.h:119
-msgid "vFolders automatically updated."
-msgstr "Le vFolder inyuswe ngokuzenzekela."
-
 #: ../mail/message-list.c:996
 msgid "Unseen"
 msgstr "Engabonwanga"
@@ -14174,7 +14326,7 @@ msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:193
+#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Namhlanje %l:%M %p"
@@ -14247,7 +14399,7 @@ msgstr "Ukulandelela"
 msgid "For Your Information"
 msgstr "Ukukwazisa"
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:41
+#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Dlulisa"
 
@@ -14255,11 +14407,11 @@ msgstr "Dlulisa"
 msgid "No Response Necessary"
 msgstr "Akudingeki mpendulo"
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:79
+#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
 msgid "Reply"
 msgstr "Impendulo"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to All"
 msgstr "Phendula Zonke"
 
@@ -14339,7 +14491,8 @@ msgstr "Yiqalise kwakhona i-Evolution"
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr "Kopa ukwabuyisela i-data nemimiselo yenkqubo ye-Evolution"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 #, fuzzy
 msgid "Backup and restore plugin"
 msgstr "Kopa ukwabuyisela i-data nemimiselo yenkqubo ye-Evolution"
@@ -14356,27 +14509,27 @@ msgstr "Kopa ukwabuyisela i-data nemimiselo yenkqubo ye-Evolution"
 msgid "Restore Settings..."
 msgstr "Buyisela Imimiselo..."
 
-#: ../plugins/bbdb/bbdb.c:398
+#: ../plugins/bbdb/bbdb.c:404
 msgid "Automatic Contacts"
 msgstr "Oqhagamshelana nabo ngokuzenzekelayo"
 
-#: ../plugins/bbdb/bbdb.c:407
+#: ../plugins/bbdb/bbdb.c:413
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">Oqhagamshelana Nabo Ngokuzenzekelayo</span>"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:420
+#: ../plugins/bbdb/bbdb.c:426
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 "_Ngenisa ngokuzenzekelayo kwincwadi yedilesi ngelixa uphendula i-imeyili"
 
-#: ../plugins/bbdb/bbdb.c:438
+#: ../plugins/bbdb/bbdb.c:444
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">Oqhagamshelana Nabo Ngelo Xesha</span>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:451
+#: ../plugins/bbdb/bbdb.c:457
 msgid ""
 "Periodically synchronize contact information and images from my _instant "
 "messenger"
@@ -14385,7 +14538,7 @@ msgstr ""
 "ivela kwisithunywa sam _sophanyazo"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:458
+#: ../plugins/bbdb/bbdb.c:464
 msgid "Synchronize with _buddy list now"
 msgstr "Enza ngexesha elinye na_bahlobo abakuluhlu ngoku"
 
@@ -14451,20 +14604,20 @@ msgstr "Imozulu: Kukho ilanga"
 msgid "Weather: Thunderstorms"
 msgstr "Imozulu: Iimvula ezikhatshwa zindudumo"
 
-#: ../plugins/calendar-weather/calendar-weather.c:268
+#: ../plugins/calendar-weather/calendar-weather.c:267
 #, fuzzy
 msgid "Select a location"
 msgstr "Khetha Okufuneka Kwenziwe"
 
-#: ../plugins/calendar-weather/calendar-weather.c:655
+#: ../plugins/calendar-weather/calendar-weather.c:654
 msgid "_Units:"
 msgstr "_Iiyunithi:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:661
 msgid "Metric (Celsius, cm, etc)"
 msgstr ""
 
-#: ../plugins/calendar-weather/calendar-weather.c:663
+#: ../plugins/calendar-weather/calendar-weather.c:662
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr ""
 
@@ -14493,20 +14646,62 @@ msgstr "Idilesi _Ye-imeyili:"
 msgid "Copy tool"
 msgstr "Kopela Kwisiqulathi Seefayili"
 
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr ""
+
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
+msgid "Checks whether Evolution is the default mail client on startup."
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
+#, fuzzy
+msgid "Default Mail Client "
+msgstr "Misela isimbo sokuphendula"
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
+msgid "Do you want to make Evolution your default e-mail client?"
+msgstr ""
+
 #: ../plugins/default-source/default-source.c:82
-#: ../plugins/default-source/default-source.c:108
+#: ../plugins/default-source/default-source.c:109
 #, fuzzy
 msgid "Mark as default folder"
 msgstr "Sisebenzise isiqulathi seefayili esimiselwe iidrafti?"
 
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Isiqulathi Seefayili Semiyalezo _Ethunyelweyo:"
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "_Igama le-akhawunti:"
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Igama _lesiqulathi seefayili"
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
+#, fuzzy
+msgid "_User:"
+msgstr "_Igama lomsebenzisi:"
+
 #. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:68
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
 msgid "Secure Password"
 msgstr "Khusela I-Password"
 
 # "Exchange" should remain verbatim in translation (it is a type of mail server, i.e. adjective)
 #. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:71
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
 #, fuzzy
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
@@ -14515,12 +14710,12 @@ msgstr ""
 "Olu khetho luza kunxulumana kwiseva yenkqubo yoTshintshiselwano "
 "kusetyenziswa ubungqina be-password ekhuselekileyo le-(NTLM)."
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:79
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 msgstr "I-Password yombhalo oqhelekileyo"
 
 # "Exchange" should remain verbatim in translation (it is a type of mail server, i.e. adjective)
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:81
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
 #, fuzzy
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
@@ -14529,13 +14724,12 @@ msgstr ""
 "Olu khetho luza kunxulumana kwiseva yenkqubo yoTshintshiselwano "
 "kusetyenziswa ubungqina obusemgangathweni be-password yombhalo oqhelekileyo."
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:194
+#: ../plugins/exchange-operations/exchange-account-setup.c:251
 #, fuzzy
-msgid "Could not read out-of-office state"
-msgstr "Ayikwazanga ukwenza umyalezo."
+msgid "Out Of Office"
+msgstr "Akakho e-Ofisini"
 
-#. Description section
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:211
+#: ../plugins/exchange-operations/exchange-account-setup.c:258
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -14544,53 +14738,679 @@ msgstr ""
 "ngamnye othumela\n"
 "umyalezo kuwe ngelixa ungekho e-ofisini."
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:239
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:249
+#: ../plugins/exchange-operations/exchange-account-setup.c:270
+#: ../plugins/exchange-operations/exchange-account-setup.c:275
 #, fuzzy
 msgid "I am out of the office"
 msgstr "Andikho e-ofisini ngokwangoku"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:242
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:246
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
+#: ../plugins/exchange-operations/exchange-account-setup.c:274
 #, fuzzy
 msgid "I am in the office"
 msgstr "Ndise-ofisini ngokwangoku"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:275
+#. Change Password
+#: ../plugins/exchange-operations/exchange-account-setup.c:321
 #, fuzzy
-msgid "Out of office Message:"
-msgstr "<b>Umyalezo Wokungabikho E-ofisini:</b>"
+msgid "Change the password for Exchange account"
+msgstr "Faka i-password ye-%s"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:319
+#: ../plugins/exchange-operations/exchange-account-setup.c:323
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#, fuzzy
+msgid "Change Password"
+msgstr "Faka I-password"
+
+#. Delegation Assistant
+#: ../plugins/exchange-operations/exchange-account-setup.c:327
+msgid "Manage the delegate settings for Exchange account"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#, fuzzy
+msgid "Delegation Assitant"
+msgstr "Umncedisi wokumisela inkqubo ye-Evolution"
+
+#. Miscelleneous settings
+#: ../plugins/exchange-operations/exchange-account-setup.c:339
+#, fuzzy
+msgid "Miscelleneous"
+msgstr "<b>Iintlobo Ngeentlobo</b>"
+
+#. Folder Size
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#, fuzzy
+msgid "View the size of all Exchange folders"
+msgstr "nazo zonke iziqulathi zeefayili zangaphakathi"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:351
+#, fuzzy
+msgid "Folders Size"
+msgstr "Iziqulathi zeefayili"
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:358
 #, fuzzy
 msgid "Exchange Settings"
 msgstr "Imimiselo"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:507
-#: ../plugins/exchange-account-setup/exchange-ask-password.c:200
+#: ../plugins/exchange-operations/exchange-account-setup.c:601
 msgid "_OWA Url:"
 msgstr "I-_OWA Url:"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:532
-#: ../plugins/exchange-account-setup/exchange-ask-password.c:193
+#: ../plugins/exchange-operations/exchange-account-setup.c:626
 #, fuzzy
 msgid "A_uthenticate"
 msgstr "Ubungqina Bobunyani"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:597
-#, fuzzy
-msgid "Could not update out-of-office state"
-msgstr "Akunako ukuhlaziya le nto"
-
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:724
+#: ../plugins/exchange-operations/exchange-account-setup.c:814
 #, fuzzy
 msgid "Authentication Type"
 msgstr "Ubungqina Bobunyani"
 
-#: ../plugins/exchange-account-setup/exchange-account-setup.c:738
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Ch_eck for Supported Types"
 msgstr "Kha_ngela Iintlobo Ezixhaswayo"
 
+#. User entered a wrong existing
+#. * password. Prompt him again.
+#.
+#: ../plugins/exchange-operations/exchange-change-password.c:115
+msgid ""
+"The current password does not match the existing password for your account. "
+"Please enter the correct password"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-change-password.c:122
+msgid "The two passwords do not match. Please re-enter the passwords."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#, fuzzy
+msgid "Confirm Password:"
+msgstr "Faka I-password"
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#, fuzzy
+msgid "Current Password:"
+msgstr "Khusela I-Password"
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#, fuzzy
+msgid "New Password:"
+msgstr "I-_Password:"
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
+msgid "Your current password has expired. Please change your password now."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:144
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
+#, fuzzy
+msgid "Custom"
+msgstr "Okuboniswa Umthengi kwiskrini"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
+#, fuzzy, c-format
+msgid "Permissions for %s"
+msgstr "Imvume ikhatyiwe"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:421
+#, fuzzy
+msgid "Delegate To"
+msgstr "Thumela u:"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:562
+#, c-format
+msgid "Remove the delegate %s?"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:679
+#, fuzzy
+msgid "Could not access Active Directory"
+msgstr ""
+"Ayikwazanga ukwenza uvimba wefayili %s:\n"
+"%s"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:694
+#, fuzzy
+msgid "Could not find self in Active Directory"
+msgstr "Ayikwazanga ukuvula uvimba weefayili ofumaneka ngokukhawuleza: %s"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:707
+#, fuzzy, c-format
+msgid "Could not find delegate %s in Active Directory"
+msgstr "Ayikwazanga ukuvula uvimba weefayili ofumaneka ngokukhawuleza: %s"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:719
+#, fuzzy, c-format
+msgid "Could not remove delegate %s"
+msgstr "Ayikwazanga ukubhala i-data: %s"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:779
+#, fuzzy
+msgid "Could not update list of delegates."
+msgstr "Akunako ukuhlaziya le nto"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:797
+#, fuzzy, c-format
+msgid "Could not add delegate %s"
+msgstr "Ayikwazanga ukuthumela umyalezo: %s"
+
+#: ../plugins/exchange-operations/exchange-delegates.c:965
+#, fuzzy
+msgid "Error reading delegates list."
+msgstr "Impazamo ngelixa kusongezwa uluhlu"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+msgid "Author (read, create)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Ikhalenda:"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#, fuzzy
+msgid "Co_ntacts:"
+msgstr "Oqhagamshelana nabo: "
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
+#, fuzzy
+msgid "Delegate Permissions"
+msgstr "Othunyiweyo"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#, fuzzy
+msgid "Delegates"
+msgstr "Othunyiweyo"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Editor (read, create, edit)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#, fuzzy
+msgid "Permissions for"
+msgstr "Imvume ikhatyiwe"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#, fuzzy
+msgid "Reviewer (read-only)"
+msgstr "Inkonzo sele ilungile"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+msgid ""
+"These users will be able to send mail on your behalf\n"
+"and access your folders with the permissions you give them."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+#, fuzzy
+msgid "_Delegate can see private items"
+msgstr "Yenza uvavanyo olutsha"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+#, fuzzy
+msgid "_Inbox:"
+msgstr "Ibhokisi yezingenayo"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#, fuzzy
+msgid "_Tasks:"
+msgstr "_Imisebenzi"
+
+#: ../plugins/exchange-operations/exchange-folder-permission.c:58
+#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
+#, fuzzy
+msgid "Permissions..."
+msgstr "Imvume ikhatyiwe"
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:136
+#, fuzzy
+msgid "Folder Name"
+msgstr "Igama _lesiqulathi seefayili"
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
+#, fuzzy
+msgid "Folder Size"
+msgstr "Isiqulathi seefayili"
+
+#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
+#, fuzzy
+msgid "Exchange Folder Tree"
+msgstr "Umthe Wesiqulathi seefayili Zee-imeyili"
+
+#: ../plugins/exchange-operations/exchange-folder.c:62
+#: ../plugins/exchange-operations/exchange-folder.c:223
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#, fuzzy
+msgid "Unsubscribe Folder..."
+msgstr "_Zikhuphe-ekuzibopheleleni kuluhlu"
+
+#: ../plugins/exchange-operations/exchange-folder.c:460
+#: ../plugins/exchange-operations/exchange-folder.c:520
+#, fuzzy, c-format
+msgid "Really unsubscribe from folder \"%s\"?"
+msgstr "Zikhuphe kwisibophelelo esikwisiqulathi seefayili \"%s\""
+
+#: ../plugins/exchange-operations/exchange-folder.c:472
+#: ../plugins/exchange-operations/exchange-folder.c:532
+#, fuzzy, c-format
+msgid "Unsubscribe from \"%s\""
+msgstr "Zikhuphe kwisibophelelo esikwisiqulathi seefayili \"%s\""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
+#, fuzzy
+msgid "(Permission denied.)"
+msgstr "Imvume ikhatyiwe"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+msgid "Add User:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#, fuzzy
+msgid "Add User"
+msgstr "_Yongeza i-URL"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Permissions</b>"
+msgstr "<b>Okhetha kuko</b>"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#, fuzzy
+msgid "Cannot Delete"
+msgstr "Ngenisa Umthunywa"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#, fuzzy
+msgid "Cannot Edit"
+msgstr "Umhleli woqhagamshelwano"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#, fuzzy
+msgid "Create items"
+msgstr "Yenza isiqulathi seefayili"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#, fuzzy
+msgid "Create subfolders"
+msgstr "Yenza isiqulathi seefayili"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#, fuzzy
+msgid "Delete Any Items"
+msgstr "Othunyiweyo"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#, fuzzy
+msgid "Delete Own Items"
+msgstr "Othunyiweyo"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#, fuzzy
+msgid "Edit Any Items"
+msgstr "Hlela Idinga"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+msgid "Edit Own Items"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#, fuzzy
+msgid "Folder contact"
+msgstr "Akukho mntu ungaqhagamshelana naye"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#, fuzzy
+msgid "Folder owner"
+msgstr "I-vFolder kuMth_umeli"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#, fuzzy
+msgid "Folder visible"
+msgstr "Isithinteli-sixhobo esibonakalayo"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#, fuzzy
+msgid "Read items"
+msgstr "Funda iirisithi"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
+#, fuzzy
+msgid "Role: "
+msgstr "Indima"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:144
+#, fuzzy
+msgid "Select User"
+msgstr "Khetha Isiqulathi Seefayili"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:182
+#, fuzzy
+msgid "Addressbook..."
+msgstr "Incwadi Yedilesi"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
+msgid "Subscribe to Other User's Contacts"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
+msgid "Subscribe to Other User's Calendar"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+msgid "Cannot change password due to configuration problems."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+#, fuzzy
+msgid "Cannot display folders."
+msgstr "Ayikwazi ukwenza isiqulathi seefayili %s: %s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+msgid ""
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#, fuzzy
+msgid "Could not authenticate to server."
+msgstr "Ayikwazi ukunika ubungqina kwiseva: %s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#, fuzzy
+msgid "Could not change password."
+msgstr "Akulifakanga i-password."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+msgid ""
+"Could not configure Exchange account because \n"
+"an unknown error occurred. Check the URL, \n"
+"username, and password, and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
+#, fuzzy
+msgid "Could not connect to server {0}."
+msgstr "Ayikwazanga ukunxulumana kwiseva i-POP %s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#, fuzzy
+msgid "Could not determine folder permissions for delegates."
+msgstr "Ayiwufumananga umzobo wolwazi lweseva ye-LDAP."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+msgid "Could not find Exchange Web Storage System."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#, fuzzy
+msgid "Could not locate server {0}."
+msgstr "Ayikwazanga ukwenza umyalezo."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+msgid "Could not make {0} a delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#, fuzzy
+msgid "Could not read folder permissions"
+msgstr "Ayikwazanga ukuphinda ithiye igama kwisiqulathi seefayili: %s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#, fuzzy
+msgid "Could not read folder permissions."
+msgstr "Ayikwazanga ukuphinda ithiye igama kwisiqulathi seefayili: %s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#, fuzzy
+msgid "Could not read out-of-office state"
+msgstr "Ayikwazanga ukwenza umyalezo."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#, fuzzy
+msgid "Could not update folder permissions."
+msgstr "Ayikwazanga ukugcina isiqulathi seefayili: %s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#, fuzzy
+msgid "Could not update out-of-office state"
+msgstr "Akunako ukuhlaziya le nto"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+msgid "Exchange Account is offline."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+msgid "Exchange Connector access error."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+msgid ""
+"Exchange Connector requires access to certain\n"
+"functionality on the Exchange Server that appears\n"
+"to be disabled or blocked.  (This is usually \n"
+"unintentional.)  Your Exchange Administrator will \n"
+"need to enable this functionality in order for \n"
+"you to be able to use Ximian Connector.\n"
+"\n"
+"For information to provide to your Exchange \n"
+"administrator, please follow the link below:\n"
+"\n"
+"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
+"html\n"
+"  "
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
+#, fuzzy
+msgid "Failed to update delegates:"
+msgstr "Ayiphumelelanga ukukhowuda i-data"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+msgid "Folder already exists"
+msgstr "Esi siqulathi seefayili sele sikho kade"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#, fuzzy
+msgid "Folder does not exist"
+msgstr "Esi siqulathi seefayili `%s' asikho."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#, fuzzy
+msgid "Folder offline"
+msgstr "Ukungasebenzi kwi-intanethi"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../shell/e-shell.c:1265
+msgid "Generic error"
+msgstr "Impazamo yohlobo oluthile"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+msgid ""
+"If OWA is running on a different path, you must specify that in the account "
+"configuration dialog."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+msgid "Mailbox for {0} is not on this server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+msgid "Make sure the URL is correct and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+msgid "Make sure the server name is spelled correctly and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+msgid "Make sure the username and password are correct and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+msgid "No Global Catalog server configured for this account."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+msgid "No mailbox for user {0} on {1}."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#, fuzzy
+msgid "No such user {0}"
+msgstr "Akukho siqulathi seefayili sinjalo %s"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+msgid "Password successfully changed."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#, fuzzy
+msgid "Please restart Evolution"
+msgstr "Yiqalise kwakhona i-Evolution"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#, fuzzy
+msgid "Please select a user."
+msgstr "Nceda ukhethe iseva."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+msgid "Server rejected password because it is too weak."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+msgid "The Exchange account will be disabled when you quit Evolution"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+msgid "The Exchange account will be removed when you quit Evolution"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+msgid "The Exchange server is not compatible with Exchange Connector."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+msgid ""
+"The server is runinng Exchange 5.5. Exchange Connector \n"
+"supports Microsoft Exchange 2000 and 2003 only."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+msgid ""
+"This probably means that your server requires \n"
+"you to specify the Windows domain name \n"
+"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
+"\n"
+"Or you might have just typed your password wrong."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+msgid "Try again with a different password."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#, fuzzy
+msgid "Unable to add user to access control list:"
+msgstr "Ayinako ukulungisa ibhobhini yesiqulathi seefayili"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#, fuzzy
+msgid "Unable to edit delegates."
+msgstr "Ayinakho ukuqinisekisa usayino lwegqabi"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#, fuzzy
+msgid "Unknown error looking up {0}"
+msgstr "Impazamo engaziwayo"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#, fuzzy
+msgid "Unknown error."
+msgstr "Impazamo engaziwayo"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#, fuzzy
+msgid "Unknown type"
+msgstr "Engaziwayo"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#, fuzzy
+msgid "Unsupported operation"
+msgstr "Umsebenzisi uwurhoxisile lo msebenzi."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#, fuzzy
+msgid "You are nearing your quota available for storing mails on this server."
+msgstr "Ukufunda nokugcina i-imeyili kwiseva ye-IMAP."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+msgid "You cannot make yourself your own delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+msgid "You have exceeded your quota for storing mails on this server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+msgid "You may only configure a single Exchange account."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+msgid ""
+"Your current usage is : {0}KB. Try to clear up some space by deleting some "
+"mails."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+msgid ""
+"Your current usage is : {0}KB. You will not be able to either send or "
+"recieve mails now."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+msgid ""
+"Your current usage is : {0}KB. You will not be able to send mails till you "
+"clear up some space by deleting some mails."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+msgid "Your password has expired."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+msgid "{0} cannot be added to an access control list"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+msgid "{0} is already a delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+msgid "{0} is already in the list"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
+msgid "Subscribe to Other User's Tasks"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
+#, fuzzy
+msgid "Check folder permissions"
+msgstr "Ikhangela ukuhambelana kwesiqulathi seefayili"
+
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+#, fuzzy
+msgid "Subscribe to Other User's Folder"
+msgstr "Zi_bophelele Kwisiqulathi Seefayili..."
+
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -14605,10 +15425,60 @@ msgstr ""
 msgid "Unsubscribe Folders"
 msgstr "_Zikhuphe-ekuzibopheleleni kuluhlu"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:413
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
 msgid "Checklist"
 msgstr "Uluhlu Lokukhangela"
 
+#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
+#, fuzzy
+msgid "Groupwise Account Setup"
+msgstr "I-Groupware Suite"
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:77
+#, fuzzy
+msgid "Junk Settings"
+msgstr "Imimiselo"
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:90
+#, fuzzy
+msgid "<b>Junk Mail Settings</b>"
+msgstr "<b>Ukhetho Loluhlu Lomsebenzi</b>"
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:112
+#, fuzzy
+msgid "Junk Mail Settings..."
+msgstr "Imimiselo Yesi_khokelo..."
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:1
+#, fuzzy
+msgid "<b>Junk List :</b>"
+msgstr "<b>Uluhlu Lomsebezni</b>"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:2
+#, fuzzy
+msgid "Email:"
+msgstr "I-imeyile"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
+#, fuzzy
+msgid "Junk Mail Settings"
+msgstr "Imimiselo"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:5
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
+#, fuzzy
+msgid "_Disable"
+msgstr "Yenza ukuba ingasebenzi"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:6
+msgid "_Enable"
+msgstr "_Ukwenza isebenze"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:7
+#, fuzzy
+msgid "_Junk List"
+msgstr "Uvavanyo Lwento Engenamsebenzi"
+
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr ""
@@ -14627,6 +15497,11 @@ msgstr ""
 msgid "Groupwise Features"
 msgstr "I-Groupware Suite"
 
+#: ../plugins/groupwise-features/process-meeting.c:49
+#, fuzzy
+msgid "Accept Tentatively"
+msgstr "Oyilingayo"
+
 #: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users :</b>"
 msgstr "<b>Abasebenzisi :</b>"
@@ -14665,401 +15540,493 @@ msgstr "_Kwabelwana Ngayo No ..."
 msgid "_Sharing"
 msgstr "_Ukwabelana"
 
-#: ../plugins/groupwise-features/send-options.c:82
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Name</b>"
+msgstr "<b>Ekhaya</b>"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+msgid "Access Rights"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+#, fuzzy
+msgid "Add/Edit"
+msgstr "Hlela"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+#, fuzzy
+msgid "Con_tacts"
+msgstr "Abantu Oqhagamshelana Nabo"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+msgid "Modify _folders/options/rules/"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+msgid "Read items marked _private"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+#, fuzzy
+msgid "Reminder Notes"
+msgstr "_Ndikhumbuze Ngelinye Ixesha"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+#, fuzzy
+msgid "Subscribe to my _alarms"
+msgstr "_Zibophelele kuluhlu"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+#, fuzzy
+msgid "Subscribe to my _notifications"
+msgstr "_Zibophelele kuluhlu"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+#: ../ui/evolution-mail-message.xml.h:121
+#, fuzzy
+msgid "_Read"
+msgstr "Funda"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
+#, fuzzy
+msgid "_Write"
+msgstr "_Shicilela"
+
+#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+#, fuzzy
+msgid "Proxy"
+msgstr "Umba ophambili"
+
+#: ../plugins/groupwise-features/proxy-listing.glade.h:2
+#: ../smime/gui/smime-ui.glade.h:49
+#: ../widgets/table/e-table-config-no-group.glade.h:20
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "dialog1"
+msgstr "unxibelelwano1"
+
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Account Name</b>"
+msgstr "Igama le-akhawunti"
+
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+#, fuzzy
+msgid "Proxy Login"
+msgstr "Ngena"
+
+#: ../plugins/groupwise-features/proxy-login.c:219
+#: ../plugins/groupwise-features/proxy-login.c:261
+#: ../plugins/groupwise-features/proxy.c:490
+#: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sFaka i-password ye %s (umsebenzisi %s)"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/proxy-login.c:484
+#, fuzzy
+msgid "_Proxy Login..."
+msgstr "_Shicilela..."
+
+#: ../plugins/groupwise-features/proxy.c:672
+msgid "The Proxy tab will be available only when the account is enabled."
+msgstr ""
+
+#: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Users"
 msgstr "Abasebenzisi"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:319
 msgid "Enter the users and set permissions"
 msgstr "Faka abasebenzisi umisele neemvume"
 
-#: ../plugins/groupwise-features/share-folder-common.c:337
+#: ../plugins/groupwise-features/share-folder-common.c:338
 #, fuzzy
 msgid "New _Shared Folder..."
 msgstr "Isiqulathi Seefayili _Esitsha..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:440
+#: ../plugins/groupwise-features/share-folder-common.c:453
 msgid "Sharing"
 msgstr "Ukwabelana"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/groupwise-features/status-track.c:235
+#, fuzzy
+msgid "Track Message Status..."
+msgstr "Thumela Umyalezo..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:724
 #, fuzzy
 msgid "Unable to parse item"
 msgstr "Ayikwazanga ukwahlula isiqulatho semiyalezo ngezijungqu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:741
+#: ../plugins/itip-formatter/itip-formatter.c:780
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Ayinako ukuthumela le nto kwikhalenda '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:791
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Yithumela kwikhalenda '%s' njengeyamkelekileyo"
 
-#: ../plugins/itip-formatter/itip-formatter.c:756
+#: ../plugins/itip-formatter/itip-formatter.c:795
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Yithumela kwikhalenda '%s' njengelingwayo"
 
-#: ../plugins/itip-formatter/itip-formatter.c:761
+#: ../plugins/itip-formatter/itip-formatter.c:800
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Yithumela kwikhalenda '%s' njengengavunyangwa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:766
+#: ../plugins/itip-formatter/itip-formatter.c:805
 #, c-format
 msgid "Sent to calendar '%s' as cancelled"
 msgstr "Yithumela kwikhalenda '%s' njengerhoxisiweyo"
 
-#: ../plugins/itip-formatter/itip-formatter.c:859
+#: ../plugins/itip-formatter/itip-formatter.c:898
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:866
+#: ../plugins/itip-formatter/itip-formatter.c:905
 msgid "Sent a cancellation notice to the delegate"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:907
 #, fuzzy
 msgid "Could not send the cancellation notice to the delegate"
 msgstr ""
 "Ungathanda ukuthumelela isaziso sokurhoxisa ngokungenisiweyo kule jenali na?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:940
+#: ../plugins/itip-formatter/itip-formatter.c:991
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Ayikwazanga ukuhlaziya ubume bokhoyo kuba obo bume abuqinisekiswanga"
 
-#: ../plugins/itip-formatter/itip-formatter.c:966
+#: ../plugins/itip-formatter/itip-formatter.c:1017
 #, fuzzy, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Ayinako ukufudusa ikhalenda `%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:970
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 msgid "Attendee status updated"
 msgstr "Ubume bokhoyo sele buhlaziyiwe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1097
+#: ../plugins/itip-formatter/itip-formatter.c:1148
 #, fuzzy
 msgid "The calendar attached is not valid"
 msgstr "Uhlobo lwesiqulathi seefayili aluqinisekiswanga"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1098
+#: ../plugins/itip-formatter/itip-formatter.c:1149
 msgid ""
 "The message claims to contain a calendar, but the calendar is not valid "
 "iCalendar."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
-#: ../plugins/itip-formatter/itip-formatter.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:1223
+#: ../plugins/itip-formatter/itip-formatter.c:1183
+#: ../plugins/itip-formatter/itip-formatter.c:1198
+#: ../plugins/itip-formatter/itip-formatter.c:1274
 #, fuzzy
 msgid "The item in the calendar is not valid"
 msgstr "Uhlobo lwesiqulathi seefayili aluqinisekiswanga"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
-#: ../plugins/itip-formatter/itip-formatter.c:1148
-#: ../plugins/itip-formatter/itip-formatter.c:1224
+#: ../plugins/itip-formatter/itip-formatter.c:1184
+#: ../plugins/itip-formatter/itip-formatter.c:1199
+#: ../plugins/itip-formatter/itip-formatter.c:1275
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1158
+#: ../plugins/itip-formatter/itip-formatter.c:1209
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1159
+#: ../plugins/itip-formatter/itip-formatter.c:1210
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1824
+#: ../plugins/itip-formatter/itip-formatter.c:1968
 #, fuzzy
 msgid "Meetings and Tasks"
 msgstr "Intlanganiso - %s"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1847
+#: ../plugins/itip-formatter/itip-formatter.c:1991
 msgid "_Delete message after acting"
 msgstr "_Cima umyalezo emva kokuwusebenzisa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1857
+#: ../plugins/itip-formatter/itip-formatter.c:2001
 msgid "<span weight=\"bold\">Conflict Search</span>"
 msgstr "<span weight=\"bold\">Ukukhangela Okuchaseneyo</span>"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:1870
+#: ../plugins/itip-formatter/itip-formatter.c:2014
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Khetha iikhalenda ukukhangela ukudibana kwentlanganiso"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1887
+#: ../plugins/itip-formatter/itip-formatter.c:2031
 msgid "Conflict Search Table"
 msgstr ""
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:179 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
 msgid "Today"
 msgstr "Namhlanje"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:184
+#: ../plugins/itip-formatter/itip-view.c:189
 msgid "Today %H:%M"
 msgstr "Namhlanje %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:188
+#: ../plugins/itip-formatter/itip-view.c:193
 msgid "Today %H:%M:%S"
 msgstr "Namhlanje %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:202
 msgid "Today %l:%M:%S %p"
 msgstr "Namhlanje %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Tomorrow"
 msgstr ""
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:212
+#: ../plugins/itip-formatter/itip-view.c:217
 #, fuzzy
 msgid "Tomorrow %H:%M"
 msgstr "Namhlanje %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:216
+#: ../plugins/itip-formatter/itip-view.c:221
 #, fuzzy
 msgid "Tomorrow %H:%M:%S"
 msgstr "Namhlanje %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:226
 #, fuzzy
 msgid "Tomorrow %l:%M %p"
 msgstr "Namhlanje %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:230
 #, fuzzy
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Namhlanje %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:244
+#: ../plugins/itip-formatter/itip-view.c:249
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:249
+#: ../plugins/itip-formatter/itip-view.c:254
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:253
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:258
+#: ../plugins/itip-formatter/itip-view.c:263
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:267
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:276
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:277
+#: ../plugins/itip-formatter/itip-view.c:282
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:281
+#: ../plugins/itip-formatter/itip-view.c:286
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:286
+#: ../plugins/itip-formatter/itip-view.c:291
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:295
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:305
+#: ../plugins/itip-formatter/itip-view.c:310
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:310
+#: ../plugins/itip-formatter/itip-view.c:315
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:319
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:339
+#: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> nge-%s sele ipapashe olu lwazi lwentlanganiso lulandelayo:"
 
-#: ../plugins/itip-formatter/itip-view.c:341
+#: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> sele ipapashe olu lwazi lwentlanganiso lulandelayo:"
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:351
 #, fuzzy, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> uyirhoxisile le ntlanganiso ilandelayo."
 
-#: ../plugins/itip-formatter/itip-view.c:349
+#: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> nge-%s kucelwa ukuba ubekho kwintlanganiso elandelayo:"
 
-#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> kucelwa ukuba ubekho kwintlanganiso elandelayo:"
 
-#: ../plugins/itip-formatter/itip-view.c:357
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> nge-%s unqwenela ukongeza kwintlanganiso ekhoyo ngoku:"
 
-#: ../plugins/itip-formatter/itip-view.c:359
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> unqwenela ukongeza kwintlanganiso ekhoyo ngoku:"
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr ""
 "<b>%s</b>: unqwenela ukufumana ulwazi olutsha ngentlanganiso elandelayo:"
 
-#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:370
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> uyamkele le ntlanganiso ilandelayo:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:374
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has cancelled the following meeting:"
 msgstr "<b>%s</b> nge %s uyirhoxisile le ntlanganiso ilandelayo:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> has cancelled the following meeting."
 msgstr "<b>%s</b> uyirhoxisile le ntlanganiso ilandelayo."
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:379
 #, fuzzy, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> uyamkele le ntlanganiso ilandelayo:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:383
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> nge %s uyirhoxisile le ntlanganiso ilandelayo:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:385
 #, fuzzy, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> uyirhoxisile le ntlanganiso ilandelayo."
 
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:412
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> nge-%s sele ipapashe olu lwazi lwentlanganiso lulandelayo:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:414
 #, fuzzy, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> sele ipapashe olu lwazi lwentlanganiso lulandelayo:"
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:419
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> icela ubukho buka-%s kwintlanganiso elandelayo:"
 
-#: ../plugins/itip-formatter/itip-view.c:417
+#: ../plugins/itip-formatter/itip-view.c:422
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> nge %s uyirhoxisile le ntlanganiso ilandelayo:"
 
-#: ../plugins/itip-formatter/itip-view.c:419
+#: ../plugins/itip-formatter/itip-view.c:424
 #, fuzzy, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "u-<b>%s</b> uwurhoxisile umsebenzi."
 
-#: ../plugins/itip-formatter/itip-view.c:425
+#: ../plugins/itip-formatter/itip-view.c:430
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> nge-%s unqwenela ukongeza kwintlanganiso ekhoyo ngoku:"
 
-#: ../plugins/itip-formatter/itip-view.c:427
+#: ../plugins/itip-formatter/itip-view.c:432
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "u-<b>%s</b> unqwenela ukongeza kumsebenzi osele ukho."
 
-#: ../plugins/itip-formatter/itip-view.c:430
+#: ../plugins/itip-formatter/itip-view.c:435
 #, fuzzy, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -15067,57 +16034,62 @@ msgid ""
 msgstr ""
 "<b>%s</b>: unqwenela ukufumana ulwazi olutsha ngentlanganiso elandelayo:"
 
-#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:438
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> uyamkele le ntlanganiso ilandelayo:"
 
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:442
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has cancelled the following assigned task:"
 msgstr "<b>%s</b> nge %s uyirhoxisile le ntlanganiso ilandelayo:"
 
-#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:444
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled the following assigned task:"
 msgstr "<b>%s</b> uyirhoxisile le ntlanganiso ilandelayo."
 
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:447
 #, fuzzy, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> uyamkele le ntlanganiso ilandelayo:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:451
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> nge %s uyirhoxisile le ntlanganiso ilandelayo:"
 
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:453
 #, fuzzy, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> uyamkele le ntlanganiso ilandelayo:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:871
+#: ../plugins/itip-formatter/itip-view.c:892
 msgid "Start time:"
 msgstr "Ixesha lokuqala:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:880
+#: ../plugins/itip-formatter/itip-view.c:901
 msgid "End time:"
 msgstr "Ixesha lokuyeka:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:896
-#: ../plugins/itip-formatter/itip-view.c:946
+#: ../plugins/itip-formatter/itip-view.c:917
+#: ../plugins/itip-formatter/itip-view.c:967
 msgid "Comment:"
 msgstr "Nika amagqabantshintshi:"
 
-#: ../plugins/itip-formatter/itip-view.c:960
+#: ../plugins/itip-formatter/itip-view.c:981
 #, fuzzy
 msgid "Send u_pdates to attendees"
 msgstr "Ayinako ukufudusa ikhalenda `%s'"
 
+#: ../plugins/itip-formatter/itip-view.c:990
+#, fuzzy
+msgid "A_pply to all instances"
+msgstr "Kuwo onke Amatyeli"
+
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 #, fuzzy
 msgid "Displays text/calendar parts in messages."
@@ -15145,6 +16117,49 @@ msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "Le mpendulo ayiveli kokhoyo ngoku.  Ongezwe njengokhoyo?"
 
+#: ../plugins/mail-account-disable/mail-account-disable.c:47
+msgid "Proxy _Logout"
+msgstr ""
+
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
+#, fuzzy
+msgid "Allows disabling of accounts."
+msgstr "Uluhlu lwee-akhawunti"
+
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+#, fuzzy
+msgid "Disable Account"
+msgstr "Ii-akhawunti Ye-imeyili"
+
+#: ../plugins/mail-remote/client.c:30
+#, fuzzy, c-format
+msgid "System error: %s"
+msgstr "Impazamo ekuboneni ukuba okufakiweyo kulungile na: %s"
+
+#: ../plugins/mail-remote/client.c:32
+#, fuzzy, c-format
+msgid "Camel error: %s"
+msgstr "Impazamo ekuboneni ukuba okufakiweyo kulungile na: %s"
+
+#: ../plugins/mail-remote/evolution-mail-store.c:476
+msgid "Account cannot send e-mail"
+msgstr ""
+
+#: ../plugins/mail-remote/evolution-mail-store.c:605
+#, fuzzy
+msgid "No store available"
+msgstr "Akukho sishwankathelo sifumanekayo."
+
+#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
+msgid ""
+"A plugin which implements a CORBA interface for accessing mail data remotely."
+msgstr ""
+
+#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
+#, fuzzy
+msgid "Mail Remote"
+msgstr "Izihluzi Zee-imeyili"
+
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
 "A plugin which allows the creation of meetings from the contents of a mail "
@@ -15348,6 +16363,15 @@ msgstr ""
 "Esi siqulathi seefayili asiphawulelwanga kuxhasa ukusebenza ungekho kwi-"
 "intanethi"
 
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
+msgid "A plugin which implements mono plugins."
+msgstr ""
+
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+#, fuzzy
+msgid "Mono Loader"
+msgstr "Yiya Kwisiqulathi seefayili"
+
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
 #, fuzzy
 msgid "Generates a D-BUS message when new mail arrives."
@@ -15394,6 +16418,8 @@ msgid "Path"
 msgstr "Indlela"
 
 #: ../plugins/plugin-manager/plugin-manager.c:48
+#: ../widgets/table/e-table-config-no-group.glade.h:6
+#: ../widgets/table/e-table-config.glade.h:5
 msgid "Description"
 msgstr "Inkcazelo"
 
@@ -15407,6 +16433,7 @@ msgid "Note: Some changes will not take effect until restart"
 msgstr "Qaphela: Ezinye inguquko azenzeki de ube uyivula ngokutsha"
 
 #: ../plugins/plugin-manager/plugin-manager.c:210
+#: ../plugins/plugin-manager/plugin-manager.c:271
 msgid "Plugin"
 msgstr "Inkqubo yoncedo"
 
@@ -15448,11 +16475,35 @@ msgstr "Indlela ye-HTML"
 msgid "Gives an option to print mail from composer"
 msgstr ""
 
+#: ../plugins/print-message/org-gnome-print-message.xml.h:1
+#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "Ukukhangela _phambi Kokushicilela"
+
+#: ../plugins/print-message/org-gnome-print-message.xml.h:2
+#, fuzzy
+msgid "Prints the message"
+msgstr "Shicilela lo myalezo"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:98
+msgid "Spamassassin (built-in)"
+msgstr "i-Spamassassin (esakhelweyo)"
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
+msgid "Sa junk-plugin"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
+msgid "learns junk messages using spamd."
+msgstr ""
+
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
 msgstr ""
 
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:2
+#. the path to the shared library
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
 #, fuzzy
 msgid "Save attachments"
 msgstr "Gcina zonke iziqhoboshelo"
@@ -15475,7 +16526,6 @@ msgstr "Uhlobo lwe-MIME"
 
 #: ../plugins/save-attachments/save-attachments.c:359
 #: ../ui/evolution-message-composer.xml.h:18
-#: ../ui/evolution-signature-editor.xml.h:6
 msgid "Save"
 msgstr "Gcina"
 
@@ -15568,7 +16618,7 @@ msgstr "Ukuquka amaxabiso ne:"
 msgid "Comma separated value format (.csv)"
 msgstr "Ikhoma eyahlula ubume bexabiso (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:136
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "Ubume be-iCalendar (.ics)"
 
@@ -15637,16 +16687,16 @@ msgstr ""
 msgid "Startup wizard"
 msgstr ""
 
-#: ../plugins/startup-wizard/startup-wizard.c:255
+#: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "Umncedisi wokumisela inkqubo ye-Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:260
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid "Welcome"
 msgstr "Wamkelekile"
 
 # Missing second occurrence of "Evolution" in translation
-#: ../plugins/startup-wizard/startup-wizard.c:261
+#: ../plugins/startup-wizard/startup-wizard.c:89
 #, fuzzy
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
@@ -15660,17 +16710,23 @@ msgstr ""
 "\n"
 "Nceda ucofe iqhosha u \"Dlulisa\" xa uqhubeka. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:306
-#: ../shell/e-shell-importer.c:159
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:145
 msgid "Please select the information that you would like to import:"
 msgstr "Nceda uchonge ulwazi ofuna ukulungenisa:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:321
-#: ../shell/e-shell-importer.c:905
+#: ../plugins/startup-wizard/startup-wizard.c:154
+#: ../shell/e-shell-importer.c:398
 #, c-format
 msgid "From %s:"
 msgstr "Ivela %s:"
 
+#: ../plugins/startup-wizard/startup-wizard.c:234
+#: ../shell/e-shell-importer.c:509
+#, fuzzy
+msgid "Importing data."
+msgstr "Ukungenisa i-data ye-Elm"
+
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
 msgstr ""
@@ -15856,11 +16912,11 @@ msgstr ""
 msgid "(Untitled)"
 msgstr "(Engenasihloko)"
 
-#: ../shell/e-shell-importer.c:147
+#: ../shell/e-shell-importer.c:133
 msgid "Choose the type of importer to run:"
 msgstr "Khetha uhlobo lokungenisa omaluphunyezwe:"
 
-#: ../shell/e-shell-importer.c:150
+#: ../shell/e-shell-importer.c:136
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -15874,12 +16930,12 @@ msgstr ""
 "Ungakhetha u- \"Ngokuzenzekelayo\" ukuba awazi, i-Evolution iza kuzama "
 "ukuzifunela ngokwayo."
 
-#: ../shell/e-shell-importer.c:156
+#: ../shell/e-shell-importer.c:142
 msgid "Choose the destination for this import"
 msgstr "Khetha indawo oluya kuyo olu ngeniso"
 
 # Evolution - verbatim
-#: ../shell/e-shell-importer.c:162
+#: ../shell/e-shell-importer.c:148
 #, fuzzy
 msgid ""
 "Evolution checked for settings to import from the following\n"
@@ -15892,93 +16948,27 @@ msgstr ""
 "mimiselo inokungeniswa ifunyenweyo. Ukuba uyafuna\n"
 "ungazama kwakhona, nceda ucofe iqhosha u-\"Buyela emva\".\n"
 
-#: ../shell/e-shell-importer.c:233 ../shell/e-shell-importer.c:267
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Ukungenisa %s\n"
-"Ukungenisa into %d."
-
-#: ../shell/e-shell-importer.c:347
-msgid "Select importer"
-msgstr "Khetha isingenisi"
-
-#: ../shell/e-shell-importer.c:468 ../shell/e-shell-importer.c:1092
-#, c-format
-msgid "File %s does not exist"
-msgstr "Ayikho le fayili %s"
-
-#: ../shell/e-shell-importer.c:476
-msgid "Importing"
-msgstr "Ukungenisa"
-
-#: ../shell/e-shell-importer.c:484
-#, c-format
-msgid "Importing %s.\n"
-msgstr "Ukungenisa %s.\n"
-
-#: ../shell/e-shell-importer.c:494 ../shell/e-shell-importer.c:495
-#, c-format
-msgid "Error loading %s"
-msgstr "Impazamo xa kufakwa inkqubo %s"
-
-#: ../shell/e-shell-importer.c:513
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Ukungenisa %s\n"
-"Ukungenisa into 1."
-
-#: ../shell/e-shell-importer.c:589
-msgid "Automatic"
-msgstr "Ngokuzenzekelayo"
-
-#: ../shell/e-shell-importer.c:645
+#: ../shell/e-shell-importer.c:283
 msgid "F_ilename:"
 msgstr "Igama lef_ayili:"
 
-#: ../shell/e-shell-importer.c:650
+#: ../shell/e-shell-importer.c:288
 msgid "Select a file"
 msgstr "Khetha ifayili"
 
-#: ../shell/e-shell-importer.c:662
+#: ../shell/e-shell-importer.c:300
 msgid "File _type:"
 msgstr "_Uhlobo lwefayili:"
 
-#: ../shell/e-shell-importer.c:701
+#: ../shell/e-shell-importer.c:336
 msgid "Import data and settings from _older programs"
 msgstr "Ukungenisa i-data kunye nemimiselo evela _kwiinkqubo ezindala"
 
-#: ../shell/e-shell-importer.c:704
+#: ../shell/e-shell-importer.c:339
 msgid "Import a _single file"
 msgstr "Ngenisa ifayile e_nye"
 
-#: ../shell/e-shell-importer.c:772
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-"Nceda ulinde...\n"
-"Isaskena indlela ezimiselwe ngayo iinkqubo ezikhoyo"
-
-#: ../shell/e-shell-importer.c:779
-msgid "Starting Intelligent Importers"
-msgstr "Qalisa Izingenisi Ezikrelekrele"
-
-#: ../shell/e-shell-importer.c:1111
-#, c-format
-msgid "No importer available for file %s"
-msgstr "Akukho singenisi sale fayili sifumanekayo %s"
-
-#: ../shell/e-shell-importer.c:1125
-msgid "Unable to execute importer"
-msgstr "Ayinako ukuphumeza isingenisi"
-
-#: ../shell/e-shell-importer.c:1241
+#: ../shell/e-shell-importer.c:698
 msgid "_Import"
 msgstr "_Ngenisa"
 
@@ -15986,118 +16976,114 @@ msgstr "_Ngenisa"
 msgid "Evolution Settings"
 msgstr "Imimiselo Ye-Evolution"
 
-#: ../shell/e-shell-utils.c:116
+#: ../shell/e-shell-utils.c:118
 msgid "No folder name specified."
 msgstr "Akukho gama lasiqulathi seefayili lichaziweyo."
 
-#: ../shell/e-shell-utils.c:123
+#: ../shell/e-shell-utils.c:125
 msgid "Folder name cannot contain the Return character."
 msgstr "Igama lesiqulathi seefayili liqulethe uphawu Lokubuya kwakhona."
 
-#: ../shell/e-shell-utils.c:129
+#: ../shell/e-shell-utils.c:131
 msgid "Folder name cannot contain the character \"/\"."
 msgstr "Igama lesiqulathi seefayili alikwazi ukuqulatha olu phawu \"/\"."
 
-#: ../shell/e-shell-utils.c:135
+#: ../shell/e-shell-utils.c:137
 msgid "Folder name cannot contain the character \"#\"."
 msgstr "Igama lesiqulathi seefayili alikwazi ukuqulatha olu phawu \"#\"."
 
-#: ../shell/e-shell-utils.c:141
+#: ../shell/e-shell-utils.c:143
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ne '..' ngamagama abekiweyo eziqulathi zeefayili."
 
-#: ../shell/e-shell-window-commands.c:69
+#: ../shell/e-shell-window-commands.c:70
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "Izixhobo zeSikhokelo se-GNOME akukhangeleki ngokungathi zike zasekwa kwesi "
 "sixokelelwano."
 
-#: ../shell/e-shell-window-commands.c:77
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
 msgid "Error executing %s."
 msgstr "Impazamo ekuphumezeni %s."
 
-#: ../shell/e-shell-window-commands.c:126
+#: ../shell/e-shell-window-commands.c:127
 msgid "Bug buddy is not installed."
 msgstr "Alwenziwanga Useko-zixhobo lwe-Bug buddy."
 
-#: ../shell/e-shell-window-commands.c:134
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy could not be run."
 msgstr "I-Bug buddy ayikwazanga ukuphunyezwa."
 
 #. 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:508
+#: ../shell/e-shell-window-commands.c:532
 msgid "translator-credits"
 msgstr "Canonical Ltd <translations@canonical.com>"
 
-#: ../shell/e-shell-window-commands.c:522
+#: ../shell/e-shell-window-commands.c:546
 msgid "Groupware Suite"
 msgstr "I-Groupware Suite"
 
-#: ../shell/e-shell-window-commands.c:749
+#: ../shell/e-shell-window-commands.c:774
 msgid "_Work Online"
 msgstr "_Ukusebenza kwi-intanethi"
 
-#: ../shell/e-shell-window-commands.c:762 ../ui/evolution.xml.h:47
+#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
 msgid "_Work Offline"
 msgstr "_Ukungasebenzi kwi-intanethi"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:800
 msgid "Work Offline"
 msgstr "Ukungasebenzi kwi-intanethi"
 
-#: ../shell/e-shell-window.c:341
+#: ../shell/e-shell-window.c:343
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Inkqubo ye-Evolution ikwi-intanethi ngokwangoku. Cofa eli qhosha ukusebenza "
 "ungekho kwi-intanethi."
 
-#: ../shell/e-shell-window.c:349
+#: ../shell/e-shell-window.c:351
 msgid "Evolution is in the process of going offline."
 msgstr "I-Evolution isendleleni yokuphuma kwi-intanethi."
 
-#: ../shell/e-shell-window.c:356
+#: ../shell/e-shell-window.c:358
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Inkqubo ye-Evolution ayikho kwi-intanethi ngokwangoku. Cofa eli qhosha "
 "ukusebenza kwi-intanethi."
 
-#: ../shell/e-shell-window.c:712
+#: ../shell/e-shell-window.c:724
 #, c-format
 msgid "Switch to %s"
 msgstr "Tshintshela ku %s"
 
-#: ../shell/e-shell.c:622
+#: ../shell/e-shell.c:623
 msgid "Uknown system error."
 msgstr "Kwenzeke impazamo engaziwayo kwisixokelelwano."
 
-#: ../shell/e-shell.c:824 ../shell/e-shell.c:825
+#: ../shell/e-shell.c:825 ../shell/e-shell.c:826
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1278 ../widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:256
 msgid "OK"
 msgstr "KULUNGILE"
 
-#: ../shell/e-shell.c:1280
+#: ../shell/e-shell.c:1259
 msgid "Invalid arguments"
 msgstr "Impikiswano engaqinisekiswanga"
 
-#: ../shell/e-shell.c:1282
+#: ../shell/e-shell.c:1261
 msgid "Cannot register on OAF"
 msgstr "Ayikwazi ukubhalisa i-OAF"
 
-#: ../shell/e-shell.c:1284
+#: ../shell/e-shell.c:1263
 msgid "Configuration Database not found"
 msgstr "Ayifumanekanga i-Database yokumisela inkqubo"
 
-#: ../shell/e-shell.c:1286
-msgid "Generic error"
-msgstr "Impazamo yohlobo oluthile"
-
 #: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "Entsha"
@@ -16114,35 +17100,35 @@ msgstr "_Uvavanyo"
 msgid "Create a new test item"
 msgstr "Yenza uvavanyo olutsha"
 
-#: ../shell/importer/import.glade.h:1
+#: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Cofa u\"Ngenisa\" ukuqalisa ukungenisa ifayili yenkqubo ye-Evolution. "
 
-#: ../shell/importer/import.glade.h:2
+#: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
 msgstr "Umncedisi Wongeniso Lwenkqubo Ye-Evolution"
 
-#: ../shell/importer/import.glade.h:3
+#: ../shell/import.glade.h:3
 msgid "Import File"
 msgstr "Ukungenisa Ifayili"
 
-#: ../shell/importer/import.glade.h:4
+#: ../shell/import.glade.h:4
 msgid "Import Location"
 msgstr "Indawo Oyingenisa Kuyo"
 
-#: ../shell/importer/import.glade.h:5
+#: ../shell/import.glade.h:5
 msgid "Importer Type"
 msgstr "Uhlobo Lwesingenisi"
 
-#: ../shell/importer/import.glade.h:6
+#: ../shell/import.glade.h:6
 msgid "Select Importers"
 msgstr "Khetha Izingenisi"
 
-#: ../shell/importer/import.glade.h:7
+#: ../shell/import.glade.h:7
 msgid "Select a File"
 msgstr "Khetha Ifayili"
 
-#: ../shell/importer/import.glade.h:8
+#: ../shell/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
@@ -16152,27 +17138,6 @@ msgstr ""
 "Ngalo mncedisi uza kukhokelelwa kwinkqubo yo\n"
 "kungenisa ifayili zangaphandle kwinkqubo ye-Evolution."
 
-#: ../shell/importer/intelligent.c:193
-msgid "Importers"
-msgstr "Izingenisi"
-
-#: ../shell/importer/intelligent.c:195 ../smime/gui/smime-ui.glade.h:29
-msgid "Import"
-msgstr "Ngenisa"
-
-#: ../shell/importer/intelligent.c:199
-msgid "Don't import"
-msgstr "Musa ukungenisa"
-
-#: ../shell/importer/intelligent.c:203
-msgid "Don't ask me again"
-msgstr "Musa ukundibuza kwakhona"
-
-#: ../shell/importer/intelligent.c:211
-msgid "Evolution can import data from the following files:"
-msgstr ""
-"Inkqubo ye-Evolution ingangenisa i-data evela kwezi fayili zilandelayo:"
-
 #. Preview/Alpha/Beta version warning message
 #: ../shell/main.c:230
 #, no-c-format
@@ -16259,26 +17224,38 @@ msgstr ""
 "  Sebenzisa %s --help ukufumana ulwazi gabalala.\n"
 
 #: ../shell/shell.error.xml.h:1
+#, fuzzy
+msgid "Are you sure you want to forget all remembered passwords?"
+msgstr "Uqinisekile na ukuba ufuna ukuyicima le misebenzi iku {0}?"
+
+#: ../shell/shell.error.xml.h:2
 msgid "Continue"
 msgstr "Qhubeka"
 
-#: ../shell/shell.error.xml.h:2
+#: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
 msgstr "Icinywe na i-data endala kolu hlobo {0}?"
 
-#: ../shell/shell.error.xml.h:3
+#: ../shell/shell.error.xml.h:4
 msgid "Evolution can not start."
 msgstr "Inkqubo ye-Evolution ayikwazi ukuqalisa."
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:5
+#, fuzzy
+msgid ""
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed. "
+msgstr "Libala ii-password ozikhumbuleyo ukuze wazise xa zifuneka kwakhona"
+
+#: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
 msgstr "Akukho sithuba saneleyo sokuhlaziya kule diski."
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:8
 msgid "Really delete old data?"
 msgstr "Icinywe nyani le data indala?"
 
-#: ../shell/shell.error.xml.h:6
+#: ../shell/shell.error.xml.h:9
 #, fuzzy
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory is about to be be "
@@ -16302,7 +17279,7 @@ msgstr ""
 "Ukuba ukhe wayicima awusayi kuba nako ukubuyela kuhlobo olungaphambili "
 "lwenkqubo ye-evolution ngaphandle kokuba ukwenze ngesandla oko.\n"
 
-#: ../shell/shell.error.xml.h:12
+#: ../shell/shell.error.xml.h:15
 #, fuzzy
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
@@ -16319,14 +17296,14 @@ msgstr ""
 "siza kususwa ngokusisigxina.  Ukuba ukhetha ukuyigcina le data, ungakususa "
 "okuqulethwe kwinkqubo ye-\"evolution\" xa unexesha.\n"
 
-#: ../shell/shell.error.xml.h:16
+#: ../shell/shell.error.xml.h:19
 #, fuzzy
 msgid "Upgrade from previous version failed: {0}"
 msgstr ""
 "Aluphumelelanga uhlaziyo oluvela kuhlobo olungaphambili:\n"
 "{0}"
 
-#: ../shell/shell.error.xml.h:17
+#: ../shell/shell.error.xml.h:20
 msgid ""
 "Upgrading your data and settings will require upto {0} of disk space, but "
 "you only have {1} available.\n"
@@ -16340,7 +17317,7 @@ msgstr ""
 "Kuza kufuneka uvule isithuba ekhaya kuvimba wakho weefayili phambi kokuba "
 "uqhubeke."
 
-#: ../shell/shell.error.xml.h:20
+#: ../shell/shell.error.xml.h:23
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
@@ -16351,7 +17328,7 @@ msgstr ""
 "\n"
 "Cofa uncedo ukufumana iinkcukacha"
 
-#: ../shell/shell.error.xml.h:23
+#: ../shell/shell.error.xml.h:26
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
@@ -16366,15 +17343,20 @@ msgstr ""
 "\n"
 "Cofa uncedo ukufumana iinkcukacha"
 
-#: ../shell/shell.error.xml.h:28
+#: ../shell/shell.error.xml.h:31
+#, fuzzy
+msgid "_Forget"
+msgstr "_Isiqhagamsheli:"
+
+#: ../shell/shell.error.xml.h:32
 msgid "_Keep Data"
 msgstr "_Gcina I-data"
 
-#: ../shell/shell.error.xml.h:29
+#: ../shell/shell.error.xml.h:33
 msgid "_Remind Me Later"
 msgstr "_Ndikhumbuze Ngelinye Ixesha"
 
-#: ../shell/shell.error.xml.h:30
+#: ../shell/shell.error.xml.h:34
 msgid ""
 "{1}\n"
 "\n"
@@ -16601,6 +17583,10 @@ msgstr "Isatifiketi Sosayina I-imeyili"
 msgid "Expires On"
 msgstr "Iphelelwa Ngo"
 
+#: ../smime/gui/smime-ui.glade.h:29
+msgid "Import"
+msgstr "Ngenisa"
+
 #: ../smime/gui/smime-ui.glade.h:30
 msgid "Issued On"
 msgstr "Ikhutshwe Ngo"
@@ -16670,12 +17656,8 @@ msgstr "Izatifiketi zakho"
 msgid "_Edit CA Trust"
 msgstr "_Hlaziya i-CA Trust"
 
-#: ../smime/gui/smime-ui.glade.h:49
-msgid "dialog1"
-msgstr "unxibelelwano1"
-
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:650
+#: ../smime/lib/e-cert-db.c:651
 msgid "Certificate already exists"
 msgstr "Isatifiketi sele sikho"
 
@@ -16932,7 +17914,8 @@ msgid "Shutting down %s (%s)\n"
 msgstr "Iyacima %s (%s)\n"
 
 #: ../ui/evolution-addressbook.xml.h:3
-msgid "Copy Contact(s) to Another Folder..."
+#, fuzzy
+msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Kopa Oqhagamshelana naye umse Kwesinye Isiqulathi Seefayili..."
 
 #: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
@@ -16952,7 +17935,8 @@ msgid "Delete selected contacts"
 msgstr "Cima obachonge koqhagamshelana nabo"
 
 #: ../ui/evolution-addressbook.xml.h:11
-msgid "Move Contact(s) to Another Folder..."
+#, fuzzy
+msgid "Move Selected Contacts to Another Folder..."
 msgstr "Shenzisa Oqhagamshelana naye umse Kwesinye Isiqulathi Seefayili..."
 
 #: ../ui/evolution-addressbook.xml.h:12
@@ -16967,11 +17951,6 @@ msgstr "Ncamathisela kwi-clipboard"
 msgid "Previews the contacts to be printed"
 msgstr "Ukukhangela oqhagamshelana nabo phambi kokubashicilela"
 
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-tasks.xml.h:15
-msgid "Print Pre_view"
-msgstr "Ukukhangela _phambi Kokushicilela"
-
 #: ../ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Shicilela obachongileyo kwabo uqhagamshelana nabo"
@@ -17017,7 +17996,7 @@ msgid "View the current contact"
 msgstr "Khangela oqhagamshelana naye ngoku"
 
 #: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-mail-list.xml.h:24 ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution-tasks.xml.h:19
 msgid "_Actions"
 msgstr "_Izenzo"
 
@@ -17025,10 +18004,6 @@ msgstr "_Izenzo"
 msgid "_Forward Contact..."
 msgstr "_Dlulisa Oqhagamshelana naye..."
 
-#: ../ui/evolution-addressbook.xml.h:36
-msgid "_Move to Folder..."
-msgstr "_Shenxisela Kwisiqulathi Seefayili..."
-
 #: ../ui/evolution-addressbook.xml.h:39
 msgid "_Preview Pane"
 msgstr "_Bonisa Igilasi Yefestile Phambi Kokushicilela"
@@ -17085,7 +18060,7 @@ msgstr "Uluhlu"
 msgid "Month"
 msgstr "Inyanga"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
 msgid "Next"
 msgstr "Elandelayo"
 
@@ -17093,7 +18068,7 @@ msgstr "Elandelayo"
 msgid "Previews the calendar to be printed"
 msgstr "Bonisa Ikhalenda emayishicilelwe"
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
 msgid "Previous"
 msgstr "Engaphambili"
 
@@ -17204,19 +18179,19 @@ msgid "Create a new folder for storing mail"
 msgstr "Yenza isiqulathi seefayili zenyani zolu luhlu loqhagamshelana naye"
 
 #: ../ui/evolution-mail-global.xml.h:5
-msgid "Create or edit rules for filtering new mail"
-msgstr "Yenza okanye uhlele imithetho yokuhluza i-imeyili entsha"
-
-#: ../ui/evolution-mail-global.xml.h:6
 #, fuzzy
-msgid "Create or edit vFolder definitions"
+msgid "Create or edit Search Folder definitions"
 msgstr "Yenza okanye uhlele iinkcazelo eziyinyani zesiqulathi seefayili"
 
+#: ../ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr "Yenza okanye uhlele imithetho yokuhluza i-imeyili entsha"
+
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
 msgstr "Chitha _Umgqomo"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "I_siqulathi seefayili"
@@ -17228,19 +18203,15 @@ msgstr "Izihluzi Zee-imeyili"
 
 #: ../ui/evolution-mail-global.xml.h:10
 #, fuzzy
-msgid "Message _List As"
-msgstr "Uluhlu lomyalezo"
-
-#: ../ui/evolution-mail-global.xml.h:11
-#, fuzzy
 msgid "Message _Preview"
 msgstr "Isihloko Somyalezo"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:11
 #, fuzzy
 msgid "Move the selected folder into another folder"
 msgstr "Shenxisa um(imi)yalezo ochongiweyo uwuse kwesinye isiqulathi seefayili"
 
+#. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
@@ -17248,44 +18219,39 @@ msgstr ""
 "zeefayili"
 
 #: ../ui/evolution-mail-global.xml.h:14
-msgid "Post a message to a Public folder"
-msgstr "Thumela umyalezo kwisiqulathi seefayili sikaWonkewonke"
-
-#: ../ui/evolution-mail-global.xml.h:15
 #, fuzzy
 msgid "Search F_olders"
 msgstr "Khetha Isiqulathi Seefayili"
 
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
 msgstr "Bonisa ifestile yokubona umyalezo phambi kokuwushicilela"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 "Zibophelele okanye uzikhuphe ekuzibopheleleni kwiziqulathi zeefayili "
 "ezikwiseva ekude"
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:17
 #, fuzzy
 msgid "_Copy Folder To..."
 msgstr "_Kopela Kwisiqulathi Seefayili..."
 
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "_Move Folder To..."
 msgstr "_Shenxisela Kwisiqulathi Seefayili..."
 
-#: ../ui/evolution-mail-global.xml.h:20
-msgid "_New Search _Folder (FIXME)"
-msgstr ""
-
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:19
 #, fuzzy
 msgid "_New..."
 msgstr "_Entsha"
 
-#: ../ui/evolution-mail-global.xml.h:22
+#.
+#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
+#.
+#: ../ui/evolution-mail-global.xml.h:23
 #, fuzzy
 msgid "_Subscriptions"
 msgstr "Iziqulathi Zeefayili Onokuzibophelela Kuzo"
@@ -17299,113 +18265,113 @@ msgstr "Guqula iimpawu zesi siqulathi seefayili"
 msgid "Change the properties of this folder"
 msgstr "Guqula iimpawu zesi siqulathi seefayili"
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopela um(imi)yalezo ochongiweyo kwi-clipboard"
 
-#: ../ui/evolution-mail-list.xml.h:4 ../ui/evolution-mail-message.xml.h:23
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:24
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Sikela um(imi)yalezo ochongiweyo kwi-clipboard"
 
-#: ../ui/evolution-mail-list.xml.h:5
+#: ../ui/evolution-mail-list.xml.h:6
 msgid "E_xpunge"
 msgstr "C_ima"
 
-#: ../ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-list.xml.h:8
 #, fuzzy
 msgid "Group By _Threads"
 msgstr "Hlanganisa Ngale Ndawo"
 
-#: ../ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:9
+#, fuzzy
+msgid "Hide S_elected Messages"
+msgstr "Fihla Imiyalezo E_cinyiweyo"
+
+#: ../ui/evolution-mail-list.xml.h:10
 msgid "Hide _Deleted Messages"
 msgstr "Fihla Imiyalezo E_cinyiweyo"
 
-#: ../ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:11
+msgid "Hide _Read Messages"
+msgstr "Fihla Imiyalezo E_fundiweyo"
+
+#: ../ui/evolution-mail-list.xml.h:12
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Fihla imiyalezo ecinyiweyo kunokuba uyibonise ngokuyicanda ngomgca phakathi"
 
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:13
 #, fuzzy
 msgid "Mark Me_ssages as Read"
 msgstr "_Phawula imiyalezo njengefundwe emva"
 
-#: ../ui/evolution-mail-list.xml.h:11 ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
 msgid "Paste message(s) from the clipboard"
 msgstr "Ncamathisela um(imi)yalezo kwi-clipboard"
 
-#: ../ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:15
 msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 "Susa ngokusisigxina yonke imiyalezo ecinyiweyo kwesi siqulathi seefayili"
 
-#: ../ui/evolution-mail-list.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:16
 #, fuzzy
 msgid "Permanently remove this folder"
 msgstr ""
 "Susa ngokusisigxina yonke imiyalezo ecinyiweyo kwesi siqulathi seefayili"
 
-#: ../ui/evolution-mail-list.xml.h:14
+#: ../ui/evolution-mail-list.xml.h:17
+#, fuzzy
+msgid "Select Message _Thread"
+msgstr "Fihla Imiyalezo E_khethiweyo"
+
+#: ../ui/evolution-mail-list.xml.h:18
 #, fuzzy
 msgid "Select _All Messages"
 msgstr "Chonga yonke imiyalezo ebonakalayo"
 
-#: ../ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Select all and only the messages that are not currently selected"
 msgstr "Chonga zonke kunye naloo miyalezo engachongwanga ngokwangoku"
 
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Chonga yonke imiyalezo ekwinkqubo enamacandelwana azimeleyo efanayo "
 "nomyalezo ochongiweyo"
 
-#: ../ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Select all visible messages"
 msgstr "Chonga yonke imiyalezo ebonakalayo"
 
-#: ../ui/evolution-mail-list.xml.h:18
-#, fuzzy
-msgid "Show _Messages"
-msgstr "_Imiyalezo"
+#: ../ui/evolution-mail-list.xml.h:22
+msgid "Sh_ow Hidden Messages"
+msgstr "Bo_nisa Imiyalezo Efihliweyo"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Show messages that have been temporarily hidden"
 msgstr "Bonisa imiyalezo ebifihlwe okwexeshana"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Fihla okwexeshana yonke imiyalezo esele ifundiwe"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Temporarily hide the selected messages"
 msgstr "Fihla okwexeshana imiyalezo echongiweyo"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Threaded Message list"
 msgstr "Uluhlu Lomyalezo Okwinkqubo enamacandelwana azimeleyo"
 
-#: ../ui/evolution-mail-list.xml.h:23
-#, fuzzy
-msgid "Un_read Messages"
-msgstr "Umyalezo ongafundwanga:"
-
-#: ../ui/evolution-mail-list.xml.h:25
-msgid "_All"
-msgstr ""
-
-#: ../ui/evolution-mail-list.xml.h:27 ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 #, fuzzy
 msgid "_Message"
 msgstr "_Imiyalezo"
 
-#: ../ui/evolution-mail-list.xml.h:30
-#, fuzzy
-msgid "_Selected Messages"
-msgstr "Fihla Imiyalezo E_khethiweyo"
-
 #: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Y_ongeza Umthumeli Kwincwadi Yedilesi"
@@ -17414,437 +18380,447 @@ msgstr "Y_ongeza Umthumeli Kwincwadi Yedilesi"
 msgid "A_pply Filters"
 msgstr "S_ebenzisa Izihluzi"
 
-#: ../ui/evolution-mail-message.xml.h:3
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-message.xml.h:4
 msgid "Add Sender to Address Book"
 msgstr "Yongeza Umthumeli Kwincwadi Yedilesi"
 
-#: ../ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:5
 #, fuzzy
 msgid "All Message _Headers"
 msgstr "Isihloko Somyalezo"
 
-#: ../ui/evolution-mail-message.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:6
 msgid "Apply filter rules to the selected messages"
 msgstr "Sebenzisa imithetho yezihluzi kwimiyalezo echongiweyo"
 
-#: ../ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:7
 #, fuzzy
 msgid "Check for _Junk"
 msgstr "Ukukhangela i-imeyili entsha"
 
-#: ../ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
 msgstr "Bhala _Umyalezo Omtsha"
 
-#: ../ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Bhala impendulo eya kubo bonke abamkeli bomyalezo ochongiweyo"
 
-#: ../ui/evolution-mail-message.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 "Bhala impendulo eya kubo bonke abakuluhlu loqhagamshelwano lomyalezo "
 "ochongiweyo"
 
-#: ../ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-message.xml.h:11
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Bhala impendulo eya kumthumeli womyalezo ochongiweyo"
 
-#: ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Copy selected messages to another folder"
 msgstr "Kopela imiyalezo echongiweyo kwesinye isiqulathi seefayili"
 
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:15
 #, fuzzy
 msgid "Create R_ule"
 msgstr "Yenza isiqulathi seefayili"
 
-#: ../ui/evolution-mail-message.xml.h:15
-msgid "Create a rule to filter messages from this sender"
-msgstr "Yenza umthetho ohluza imiyalezo evela kumthumeli"
-
 #: ../ui/evolution-mail-message.xml.h:16
-msgid "Create a rule to filter messages to these recipients"
-msgstr "Yenza umthetho ohluza imiyalezo eya kwaba bamkeli"
+#, fuzzy
+msgid "Create a Search Folder for these recipients"
+msgstr "Yenza isiqulathi seefayili zenyani zaba bamkeli"
 
 #: ../ui/evolution-mail-message.xml.h:17
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "Yenza umthetho ohluza imiyalezo eya kolu luhlu loqhagamshelana naye"
+#, fuzzy
+msgid "Create a Search Folder for this mailing list"
+msgstr "Yenza isiqulathi seefayili zenyani zolu luhlu loqhagamshelana naye"
 
 #: ../ui/evolution-mail-message.xml.h:18
-msgid "Create a rule to filter messages with this subject"
-msgstr "Yenza umthetho ohluza imiyalezo enesi sihloko"
+#, fuzzy
+msgid "Create a Search Folder for this sender"
+msgstr "Yenza isiqulathi seefayili zenyani zalo mthumeli"
 
 #: ../ui/evolution-mail-message.xml.h:19
 #, fuzzy
-msgid "Create a vFolder for these recipients"
-msgstr "Yenza isiqulathi seefayili zenyani zaba bamkeli"
+msgid "Create a Search Folder for this subject"
+msgstr "Yenza isiqulathi seefayili zenyani zesi sihloko"
 
 #: ../ui/evolution-mail-message.xml.h:20
-#, fuzzy
-msgid "Create a vFolder for this mailing list"
-msgstr "Yenza isiqulathi seefayili zenyani zolu luhlu loqhagamshelana naye"
+msgid "Create a rule to filter messages from this sender"
+msgstr "Yenza umthetho ohluza imiyalezo evela kumthumeli"
 
 #: ../ui/evolution-mail-message.xml.h:21
-#, fuzzy
-msgid "Create a vFolder for this sender"
-msgstr "Yenza isiqulathi seefayili zenyani zalo mthumeli"
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Yenza umthetho ohluza imiyalezo eya kwaba bamkeli"
 
 #: ../ui/evolution-mail-message.xml.h:22
-#, fuzzy
-msgid "Create a vFolder for this subject"
-msgstr "Yenza isiqulathi seefayili zenyani zesi sihloko"
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Yenza umthetho ohluza imiyalezo eya kolu luhlu loqhagamshelana naye"
+
+#: ../ui/evolution-mail-message.xml.h:23
+msgid "Create a rule to filter messages with this subject"
+msgstr "Yenza umthetho ohluza imiyalezo enesi sihloko"
 
-#: ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-message.xml.h:25
 msgid "Decrease the text size"
 msgstr "Nciphisa ubungakanani bombhalo"
 
-#: ../ui/evolution-mail-message.xml.h:26
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next important message"
 msgstr "Bonisa umyalezo olandelayo obalulekileyo"
 
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next message"
 msgstr "Bonisa umyalezo olandelayo"
 
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
 msgstr "Bonisa umyalezo olandelayo ongekafundwa"
 
-#: ../ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the next unread thread"
 msgstr "Bonisa umyalezo olandelayo ongekafundwa"
 
-#: ../ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous important message"
 msgstr "Bonisa umyalezo ongaphambili obalulekileyo"
 
-#: ../ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous message"
 msgstr "Bonisa umyalezo ongaphambili"
 
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:33
 msgid "Display the previous unread message"
 msgstr "Bonisa umyalezo ongaphambili ongekafundwa"
 
-#: ../ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "Hluza _Kuluhlu lwe-imeyili..."
 
-#: ../ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "Hluza Kum_thumeli..."
 
-#: ../ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "Hluza ku _Mamkeli..."
 
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "Hluza kwi_Sihloko..."
 
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
 msgstr "Hluza imiyalezo echongiweyo ukhangela ubume obungasebenziyo"
 
-#: ../ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "Um(imi)yalezo ochonge nge-Flag ukuze ulandelwe"
 
-#: ../ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "Landele_la..."
 
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "Nyanzela ukufaka imifanekiso ekwi-imeyili ye-HTML"
 
-#: ../ui/evolution-mail-message.xml.h:42
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "Dlulisa umyalezo ochongiweyo ngomzimba womyalezo omtsha"
 
-#: ../ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "Dlulisa umyalezo ochongiweyo ngokuwucaphula njengempendulo"
 
-#: ../ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "Dlulisela umyalezo ochongiweyo komnye umntu"
 
-#: ../ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 "Dlulisa njengesiqhoboshelo umyalezo ochongiweyo uwudlulisela komnye umntu"
 
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Yandisa ubungakanani bombhalo"
 
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:49
 #, fuzzy
 msgid "Mar_k as"
 msgstr "Yiphawu_le njengeFundiweyo"
 
-#: ../ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as having been read"
 msgstr "Phawula um(imi)yalezo ochongiweyo njengofundiweyo"
 
-#: ../ui/evolution-mail-message.xml.h:50
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as important"
 msgstr "Phawula um(imi)yalezo ochongiweyo njengobalulekileyo"
 
-#: ../ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as junk"
 msgstr "Phawula um(imi)yalezo ochongiweyo njengongasebenziyo"
 
-#: ../ui/evolution-mail-message.xml.h:52
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not being junk"
 msgstr "Phawula um(imi)yalezo ochongiweyo njengosebenzayo"
 
-#: ../ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Phawula um(imi)yalezo ochongiweyo njengongafundwanga"
 
-#: ../ui/evolution-mail-message.xml.h:54
+#: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Phawula um(imi)yalezo ochongiweyo njengongabalulekanga"
 
-#: ../ui/evolution-mail-message.xml.h:55
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
 msgstr "Phawula um(imi)yalezo ochongiweyo ukuba ucinywe"
 
-#: ../ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Message Source"
 msgstr "Uvimba wemiyalezo"
 
-#: ../ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Move"
 msgstr "Shenxisa"
 
-#: ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-mail-message.xml.h:59
 msgid "Move selected message(s) to another folder"
 msgstr "Shenxisa um(imi)yalezo ochongiweyo uwuse kwesinye isiqulathi seefayili"
 
-#: ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Important Message"
 msgstr "Okulandelayo _Umyalezo obalulekileyo"
 
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Next _Thread"
 msgstr "Okulandelayo _Yinkqubo Enamacandelwana azimeleyo"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Next _Unread Message"
 msgstr "Okulandelayo _Umyalezo Ongafundwanga"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Not Junk"
 msgstr "Uyasebenza"
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:65
 msgid "Open a window for composing a mail message"
 msgstr "Vula ifestile yokubhala umyalezo we-imeyili"
 
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "Open the selected message in a new window"
 msgstr "Vula umyalezo ochongiweyo kwifestile entsha"
 
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "Open the selected message in the composer for editing"
 msgstr "Vula umyalezo ochongiweyo kumbhalo wokuhlela"
 
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "P_revious Unread Message"
 msgstr "Umyalezo Wa_ngaphambili Ongafundwanga"
 
-#: ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Pos_t New Message to Folder"
+msgstr "Thumela Umyalezo Om_tsha"
+
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a Repl_y"
 msgstr "Thumela Impendu_lo"
 
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:72
+msgid "Post a message to a Public folder"
+msgstr "Thumela umyalezo kwisiqulathi seefayili sikaWonkewonke"
+
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Post a reply to a message in a Public folder"
 msgstr "Thumela impendulo yomyalezo kwisiqulathi seefayili sikaWonkewonke"
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Pr_evious Important Message"
 msgstr "Umyalezo Wa_ngaphambili Obalulekileyo"
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Preview the message to be printed"
 msgstr "Bonisa umyalezo oza kushicilelwa"
 
-#: ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Print this message"
 msgstr "Shicilela lo myalezo"
 
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Re_direct"
 msgstr "Ukwa_lathisa kwakhona"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Ukwalathisela (ukuqakathisela) umyalezo ochongiweyo komnye umntu"
 
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Reset the text to its original size"
 msgstr "Wumisele kwakhona umbhalo uwuse kubungakanani bokuqala"
 
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Save the message as a text file"
 msgstr "Gcina umyalezo njengefayili engumbhalo"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:87
+#, fuzzy
+msgid "Search Folder from Mailing _List..."
+msgstr "I-vFolder ekuLuhlu _Lwabantu Oqhagamshelana nabo nge-imeyili..."
+
+#: ../ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "Search Folder from Recipients..."
+msgstr "I-vFolder eku_Mamkeli..."
+
+#: ../ui/evolution-mail-message.xml.h:89
+#, fuzzy
+msgid "Search Folder from S_ubject..."
+msgstr "I-vFolder ekwi_Sihloko..."
+
+#: ../ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "Search Folder from Sen_der..."
+msgstr "I-vFolder ekuM_thumeli..."
+
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Search for text in the body of the displayed message"
 msgstr "Khangela umbhalo kumzimba womyalezo obonisiweyo"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Select _All Text"
 msgstr "Chonga yonke imibhalo"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:93
 #, fuzzy
 msgid "Select all the text in a message"
 msgstr "Chonga yonke imiyalezo ebonakalayo"
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "Misela inkqubo yephepha lommiselo wesishicileli onaso ngoku"
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Bonisa ikhesa edanyazayo kumzimba womyalezo okwiskrini"
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show message in the normal style"
 msgstr "Bonisa umyalezo kwisimbo esiqhelekileyo"
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Show message with all email headers"
 msgstr "Bonisa umyalezo kuzo zonke izihloko ze-imeyili"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Show the raw email source of the message"
 msgstr "Bonisa umthombo okrwada we-imeyili yalo myalezo"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Un-delete the selected messages"
 msgstr "Musa-ukucima umyalezo okhethiweyo"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "Uni_mportant"
 msgstr "Ibalulekile"
 
-#: ../ui/evolution-mail-message.xml.h:94
-#, fuzzy
-msgid "VFolder on Mailing _List..."
-msgstr "I-vFolder ekuLuhlu _Lwabantu Oqhagamshelana nabo nge-imeyili..."
-
-#: ../ui/evolution-mail-message.xml.h:95
-#, fuzzy
-msgid "VFolder on Recipients..."
-msgstr "I-vFolder eku_Mamkeli..."
-
-#: ../ui/evolution-mail-message.xml.h:96
-#, fuzzy
-msgid "VFolder on S_ubject..."
-msgstr "I-vFolder ekwi_Sihloko..."
-
-#: ../ui/evolution-mail-message.xml.h:97
-#, fuzzy
-msgid "VFolder on Sen_der..."
-msgstr "I-vFolder ekuM_thumeli..."
-
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "_Caret Mode"
 msgstr "Indlela _ebonisa uphawu omalufakwe"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:105
 #, fuzzy
 msgid "_Delete Message"
 msgstr "Fihla Imiyalezo E_cinyiweyo"
 
-#: ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Find in Message..."
 msgstr "Ifunyenwe Kumyalezo"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Go To"
 msgstr "_Yiya Ku"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:110
 #, fuzzy
 msgid "_Important"
 msgstr "Ibalulekile"
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:111
 #, fuzzy
 msgid "_Junk"
 msgstr "Ulwazi olungasebenziyo"
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Load Images"
 msgstr "Faka _Imifanekiso"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Next Message"
 msgstr "_Umyalezo Olandelayo"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:116
 #, fuzzy
 msgid "_Normal Size"
 msgstr "Eqhelekileyo"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Not Junk"
 msgstr "Uyasebenza"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:118
 #, fuzzy
 msgid "_Open in New Window"
 msgstr "Yivule _Kwifestile Entsha"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Previous Message"
 msgstr "_Umyalezo Ongaphambili"
 
-#: ../ui/evolution-mail-message.xml.h:118
-#, fuzzy
-msgid "_Read"
-msgstr "Funda"
-
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:123
 #, fuzzy
 msgid "_Save Message..."
 msgstr "Thumela Umyalezo..."
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:124
 #, fuzzy
 msgid "_Undelete Message"
 msgstr "_Umyalezo Olandelayo"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:125
 #, fuzzy
 msgid "_Unread"
 msgstr "Yiphawule njenge_Ngafundwanga"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Zoom In"
 msgstr ""
 
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
 #: ../ui/evolution-mail-messagedisplay.xml.h:1
 #: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:2
+#: ../ui/evolution-signature-editor.xml.h:7
 msgid "Close"
 msgstr "Vala"
 
@@ -17852,19 +18828,19 @@ msgstr "Vala"
 msgid "Close this window"
 msgstr "Vala le festile"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "I-toolbar eyintloko"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:40 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Vala"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:43
-#: ../ui/evolution-signature-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:45
+#: ../ui/evolution-signature-editor.xml.h:24
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
 msgid "_File"
 msgstr "I_fayili"
 
@@ -17880,8 +18856,13 @@ msgstr "Qhoboshela ifayili"
 msgid "Check to get delivery notification when your message is read"
 msgstr ""
 
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
 #: ../ui/evolution-message-composer.xml.h:5
-#: ../ui/evolution-signature-editor.xml.h:3
+#: ../ui/evolution-signature-editor.xml.h:13
 msgid "Close the current file"
 msgstr "Vala le fayili"
 
@@ -17899,7 +18880,7 @@ msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Khowuda lo myalezo ngeSatifiketi sakho Sokukhowuda Se-S/MIME"
 
 #: ../ui/evolution-message-composer.xml.h:9
-#: ../ui/evolution-signature-editor.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:14
 msgid "For_mat"
 msgstr "Ubu_me"
 
@@ -17937,113 +18918,122 @@ msgid "Save As"
 msgstr "Gcina Njenge"
 
 #: ../ui/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save Draft"
+msgstr "Gcina I_drafti"
+
+#: ../ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Gcina _Njenge..."
 
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:22
 msgid "Save _Draft"
 msgstr "Gcina I_drafti"
 
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:23
+#, fuzzy
+msgid "Save as draft"
+msgstr "Gcina I_drafti"
+
+#: ../ui/evolution-message-composer.xml.h:24
 msgid "Save in folder..."
 msgstr "Gcina kwisiqulathi seefayili..."
 
-#: ../ui/evolution-message-composer.xml.h:23
-#: ../ui/evolution-signature-editor.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:25
 msgid "Save the current file"
 msgstr "Gcina le fayili"
 
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Save the current file with a different name"
 msgstr "Gcina le fayili ngegama elahlukileyo"
 
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Save the message in a specified folder"
 msgstr "Gcina umyalezo kwisiqulathi seefayili esichaziweyo"
 
-#: ../ui/evolution-message-composer.xml.h:27
-#: ../ui/evolution-signature-editor.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:29
+#: ../ui/evolution-signature-editor.xml.h:22
 msgid "Send the mail in HTML format"
 msgstr "Thumela i-imeyili ngobume be-HTML"
 
-#: ../ui/evolution-message-composer.xml.h:28
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Send this message"
 msgstr "Thumela lo myalezo"
 
-#: ../ui/evolution-message-composer.xml.h:29
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your PGP key"
 msgstr "Sayina lo myalezo ngesitshixo se-PGP yakho"
 
-#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Sayina lo myalezo ngeSatifiketi Sosayino lwe-S/MIME yakho"
 
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Iqhosha lokubonisa ukuba indawo yoKOPELA NGOKUFIHLIWEYO ibonisiwe"
 
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the CC field is displayed"
 msgstr "Iqhosha lokubonisa ukuba indawo yoKUKOPELA KU- ibonisiwe"
 
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Iqhosha lokubonisa ukuba isikhethi esithi Ivela ku- sibonisiwe"
 
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "Iqhosha lokubonisa ukuba indawo ethi Thumela-Ku ibonisiwe"
 
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Iqhosha lokubonisa ukuba indawo ethi Phendulela ku- ibonisiwe"
 
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the To field is displayed"
 msgstr "Iqhosha lokubonisa ukuba indawo ethi Iya ku- ibonisiwe"
 
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "_Attachment..."
 msgstr "_Isiqhoboshelo..."
 
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "_Bcc Field"
 msgstr "Indawo yoKukopela _ngokufihliweyo"
 
-#: ../ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:41
 msgid "_Cc Field"
 msgstr "Indawo yoKukopela _ku"
 
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:43
 msgid "_Delete all"
 msgstr "_Cima Yonke"
 
-#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-message-composer.xml.h:46
 msgid "_From Field"
 msgstr "Indawo ye-_Ivela ku-"
 
-#: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-signature-editor.xml.h:25
 msgid "_Insert"
 msgstr "_Fakela"
 
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Open..."
 msgstr "_Vula..."
 
-#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Post-To Field"
 msgstr "_Indawo ye-Thumela Ku-"
 
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:50
 msgid "_Reply-To Field"
 msgstr "_Indawo Yempendulo Eya ku-"
 
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:52
 msgid "_Security"
 msgstr "_Ukhuseleko"
 
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:53
 msgid "_To Field"
 msgstr "_Indawo Ye- Iya ku-"
 
@@ -18051,19 +19041,22 @@ msgstr "_Indawo Ye- Iya ku-"
 msgid "C_lose"
 msgstr "V_ala"
 
-#: ../ui/evolution-signature-editor.xml.h:5
+#: ../ui/evolution-signature-editor.xml.h:15
 msgid "H_TML"
 msgstr "i-H_TML"
 
-#: ../ui/evolution-signature-editor.xml.h:7
+#: ../ui/evolution-signature-editor.xml.h:16
 msgid "Save and Close"
 msgstr "Gcina ze Uvale"
 
-#: ../ui/evolution-signature-editor.xml.h:8
+#.
+#. <menuitem name="FileSave" verb="" _label="_Save"/>
+#.
+#: ../ui/evolution-signature-editor.xml.h:20
 msgid "Save and _Close"
 msgstr "Gcina ze U_vale"
 
-#: ../ui/evolution-signature-editor.xml.h:10
+#: ../ui/evolution-signature-editor.xml.h:21
 msgid "Save the current file and close the window"
 msgstr "Gcina le fayili ze uvale le festile"
 
@@ -18139,7 +19132,7 @@ msgstr "Shicilela uluhlu lwemisebenzi"
 msgid "View the selected task"
 msgstr "Khangela umsebenzi ochongiweyo"
 
-#: ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-tasks.xml.h:25
 msgid "_Open Task"
 msgstr "_Vula Umsebenzi"
 
@@ -18176,138 +19169,138 @@ msgid "Display window buttons with text only"
 msgstr "Bonisa amaqhosha efestile anemibhalo kuphela"
 
 #: ../ui/evolution.xml.h:10
-msgid "Evolution _FAQ"
-msgstr "Uphuhliso lwe-_FAQ"
-
-#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Phuma kule nkqubo"
 
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:11
 msgid "Forget _Passwords"
 msgstr "Libala _Ii-Passwords"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Libala ii-password ozikhumbuleyo ukuze wazise xa zifuneka kwakhona"
 
-#: ../ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:13
 msgid "Hide window buttons"
 msgstr "Fihla amaqhosha efestile"
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:14
 msgid "Icons _and text"
 msgstr "Iimpawu zemiqondiso _kunye nemibhalo"
 
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:15
 msgid "Import data from other programs"
 msgstr "Ngenisa i-data evela kwezinye iinkqubo"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "Ifestile _Entsha"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "Okukh_ethwayo"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "Thumela / Fumana"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send queued items and retrieve new items"
 msgstr "Thumela izinto ezikukrozo ze ufumane izinto ezintsha"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Set up Pilot configuration"
 msgstr "Misela inkqubo emiselweyo yeSikhokelo"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Show information about Evolution"
 msgstr "Bonisa ulwazi ngenkqubo ye-Evolution"
 
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:23
 msgid "Submit Bug Report"
 msgstr "Ngenisa Ingxelo Yesiphene"
 
-#: ../ui/evolution.xml.h:25
+#. <menuitem name="HelpFAQ" verb=""
+#. _label="Evolution _FAQ"/>
+#.
+#. <separator/>
+#: ../ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Ngenisa _Ingxelo Yesiphene"
 
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:29
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Ngenisa Ingxelo Yesiphene usebenzisa i-Bug Buddy"
 
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Iqhosha lokubonisa ukuba sisebenza ngaphandle kwe-intanethi."
 
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:31
 msgid "Tool_bar"
 msgstr "I-Tool_bar"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:32
 msgid "Tool_bar style"
 msgstr "Ubume be-Tool_bar"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:33
 msgid "_About Evolution..."
 msgstr "_Nge-Evolution..."
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:34
 #, fuzzy
 msgid "_Close Window"
 msgstr "Vala le festile"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:37
 msgid "_Help"
 msgstr "_Uncedo"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:38
 msgid "_Hide buttons"
 msgstr "_Fihla amaqhosha"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:39
 msgid "_Icons only"
 msgstr "_Umqondiso kuphela"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:40
 msgid "_Import..."
 msgstr "_Ngenisa..."
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:41
 msgid "_New"
 msgstr "_Entsha"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:42
 msgid "_Quick Reference"
 msgstr "_Ukubhekisa Ngokukhawuleza"
 
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Quit"
 msgstr "S_ika"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:44
 msgid "_Send / Receive"
 msgstr "_Thumela / Fumana"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:45
 msgid "_Switcher Appearance"
 msgstr ""
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:46
 msgid "_Synchronization Options..."
 msgstr ""
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:47
 msgid "_Text only"
 msgstr "_Umbhalo kuphela"
 
-#: ../ui/evolution.xml.h:45
-msgid "_Tools"
-msgstr "_Izixhobo"
+#: ../ui/evolution.xml.h:49
+msgid "_Window"
+msgstr "_Ifestile"
 
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
@@ -18404,6 +19397,34 @@ msgstr ""
 "ixesha lendawo.\n"
 "Sebenzisa iqhosha elisekunene le-mouse ukunciphisa."
 
+#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-model.c:188
+#, fuzzy
+msgid "Collection"
+msgstr "indawo"
+
+#: ../widgets/menus/gal-define-views-dialog.c:325
+#: ../widgets/menus/gal-define-views.glade.h:4
+#, fuzzy, no-c-format
+msgid "Define Views for %s"
+msgstr "Chaza Okuboniswa Kwiskrini..."
+
+#: ../widgets/menus/gal-define-views-dialog.c:333
+#: ../widgets/menus/gal-define-views-dialog.c:335
+#, fuzzy
+msgid "Define Views"
+msgstr "Chaza Okuboniswa Kwiskrini..."
+
+#: ../widgets/menus/gal-define-views.glade.h:2
+#, fuzzy, no-c-format
+msgid "Define Views for \"%s\""
+msgstr "Chaza Okuboniswa Kwiskrini..."
+
+#: ../widgets/menus/gal-define-views.glade.h:5
+#, fuzzy
+msgid "_Edit..."
+msgstr "_Hlela"
+
 #: ../widgets/menus/gal-view-factory-etable.c:39
 #: ../widgets/table/e-table-header-item.c:1845
 #: ../widgets/table/e-table-scrolled.c:224
@@ -18411,6 +19432,25 @@ msgstr ""
 msgid "Table"
 msgstr "iTheyibhile"
 
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
+#, fuzzy
+msgid "Instance"
+msgstr "Kuwo onke Amatyeli"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
+#, fuzzy
+msgid "Save Current View"
+msgstr "Okubona Ngoku"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#, fuzzy
+msgid "_Create new view"
+msgstr "Yenza uvavanyo olutsha"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
+msgid "_Replace existing view"
+msgstr ""
+
 #: ../widgets/menus/gal-view-menus.c:291
 msgid "_Current View"
 msgstr "_Okubonakala Ngoku"
@@ -18427,6 +19467,21 @@ msgstr "Ifektri"
 msgid "Define New View"
 msgstr "Chaza Okubonakalayo Okutsha"
 
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#, fuzzy
+msgid "Name of new view:"
+msgstr "ukubonisa ubume benyanga :"
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#, fuzzy
+msgid "Type of View"
+msgstr "Ukujonga ubume bosuku"
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:4
+#, fuzzy
+msgid "Type of view:"
+msgstr "ukubonisa umsebenzi wosuku :"
+
 #. 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:415
@@ -18434,7 +19489,7 @@ msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1099
+#: ../widgets/misc/e-calendar-item.c:1097
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -18464,16 +19519,13 @@ msgstr "Zalisa umbala"
 msgid "GDK fill color"
 msgstr "GDK zalisa umbala"
 
-#: ../widgets/misc/e-canvas-background.c:477 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
+#: ../widgets/misc/e-canvas-background.c:477
+#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3562
+#: ../widgets/text/e-text.c:3563
 msgid "Fill stipple"
 msgstr "Zalisa umzobo ngokuchokoza"
 
-#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1306
-#, fuzzy
-msgid "FIll stipple"
-msgstr "Zalisa umzobo ngokuchokoza"
-
 #: ../widgets/misc/e-canvas-background.c:484
 #: ../widgets/misc/e-canvas-background.c:485
 #, fuzzy
@@ -18497,14 +19549,16 @@ msgid "Y2"
 msgstr ""
 
 #: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
+#: ../widgets/table/e-table-group-container.c:978
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3001
+#: ../widgets/table/e-table-item.c:3005
 msgid "Minimum width"
 msgstr "Ubuncinane bobubanzi"
 
 #: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
+#: ../widgets/table/e-table-group-container.c:979
 #: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3002
+#: ../widgets/table/e-table-item.c:3006
 msgid "Minimum Width"
 msgstr "Ubuncinane Bobubanzi"
 
@@ -18829,7 +19883,7 @@ msgstr "Inkqubo Yokhetho"
 msgid "Cursor Mode"
 msgstr "Inkqubo yeKhesa"
 
-#: ../widgets/misc/e-send-options.c:515
+#: ../widgets/misc/e-send-options.c:521
 #, fuzzy
 msgid "When de_leted:"
 msgstr "%d icinyiwe"
@@ -18982,6 +20036,25 @@ msgstr "%s (%d%% igqityiwe)"
 msgid "click here to go to url"
 msgstr "<cofa apha ukukhetha isiqulathi seefayili>"
 
+#: ../widgets/misc/gal-categories.glade.h:2
+msgid "Edit Master Category List..."
+msgstr ""
+
+#: ../widgets/misc/gal-categories.glade.h:3
+#, fuzzy
+msgid "Item(s) belong to these _categories:"
+msgstr "Olu qhagamshelwano lolwezi ndidi:"
+
+#: ../widgets/misc/gal-categories.glade.h:4
+#, fuzzy
+msgid "_Available Categories:"
+msgstr "_Iindidi"
+
+#: ../widgets/misc/gal-categories.glade.h:5
+#, fuzzy
+msgid "categories"
+msgstr "Iindidi"
+
 #: ../widgets/table/e-cell-combo.c:177
 msgid "popup list"
 msgstr "uluhlu lokuqhushumbisa"
@@ -19022,28 +20095,99 @@ msgstr "Ikholam Yombala"
 msgid "BG Color Column"
 msgstr "Ikholam Yombala we BG"
 
-#: ../widgets/table/e-table-config-field.c:254
-msgid "Then By"
-msgstr "Kuze Nge"
-
-#: ../widgets/table/e-table-config-field.c:254
+#: ../widgets/table/e-table-config-no-group.glade.h:1
 #, fuzzy
-msgid "Group By"
-msgstr "_Hlanganisa Nge..."
+msgid "<- _Remove"
+msgstr "_Susa"
 
-#: ../widgets/table/e-table-config-field.c:254
+#: ../widgets/table/e-table-config-no-group.glade.h:2
+#: ../widgets/table/e-table-config.glade.h:1
 #, fuzzy
-msgid "Sort By"
-msgstr "Hlela"
+msgid "A_vailable Fields:"
+msgstr "Indawo Yokusabalalisa Onokubhala Kuyo"
 
-#: ../widgets/table/e-table-config-field.c:270
+#: ../widgets/table/e-table-config-no-group.glade.h:3
+#: ../widgets/table/e-table-config.glade.h:2
 msgid "Ascending"
 msgstr "Enyukayo"
 
-#: ../widgets/table/e-table-config-field.c:273
+#: ../widgets/table/e-table-config-no-group.glade.h:4
+#: ../widgets/table/e-table-config.glade.h:3
+#, fuzzy
+msgid "Clear All"
+msgstr "Su_la iFlegi"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:5
+#: ../widgets/table/e-table-config.glade.h:4
 msgid "Descending"
 msgstr "Iyehla"
 
+#: ../widgets/table/e-table-config-no-group.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:7
+#, fuzzy
+msgid "Group Items By"
+msgstr "_Hlanganisa Nge..."
+
+#: ../widgets/table/e-table-config-no-group.glade.h:9
+#: ../widgets/table/e-table-config.glade.h:8
+msgid "Move _Down"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:9
+#, fuzzy
+msgid "Move _Up"
+msgstr "Shenxisa"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:11
+msgid "Sh_ow these fields in order:"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:12
+#: ../widgets/table/e-table-config.c:563
+#: ../widgets/table/e-table-config.glade.h:10
+#, fuzzy
+msgid "Show Fields"
+msgstr "_Indawo Ye- Iya ku-"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:11
+msgid "Show field in View"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:12
+#, fuzzy
+msgid "Sort"
+msgstr "Isihleli"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:15
+#: ../widgets/table/e-table-config.glade.h:13
+#, fuzzy
+msgid "Sort Items By"
+msgstr "Hlela"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:14
+msgid "Then By"
+msgstr "Kuze Nge"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:17
+#, fuzzy
+msgid "_Add ->"
+msgstr "_Yongeza"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:18
+#: ../widgets/table/e-table-config.glade.h:16
+msgid "_Fields Shown..."
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:20
+#, fuzzy
+msgid "_Sort..."
+msgstr "_Ngenisa..."
+
 #: ../widgets/table/e-table-config.c:150
 msgid "State"
 msgstr "Isimo"
@@ -19064,6 +20208,20 @@ msgstr "Azihlelwanga"
 msgid "No grouping"
 msgstr "Akukho kuhlanganiswa"
 
+#: ../widgets/table/e-table-config.c:584
+#, fuzzy
+msgid "Available Fields"
+msgstr "Indawo Yokusabalalisa Onokubhala Kuyo"
+
+#: ../widgets/table/e-table-config.glade.h:17
+#, fuzzy
+msgid "_Group By..."
+msgstr "_Hlanganisa Nge..."
+
+#: ../widgets/table/e-table-config.glade.h:19
+msgid "_Show these fields in order:"
+msgstr ""
+
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:646
 #: ../widgets/table/e-table-field-chooser.c:79
@@ -19082,66 +20240,115 @@ msgstr "Okubhalwe emantla ephepha Okuzeleyo"
 msgid "Add a column..."
 msgstr "Dibanisa umqulu..."
 
+#: ../widgets/table/e-table-field-chooser.glade.h:1
+#, fuzzy
+msgid "Field Chooser"
+msgstr "Igama Lenxalenye Ye-data"
+
+#: ../widgets/table/e-table-field-chooser.glade.h:2
+msgid ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:350
+#, c-format
+msgid "%s : %s (%d item)"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:351
+#, c-format
+msgid "%s : %s (%d items)"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:356
+#, fuzzy, c-format
+msgid "%s (%d item)"
+msgstr "%s (%d%% igqityiwe)"
+
+#: ../widgets/table/e-table-group-container.c:357
+#, fuzzy, c-format
+msgid "%s (%d items)"
+msgstr "%s (%s)"
+
+#: ../widgets/table/e-table-group-container.c:901
+#: ../widgets/table/e-table-group-container.c:902
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
+#: ../widgets/table/e-table-item.c:2963 ../widgets/table/e-table-item.c:2964
 msgid "Alternating Row Colors"
 msgstr "Imibala Yemigca Ebolekisanayo"
 
+#: ../widgets/table/e-table-group-container.c:908
+#: ../widgets/table/e-table-group-container.c:909
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
+#: ../widgets/table/e-table-item.c:2970 ../widgets/table/e-table-item.c:2971
 #: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
 msgid "Horizontal Draw Grid"
 msgstr "iGridi Yomzobo Ethe tyaba"
 
+#: ../widgets/table/e-table-group-container.c:915
+#: ../widgets/table/e-table-group-container.c:916
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
+#: ../widgets/table/e-table-item.c:2977 ../widgets/table/e-table-item.c:2978
 #: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 msgid "Vertical Draw Grid"
 msgstr "iGridi Yomzobo Ethe nkqo"
 
+#: ../widgets/table/e-table-group-container.c:922
+#: ../widgets/table/e-table-group-container.c:923
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
+#: ../widgets/table/e-table-item.c:2984 ../widgets/table/e-table-item.c:2985
 #: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
 msgid "Draw focus"
 msgstr "Zoba incam"
 
+#: ../widgets/table/e-table-group-container.c:929
+#: ../widgets/table/e-table-group-container.c:930
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
+#: ../widgets/table/e-table-item.c:2991 ../widgets/table/e-table-item.c:2992
 msgid "Cursor mode"
 msgstr "Imkqubo yekhesa"
 
+#: ../widgets/table/e-table-group-container.c:936
+#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-leaf.c:615
+#: ../widgets/table/e-table-group-leaf.c:616
+#: ../widgets/table/e-table-item.c:2956 ../widgets/table/e-table-item.c:2957
+msgid "Selection model"
+msgstr "Imodeli yokhetho"
+
+#: ../widgets/table/e-table-group-container.c:943
+#: ../widgets/table/e-table-group-container.c:944
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
+#: ../widgets/table/e-table-item.c:2998 ../widgets/table/e-table-item.c:2999
 #: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3265
 #: ../widgets/table/e-tree.c:3266
 msgid "Length Threshold"
 msgstr "Umda Wobude"
 
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
-msgid "Selection model"
-msgstr "Imodeli yokhetho"
-
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-group-leaf.c:644
-msgid "Frozen"
-msgstr "Igodole"
-
+#: ../widgets/table/e-table-group-container.c:950
+#: ../widgets/table/e-table-group-container.c:951
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 #: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3297
 #: ../widgets/table/e-tree.c:3298
 msgid "Uniform row height"
 msgstr "Umphakamo womgca ofanayo"
 
+#: ../widgets/table/e-table-group-container.c:957
+#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-group-leaf.c:644
+msgid "Frozen"
+msgstr "Igodole"
+
 #: ../widgets/table/e-table-header-item.c:1472
 msgid "Customize Current View"
 msgstr "Zilungiselele ngendlela oyithandayo Okubonakalayo Okuqhubekayo"
@@ -19206,17 +20413,17 @@ msgstr "Hlela i-Info"
 msgid "Tree"
 msgstr "Ubekelo lweenkqutyana ngokwemo-mthi"
 
-#: ../widgets/table/e-table-item.c:2938 ../widgets/table/e-table-item.c:2939
+#: ../widgets/table/e-table-item.c:2942 ../widgets/table/e-table-item.c:2943
 #, fuzzy
 msgid "Table header"
 msgstr "Isihloko esingabhalekanga kakuhle"
 
-#: ../widgets/table/e-table-item.c:2945 ../widgets/table/e-table-item.c:2946
+#: ../widgets/table/e-table-item.c:2949 ../widgets/table/e-table-item.c:2950
 #, fuzzy
 msgid "Table model"
 msgstr "i-Cell yeTheyibhile"
 
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 #, fuzzy
 msgid "Cursor row"
 msgstr "Umgca weKhesa"
@@ -19388,2771 +20595,3 @@ msgstr "Imeko emalunga ne-IM"
 #: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
 msgid "Handle Popup"
 msgstr "Isiqhashumbi Sesikhombisi"
-
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr ""
-#~ "Uqinisekile ukuba ufuna\n"
-#~ "ukucima lo uqhagamshelana naye?"
-
-#~ msgid "Save Appointment"
-#~ msgstr "Gcina Idinga"
-
-#, fuzzy
-#~ msgid ""
-#~ "Some features may not work correctly with your current server version "
-#~ msgstr ""
-#~ "Ezinye izimo azisebenzi ngokuchanekileyo nohlobo lweseva olukhoyo ngoku"
-
-#~ msgid "Appointment Title"
-#~ msgstr "Isihloko sedinga"
-
-#~ msgid "end-time"
-#~ msgstr "ixesha-lokuyeka"
-
-#~ msgid "location"
-#~ msgstr "indawo"
-
-#~ msgid "start-time"
-#~ msgstr "ixesha-lokuqala"
-
-#~ msgid "Show _Attachment Bar (drop attachments here)"
-#~ msgstr "Bonisa _Uphawu Lwesiqhoboshelo (zibeke apha iziqhoboshelo)"
-
-#~ msgid "Ad_vanced  send options"
-#~ msgstr "Oluph_uculweyo ukhetho lokuthumela"
-
-#~ msgid "N"
-#~ msgstr "Node"
-
-#~ msgid "S"
-#~ msgstr "Sude"
-
-#~ msgid "W"
-#~ msgstr "Ntshona"
-
-#~ msgid "<b>If</b>"
-#~ msgstr "<b>Ukuba</b>"
-
-#~ msgid "Create New Folder"
-#~ msgstr "Yenza Isiqulathi Seefayili Esitsha"
-
-#~ msgid "_Print"
-#~ msgstr "_Shicilela"
-
-#~ msgid "port for starting user runned spamd"
-#~ msgstr "qhagamshela ukuqalisa isiphumezi somsebenzisi esi-spamd"
-
-#~ msgid "spamd port"
-#~ msgstr "isiqhagamshelisi esi-spamd"
-
-#~ msgid "_Load images if sender is in address book"
-#~ msgstr "_Faka umfanekiso ukuba umthumeli ukho kwincwadi yedilesi"
-
-#~ msgid "{1}."
-#~ msgstr "{1}."
-
-#, fuzzy
-#~ msgid "Mark  as default folder"
-#~ msgstr "Sisebenzise isiqulathi seefayili esimiselwe iidrafti?"
-
-#~ msgid "<b>%s</b> requests the presence of %s at the following meeting:"
-#~ msgstr "<b>%s</b> icela ubukho buka-%s kwintlanganiso elandelayo:"
-
-#~ msgid "Manage Plugins..."
-#~ msgstr "Lawula Inkqubo Yoncedo..."
-
-#~ msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
-#~ msgstr "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
-
-#~ msgid ""
-#~ "Uid%sSummary%sDescription List%sCategories List%sComment List%sCompleted%"
-#~ "sCreated%sContact List%sStart%sEnd%sDue%sPercent Done%sPriority%sUrl%"
-#~ "sAttendees List%sLocation%sModified%s"
-#~ msgstr ""
-#~ "I-Uid%sIsishwankathelo%sUluhlu Lwenkcazelo%sUluhlu Lweendidi%sUluhlu "
-#~ "Lwezimvo%sIgqityiwe%sYenziwe%sUluhlu Loqhagamshelana Nabo%sQalisa%"
-#~ "sGqibezela%sIlindelekile%sIpesenti Esele Yenziwe%sOkuphambili%sI-Url%"
-#~ "sUluhlu Lwabebekho%sIndawo%sSele Ilungisiwe%s"
-
-#, fuzzy
-#~ msgid "Invalid user"
-#~ msgstr "Injongo engagunyaziswanga"
-
-#, fuzzy
-#~ msgid "Specify User"
-#~ msgstr "Khetha Umsebenzisi"
-
-#~ msgid "Closing connections..."
-#~ msgstr "Ukuvala unxulumano..."
-
-#~ msgid "Starting import"
-#~ msgstr "Ukuqalisa ukungenisa"
-
-#~ msgid ""
-#~ "If you quit the Evolution Setup Assistant now, all of the information "
-#~ "that you have entered will be forgotten. You will need to run this "
-#~ "assistant again before using Evolution.\n"
-#~ "\n"
-#~ "Do you want to quit using the Assistant now?"
-#~ msgstr ""
-#~ "Ukuba uyaphuma ngoku Kwisincedisi Sokumisela Inkqubo Ye-Evolution, lonke "
-#~ "ulwazi olungenisileyo luya kulityalwa. Kuza kufuneka usiphumeze kwakhona "
-#~ "isincedisi phambi kokusebenzisa inkqubo ye-Evolution.\n"
-#~ "\n"
-#~ "Ingaba ngoku ufuna ukuyeka ukusebenzisa Isincedisi?"
-
-#~ msgid "Importing Files"
-#~ msgstr "Ukungenisa iifayili"
-
-#~ msgid "Timezone "
-#~ msgstr "Ixesha lendawo "
-
-#~ msgid ""
-#~ "You have successfully entered all of the information needed to set up "
-#~ "Evolution. \n"
-#~ "\n"
-#~ "Click the \"Apply\" button to save your settings. "
-#~ msgstr ""
-#~ "Ungenise ngempumelelo lonke ulwazi olufunekayo xa umisela i-Evolution. \n"
-#~ "\n"
-#~ "Cofa iqhosa u \"Yisebenzise\" ukugcina imimiselo yakho."
-
-#~ msgid "Disable the mono plugin environment."
-#~ msgstr "Yenze ingasebenzi indawo yoncedo lwenkqubo enye."
-
-#~ msgid "Cannot start Evolution"
-#~ msgstr "Ayikwazi ukuqalisa inkqubo ye-Evolution"
-
-#~ msgid "Post Ne_w Message"
-#~ msgstr "Thumela Umyalezo Om_tsha"
-
-#~ msgid "S_ubscribe to Folders..."
-#~ msgstr "Zi_bophelele Kwisiqulathi Seefayili..."
-
-#~ msgid "_Filters..."
-#~ msgstr "_Izihluzi..."
-
-#, fuzzy
-#~ msgid "vFolder _Editor..."
-#~ msgstr "Umhleli _Wesiqulathi Seefayili Eziyinyani..."
-
-#~ msgid "Hide _Read Messages"
-#~ msgstr "Fihla Imiyalezo E_fundiweyo"
-
-#~ msgid "Mark All as _Read"
-#~ msgstr "Phawula Yonke njenge_Fundiweyo"
-
-#~ msgid "Sh_ow Hidden Messages"
-#~ msgstr "Bo_nisa Imiyalezo Efihliweyo"
-
-#~ msgid "_Folder"
-#~ msgstr "_Isiqulathi seefayili"
-
-#~ msgid "_Threaded Message List"
-#~ msgstr "_Uluhlu Lwenkqubo Enamacandelwana Azimeleyo Omyalezo"
-
-#, fuzzy
-#~ msgid "Create _vFolder From Message"
-#~ msgstr "_Yenza Isihluzi Kumyalezo"
-
-#~ msgid "F_orward As..."
-#~ msgstr "Dl_ulisa Njenge..."
-
-#~ msgid "Filter _Junk"
-#~ msgstr "Hluza _Okungasebenziyo"
-
-#~ msgid "Mark as I_mportant"
-#~ msgstr "Phawula njengeB_alulekileyo"
-
-#~ msgid "Mark as Unimp_ortant"
-#~ msgstr "Phawula njengeNgabal_ulekanga"
-
-#~ msgid "Original Si_ze"
-#~ msgstr "Ubu_ngakanani Bokuqala"
-
-#~ msgid "S_earch in Message..."
-#~ msgstr "K_hangela Kumyalezo..."
-
-#~ msgid "S_maller"
-#~ msgstr "E_ncinanana"
-
-#~ msgid "Show Email _Source"
-#~ msgstr "Bonisa _Umthombo We-imeyili"
-
-#~ msgid "Show Full _Headers"
-#~ msgstr "Bonisa Izihloko _Ezizeleyo"
-
-#~ msgid "Text Si_ze"
-#~ msgstr "Ubungaka_nani Bombhalo"
-
-#~ msgid "_Attached"
-#~ msgstr "_Iqhotyoshelwe"
-
-#~ msgid "_Create Filter From Message"
-#~ msgstr "_Yenza Isihluzi Kumyalezo"
-
-#~ msgid "_Inline"
-#~ msgstr "_Ukuphumeza i-data ekrwada"
-
-#~ msgid "_Larger"
-#~ msgstr "_Enkulwana"
-
-#~ msgid "_Message Display"
-#~ msgstr "_Ukubonisa Umyalezo Kwiskrini"
-
-#~ msgid "_Normal Display"
-#~ msgstr "_Ukubonisa Okuqhelekileyo"
-
-#~ msgid "_Open Message"
-#~ msgstr "_Vula Umyalezo"
-
-#~ msgid "_Quoted"
-#~ msgstr "_Ecatshulweyo"
-
-#~ msgid "_Undelete"
-#~ msgstr "_Musa Ukucima"
-
-#~ msgid "Show / hide attachments"
-#~ msgstr "Bonisa / fihla iziqhoboshelo"
-
-#~ msgid "Show _attachments"
-#~ msgstr "Bonisa _iziqhoboshelo"
-
-#~ msgid "Show attachments"
-#~ msgstr "Bonisa iziqhoboshelo"
-
-#~ msgid "E_xit"
-#~ msgstr "P_huma"
-
-#~ msgid "Pi_lot Settings..."
-#~ msgstr "Imimiselo Yesi_khokelo..."
-
-#~ msgid "Window B_uttons"
-#~ msgstr "A_maqhosha Efestile"
-
-#~ msgid "_Window"
-#~ msgstr "_Ifestile"
-
-#~ msgid "_Advanced..."
-#~ msgstr "_Eqhubele phambili..."
-
-#, fuzzy
-#~ msgid ""
-#~ "None\n"
-#~ "Mail Receipt\n"
-#~ msgstr "Funda iirisithi"
-
-#~ msgid "have "
-#~ msgstr "ba na-"
-
-#~ msgid "has "
-#~ msgstr "une-"
-
-#~ msgid " cards"
-#~ msgstr " iikhadi"
-
-#~ msgid " card"
-#~ msgstr " ikhadi"
-
-#~ msgid "alarm "
-#~ msgstr "isiqaphelisi "
-
-#~ msgid "time-zone "
-#~ msgstr "ixesha elibekiweyo "
-
-#~ msgid "meeting "
-#~ msgstr "intlanganiso "
-
-#~ msgid "empty"
-#~ msgstr "ayinanto"
-
-#~ msgid ", %d events"
-#~ msgstr ", %d izehlo"
-
-#~ msgid "work week view :"
-#~ msgstr "ukubonisa iveki yomsebenzi :"
-
-#~ msgid "day view :"
-#~ msgstr "ukubonisa umsebenzi wosuku :"
-
-#~ msgid "month view :"
-#~ msgstr "ukubonisa ubume benyanga :"
-
-#~ msgid "week view :"
-#~ msgstr "ukubonisa ubume beveki :"
-
-#~ msgid ")"
-#~ msgstr ")"
-
-#~ msgid "Position of the vertical pane in main view."
-#~ msgstr "Indawo yobude begilasi yefestile kwisibonisi esingundoqo."
-
-#~ msgid ""
-#~ "The number of characters that must be typed before Evolution will attempt "
-#~ "to autocomplete"
-#~ msgstr ""
-#~ "Inani loonobumba ekufuneka bechwetheziwe phambi kokuba i-Evolution "
-#~ "ibagqibezele ngokuzenzekelayo"
-
-#~ msgid "Address:"
-#~ msgstr "Idilesi:"
-
-#~ msgid "Calendar:"
-#~ msgstr "Ikhalenda:"
-
-#~ msgid "PO Box:"
-#~ msgstr "Ibhokisi yeposi:"
-
-#~ msgid "State/Province:"
-#~ msgstr "Isizwe/Iphondo:"
-
-#~ msgid "Title:"
-#~ msgstr "Isihloko:"
-
-#~ msgid "This contact belongs to these categories:"
-#~ msgstr "Olu qhagamshelwano lolwezi ndidi:"
-
-#~ msgid "Edit Contact Info"
-#~ msgstr "Hlela Ulwazi Loqhagamshelwano"
-
-#~ msgid "Add to Contacts"
-#~ msgstr "Yongeza Koqhagamshelana Nabo"
-
-#~ msgid "Allocate less space to weekend appointments"
-#~ msgstr "Wanike indawo encinane amadinga angeempelaveki"
-
-#~ msgid "Days that are work days"
-#~ msgstr "Iintsuku ezizintsuku zomsebenzi"
-
-#~ msgid "Default timezone for meetings"
-#~ msgstr "Wamisele amaxesha eentlanganiso"
-
-#~ msgid "Hour the workday ends on"
-#~ msgstr "Iyure oluphela ngayo usuku lomsebenzi"
-
-#~ msgid "Position of the horizontal pane in the month view"
-#~ msgstr "Indawo yobubanzi begilasi yefestile kwisithuba senyanga"
-
-#~ msgid "Position of the vertical pane"
-#~ msgstr "Indawo yobubanzi begilasi yefestile"
-
-#~ msgid "Show where events end in week and month views"
-#~ msgstr ""
-#~ "Bonisa ukuba siphela phi na isiganeko kwisithuba seveki okanye inyanga"
-
-#~ msgid "The url template to use as a free/busy data fallback"
-#~ msgstr ""
-#~ "Isikhokelo se-url esisetyenziswa njengesingahlawulwayo /njenge-data "
-#~ "exakekileyo ekungabuyelwa kuyo"
-
-#~ msgid "Whether to ask for confirmation when folder is expunged"
-#~ msgstr "Ukuba ungacela ukwaziswa xa isiqulathi seefayili sicinywa"
-
-#~ msgid "option menu to choose alarm action"
-#~ msgstr "imenyu okhetha kuyo isenzo esinesandi esilumkisayo"
-
-#~ msgid "option menu to choose alarm relative"
-#~ msgstr "imenyu okhetha kuyo isandi esilumkisayo esihambelanayo"
-
-#~ msgid "option menu to choose alarm time"
-#~ msgstr "imenyu okhetha kuyo isandi sexesha esilumkisayo"
-
-#~ msgid "option menu to choose alarm value units"
-#~ msgstr "imenyu okhetha kuyo ixabiso leyunithi yesandi esilumkisayo"
-
-#~ msgid "<span weight=\"bold\">Basics</span>"
-#~ msgstr "<span weight=\"bold\">Iziseko</span>"
-
-#~ msgid "<span weight=\"bold\">Date and Time</span>"
-#~ msgstr "<span weight=\"bold\">Umhla neXesha</span>"
-
-#~ msgid "Free/Busy Editor"
-#~ msgstr "Umhleli Ofumanekayo/Oxakekileyo"
-
-#~ msgid "Print Setup"
-#~ msgstr "Ukumisela Inkqubo Yokushicilela"
-
-#~ msgid "Signing is not supported by this cipher"
-#~ msgstr ""
-#~ "Ukusayina akuxhaswanga sisixokelelwano esenza i-data ifundwe ngokuyivula "
-#~ "ngesitshixo"
-
-#~ msgid "Signing message"
-#~ msgstr "Ukusayina umyalezo"
-
-#~ msgid "Verifying is not supported by this cipher"
-#~ msgstr ""
-#~ "Ukuqinisekisa akuxhaswanga sisixokelelwano esenza i-data ifundwe "
-#~ "ngokuyivula ngesitshixo"
-
-#~ msgid "Verifying message"
-#~ msgstr "Ukuqinisekisa umyalezo"
-
-#~ msgid "Encryption is not supported by this cipher"
-#~ msgstr ""
-#~ "Ukukhowuda i-data akuxhaswanga sisixokelelwano esenza i-data ifundwe "
-#~ "ngokuyivula ngesitshixo"
-
-#~ msgid "Encrypting message"
-#~ msgstr "Ukukhowuda umyalezo"
-
-#~ msgid "Decryption is not supported by this cipher"
-#~ msgstr ""
-#~ "Ukususa ikhowudi akuxhaswanga sisixokelelwano esenza i-data ifundwe "
-#~ "ngokuyivula ngesitshixo"
-
-#~ msgid "Decrypting message"
-#~ msgstr "Ukususa ikhowudi kumyalezo"
-
-#~ msgid "You may not import keys with this cipher"
-#~ msgstr ""
-#~ "Akungengenisi ngesitshixo ngesixokelelwano esenza i-data ifundwe "
-#~ "ngokuyivula ngesitshixo"
-
-#~ msgid "You may not export keys with this cipher"
-#~ msgstr ""
-#~ "Akunako ukususa ulwazi kwenye inkqubo uluse kwenye usebenzisa "
-#~ "isixokelelwano esenza i-data ifundwe ngokuyivula ngesitshixo"
-
-#~ msgid "Unable to create cache path"
-#~ msgstr ""
-#~ "Ayinako ukwenza indlela kwinxalenye egcina iikopi ze-data ezisetyenziswa "
-#~ "xa kufakwa inkqubo"
-
-#~ msgid "Could not remove cache entry: %s: %s"
-#~ msgstr "Asikwazanga ukususa inxalenye yokukhowuda i-data: %s: %s"
-
-#~ msgid ""
-#~ "Could not write log entry: %s\n"
-#~ "Further operations on this server will not be replayed when you\n"
-#~ "reconnect to the network."
-#~ msgstr ""
-#~ "Ayikwazanga ukubhala ingeniso ye-log: %s\n"
-#~ "Ezinye izenzo kule seva azinakudlalwa kwakhona ngelixa u\n"
-#~ "enxulumana nothungelwano."
-
-#~ msgid ""
-#~ "Could not open `%s':\n"
-#~ "%s\n"
-#~ "Changes made to this folder will not be resynchronized."
-#~ msgstr ""
-#~ "Ayikwazanga ukuvula `%s':\n"
-#~ "%s\n"
-#~ "Iinguqu ezenziwe kwesi siqulathi seefayili azinakukhowudwa kwakhona."
-
-#~ msgid "Resynchronizing with server"
-#~ msgstr "Kuphindwa okwenziwe ngaxeshanye neseva"
-
-#~ msgid "Copy folder content locally for offline operation"
-#~ msgstr ""
-#~ "Kopa okuqulathwe kwisiqulathi fayili ukuze ukusebenzise xa ikhompyutha "
-#~ "ziphumile kwi-intanethi"
-
-#~ msgid "Downloading new messages for offline mode"
-#~ msgstr ""
-#~ "Ukukhuphela ulwazi lwemiyalezo emitsha ukuze lusetyenziswa ngaphandle kwe-"
-#~ "intanethi"
-
-#~ msgid "Preparing folder '%s' for offline"
-#~ msgstr ""
-#~ "Ukulungisa isiqulathi seefayili '%s' usilungiselela xa ungekho kwi-"
-#~ "intanethi"
-
-#~ msgid "You must be working online to complete this operation"
-#~ msgstr ""
-#~ "Kufuneka ube usebenza kwi-intanethi ukuze ukwazi ukugqibezela lo msebenzi"
-
-#~ msgid "Failed to create pipe to '%s': %s"
-#~ msgstr "Ayiphumelelanga ukwenza umbhobho we-'%s': %s"
-
-#~ msgid "Failed to create child process '%s': %s"
-#~ msgstr "Ayiphumelelanga ukwenza inkqubo yomntwana '%s': %s"
-
-#~ msgid "Invalid message stream received from %s: %s"
-#~ msgstr "Uludwe lomyalezo ophuthileyo uvela ku-%s: %s"
-
-#~ msgid "Syncing folders"
-#~ msgstr "Iziqulathi zeefayili ezenziwe ngaxeshanye"
-
-#~ msgid "Error parsing filter: %s: %s"
-#~ msgstr "Impazamo kwisihluzi sokwahlula ngezijungqu: %s: %s"
-
-#~ msgid "Error executing filter: %s: %s"
-#~ msgstr "Impazamo ekuphumezeni isihluzi: %s: %s"
-
-#~ msgid "Unable to open spool folder"
-#~ msgstr "Ayinako ukuvula ibhobhini yesiqulathi seefayili"
-
-#~ msgid "Unable to process spool folder"
-#~ msgstr "Ayinako ukulungisa ibhobhini yesiqulathi seefayili"
-
-#~ msgid "Getting message %d (%d%%)"
-#~ msgstr "Ukufumana Umyalezo %d (%d%%)"
-
-#~ msgid "Cannot open message"
-#~ msgstr "Ayikwazanga ukuvula umyalezo"
-
-#~ msgid "Failed on message %d"
-#~ msgstr "Ayiphumelelanga kulo myalezo %d"
-
-#~ msgid "Syncing folder"
-#~ msgstr "Isiqulathi seefayili esenziwe ngaxeshanye"
-
-#~ msgid "Getting message %d of %d"
-#~ msgstr "Ukufumana umyalezo %d of %d"
-
-#~ msgid "Failed at message %d of %d"
-#~ msgstr "Ayiphumelelanga kumyalezo %d of %d"
-
-#~ msgid "Failed to retrieve message"
-#~ msgstr "Ayiphumelelanga ukuwufumana kwakhona umyalezo"
-
-#~ msgid "Invalid arguments to (system-flag)"
-#~ msgstr "Iimpikiswano ezingasebenziyo kwi (sixokelelwano-flegi)"
-
-#~ msgid "Invalid arguments to (user-tag)"
-#~ msgstr "Iimpikiswano ezingasebenziyo ziya (kwisiphawuli-somsebenzisi)"
-
-#~ msgid "Failed to create create child process '%s': %s"
-#~ msgstr "Ayiphumelelanga ukwenza inkqubo yomntwana '%s': %s"
-
-#~ msgid "Error executing filter search: %s: %s"
-#~ msgstr "Impazamo xa kuphunyezwa ukufuna ngesihluzi: %s: %s"
-
-#~ msgid "Unsupported operation: append message: for %s"
-#~ msgstr "Umsebenzi ongaxhaswanga: ukongeza umyalezo: we-%s"
-
-#~ msgid "Unsupported operation: search by expression: for %s"
-#~ msgstr "Umsebenzi ongaxhaswanga: ukufuna ngefomula: usenzela i-%s"
-
-#~ msgid "Unsupported operation: search by uids: for %s"
-#~ msgstr "Umsebenzi ongaxhaswanga: ukufuna nge-uids: usenzela i-%s"
-
-#~ msgid "Moving messages"
-#~ msgstr "Shenxisa imiyalezo"
-
-#~ msgid "Copying messages"
-#~ msgstr "Ukukopa imiyalezo"
-
-#~ msgid "Learning junk"
-#~ msgstr "Ukufunda ulwazi olungenamsebenzi"
-
-#~ msgid "Learning non-junk"
-#~ msgstr "Ukufunda ulwazi olusebenzayo"
-
-#~ msgid "Filtering new message(s)"
-#~ msgstr "Ukuhluza u(imi)yalezo emitsha"
-
-#~ msgid ""
-#~ "Cannot parse search expression: %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ayikwazanga ukwahlula ukukhangela intetho ngokwezijungqu: %s\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Error executing search expression: %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kwenzeke impazamo ngelixa kukhangelwa intethol: %s:\n"
-#~ "%s"
-
-#~ msgid "(match-all) requires a single bool result"
-#~ msgstr "(yelelisa-konke) ifuna iziphumo ze-bool enye"
-
-#~ msgid "(match-threads) not allowed inside match-all"
-#~ msgstr "(yelelisa-imicu) ayivumelekanga phakathi kokuyelelisa-konke"
-
-#~ msgid "(match-threads) requires a match type string"
-#~ msgstr "(yelelisa-imicu) ifuna uhlobo lomcu oluyeleleyo"
-
-#~ msgid "(match-threads) expects an array result"
-#~ msgstr "(yelelisa-imicu) ilindele uludwe lweziphumo"
-
-#~ msgid "(match-threads) requires the folder set"
-#~ msgstr "(yelelisa-imicu) ifuna ummiselo wesiqulathi seefayili"
-
-#~ msgid "Performing query on unknown header: %s"
-#~ msgstr "Ibuza imibuzo kwintloko engaziwayo: %s"
-
-#~ msgid ""
-#~ "Unexpected GnuPG status message encountered:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kufumaneke ubume bomyalezo we-GnuPG obungalindelekanga:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Failed to parse gpg userid hint."
-#~ msgstr "Ayiphumelelanga ukwahlula icebiso le-gpg userid ngezijungqu."
-
-#~ msgid "Failed to parse gpg passphrase request."
-#~ msgstr ""
-#~ "Ayiphumelelanga ukwahlula isicelo se-gpg sebinzana lokudlula ngezijungqu."
-
-#~ msgid ""
-#~ "You need a passphrase to unlock the key for\n"
-#~ "user: \"%s\""
-#~ msgstr ""
-#~ "Ufuna ibinzana lokudlula ukuvula isitshixo se-\n"
-#~ "umsebenzisi: \"%s\""
-
-#~ msgid "Failed to unlock secret key: 3 bad passphrases given."
-#~ msgstr ""
-#~ "Ayiphumelelanga ukuvula isitshixo esilihlebo: Ilinikwe ka-3 ibinzana "
-#~ "lokudlula elingalunganga."
-
-#~ msgid "Unexpected response from GnuPG: %s"
-#~ msgstr "Impendulo engalindelekanga evela kwi-GnuPG: %s"
-
-#~ msgid "Failed to encrypt: No valid recipients specified."
-#~ msgstr ""
-#~ "Ayiphumelelanga ukuguqula isiqendu sikhowudwe: Umamkeli uchaziweyo "
-#~ "akaqinisekiswanga."
-
-#~ msgid ""
-#~ "Failed to GPG %s: %s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ayiphumelelanga uku-GPG %s: %s\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Failed to GPG %s: %s\n"
-#~ msgstr "Ayiphumelelanga uku-GPG %s: %s\n"
-
-#~ msgid "Could not generate signing data: %s"
-#~ msgstr "Ayikwazanga ukwenza i-data yokusayina: %s"
-
-#~ msgid "Failed to execute gpg: %s"
-#~ msgstr "Ayiphumelelanga ukuphumeza i-gpg: %s"
-
-#~ msgid "Failed to execute gpg."
-#~ msgstr "Ayiphumelelanga ukuphumeza i-gpg."
-
-#~ msgid "This is a digitally signed message part"
-#~ msgstr "Le yinxalenye yomyalezo ngokwemivo"
-
-#~ msgid "Cannot verify message signature: Incorrect message format"
-#~ msgstr ""
-#~ "Ayikwazanga ukuqinisekisa usayino lomyalezo: Ukulungiselela umyalezo "
-#~ "akuchanekanga"
-
-#~ msgid "Cannot verify message signature: could not create temp file: %s"
-#~ msgstr ""
-#~ "Ayikwazanga ukuqinisekisa usayino lomyalezo: ayikwazanga ukwenza ifayili "
-#~ "yethutyana: %s"
-
-#~ msgid "Could not generate encrypting data: %s"
-#~ msgstr "Ayikwazanga ukwenza i-data ekhowudiweyo: %s"
-
-#~ msgid "This is a digitally encrypted message part"
-#~ msgstr "Le yinxalenye yomyalezo okhowudwe ngokwemivo"
-
-#~ msgid "Failed to decrypt MIME part: protocol error"
-#~ msgstr ""
-#~ "Ayiphumelelanga ukubuyisela inxalenye ye-MIME: kwenzeke impazamo "
-#~ "kwimithehto yokusebenza"
-
-#~ msgid "Encrypted content"
-#~ msgstr "Isiqulatho esikhowudiweyo"
-
-#~ msgid "Could not create lock file for %s: %s"
-#~ msgstr "Ayikwazanga ukwenza ifayili etshixwayo ye-%s: %s"
-
-#~ msgid "Timed out trying to get lock file on %s. Try again later."
-#~ msgstr ""
-#~ "Iphelelwe lixesha isazama ukungenisa ifayili etshixwayo kwi-%s. Zama "
-#~ "kwakhona ethubeni."
-
-#~ msgid "Failed to get lock using fcntl(2): %s"
-#~ msgstr "Ayiphumelelanga ukufumana isitshixo isebenzisa i-fcntl(2): %s"
-
-#~ msgid "Failed to get lock using flock(2): %s"
-#~ msgstr "Ayiphumelelanga ukufumana isitshixo isebenzisa i-flock(2): %s"
-
-#~ msgid "Cannot build locking helper pipe: %s"
-#~ msgstr "Ayikwazi ukwakha umbhobho wokuncedisa xa kutshixwayo: %s"
-
-#~ msgid "Cannot fork locking helper: %s"
-#~ msgstr ""
-#~ "Ayikwazi ukwenza uvimba okhethekileyo weefayili isincedisi sokutshixa: %s"
-
-#~ msgid "Could not lock '%s': protocol error with lock-helper"
-#~ msgstr ""
-#~ "Ayikwazanga ukutshixa '%s': impazamo kwimithetho yokusebenza nge-lock-"
-#~ "helper"
-
-#~ msgid "Could not lock '%s'"
-#~ msgstr "Ayikwazanga ukutshixa '%s'"
-
-#~ msgid "Could not check mail file %s: %s"
-#~ msgstr "Ayikwazanga ukukhangela ifayili ye-imeyili %s: %s"
-
-#~ msgid "Could not open mail file %s: %s"
-#~ msgstr "Ayikwazanga ukuvula ifayili ye-imeyili %s: %s"
-
-#~ msgid "Could not open temporary mail file %s: %s"
-#~ msgstr "Ayikwazanga ukuvula ifayili ye-imeyili yexeshana %s: %s"
-
-#~ msgid "Failed to store mail in temp file %s: %s"
-#~ msgstr "Ayikwazanga ukugcina ifayili ye-imeyili yethutyana %s: %s"
-
-#~ msgid "Could not create pipe: %s"
-#~ msgstr "Ayikwazanga ukwenza umbhobho: %s"
-
-#~ msgid "Could not fork: %s"
-#~ msgstr "Ayikwazanga ukwenza uvimba okhethekileyo weefayili zeenkqubo: %s"
-
-#~ msgid "Movemail program failed: %s"
-#~ msgstr "Inkqubo yokushenxisa i-imeyili ayiphumelelanga: %s"
-
-#~ msgid "(Unknown error)"
-#~ msgstr "(Impazamo engaziwayo)"
-
-#~ msgid "Error reading mail file: %s"
-#~ msgstr "Impazamo ekufundweni kwefayili ye-imeyili: %s"
-
-#~ msgid "Error writing mail temp file: %s"
-#~ msgstr "Impazamo ekubhalweni kwe-imeyili yexeshana: %s"
-
-#~ msgid "Error copying mail temp file: %s"
-#~ msgstr "Impazamo ekukopeni ifayili ye-imeyili yexeshana: %s"
-
-#~ msgid "parse error"
-#~ msgstr "impazamo ekwahluleni ngezijungqu"
-
-#~ msgid "cannot create thread"
-#~ msgstr "ayikwazanga ukwenza inkqubo enamacandelo amancinane azimeleyo"
-
-#~ msgid "Resolving: %s"
-#~ msgstr "Ukusombulula: %s"
-
-#~ msgid "Host lookup failed"
-#~ msgstr "Ukukhangela umququzeleli akuphumelelanga"
-
-#~ msgid "Host lookup failed: %s: %s"
-#~ msgstr "Ukukhangela umququzeleli akuphumelelanga: %s: %s"
-
-#~ msgid "Resolving address"
-#~ msgstr "Ukusombulula idilesi"
-
-#~ msgid "Name lookup failed"
-#~ msgstr "Igama olikhangelayo aliphumelelanga"
-
-#~ msgid "Name lookup failed: %s"
-#~ msgstr "Igama olikhangelayo aliphumelelanga: %s"
-
-#~ msgid "Virtual folder email provider"
-#~ msgstr ""
-#~ "Isinikezeli sesiqulathi seefayili ze-imeyili esisebenza ngokwahlukileyo"
-
-#~ msgid "For reading mail as a query of another set of folders"
-#~ msgstr ""
-#~ "Yeyokufunda i-imeyili njengombuzo kwenye isethi yeziqulathi zeefayili"
-
-#~ msgid "Could not load %s: Module loading not supported on this system."
-#~ msgstr ""
-#~ "Ayikwazanga ukufaka %s: Imodyuli yokufaka ayixhaswanga kwesi "
-#~ "sixokelelwano."
-
-#~ msgid "Could not load %s: %s"
-#~ msgstr "Ayikwazanga ukufaka %s: %s"
-
-#~ msgid "Could not load %s: No initialization code in module."
-#~ msgstr "Ayikwazanga ukufaka %s: Ayikho ikhowudi yokuyiqalisa kule modyuli."
-
-#~ msgid "No provider available for protocol `%s'"
-#~ msgstr "Akukho sinikezeli sifumanekayo kwisivumelwano sangaphambili `%s'"
-
-#~ msgid "Anonymous"
-#~ msgstr "Engenagama"
-
-#~ msgid "This option will connect to the server using an anonymous login."
-#~ msgstr ""
-#~ "Olu khetho luza kunxulumana neseva lusebenzisa ukungena okungaziwayo."
-
-#~ msgid "Authentication failed."
-#~ msgstr "Akuphumelelanga ukuqinisekisa ubungqina."
-
-#~ msgid ""
-#~ "Invalid email address trace information:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ulwazi lokukhangela lufumanise ukuba ayisebenzi le dilesi:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Invalid opaque trace information:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ukuphutha kokulandela umzila wolwazi olungavisiswayo:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Invalid trace information:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ukulandela umzila wolwazi akusebenzi:\n"
-#~ "%s"
-
-#~ msgid "CRAM-MD5"
-#~ msgstr "i-CRAM-MD5"
-
-#~ msgid ""
-#~ "This option will connect to the server using a secure CRAM-MD5 password, "
-#~ "if the server supports it."
-#~ msgstr ""
-#~ "Olu khetho luza kunxulumanisa kwiseva kusebenzisa i-password "
-#~ "ekhuselekileyo ye-CRAM-MD5, ukuba loo seva iyalixhasa."
-
-#~ msgid "DIGEST-MD5"
-#~ msgstr "i-DIGEST-MD5"
-
-#~ msgid ""
-#~ "This option will connect to the server using a secure DIGEST-MD5 "
-#~ "password, if the server supports it."
-#~ msgstr ""
-#~ "Olu khetho luza kunxulumanisa kwiseva kusebenzisa i-password "
-#~ "ekhuselekileyo ye-DIGEST-MD5, ukuba loo seva iyalixhasa."
-
-#~ msgid "Server challenge too long (>2048 octets)\n"
-#~ msgstr "Umceli mngeni kwiseva ende kakhulu (>2048 octets)\n"
-
-#~ msgid "Server challenge invalid\n"
-#~ msgstr "Umceli mngeni kwiseva engasebenziyo\n"
-
-#~ msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-#~ msgstr ""
-#~ "Umceli mngeni kwiseva uqulethe okuphuthileyo \"Ubulunga nokhuseleko\" "
-#~ "umqondiso\n"
-
-#~ msgid "Server response did not contain authorization data\n"
-#~ msgstr "Impendulo yeseva ayiqulathanga bungqina be-data\n"
-
-#~ msgid "Server response contained incomplete authorization data\n"
-#~ msgstr "Impendulo yeseva iqulathe ubungqina obungaphelelanga be-data\n"
-
-#~ msgid "Server response does not match\n"
-#~ msgstr "Impendulo yeseva ayihambelani ne\n"
-
-#~ msgid "GSSAPI"
-#~ msgstr "i-GSSAPI"
-
-#~ msgid ""
-#~ "This option will connect to the server using Kerberos 5 authentication."
-#~ msgstr ""
-#~ "Olu khetho luza kunxulumana neseva lusebenzisa i-Kerberos 5 yobungqina."
-
-#~ msgid ""
-#~ "The specified mechanism is not supported by the provided credential, or "
-#~ "is unrecognized by the implementation."
-#~ msgstr ""
-#~ "Le ndlela ichaziweyo ayixhaswa ngabaqinisekisi abanikiweyo, okanye "
-#~ "ayaziwa ngabazalisekisi."
-
-#~ msgid "The provided target_name parameter was ill-formed."
-#~ msgstr "Umda onikiweyo we-target_name awakhiwanga kakuhle."
-
-#~ msgid ""
-#~ "The provided target_name parameter contained an invalid or unsupported "
-#~ "type of name."
-#~ msgstr ""
-#~ "Umda onikiweyo we-target_name uqulethe uhlobo lwegama olungasebenziyo "
-#~ "okanye olungaxhaswanga."
-
-#~ msgid ""
-#~ "The input_token contains different channel bindings to those specified "
-#~ "via the input_chan_bindings parameter."
-#~ msgstr ""
-#~ "Le input_token iqulethe eyahlukahlukeneyo imidibaniso yejelo kunaleyo "
-#~ "ichazwe ngokudlula kumda wee-input_chan_bindings."
-
-#~ msgid ""
-#~ "The input_token contains an invalid signature, or a signature that could "
-#~ "not be verified."
-#~ msgstr ""
-#~ "Le input_token iqulethe usayino olungasebenziyo, okanye usayino "
-#~ "olungenakuqinisekiswa."
-
-#~ msgid ""
-#~ "The supplied credentials were not valid for context initiation, or the "
-#~ "credential handle did not reference any credentials."
-#~ msgstr ""
-#~ "Iziqinisekiso ezinikeziweyo azikulungelanga ukuqalisa okuqulethweyo, "
-#~ "okanye okunokwenziwa sisiqinisekizo akubonisanga naziphi na iziqinisekiso."
-
-#~ msgid "The supplied context handle did not refer to a valid context."
-#~ msgstr ""
-#~ "Okunokwenziwa sisiqulatho esinikiweyo akubhekisi kwisiqulatho "
-#~ "esilungileyo."
-
-#~ msgid "The consistency checks performed on the input_token failed."
-#~ msgstr ""
-#~ "Ukukhangela ukungaguquguquki okwenziwe kwi-input_token akuphumelelanga."
-
-#~ msgid "The consistency checks performed on the credential failed."
-#~ msgstr ""
-#~ "Ukukhangela ukungaguquguquki okwenziwe kwiziqinisekiso akuphumelelanga."
-
-#~ msgid "The referenced credentials have expired."
-#~ msgstr "Iziqinisekiso ekubhekiswe kuzo sele ziphelelwe lixesha."
-
-#~ msgid "Bad authentication response from server."
-#~ msgstr ""
-#~ "Impendulo ebonisa ukungalundi kobungqina bobunyaniso obuvela kwiseva."
-
-#~ msgid "Unsupported security layer."
-#~ msgstr "Ukungaxhaswa komgangatho wokhuseleko."
-
-#~ msgid "Kerberos 4"
-#~ msgstr "i-Kerberos 4"
-
-#~ msgid ""
-#~ "This option will connect to the server using Kerberos 4 authentication."
-#~ msgstr ""
-#~ "Olu khetho alunxulumaniswanga kwiseva kusetyenziswa i-Kerberos 4 "
-#~ "ukufumanisa ubungqina bobunyani."
-
-#~ msgid ""
-#~ "Could not get Kerberos ticket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ayilifumananga itikiti le-Kerberos:\n"
-#~ "%s"
-
-#~ msgid "Login"
-#~ msgstr "Ngena"
-
-#~ msgid "This option will connect to the server using a simple password."
-#~ msgstr "Olu khetho luza kungena kwiseva lusebenzisa i-password elula."
-
-#~ msgid "Unknown authentication state."
-#~ msgstr "Abaziwa ubume bobungqina bobunyani."
-
-#~ msgid "NTLM / SPA"
-#~ msgstr "i-NTLM / SPA"
-
-#~ msgid ""
-#~ "This option will connect to a Windows-based server using NTLM / Secure "
-#~ "Password Authentication."
-#~ msgstr ""
-#~ "Olu khetho luza kunxulumanisa kwiseva esekelwe kwi-Windows lusebenzisa i-"
-#~ "NTLM / Igama eliyimfihlo Elikhuselekileyo Lokungqina ubunyani."
-
-#~ msgid "PLAIN"
-#~ msgstr "i-PLAIN"
-
-#~ msgid "POP before SMTP"
-#~ msgstr "i-POP phambi kwe-SMTP"
-
-#~ msgid "This option will authorise a POP connection before attempting SMTP"
-#~ msgstr ""
-#~ "Olu khetho luza kugunyazisa unxulumano lwe-POP phambi kokuzama i-SMTP"
-
-#~ msgid "POP Source URI"
-#~ msgstr "Umthombo i-POP we-URI"
-
-#~ msgid "POP Before SMTP auth using an unknown transport"
-#~ msgstr ""
-#~ "i-POP Phambi kwesigunyaziso se- SMTP kusetyenziswa isithuthi esingaziwayo"
-
-#~ msgid "POP Before SMTP auth using a non-pop source"
-#~ msgstr ""
-#~ "i-POP Phambi kwewesigunyaziso se-SMTP kusetyenziswa umthombo ongaziveziyo"
-
-#~ msgid "Regular expression compilation failed: %s: %s"
-#~ msgstr "Ukwenziwa komboniso oqhelekileyo akuphumelelanga: %s: %s"
-
-#~ msgid "URL '%s' needs a username component"
-#~ msgstr "i-URL '%s' ifuna icandelo legama lomsebenzisi"
-
-#~ msgid "URL '%s' needs a host component"
-#~ msgstr "i-URL '%s' ifuna icandelo lomququzeleli"
-
-#~ msgid "URL '%s' needs a path component"
-#~ msgstr "i-URL '%s' ifuna icandelo lendlela"
-
-#~ msgid ""
-#~ "Could not create directory %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ayikwazanga ukwenza uvimba wefayili %s:\n"
-#~ "%s"
-
-#~ msgid "Cannot find certificate for '%s'"
-#~ msgstr "Asifumaneki isatifikethi se-'%s'"
-
-#~ msgid "Cannot create CMS message"
-#~ msgstr "Ayikwazi ukwenza umyalezo we-CMS"
-
-#~ msgid "Cannot create CMS signed data"
-#~ msgstr "Ayikwazi ukwenza i-data ye-CMS esayiniweyo"
-
-#~ msgid "Cannot attach CMS signed data"
-#~ msgstr "Ayikwazi ukuqhoboshela i-data ye-CMS esayiniweyo"
-
-#~ msgid "Cannot attach CMS data"
-#~ msgstr "Ayikwazi ukwenza i-data ye-CMS"
-
-#~ msgid "Cannot create CMS Signer information"
-#~ msgstr "Ayikwazi ukwenza ulwazi loMsayini we-CMS"
-
-#~ msgid "Cannot find certificate chain"
-#~ msgstr "Ayiyifumananga imiyalelo yesatifikethi"
-
-#~ msgid "Cannot add CMS Signing time"
-#~ msgstr "Ayinakongeza ixesha lokusayina le-CMS"
-
-#~ msgid "Encryption certificate for '%s' does not exist"
-#~ msgstr "Akukho ukukhowuda isatifikethi se-'%s'"
-
-#~ msgid "Cannot add SMIMEEncKeyPrefs attribute"
-#~ msgstr "Ayinako ukongeza uphawu lwe-SMIMEEncKeyPrefs"
-
-#~ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
-#~ msgstr "Ayinako ukongeza uphawu lwe-MS SMIMEEncKeyPrefs"
-
-#~ msgid "Cannot add encryption certificate"
-#~ msgstr "Ayinako ukongeza ukukhowuda isatifikethi"
-
-#~ msgid "Cannot add CMS Signer information"
-#~ msgstr "Ayinako ukongeza ulwazi losayina i-CMS"
-
-#~ msgid "Cannot create encoder context"
-#~ msgstr "Ayinako ukwenza imeko yokukhowuda"
-
-#~ msgid "Failed to add data to CMS encoder"
-#~ msgstr "Ayiphumelelanga ukongeza i-data kwisingenisi khowudi se-CMS"
-
-#~ msgid "Failed to encode data"
-#~ msgstr "Ayiphumelelanga ukukhowuda i-data"
-
-#~ msgid "Unverified"
-#~ msgstr "Ayiqinisekiswanga"
-
-#~ msgid "Good signature"
-#~ msgstr "Usayino olulungileyo"
-
-#~ msgid "Bad signature"
-#~ msgstr "Usayino olungalunganga"
-
-#~ msgid "Content tampered with or altered in transit"
-#~ msgstr "Okuqulethweyo kuphazanyisiwe ne- okanye kuguqulwe kusahanjiswa"
-
-#~ msgid "Signing certificate not found"
-#~ msgstr "Ukusayina isatifikethi akufunyanwanga"
-
-#~ msgid "Signing certificate not trusted"
-#~ msgstr "Ukusayina isatifikethi akuthembekanga"
-
-#~ msgid "Signature algorithm unknown"
-#~ msgstr "Alwaziwa usayino lwemithetho esetyenziswa ukwenza umsebenzi othile"
-
-#~ msgid "Signature algorithm unsupported"
-#~ msgstr ""
-#~ "Aluxhaswanga usayino lwemithetho esetyenziswa ukwenza umsebenzi othile"
-
-#~ msgid "Malformed signature"
-#~ msgstr "Usayino olungemanga kakuhle"
-
-#~ msgid "Processing error"
-#~ msgstr "Impazamo ekulungisweni kwenkqubo"
-
-#~ msgid "No signed data in signature"
-#~ msgstr "Akukho data ityikityiweyo kolu sayino"
-
-#~ msgid "Digests missing from enveloped data"
-#~ msgstr "Akukho zishwankathelo zifutshane kwi-data esemvulophini"
-
-#~ msgid "Cannot calculate digests"
-#~ msgstr "Ayikwazi ukubala izishwankathelo ezifutshane"
-
-#~ msgid "Cannot set message digests"
-#~ msgstr "Ayikwazi ukumisela izishwankathelo ezifutshane zomyalezo"
-
-#~ msgid "Certificate import failed"
-#~ msgstr "Isatifiketi sokungenisa i-data okanye inkqubo asiphumelelanga"
-
-#~ msgid "Certificate is the only message, cannot verify certificates"
-#~ msgstr ""
-#~ "Isatifiketi siso kuphela esingumyalezo, ayikwazi ukuqinisekisa izatifiketi"
-
-#~ msgid "Certificate is the only message, certificates imported and verified"
-#~ msgstr ""
-#~ "Isatifiketi siso kuphela esingumyalezo, izatifikethi zangeniswa zaza "
-#~ "zaqinisekiswa"
-
-#~ msgid "Cannot find signature digests"
-#~ msgstr "Ayikwazi ukufumana usayino lwezishwankathelo ezimfutshane"
-
-#~ msgid "Signer: %s <%s>: %s\n"
-#~ msgstr "Umsayini: %s <%s>: %s\n"
-
-#~ msgid "Decoder failed"
-#~ msgstr "Isixhobo sokukhupha iikhowudi asiphumelelanga"
-
-#~ msgid "Cannot find certificate for `%s'"
-#~ msgstr "Ayikwazi ukufumana isatifiketi se `%s'"
-
-#~ msgid "Cannot find common bulk encryption algorithm"
-#~ msgstr ""
-#~ "Ayikwazi ukufumana imithetho eqhelekileyo echaza ukukhowudwa kwe-data "
-#~ "eninzi"
-
-#~ msgid "Cannot allocate slot for encryption bulk key"
-#~ msgstr "Ayikwazi ukwabela iqhosha lokukhowuda i-data eninzi"
-
-#~ msgid "Cannot create CMS Message"
-#~ msgstr "Ayikwazi ukwenza Umyalezo we-CMS"
-
-#~ msgid "Cannot create CMS Enveloped data"
-#~ msgstr "Ayikwazi ukwenza i-data Esongelweyo ye-CMS"
-
-#~ msgid "Cannot attach CMS Enveloped data"
-#~ msgstr "Ayikwazi ukuqhoboshela i-data Esongelweyo ye-CMS"
-
-#~ msgid "Cannot attach CMS data object"
-#~ msgstr "Ayikwazi ukuqhoboshela i-data yomfanekiso ye-CMS"
-
-#~ msgid "Cannot add CMS Recipient information"
-#~ msgstr "Ayikwazi ukongeza ulwazi Lomamkeli we-CMS"
-
-#~ msgid "Failed to add data to encoder"
-#~ msgstr "Akuphumelelanga ukongeza i-data kwisixhobo sokukhowuda"
-
-#~ msgid "Decoder failed, error %d"
-#~ msgstr "Isixhobo sokukhupha iikhowudi asiphumelelanga, impazamo %d"
-
-#~ msgid "S/MIME Decrypt: No encrypted content found"
-#~ msgstr ""
-#~ "Ukukhupha ikhowudi kwi-S/MIME: Akufunyanwanga siqulatho sikhowudiweyo"
-
-#~ msgid "import keys: unimplemented"
-#~ msgstr "amaqhosha okungenisa: awazalisekiswanga"
-
-#~ msgid "export keys: unimplemented"
-#~ msgstr "amaqhosha okufudusa: awazalisekiswanga"
-
-#~ msgid "Cannot get folder: Invalid operation on this store"
-#~ msgstr ""
-#~ "Ayikwazi ukufumana isiqulathi seefayili: Kukho ukusebenza "
-#~ "okungagunyaziswanga kulo vimba"
-
-#~ msgid "Cannot create folder `%s': folder exists"
-#~ msgstr ""
-#~ "Ayikwazi ukwenza isiqulathi seefayili `%s': esi siqulathi seefayili sele "
-#~ "sikho"
-
-#~ msgid "Cannot create folder: Invalid operation on this store"
-#~ msgstr ""
-#~ "Ayikwazi ukwenza isiqulathi seefayili: Kukho ukusebenza "
-#~ "okungagunyaziswanga kulo vimba"
-
-#~ msgid "Cannot create folder: %s: folder exists"
-#~ msgstr ""
-#~ "Ayikwazi ukwenza isiqulathi seefayili %s: esi siqulathi seefayili sele "
-#~ "sikho"
-
-#~ msgid "Cannot delete folder: %s: Invalid operation"
-#~ msgstr ""
-#~ "Ayikwazi ukwenza isiqulathi seefayili: %s: Ukusebenza akungagunyaziswanga"
-
-#~ msgid "Cannot rename folder: %s: Invalid operation"
-#~ msgstr ""
-#~ "Ayikwazi ukuthiya isiqulathi seefayili ngokutsha: %s: Ukusebenza "
-#~ "akungagunyaziswanga"
-
-#~ msgid "Trash"
-#~ msgstr "Umgqomo"
-
-#~ msgid "Unable to get issuer's certificate"
-#~ msgstr "Ayinakho ukufumana isatifiketi somntu ozikhuphayo"
-
-#~ msgid "Unable to get Certificate Revocation List"
-#~ msgstr "Ayinakho ukufumana Uluhlu Lokurhoxisa Isatifiketi"
-
-#~ msgid "Unable to decrypt certificate signature"
-#~ msgstr "Ayinakho ukuguqula idata yokusayina isatifiketi ekhowudiweyo"
-
-#~ msgid "Unable to decrypt Certificate Revocation List signature"
-#~ msgstr ""
-#~ "Ayinakho ukukhupha ikhowudi yokusayina Uluhlu Lokurhoxisa Isatifiketi"
-
-#~ msgid "Unable to decode issuer's public key"
-#~ msgstr ""
-#~ "Ayinakho ukukhupha ikhowudi kwisitshixo sikawonkewonke somntu okhupha "
-#~ "isatifiketi"
-
-#~ msgid "Certificate signature failure"
-#~ msgstr "Usayino lwesatifiketi aluphumelelanga"
-
-#~ msgid "Certificate Revocation List signature failure"
-#~ msgstr "Ukusayina Uluhlu Olurhoxisa Isatifiketi akuphumelelanga"
-
-#~ msgid "Certificate not yet valid"
-#~ msgstr "Isatifiketi asikagunyaziswa okwangoku"
-
-#~ msgid "Certificate has expired"
-#~ msgstr "Isatifikethi siphelelwe lixesha"
-
-#~ msgid "CRL not yet valid"
-#~ msgstr "I-CRL ayikabi semthethweni okwangoku"
-
-#~ msgid "CRL has expired"
-#~ msgstr "I-CRL iphelelwe lixesha"
-
-#~ msgid "Error in CRL"
-#~ msgstr "Impazamo kwi-CRL"
-
-#~ msgid "Out of memory"
-#~ msgstr "Ukuzala kovimba wolwazi"
-
-#~ msgid "Zero-depth self-signed certificate"
-#~ msgstr "Isatifiketi ozisayinela sona asinabunzulu"
-
-#~ msgid "Self-signed certificate in chain"
-#~ msgstr "Isatifiketi ozisayinela sona kuludwe lwazo"
-
-#~ msgid "Unable to get issuer's certificate locally"
-#~ msgstr "Ayinakho ukufumana isatifiketi ngaphakathi"
-
-#~ msgid "Unable to verify leaf signature"
-#~ msgstr "Ayinakho ukuqinisekisa usayino lwegqabi"
-
-#~ msgid "Certificate chain too long"
-#~ msgstr "Uludwe lwezatifiketi lude kakhulu"
-
-#~ msgid "Certificate Revoked"
-#~ msgstr "Isatifiketi Sirhoxisiwe"
-
-#~ msgid "Invalid Certificate Authority (CA)"
-#~ msgstr "Iziphathi-mandla Zezatifikethi Azigunyaziswanga (CA)"
-
-#~ msgid "Path length exceeded"
-#~ msgstr "Ubude bendlela budluliwe"
-
-#~ msgid "Certificate untrusted"
-#~ msgstr "Isatifiketi asithenjwanga"
-
-#~ msgid "Certificate rejected"
-#~ msgstr "Isatifiketi saliwe"
-
-#~ msgid "Subject/Issuer mismatch"
-#~ msgstr "Ulinganiso olungachanekanga lweSihloko/Lomabi"
-
-#~ msgid "AKID/SKID mismatch"
-#~ msgstr "Ulinganiso olungachanekanga lwe-AKID/I-SKID"
-
-#~ msgid "AKID/Issuer serial mismatch"
-#~ msgstr "Ulinganiso olungachanekanga lolandelwano lwe-AKID/Lomabi"
-
-#~ msgid "Key usage does not support certificate signing"
-#~ msgstr "Ukusetyenziswa okuphambili akuluxhasi ukusayinwa kwesatifiketi"
-
-#~ msgid "Error in application verification"
-#~ msgstr "Impazamo ngelixa kuqinisekiswa inkqubo"
-
-#~ msgid ""
-#~ "Issuer:            %s\n"
-#~ "Subject:           %s\n"
-#~ "Fingerprint:       %s\n"
-#~ "Signature:         %s"
-#~ msgstr ""
-#~ "Osikhuphayo:       %s\n"
-#~ "Isihloko:          %s\n"
-#~ "Uphawu lomnwe:     %s\n"
-#~ "Usayino:           %s"
-
-#~ msgid "GOOD"
-#~ msgstr "KULUNGILE"
-
-#~ msgid "BAD"
-#~ msgstr "AKULUNGANGA"
-
-#~ msgid ""
-#~ "Bad certificate from %s:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Do you wish to accept anyway?"
-#~ msgstr ""
-#~ "Isatifiketi esingalunganga sivela %s:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Unqwenela ukuyivuma nakuba kunjalo?"
-
-#~ msgid ""
-#~ "SSL Certificate check for %s:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Do you wish to accept?"
-#~ msgstr ""
-#~ "Ukukhangela isatifiketi se-SSL %s:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Unqwenela ukuvuma na?"
-
-#~ msgid ""
-#~ "Certificate problem: %s\n"
-#~ "Issuer: %s"
-#~ msgstr ""
-#~ "Ingxaki kwisatifiketi: %s\n"
-#~ "Osikhuphayo: %s"
-
-#~ msgid ""
-#~ "Bad certificate domain: %s\n"
-#~ "Issuer: %s"
-#~ msgstr ""
-#~ "Indawo yesatifiketi engalunganga: %s\n"
-#~ "Osikhuphayo: %s"
-
-#~ msgid ""
-#~ "Certificate expired: %s\n"
-#~ "Issuer: %s"
-#~ msgstr ""
-#~ "Isatifiketi esiphelelwe lixesha: %s\n"
-#~ "Osikhuphayo: %s"
-
-#~ msgid ""
-#~ "Certificate revocation list expired: %s\n"
-#~ "Issuer: %s"
-#~ msgstr ""
-#~ "Uluhlu lokurhixisa isatifiketi luphelelwe lixesha: %s\n"
-#~ "Osikhuphayo: %s"
-
-#~ msgid "Could not parse URL `%s'"
-#~ msgstr "Ayikwazanga ukwahlula i-URL `%s' ngezijungqu"
-
-#~ msgid "Error storing `%s': %s"
-#~ msgstr "Impazamo ekugcineni i-`%s': %s"
-
-#~ msgid "No such message %s in %s"
-#~ msgstr "Akukho myalezo unjalo %s kwi-%s"
-
-#~ msgid "Cannot copy or move messages into a Virtual Folder"
-#~ msgstr ""
-#~ "Ayikwazi ukukopa okanye ukufudusa imiyalezo iyise Kwisiqulathi seefayili "
-#~ "Esingeyonyaniso"
-
-#~ msgid "Cannot delete folder: %s: No such folder"
-#~ msgstr ""
-#~ "Ayikwazi ukucima isiqulathi seefayili: %s: Asikho isiqulathi seefayili "
-#~ "esinjalo"
-
-#~ msgid "Cannot rename folder: %s: No such folder"
-#~ msgstr ""
-#~ "Ayikwazi ukunika elinye igama kwisiqulathi seefayili: %s: Asikho "
-#~ "isiqulathi seefayili esinjalo"
-
-#~ msgid "Cannot copy messages to the Trash folder"
-#~ msgstr "Ayikwazi ukukopa imiyalezo kwisiqulathi seefayili Esingumgqomo"
-
-#~ msgid "Cannot copy messages to the Junk folder"
-#~ msgstr ""
-#~ "Ayikwazi ukukopa imiyalezo iyise kwisiqulathi seefayili "
-#~ "Esinokungasebenziyo"
-
-#~ msgid "Check for new messages in all folders"
-#~ msgstr "Khangela imiyalezo emitsha kuzo zonke iziqulathi zeefayili"
-
-#~ msgid "Apply filters to new messages in Inbox on this server"
-#~ msgstr ""
-#~ "Sebenzisa izihluzi kwimiyalezo emitsha ekwibhokisi lezingenayo kule seva"
-
-#~ msgid "Check new messages for Junk contents"
-#~ msgstr "Khangela imiyalezo emitsha"
-
-#~ msgid "Only check for Junk messages in the INBOX folder"
-#~ msgstr ""
-#~ "Khangela loo miyalezo ingasebenziyo kuphela kwisiqulathi seefayile "
-#~ "SEMIYALEZO ENGENAYO"
-
-#~ msgid "Automatically synchronize account locally"
-#~ msgstr "Ukumisa ixesha ngokuzenzekelayo ngaphakathi"
-
-#~ msgid "Address Book and Calendar"
-#~ msgstr "Incwadi Yedilesi neKhalenda"
-
-#~ msgid "Post Office Agent:"
-#~ msgstr "I-arhente Enguvimba Wemiyalezo:"
-
-#~ msgid "Post Office Agent SOAP Port:"
-#~ msgstr "Isixhobo i-SOAP esiyi-arhente Enguvimba Wemiyalezo:"
-
-#~ msgid "Use Secure Connection (SSL)"
-#~ msgstr "Sebenzisa Unxulumano Olunokhuseleko (I-SSL)"
-
-#~ msgid "Novell GroupWise"
-#~ msgstr "I-Novell GroupWise"
-
-#~ msgid "For accessing Novell Groupwise servers"
-#~ msgstr "Ukufikelela kwiseva ye-Novell GroupWise"
-
-#~ msgid "Password"
-#~ msgstr "I-Password"
-
-#~ msgid ""
-#~ "This option will connect to the IMAP server using a plaintext password."
-#~ msgstr ""
-#~ "Olu khetho luza kunxulumana kwiseva i-IMAP kusetyenziswa igama "
-#~ "eliyimfihlo lombhalo oqhelekileyo."
-
-#~ msgid "Failed sending command to IMAP server %s: %s"
-#~ msgstr "Ayiphumelelanga ukuthumela umyalelo kwiseva i-IMAP %s: %s"
-
-#~ msgid "Unexpected response from IMAP4 server %s: %s"
-#~ msgstr "Impendulo engalindelekanga evela kwiseva i-IMAP4 %s: %s"
-
-#~ msgid "Unexpected greeting from IMAP server %s."
-#~ msgstr "Isibuliso esingalindelekanga esivela kwiseva i-IMAP %s."
-
-#~ msgid "Cannot select folder `%s': Invalid mailbox name"
-#~ msgstr ""
-#~ "Ayikwazi ukuchonga isiqulathi seefayili `%s': Igama lebhokisi ye-imeyili "
-#~ "aligunyaziswanga"
-
-#~ msgid "Cannot select folder `%s': Bad command"
-#~ msgstr "Ayikwazi ukuchonga isiqulathi seefayili `%s': Umyalelo ongalunganga"
-
-#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
-#~ msgstr "Iseva i-IMAP4 %s iphume ngokungalindelekanga: %s"
-
-#~ msgid "Cannot access folder `%s': %s"
-#~ msgstr "Ayikwazi ukufikelela kwisiqulathi seefayili `%s': %s"
-
-#~ msgid "Cannot sync flags to folder `%s': Unknown"
-#~ msgstr ""
-#~ "Ayikwazi ukumisa ixesha lee-flags kwisiqulathi seefayili `%s': Ayaziwa"
-
-#~ msgid "Cannot sync flags to folder `%s': Bad command"
-#~ msgstr ""
-#~ "Ayikwazi ukumisela ii-flags ixesha kwisiqulathi seefayili `%s': Umyalelo "
-#~ "ongalunganga"
-
-#~ msgid "Cannot expunge folder `%s': Unknown"
-#~ msgstr "Ayikwazi ukucima isiqulathi seefayili `%s': Ayaziwa"
-
-#~ msgid "Cannot expunge folder `%s': Bad command"
-#~ msgstr "Ayikwazi ukucima isiqulathi seefayili %s': Umyalelo ongalunganga"
-
-#~ msgid "User cancelled"
-#~ msgstr "Urhoxisiwe umsebenzisi"
-
-#~ msgid "Cannot get message %s: %s"
-#~ msgstr "Ayikwazi ukufumana umyalezo %s: %s"
-
-#~ msgid "Cannot get message %s from folder `%s': No such message"
-#~ msgstr ""
-#~ "Ayikwazi ukufumana umyalezo %s osuka kwisiqulathi seefayili `%s': akukho "
-#~ "myalezo unjalo"
-
-#~ msgid "Cannot get message %s from folder `%s': Bad command"
-#~ msgstr ""
-#~ "Ayikwazi ukufumana umyalezo %s osuka kwisiqulathi seefayili `%s': "
-#~ "Umyalelo ongalunganga"
-
-#~ msgid "Cannot append messages to IMAP folders in offline mode."
-#~ msgstr ""
-#~ "Ayikwazi ukuhlomela imiyalezo kwisiqulathi seefayili i-IMAP xa "
-#~ "ungasebenzi kwi-intanethi."
-
-#~ msgid "Cannot append message to folder `%s': Unknown error"
-#~ msgstr ""
-#~ "Ayikwazi ukuhlomela umyalezo kwisiqulathi seefayili `%s': Impazamo ayaziwa"
-
-#~ msgid "Cannot append message to folder `%s': Bad command"
-#~ msgstr ""
-#~ "Ayikwazi ukuhlomela umyalezo kwisiqulathi seefayili `%s': Umyalelo "
-#~ "ongalunganga"
-
-#~ msgid "Cannot move messages to or from IMAP folders in offline mode."
-#~ msgstr ""
-#~ "Ayikwazi ukushenxisa imiyalezo ukuya nokusuka kwisiqulathi seefayili i-"
-#~ "IMAP xa ungasebenzi kwi-intanethi."
-
-#~ msgid "Cannot copy messages to or from IMAP folders in offline mode."
-#~ msgstr ""
-#~ "Ayikwazi ukukopa imiyalezo ukuya nokusuka kwisiqulathi seefayili i-IMAP "
-#~ "xa ungasebenzi kwi-intanethi."
-
-#~ msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-#~ msgstr ""
-#~ "Ayikwazi ukushenxisa imiyalezo ukusuka kwisiqulathi seefayili `%s' ukuya "
-#~ "kwisiqulathi seefayili `%s': Ayaziwa"
-
-#~ msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-#~ msgstr ""
-#~ "Ayikwazi ukukopa imiyalezo ukusuka kwisiqulathi seefayili `%s' ukuya "
-#~ "kwisiqulathi seefayili `%s': Ayaziwa"
-
-#~ msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-#~ msgstr ""
-#~ "Ayikwazi ukushenxisa imiyalezo ukusuka kwisiqulathi seefayili `%s' ukuya "
-#~ "kwisiqulathi seefayili `%s': Umyalelo awulunganga"
-
-#~ msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-#~ msgstr ""
-#~ "Ayikwazi ukukopa imiyalezo ukusuka kwisiqulathi seefayili `%s' ukuya "
-#~ "kwisiqulathi seefayili `%s': Umyalelo awulunganga"
-
-#~ msgid "Folders"
-#~ msgstr "Iziqulathi zeefayili"
-
-#~ msgid "Show only subscribed folders"
-#~ msgstr "Bonisa iziqulathi zeefayili zabazibopheleleyo kuphela"
-
-#~ msgid "Override server-supplied folder namespace"
-#~ msgstr "Ukungananzi indawo yegama leseva yesiqulathi seefayili"
-
-#~ msgid "Namespace"
-#~ msgstr "Igama lendawo"
-
-#~ msgid "Apply filters to new messages in INBOX on this server"
-#~ msgstr ""
-#~ "Sebenzisa izihluzi kwimiyalezo emitsha ekwiBHOKISI LEZINGENAYO kule seva"
-
-#~ msgid "Automatically synchronize remote mail locally"
-#~ msgstr "Ukubekela i-imeyili yangaphakathi ixesha ngokuzenzekelayo"
-
-#~ msgid "IMAPv4rev1"
-#~ msgstr "IMAPv4rev1"
-
-#~ msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-#~ msgstr "Ukufunda nokugcina i-imeyili kwiseva i-IMAPv4rev1. ISALINGWA!!"
-
-#~ msgid ""
-#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
-#~ "password."
-#~ msgstr ""
-#~ "Olu khetho luza kunxulumaniswa kwiseva ye-IMAPv4rev1 kusetyenziswa igama "
-#~ "eliyimfihlo lombhalo ofundekayo."
-
-#~ msgid "IMAP server %s"
-#~ msgstr "Iseva i-IMAP %s"
-
-#~ msgid "IMAP service for %s on %s"
-#~ msgstr "Inkonzo i-IMAP ye-%s kwi-%s"
-
-#~ msgid "Could not connect to %s: %s"
-#~ msgstr "Ayikwazi ukunxulumanisa kwi-%s: %s"
-
-#~ msgid "SSL unavailable"
-#~ msgstr "Ayifumaneki i-SSL"
-
-#~ msgid "Connection cancelled"
-#~ msgstr "Unxulumano lurhoxisiwe"
-
-#~ msgid "Failed to connect to IMAP server %s in secure mode: %s"
-#~ msgstr ""
-#~ "Ayiphumelelanga ukurhoxisa unxulumano kwiseva ye-IMAP %s kwindlela "
-#~ "ekhuselekileyo: %s"
-
-#~ msgid "SSL negotiations failed"
-#~ msgstr "Uthethwathethwano lwe-SSL aluphumelelanga"
-
-#~ msgid ""
-#~ "Cannot authenticate to IMAP server %s using the %s authentication "
-#~ "mechanism"
-#~ msgstr ""
-#~ "Ayikwazi ukungqina kwiseva ye-IMAP %s isebenzisa indlela %s yokufuman "
-#~ "ubungqina"
-
-#~ msgid "%sPlease enter the IMAP password for %s on host %s"
-#~ msgstr "%sNceda ungenise i-password ye-IMAP ye-%s kumququzeleli %s"
-
-#~ msgid "Cannot authenticate to IMAP server %s using %s"
-#~ msgstr "Ayikwazi ukungqina ubunyaniso beseva ye-IMAP %s isebenzisa i-%s"
-
-#~ msgid "Cannot create IMAP folders in offline mode."
-#~ msgstr ""
-#~ "Ayikwazi ukwenza iziqulathi zeefayili ze-IMAP xa ungasebenzi kwi-"
-#~ "intanethi."
-
-#~ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-#~ msgstr ""
-#~ "Ayikwazi ukufumana isiqulathi seefayili `%s' kwiseva ye-IMAP %s: Ayaziwa"
-
-#~ msgid ""
-#~ "The folder name \"%s\" is invalid because it contains the character \"%c\""
-#~ msgstr ""
-#~ "Igama lesiqulathi seefayili \"%s\" aligunyaziswanga kuba liqulethe uphawu "
-#~ "\"%c\""
-
-#~ msgid "Cannot create folder `%s': Invalid mailbox name"
-#~ msgstr ""
-#~ "Ayikwazi ukwenza isiqulathi seefayili `%s': Igama lebhokisi ye-imeyili "
-#~ "aligunyaziswanga"
-
-#~ msgid "Cannot create folder `%s': Bad command"
-#~ msgstr "Ayikwazi ukwenza isiqulathi seefayili `%s': Umyalelo awulunganga"
-
-#~ msgid "Cannot delete folder `%s': Special folder"
-#~ msgstr ""
-#~ "Ayikwazi ukucima isiqulathi seefayili `%s': Isiqulathi seefayili "
-#~ "esikhethekileyo"
-
-#~ msgid "Cannot delete IMAP folders in offline mode."
-#~ msgstr ""
-#~ "Ayikwazi ukucima isiqulathi seefayili se-IMAP xa ingasebenzi kwi-"
-#~ "intanethi."
-
-#~ msgid "Cannot delete folder `%s': Invalid mailbox name"
-#~ msgstr ""
-#~ "Ayikwazi ukucima isiqulathi seefayili `%s': Igama lebhokisi ye-imeyili "
-#~ "aligunyaziswanga"
-
-#~ msgid "Cannot delete folder `%s': Bad command"
-#~ msgstr "Ayikwazi ukucima isiqulathi seefayili `%s': Umyalelo awulunganga"
-
-#~ msgid "Cannot rename folder `%s' to `%s': Special folder"
-#~ msgstr ""
-#~ "Ayikwazi ukunika isiqulathi seefayili elinye igama `%s' ukuya `%s': "
-#~ "Isiqulathi seefayili esikhethekileyo"
-
-#~ msgid "Cannot rename IMAP folders in offline mode."
-#~ msgstr ""
-#~ "Ayikwazi ukunika isiqulathi seefayili se-IMAP elinye igama xa ingasebenzi "
-#~ "kwi-intanethi."
-
-#~ msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-#~ msgstr ""
-#~ "Ayikwazi ukunika isiqulathi seefayili elinye igama `%s' ukuya `%s': Igama "
-#~ "lebhokisi ye-imeyili aligunyaziswanga"
-
-#~ msgid "Cannot rename folder `%s' to `%s': Bad command"
-#~ msgstr ""
-#~ "Ayikwazi ukunika isiqulathi seefayili elinye igama `%s' ukuya `%s': "
-#~ "Umyalelo ongalunganga"
-
-#~ msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-#~ msgstr ""
-#~ "Ayikwazi ukufumana %s ulwazi lwesakhiwo `%s' esikwiseva i-IMAP %s: %s"
-
-#~ msgid "Bad command"
-#~ msgstr "Umyalelo ongalunganga"
-
-#~ msgid "Cannot subscribe to IMAP folders in offline mode."
-#~ msgstr ""
-#~ "Awukwazi ukuzibophelela kwiziqulathi zeefayili i-IMAP xa ungasebenzi kwi-"
-#~ "intanethi."
-
-#~ msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-#~ msgstr ""
-#~ "Awukwazi ukuzibophelela kwisiqulathi seefayili `%s': Igama lebhokisi ye-"
-#~ "imeyili aligunyaziswanga"
-
-#~ msgid "Cannot subscribe to folder `%s': Bad command"
-#~ msgstr ""
-#~ "Awukwazi ukuzibophelela kwiziqulathi zeefayili `%s': Umyalelo awulunganga"
-
-#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
-#~ msgstr ""
-#~ "Awukwazi ukuzikhupha kwisibophelelo esisuka kwiziqulathi zeefayili ze-"
-#~ "IMAP ungasebenzi kwi-intanethi."
-
-#~ msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-#~ msgstr ""
-#~ "Awukwazi ukuzikhupha kwisibophelelo esisuka kwisiqulathi seefayili `%s': "
-#~ "Igama lebhokisi ye-imeyili aligunyaziswanga"
-
-#~ msgid "Cannot unsubscribe from folder `%s': Bad command"
-#~ msgstr ""
-#~ "Awukwazi ukuzikhupha kwisibophelelo esisuka kwisiqulathi seefayili `%s': "
-#~ "Umyalelo ongalunganga"
-
-#~ msgid "Scanning for changed messages"
-#~ msgstr "Ukuskena imiyalezo eguquliweyo"
-
-#~ msgid "Fetching envelopes for new messages"
-#~ msgstr "Ukuphuthuma iimvulophu zemiyalezo emitsha"
-
-#~ msgid "Unexpected token in response from IMAP server %s: "
-#~ msgstr "Umqondiso ongalindelekanga ukuphendula okuvela kwiseva i-IMAP %s: "
-
-#~ msgid "No data"
-#~ msgstr "Akukho data"
-
-#~ msgid "IMAP server %s unexpectedly disconnected: %s"
-#~ msgstr "Iseva ye- IMAP %s icinywe kungalindelekanga: %s"
-
-#~ msgid "Operation cancelled"
-#~ msgstr "Umsebenzi urhoxisiwe"
-
-#~ msgid "Server unexpectedly disconnected: %s"
-#~ msgstr "Iseva icinywe kungalindelekanga: %s"
-
-#~ msgid ""
-#~ "Alert from IMAP server %s@%s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Isilumkiso esivela kwiseva i-IMAP %s@%s:\n"
-#~ "%s"
-
-#~ msgid "Unexpected response from IMAP server: %s"
-#~ msgstr "Impendulo engalindelekanga evela kwiseva i-IMAP: %s"
-
-#~ msgid "IMAP command failed: %s"
-#~ msgstr "Umyalelo i-IMAP awuphumelelanga: %s"
-
-#~ msgid "Server response ended too soon."
-#~ msgstr "Impendulo yeseva iphele msinyane kakhulu."
-
-#~ msgid "IMAP server response did not contain %s information"
-#~ msgstr "Impendulo yeseva i-IMAP ibingaluqulathanga ulwazi %s"
-
-#~ msgid "Unexpected OK response from IMAP server: %s"
-#~ msgstr "Impendulo engalindelekanga ethi OK ivela kwiseva i-IMAP: %s"
-
-#~ msgid "Could not create directory %s: %s"
-#~ msgstr "Ayikwazanga ukwenza uvimba weefayili %s: %s"
-
-#~ msgid "Could not load summary for %s"
-#~ msgstr "Ayikwazanga ukufaka isishwankathelo se-%s"
-
-#~ msgid "Folder was destroyed and recreated on server."
-#~ msgstr ""
-#~ "Isiqulathi seefayili satshatyalaliswa saza sakhiwa ngokutsha kwiseva."
-
-#~ msgid "Unable to retrieve message: %s"
-#~ msgstr "Ayinakho ukuphinda ifumane lo myalezo: %s"
-
-#~ msgid ""
-#~ "Cannot get message: %s\n"
-#~ "  %s"
-#~ msgstr ""
-#~ "Ayiwufumani umyalezo: %s\n"
-#~ "  %s"
-
-#~ msgid "This message is not currently available"
-#~ msgstr "Lo myalezo awufumaneki ngokwangoku"
-
-#~ msgid "Fetching summary information for new messages"
-#~ msgstr "Isaphuthuma isishwankathelo solwazi lwemiyalezo emitsha"
-
-#~ msgid "Incomplete server response: no information provided for message %d"
-#~ msgstr ""
-#~ "Impendulo yeseva ayiphelelanga: akukho lwazi lunikiweyo ngalo myalezo %d"
-
-#~ msgid "Incomplete server response: no UID provided for message %d"
-#~ msgstr "Impendulo yeseva ayiphelelanga: ayinikwanga i-UID yomyalezo %d"
-
-#~ msgid ""
-#~ "Unexpected server response: Identical UIDs provided for messages %d and %d"
-#~ msgstr ""
-#~ "Le mpendulo yeseva ayilindelekanga: Inike ii-UID zemiyalezo ezifanayo ze-%"
-#~ "d ne-%d"
-
-#~ msgid "Could not find message body in FETCH response."
-#~ msgstr "Ayiwufumananga umzimba womyalezo kwimpendulo ethi FETCH."
-
-#~ msgid "Could not open cache directory: %s"
-#~ msgstr "Ayikwazanga ukuvula uvimba weefayili ofumaneka ngokukhawuleza: %s"
-
-#~ msgid "Failed to cache message %s: %s"
-#~ msgstr "Ayiphumelelanga ukuvula umyalezo ngokukhawuleza %s: %s"
-
-#~ msgid "Failed to cache %s: %s"
-#~ msgstr "Ayiphumelelanga ukuvula umyalezo ngokukhawuleza %s: %s"
-
-#~ msgid "C_heck for new messages in all folders"
-#~ msgstr "Uku_khangela imiyalezo emitsha kuzo zonke iziqulathi zeefayili"
-
-#~ msgid "Connection to Server"
-#~ msgstr "Ukunxulumanisa Kwiseva"
-
-#~ msgid "_Use custom command to connect to server"
-#~ msgstr "_Sebenzisa umyalelo womthengi ukungena kwiseva"
-
-#~ msgid "_Show only subscribed folders"
-#~ msgstr "_Bonisa kuphela ezo ziqulathi zeefayili kuzibophelelwa kuzo"
-
-#~ msgid "O_verride server-supplied folder namespace"
-#~ msgstr "Uku_ngananzi indawo yegama enikwa yiseva yesiqulathi seefayili"
-
-#~ msgid "_Apply filters to new messages in INBOX on this server"
-#~ msgstr ""
-#~ "_Sebenzisa izihluzi kwimiyalezo emitsha ekwiBHOKISI LEZINGENAYO kule seva"
-
-#~ msgid "Check new messages for _Junk contents"
-#~ msgstr "Khangela imiyalezo emitsha ye_ziqulathi Zokungasebenziyo"
-
-#~ msgid "Only check for Junk messa_ges in the INBOX folder"
-#~ msgstr ""
-#~ "Khangela kuphela imiya_lezo Engasebenziyo kwisiqulathi seefayili "
-#~ "seBHOKISI LEZINGENAYO"
-
-#~ msgid "Automatically synchroni_ze remote mail locally"
-#~ msgstr "Ukubeke_la i-imeyili yangaphakathi ixesha ngokuzenzekelayo"
-
-#~ msgid "IMAP"
-#~ msgstr "I-IMAP"
-
-#~ msgid "For reading and storing mail on IMAP servers."
-#~ msgstr "Ukufunda nokugcina i-imeyili kwiseva ye-IMAP."
-
-#~ msgid "STARTTLS not supported"
-#~ msgstr "I-STARTTLS asixhaswanga"
-
-#~ msgid "Could not connect with command \"%s\": %s"
-#~ msgstr "Ayinakho ukunxulumana nomyalelo \"%s\": %s"
-
-#~ msgid "IMAP server %s does not support requested authentication type %s"
-#~ msgstr "Iseva i-IMAP %s ayiluxhasi udidi lobungqina obuceliweyo %s"
-
-#~ msgid "No support for authentication type %s"
-#~ msgstr "Akukho nkxaso yodidi lobungqina %s"
-
-#~ msgid "%sPlease enter the IMAP password for %s@%s"
-#~ msgstr "%sNceda ufake i-password le-IMAP ye-%s@%s"
-
-#~ msgid "You didn't enter a password."
-#~ msgstr "Akulifakanga i-password."
-
-#~ msgid ""
-#~ "Unable to authenticate to IMAP server.\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Ayikwazi ukunika ubungqina kwiseva ye-IMAP.\n"
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid "No such folder %s"
-#~ msgstr "Akukho siqulathi seefayili sinjalo %s"
-
-#~ msgid "The parent folder is not allowed to contain subfolders"
-#~ msgstr ""
-#~ "Isiqulathi seefayili esingumzali asivunyelwanga ukuba singaqulatha "
-#~ "iziqulathi zeefayili zangaphakathi"
-
-#~ msgid "Cannot create folder `%s': folder exists."
-#~ msgstr ""
-#~ "Ayikwazi ukwenza isiqulathi seefayili `%s': isiqulathi seefayili sele "
-#~ "sikho."
-
-#~ msgid "Unknown parent folder: %s"
-#~ msgstr "Isiqulathi seefayili esingumzali asaziwa: %s"
-
-#~ msgid "IMAP+"
-#~ msgstr "IMAP+"
-
-#~ msgid ""
-#~ "Experimental IMAP 4(.1) client\n"
-#~ "This is untested and unsupported code, you want to use plain imap "
-#~ "instead.\n"
-#~ "\n"
-#~ " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-#~ msgstr ""
-#~ "I-IMAP 4(.1) esalingwayi umthengi\n"
-#~ "Le khowudi ayivavanywanga yaye ayixhaswanga, ingaba ufuna ukusebenzisa i-"
-#~ "imap eqhelekileyo.\n"
-#~ "\n"
-#~ " !!! MUSA UKUSEBENZISA OKU UKWENZA I-IMEYILI !!!\n"
-
-#~ msgid "Could not connect to %s (port %s): %s"
-#~ msgstr "Ayinakho ukunxulumana kwi- %s (isiqhagamsheli %s): %s"
-
-#~ msgid "Could not connect to POP server on %s"
-#~ msgstr "Ayinakho ukunxulumana kwiseva i-POP ekwi-%s"
-
-#~ msgid "Index message body data"
-#~ msgstr "Isalathiso se-data yomzimba womyalezo"
-
-#~ msgid "~%s (%s)"
-#~ msgstr "~%s (%s)"
-
-#~ msgid "mailbox:%s (%s)"
-#~ msgstr "ibokhisi ye-imeyili:%s (%s)"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Use the `.folders' folder summary file (exmh)"
-#~ msgstr ""
-#~ "Sebenzisa ii-`.folders' ifayili yesiqulathi seefayili soshwankathelo "
-#~ "(exmh)"
-
-#~ msgid "MH-format mail directories"
-#~ msgstr "Ubume be-MH enguvimba weefayili ze-imeyili"
-
-#~ msgid "For storing local mail in MH-like mail directories."
-#~ msgstr ""
-#~ "Ukugcina i-imeyili yangaphakathi kuvimba weefayili ze-imeyili ofana ne-MH."
-
-#~ msgid "Local delivery"
-#~ msgstr "Ukusabalalisa kwangaphakathi"
-
-#~ msgid ""
-#~ "For retrieving (moving) local mail from standard mbox formated spools "
-#~ "into folders managed by Evolution."
-#~ msgstr ""
-#~ "Ukufumana (ukushenxisa) i-imeyili yangaphakathi uyisusa kwibhobhini ye-"
-#~ "mbox enobume obusemgangathweni uyise kwiziqulathi zeefayili ezilawulwa yi-"
-#~ "Evolution."
-
-#~ msgid "Apply filters to new messages in INBOX"
-#~ msgstr "Sebenzisa izihluzi kwimiyalezo emitsha ekwiBHOKISI LEZINGENAYO"
-
-#~ msgid "Maildir-format mail directories"
-#~ msgstr "Ubume be-Maildir-enguvimba weefayili ze-imeyili"
-
-#~ msgid "For storing local mail in maildir directories."
-#~ msgstr "Yokugcina i-imeyili yangaphakathi kuvimba weefayili ze-imeyili."
-
-#~ msgid "Store status headers in Elm/Pine/Mutt format"
-#~ msgstr "Gcina ubume bokuvela phezulu ephepheni bukubume be-Elm/Pine/Mutt"
-
-#~ msgid "Standard Unix mbox spool or directory"
-#~ msgstr "Ibhobhini okanye uvimba weefayili osemgangathweni we-Unix mbox"
-
-#~ 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."
-#~ msgstr ""
-#~ "Ukufunda nokugcina i-imeyili yangaphakathi kwibhobhini yeefayili ye-mbox "
-#~ "esemgangathweni wangaphandle.\n"
-#~ "Ingasetyenziswa ukufunda umthi we-Elm, Pine, okanye ubume beziqulathi "
-#~ "zeefayili ze-Mutt."
-
-#~ msgid "Store root %s is not an absolute path"
-#~ msgstr "Ingcambu yovimba %s asiyiyo kuphela ndlela"
-
-#~ msgid "Store root %s is not a regular directory"
-#~ msgstr "Ingcambu yovimba %s asingovimba weefayili uqhelekileyo"
-
-#~ msgid "Cannot get folder: %s: %s"
-#~ msgstr "Ayikwazi ukufumana isiqulathi seefayili: %s: %s"
-
-#~ msgid "Local stores do not have an inbox"
-#~ msgstr "Oovimba bangaphakathi abanalo ibhokisi lezingenayo"
-
-#~ msgid "Local mail file %s"
-#~ msgstr "Ifayili ye-imeyili yangaphakathi %s"
-
-#~ msgid "Could not rename folder %s to %s: %s"
-#~ msgstr ""
-#~ "Ayikwazanga ukunika isiqulathi seefayili elinye igama %s ukuya %s: %s"
-
-#~ msgid "Could not rename '%s': %s"
-#~ msgstr "Ayikwazanga ukunika elinye igama '%s': %s"
-
-#~ msgid "Could not delete folder summary file `%s': %s"
-#~ msgstr ""
-#~ "Ayikwazanga ukucima isiqulathi seefayili esiyifayili yoshwankathelo `%s': "
-#~ "%s"
-
-#~ msgid "Could not delete folder index file `%s': %s"
-#~ msgstr ""
-#~ "Ayikwazanga ukucima isiqulathi seefayili esiyifayili yesalathiso`%s': %s"
-
-#~ msgid "Could not delete folder meta file `%s': %s"
-#~ msgstr ""
-#~ "Ayikwazanga ukucima isiqulathi seefayili esiyifayili equlethe ezinye `%"
-#~ "s': %s"
-
-#~ msgid "Could not save summary: %s: %s"
-#~ msgstr "Ayikwazanga ukugcina isishwankathelo: %s: %s"
-
-#~ msgid "Unable to add message to summary: unknown reason"
-#~ msgstr "Ayinakho ukongeza umyalezo kwisishwankathelo: isizathu asaziwa"
-
-#~ msgid "Maildir append message cancelled"
-#~ msgstr "Ukuhlomela umyalezo kuvimba weefayili ongundoqo sirhoxisiwe"
-
-#~ msgid "Cannot append message to maildir folder: %s: %s"
-#~ msgstr ""
-#~ "Ayikwazi ukuhlomela umyalezo kwisiqulathi seefayili esikuvimba weefayili "
-#~ "ongundoqo: %s: %s"
-
-#~ msgid ""
-#~ "Cannot get message: %s from folder %s\n"
-#~ "  %s"
-#~ msgstr ""
-#~ "Ayikwazi ukufumana umyalezo: %s ukusuka kwisiqulathi seefayili %s\n"
-#~ "  %s"
-
-#~ msgid "Invalid message contents"
-#~ msgstr "Isiqulatho semiyalezo asigunyaziswanga"
-
-#~ msgid "Cannot get folder `%s': %s"
-#~ msgstr "Ayikwazi ukufumana isiqulathi seefayili `%s': %s"
-
-#~ msgid "Cannot get folder `%s': folder does not exist."
-#~ msgstr ""
-#~ "Ayikwazi ukufumana isiqulathi seefayili `%s': isiqulathi seefayili asikho."
-
-#~ msgid "Cannot create folder `%s': %s"
-#~ msgstr "Ayikwazi ukwenza isiqulathi seefayili `%s': %s"
-
-#~ msgid "Cannot get folder `%s': not a maildir directory."
-#~ msgstr ""
-#~ "Ayikwazi ukufumana isiqulathi seefayili `%s': asingovimba wefayili i-"
-#~ "maildir."
-
-#~ msgid "Could not delete folder `%s': %s"
-#~ msgstr "Ayikwazanga ukucima isiqulathi seefayili `%s': %s"
-
-#~ msgid "not a maildir directory"
-#~ msgstr "asingovimba weefayili we-maildir"
-
-#~ msgid "Could not scan folder `%s': %s"
-#~ msgstr "Ayikwazanga ukuskena isiqulathi seefayili `%s': %s"
-
-#~ msgid "Cannot open maildir directory path: %s: %s"
-#~ msgstr "Ayikwazi ukuvula indlela yovimba weefayili i-maildir: %s: %s"
-
-#~ msgid "Checking folder consistency"
-#~ msgstr "Ikhangela ukuhambelana kwesiqulathi seefayili"
-
-#~ msgid "Checking for new messages"
-#~ msgstr "Ikhangela imiyalezo emitsha"
-
-#~ msgid "Storing folder"
-#~ msgstr "Isiqulathi seefayili esinguvimba"
-
-#~ msgid "Cannot create folder lock on %s: %s"
-#~ msgstr "Ayikwazi ukwenza isitshixo sesiqulathi seefayili kwi-%s: %s"
-
-#~ msgid "Cannot open mailbox: %s: %s\n"
-#~ msgstr "Ayikwazi ukuvula ibhokisi ye-imeyili: %s: %s\n"
-
-#~ msgid "Mail append cancelled"
-#~ msgstr "Ukuhlomela i-imeyili kurhoxisiwe"
-
-#~ msgid "Cannot append message to mbox file: %s: %s"
-#~ msgstr "Ayikwazi ukuhlomela umyalezo kwifayili i-mbox: %s: %s"
-
-#~ msgid "The folder appears to be irrecoverably corrupted."
-#~ msgstr "Isiqulathi seefayili esibonakala singenakubhangiswa sonakalisiwe."
-
-#~ msgid "Message construction failed."
-#~ msgstr "Akuphumelelanga ukubhala umyalezo."
-
-#~ msgid "Cannot create a folder by this name."
-#~ msgstr "Ayikwazi ukuthiya isiqulathi seefayili ngeli gama."
-
-#~ msgid "Cannot get folder `%s': not a regular file."
-#~ msgstr ""
-#~ "Ayikwazi ukufumana isiqulathi seefayili `%s': asiyofayili iqhelekileyo."
-
-#~ msgid ""
-#~ "Could not delete folder `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ayikwazanga ukucima isiqulathi seefayili `%s':\n"
-#~ "%s"
-
-#~ msgid "`%s' is not a regular file."
-#~ msgstr "I-`%s' asiyofayili iqhelekileyo."
-
-#~ msgid "Folder `%s' is not empty. Not deleted."
-#~ msgstr "Esi siqulathi seefayili `%s' sinento. Ayicinywanga."
-
-#~ msgid "Cannot create directory `%s': %s."
-#~ msgstr "Ayikwazi ukwenza uvimba weefayili `%s': %s."
-
-#~ msgid "Cannot create folder: %s: %s"
-#~ msgstr "Ayikwazi ukwenza isiqulathi seefayili %s: %s"
-
-#~ msgid "Folder already exists"
-#~ msgstr "Esi siqulathi seefayili sele sikho kade"
-
-#~ msgid "The new folder name is illegal."
-#~ msgstr "Eli gama litsha lesi siqulathi seefayile alikho mthethweni."
-
-#~ msgid "Could not rename `%s': `%s': %s"
-#~ msgstr "Ayikwazanga ukuphinda iyinike elinye igama `%s': `%s': %s"
-
-#~ msgid "Could not rename '%s' to %s: %s"
-#~ msgstr "Ayikwazanga ukuphinda iyinike elinye igama '%s' ukuya %s: %s"
-
-#~ msgid "Could not open folder: %s: %s"
-#~ msgstr "Ayikwazanga ukuvula isiqulathi seefayili %s: %s"
-
-#~ msgid "Fatal mail parser error near position %ld in folder %s"
-#~ msgstr ""
-#~ "Impazamo ebulalayo ekwahluleni i-imeyili ngezijungqu kufuphi nendawo %ld "
-#~ "kwisiqulathi seefayili %s"
-
-#~ msgid "Cannot check folder: %s: %s"
-#~ msgstr "Ayikwazanga ukukhangela isiqulathi seefayili: %s: %s"
-
-#~ msgid "Could not open file: %s: %s"
-#~ msgstr "Ayikwazanga ukuvula ifayili: %s: %s"
-
-#~ msgid "Cannot open temporary mailbox: %s"
-#~ msgstr "Ayikwazi ukuvula ibhokisi ye-imeyili yexeshana: %s"
-
-#~ msgid "Could not close source folder %s: %s"
-#~ msgstr "Ayikwazanga ukuvala umthombo wesiqulathi seefayili %s: %s"
-
-#~ msgid "Could not close temp folder: %s"
-#~ msgstr "Ayikwazanga ukuvala isiqulathi seefayili yexeshana: %s"
-
-#~ msgid "Could not rename folder: %s"
-#~ msgstr "Ayikwazanga ukuphinda ithiye igama kwisiqulathi seefayili: %s"
-
-#~ msgid "Summary and folder mismatch, even after a sync"
-#~ msgstr ""
-#~ "Isishwankathelo nesiqulathi seefayili azihambelani, nasemva kokuzimisela "
-#~ "ixesha"
-
-#~ msgid "Unknown error: %s"
-#~ msgstr "Impazamo engaziwayo: %s"
-
-#~ msgid "Could not store folder: %s"
-#~ msgstr "Ayikwazanga ukugcina isiqulathi seefayili: %s"
-
-#~ msgid "Error writing to temp mailbox: %s"
-#~ msgstr "Impazamo ngelixa kubhalwa kwibhokisi ye-imeyili yexeshana: %s"
-
-#~ msgid "Writing to tmp mailbox failed: %s: %s"
-#~ msgstr "Ukubhala kwibhokisi ye-imeyili ye-tmp akuphumelelanga: %s: %s"
-
-#~ msgid "MH append message cancelled"
-#~ msgstr "Ukuhlomela umyalezo kwi-MH kurhoxisiwe"
-
-#~ msgid "Cannot append message to mh folder: %s: %s"
-#~ msgstr "Ayikwazi ukuhlomela umyalezo kwisiqulathi seefayili i-mh: %s: %s"
-
-#~ msgid "Could not create folder `%s': %s"
-#~ msgstr "Ayikwazanga ukwenza isiqulathi seefayili `%s': %s"
-
-#~ msgid "Cannot get folder `%s': not a directory."
-#~ msgstr "Ayikwazi ukufumana `%s': ayingovimba weefayili."
-
-#~ msgid "Cannot open MH directory path: %s: %s"
-#~ msgstr "Ayikwazi ukuvula indlela yovimba weefayili i-MH: %s: %s"
-
-#~ msgid "Spool `%s' cannot be opened: %s"
-#~ msgstr "Ibhobhini `%s' ayivuleki: %s"
-
-#~ msgid "Spool `%s' is not a regular file or directory"
-#~ msgstr "Ibhobhini `%s' ayiyofayili okanye ayingovimba weefayili"
-
-#~ msgid "Folder `%s/%s' does not exist."
-#~ msgstr "Esi siqulathi seefayili `%s/%s' asikho."
-
-#~ msgid ""
-#~ "Could not open folder `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ayikwazanga ukuvula isiqulathi seefayili `%s':\n"
-#~ "%s"
-
-#~ msgid "Folder `%s' does not exist."
-#~ msgstr "Esi siqulathi seefayili `%s' asikho."
-
-#~ msgid ""
-#~ "Could not create folder `%s':\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ayikwazanga ukwenza isiqulathi seefayili `%s':\n"
-#~ "%s"
-
-#~ msgid "`%s' is not a mailbox file."
-#~ msgstr "I-`%s' asiyofayili yebhokisi ye-imeyili."
-
-#~ msgid "Store does not support an INBOX"
-#~ msgstr "Uvimba akayixhasi IBHOKISI YEZINGENAYO"
-
-#~ msgid "Spool mail file %s"
-#~ msgstr "Ifayili yebhobhini ye-imeyili %s"
-
-#~ msgid "Spool folder tree %s"
-#~ msgstr "Umthi webhobhini yesiqulathi seefayili %s"
-
-#~ msgid "Spool folders cannot be renamed"
-#~ msgstr "Ibhobhini yeziqulathi zeefayili ayinakuthiywa ngokutsha"
-
-#~ msgid "Spool folders cannot be deleted"
-#~ msgstr "Ibhobhini yeziqulathi zeefayili ayinakucinywa"
-
-#~ msgid "Could not sync temporary folder %s: %s"
-#~ msgstr "Ayikwazanga ukumisa ixesha kwisiqulathi seefayili sexeshana %s: %s"
-
-#~ msgid "Could not sync spool folder %s: %s"
-#~ msgstr "Ayikwazanga ukumisa ixesha kwibhobhini yesiqulathi seefayili %s: %s"
-
-#~ msgid ""
-#~ "Could not sync spool folder %s: %s\n"
-#~ "Folder may be corrupt, copy saved in `%s'"
-#~ msgstr ""
-#~ "Ayikwazanga ukumisa ixesha lesiqulathi seefayili %s: %s\n"
-#~ "Isiqulathi seefayili sisenokuba sonakele, ikopi igcinwe kwi-`%s'"
-
-#~ msgid "Please enter the NNTP password for %s@%s"
-#~ msgstr "Nceda ufake igama eliyimfihlo le-NNTP ye-%s@%s"
-
-#~ msgid "Server rejected username"
-#~ msgstr "Iseva ayilivumanga igama lalo msebenzisi"
-
-#~ msgid "Failed to send username to server"
-#~ msgstr "Ayiphumelelanga ukuthumela igama lomsebenzisi kwiseva"
-
-#~ msgid "Server rejected username/password"
-#~ msgstr "Iseva ayilivumanga igama lomsebenzisi/i-password"
-
-#~ msgid "Internal error: uid in invalid format: %s"
-#~ msgstr "Impazamo yangaphakathi: ubume be-uid abugunyaziswanga: %s"
-
-#~ msgid "Posting failed: %s"
-#~ msgstr "Ukuposa akuphumelelanga: %s"
-
-#~ msgid "You cannot post NNTP messages while working offline!"
-#~ msgstr "Awunako ukuthumela imiyalezo ye-NNTP ungasebenzi kwi-intanethi!"
-
-#~ msgid "You cannot copy messages from a NNTP folder!"
-#~ msgstr "Awunako ukukopa imiyalezo evela kwisiqulathi seefayili ye-NNTP!"
-
-#~ msgid "Could not get group list from server."
-#~ msgstr "Ayikwazi ukufumana uluhlu lweqela elivela kwiseva."
-
-#~ msgid "Unable to load grouplist file for %s: %s"
-#~ msgstr "Ayikwazanga ukufaka ifayili yoluhlu lweqela le %s: %s"
-
-#~ msgid "Unable to save grouplist file for %s: %s"
-#~ msgstr "Ayikwazanga ukugcina ifayili yoluhlu lweqela le %s: %s"
-
-#~ msgid ""
-#~ "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-#~ msgstr ""
-#~ "Bonisa iziqulathi zeefayili ngokufinyeziweyo (umz. c.o.linux kune- comp."
-#~ "os.linux)"
-
-#~ msgid "In the subscription dialog, show relative folder names"
-#~ msgstr ""
-#~ "Kwiskrini sabazibopheleleyo, bonisa amagama esiqulathi seefayili "
-#~ "esinxulumeneyo"
-
-#~ msgid "USENET news"
-#~ msgstr "Iindaba ze-USENET"
-
-#~ msgid "This is a provider for reading from and posting toUSENET newsgroups."
-#~ msgstr "Lo ngumnikezeli wokufundela nokuposela kwiqela leendaba i-USENET."
-
-#~ msgid ""
-#~ "This option will authenticate with the NNTP server using a plaintext "
-#~ "password."
-#~ msgstr ""
-#~ "Olu khetho luza kungqinwa neseva ye-NNTP kusetyenziswa igama eliyimfihlo "
-#~ "lombhalo ofundekayo."
-
-#~ msgid "Could not read greeting from %s: %s"
-#~ msgstr "Ayikwazanga ukufunda umbuliso kwi-%s: %s"
-
-#~ msgid "NNTP server %s returned error code %d: %s"
-#~ msgstr "Iseva ye-NNTP i- %s iyibuyisile ikhowudi eyimpazamo %d: %s"
-
-#~ msgid "USENET News via %s"
-#~ msgstr "Iindaba ze-USENET ngendlela edlula %s"
-
-#~ msgid ""
-#~ "Error retrieving newsgroups:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Impazamo ekufumaneni iqela leendaba:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "You cannot subscribe to this newsgroup:\n"
-#~ "\n"
-#~ "No such newsgroup. The selected item is a probably a parent folder."
-#~ msgstr ""
-#~ "Awukwazi ukuzibophelela kweli qela leendaba:\n"
-#~ "\n"
-#~ "Akukho qela landaba linjalo. Le nto uyikhethileyo kusenokwenzeka ukuba "
-#~ "sisiqulathi seefayile esingumzali."
-
-#~ msgid ""
-#~ "You cannot unsubscribe to this newsgroup:\n"
-#~ "\n"
-#~ "newsgroup does not exist!"
-#~ msgstr ""
-#~ "Awukwazi ukuzikhupha koku kuzibophelela kweli qela leendaba:\n"
-#~ "\n"
-#~ "Alikho iqela leendaba elinjalo!"
-
-#~ msgid "You cannot create a folder in a News store: subscribe instead."
-#~ msgstr ""
-#~ "Awukwazi ukwenza isiqulathi seefayili kuvimba Weendaba: endaweni yoko "
-#~ "zibophelele."
-
-#~ msgid "You cannot rename a folder in a News store."
-#~ msgstr ""
-#~ "Awukwazi ukunika isiqulathi seefayili elinye igama kulo vimba Weendaba."
-
-#~ msgid "You cannot remove a folder in a News store: unsubscribe instead."
-#~ msgstr ""
-#~ "Awukwazi ukususa uvimba weefayili kuvimba Weendaba: endaweni yoko sula "
-#~ "ekuzibopheleleni."
-
-#~ msgid "Authentication requested but no username provided"
-#~ msgstr "Ubungqina buceliwe kodwa abunikwanga igama lomsebenzisi"
-
-#~ msgid "Cannot authenticate to server: %s"
-#~ msgstr "Ayikwazi ukunika ubungqina kwiseva: %s"
-
-#~ msgid "NNTP Command failed: %s"
-#~ msgstr "Umyalelo i-NNTP awuphumelelanga: %s"
-
-#~ msgid "Not connected."
-#~ msgstr "Awukho kwi-intanethi."
-
-#~ msgid "No such folder: %s"
-#~ msgstr "Akukho siqulathi seefayili sinjalo: %s"
-
-#~ msgid "%s: Scanning new messages"
-#~ msgstr "I-%s: Ukuskena imiyalezo emitsha"
-
-#~ msgid "Unexpected server response from xover: %s"
-#~ msgstr "Impendulo engalindelekanga yeseva ivela kwi-xover: %s"
-
-#~ msgid "Unexpected server response from head: %s"
-#~ msgstr "Impendulo engalindelekanga yeseva ivela kwintloko: %s"
-
-#~ msgid "Use cancel"
-#~ msgstr "Sebenzisa urhoxiso"
-
-#~ msgid "Operation failed: %s"
-#~ msgstr "Isenzo esingaphumelelanga: %s"
-
-#~ msgid "Retrieving POP summary"
-#~ msgstr "Ukuvula isishwankathelo i-POP"
-
-#~ msgid "Cannot get POP summary: %s"
-#~ msgstr "Ayikwazi ukufumana isishwankathelo se-POP: %s"
-
-#~ msgid "Expunging deleted messages"
-#~ msgstr "Ukucima imiyalezo ecinyiweyo"
-
-#~ msgid "No message with uid %s"
-#~ msgstr "Akukho myalezo une- uid %s"
-
-#~ msgid "Retrieving POP message %d"
-#~ msgstr "Ukuvula umyalezo i-POP %d"
-
-#~ msgid "Delete after %s day(s)"
-#~ msgstr "Cima emva kosuku (kweentsuku) %s"
-
-#~ msgid "Disable support for all POP3 extensions"
-#~ msgstr "Vala inkxaso yazo zonke izongezeleli ze-POP3"
-
-#~ msgid "POP"
-#~ msgstr "I-POP"
-
-#~ msgid "For connecting to and downloading mail from POP servers."
-#~ msgstr ""
-#~ "Ukunxulumana kwi-nokukhuphela ulwazi lwe-imeyli oluvela kwiseva i-POP."
-
-#~ msgid ""
-#~ "This option will connect to the POP server using a plaintext password. "
-#~ "This is the only option supported by many POP servers."
-#~ msgstr ""
-#~ "Olu khetho luza kunxulumanisa kwiseva ye-POP usebenzisa igama eliyimfihlo "
-#~ "elifundekayo. Olu khetho lulo kuphela oluxhaswa ziiseva ezininzi ze-POP."
-
-#~ 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 claim to support it."
-#~ msgstr ""
-#~ "Olu khetho luza kunxulumanisa kwiseva i-POP usebenzisa igama eliyimfihlo "
-#~ "elikhowudiweyo lidlula kumthetho wokusebenza we-APOP. Oku "
-#~ "kusenokungasebenzi kuzo zonke iiseva eziphakamisa inkxazo yazo kulo."
-
-#~ msgid "Failed to read a valid greeting from POP server %s"
-#~ msgstr ""
-#~ "Ayiphumelelanga ukufunda isibuliso esisemthethweni esivela kwiseva i-POP %"
-#~ "s"
-
-#~ msgid "Failed to connect to POP server %s in secure mode: %s"
-#~ msgstr ""
-#~ "Ayiphumelelanga ukunxulumana kwiseva ye-POP %s ekwindlela ekhuselekileyo: "
-#~ "%s"
-
-#~ msgid "STLS not supported"
-#~ msgstr "I-STLS ayixhaswanga"
-
-#~ msgid "Could not connect to POP server %s"
-#~ msgstr "Ayikwazanga ukunxulumana kwiseva i-POP %s"
-
-#~ msgid ""
-#~ "Unable to connect to POP server %s: No support for requested "
-#~ "authentication mechanism."
-#~ msgstr ""
-#~ "Ayinakho ukunxulumanisa kwiseva i-POP %s: Akukho nkxaso yesicelo sendlela "
-#~ "yobungqina."
-
-#~ msgid "SASL `%s' Login failed for POP server %s: %s"
-#~ msgstr "I-SASL `%s' Yokungena ayiphumelelanga kwiseva ye-POP %s: %s"
-
-#~ msgid "Cannot login to POP server %s: SASL Protocol error"
-#~ msgstr ""
-#~ "Ayikwazi ukungena kwiseva ye-POP %s: Impazamo kwimithetho yokusebenza ye-"
-#~ "SASL"
-
-#~ msgid "Failed to authenticate on POP server %s: %s"
-#~ msgstr "Ayiphumelelanga ukunika ubungqina kwiseva i-POP %s: %s"
-
-#~ msgid "%sPlease enter the POP password for %s on host %s"
-#~ msgstr "%sNceda faka igama eliyimfihlo le-POP ye-%s kumququzeleli %s"
-
-#~ msgid ""
-#~ "Unable to connect to POP server %s.\n"
-#~ "Error sending password: %s"
-#~ msgstr ""
-#~ "Ayinakho ukunxulumanisa kwiseva ye-POP %s.\n"
-#~ "Impazamo xa kuthunyelwa igama eliyimfihlo: %s"
-
-#~ msgid ""
-#~ "Unable to connect to POP server %s.\n"
-#~ "Error sending username: %s"
-#~ msgstr ""
-#~ "Ayinakho ukunxulumanisa kwiseva ye-POP %s.\n"
-#~ "Impazamo xa kuthunyelwa igama lomsebenzisi: %s"
-
-#~ msgid "No such folder `%s'."
-#~ msgstr "Akukho siqulathi seefayili sinjalo `%s'."
-
-#~ msgid "Sendmail"
-#~ msgstr "I-Sendmail"
-
-#~ msgid ""
-#~ "For delivering mail by passing it to the \"sendmail\" program on the "
-#~ "local system."
-#~ msgstr ""
-#~ "Ngokuhambisa i-imeyili ngokuyidlulisa kwinkqubo i-\"sendmail\" "
-#~ "kwisixokelelwano sangaphakathi."
-
-#~ msgid "Could not parse recipient list"
-#~ msgstr "Ayikwazanga ukwahlula uluhlu lomamkeli ngezijungqu"
-
-#~ msgid "Could not create pipe to sendmail: %s: mail not sent"
-#~ msgstr ""
-#~ "Ayikwazanga ukwenza umbhobho we-sendmail: %s: i-imeyili ayithunyelwanga"
-
-#~ msgid "Could not fork sendmail: %s: mail not sent"
-#~ msgstr "Ayikwazanga ukuphakamisa i-sendmail: %s: i-imeyili ayithunyelwanga"
-
-#~ msgid "Could not send message: %s"
-#~ msgstr "Ayikwazanga ukuthumela umyalezo: %s"
-
-#~ msgid "sendmail exited with signal %s: mail not sent."
-#~ msgstr ""
-#~ "i-sendmail iphume ngaphandle kokubonisa uphawu %s: umyalezo "
-#~ "awuthunyelwanga."
-
-#~ msgid "Could not execute %s: mail not sent."
-#~ msgstr "Ayikwazanga ukuphumeza %s: umyalezo awuthunyelwanga."
-
-#~ msgid "sendmail exited with status %d: mail not sent."
-#~ msgstr "i-sendmail iphume nobume %d: umyalezo awuthunyelwanga."
-
-#~ msgid "sendmail"
-#~ msgstr "i-sendmail"
-
-#~ msgid "Mail delivery via the sendmail program"
-#~ msgstr "Ukuhambisa i-imeyili uyidlulisa kwinkqubo ye-sendmail"
-
-#~ msgid "SMTP"
-#~ msgstr "i-SMTP"
-
-#~ msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-#~ msgstr ""
-#~ "Ukuhambisa i-imeyili ngokunxulumanisa kwi-mailhub ekwenye indawo "
-#~ "kusetyenziswa i-SMTP."
-
-#~ msgid "Syntax error, command unrecognized"
-#~ msgstr ""
-#~ "Impazamo yeengxelo ezingaqondakaliyo ngenxa yokungalandeli imithetho "
-#~ "yokwenza iinkqubo, umyalelo awunakanwa"
-
-#~ msgid "Syntax error in parameters or arguments"
-#~ msgstr ""
-#~ "Impazamo yeengxelo ezingaqondakaliyo ngenxa yokungalandeli imithetho "
-#~ "yokwenza iinkqubo nefumaneka kwimida okanye kwimpikiswano"
-
-#~ msgid "Command not implemented"
-#~ msgstr "Umyalelo awenziwanga"
-
-#~ msgid "Command parameter not implemented"
-#~ msgstr "Imida yomyalezo ayenziwanga"
-
-#~ msgid "System status, or system help reply"
-#~ msgstr ""
-#~ "Ubume besixokelelwano, okanye impendulo yoncedo evela kwisixokelelwano"
-
-#~ msgid "Help message"
-#~ msgstr "Umyalezo woncedo"
-
-#~ msgid "Service ready"
-#~ msgstr "Inkonzo sele ilungile"
-
-#~ msgid "Service closing transmission channel"
-#~ msgstr "Le nkonzo ivala ijelo losasazo"
-
-#~ msgid "Service not available, closing transmission channel"
-#~ msgstr "Inkonzo ayifumaneki, ijelo losasazo liyavala"
-
-#~ msgid "Requested mail action okay, completed"
-#~ msgstr "Isenzo esiceliweyo se-imeyili silungile, sesigqityiwe"
-
-#~ msgid "User not local; will forward to <forward-path>"
-#~ msgstr ""
-#~ "Lo msebenzisi akakho apha ngaphakathi; uza kudluliselwa ku <forward-path>"
-
-#~ msgid "Requested mail action not taken: mailbox unavailable"
-#~ msgstr ""
-#~ "Isenzo se-imeyili esiceliweyo asenzekanga: ibhokisi le-imeyili alifumaneki"
-
-#~ msgid "Requested action not taken: mailbox unavailable"
-#~ msgstr "Isenzo esiceliweyo asenzekanga: ibhokisi le-imeyili alifumaneki"
-
-#~ msgid "Requested action aborted: error in processing"
-#~ msgstr "Isenzo esiceliweyo siyekiwe: impazamo ekuphunyezweni kwaso"
-
-#~ msgid "User not local; please try <forward-path>"
-#~ msgstr "Umsebenzisi akakho apha ngaphakathi; nceda uzame <forward-path>"
-
-#~ msgid "Requested action not taken: insufficient system storage"
-#~ msgstr "Isenzo esiceliweyo asenzekanga: uvimba wesixokelelwano akonelanga"
-
-#~ msgid "Requested mail action aborted: exceeded storage allocation"
-#~ msgstr "Isenzo esiceliweyo siyekiwe: sidlule uvimba onikiweyo"
-
-#~ msgid "Requested action not taken: mailbox name not allowed"
-#~ msgstr ""
-#~ "Isenzo esiceliweyo asenzekanga: igama lebhokisi ye-imeyili alivunywanga"
-
-#~ msgid "Start mail input; end with <CRLF>.<CRLF>"
-#~ msgstr "Qalisa ukungenisa i-imeyili; gqibezela nge <CRLF>.<CRLF>"
-
-#~ msgid "Transaction failed"
-#~ msgstr "Utshintshiselwano aluphumelelanga"
-
-#~ msgid "A password transition is needed"
-#~ msgstr "Ukudlulisa i-password kuyafuneka"
-
-#~ msgid "Authentication mechanism is too weak"
-#~ msgstr "Indlela yokungqina ubunyaniso ibuthathaka kakhulu"
-
-#~ msgid "Encryption required for requested authentication mechanism"
-#~ msgstr "Ukukhowudwa kuyafuneka ukunika ubungqina obuceliweyo"
-
-#~ msgid "Temporary authentication failure"
-#~ msgstr "Ukungaphumeleli kobungqina bexeshana"
-
-#~ msgid "Authentication required"
-#~ msgstr "Kufuneka ubungqina"
-
-#~ msgid "Welcome response error"
-#~ msgstr "Impazamo kwimpendulo yokwamkela"
-
-#~ msgid "Failed to connect to SMTP server %s in secure mode: %s"
-#~ msgstr ""
-#~ "Ayiphumelelanga ukunxulumanisa kwiseva ye-SMTP %s kwindlela "
-#~ "ekhuselekileyo: %s"
-
-#~ msgid "STARTTLS command failed: %s"
-#~ msgstr "Umyalelo i-STARTTLS awuphumelelanga: %s"
-
-#~ msgid "STARTTLS command failed"
-#~ msgstr "Umyalelo i-STARTTLS awuphumelelanga"
-
-#~ msgid "SMTP server %s does not support requested authentication type %s."
-#~ msgstr "Iseva i-SMTP %s ayibuxhasi ubungqina bohlobo lwe %s."
-
-#~ msgid "%sPlease enter the SMTP password for %s on host %s"
-#~ msgstr "%sNceda faka i-password ye-SMTP ye %s kumququzeleli %s"
-
-#~ msgid ""
-#~ "Unable to authenticate to SMTP server.\n"
-#~ "%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Ayinakho ukunika ubungqina kwiseva ye-SMTP.\n"
-#~ "%s\n"
-#~ "\n"
-
-#~ msgid "SMTP server %s"
-#~ msgstr "Iseva ye-SMTP %s"
-
-#~ msgid "SMTP mail delivery via %s"
-#~ msgstr "Isihambisi se-imeyili i-SMTP sidlula %s"
-
-#~ msgid "Cannot send message: service not connected."
-#~ msgstr "Ayikwazanga ukuthumela umyalezo: le nkonzo ayinxulumaniswanga."
-
-#~ msgid "Cannot send message: sender address not valid."
-#~ msgstr ""
-#~ "Ayikwazanga ukuthumela umyalezo: lidilesi yomthumeli ayiqinisekiswanga."
-
-#~ msgid "Sending message"
-#~ msgstr "Ukuthumela umyalezo"
-
-#~ msgid "Cannot send message: no recipients defined."
-#~ msgstr "Ayikwazanga ukuthumela umyalezo: akukho bamkeli bachaziweyo."
-
-#~ msgid "Cannot send message: one or more invalid recipients"
-#~ msgstr ""
-#~ "Ayikwazanga ukuthumela umyalezo: omnye okanye ngaphezulu wabamkeli "
-#~ "akaqinisekiswanga"
-
-#~ msgid "SMTP Greeting"
-#~ msgstr "Isibuliso se-SMTP"
-
-#~ msgid "HELO command failed: %s"
-#~ msgstr "Umyalelo u-HELO awuphumelelanga: %s"
-
-#~ msgid "HELO command failed"
-#~ msgstr "Umyalelo u-HELO awuphumelelanga"
-
-#~ msgid "SMTP Authentication"
-#~ msgstr "Ubungqina be-SMTP"
-
-#~ msgid "Error creating SASL authentication object."
-#~ msgstr "Impazamo xa kusenziwa i-SASL ukufumana ubungqina bento."
-
-#~ msgid "AUTH command failed: %s"
-#~ msgstr "Umyalelo u-AUTH awuphumelelanga: %s"
-
-#~ msgid "AUTH command failed"
-#~ msgstr "Umyalelo u-AUTH awuphumelelanga"
-
-#~ msgid "Bad authentication response from server.\n"
-#~ msgstr "Impendulo yobungqina obungalunganga obuvela kwiseva.\n"
-
-#~ msgid "MAIL FROM command failed: %s: mail not sent"
-#~ msgstr "Umyalelo i-MAIL FROM awuphumelelanga: %s: umyalezo awuthunyelwanga"
-
-#~ msgid "MAIL FROM command failed"
-#~ msgstr "Umyalelo i-MAIL FROM awuphumelelanga"
-
-#~ msgid "RCPT TO command failed: %s: mail not sent"
-#~ msgstr "Umyalelo i-RCPT TO awuphumelelanga: %s: umyalezo awuthunyelwanga"
-
-#~ msgid "RCPT TO <%s> failed"
-#~ msgstr "Umyalelo i-RCPT TO <%s> awuphumelelanga"
-
-#~ msgid "DATA command failed: %s: mail not sent"
-#~ msgstr "Umyalelo othi DATA awuphumelelanga: %s: i-imeyili ayithunyelwanga"
-
-#~ msgid "DATA command failed"
-#~ msgstr "Umyalelo othi DATA awuphumelelanga"
-
-#~ msgid "RSET command failed: %s"
-#~ msgstr "Umyalelo othi RSET awuphumelelanga %s"
-
-#~ msgid "RSET command failed"
-#~ msgstr "Umyalelo othi RSET awuphumelelanga"
-
-#~ msgid "QUIT command failed: %s"
-#~ msgstr "Umyalelo othi QUIT awuphumelelanga: %s"
-
-#~ msgid "QUIT command failed"
-#~ msgstr "Umyalelo othi QUIT awuphumelelanga"
-
-#~ msgid "_Remember this password"
-#~ msgstr "_Khumbula le password"
-
-#~ msgid "_Remember this password for the remainder of this session"
-#~ msgstr "_Khumbula le password de kuphele le seshini"
-
-#~ msgid "VFolders"
-#~ msgstr "Ii-VFolders"
-
-#~ msgid "Add Sender to Address_book"
-#~ msgstr "Yongeza Umthumeli kwi_Ncwadi Yeedilesi"
-
-#~ msgid "Appl_y Filters"
-#~ msgstr "Sebenzis_a Izihluzi"
-
-#~ msgid "F_ilter Junk"
-#~ msgstr "H_luza Okungasebenziyo"
-
-#~ msgid "Virtual _Folders"
-#~ msgstr "Iziqulathi _zeefayili"
-
-#~ msgid ""
-#~ "You are almost done with the mail configuration process. The identity, "
-#~ "incoming mail server and outgoing mail transport method which you "
-#~ "provided will be grouped together to make an Evolution mail account. "
-#~ "Please enter a name for this account in the space below. This name will "
-#~ "be used for display purposes only."
-#~ msgstr ""
-#~ "Sele uza kugqiba ukumisela inkqubo ye-imeyili. Isazisi, iseva yee-imeyili "
-#~ "ezingenayo nendlela yokuthutha ii-imeyili ziphumayo oyinikileyo ziza "
-#~ "kudityaniswa ukwenza i-akhawunti yee-imeyili zenkqubo ye-Evolution. Nceda "
-#~ "ufake igama lale akhawunti kwisithuba osinikwe apha ngezantsi. Eli gama "
-#~ "liza kusetyenziswa ngenjongo yokubonisa kwiskrini kuphela."
-
-#~ msgid "_Enable"
-#~ msgstr "_Ukwenza isebenze"
-
-#~ msgid ""
-#~ "\n"
-#~ " Please read carefully the license agreement displayed\n"
-#~ " below and tick the check box for accepting it\n"
-#~ msgstr ""
-#~ "\n"
-#~ " Nceda ulifunde ngocoselelo iphepha-mvume eliboniswe\n"
-#~ " apha ngezantsi ze ufake uphawu kwbhokisi xa uluvumayo\n"
-
-#~ msgid "Body does not contain"
-#~ msgstr "Umzimba awuqulathanga"
-
-#~ msgid "Body or subject contains"
-#~ msgstr "Umzimba okanye isihloko siqulethe"
-
-#~ msgid "Subject does not contain"
-#~ msgstr "Isihloko asiqulathanga"
-
-#~ msgid "Unable to update attendee statusAttendee status updated. %s"
-#~ msgstr "Ayinako ukuhlaziya ubume bokhoyoUbume bokhoyo sele buhlaziyiwe. %s"
-
-#~ msgid "Meetings"
-#~ msgstr "Iintlanganiso"
-
-#~ msgid ""
-#~ "\n"
-#~ "Share List"
-#~ msgstr ""
-#~ "\n"
-#~ "Uluhlu Ekwabelwana ngalo"
-
-#~ msgid "Ad_d"
-#~ msgstr "Yong_eza"
-
-#~ msgid "Additional Access"
-#~ msgstr "Ufikelelo Olongeziweyo"
-
-#~ msgid "Delet_e"
-#~ msgstr "Cim_a"
-
-#~ msgid "Edi_t"
-#~ msgstr "Hlel_a"
-
-#~ msgid "Button style"
-#~ msgstr "Isimbo seqhosha"
-
-#~ msgid "Whether Evolution should start up in offline mode"
-#~ msgstr "Ukuba inkqubo ye-Evolution kufuneka iqalisiwe ingekho kwi-intanethi"
-
-#~ msgid "Create _Virtual Folder From Message"
-#~ msgstr "Yenza _Isiqulathi Seefayili Esiyinyani Esivela Kumyalezo"