disted

svn path=/trunk/; revision=25711

1 files changed, 1171 insertions, 610 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index ea977b037f..fa9e8c9220 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-27 18:25-0400\n"
+"POT-Creation-Date: 2004-04-29 13:14-0400\n"
 "PO-Revision-Date: 2004-04-27 18:27-0400\n"
 "Last-Translator: Gareth Owen <gowen72@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -200,7 +200,7 @@ msgstr "Migrating `%s':"
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:241
+#: mail/mail-component.c:242
 msgid "On This Computer"
 msgstr "On This Computer"
 
@@ -2364,13 +2364,13 @@ msgid "Email begins with"
 msgstr "Email begins with"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:57
 msgid "Category is"
 msgstr "Category is"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Any field contains"
 msgstr "Any field contains"
 
@@ -2473,9 +2473,9 @@ msgstr "Paste"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1086
 #: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:223
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
@@ -2499,7 +2499,7 @@ msgstr ""
 
 #. All, unmatched, separator
 #: addressbook/gui/widgets/e-addressbook-view.c:1657
-#: calendar/gui/cal-search-bar.c:359
+#: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Any Category"
 
@@ -2852,7 +2852,7 @@ msgstr "Protocol not supported"
 #. E_BOOK_ERROR_CANCELLED
 #: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
 #: camel/camel-service.c:728 camel/camel-service.c:766
 #: camel/camel-service.c:850 camel/camel-service.c:890
@@ -3779,23 +3779,23 @@ msgstr "Whether to show times in 24h format instead of using am/pm"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Whether to show week numbers in date navigator"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Summary contains"
 msgstr "Summary contains"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Description contains"
 msgstr "Description contains"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:54
 msgid "Comment contains"
 msgstr "Comment contains"
 
-#: calendar/gui/cal-search-bar.c:53
+#: calendar/gui/cal-search-bar.c:56
 msgid "Location contains"
 msgstr "Location contains"
 
-#: calendar/gui/cal-search-bar.c:363 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
 msgid "Unmatched"
 msgstr "Unmatched"
 
@@ -4134,8 +4134,8 @@ msgstr "start of appointment"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:480
-#: mail/em-composer-prefs.c:665 mail/em-composer-prefs.c:893
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:463
+#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
 msgid "Enabled"
 msgstr "Enabled"
 
@@ -4149,19 +4149,19 @@ msgstr "Don't Remove"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:302
-#: mail/em-account-prefs.c:343 mail/em-account-prefs.c:386
-#: mail/em-composer-prefs.c:584 mail/em-composer-prefs.c:642
-#: mail/em-composer-prefs.c:672
+#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:285
+#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
+#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
+#: mail/em-composer-prefs.c:670
 msgid "Disable"
 msgstr "Disable"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:302
-#: mail/em-account-prefs.c:343 mail/em-account-prefs.c:388
-#: mail/em-composer-prefs.c:584 mail/em-composer-prefs.c:642
-#: mail/em-composer-prefs.c:672
+#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:285
+#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
+#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
+#: mail/em-composer-prefs.c:670
 msgid "Enable"
 msgstr "Enable"
 
@@ -4618,7 +4618,7 @@ msgstr "No summary"
 
 #: calendar/gui/dialogs/comp-editor.c:1377
 #: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1196
+#: composer/e-msg-composer.c:1183
 msgid "Save as..."
 msgstr "Save as..."
 
@@ -4870,8 +4870,8 @@ msgstr "_Start time:"
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2169
-#: mail/em-account-prefs.c:441 mail/em-folder-view.c:804
+#: calendar/gui/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
+#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
 #: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
 #: mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
@@ -4900,7 +4900,7 @@ msgstr "_Delegate To..."
 #: calendar/gui/dialogs/meeting-page.c:654
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
 #: calendar/gui/e-calendar-view.c:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2571 mail/em-folder-view.c:795
+#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5122,7 +5122,7 @@ msgid "_No recurrence"
 msgstr "_No recurrence"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:457
+#: composer/e-msg-composer-attachment-bar.c:450
 msgid "_Remove"
 msgstr "_Remove"
 
@@ -5164,7 +5164,7 @@ msgstr ""
 "\n"
 "Do you wish to save your changes?"
 
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1611
+#: calendar/gui/dialogs/save-comp.c:57
 msgid "_Discard Changes"
 msgstr "_Discard Changes"
 
@@ -5217,7 +5217,7 @@ msgid "% _Complete"
 msgstr "% _Complete"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
 #: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
 #: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
 msgid "Completed"
@@ -5229,8 +5229,8 @@ msgid "High"
 msgstr "High"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
-#: calendar/gui/e-cal-model-tasks.c:662 calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
+#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "In Progress"
@@ -5247,7 +5247,7 @@ msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
 #: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Not Started"
@@ -5478,23 +5478,23 @@ msgstr "Free"
 msgid "Busy"
 msgstr "Busy"
 
-#: calendar/gui/e-cal-model-tasks.c:275
+#: calendar/gui/e-cal-model-tasks.c:302
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/e-cal-model-tasks.c:275
+#: calendar/gui/e-cal-model-tasks.c:302
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:304
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/e-cal-model-tasks.c:545
+#: calendar/gui/e-cal-model-tasks.c:573
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -5504,10 +5504,6 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/e-cal-model-tasks.c:748 calendar/gui/e-cal-model-tasks.c:781
-msgid "Due date is before start date!"
-msgstr "Due date is before start date!"
-
 #: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
 #: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
@@ -5528,7 +5524,7 @@ msgstr "No"
 #: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
 #: camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2134
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
 #: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Unknown"
@@ -5628,7 +5624,7 @@ msgstr "C_ut"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
 #: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2564 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
@@ -6164,63 +6160,63 @@ msgstr "The message contains only unsupported requests."
 msgid "The attachment does not contain a valid calendar message"
 msgstr "The attachment does not contain a valid calendar message"
 
-#: calendar/gui/e-itip-control.c:1533
+#: calendar/gui/e-itip-control.c:1535
 msgid "The attachment has no viewable calendar items"
 msgstr "The attachment has no viewable calendar items"
 
-#: calendar/gui/e-itip-control.c:1764
+#: calendar/gui/e-itip-control.c:1766
 msgid "Calendar file could not be updated!\n"
 msgstr "Calendar file could not be updated!\n"
 
-#: calendar/gui/e-itip-control.c:1766
+#: calendar/gui/e-itip-control.c:1768
 msgid "Update complete\n"
 msgstr "Update complete\n"
 
-#: calendar/gui/e-itip-control.c:1796 calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Attendee status can not be updated because the item no longer exists"
 
-#: calendar/gui/e-itip-control.c:1812 calendar/gui/e-itip-control.c:1850
+#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is invalid and cannot be updated\n"
 
-#: calendar/gui/e-itip-control.c:1822
+#: calendar/gui/e-itip-control.c:1824
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "This response is not from a current attendee.  Add as an attendee?"
 
-#: calendar/gui/e-itip-control.c:1834
+#: calendar/gui/e-itip-control.c:1836
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Attendee status could not be updated because of an invalid status!\n"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1855
 msgid "There was an error on the CORBA system\n"
 msgstr "There was an error on the CORBA system\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1858
 msgid "Object could not be found\n"
 msgstr "Object could not be found\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1861
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "You don't have the right permissions to update the calendar\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1864
 msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1867
 msgid "Attendee status could not be updated!\n"
 msgstr "Attendee status could not be updated!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1898
 msgid "Removal Complete"
 msgstr "Removal Complete"
 
-#: calendar/gui/e-itip-control.c:1919 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
 msgid "Item sent!\n"
 msgstr "Item sent!\n"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1971
+#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
 msgid "The item could not be sent!\n"
 msgstr "The item could not be sent!\n"
 
@@ -8777,7 +8773,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
 #: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:697
+#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelled."
@@ -9304,6 +9300,79 @@ msgstr ""
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Enter security pass-phrase for `%s'"
 
+#: camel/camel-smime-context.c:261
+#, fuzzy, c-format
+msgid "Cannot find certificate for '%s'"
+msgstr "Cannot create folder `%s': %s"
+
+#: camel/camel-smime-context.c:267
+#, fuzzy
+msgid "Cannot create CMS message"
+msgstr "Cannot open message"
+
+#: camel/camel-smime-context.c:272
+msgid "Cannot create CMS signedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:278
+#, fuzzy
+msgid "Cannot attach CMS signedData"
+msgstr "Cannot attach file %s: %s"
+
+#: camel/camel-smime-context.c:285
+#, fuzzy
+msgid "Cannot attach CMS data"
+msgstr "Cannot attach file %s: %s"
+
+#: camel/camel-smime-context.c:291
+msgid "Cannot create CMS SignerInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:297
+msgid "Cannot find cert chain"
+msgstr ""
+
+#: camel/camel-smime-context.c:303
+msgid "Cannot add CMS SigningTime"
+msgstr ""
+
+#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
+#, fuzzy, c-format
+msgid "Encryption cert for '%s' does not exist"
+msgstr "Folder `%s' does not exist."
+
+#: camel/camel-smime-context.c:344
+msgid "Cannot add SMIMEEncKeyPrefs attribute"
+msgstr ""
+
+#: camel/camel-smime-context.c:349
+msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
+msgstr ""
+
+#: camel/camel-smime-context.c:354
+#, fuzzy
+msgid "Cannot add add encryption certificate"
+msgstr "Encry_ption certificate:"
+
+#: camel/camel-smime-context.c:360
+msgid "Cannot add CMS SignerInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:430
+#, fuzzy
+msgid "Cannot create encoder context"
+msgstr "Cannot create folder lock on %s: %s"
+
+#: camel/camel-smime-context.c:436
+#, fuzzy
+msgid "Failed to add data to CMS encoder"
+msgstr "Failed to append to local `Sent' folder: %s"
+
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#, fuzzy
+msgid "Failed to encode data"
+msgstr "Failed to authenticate.\n"
+
 #: camel/camel-smime-context.c:514
 msgid "Unverified"
 msgstr "Unverified"
@@ -9333,7 +9402,8 @@ msgid "Signature algorithm unknown"
 msgstr "Signature algorithm unknown"
 
 #: camel/camel-smime-context.c:528
-msgid "Siganture algorithm unsupported"
+#, fuzzy
+msgid "Signature algorithm unsupported"
 msgstr "Siganture algorithm unsupported"
 
 #: camel/camel-smime-context.c:530
@@ -9344,11 +9414,120 @@ msgstr "Malformed signature"
 msgid "Processing error"
 msgstr "Processing error"
 
+#: camel/camel-smime-context.c:569
+#, fuzzy
+msgid "No signedData in signature"
+msgstr "Add script signature"
+
+#: camel/camel-smime-context.c:576
+msgid "Digests missing from enveloped data"
+msgstr ""
+
+#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
+#, fuzzy
+msgid "Cannot calculate digests"
+msgstr "Cannot create folder: %s: %s"
+
+#: camel/camel-smime-context.c:604
+#, fuzzy
+msgid "Cannot set message digests"
+msgstr "Cannot get message %s: %s"
+
+#: camel/camel-smime-context.c:614
+#, fuzzy
+msgid "Certificate import failed"
+msgstr "Certificate signature failure"
+
+#: camel/camel-smime-context.c:624
+msgid "Certficate only message, cannot verify certificates"
+msgstr ""
+
+#: camel/camel-smime-context.c:627
+msgid "Certficate only message, certificates imported and verified"
+msgstr ""
+
+#: camel/camel-smime-context.c:631
+#, fuzzy
+msgid "Can't find signature digests"
+msgstr "Valid signature"
+
 #: camel/camel-smime-context.c:647
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Signer: %s <%s>: %s\n"
 
+#: camel/camel-smime-context.c:748
+#, fuzzy
+msgid "Decoder failed"
+msgstr "DATA command failed"
+
+#: camel/camel-smime-context.c:800
+#, fuzzy, c-format
+msgid "Can't find certificate for `%s'"
+msgstr "Cannot create folder `%s': %s"
+
+#: camel/camel-smime-context.c:807
+msgid "Can't find common bulk encryption algorithm"
+msgstr ""
+
+#. PORT_GetError(); ??
+#: camel/camel-smime-context.c:816
+msgid "Can't allocate slot for encryption bulk key"
+msgstr ""
+
+#: camel/camel-smime-context.c:827
+#, fuzzy
+msgid "Can't create CMS Message"
+msgstr "Crea_te Rule From Message"
+
+#: camel/camel-smime-context.c:833
+msgid "Can't create CMS EnvelopedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:839
+msgid "Can't attach CMS EnvelopedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:845
+msgid "Can't attach CMS data object"
+msgstr ""
+
+#: camel/camel-smime-context.c:854
+msgid "Can't create CMS RecipientInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:859
+msgid "Can't add CMS RecipientInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:873
+#, fuzzy
+msgid "Can't create encoder context"
+msgstr "Cannot create folder lock on %s: %s"
+
+#: camel/camel-smime-context.c:884
+#, fuzzy
+msgid "Failed to add data to encoder"
+msgstr "Failed to send username to server"
+
+#: camel/camel-smime-context.c:970
+#, c-format
+msgid "Decoder failed, error %d"
+msgstr ""
+
+#: camel/camel-smime-context.c:977
+msgid "S/MIME Decrypt: No encrypted content found"
+msgstr ""
+
+#: camel/camel-smime-context.c:1004
+#, fuzzy
+msgid "import keys: unimplemented"
+msgstr "Command not implemented"
+
+#: camel/camel-smime-context.c:1012
+msgid "export keys: unimplemented"
+msgstr ""
+
 #: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Cannot get folder: Invalid operation on this store"
@@ -9734,31 +9913,31 @@ msgstr "IMAP server response did not contain %s information"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unexpected OK response from IMAP server: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:223
+#: camel/providers/imap/camel-imap-folder.c:226
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Could not create directory %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:242
+#: camel/providers/imap/camel-imap-folder.c:245
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Could not load summary for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:323
+#: camel/providers/imap/camel-imap-folder.c:326
 msgid "Folder was destroyed and recreated on server."
 msgstr "Folder was destroyed and recreated on server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:566
+#: camel/providers/imap/camel-imap-folder.c:569
 msgid "Scanning for changed messages"
 msgstr "Scanning for changed messages"
 
-#: camel/providers/imap/camel-imap-folder.c:1960
+#: camel/providers/imap/camel-imap-folder.c:1963
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Unable to retrieve message: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2007
+#: camel/providers/imap/camel-imap-folder.c:2010
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-maildir-folder.c:224
 #: camel/providers/local/camel-maildir-folder.c:233
@@ -9774,25 +9953,25 @@ msgstr ""
 "Cannot get message: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2007
+#: camel/providers/imap/camel-imap-folder.c:2010
 #: camel/providers/local/camel-maildir-folder.c:211
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mh-folder.c:200
 msgid "No such message"
 msgstr "No such message"
 
-#: camel/providers/imap/camel-imap-folder.c:2041
-#: camel/providers/imap/camel-imap-folder.c:2643
+#: camel/providers/imap/camel-imap-folder.c:2044
+#: camel/providers/imap/camel-imap-folder.c:2646
 #: camel/providers/nntp/camel-nntp-folder.c:233
 msgid "This message is not currently available"
 msgstr "This message is not currently available"
 
-#: camel/providers/imap/camel-imap-folder.c:2307
-#: camel/providers/imap/camel-imap-folder.c:2377
+#: camel/providers/imap/camel-imap-folder.c:2310
+#: camel/providers/imap/camel-imap-folder.c:2380
 msgid "Fetching summary information for new messages"
 msgstr "Fetching summary information for new messages"
 
-#: camel/providers/imap/camel-imap-folder.c:2681
+#: camel/providers/imap/camel-imap-folder.c:2684
 msgid "Could not find message body in FETCH response."
 msgstr "Could not find message body in FETCH response."
 
@@ -10373,7 +10552,7 @@ msgstr "Could not close source folder %s: %s"
 msgid "Could not close temp folder: %s"
 msgstr "Could not close temp folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2524
+#: camel/providers/local/camel-mbox-summary.c:592
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Could not rename folder: %s"
@@ -10772,7 +10951,8 @@ msgstr "No message with uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Retrieving POP message %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
+#: composer/e-msg-composer.c:1236
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
@@ -11216,19 +11396,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1486
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
 msgid "attachment"
 msgstr "attachment"
 
-#: composer/e-msg-composer-attachment-bar.c:458
+#: composer/e-msg-composer-attachment-bar.c:451
 msgid "Remove selected items from the attachment list"
 msgstr "Remove selected items from the attachment list"
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:491
 msgid "Add attachment..."
 msgstr "Add attachment..."
 
-#: composer/e-msg-composer-attachment-bar.c:499
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Attach a file to the message"
 msgstr "Attach a file to the message"
 
@@ -11260,10 +11440,6 @@ msgstr "MIME type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suggest automatic display of attachment"
 
-#: composer/e-msg-composer-hdrs.c:308
-msgid "You need to configure an account before you can compose mail."
-msgstr "You need to configure an account before you can compose mail."
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Posting destination"
@@ -11344,13 +11520,13 @@ msgstr "Click here to select folders to post to"
 msgid "Attach file(s)"
 msgstr "Attach file(s)"
 
-#: composer/e-msg-composer.c:694
+#: composer/e-msg-composer.c:695
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 msgstr ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 
-#: composer/e-msg-composer.c:700
+#: composer/e-msg-composer.c:701
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
@@ -11358,134 +11534,52 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 
-#: composer/e-msg-composer.c:831
-#, c-format
-msgid ""
-"Error while reading file %s:\n"
-"%s"
-msgstr ""
-"Error while reading file %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:1211
-msgid "File exists, overwrite?"
-msgstr "File exists, overwrite?"
-
-#: composer/e-msg-composer.c:1222 composer/e-msg-composer.c:1238
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Error saving file: %s"
-
-#: composer/e-msg-composer.c:1262
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Error loading file: %s"
-
-#: composer/e-msg-composer.c:1300
-#, c-format
-msgid "Error accessing file: %s"
-msgstr "Error accessing file: %s"
+#: composer/e-msg-composer.c:1273
+#, fuzzy
+msgid "Could not open file"
+msgstr "Can not open file"
 
-#: composer/e-msg-composer.c:1308
+#: composer/e-msg-composer.c:1281
 msgid "Unable to retrieve message from editor"
 msgstr "Unable to retrieve message from editor"
 
-#: composer/e-msg-composer.c:1315
-#, c-format
-msgid ""
-"Unable to seek on file: %s\n"
-"%s"
-msgstr ""
-"Unable to seek on file: %s\n"
-"%s"
-
-#: composer/e-msg-composer.c:1322
-#, c-format
-msgid ""
-"Unable to truncate file: %s\n"
-"%s"
-msgstr ""
-"Unable to truncate file: %s\n"
-"%s"
-
-#: composer/e-msg-composer.c:1331
-#, c-format
-msgid ""
-"Unable to copy file descriptor: %s\n"
-"%s"
-msgstr ""
-"Unable to copy file descriptor: %s\n"
-"%s"
-
-#: composer/e-msg-composer.c:1340
-#, c-format
-msgid ""
-"Error autosaving message: %s\n"
-" %s"
-msgstr ""
-"Error autosaving message: %s\n"
-" %s"
-
-#: composer/e-msg-composer.c:1442
-msgid ""
-"Ximian Evolution has found unsaved messages from a previous session.\n"
-"Would you like to try to recover them?"
-msgstr ""
-"Ximian Evolution has found unsaved messages from a previous session.\n"
-"Would you like to try to recover them?"
-
-#: composer/e-msg-composer.c:1606
-#, c-format
-msgid ""
-"The message \"%s\" has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"The message \"%s\" has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-
-#: composer/e-msg-composer.c:1608
+#: composer/e-msg-composer.c:1551
 msgid "Untitled Message"
 msgstr "Untitled Message"
 
-#: composer/e-msg-composer.c:1615
-msgid "Warning: Modified Message"
-msgstr "Warning: Modified Message"
-
-#: composer/e-msg-composer.c:1648
+#: composer/e-msg-composer.c:1581
 msgid "Open file"
 msgstr "Open file"
 
-#: composer/e-msg-composer.c:2055 mail/mail-account-gui.c:1461
+#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
-#: composer/e-msg-composer.c:2154
+#: composer/e-msg-composer.c:2087
 msgid "Signature:"
 msgstr "Signature:"
 
-#: composer/e-msg-composer.c:2355
+#: composer/e-msg-composer.c:2288
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] "<b>%d</b> File Attached"
 msgstr[1] "<b>%d</b> Files Attached"
 
-#: composer/e-msg-composer.c:2384
+#: composer/e-msg-composer.c:2317
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Hide _Attachment Bar (drop attachments here)"
 
-#: composer/e-msg-composer.c:2387 composer/e-msg-composer.c:3291
+#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Show _Attachment Bar (drop attachments here)"
 
-#: composer/e-msg-composer.c:2404 composer/e-msg-composer.c:3170
-#: composer/e-msg-composer.c:3171
+#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
+#: composer/e-msg-composer.c:3104
 msgid "Compose a message"
 msgstr "Compose a message"
 
-#: composer/e-msg-composer.c:3204
+#: composer/e-msg-composer.c:3137
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11493,7 +11587,7 @@ msgstr ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 
-#: composer/e-msg-composer.c:3232
+#: composer/e-msg-composer.c:3165
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11505,7 +11599,7 @@ msgstr ""
 "Please make sure you have the correct version\n"
 "of gtkhtml and libgtkhtml installed.\n"
 
-#: composer/e-msg-composer.c:3336
+#: composer/e-msg-composer.c:3269
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11513,7 +11607,7 @@ msgstr ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 
-#: composer/e-msg-composer.c:4341
+#: composer/e-msg-composer.c:4274
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11521,6 +11615,118 @@ msgstr ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 
+#: composer/mail-composer-errors.xml.in.h:1
+msgid "${1}"
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:2
+msgid "All accounts have been removed."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:3
+#, fuzzy
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Are you sure you want to delete this untitled appointment?"
+
+#: composer/mail-composer-errors.xml.in.h:4
+msgid "Because \"${0}\", you may need to select different mail options."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:5
+msgid "Because \"${1}\"."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:6
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:7
+#, fuzzy
+msgid "Could not create message."
+msgstr "Could not create pipe: %s"
+
+#: composer/mail-composer-errors.xml.in.h:8
+#, fuzzy
+msgid "Could not read signature file \"{0}\"."
+msgstr "Could not save signature file: %s"
+
+#: composer/mail-composer-errors.xml.in.h:9
+#, fuzzy
+msgid "Could not save to autosave file \"{0}\"."
+msgstr "Could not save signature file: %s"
+
+#: composer/mail-composer-errors.xml.in.h:10
+msgid "Directories can not be attached to Messages."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:11
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Discard Changes"
+
+#: composer/mail-composer-errors.xml.in.h:12
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Do you want to save changes?"
+
+#: composer/mail-composer-errors.xml.in.h:13
+#, fuzzy
+msgid "Don't Recover"
+msgstr "Don't Remove"
+
+#: composer/mail-composer-errors.xml.in.h:14
+msgid "Error saving to autosave because \"{1}\"."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:15
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:16
+#, fuzzy
+msgid "Recover"
+msgstr "Remove"
+
+#: composer/mail-composer-errors.xml.in.h:17
+#, fuzzy
+msgid "Save Message"
+msgstr "Save Message..."
+
+#: composer/mail-composer-errors.xml.in.h:18
+msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:19
+msgid ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.in.h:20
+#, fuzzy
+msgid "Unfinished messages found"
+msgstr "Unread messages"
+
+#: composer/mail-composer-errors.xml.in.h:21
+msgid "Warning: Modified Message"
+msgstr "Warning: Modified Message"
+
+#: composer/mail-composer-errors.xml.in.h:22
+#, fuzzy
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Attach a file to the message"
+
+#: composer/mail-composer-errors.xml.in.h:23
+msgid "You need to configure an account before you can compose mail."
+msgstr "You need to configure an account before you can compose mail."
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr "The Ximian Evolution Groupware Suite"
@@ -11804,24 +12010,20 @@ msgid_plural "%d years ago"
 msgstr[0] "%d year ago"
 msgstr[1] "%d years ago"
 
-#: filter/filter-datespec.c:187
-msgid "You must choose a date."
-msgstr "You must choose a date."
-
-#: filter/filter-datespec.c:287
+#: filter/filter-datespec.c:280
 msgid "<click here to select a date>"
 msgstr "<click here to select a date>"
 
-#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
+#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
 msgid "now"
 msgstr "now"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:297
+#: filter/filter-datespec.c:290
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: filter/filter-datespec.c:413
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Select a time to compare against"
 
@@ -11829,16 +12031,84 @@ msgstr "Select a time to compare against"
 msgid "_Filter Rules"
 msgstr "_Filter Rules"
 
-#: filter/filter-file.c:166
+#: filter/filter-errors.xml.in.h:1
+#, fuzzy
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Error in regular expression '%s':\n"
+"%s"
+
+#: filter/filter-errors.xml.in.h:2
+msgid "Could not compile regular expression \"{1}\"."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:3
+#, fuzzy
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "File '%s' does not exist or is not a regular file."
+
+#: filter/filter-errors.xml.in.h:4
+#, fuzzy
+msgid "Missing date."
+msgstr "Meeting Update"
+
+#: filter/filter-errors.xml.in.h:5
+#, fuzzy
+msgid "Missing file name."
+msgstr "Distinguished name"
+
+#: filter/filter-errors.xml.in.h:6
+#, fuzzy
+msgid "Missing folder."
+msgstr "Synchronising \"%s\""
+
+#: filter/filter-errors.xml.in.h:7
+#, fuzzy
+msgid "Missing name."
+msgstr "Distinguished name"
+
+#: filter/filter-errors.xml.in.h:8
+msgid "Name \"{0}\" already used."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:9
+#, fuzzy
+msgid "No sources selected."
+msgstr "No server has been selected"
+
+#: filter/filter-errors.xml.in.h:10
+msgid "Please choose another name."
+msgstr ""
+
+#: filter/filter-errors.xml.in.h:11
+msgid "You must choose a date."
+msgstr "You must choose a date."
+
+#: filter/filter-errors.xml.in.h:12
+msgid "You must name this filter."
+msgstr "You must name this filter."
+
+#: filter/filter-errors.xml.in.h:13
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "You must name this vfolder."
+
+#: filter/filter-errors.xml.in.h:14
 msgid "You must specify a file name."
 msgstr "You must specify a file name."
 
-#: filter/filter-file.c:185
-#, c-format
-msgid "File '%s' does not exist or is not a regular file."
-msgstr "File '%s' does not exist or is not a regular file."
+#: filter/filter-errors.xml.in.h:15
+msgid "You must specify a folder."
+msgstr "You must specify a folder."
 
-#: filter/filter-file.c:301
+#: filter/filter-errors.xml.in.h:16
+msgid ""
+"You must specify at least one folder as a source. Either by selecting the "
+"folders individually, and/or by selecting all local folders, all remote "
+"folders, or both."
+msgstr ""
+
+#: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Choose a file"
 
@@ -11847,24 +12117,11 @@ msgstr "Choose a file"
 msgid "<b>Then</b>"
 msgstr "<b>Then</b>"
 
-#: filter/filter-folder.c:153
-msgid "You must specify a folder."
-msgstr "You must specify a folder."
-
-#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
 #: mail/mail-account-gui.c:1327
 msgid "Select Folder"
 msgstr "Select Folder"
 
-#: filter/filter-input.c:193
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Error in regular expression '%s':\n"
-"%s"
-
 #: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
 #: mail/mail-config.c:65 mail/mail-config.glade.h:90
 msgid "Important"
@@ -11886,39 +12143,35 @@ msgstr "Later"
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "You must name this filter."
-
-#: filter/filter-rule.c:752
+#: filter/filter-rule.c:746
 msgid "Rule name:"
 msgstr "Rule name:"
 
-#: filter/filter-rule.c:756
+#: filter/filter-rule.c:750
 msgid "Untitled"
 msgstr "Untitled"
 
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:773
 msgid "<b>If</b>"
 msgstr "<b>If</b>"
 
-#: filter/filter-rule.c:810
+#: filter/filter-rule.c:804
 msgid "Execute actions"
 msgstr "Execute actions"
 
-#: filter/filter-rule.c:814
+#: filter/filter-rule.c:808
 msgid "if all criteria are met"
 msgstr "if all criteria are met"
 
-#: filter/filter-rule.c:819
+#: filter/filter-rule.c:813
 msgid "if any criteria are met"
 msgstr "if any criteria are met"
 
-#: filter/filter-rule.c:910
+#: filter/filter-rule.c:904
 msgid "incoming"
 msgstr "incoming"
 
-#: filter/filter-rule.c:910
+#: filter/filter-rule.c:904
 msgid "outgoing"
 msgstr "outgoing"
 
@@ -12256,21 +12509,15 @@ msgstr "Subject"
 msgid "Unset Status"
 msgstr "Unset Status"
 
-#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1008
-#, c-format
-msgid "Rule name '%s' is not unique, choose another."
-msgstr "Rule name '%s' is not unique, choose another."
-
-#: filter/rule-editor.c:291
+#: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Add Rule"
 
-#: filter/rule-editor.c:375
+#: filter/rule-editor.c:361
 msgid "Edit Rule"
 msgstr "Edit Rule"
 
-#: filter/rule-editor.c:699
+#: filter/rule-editor.c:685
 msgid "Rule name"
 msgstr "Rule name"
 
@@ -12314,15 +12561,7 @@ msgstr "Subject does not contain"
 msgid "Virtual _Folders"
 msgstr "Virtual _Folders"
 
-#: filter/vfolder-rule.c:215
-msgid "You must name this vfolder."
-msgstr "You must name this vfolder."
-
-#: filter/vfolder-rule.c:230
-msgid "You need to to specify at least one folder as a source."
-msgstr "You need to to specify at least one folder as a source."
-
-#: filter/vfolder-rule.c:587
+#: filter/vfolder-rule.c:572
 msgid "VFolder source"
 msgstr "VFolder source"
 
@@ -12374,8 +12613,8 @@ msgstr "Evolution Mail preferences control"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:538
-#: mail/mail-component.c:581
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
+#: mail/mail-component.c:582
 msgid "Mail"
 msgstr "Mail"
 
@@ -12387,101 +12626,36 @@ msgstr "Mail Accounts"
 msgid "Mail Preferences"
 msgstr "Mail Preferences"
 
-#: mail/em-account-prefs.c:220
-msgid "Are you sure you want to delete this account?"
-msgstr "Are you sure you want to delete this account?"
-
-#: mail/em-account-prefs.c:228
-msgid "Don't delete"
-msgstr "Don't delete"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:432
+#: mail/em-account-prefs.c:415
 msgid "[Default]"
 msgstr "[Default]"
 
-#: mail/em-account-prefs.c:486
+#: mail/em-account-prefs.c:469
 msgid "Account name"
 msgstr "Account name"
 
-#: mail/em-account-prefs.c:488
+#: mail/em-account-prefs.c:471
 msgid "Protocol"
 msgstr "Protocol"
 
-#: mail/em-composer-prefs.c:290 mail/em-composer-prefs.c:413
+#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
 #: mail/mail-config.c:1038
 msgid "Unnamed"
 msgstr "Unnamed"
 
-#: mail/em-composer-prefs.c:397
-msgid "You must specify a valid script name."
-msgstr "You must specify a valid script name."
-
-#: mail/em-composer-prefs.c:897
+#: mail/em-composer-prefs.c:895
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: mail/em-composer-prefs.c:943
+#: mail/em-composer-prefs.c:941
 msgid "Add signature script"
 msgstr "Add signature script"
 
-#: mail/em-composer-prefs.c:963
+#: mail/em-composer-prefs.c:961
 msgid "Signature(s)"
 msgstr "Signature(s)"
 
-#: mail/em-composer-utils.c:124
-#, c-format
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-"%sSend anyway?"
-msgstr ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
-"%sSend anyway?"
-
-#: mail/em-composer-utils.c:138
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"This message has no subject.\n"
-"Really send?"
-
-#: mail/em-composer-utils.c:153
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-msgstr ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-
-#: mail/em-composer-utils.c:157
-msgid "This message contains only Bcc recipients."
-msgstr "This message contains only Bcc recipients."
-
-#: mail/em-composer-utils.c:162
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-
-#: mail/em-composer-utils.c:305
-msgid "You must specify recipients in order to send this message."
-msgstr "You must specify recipients in order to send this message."
-
-#: mail/em-composer-utils.c:574
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-
 #: mail/em-folder-browser.c:139
 msgid "Create _Virtual Folder From Search..."
 msgstr "Create _Virtual Folder From Search..."
@@ -12516,8 +12690,8 @@ msgstr "<click here to select a folder>"
 msgid "Create New Folder"
 msgstr "Create New Folder"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2278
-#: mail/mail-component.c:741
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
+#: mail/mail-component.c:731
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
@@ -12526,135 +12700,96 @@ msgid "Folder _name:"
 msgstr "Folder _name:"
 
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:856
+#: mail/mail-vfolder.c:852
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
+#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
 msgid "Inbox"
 msgstr "Inbox"
 
-#: mail/em-folder-tree-model.c:493 mail/em-folder-tree-model.c:802
+#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
 msgid "Loading..."
 msgstr "Loading..."
 
-#: mail/em-folder-tree.c:923
+#: mail/em-folder-tree.c:924
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: mail/em-folder-tree.c:925
+#: mail/em-folder-tree.c:926
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: mail/em-folder-tree.c:932
+#: mail/em-folder-tree.c:933
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: mail/em-folder-tree.c:934
+#: mail/em-folder-tree.c:935
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: mail/em-folder-tree.c:950
+#: mail/em-folder-tree.c:951
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: mail/em-folder-tree.c:1998
-#, c-format
-msgid "Cannot move folder `%s': illegal operation"
-msgstr "Cannot move folder `%s': illegal operation"
-
-#: mail/em-folder-tree.c:2027 mail/em-folder-tree.c:2204
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: mail/em-folder-tree.c:2043 mail/em-folder-tree.c:2056
+#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
 #: mail/em-folder-view.c:672 mail/em-folder-view.c:686
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Select folder"
 
-#: mail/em-folder-tree.c:2083
+#: mail/em-folder-tree.c:2080
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creating folder `%s'"
 
-#: mail/em-folder-tree.c:2278 mail/mail-component.c:741
+#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
 msgid "Create folder"
 msgstr "Create folder"
 
-#: mail/em-folder-tree.c:2397
-#, c-format
-msgid "Could not delete folder: %s"
-msgstr "Could not delete folder: %s"
-
-#: mail/em-folder-tree.c:2424
-#, c-format
-msgid "Cannot delete local %s folder."
-msgstr "Cannot delete local %s folder."
-
-#: mail/em-folder-tree.c:2430
-#, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Really delete folder \"%s\" and all of its subfolders?"
-
-#: mail/em-folder-tree.c:2440
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Delete \"%s\""
-
-#: mail/em-folder-tree.c:2476
-#, c-format
-msgid "Cannot rename local %s folder."
-msgstr "Cannot rename local %s folder."
-
-#: mail/em-folder-tree.c:2485
+#: mail/em-folder-tree.c:2458
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rename the \"%s\" folder to:"
 
-#: mail/em-folder-tree.c:2487
+#: mail/em-folder-tree.c:2460
 msgid "Rename Folder"
 msgstr "Rename Folder"
 
-#: mail/em-folder-tree.c:2511
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "A folder named \"%s\" already exists. Please use a different name."
-
-#: mail/em-folder-tree.c:2559 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
 msgid "_View"
 msgstr "_View"
 
-#: mail/em-folder-tree.c:2560
+#: mail/em-folder-tree.c:2530
 msgid "Open in _New Window"
 msgstr "Open in _New Window"
 
-#: mail/em-folder-tree.c:2565
+#: mail/em-folder-tree.c:2535
 msgid "_Move"
 msgstr "_Move"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2569
+#: mail/em-folder-tree.c:2539
 msgid "_New Folder..."
 msgstr "_New Folder..."
 
-#: mail/em-folder-tree.c:2572
+#: mail/em-folder-tree.c:2542
 msgid "_Rename"
 msgstr "_Rename"
 
-#: mail/em-folder-tree.c:2575 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Properties..."
 
@@ -13178,108 +13313,46 @@ msgstr "Please select a server."
 msgid "No server has been selected"
 msgstr "No server has been selected"
 
-#: mail/em-utils.c:100
+#: mail/em-utils.c:95
 msgid "Don't show this message again."
 msgstr "Don't show this message again."
 
-#: mail/em-utils.c:282
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Error loading filter information:\n"
-"%s"
-
-#: mail/em-utils.c:291
+#: mail/em-utils.c:285
 msgid "Filters"
 msgstr "Filters"
 
-#: mail/em-utils.c:536
+#: mail/em-utils.c:530
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: mail/em-utils.c:1143
+#: mail/em-utils.c:1137
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1153
+#: mail/em-utils.c:1147
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 
-#: mail/em-utils.c:1436 mail/em-utils.c:1520 mail/em-utils.c:1529
-#, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"Cannot save to `%s'\n"
-" %s"
-
-#: mail/em-utils.c:1441
-#, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"`%s' already exists.\n"
-"Overwrite it?"
-
-#: mail/em-utils.c:1484
+#: mail/em-utils.c:1476
 msgid "message"
 msgstr "message"
 
-#: mail/em-utils.c:1536
-#, c-format
-msgid "Error: '%s' exists and is not a regular file"
-msgstr "Error: '%s' exists and is not a regular file"
-
-#: mail/em-utils.c:1590
+#: mail/em-utils.c:1579
 msgid "Save Message..."
 msgstr "Save Message..."
 
-#: mail/em-utils.c:1639
+#: mail/em-utils.c:1628
 msgid "Add address"
 msgstr "Add address"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2074
+#: mail/em-utils.c:2063
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
 
-#: mail/em-utils.c:2125
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Could not create temporary directory: %s"
-
-#: mail/em-utils.c:2456
-#, c-format
-msgid ""
-"This operation will permanently remove all deleted messages in the folder `%"
-"s'. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-"This operation will permanently remove all deleted messages in the folder `%"
-"s'. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-
-#: mail/em-utils.c:2481
-msgid ""
-"This operation will permanently remove all deleted messages in all folders. "
-"If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-msgstr ""
-"This operation will permanently remove all deleted messages in all folders. "
-"If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
-
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Automatic link recognition"
@@ -13942,10 +14015,6 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/mail-account-editor.c:110
-msgid "You have not filled in all of the required information."
-msgstr "You have not filled in all of the required information."
-
 #. give our dialog an OK button and title
 #: mail/mail-account-editor.c:153
 msgid "Evolution Account Editor"
@@ -13963,10 +14032,6 @@ msgstr "User_name:"
 msgid "_Path:"
 msgstr "_Path:"
 
-#: mail/mail-account-gui.c:2269
-msgid "You may not create two accounts with the same name."
-msgstr "You may not create two accounts with the same name."
-
 #: mail/mail-autofilter.c:75
 #, c-format
 msgid "Mail to %s"
@@ -13996,90 +14061,71 @@ msgstr "Replies to %s"
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
-#: mail/mail-autofilter.c:430
-msgid "The following filter rule(s):\n"
-msgstr "The following filter rule(s):\n"
-
-#: mail/mail-autofilter.c:436
-#, c-format
-msgid ""
-"Used the removed folder:\n"
-"    '%s'\n"
-"And have been updated."
-msgstr ""
-"Used the removed folder:\n"
-"    '%s'\n"
-"And have been updated."
-
-#: mail/mail-component.c:491
+#: mail/mail-component.c:492
 #, c-format
 msgid "%d deleted"
 msgstr "%d deleted"
 
-#: mail/mail-component.c:493
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d junk"
 msgstr "%d junk"
 
-#: mail/mail-component.c:516
+#: mail/mail-component.c:517
 #, c-format
 msgid "%d drafts"
 msgstr "%d drafts"
 
-#: mail/mail-component.c:518
+#: mail/mail-component.c:519
 #, c-format
 msgid "%d sent"
 msgstr "%d sent"
 
-#: mail/mail-component.c:520
+#: mail/mail-component.c:521
 #, c-format
 msgid "%d unsent"
 msgstr "%d unsent"
 
-#: mail/mail-component.c:524
+#: mail/mail-component.c:525
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/mail-component.c:526
+#: mail/mail-component.c:527
 #, c-format
 msgid ", %d unread"
 msgstr ", %d unread"
 
-#: mail/mail-component.c:530
+#: mail/mail-component.c:531
 #, c-format
 msgid ", %d selected"
 msgstr ", %d selected"
 
-#: mail/mail-component.c:625
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "You have unsent messages, do you wish to quit anyway?"
-
-#: mail/mail-component.c:693
+#: mail/mail-component.c:683
 msgid "New Mail Message"
 msgstr "New Mail Message"
 
-#: mail/mail-component.c:694
+#: mail/mail-component.c:684
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: mail/mail-component.c:695
+#: mail/mail-component.c:685
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: mail/mail-component.c:701
+#: mail/mail-component.c:691
 msgid "New Mail Folder"
 msgstr "New Mail Folder"
 
-#: mail/mail-component.c:702
+#: mail/mail-component.c:692
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: mail/mail-component.c:703
+#: mail/mail-component.c:693
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: mail/mail-component.c:881
+#: mail/mail-component.c:871
 msgid "URI of the mail source that the view will display"
 msgstr "URI of the mail source that the view will display"
 
@@ -14750,30 +14796,439 @@ msgstr "colour"
 msgid "description"
 msgstr "description"
 
-#: mail/mail-folder-cache.c:786
-#, c-format
-msgid "Pinging %s"
-msgstr "Pinging %s"
+#: mail/mail-errors.xml.in.h:1
+#, fuzzy
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "A folder named \"%s\" already exists. Please use a different name."
 
-#: mail/mail-mt.c:259
-#, c-format
+#: mail/mail-errors.xml.in.h:2
 msgid ""
-"Error while '%s':\n"
-"%s"
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
 msgstr ""
-"Error while '%s':\n"
-"%s"
 
-#: mail/mail-mt.c:262
-#, c-format
+#: mail/mail-errors.xml.in.h:3
+msgid "Are you sure you want to delete this account?"
+msgstr "Are you sure you want to delete this account?"
+
+#: mail/mail-errors.xml.in.h:4
+#, fuzzy
 msgid ""
-"Error while performing operation:\n"
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Permanently remove all deleted messages from this folder"
+
+#: mail/mail-errors.xml.in.h:5
+#, fuzzy
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Permanently remove all deleted messages from all folders"
+
+#: mail/mail-errors.xml.in.h:6
+#, fuzzy
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Are you sure you want to remove this URL?"
+
+#: mail/mail-errors.xml.in.h:7
+#, fuzzy
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "Prompt when user tries to send a message with no To or Cc recipients."
+
+#: mail/mail-errors.xml.in.h:8
+#, fuzzy
+msgid "Are you sure you want to send a message without a subject?"
+msgstr ""
+"Prompt the user when he or she tries to send a message without a Subject."
+
+#: mail/mail-errors.xml.in.h:9
+msgid "Because \"{0}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:10
+msgid "Because \"{1}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:11
+msgid "Because \"{2}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:12
+msgid "Cannot add vFolder \"{0}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:13
+#, fuzzy
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-errors.xml.in.h:14
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "Cannot create folder: %s: %s"
+
+#: mail/mail-errors.xml.in.h:15
+#, fuzzy
+msgid "Cannot create temporary save directory."
+msgstr "Could not create temporary directory: %s"
+
+#: mail/mail-errors.xml.in.h:16
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Cannot create directory `%s': %s."
+
+#: mail/mail-errors.xml.in.h:17
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Cannot delete local %s folder."
+
+#: mail/mail-errors.xml.in.h:18
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Cannot delete local %s folder."
+
+#: mail/mail-errors.xml.in.h:19
+#, fuzzy
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Cannot get folder `%s': folder does not exist."
+
+#: mail/mail-errors.xml.in.h:20
+#, fuzzy
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-errors.xml.in.h:21
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "Could not open source"
+
+#: mail/mail-errors.xml.in.h:22
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "Could not open source"
+
+#: mail/mail-errors.xml.in.h:23
+#, fuzzy
+msgid "Cannot open target \"{2}\"."
+msgstr "Cannot open message"
+
+#: mail/mail-errors.xml.in.h:24
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:25
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Cannot rename local %s folder."
+
+#: mail/mail-errors.xml.in.h:26
+msgid "Cannot save changes to account."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:27
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Cannot create directory `%s': %s."
+
+#: mail/mail-errors.xml.in.h:28
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
+msgstr ""
+"Cannot save to `%s'\n"
+" %s"
+
+#: mail/mail-errors.xml.in.h:29
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Add signature script"
+
+#: mail/mail-errors.xml.in.h:30
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:31
+#, fuzzy
+msgid "Could not save signature file."
+msgstr "Could not save signature file: %s"
+
+#: mail/mail-errors.xml.in.h:32
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "Delete \"%s\""
+
+#: mail/mail-errors.xml.in.h:33
+#, fuzzy
+msgid "Delete account?"
+msgstr "Delete selected contacts"
+
+#: mail/mail-errors.xml.in.h:34
+#, fuzzy
+msgid "Discard changed?"
+msgstr "_Discard changes"
+
+#: mail/mail-errors.xml.in.h:35
+#, fuzzy
+msgid "Do you wish to save your changes?"
+msgstr "Do you want to save changes?"
+
+#: mail/mail-errors.xml.in.h:36
+msgid "Don't delete"
+msgstr "Don't delete"
+
+#: mail/mail-errors.xml.in.h:37
+#, fuzzy
+msgid "Enter password."
+msgstr "Enter password"
+
+#: mail/mail-errors.xml.in.h:38
+#, fuzzy
+msgid "Error loading filter definitions."
+msgstr ""
+"Error loading filter information:\n"
 "%s"
+
+#: mail/mail-errors.xml.in.h:39
+#, fuzzy
+msgid "Error while performing operation."
 msgstr ""
 "Error while performing operation:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-errors.xml.in.h:40
+#, fuzzy
+msgid "Error while {0}."
+msgstr ""
+"Error while '%s':\n"
+"%s"
+
+#: mail/mail-errors.xml.in.h:41
+#, fuzzy
+msgid "File exists but cannot overwrite it."
+msgstr "File exists, overwrite?"
+
+#: mail/mail-errors.xml.in.h:42
+#, fuzzy
+msgid "File exists but is not a regular file."
+msgstr "File '%s' does not exist or is not a regular file."
+
+#: mail/mail-errors.xml.in.h:43
+msgid "If you continue, you will not be able to recover these messages."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:44
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:45
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:46
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:47
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "SMTP Authentication"
+
+#: mail/mail-errors.xml.in.h:48
+msgid "Mail filters automatically updated."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:49
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:50
+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."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:51
+#, fuzzy
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email: {0} Send anyway?"
+msgstr ""
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
+"%sSend anyway?"
+
+#: mail/mail-errors.xml.in.h:52
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Really delete folder \"%s\" and all of its subfolders?"
+
+#: mail/mail-errors.xml.in.h:53
+msgid ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:54
+msgid ""
+"The contact list you are sending to is configured to hide list recipients. "
+"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 in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:55
+#, fuzzy
+msgid ""
+"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
+"have been updated."
+msgstr ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+
+#: mail/mail-errors.xml.in.h:56
+#, fuzzy
+msgid ""
+"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
+"been updated."
+msgstr ""
+"The following vFolder(s):\n"
+"%sUsed the removed folder:\n"
+"    '%s'\n"
+"And have been updated."
+
+#: mail/mail-errors.xml.in.h:57
+msgid ""
+"The message was sent via the \"sendmail\" external application. Sendmail "
+"reports the following error: status 67: mail not sent. The message is stored "
+"in the Outbox folder. Check the message for errors and resend."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:58
+msgid "The script file must exist and be executable."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:59
+msgid ""
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:60
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:61
+#, fuzzy
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP server %s does not support requested authentication type %s."
+
+#: mail/mail-errors.xml.in.h:62
+#, fuzzy
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+
+#: mail/mail-errors.xml.in.h:63
+#, fuzzy
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+
+#: mail/mail-errors.xml.in.h:64
+#, fuzzy
+msgid "Use _Default"
+msgstr "Default"
+
+#: mail/mail-errors.xml.in.h:65
+#, fuzzy
+msgid "Use default drafts folder?"
+msgstr "Path to the default contacts folder"
+
+#: mail/mail-errors.xml.in.h:66
+msgid "You have not filled in all of the required information."
+msgstr "You have not filled in all of the required information."
+
+#: mail/mail-errors.xml.in.h:67
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "You have unsent messages, do you wish to quit anyway?"
+
+#: mail/mail-errors.xml.in.h:68
+msgid "You may not create two accounts with the same name."
+msgstr "You may not create two accounts with the same name."
+
+#: mail/mail-errors.xml.in.h:69
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:70
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:71
+msgid "_Discard changes"
+msgstr "_Discard changes"
+
+#: mail/mail-errors.xml.in.h:72
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "Empty _Trash"
+
+#: mail/mail-errors.xml.in.h:73
+#, fuzzy
+msgid "_Expunge"
+msgstr "E_xpunge"
+
+#: mail/mail-errors.xml.in.h:74
+#, fuzzy
+msgid "_Send"
+msgstr "Send"
+
+#: mail/mail-errors.xml.in.h:75
+msgid "vFolders automatically updated."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:76
+msgid "{0}"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:77
+msgid "{0}."
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:78
+msgid "{1}"
+msgstr ""
+
+#: mail/mail-errors.xml.in.h:79
+msgid "{1}."
+msgstr ""
+
+#: mail/mail-folder-cache.c:786
+#, c-format
+msgid "Pinging %s"
+msgstr "Pinging %s"
+
+#: mail/mail-mt.c:897
 msgid "Working"
 msgstr "Working"
 
@@ -14785,12 +15240,12 @@ msgstr "Filtering Folder"
 msgid "Fetching Mail"
 msgstr "Fetching Mail"
 
-#: mail/mail-ops.c:534
+#: mail/mail-ops.c:532
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Failed to apply outgoing filters: %s"
 
-#: mail/mail-ops.c:559
+#: mail/mail-ops.c:557
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14799,115 +15254,115 @@ msgstr ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:566
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Failed to append to local `Sent' folder: %s"
 
-#: mail/mail-ops.c:664
+#: mail/mail-ops.c:662
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
 
-#: mail/mail-ops.c:695
+#: mail/mail-ops.c:693
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Failed to send %d of %d messages"
 
-#: mail/mail-ops.c:699
+#: mail/mail-ops.c:697
 msgid "Complete."
 msgstr "Complete."
 
-#: mail/mail-ops.c:796
+#: mail/mail-ops.c:794
 msgid "Saving message to folder"
 msgstr "Saving message to folder"
 
-#: mail/mail-ops.c:881
+#: mail/mail-ops.c:879
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moving messages to %s"
 
-#: mail/mail-ops.c:881
+#: mail/mail-ops.c:879
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copying messages to %s"
 
-#: mail/mail-ops.c:994
+#: mail/mail-ops.c:992
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanning folders in \"%s\""
 
-#: mail/mail-ops.c:1107
+#: mail/mail-ops.c:1105
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
-#: mail/mail-ops.c:1150
+#: mail/mail-ops.c:1148
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opening folder %s"
 
-#: mail/mail-ops.c:1222
+#: mail/mail-ops.c:1220
 #, c-format
 msgid "Opening store %s"
 msgstr "Opening store %s"
 
-#: mail/mail-ops.c:1300
+#: mail/mail-ops.c:1298
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removing folder %s"
 
-#: mail/mail-ops.c:1394
+#: mail/mail-ops.c:1392
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Storing folder '%s'"
 
-#: mail/mail-ops.c:1459
+#: mail/mail-ops.c:1457
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: mail/mail-ops.c:1460
+#: mail/mail-ops.c:1458
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Storing account '%s'"
 
-#: mail/mail-ops.c:1515
+#: mail/mail-ops.c:1513
 msgid "Refreshing folder"
 msgstr "Refreshing folder"
 
-#: mail/mail-ops.c:1551 mail/mail-ops.c:1602
+#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
 msgid "Expunging folder"
 msgstr "Expunging folder"
 
-#: mail/mail-ops.c:1599
+#: mail/mail-ops.c:1597
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Emptying trash in '%s'"
 
-#: mail/mail-ops.c:1600
+#: mail/mail-ops.c:1598
 msgid "Local Folders"
 msgstr "Local Folders"
 
-#: mail/mail-ops.c:1683
+#: mail/mail-ops.c:1681
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Retrieving message %s"
 
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1753
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Retrieving %d message"
 msgstr[1] "Retreiving %d messages"
 
-#: mail/mail-ops.c:1841
+#: mail/mail-ops.c:1839
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Saving %d message"
 msgstr[1] "Saving %d messages"
 
-#: mail/mail-ops.c:1891
+#: mail/mail-ops.c:1889
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -14916,7 +15371,7 @@ msgstr ""
 "Unable to create output file: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1919
+#: mail/mail-ops.c:1917
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14925,11 +15380,11 @@ msgstr ""
 "Error saving messages to: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1990
+#: mail/mail-ops.c:1988
 msgid "Saving attachment"
 msgstr "Saving attachment"
 
-#: mail/mail-ops.c:2007
+#: mail/mail-ops.c:2005
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14938,17 +15393,17 @@ msgstr ""
 "Cannot create output file: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:2035
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Could not write data: %s"
 
-#: mail/mail-ops.c:2185
+#: mail/mail-ops.c:2183
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnecting from %s"
 
-#: mail/mail-ops.c:2185
+#: mail/mail-ops.c:2183
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnecting to %s"
@@ -15012,59 +15467,36 @@ msgstr "Updating..."
 msgid "Waiting..."
 msgstr "Waiting..."
 
-#: mail/mail-session.c:236
+#: mail/mail-session.c:237
 msgid "User canceled operation."
 msgstr "User cancelled operation."
 
-#: mail/mail-session.c:269
+#: mail/mail-session.c:270
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Enter Password for %s"
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:295
 msgid "_Remember this password"
 msgstr "_Remember this password"
 
-#: mail/mail-session.c:299
+#: mail/mail-session.c:296
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Remember this password for the remainder of this session"
 
-#: mail/mail-signature-editor.c:86
-#, c-format
-msgid "Could not save signature file: %s"
-msgstr "Could not save signature file: %s"
-
-#: mail/mail-signature-editor.c:233
-msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-
-#: mail/mail-signature-editor.c:236
-msgid "_Discard changes"
-msgstr "_Discard changes"
-
-#: mail/mail-signature-editor.c:240
-msgid "Save signature"
-msgstr "Save signature"
-
-#: mail/mail-signature-editor.c:388
+#: mail/mail-signature-editor.c:371
 msgid "Edit signature"
 msgstr "Edit signature"
 
-#: mail/mail-signature-editor.c:428
+#: mail/mail-signature-editor.c:411
 msgid "Enter a name for this signature."
 msgstr "Enter a name for this signature."
 
-#: mail/mail-signature-editor.c:431
+#: mail/mail-signature-editor.c:414
 msgid "Name:"
 msgstr "Name:"
 
@@ -15102,33 +15534,15 @@ msgstr "Setting up vfolder: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Updating vfolders for uri: %s"
 
-#: mail/mail-vfolder.c:525
-#, c-format
-msgid ""
-"The following vFolder(s):\n"
-"%sUsed the removed folder:\n"
-"    '%s'\n"
-"And have been updated."
-msgstr ""
-"The following vFolder(s):\n"
-"%sUsed the removed folder:\n"
-"    '%s'\n"
-"And have been updated."
-
-#: mail/mail-vfolder.c:926
+#: mail/mail-vfolder.c:922
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:961
 msgid "Edit VFolder"
 msgstr "Edit VFolder"
 
-#: mail/mail-vfolder.c:985
-#, c-format
-msgid "Trying to edit a vfolder '%s' which doesn't exist."
-msgstr "Trying to edit a vfolder '%s' which doesn't exist."
-
-#: mail/mail-vfolder.c:1057
+#: mail/mail-vfolder.c:1045
 msgid "New VFolder"
 msgstr "New VFolder"
 
@@ -15192,7 +15606,7 @@ msgstr "%d %b %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3107
+#: mail/message-list.c:3109
 msgid "Generating message list"
 msgstr "Generating message list"
 
@@ -15642,17 +16056,17 @@ msgstr "_Work Offline"
 msgid "Work Offline"
 msgstr "Work Offline"
 
-#: shell/e-shell-window.c:327
+#: shell/e-shell-window.c:338
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 
-#: shell/e-shell-window.c:334
+#: shell/e-shell-window.c:345
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution is in the process of going offline."
 
-#: shell/e-shell-window.c:340
+#: shell/e-shell-window.c:351
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -18139,6 +18553,168 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
+#~ msgid "Due date is before start date!"
+#~ msgstr "Due date is before start date!"
+
+#~ msgid ""
+#~ "Error while reading file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Error while reading file %s:\n"
+#~ "%s"
+
+#~ msgid "Error saving file: %s"
+#~ msgstr "Error saving file: %s"
+
+#~ msgid "Error loading file: %s"
+#~ msgstr "Error loading file: %s"
+
+#~ msgid "Error accessing file: %s"
+#~ msgstr "Error accessing file: %s"
+
+#~ msgid ""
+#~ "Unable to seek on file: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Unable to seek on file: %s\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Unable to truncate file: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Unable to truncate file: %s\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Unable to copy file descriptor: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Unable to copy file descriptor: %s\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error autosaving message: %s\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Error autosaving message: %s\n"
+#~ " %s"
+
+#~ msgid ""
+#~ "Ximian Evolution has found unsaved messages from a previous session.\n"
+#~ "Would you like to try to recover them?"
+#~ msgstr ""
+#~ "Ximian Evolution has found unsaved messages from a previous session.\n"
+#~ "Would you like to try to recover them?"
+
+#~ msgid ""
+#~ "The message \"%s\" has not been sent.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "The message \"%s\" has not been sent.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+
+#~ msgid "Rule name '%s' is not unique, choose another."
+#~ msgstr "Rule name '%s' is not unique, choose another."
+
+#~ msgid "You need to to specify at least one folder as a source."
+#~ msgstr "You need to to specify at least one folder as a source."
+
+#~ msgid "You must specify a valid script name."
+#~ msgstr "You must specify a valid script name."
+
+#~ msgid ""
+#~ "This message has no subject.\n"
+#~ "Really send?"
+#~ msgstr ""
+#~ "This message has no subject.\n"
+#~ "Really send?"
+
+#~ msgid ""
+#~ "Since the contact list you are sending to is configured to hide the "
+#~ "list's addresses, this message will contain only Bcc recipients."
+#~ msgstr ""
+#~ "Since the contact list you are sending to is configured to hide the "
+#~ "list's addresses, this message will contain only Bcc recipients."
+
+#~ msgid "This message contains only Bcc recipients."
+#~ msgstr "This message contains only Bcc recipients."
+
+#~ msgid ""
+#~ "It is possible that the mail server may reveal the recipients by adding "
+#~ "an Apparently-To header.\n"
+#~ "Send anyway?"
+#~ msgstr ""
+#~ "It is possible that the mail server may reveal the recipients by adding "
+#~ "an Apparently-To header.\n"
+#~ "Send anyway?"
+
+#~ msgid "You must specify recipients in order to send this message."
+#~ msgstr "You must specify recipients in order to send this message."
+
+#~ msgid "Cannot move folder `%s': illegal operation"
+#~ msgstr "Cannot move folder `%s': illegal operation"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "Could not delete folder: %s"
+#~ msgstr "Could not delete folder: %s"
+
+#~ msgid ""
+#~ "`%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "`%s' already exists.\n"
+#~ "Overwrite it?"
+
+#~ msgid "Error: '%s' exists and is not a regular file"
+#~ msgstr "Error: '%s' exists and is not a regular file"
+
+#~ msgid ""
+#~ "This operation will permanently remove all deleted messages in the folder "
+#~ "`%s'. If you continue, you will not be able to recover these messages.\n"
+#~ "\n"
+#~ "Really erase these messages?"
+#~ msgstr ""
+#~ "This operation will permanently remove all deleted messages in the folder "
+#~ "`%s'. If you continue, you will not be able to recover these messages.\n"
+#~ "\n"
+#~ "Really erase these messages?"
+
+#~ msgid ""
+#~ "This operation will permanently remove all deleted messages in all "
+#~ "folders. If you continue, you will not be able to recover these "
+#~ "messages.\n"
+#~ "\n"
+#~ "Really erase these messages?"
+#~ msgstr ""
+#~ "This operation will permanently remove all deleted messages in all "
+#~ "folders. If you continue, you will not be able to recover these "
+#~ "messages.\n"
+#~ "\n"
+#~ "Really erase these messages?"
+
+#~ msgid "The following filter rule(s):\n"
+#~ msgstr "The following filter rule(s):\n"
+
+#~ msgid ""
+#~ "Used the removed folder:\n"
+#~ "    '%s'\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "Used the removed folder:\n"
+#~ "    '%s'\n"
+#~ "And have been updated."
+
+#~ msgid "Save signature"
+#~ msgstr "Save signature"
+
+#~ msgid "Trying to edit a vfolder '%s' which doesn't exist."
+#~ msgstr "Trying to edit a vfolder '%s' which doesn't exist."
+
 #~ msgid "Address Book Creation Assistant"
 #~ msgstr "Address Book Creation Assistant"
 
@@ -18573,9 +19149,6 @@ msgstr "%s (%d%% complete)"
 #~ msgid "[script]"
 #~ msgstr "[script]"
 
-#~ msgid "Add script signature"
-#~ msgstr "Add script signature"
-
 #~ msgid "With _Category"
 #~ msgstr "With _Category"
 
@@ -18719,14 +19292,6 @@ msgstr "%s (%d%% complete)"
 #~ msgstr "Synchronising \"%s\""
 
 #, fuzzy
-#~ msgid "Cannot copy folder: %s"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
-#~ msgid "Cannot move folder: %s"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
 #~ msgid "Copy Folder"
 #~ msgstr "Synchronising \"%s\""
 
@@ -19411,10 +19976,6 @@ msgstr "%s (%d%% complete)"
 #~ msgstr "Synchronising \"%s\""
 
 #, fuzzy
-#~ msgid "Summarising folder"
-#~ msgstr "Synchronising \"%s\""
-
-#, fuzzy
 #~ msgid "Cannot initialize Evolution's Executive Summary component."
 #~ msgstr "Cannot initialise Evolution's mail component."