Added a number of missing files. Updated Canadian English translation.

2005-10-19  Adam Weinberger  <adamw@gnome.org>

	* POTFILES.in: Added a number of missing files.
	* en_CA.po: Updated Canadian English translation.

svn path=/trunk/; revision=30540

3 files changed, 850 insertions, 525 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 48d574f506..c83d487dd5 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-19  Adam Weinberger  <adamw@gnome.org>
+
+	* POTFILES.in: Added a number of missing files.
+	* en_CA.po: Updated Canadian English translation.
+
 2005-10-19  Funda Wang  <fundawang@linux.net.cn>
 
 	* zh_CN.po: Updated Simplified Chinese translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 49d001d851..6e0f4a16e3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -77,6 +77,7 @@ addressbook/tools/evolution-addressbook-import.c
 calendar/calendar.error.xml
 calendar/common/authentication.c
 calendar/conduits/calendar/calendar-conduit.c
+calendar/conduits/memo/memo-conduit.c
 calendar/conduits/todo/todo-conduit.c
 calendar/gui/GNOME_Evolution_Calendar.server.in.in
 calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in
@@ -118,6 +119,9 @@ calendar/gui/dialogs/event-page.glade
 calendar/gui/dialogs/meeting-page.c
 calendar/gui/dialogs/meeting-page.etspec
 calendar/gui/dialogs/meeting-page.glade
+calendar/gui/dialogs/memo-editor.c
+calendar/gui/dialogs/memo-page.c
+calendar/gui/dialogs/memo-page.glade
 calendar/gui/dialogs/new-calendar.glade
 calendar/gui/dialogs/new-task-list.glade
 calendar/gui/dialogs/recur-comp.c
@@ -135,12 +139,14 @@ calendar/gui/dialogs/task-page.c
 calendar/gui/dialogs/task-page.glade
 calendar/gui/dialogs/url-editor-dialog.glade
 calendar/gui/e-alarm-list.c
+calendar/gui/e-cal-component-memo-preview.c
 calendar/gui/e-cal-component-preview.c
 calendar/gui/e-cal-list-view.c
 calendar/gui/e-cal-list-view.etspec
 calendar/gui/e-cal-model-calendar.c
 calendar/gui/e-cal-model-tasks.c
 calendar/gui/e-cal-model.c
+calendar/gui/e-cal-popup.c
 calendar/gui/e-calendar-table.c
 calendar/gui/e-calendar-table.etspec
 calendar/gui/e-calendar-view.c
@@ -155,6 +161,9 @@ calendar/gui/e-meeting-store.c
 calendar/gui/e-meeting-time-sel-item.c
 calendar/gui/e-meeting-time-sel.c
 calendar/gui/e-meeting-time-sel.etspec
+calendar/gui/e-memo-table.c
+calendar/gui/e-memo-table.etspec
+calendar/gui/e-memos.c
 calendar/gui/e-pub-utils.c
 calendar/gui/e-tasks.c
 calendar/gui/e-timezone-entry.c
@@ -164,6 +173,8 @@ calendar/gui/gnome-cal.c
 calendar/gui/goto-dialog.glade
 calendar/gui/goto.c
 calendar/gui/itip-utils.c
+calendar/gui/memos-component.c
+calendar/gui/memos-control.c
 calendar/gui/migration.c
 calendar/gui/print.c
 calendar/gui/tasks-component.c
@@ -322,6 +333,9 @@ plugins/groupwise-features/proxy.c
 plugins/groupwise-features/send-options.c
 plugins/groupwise-features/share-folder-common.c
 plugins/groupwise-features/status-track.c
+plugins/ipod-sync/ical-format.c
+plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml
+plugins/ipod-sync/sync.c
 plugins/itip-formatter/itip-formatter.c
 plugins/itip-formatter/itip-view.c
 plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml
@@ -403,6 +417,7 @@ ui/evolution-mail-global.xml
 ui/evolution-mail-list.xml
 ui/evolution-mail-message.xml
 ui/evolution-mail-messagedisplay.xml
+ui/evolution-memos.xml
 ui/evolution-message-composer.xml
 ui/evolution-signature-editor.xml
 ui/evolution-subscribe.xml
@@ -411,6 +426,7 @@ ui/evolution.xml
 views/addressbook/galview.xml
 views/calendar/galview.xml
 views/mail/galview.xml
+views/memos/galview.xml
 views/tasks/galview.xml
 widgets/e-timezone-dialog/e-timezone-dialog.c
 widgets/e-timezone-dialog/e-timezone-dialog.glade
diff --git a/po/en_CA.po b/po/en_CA.po
index e20ea1fb10..2cfb1fbc49 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-14 12:27-0400\n"
+"POT-Creation-Date: 2005-10-19 14:38-0400\n"
 "PO-Revision-Date: 2005-08-21 19:18-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -366,7 +366,7 @@ msgstr "LDAP server did not respond with valid schema information."
 msgid "Server Version"
 msgstr "Server Version"
 
-#: addressbook/addressbook.error.xml.h:14 calendar/calendar.error.xml.h:42
+#: addressbook/addressbook.error.xml.h:14 calendar/calendar.error.xml.h:44
 msgid "Some features may not work properly with your current server"
 msgstr "Some features may not work properly with your current server"
 
@@ -438,7 +438,7 @@ msgstr ""
 "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?"
 
-#: addressbook/addressbook.error.xml.h:28 calendar/calendar.error.xml.h:57
+#: addressbook/addressbook.error.xml.h:28 calendar/calendar.error.xml.h:61
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -555,8 +555,9 @@ msgstr "Manage your S/MIME certificates here"
 #. 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
+#: calendar/gui/calendar-component.c:208 calendar/gui/memos-component.c:192
+#: calendar/gui/migration.c:462 calendar/gui/migration.c:555
+#: calendar/gui/migration.c:1057 calendar/gui/tasks-component.c:188
 #: mail/em-folder-tree-model.c:197 mail/em-folder-tree-model.c:199
 #: mail/mail-component.c:292 mail/mail-vfolder.c:223
 msgid "On This Computer"
@@ -570,8 +571,9 @@ msgstr "On This Computer"
 #: 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
+#: calendar/gui/calendar-component.c:216 calendar/gui/memos-component.c:200
+#: calendar/gui/migration.c:470 calendar/gui/migration.c:563
+#: calendar/gui/migration.c:1065 calendar/gui/tasks-component.c:196
 #: filter/filter-label.c:123 mail/em-migrate.c:1043 mail/mail-config.c:78
 #: mail/mail-config.glade.h:104
 msgid "Personal"
@@ -634,8 +636,9 @@ msgstr "Copy book content locally for offline operation"
 #: 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:366
-#: calendar/gui/dialogs/calendar-setup.c:377 mail/em-folder-properties.c:215
+#: calendar/gui/dialogs/calendar-setup.c:368
+#: calendar/gui/dialogs/calendar-setup.c:379
+#: calendar/gui/dialogs/calendar-setup.c:390 mail/em-folder-properties.c:215
 #: mail/mail-config.glade.h:85 smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "General"
@@ -734,13 +737,16 @@ msgstr ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 
 #: addressbook/gui/component/addressbook-view.c:764
-#: addressbook/gui/widgets/e-addressbook-view.c:952 mail/em-filter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:952
+#: calendar/gui/memos-component.c:450 mail/em-filter-i18n.h:11
 #: ui/evolution-addressbook.xml.h:9 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:25 ui/evolution-memos.xml.h:6
+#: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Delete"
 
 #: addressbook/gui/component/addressbook-view.c:766
+#: calendar/gui/memos-component.c:451
 msgid "Properties..."
 msgstr "Properties..."
 
@@ -822,6 +828,7 @@ msgstr "Whether to show the preview pane."
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/memo-page.glade.h:1
 #: calendar/gui/dialogs/new-calendar.glade.h:1
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
@@ -2754,6 +2761,7 @@ msgstr "Source"
 #: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:377
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
+#: calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Type"
 
@@ -2769,8 +2777,9 @@ msgid "Save as VCard..."
 msgstr "Save as VCard..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:930
+#: calendar/gui/dialogs/comp-editor.c:1119
 #: calendar/gui/e-calendar-table.c:1167 calendar/gui/e-calendar-view.c:1549
-#: ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-memo-table.c:845 ui/evolution-addressbook.xml.h:38
 msgid "_Open"
 msgstr "_Open"
 
@@ -2804,9 +2813,10 @@ msgid "Send Message to Contacts"
 msgstr "Send Message to Contacts"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:942
-#: calendar/gui/calendar-commands.c:119 calendar/gui/print.c:2510
+#: calendar/gui/calendar-commands.c:119 calendar/gui/print.c:2512
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail-message.xml.h:76 ui/evolution-tasks.xml.h:14
+#: ui/evolution-mail-message.xml.h:76 ui/evolution-memos.xml.h:11
+#: ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Print"
 
@@ -2819,18 +2829,21 @@ msgid "Move to Address Book..."
 msgstr "Move to Address Book..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:949
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-memos.xml.h:4
+#: ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cut"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:950
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-mail-message.xml.h:11
+#: calendar/gui/memos-component.c:449 ui/evolution-addressbook.xml.h:3
+#: ui/evolution-mail-message.xml.h:11 ui/evolution-memos.xml.h:2
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copy"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:951
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-tasks.xml.h:11
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-memos.xml.h:8
+#: ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Paste"
 
@@ -2877,6 +2890,7 @@ msgstr "Car Phone"
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-list-view.etspec.h:1
 #: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-memo-table.etspec.h:1
 msgid "Categories"
 msgstr "Categories"
 
@@ -3246,7 +3260,7 @@ msgstr "Protocol not supported"
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:232
 #: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:661
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/print.c:2373
+#: calendar/gui/e-calendar-table.c:460 calendar/gui/print.c:2375
 msgid "Cancelled"
 msgstr "Cancelled"
 
@@ -3990,32 +4004,36 @@ msgid "Delete calendar '{0}'?"
 msgstr "Delete calendar '{0}'?"
 
 #: calendar/calendar.error.xml.h:26
+msgid "Delete memo list '{0}'?"
+msgstr "Delete memo list '{0}'?"
+
+#: calendar/calendar.error.xml.h:27
 msgid "Delete task list '{0}'?"
 msgstr "Delete task list '{0}'?"
 
-#: calendar/calendar.error.xml.h:27
+#: calendar/calendar.error.xml.h:28
 msgid "Don't Send"
 msgstr "Don't Send"
 
-#: calendar/calendar.error.xml.h:28
+#: calendar/calendar.error.xml.h:29
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Download in progress. Do you want to save the appointment?"
 
-#: calendar/calendar.error.xml.h:29
+#: calendar/calendar.error.xml.h:30
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Download in progress. Do you want to save the task?"
 
-#: calendar/calendar.error.xml.h:30
+#: calendar/calendar.error.xml.h:31
 msgid "Editor could not be loaded."
 msgstr "Editor could not be loaded."
 
-#: calendar/calendar.error.xml.h:31
+#: calendar/calendar.error.xml.h:32
 msgid ""
 "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr ""
 "Email invitations will be sent to all participants and allow them to RSVP."
 
-#: calendar/calendar.error.xml.h:32
+#: calendar/calendar.error.xml.h:33
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -4023,15 +4041,19 @@ msgstr ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 
-#: calendar/calendar.error.xml.h:33
+#: calendar/calendar.error.xml.h:34
 msgid "Error loading calendar"
 msgstr "Error loading calendar"
 
-#: calendar/calendar.error.xml.h:34
+#: calendar/calendar.error.xml.h:35
+msgid "Error loading memo list"
+msgstr "Error loading memo list"
+
+#: calendar/calendar.error.xml.h:36
 msgid "Error loading task list"
 msgstr "Error loading task list"
 
-#: calendar/calendar.error.xml.h:35
+#: calendar/calendar.error.xml.h:37
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
@@ -4039,7 +4061,7 @@ msgstr ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the journal has been deleted."
 
-#: calendar/calendar.error.xml.h:36
+#: calendar/calendar.error.xml.h:38
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4047,7 +4069,7 @@ msgstr ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is cancelled."
 
-#: calendar/calendar.error.xml.h:37
+#: calendar/calendar.error.xml.h:39
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
@@ -4055,15 +4077,15 @@ msgstr ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 
-#: calendar/calendar.error.xml.h:38 ui/evolution-message-composer.xml.h:28
+#: calendar/calendar.error.xml.h:40 ui/evolution-message-composer.xml.h:28
 msgid "Send"
 msgstr "Send"
 
-#: calendar/calendar.error.xml.h:39
+#: calendar/calendar.error.xml.h:41
 msgid "Send Notice"
 msgstr "Send Notice"
 
-#: calendar/calendar.error.xml.h:40
+#: calendar/calendar.error.xml.h:42
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4071,7 +4093,7 @@ msgstr ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 
-#: calendar/calendar.error.xml.h:41
+#: calendar/calendar.error.xml.h:43
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4079,97 +4101,105 @@ msgstr ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 
-#: calendar/calendar.error.xml.h:43
+#: calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "The Evolution calendar has quit unexpectedly."
 
-#: calendar/calendar.error.xml.h:44
+#: calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "The Evolution tasks have quit unexpectedly."
 
-#: calendar/calendar.error.xml.h:45
+#: calendar/calendar.error.xml.h:47
 msgid "The calendar is not marked for offline usage"
 msgstr "The calendar is not marked for offline usage"
 
-#: calendar/calendar.error.xml.h:46
+#: calendar/calendar.error.xml.h:48
+msgid "The memo list is not marked for offline usage"
+msgstr "The memo list is not marked for offline usage"
+
+#: calendar/calendar.error.xml.h:49
 msgid "The task list is not marked for offline usage"
 msgstr "The task list is not marked for offline usage"
 
-#: calendar/calendar.error.xml.h:47
+#: calendar/calendar.error.xml.h:50
 msgid "This calendar will be removed permanently."
 msgstr "This calendar will be removed permanently."
 
-#: calendar/calendar.error.xml.h:48
+#: calendar/calendar.error.xml.h:51
+msgid "This memo list will be removed permanently."
+msgstr "This memo list will be removed permanently."
+
+#: calendar/calendar.error.xml.h:52
 msgid "This task list will be removed permanently."
 msgstr "This task list will be removed permanently."
 
-#: calendar/calendar.error.xml.h:49
+#: calendar/calendar.error.xml.h:53
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Would you like to save your changes to this appointment?"
 
-#: calendar/calendar.error.xml.h:50
+#: calendar/calendar.error.xml.h:54
 msgid "Would you like to save your changes to this task?"
 msgstr "Would you like to save your changes to this task?"
 
-#: calendar/calendar.error.xml.h:51
+#: calendar/calendar.error.xml.h:55
 msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr "Would you like to send a cancelation notice for this journal entry?"
 
-#: calendar/calendar.error.xml.h:52
+#: calendar/calendar.error.xml.h:56
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "Would you like to send all the participants a cancelation notice?"
 
-#: calendar/calendar.error.xml.h:53
+#: calendar/calendar.error.xml.h:57
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Would you like to send meeting invitations to participants?"
 
-#: calendar/calendar.error.xml.h:54
+#: calendar/calendar.error.xml.h:58
 msgid "Would you like to send this task to participants?"
 msgstr "Would you like to send this task to participants?"
 
-#: calendar/calendar.error.xml.h:55
+#: calendar/calendar.error.xml.h:59
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Would you like to send updated meeting information to participants?"
 
-#: calendar/calendar.error.xml.h:56
+#: calendar/calendar.error.xml.h:60
 msgid "Would you like to send updated task information to participants?"
 msgstr "Would you like to send updated task information to participants?"
 
-#: calendar/calendar.error.xml.h:58
+#: calendar/calendar.error.xml.h:62
 msgid "You have changed this appointment, but not yet saved them."
 msgstr "You have changed this appointment, but not yet saved them."
 
-#: calendar/calendar.error.xml.h:59
+#: calendar/calendar.error.xml.h:63
 msgid "You have made changes to this task, but not yet saved them."
 msgstr "You have made changes to this task, but not yet saved them."
 
-#: calendar/calendar.error.xml.h:60
+#: calendar/calendar.error.xml.h:64
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Your calendars will not be available until Evolution is restarted."
 
-#: calendar/calendar.error.xml.h:61
+#: calendar/calendar.error.xml.h:65
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Your tasks will not be available until Evolution is restarted."
 
-#: calendar/calendar.error.xml.h:62 composer/mail-composer.error.xml.h:29
+#: calendar/calendar.error.xml.h:66 composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "_Discard Changes"
 
-#: calendar/calendar.error.xml.h:63 ui/evolution-message-composer.xml.h:51
+#: calendar/calendar.error.xml.h:67 ui/evolution-message-composer.xml.h:51
 #: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Save"
 
-#: calendar/calendar.error.xml.h:64
+#: calendar/calendar.error.xml.h:68
 msgid "_Save Changes"
 msgstr "_Save Changes"
 
-#: calendar/calendar.error.xml.h:65 composer/mail-composer.error.xml.h:31
-#: mail/mail.error.xml.h:123
+#: calendar/calendar.error.xml.h:69 composer/mail-composer.error.xml.h:31
+#: mail/mail.error.xml.h:127
 msgid "_Send"
 msgstr "_Send"
 
-#: calendar/calendar.error.xml.h:66
+#: calendar/calendar.error.xml.h:70
 msgid "{0}."
 msgstr "{0}."
 
@@ -4184,6 +4214,8 @@ msgstr "Split Multi-Day Events:"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1377
 #: calendar/conduits/calendar/calendar-conduit.c:1378
+#: calendar/conduits/memo/memo-conduit.c:854
+#: calendar/conduits/memo/memo-conduit.c:855
 #: calendar/conduits/todo/todo-conduit.c:879
 #: calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
@@ -4194,6 +4226,16 @@ msgstr "Could not start evolution-data-server"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Could not read pilot's Calendar application block"
 
+#: calendar/conduits/memo/memo-conduit.c:937
+#: calendar/conduits/memo/memo-conduit.c:940
+msgid "Could not read pilot's Memo application block"
+msgstr "Could not read pilot's Memo application block"
+
+#: calendar/conduits/memo/memo-conduit.c:976
+#: calendar/conduits/memo/memo-conduit.c:979
+msgid "Could not write pilot's Memo application block"
+msgstr "Could not write pilot's Memo application block"
+
 #: calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
 msgstr "Default Priority:"
@@ -4237,12 +4279,26 @@ msgid "Evolution's Calendar component"
 msgstr "Evolution's Calendar component"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution's Memos component"
+msgstr "Evolution's Memos component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
 msgstr "Evolution's Tasks component"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: calendar/gui/e-tasks.c:1332 calendar/gui/print.c:1831
-#: calendar/gui/tasks-component.c:519 calendar/gui/tasks-component.c:1012
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Memo_s"
+msgstr "Memo_s"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-memos.c:1091 calendar/gui/memos-component.c:528
+#: calendar/gui/memos-component.c:998 calendar/gui/memos-control.c:334
+msgid "Memos"
+msgstr "Memos"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#: calendar/gui/e-tasks.c:1333 calendar/gui/print.c:1831
+#: calendar/gui/tasks-component.c:519 calendar/gui/tasks-component.c:1013
 #: calendar/gui/tasks-control.c:466 calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:707
 #: plugins/groupwise-account-setup/camel-gw-listener.c:384
@@ -4251,11 +4307,11 @@ msgstr "Evolution's Tasks component"
 msgid "Tasks"
 msgstr "Tasks"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
 msgid "_Calendars"
 msgstr "_Calendars"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
 #: views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tasks"
@@ -4290,7 +4346,7 @@ msgstr "Appointments"
 
 #. Location
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: calendar/gui/e-itip-control.c:1120 plugins/itip-formatter/itip-view.c:884
+#: calendar/gui/e-itip-control.c:1117 plugins/itip-formatter/itip-view.c:884
 msgid "Location:"
 msgstr "Location:"
 
@@ -4305,7 +4361,7 @@ msgstr "Snooze _time:"
 #: plugins/exchange-operations/exchange-delegates.glade.h:13
 #: ui/evolution-addressbook.xml.h:35 ui/evolution-calendar.xml.h:41
 #: ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution-memos.xml.h:17
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:25 ui/evolution.xml.h:33
@@ -4759,7 +4815,7 @@ msgid "Unmatched"
 msgstr "Unmatched"
 
 #: calendar/gui/calendar-commands.c:119 calendar/gui/calendar-component.c:708
-#: calendar/gui/dialogs/calendar-setup.c:367 calendar/gui/gnome-cal.c:2113
+#: calendar/gui/dialogs/calendar-setup.c:369 calendar/gui/gnome-cal.c:2113
 #: 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:588
@@ -4790,10 +4846,12 @@ msgid "days"
 msgstr "days"
 
 #. Create the On the web source group
+#. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: calendar/gui/calendar-component.c:234 calendar/gui/migration.c:489
-#: calendar/gui/migration.c:582 calendar/gui/tasks-component.c:215
+#: calendar/gui/calendar-component.c:234 calendar/gui/memos-component.c:219
+#: calendar/gui/migration.c:489 calendar/gui/migration.c:582
+#: calendar/gui/migration.c:1084 calendar/gui/tasks-component.c:215
 msgid "On The Web"
 msgstr "On The Web"
 
@@ -4812,22 +4870,24 @@ msgid "_New Calendar"
 msgstr "_New Calendar"
 
 #: calendar/gui/calendar-component.c:536
-#: calendar/gui/dialogs/comp-editor.c:428 calendar/gui/e-calendar-table.c:1175
-#: calendar/gui/e-calendar-view.c:1556 calendar/gui/tasks-component.c:440
-#: composer/e-msg-composer.c:2911 mail/em-folder-tree.c:979
-#: mail/em-folder-view.c:1035 mail/message-list.c:1718
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:39
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:102
+#: calendar/gui/dialogs/comp-editor.c:429 calendar/gui/e-calendar-table.c:1175
+#: calendar/gui/e-calendar-view.c:1556 calendar/gui/e-memo-table.c:853
+#: calendar/gui/tasks-component.c:440 composer/e-msg-composer.c:3050
+#: mail/em-folder-tree.c:979 mail/em-folder-view.c:1035
+#: mail/message-list.c:1718 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:102 ui/evolution-memos.xml.h:15
 #: ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copy"
 
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/calendar-component.c:537 calendar/gui/e-calendar-table.c:1187
-#: calendar/gui/e-calendar-view.c:1569 calendar/gui/tasks-component.c:441
-#: mail/em-folder-tree.c:2054 mail/em-folder-view.c:1049
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:40
-#: ui/evolution-mail-list.xml.h:27 ui/evolution-tasks.xml.h:24
+#: calendar/gui/e-calendar-view.c:1569 calendar/gui/e-memo-table.c:862
+#: calendar/gui/tasks-component.c:441 mail/em-folder-tree.c:2054
+#: mail/em-folder-view.c:1049 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:27
+#: ui/evolution-memos.xml.h:16 ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "_Delete"
 
@@ -4839,7 +4899,7 @@ msgstr "_Properties..."
 msgid "Failed upgrading calendars."
 msgstr "Failed upgrading calendars."
 
-#: calendar/gui/calendar-component.c:1154
+#: calendar/gui/calendar-component.c:1157
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Unable to open the calendar '%s' for creating events and meetings"
@@ -5073,16 +5133,16 @@ msgstr "%.0fG"
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:311
 #: calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: calendar/gui/dialogs/comp-editor.c:2459
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:2483
+#: composer/e-msg-composer-attachment-bar.c:307 mail/em-utils.c:138
+#: mail/em-utils.c:483 mail/em-utils.c:520 widgets/misc/e-attachment-bar.c:341
 msgid "attachment"
 msgstr "attachment"
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:473
-#: calendar/gui/dialogs/comp-editor.c:1099
+#: calendar/gui/dialogs/comp-editor.c:1120
 #: calendar/gui/dialogs/meeting-page.c:908
-#: composer/e-msg-composer-attachment-bar.c:470 composer/e-msg-composer.c:3400
+#: composer/e-msg-composer-attachment-bar.c:470 composer/e-msg-composer.c:3546
 #: plugins/groupwise-features/junk-settings.glade.h:8
 #: plugins/groupwise-features/properties.glade.h:14
 #: widgets/table/e-table-config.glade.h:18
@@ -5090,15 +5150,15 @@ msgid "_Remove"
 msgstr "_Remove"
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:474
-#: calendar/gui/dialogs/comp-editor.c:1100
-#: composer/e-msg-composer-attachment-bar.c:471 composer/e-msg-composer.c:3401
+#: calendar/gui/dialogs/comp-editor.c:1121
+#: composer/e-msg-composer-attachment-bar.c:471 composer/e-msg-composer.c:3547
 #: mail/em-folder-tree.c:2058 ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "_Properties"
 
 #: calendar/gui/dialogs/cal-attachment-bar.c:476
-#: calendar/gui/dialogs/comp-editor.c:1102
-#: composer/e-msg-composer-attachment-bar.c:473 composer/e-msg-composer.c:3403
+#: calendar/gui/dialogs/comp-editor.c:1123
+#: composer/e-msg-composer-attachment-bar.c:473 composer/e-msg-composer.c:3549
 msgid "_Add attachment..."
 msgstr "_Add attachment..."
 
@@ -5119,7 +5179,7 @@ msgid "Suggest automatic display of attachment"
 msgstr "Suggest automatic display of attachment"
 
 #: calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: composer/e-msg-composer-select-file.c:241
+#: composer/e-msg-composer-select-file.c:239
 msgid "Attach file(s)"
 msgstr "Attach file(s)"
 
@@ -5154,7 +5214,7 @@ msgstr "Attachment Properties"
 
 #: calendar/gui/dialogs/cal-attachment.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:267
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:1163 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 #: widgets/misc/e-attachment.glade.h:3
 msgid "Description:"
@@ -5174,7 +5234,7 @@ msgstr "MIME type:"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: calendar/gui/dialogs/cal-prefs-dialog.c:576 mail/em-account-prefs.c:504
-#: mail/em-composer-prefs.c:891 plugins/plugin-manager/plugin-manager.c:213
+#: mail/em-composer-prefs.c:919 plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Enabled"
 
@@ -5294,7 +5354,7 @@ msgstr "Free/Busy"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:734
+#: calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "Friday"
 
@@ -5308,7 +5368,7 @@ msgstr "Minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:730
+#: calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "Monday"
 
@@ -5322,7 +5382,7 @@ msgstr "S_un"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "Saturday"
 
@@ -5336,7 +5396,7 @@ msgstr "Show week _numbers in date navigator"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1051
-#: calendar/gui/e-itip-control.c:729
+#: calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "Sunday"
 
@@ -5354,7 +5414,7 @@ msgstr "Template:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "Thursday"
 
@@ -5368,7 +5428,7 @@ msgstr "Time format:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "Tuesday"
 
@@ -5378,7 +5438,7 @@ msgstr "W_eek starts:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:732
+#: calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "Wednesday"
 
@@ -5466,27 +5526,40 @@ msgstr "Copy calendar contents locally for offline operation"
 msgid "Copy task list contents locally for offline operation"
 msgstr "Copy task list contents locally for offline operation"
 
-#: calendar/gui/dialogs/calendar-setup.c:341
+#: calendar/gui/dialogs/calendar-setup.c:292
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Copy memo list contents locally for offline operation"
+
+#: calendar/gui/dialogs/calendar-setup.c:343
 #: calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "C_olour:"
 
-#: calendar/gui/dialogs/calendar-setup.c:378
+#: calendar/gui/dialogs/calendar-setup.c:380
 msgid "Tasks List"
 msgstr "Tasks List"
 
-#: calendar/gui/dialogs/calendar-setup.c:447
+#: calendar/gui/dialogs/calendar-setup.c:391
+msgid "Memos List"
+msgstr "Memos List"
+
+#: calendar/gui/dialogs/calendar-setup.c:460
 msgid "Calendar Properties"
 msgstr "Calendar Properties"
 
-#: calendar/gui/dialogs/calendar-setup.c:449
+#: calendar/gui/dialogs/calendar-setup.c:462
 msgid "New Calendar"
 msgstr "New Calendar"
 
-#: calendar/gui/dialogs/calendar-setup.c:515
+#: calendar/gui/dialogs/calendar-setup.c:528
 msgid "Task List Properties"
 msgstr "Task List Properties"
 
+#: calendar/gui/dialogs/calendar-setup.c:594
+#: calendar/gui/memos-component.c:448
+msgid "New Memo List"
+msgstr "New Memo List"
+
 #: calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "Add Calendar"
@@ -5593,103 +5666,103 @@ msgstr " (Due "
 msgid "Due "
 msgstr "Due "
 
-#: calendar/gui/dialogs/comp-editor.c:190 composer/e-msg-composer.c:2664
+#: calendar/gui/dialogs/comp-editor.c:191 composer/e-msg-composer.c:2801
 #, c-format
 msgid "Attached message - %s"
 msgstr "Attached message - %s"
 
 #. translators, this count will always be >1
-#: 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
+#: calendar/gui/dialogs/comp-editor.c:196
+#: calendar/gui/dialogs/comp-editor.c:366 composer/e-msg-composer.c:2806
+#: composer/e-msg-composer.c:2985
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Attached message"
 msgstr[1] "%d attached messages"
 
-#: calendar/gui/dialogs/comp-editor.c:429 composer/e-msg-composer.c:2912
+#: calendar/gui/dialogs/comp-editor.c:430 composer/e-msg-composer.c:3051
 #: mail/em-folder-tree.c:980 mail/em-folder-utils.c:368
 #: mail/em-folder-view.c:931 mail/message-list.c:1719
 msgid "_Move"
 msgstr "_Move"
 
-#: calendar/gui/dialogs/comp-editor.c:431 composer/e-msg-composer.c:2914
+#: calendar/gui/dialogs/comp-editor.c:432 composer/e-msg-composer.c:3053
 #: mail/em-folder-tree.c:982 mail/message-list.c:1721
 msgid "Cancel _Drag"
 msgstr "Cancel _Drag"
 
-#: calendar/gui/dialogs/comp-editor.c:774
+#: calendar/gui/dialogs/comp-editor.c:775
 msgid "Could not update object"
 msgstr "Could not update object"
 
-#: calendar/gui/dialogs/comp-editor.c:977 composer/e-msg-composer.c:2318
+#: calendar/gui/dialogs/comp-editor.c:978 composer/e-msg-composer.c:2444
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Attachment"
 msgstr[1] "<b>%d</b> Attachments"
 
-#: calendar/gui/dialogs/comp-editor.c:1007
+#: calendar/gui/dialogs/comp-editor.c:1008
 msgid "Hide Attachment _Bar"
 msgstr "Hide Attachment _Bar"
 
-#: calendar/gui/dialogs/comp-editor.c:1010
-#: calendar/gui/dialogs/comp-editor.c:1265
+#: calendar/gui/dialogs/comp-editor.c:1011
+#: calendar/gui/dialogs/comp-editor.c:1289
 msgid "Show Attachment _Bar"
 msgstr "Show Attachment _Bar"
 
-#: calendar/gui/dialogs/comp-editor.c:1289
+#: calendar/gui/dialogs/comp-editor.c:1313
 msgid "Attachment Button: Press space key to toggle attachment bar"
 msgstr "Attachment Button: Press space key to toggle attachment bar"
 
-#: calendar/gui/dialogs/comp-editor.c:1868
-#: calendar/gui/dialogs/comp-editor.c:1911
+#: calendar/gui/dialogs/comp-editor.c:1892
+#: calendar/gui/dialogs/comp-editor.c:1935
 msgid "Edit Appointment"
 msgstr "Edit Appointment"
 
-#: calendar/gui/dialogs/comp-editor.c:1874
-#: calendar/gui/dialogs/comp-editor.c:1917
+#: calendar/gui/dialogs/comp-editor.c:1898
+#: calendar/gui/dialogs/comp-editor.c:1941
 #, c-format
 msgid "Meeting - %s"
 msgstr "Meeting - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1876
-#: calendar/gui/dialogs/comp-editor.c:1919
+#: calendar/gui/dialogs/comp-editor.c:1900
+#: calendar/gui/dialogs/comp-editor.c:1943
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appointment - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1880
-#: calendar/gui/dialogs/comp-editor.c:1923
+#: calendar/gui/dialogs/comp-editor.c:1904
+#: calendar/gui/dialogs/comp-editor.c:1947
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Assigned Task - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1882
-#: calendar/gui/dialogs/comp-editor.c:1925
+#: calendar/gui/dialogs/comp-editor.c:1906
+#: calendar/gui/dialogs/comp-editor.c:1949
 #, c-format
 msgid "Task - %s"
 msgstr "Task - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1885
-#: calendar/gui/dialogs/comp-editor.c:1928
+#: calendar/gui/dialogs/comp-editor.c:1909
+#: calendar/gui/dialogs/comp-editor.c:1952
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journal entry - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:1896
-#: calendar/gui/dialogs/comp-editor.c:1938
+#: calendar/gui/dialogs/comp-editor.c:1920
+#: calendar/gui/dialogs/comp-editor.c:1962
 msgid "No summary"
 msgstr "No summary"
 
-#: calendar/gui/dialogs/comp-editor.c:2551
-#: calendar/gui/dialogs/comp-editor.c:2584
+#: calendar/gui/dialogs/comp-editor.c:2575
 #: calendar/gui/dialogs/comp-editor.c:2608
+#: calendar/gui/dialogs/comp-editor.c:2632
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Changes made to this item may be discarded if an update arrives"
 
-#: calendar/gui/dialogs/comp-editor.c:2632
+#: calendar/gui/dialogs/comp-editor.c:2656
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
@@ -5817,26 +5890,26 @@ msgstr "Start time is wrong"
 msgid "End time is wrong"
 msgstr "End time is wrong"
 
-#: calendar/gui/dialogs/event-page.c:1686
+#: calendar/gui/dialogs/event-page.c:1693
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Unable to open the calendar '%s'."
 
-#: calendar/gui/dialogs/event-page.c:1892
+#: calendar/gui/dialogs/event-page.c:1894
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d day before appointment"
 msgstr[1] "%d days before appointment"
 
-#: calendar/gui/dialogs/event-page.c:1900
+#: calendar/gui/dialogs/event-page.c:1902
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hour before appointment"
 msgstr[1] "%d hours before appointment"
 
-#: calendar/gui/dialogs/event-page.c:1908
+#: calendar/gui/dialogs/event-page.c:1910
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -5888,6 +5961,7 @@ msgid "C_ustomize..."
 msgstr "C_ustomize..."
 
 #: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/memo-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Ca_tegories..."
 
@@ -5896,11 +5970,13 @@ msgid "Cale_ndar:"
 msgstr "Cale_ndar:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/memo-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Classi_fication:"
 msgstr "Classi_fication:"
 
 #: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/memo-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:254
 #: calendar/gui/e-cal-model.c:325 calendar/gui/e-calendar-table.c:364
 msgid "Confidential"
@@ -5915,6 +5991,7 @@ msgid "Locat_ion:"
 msgstr "Locat_ion:"
 
 #: calendar/gui/dialogs/event-page.glade.h:18
+#: calendar/gui/dialogs/memo-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:10
 #: calendar/gui/e-cal-list-view.c:253 calendar/gui/e-cal-model.c:323
 #: calendar/gui/e-calendar-table.c:363
@@ -5922,6 +5999,7 @@ msgid "Private"
 msgstr "Private"
 
 #: calendar/gui/dialogs/event-page.glade.h:19
+#: calendar/gui/dialogs/memo-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:11
 #: 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:362
@@ -5970,8 +6048,8 @@ msgstr "<b>From:</b>"
 #. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:315
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: 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
+#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-itip-control.c:1103
+#: composer/e-msg-composer.c:2247 filter/filter-rule.c:881
 #: mail/em-account-editor.c:683 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
@@ -6074,6 +6152,28 @@ msgstr "Organizer"
 msgid "Organizer:"
 msgstr "Organizer:"
 
+#: calendar/gui/dialogs/memo-editor.c:130 calendar/gui/print.c:2311
+msgid "Memo"
+msgstr "Memo"
+
+#: calendar/gui/dialogs/memo-page.c:489
+#, c-format
+msgid "Unable to open memos in '%s'."
+msgstr "Unable to open memos in '%s'."
+
+#: calendar/gui/dialogs/memo-page.glade.h:2
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Basics</span>"
+
+#: calendar/gui/dialogs/memo-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "_Group:"
+msgstr "_Group:"
+
+#: calendar/gui/dialogs/memo-page.glade.h:9
+msgid "_Memo Content:"
+msgstr "_Memo Content:"
+
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Calendar options</b>"
@@ -6262,9 +6362,9 @@ msgstr "<span weight=\"bold\">Status</span>"
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:229
 #: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:659
-#: calendar/gui/e-calendar-table.c:459 calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-calendar-table.c:459 calendar/gui/e-itip-control.c:895
 #: calendar/gui/e-meeting-store.c:196 calendar/gui/e-meeting-store.c:219
-#: calendar/gui/print.c:2370 plugins/save-calendar/csv-format.c:390
+#: calendar/gui/print.c:2372 plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Completed"
 
@@ -6278,7 +6378,7 @@ msgstr "High"
 #: calendar/gui/e-cal-component-preview.c:226
 #: 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:458
-#: calendar/gui/print.c:2367
+#: calendar/gui/print.c:2369
 msgid "In Progress"
 msgstr "In Progress"
 
@@ -6297,7 +6397,7 @@ msgstr "Normal"
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:236
 #: calendar/gui/e-cal-model-tasks.c:342 calendar/gui/e-cal-model-tasks.c:655
-#: calendar/gui/e-calendar-table.c:457 calendar/gui/print.c:2364
+#: calendar/gui/e-calendar-table.c:457 calendar/gui/print.c:2366
 msgid "Not Started"
 msgstr "Not Started"
 
@@ -6327,7 +6427,7 @@ msgstr "_Priority:"
 msgid "_Web Page:"
 msgstr "_Web Page:"
 
-#: calendar/gui/dialogs/task-editor.c:137 calendar/gui/tasks-component.c:1171
+#: calendar/gui/dialogs/task-editor.c:137 calendar/gui/tasks-component.c:1172
 msgid "_Task"
 msgstr "_Task"
 
@@ -6345,7 +6445,7 @@ msgstr "Assig_nment"
 msgid "Due date is wrong"
 msgstr "Due date is wrong"
 
-#: calendar/gui/dialogs/task-page.c:873
+#: calendar/gui/dialogs/task-page.c:880
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Unable to open tasks in '%s'."
@@ -6370,10 +6470,6 @@ msgstr "Task Description"
 msgid "_Due date:"
 msgstr "_Due date:"
 
-#: calendar/gui/dialogs/task-page.glade.h:16
-msgid "_Group:"
-msgstr "_Group:"
-
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>Free/Busy C_alendars</b>"
@@ -6499,17 +6595,27 @@ msgstr "%s at %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
-#: calendar/gui/e-cal-component-preview.c:70 mail/em-folder-view.c:2703
+#: calendar/gui/e-cal-component-memo-preview.c:72
+#: calendar/gui/e-cal-component-preview.c:70 mail/em-folder-view.c:2704
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
 
+#: calendar/gui/e-cal-component-memo-preview.c:199
+msgid "Memo:"
+msgstr "Memo:"
+
+#: calendar/gui/e-cal-component-memo-preview.c:232
+#: calendar/gui/e-cal-component-preview.c:299
+msgid "Web Page:"
+msgstr "Web Page:"
+
 #: calendar/gui/e-cal-component-preview.c:155 filter/filter-rule.c:796
 msgid "Untitled"
 msgstr "Untitled"
 
 #: calendar/gui/e-cal-component-preview.c:186
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1107 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Summary:"
 
@@ -6525,7 +6631,7 @@ msgstr "Due Date:"
 #. write status
 #. Status
 #: calendar/gui/e-cal-component-preview.c:222
-#: calendar/gui/e-itip-control.c:1134
+#: calendar/gui/e-itip-control.c:1131
 #: plugins/exchange-operations/exchange-account-setup.c:265
 #: plugins/itip-formatter/itip-view.c:909
 msgid "Status:"
@@ -6535,10 +6641,6 @@ msgstr "Status:"
 msgid "Priority:"
 msgstr "Priority:"
 
-#: calendar/gui/e-cal-component-preview.c:299
-msgid "Web Page:"
-msgstr "Web Page:"
-
 #: calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "End Date"
@@ -6548,7 +6650,8 @@ msgid "Start Date"
 msgstr "Start Date"
 
 #: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:16
+#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-memo-table.etspec.h:4 mail/mail-dialogs.glade.h:16
 #: plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "Summary"
@@ -6587,11 +6690,12 @@ msgstr "No"
 
 #. This is the default filename used for temporary file creation
 #: 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-cal-popup.c:106 calendar/gui/e-cal-popup.c:121
+#: calendar/gui/e-cal-popup.c:165 calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1289 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:1244 plugins/itip-formatter/itip-formatter.c:240
+#: mail/em-utils.c:1283 plugins/itip-formatter/itip-formatter.c:240
 #: plugins/itip-formatter/itip-formatter.c:1652
 #: plugins/plugin-manager/plugin-manager.c:72
 #: widgets/misc/e-attachment-bar.c:665 widgets/misc/e-charset-picker.c:62
@@ -6606,6 +6710,38 @@ msgstr "Recurring"
 msgid "Assigned"
 msgstr "Assigned"
 
+#: calendar/gui/e-cal-popup.c:171 mail/em-popup.c:411
+msgid "Save As..."
+msgstr "Save As..."
+
+#: calendar/gui/e-cal-popup.c:187 mail/em-format-html-display.c:1812
+msgid "Select folder to save selected attachments..."
+msgstr "Select folder to save selected attachments..."
+
+#: calendar/gui/e-cal-popup.c:216 mail/em-popup.c:436
+#, c-format
+msgid "untitled_image.%s"
+msgstr "untitled_image.%s"
+
+#: calendar/gui/e-cal-popup.c:270 calendar/gui/e-calendar-table.c:1169
+#: calendar/gui/e-calendar-view.c:1550 calendar/gui/e-memo-table.c:847
+#: mail/em-folder-view.c:1045 mail/em-popup.c:553 mail/em-popup.c:564
+msgid "_Save As..."
+msgstr "_Save As..."
+
+#: calendar/gui/e-cal-popup.c:271 mail/em-popup.c:554 mail/em-popup.c:565
+msgid "Set as _Background"
+msgstr "Set as _Background"
+
+#: calendar/gui/e-cal-popup.c:272
+msgid "_Save Selected"
+msgstr "_Save Selected"
+
+#: calendar/gui/e-cal-popup.c:394 mail/em-popup.c:774
+#, c-format
+msgid "Open in %s..."
+msgstr "Open in %s..."
+
 #: calendar/gui/e-calendar-table.c:406
 msgid "0%"
 msgstr "0%"
@@ -6655,44 +6791,45 @@ msgid "Task Table"
 msgstr "Task Table"
 
 #: calendar/gui/e-calendar-table.c:696 calendar/gui/e-calendar-view.c:671
+#: calendar/gui/e-memo-table.c:426
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
 
 #: calendar/gui/e-calendar-table.c:875 calendar/gui/e-calendar-view.c:799
+#: calendar/gui/e-memo-table.c:603
 msgid "Updating objects"
 msgstr "Updating objects"
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-view.c:1126
-#: composer/e-msg-composer.c:1243
+#: calendar/gui/e-memo-table.c:735 composer/e-msg-composer.c:1342
 msgid "Save as..."
 msgstr "Save as..."
 
-#: calendar/gui/e-calendar-table.c:1168
+#: calendar/gui/e-calendar-table.c:1168 calendar/gui/e-memo-table.c:846
 msgid "Open _Web Page"
 msgstr "Open _Web Page"
 
-#: calendar/gui/e-calendar-table.c:1169 calendar/gui/e-calendar-view.c:1550
-#: mail/em-folder-view.c:1045 mail/em-popup.c:541 mail/em-popup.c:552
-msgid "_Save As..."
-msgstr "_Save As..."
-
 #: calendar/gui/e-calendar-table.c:1170 calendar/gui/e-calendar-view.c:1530
-#: calendar/gui/e-calendar-view.c:1551 mail/em-folder-view.c:1046
+#: calendar/gui/e-calendar-view.c:1551 calendar/gui/e-memo-table.c:848
+#: 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:119 ui/evolution-tasks.xml.h:29
+#: ui/evolution-mail-message.xml.h:119 ui/evolution-memos.xml.h:20
+#: ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Print..."
 
 #: calendar/gui/e-calendar-table.c:1174 calendar/gui/e-calendar-view.c:1555
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: calendar/gui/e-memo-table.c:852 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-memos.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ut"
 
 #: calendar/gui/e-calendar-table.c:1176 calendar/gui/e-calendar-view.c:1533
-#: calendar/gui/e-calendar-view.c:1557 ui/evolution-addressbook.xml.h:39
-#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
+#: calendar/gui/e-calendar-view.c:1557 calendar/gui/e-memo-table.c:854
+#: ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:43
+#: ui/evolution-composer-entries.xml.h:9 ui/evolution-memos.xml.h:19
 #: ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_Paste"
@@ -6701,7 +6838,8 @@ msgstr "_Paste"
 msgid "_Assign Task"
 msgstr "_Assign Task"
 
-#: calendar/gui/e-calendar-table.c:1181 ui/evolution-tasks.xml.h:26
+#: calendar/gui/e-calendar-table.c:1181 calendar/gui/e-memo-table.c:858
+#: ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Forward as iCalendar"
 
@@ -6885,93 +7023,93 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:763
+#: calendar/gui/e-itip-control.c:760
 msgid "Yes. (Complex Recurrence)"
 msgstr "Yes. (Complex Recurrence)"
 
-#: calendar/gui/e-itip-control.c:774
+#: calendar/gui/e-itip-control.c:771
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Every day"
 msgstr[1] "Every day"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:776
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Every week"
 msgstr[1] "Every week"
 
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:778
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Every week on "
 msgstr[1] "Every week on "
 
-#: calendar/gui/e-itip-control.c:789
+#: calendar/gui/e-itip-control.c:786
 msgid " and "
 msgstr " and "
 
-#: calendar/gui/e-itip-control.c:796
+#: calendar/gui/e-itip-control.c:793
 #, c-format
 msgid "The %s day of "
 msgstr "The %s day of "
 
-#: calendar/gui/e-itip-control.c:809
+#: calendar/gui/e-itip-control.c:806
 #, c-format
 msgid "The %s %s of "
 msgstr "The %s %s of "
 
-#: calendar/gui/e-itip-control.c:816
+#: calendar/gui/e-itip-control.c:813
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "every month"
 msgstr[1] "every month"
 
-#: calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:817
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Every year"
 msgstr[1] "Every year"
 
-#: calendar/gui/e-itip-control.c:831
+#: calendar/gui/e-itip-control.c:828
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "a total of %d time"
 msgstr[1] " a total of %d times"
 
-#: calendar/gui/e-itip-control.c:840
+#: calendar/gui/e-itip-control.c:837
 msgid ", ending on "
 msgstr ", ending on "
 
-#: calendar/gui/e-itip-control.c:864
+#: calendar/gui/e-itip-control.c:861
 msgid "Starts"
 msgstr "Starts"
 
-#: calendar/gui/e-itip-control.c:877
+#: calendar/gui/e-itip-control.c:874
 msgid "Ends"
 msgstr "Ends"
 
-#: calendar/gui/e-itip-control.c:911 plugins/save-calendar/csv-format.c:395
+#: calendar/gui/e-itip-control.c:908 plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Due"
 
-#: calendar/gui/e-itip-control.c:951 calendar/gui/e-itip-control.c:1008
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-itip-control.c:1005
 msgid "iCalendar Information"
 msgstr "iCalendar Information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:965
 msgid "iCalendar Error"
 msgstr "iCalendar Error"
 
-#: 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
+#: calendar/gui/e-itip-control.c:1037 calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1064 calendar/gui/e-itip-control.c:1081
 #: plugins/itip-formatter/itip-view.c:338
 #: plugins/itip-formatter/itip-view.c:339
 #: plugins/itip-formatter/itip-view.c:406
@@ -6980,7 +7118,7 @@ msgid "An unknown person"
 msgstr "An unknown person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1091
+#: calendar/gui/e-itip-control.c:1088
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6988,25 +7126,25 @@ msgstr ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 
-#: calendar/gui/e-itip-control.c:1139 calendar/gui/e-meeting-list-view.c:204
+#: calendar/gui/e-itip-control.c:1136 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:548 plugins/itip-formatter/itip-formatter.c:1640
+#: calendar/gui/itip-utils.c:546 plugins/itip-formatter/itip-formatter.c:1640
 msgid "Accepted"
 msgstr "Accepted"
 
-#: calendar/gui/e-itip-control.c:1143 calendar/gui/itip-utils.c:551
+#: calendar/gui/e-itip-control.c:1140 calendar/gui/itip-utils.c:549
 #: plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
-#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-meeting-list-view.c:205
+#: calendar/gui/e-itip-control.c:1144 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:554 calendar/gui/itip-utils.c:583
+#: calendar/gui/itip-utils.c:552 calendar/gui/itip-utils.c:581
 #: plugins/itip-formatter/itip-formatter.c:1646
 msgid "Declined"
 msgstr "Declined"
 
-#: calendar/gui/e-itip-control.c:1231
+#: calendar/gui/e-itip-control.c:1228
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
@@ -7014,266 +7152,266 @@ msgstr ""
 "The meeting has been cancelled. However, it could not be found in your "
 "calendars"
 
-#: calendar/gui/e-itip-control.c:1233
+#: calendar/gui/e-itip-control.c:1230
 msgid ""
 "The task has been cancelled, however it could not be found in your task lists"
 msgstr ""
 "The task has been cancelled. However, it could not be found in your task "
 "lists"
 
-#: calendar/gui/e-itip-control.c:1312
+#: calendar/gui/e-itip-control.c:1309
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> has published meeting information."
 
-#: calendar/gui/e-itip-control.c:1313
+#: calendar/gui/e-itip-control.c:1310
 msgid "Meeting Information"
 msgstr "Meeting Information"
 
-#: calendar/gui/e-itip-control.c:1319
+#: calendar/gui/e-itip-control.c:1316
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> requests the presence of %s at a meeting."
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1318
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> requests your presence at a meeting."
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1319
 msgid "Meeting Proposal"
 msgstr "Meeting Proposal"
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> wishes to add to an existing meeting."
 
-#: calendar/gui/e-itip-control.c:1329
+#: calendar/gui/e-itip-control.c:1326
 msgid "Meeting Update"
 msgstr "Meeting Update"
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wishes to receive the latest meeting information."
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1331
 msgid "Meeting Update Request"
 msgstr "Meeting Update Request"
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> has replied to a meeting request."
 
-#: calendar/gui/e-itip-control.c:1342
+#: calendar/gui/e-itip-control.c:1339
 msgid "Meeting Reply"
 msgstr "Meeting Reply"
 
-#: calendar/gui/e-itip-control.c:1349
+#: calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> has cancelled a meeting."
 
-#: calendar/gui/e-itip-control.c:1350
+#: calendar/gui/e-itip-control.c:1347
 msgid "Meeting Cancellation"
 msgstr "Meeting Cancelation"
 
-#: calendar/gui/e-itip-control.c:1360 calendar/gui/e-itip-control.c:1437
-#: calendar/gui/e-itip-control.c:1477
+#: calendar/gui/e-itip-control.c:1357 calendar/gui/e-itip-control.c:1434
+#: calendar/gui/e-itip-control.c:1474
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> has sent an unintelligible message."
 
-#: calendar/gui/e-itip-control.c:1361
+#: calendar/gui/e-itip-control.c:1358
 msgid "Bad Meeting Message"
 msgstr "Bad Meeting Message"
 
-#: calendar/gui/e-itip-control.c:1388
+#: calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> has published task information."
 
-#: calendar/gui/e-itip-control.c:1389
+#: calendar/gui/e-itip-control.c:1386
 msgid "Task Information"
 msgstr "Task Information"
 
-#: calendar/gui/e-itip-control.c:1396
+#: calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> requests %s to perform a task."
 
-#: calendar/gui/e-itip-control.c:1398
+#: calendar/gui/e-itip-control.c:1395
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> requests you perform a task."
 
-#: calendar/gui/e-itip-control.c:1399
+#: calendar/gui/e-itip-control.c:1396
 msgid "Task Proposal"
 msgstr "Task Proposal"
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1402
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> wishes to add to an existing task."
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1403
 msgid "Task Update"
 msgstr "Task Update"
 
-#: calendar/gui/e-itip-control.c:1410
+#: calendar/gui/e-itip-control.c:1407
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wishes to receive the latest task information."
 
-#: calendar/gui/e-itip-control.c:1411
+#: calendar/gui/e-itip-control.c:1408
 msgid "Task Update Request"
 msgstr "Task Update Request"
 
-#: calendar/gui/e-itip-control.c:1418
+#: calendar/gui/e-itip-control.c:1415
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> has replied to a task assignment."
 
-#: calendar/gui/e-itip-control.c:1419
+#: calendar/gui/e-itip-control.c:1416
 msgid "Task Reply"
 msgstr "Task Reply"
 
-#: calendar/gui/e-itip-control.c:1426
+#: calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> has cancelled a task."
 
-#: calendar/gui/e-itip-control.c:1427
+#: calendar/gui/e-itip-control.c:1424
 msgid "Task Cancellation"
 msgstr "Task Cancelation"
 
-#: calendar/gui/e-itip-control.c:1438
+#: calendar/gui/e-itip-control.c:1435
 msgid "Bad Task Message"
 msgstr "Bad Task Message"
 
-#: calendar/gui/e-itip-control.c:1462
+#: calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> has published free/busy information."
 
-#: calendar/gui/e-itip-control.c:1463
+#: calendar/gui/e-itip-control.c:1460
 msgid "Free/Busy Information"
 msgstr "Free/Busy Information"
 
-#: calendar/gui/e-itip-control.c:1467
+#: calendar/gui/e-itip-control.c:1464
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> requests your free/busy information."
 
-#: calendar/gui/e-itip-control.c:1468
+#: calendar/gui/e-itip-control.c:1465
 msgid "Free/Busy Request"
 msgstr "Free/Busy Request"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1469
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> has replied to a free/busy request."
 
-#: calendar/gui/e-itip-control.c:1473
+#: calendar/gui/e-itip-control.c:1470
 msgid "Free/Busy Reply"
 msgstr "Free/Busy Reply"
 
-#: calendar/gui/e-itip-control.c:1478
+#: calendar/gui/e-itip-control.c:1475
 msgid "Bad Free/Busy Message"
 msgstr "Bad Free/Busy Message"
 
-#: calendar/gui/e-itip-control.c:1553
+#: calendar/gui/e-itip-control.c:1550
 msgid "The message does not appear to be properly formed"
 msgstr "The message does not appear to be properly formed"
 
-#: calendar/gui/e-itip-control.c:1612
+#: calendar/gui/e-itip-control.c:1609
 msgid "The message contains only unsupported requests."
 msgstr "The message contains only unsupported requests."
 
-#: calendar/gui/e-itip-control.c:1645
+#: calendar/gui/e-itip-control.c:1642
 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:1677
+#: calendar/gui/e-itip-control.c:1674
 msgid "The attachment has no viewable calendar items"
 msgstr "The attachment has no viewable calendar items"
 
-#: calendar/gui/e-itip-control.c:1911
+#: calendar/gui/e-itip-control.c:1908
 msgid "Update complete\n"
 msgstr "Update complete\n"
 
-#: calendar/gui/e-itip-control.c:1939
+#: calendar/gui/e-itip-control.c:1936
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is invalid and cannot be updated\n"
 
-#: calendar/gui/e-itip-control.c:1949
+#: calendar/gui/e-itip-control.c:1946
 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:1961
+#: calendar/gui/e-itip-control.c:1958
 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:1978
+#: calendar/gui/e-itip-control.c:1975
 msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
-#: calendar/gui/e-itip-control.c:1981
+#: calendar/gui/e-itip-control.c:1978
 #: plugins/itip-formatter/itip-formatter.c:1025
 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:2011
+#: calendar/gui/e-itip-control.c:2008
 msgid "Removal Complete"
 msgstr "Removal Complete"
 
-#: calendar/gui/e-itip-control.c:2034 calendar/gui/e-itip-control.c:2082
+#: calendar/gui/e-itip-control.c:2031 calendar/gui/e-itip-control.c:2079
 msgid "Item sent!\n"
 msgstr "Item sent!\n"
 
-#: calendar/gui/e-itip-control.c:2036 calendar/gui/e-itip-control.c:2086
+#: calendar/gui/e-itip-control.c:2033 calendar/gui/e-itip-control.c:2083
 msgid "The item could not be sent!\n"
 msgstr "The item could not be sent!\n"
 
-#: calendar/gui/e-itip-control.c:2166
+#: calendar/gui/e-itip-control.c:2163
 msgid "Choose an action:"
 msgstr "Choose an action:"
 
-#: calendar/gui/e-itip-control.c:2237
+#: calendar/gui/e-itip-control.c:2234
 msgid "Update"
 msgstr "Update"
 
-#: calendar/gui/e-itip-control.c:2265
+#: calendar/gui/e-itip-control.c:2262
 #: plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Accept"
 
-#: calendar/gui/e-itip-control.c:2266
+#: calendar/gui/e-itip-control.c:2263
 msgid "Tentatively accept"
 msgstr "Tentatively accept"
 
-#: calendar/gui/e-itip-control.c:2267
+#: calendar/gui/e-itip-control.c:2264
 #: plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Decline"
 
-#: calendar/gui/e-itip-control.c:2296
+#: calendar/gui/e-itip-control.c:2293
 msgid "Send Free/Busy Information"
 msgstr "Send Free/Busy Information"
 
-#: calendar/gui/e-itip-control.c:2324
+#: calendar/gui/e-itip-control.c:2321
 msgid "Update respondent status"
 msgstr "Update respondent status"
 
-#: calendar/gui/e-itip-control.c:2352
+#: calendar/gui/e-itip-control.c:2349
 msgid "Send Latest Information"
 msgstr "Send Latest Information"
 
-#: calendar/gui/e-itip-control.c:2380 calendar/gui/itip-utils.c:571
+#: calendar/gui/e-itip-control.c:2377 calendar/gui/itip-utils.c:569
 #: mail/mail-send-recv.c:414 mail/mail-send-recv.c:466
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7386,7 +7524,7 @@ msgid "Tentative"
 msgstr "Tentative"
 
 #: 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:557
+#: calendar/gui/e-meeting-store.c:217 calendar/gui/itip-utils.c:555
 #: plugins/itip-formatter/itip-formatter.c:1649
 msgid "Delegated"
 msgstr "Delegated"
@@ -7486,12 +7624,24 @@ msgstr "_Required people"
 msgid "Required people and _one resource"
 msgstr "Required people and _one resource"
 
-#: calendar/gui/e-pub-utils.c:311
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Enter the password for %s"
+#: calendar/gui/e-memo-table.c:267
+msgid "Memo Table"
+msgstr "Memo Table"
+
+#: calendar/gui/e-memo-table.c:863
+msgid "_Delete Selected Memos"
+msgstr "_Delete Selected Memos"
+
+#: calendar/gui/e-memo-table.c:986 calendar/gui/e-memo-table.etspec.h:2
+msgid "Click to add a memo"
+msgstr "Click to add a memo"
+
+#: calendar/gui/e-memo-table.etspec.h:3
+msgid "Memo sort"
+msgstr "Memo sort"
 
-#: calendar/gui/e-tasks.c:824 calendar/gui/gnome-cal.c:2551
+#: calendar/gui/e-memos.c:727 calendar/gui/e-tasks.c:822
+#: calendar/gui/gnome-cal.c:2553
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7500,24 +7650,38 @@ msgstr ""
 "Error on %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:872
+#: calendar/gui/e-memos.c:775
+msgid "Loading memos"
+msgstr "Loading memos"
+
+#: calendar/gui/e-memos.c:860
+#, c-format
+msgid "Opening memos at %s"
+msgstr "Opening memos at %s"
+
+#: calendar/gui/e-memos.c:1033 calendar/gui/e-tasks.c:1225
+msgid "Deleting selected objects..."
+msgstr "Deleting selected objects..."
+
+#: calendar/gui/e-pub-utils.c:311
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Enter the password for %s"
+
+#: calendar/gui/e-tasks.c:870
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: calendar/gui/e-tasks.c:956
+#: calendar/gui/e-tasks.c:957
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
 
-#: calendar/gui/e-tasks.c:1201
+#: calendar/gui/e-tasks.c:1202
 msgid "Completing tasks..."
 msgstr "Completing tasks..."
 
-#: calendar/gui/e-tasks.c:1224
-msgid "Deleting selected objects..."
-msgstr "Deleting selected objects..."
-
-#: calendar/gui/e-tasks.c:1251
+#: calendar/gui/e-tasks.c:1252
 msgid "Expunging"
 msgstr "Expunging"
 
@@ -7548,22 +7712,22 @@ msgstr "_Save Custom View"
 msgid "_Define Views..."
 msgstr "_Define Views..."
 
-#: calendar/gui/gnome-cal.c:2397
+#: calendar/gui/gnome-cal.c:2396
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Loading appointments at %s"
 
-#: calendar/gui/gnome-cal.c:2416
+#: calendar/gui/gnome-cal.c:2415
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Loading tasks at %s"
 
-#: calendar/gui/gnome-cal.c:2517
+#: calendar/gui/gnome-cal.c:2519
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
 
-#: calendar/gui/gnome-cal.c:3408
+#: calendar/gui/gnome-cal.c:3411
 msgid "Purging"
 msgstr "Purging"
 
@@ -7623,60 +7787,120 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Select Today"
 
-#: calendar/gui/itip-utils.c:353 calendar/gui/itip-utils.c:402
-#: calendar/gui/itip-utils.c:442
+#: calendar/gui/itip-utils.c:351 calendar/gui/itip-utils.c:400
+#: calendar/gui/itip-utils.c:440
 msgid "An organizer must be set."
 msgstr "An organizer must be set."
 
-#: calendar/gui/itip-utils.c:389
+#: calendar/gui/itip-utils.c:387
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: calendar/gui/itip-utils.c:510 calendar/gui/itip-utils.c:632
+#: calendar/gui/itip-utils.c:508 calendar/gui/itip-utils.c:630
 msgid "Event information"
 msgstr "Event information"
 
-#: calendar/gui/itip-utils.c:512 calendar/gui/itip-utils.c:634
+#: calendar/gui/itip-utils.c:510 calendar/gui/itip-utils.c:632
 msgid "Task information"
 msgstr "Task information"
 
-#: calendar/gui/itip-utils.c:514 calendar/gui/itip-utils.c:636
+#: calendar/gui/itip-utils.c:512 calendar/gui/itip-utils.c:634
 msgid "Journal information"
 msgstr "Journal information"
 
-#: calendar/gui/itip-utils.c:516 calendar/gui/itip-utils.c:654
+#: calendar/gui/itip-utils.c:514 calendar/gui/itip-utils.c:652
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:516
 msgid "Calendar information"
 msgstr "Calendar information"
 
-#: calendar/gui/itip-utils.c:567
+#: calendar/gui/itip-utils.c:565
 msgid "Updated"
 msgstr "Updated"
 
-#: calendar/gui/itip-utils.c:575
+#: calendar/gui/itip-utils.c:573
 msgid "Refresh"
 msgstr "Refresh"
 
-#: calendar/gui/itip-utils.c:579
+#: calendar/gui/itip-utils.c:577
 msgid "Counter-proposal"
 msgstr "Counter-proposal"
 
-#: calendar/gui/itip-utils.c:650
+#: calendar/gui/itip-utils.c:648
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Free/Busy information (%s to %s)"
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:658
 msgid "iCalendar information"
 msgstr "iCalendar information"
 
-#: calendar/gui/itip-utils.c:815
+#: calendar/gui/itip-utils.c:813
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
+#: calendar/gui/memos-component.c:524
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d memo"
+msgstr[1] "%d memos"
+
+#: calendar/gui/memos-component.c:526 calendar/gui/tasks-component.c:517
+#: mail/mail-component.c:548
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", %d selected"
+msgstr[1] ", %d selected"
+
+#: calendar/gui/memos-component.c:573
+msgid "Failed upgrading memos."
+msgstr "Failed upgrading memos."
+
+#: calendar/gui/memos-component.c:869
+#, c-format
+msgid "Unable to open the memo list '%s' for creating events and meetings"
+msgstr "Unable to open the memo list '%s' for creating events and meetings"
+
+#: calendar/gui/memos-component.c:882
+msgid "There is no calendar available for creating memos"
+msgstr "There is no calendar available for creating memos"
+
+#: calendar/gui/memos-component.c:973
+msgid "Memo Source Selector"
+msgstr "Memo Source Selector"
+
+#: calendar/gui/memos-component.c:1156
+msgid "New memo"
+msgstr "New memo"
+
+#: calendar/gui/memos-component.c:1157
+msgid "_Memo"
+msgstr "_Memo"
+
+#: calendar/gui/memos-component.c:1158
+msgid "Create a new memo"
+msgstr "Create a new memo"
+
+#: calendar/gui/memos-component.c:1164
+msgid "New memo list"
+msgstr "New memo list"
+
+#: calendar/gui/memos-component.c:1165
+msgid "Memo l_ist"
+msgstr "Memo l_ist"
+
+#: calendar/gui/memos-component.c:1166
+msgid "Create a new memo list"
+msgstr "Create a new memo list"
+
+#: calendar/gui/memos-control.c:334
+msgid "Print Memos"
+msgstr "Print Memos"
+
 #: calendar/gui/migration.c:151
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -7911,51 +8135,51 @@ msgstr "Appointment"
 msgid "Task"
 msgstr "Task"
 
-#: calendar/gui/print.c:2329
+#: calendar/gui/print.c:2331
 #, c-format
 msgid "Summary: %s"
 msgstr "Summary: %s"
 
-#: calendar/gui/print.c:2337
+#: calendar/gui/print.c:2339
 #, c-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2382
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2397
+#: calendar/gui/print.c:2399
 #, c-format
 msgid "Priority: %s"
 msgstr "Priority: %s"
 
-#: calendar/gui/print.c:2409
+#: calendar/gui/print.c:2411
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percent Complete: %i"
 
-#: calendar/gui/print.c:2421
+#: calendar/gui/print.c:2423
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2435
+#: calendar/gui/print.c:2437
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: calendar/gui/print.c:2446
+#: calendar/gui/print.c:2448
 msgid "Contacts: "
 msgstr "Contacts: "
 
-#: calendar/gui/print.c:2586 calendar/gui/print.c:2674
-#: calendar/gui/print.c:2800 mail/em-format-html-print.c:178
+#: calendar/gui/print.c:2588 calendar/gui/print.c:2676
+#: calendar/gui/print.c:2802 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Print Preview"
 
-#: calendar/gui/print.c:2621
+#: calendar/gui/print.c:2623
 msgid "Print Item"
 msgstr "Print Item"
 
@@ -7970,59 +8194,52 @@ msgid_plural "%d tasks"
 msgstr[0] "%d task"
 msgstr[1] "%d tasks"
 
-#: calendar/gui/tasks-component.c:517 mail/mail-component.c:548
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", %d selected"
-msgstr[1] ", %d selected"
-
 #: calendar/gui/tasks-component.c:564
 msgid "Failed upgrading tasks."
 msgstr "Failed upgrading tasks."
 
-#: calendar/gui/tasks-component.c:872
+#: calendar/gui/tasks-component.c:875
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Unable to open the task list '%s' for creating events and meetings"
 
-#: calendar/gui/tasks-component.c:887
+#: calendar/gui/tasks-component.c:888
 msgid "There is no calendar available for creating tasks"
 msgstr "There is no calendar available for creating tasks"
 
-#: calendar/gui/tasks-component.c:987
+#: calendar/gui/tasks-component.c:988
 msgid "Task Source Selector"
 msgstr "Task Source Selector"
 
-#: calendar/gui/tasks-component.c:1170
+#: calendar/gui/tasks-component.c:1171
 msgid "New task"
 msgstr "New task"
 
-#: calendar/gui/tasks-component.c:1172
+#: calendar/gui/tasks-component.c:1173
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: calendar/gui/tasks-component.c:1178
+#: calendar/gui/tasks-component.c:1179
 msgid "New assigned task"
 msgstr "New assigned task"
 
-#: calendar/gui/tasks-component.c:1179
+#: calendar/gui/tasks-component.c:1180
 msgid "Assigne_d Task"
 msgstr "Assigne_d Task"
 
-#: calendar/gui/tasks-component.c:1180
+#: calendar/gui/tasks-component.c:1181
 msgid "Create a new assigned task"
 msgstr "Create a new assigned task"
 
-#: calendar/gui/tasks-component.c:1186
+#: calendar/gui/tasks-component.c:1187
 msgid "New task list"
 msgstr "New task list"
 
-#: calendar/gui/tasks-component.c:1187
+#: calendar/gui/tasks-component.c:1188
 msgid "Task l_ist"
 msgstr "Task l_ist"
 
-#: calendar/gui/tasks-component.c:1188
+#: calendar/gui/tasks-component.c:1189
 msgid "Create a new task list"
 msgstr "Create a new task list"
 
@@ -9701,13 +9918,13 @@ msgstr "Post To:"
 msgid "A_ttach"
 msgstr "A_ttach"
 
-#: composer/e-msg-composer.c:738
+#: composer/e-msg-composer.c:832
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 
-#: composer/e-msg-composer.c:745
+#: composer/e-msg-composer.c:839
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -9715,47 +9932,47 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 
-#: composer/e-msg-composer.c:1224 composer/e-msg-composer.c:1257
+#: composer/e-msg-composer.c:1323 composer/e-msg-composer.c:1357
 #: plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
-#: composer/e-msg-composer.c:1294
+#: composer/e-msg-composer.c:1395
 msgid "Could not open file"
 msgstr "Could not open file"
 
-#: composer/e-msg-composer.c:1302
+#: composer/e-msg-composer.c:1403
 msgid "Unable to retrieve message from editor"
 msgstr "Unable to retrieve message from editor"
 
-#: composer/e-msg-composer.c:1572
+#: composer/e-msg-composer.c:1678
 msgid "Untitled Message"
 msgstr "Untitled Message"
 
 #. NB: This function is never used anymore
-#: composer/e-msg-composer.c:1606
+#: composer/e-msg-composer.c:1713
 msgid "Open File"
 msgstr "Open File"
 
-#: composer/e-msg-composer.c:2006 mail/em-account-editor.c:588
+#: composer/e-msg-composer.c:2127 mail/em-account-editor.c:588
 #: mail/em-account-editor.c:633 mail/em-account-editor.c:700
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
-#: composer/e-msg-composer.c:2105
+#: composer/e-msg-composer.c:2230
 msgid "Si_gnature:"
 msgstr "Si_gnature:"
 
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3527
-#: composer/e-msg-composer.c:3528
+#: composer/e-msg-composer.c:2473 composer/e-msg-composer.c:3674
+#: composer/e-msg-composer.c:3677
 msgid "Compose a message"
 msgstr "Compose a message"
 
-#: composer/e-msg-composer.c:3643
+#: composer/e-msg-composer.c:3792
 msgid "_Attachment Bar"
 msgstr "_Attachment Bar"
 
-#: composer/e-msg-composer.c:4722
+#: composer/e-msg-composer.c:4882
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -9789,7 +10006,7 @@ msgstr ""
 "Because &quot;{0}&quot;, you may need to select different mail options."
 
 #: composer/mail-composer.error.xml.h:5 e-util/e-system.error.xml.h:1
-#: mail/mail.error.xml.h:17
+#: mail/mail.error.xml.h:18
 msgid "Because &quot;{1}&quot;."
 msgstr "Because &quot;{1}&quot;."
 
@@ -10025,7 +10242,7 @@ msgstr ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
 
-#: e-util/e-dialog-utils.c:267
+#: e-util/e-dialog-utils.c:270
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10033,7 +10250,7 @@ msgstr ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 
-#: e-util/e-dialog-utils.c:269 e-util/e-system.error.xml.h:6
+#: e-util/e-dialog-utils.c:272 e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Overwrite file?"
 
@@ -10077,7 +10294,7 @@ msgstr "Do you wish to overwrite it?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "File exists &quot;{0}&quot;."
 
-#: e-util/e-system.error.xml.h:7 mail/mail.error.xml.h:122
+#: e-util/e-system.error.xml.h:7 mail/mail.error.xml.h:126
 msgid "_Overwrite"
 msgstr "_Overwrite"
 
@@ -10310,11 +10527,11 @@ msgstr "Replies and parents"
 msgid "Include threads"
 msgstr "Include threads"
 
-#: filter/filter-rule.c:978 filter/filter.glade.h:3 mail/em-utils.c:291
+#: filter/filter-rule.c:978 filter/filter.glade.h:3 mail/em-utils.c:330
 msgid "Incoming"
 msgstr "Incoming"
 
-#: filter/filter-rule.c:978 mail/em-utils.c:292
+#: filter/filter-rule.c:978 mail/em-utils.c:331
 msgid "Outgoing"
 msgstr "Outgoing"
 
@@ -10338,7 +10555,7 @@ msgstr "Missing date."
 msgid "Missing file name."
 msgstr "Missing file name."
 
-#: filter/filter.error.xml.h:6 mail/mail.error.xml.h:65
+#: filter/filter.error.xml.h:6 mail/mail.error.xml.h:67
 msgid "Missing name."
 msgstr "Missing name."
 
@@ -10587,35 +10804,35 @@ msgstr "Protocol"
 msgid "Mail Accounts Table"
 msgstr "Mail Accounts Table"
 
-#: mail/em-composer-prefs.c:307 mail/em-composer-prefs.c:430
+#: mail/em-composer-prefs.c:309 mail/em-composer-prefs.c:435
 #: mail/mail-config.c:958
 msgid "Unnamed"
 msgstr "Unnamed"
 
-#: mail/em-composer-prefs.c:897
+#: mail/em-composer-prefs.c:925
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: mail/em-composer-prefs.c:940
+#: mail/em-composer-prefs.c:968
 msgid "Add signature script"
 msgstr "Add signature script"
 
-#: mail/em-composer-prefs.c:960
+#: mail/em-composer-prefs.c:988
 msgid "Signature(s)"
 msgstr "Signature(s)"
 
-#: mail/em-composer-utils.c:853 mail/em-format-quote.c:389
+#: mail/em-composer-utils.c:848 mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: mail/em-composer-utils.c:1648
+#: mail/em-composer-utils.c:1643
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
 #. 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:1695
+#: mail/em-composer-utils.c:1690
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11020,7 +11237,7 @@ msgstr "_New Folder..."
 msgid "_Rename..."
 msgstr "_Rename..."
 
-#: mail/em-folder-tree.c:2060 mail/mail.error.xml.h:119
+#: mail/em-folder-tree.c:2060 mail/mail.error.xml.h:123
 msgid "_Empty Trash"
 msgstr "_Empty Trash"
 
@@ -11068,7 +11285,7 @@ msgstr "Create folder"
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
-#: mail/em-folder-view.c:1039 mail/em-popup.c:546 mail/em-popup.c:557
+#: mail/em-folder-view.c:1039 mail/em-popup.c:558 mail/em-popup.c:569
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
@@ -11076,7 +11293,7 @@ msgstr "Reply to _All"
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: mail/em-folder-view.c:1041 mail/em-popup.c:548 mail/em-popup.c:559
+#: mail/em-folder-view.c:1041 mail/em-popup.c:560 mail/em-popup.c:571
 #: ui/evolution-mail-message.xml.h:107
 msgid "_Forward"
 msgstr "_Forward"
@@ -11170,52 +11387,52 @@ msgid "Filter on _Mailing List"
 msgstr "Filter on _Mailing List"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1921 mail/em-folder-view.c:1965
+#: mail/em-folder-view.c:1922 mail/em-folder-view.c:1966
 msgid "Default"
 msgstr "Default"
 
-#: mail/em-folder-view.c:2064
+#: mail/em-folder-view.c:2065
 #: plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Print Message"
 
-#: mail/em-folder-view.c:2220
+#: mail/em-folder-view.c:2221
 msgid "Unable to retrieve message"
 msgstr "Unable to retrieve message"
 
-#: mail/em-folder-view.c:2413
+#: mail/em-folder-view.c:2414
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: mail/em-folder-view.c:2415
+#: mail/em-folder-view.c:2416
 msgid "Create _Search Folder"
 msgstr "Create _Search Folder"
 
-#: mail/em-folder-view.c:2416
+#: mail/em-folder-view.c:2417
 msgid "_From this Address"
 msgstr "_From this Address"
 
-#: mail/em-folder-view.c:2417
+#: mail/em-folder-view.c:2418
 msgid "_To this Address"
 msgstr "_To this Address"
 
-#: mail/em-folder-view.c:2698
+#: mail/em-folder-view.c:2699
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
 
 #. message-search popup match count string
-#: mail/em-format-html-display.c:455
+#: mail/em-format-html-display.c:461
 #, c-format
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: mail/em-format-html-display.c:706 mail/em-format-html.c:597
+#: mail/em-format-html-display.c:712 mail/em-format-html.c:597
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: mail/em-format-html-display.c:706
+#: mail/em-format-html-display.c:712
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11223,11 +11440,11 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: mail/em-format-html-display.c:707 mail/em-format-html.c:598
+#: mail/em-format-html-display.c:713 mail/em-format-html.c:598
 msgid "Valid signature"
 msgstr "Valid signature"
 
-#: mail/em-format-html-display.c:707
+#: mail/em-format-html-display.c:713
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11235,11 +11452,11 @@ msgstr ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 
-#: mail/em-format-html-display.c:708 mail/em-format-html.c:599
+#: mail/em-format-html-display.c:714 mail/em-format-html.c:599
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
-#: mail/em-format-html-display.c:708
+#: mail/em-format-html-display.c:714
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11247,11 +11464,11 @@ msgstr ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 
-#: mail/em-format-html-display.c:709
+#: mail/em-format-html-display.c:715
 msgid "Valid signature, cannot verify sender"
 msgstr "Valid signature, cannot verify sender"
 
-#: mail/em-format-html-display.c:709
+#: mail/em-format-html-display.c:715
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11259,11 +11476,11 @@ msgstr ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 
-#: mail/em-format-html-display.c:715 mail/em-format-html.c:606
+#: mail/em-format-html-display.c:721 mail/em-format-html.c:606
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
-#: mail/em-format-html-display.c:715
+#: mail/em-format-html-display.c:721
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
@@ -11271,11 +11488,11 @@ msgstr ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 
-#: mail/em-format-html-display.c:716 mail/em-format-html.c:607
+#: mail/em-format-html-display.c:722 mail/em-format-html.c:607
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
-#: mail/em-format-html-display.c:716
+#: mail/em-format-html-display.c:722
 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 "
@@ -11285,11 +11502,11 @@ msgstr ""
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 
-#: mail/em-format-html-display.c:717 mail/em-format-html.c:608
+#: mail/em-format-html-display.c:723 mail/em-format-html.c:608
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: mail/em-format-html-display.c:717
+#: mail/em-format-html-display.c:723
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11297,11 +11514,11 @@ msgstr ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 
-#: mail/em-format-html-display.c:718 mail/em-format-html.c:609
+#: mail/em-format-html-display.c:724 mail/em-format-html.c:609
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
-#: mail/em-format-html-display.c:718
+#: mail/em-format-html-display.c:724
 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 "
@@ -11311,71 +11528,67 @@ msgstr ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 
-#: mail/em-format-html-display.c:819 smime/gui/smime-ui.glade.h:48
+#: mail/em-format-html-display.c:825 smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: mail/em-format-html-display.c:834
+#: mail/em-format-html-display.c:840
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: mail/em-format-html-display.c:1116
+#: mail/em-format-html-display.c:1122
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completed on %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1124
+#: mail/em-format-html-display.c:1130
 msgid "Overdue:"
 msgstr "Overdue:"
 
-#: mail/em-format-html-display.c:1127
+#: mail/em-format-html-display.c:1133
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "by %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1187
+#: mail/em-format-html-display.c:1193
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: mail/em-format-html-display.c:1188
+#: mail/em-format-html-display.c:1194
 msgid "_Hide"
 msgstr "_Hide"
 
-#: mail/em-format-html-display.c:1189
+#: mail/em-format-html-display.c:1195
 msgid "_Fit to Width"
 msgstr "_Fit to Width"
 
-#: mail/em-format-html-display.c:1190
+#: mail/em-format-html-display.c:1196
 msgid "Show _Original Size"
 msgstr "Show _Original Size"
 
-#: mail/em-format-html-display.c:1560
+#: mail/em-format-html-display.c:1566
 msgid "Attachment Button"
 msgstr "Attachment Button"
 
-#: mail/em-format-html-display.c:1767
+#: mail/em-format-html-display.c:1773
 msgid "Select folder to save all attachments..."
 msgstr "Select folder to save all attachments..."
 
-#: mail/em-format-html-display.c:1806
-msgid "Select folder to save selected attachments..."
-msgstr "Select folder to save selected attachments..."
-
-#: mail/em-format-html-display.c:1814
+#: mail/em-format-html-display.c:1820
 msgid "Save Selected..."
 msgstr "Save Selected..."
 
 #. Cant i put in the number of attachments here ?
-#: mail/em-format-html-display.c:1881
+#: mail/em-format-html-display.c:1887
 #, c-format
 msgid "%d attachment"
 msgid_plural "%d attachments"
 msgstr[0] "%d attachment"
 msgstr[1] "%d attachments"
 
-#: mail/em-format-html-display.c:1945
+#: mail/em-format-html-display.c:1951
 msgid "No Attachment"
 msgstr "No Attachment"
 
-#: mail/em-format-html-display.c:1948
+#: mail/em-format-html-display.c:1954
 msgid "Save All"
 msgstr "Save All"
 
@@ -11582,44 +11795,26 @@ msgstr ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 
-#: mail/em-popup.c:399
-msgid "Save As..."
-msgstr "Save As..."
-
-#: mail/em-popup.c:424
-#, c-format
-msgid "untitled_image.%s"
-msgstr "untitled_image.%s"
-
-#: mail/em-popup.c:542 mail/em-popup.c:553
-msgid "Set as _Background"
-msgstr "Set as _Background"
-
-#: mail/em-popup.c:544 mail/em-popup.c:555
+#: mail/em-popup.c:556 mail/em-popup.c:567
 msgid "_Reply to sender"
 msgstr "_Reply to sender"
 
-#: mail/em-popup.c:545 mail/em-popup.c:556 ui/evolution-mail-message.xml.h:83
+#: mail/em-popup.c:557 mail/em-popup.c:568 ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
-#: mail/em-popup.c:607
+#: mail/em-popup.c:619
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: mail/em-popup.c:608
+#: mail/em-popup.c:620
 msgid "_Send New Message To..."
 msgstr "_Send New Message To..."
 
-#: mail/em-popup.c:609
+#: mail/em-popup.c:621
 msgid "_Add to Addressbook"
 msgstr "_Add to Addressbook"
 
-#: mail/em-popup.c:762
-#, c-format
-msgid "Open in %s..."
-msgstr "Open in %s..."
-
 #: mail/em-subscribe-editor.c:614
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "This store does not support subscriptions, or they are not enabled."
@@ -11641,28 +11836,28 @@ msgstr "Please select a server."
 msgid "No server has been selected"
 msgstr "No server has been selected"
 
-#: mail/em-utils.c:105
+#: mail/em-utils.c:106
 msgid "Don't show this message again."
 msgstr "Don't show this message again."
 
-#: mail/em-utils.c:299
+#: mail/em-utils.c:338
 msgid "Filters"
 msgstr "Filters"
 
-#: mail/em-utils.c:442 mail/em-utils.c:479
+#: mail/em-utils.c:481 mail/em-utils.c:518
 msgid "message"
 msgstr "message"
 
-#: mail/em-utils.c:614
+#: mail/em-utils.c:653
 msgid "Save Message..."
 msgstr "Save Message..."
 
-#: mail/em-utils.c:663
+#: mail/em-utils.c:702
 msgid "Add address"
 msgstr "Add address"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1142
+#: mail/em-utils.c:1181
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
@@ -13356,15 +13551,15 @@ msgstr "Enter Password"
 msgid "User canceled operation."
 msgstr "User cancelled operation."
 
-#: mail/mail-signature-editor.c:372
+#: mail/mail-signature-editor.c:381
 msgid "Edit signature"
 msgstr "Edit signature"
 
-#: mail/mail-signature-editor.c:412
+#: mail/mail-signature-editor.c:423
 msgid "Enter a name for this signature."
 msgstr "Enter a name for this signature."
 
-#: mail/mail-signature-editor.c:415
+#: mail/mail-signature-editor.c:426
 #: plugins/groupwise-features/properties.glade.h:5
 msgid "Name:"
 msgstr "Name:"
@@ -13444,25 +13639,33 @@ msgstr ""
 
 #: mail/mail.error.xml.h:7
 msgid ""
+"A signature already exists with the name &quot;{0}&quot;. Please specify a "
+"different name."
+msgstr ""
+"A signature already exists with the name &quot;{0}&quot;. Please specify a "
+"different name."
+
+#: mail/mail.error.xml.h:8
+msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 msgstr ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of the topic of your letter."
 
-#: mail/mail.error.xml.h:8
+#: mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Are you sure you want to delete this account and all its proxies?"
 
-#: mail/mail.error.xml.h:9
+#: mail/mail.error.xml.h:10
 msgid "Are you sure you want to delete this account?"
 msgstr "Are you sure you want to delete this account?"
 
-#: mail/mail.error.xml.h:10
+#: mail/mail.error.xml.h:11
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Are you sure you want to open {0} messages at once?"
 
-#: mail/mail.error.xml.h:11
+#: mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13470,7 +13673,7 @@ msgstr ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 
-#: mail/mail.error.xml.h:12
+#: mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
@@ -13478,75 +13681,79 @@ msgstr ""
 "Are you sure you want to remove permanently all the deleted messages in "
 "folder &quot;{0}&quot;?"
 
-#: mail/mail.error.xml.h:13
+#: mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Are you sure you want to send a message in HTML format?"
 
-#: mail/mail.error.xml.h:14
+#: mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Are you sure you want to send a message with only BCC recipients?"
 
-#: mail/mail.error.xml.h:15
+#: mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Are you sure you want to send a message without a subject?"
 
-#: mail/mail.error.xml.h:16
+#: mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr "Because &quot;{0}&quot;."
 
-#: mail/mail.error.xml.h:18
+#: mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "Because &quot;{2}&quot;."
 
-#: mail/mail.error.xml.h:19
+#: mail/mail.error.xml.h:20
+msgid "Blank Signature"
+msgstr "Blank Signature"
+
+#: mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Cannot add Search Folder &quot;{0}&quot;."
 
-#: mail/mail.error.xml.h:20
+#: mail/mail.error.xml.h:22
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 
-#: mail/mail.error.xml.h:21
+#: mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Cannot create folder &quot;{0}&quot;."
 
-#: mail/mail.error.xml.h:22
+#: mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "Cannot create temporary save directory."
 
-#: mail/mail.error.xml.h:23
+#: mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Cannot create the save directory, because &quot;{1}&quot;"
 
-#: mail/mail.error.xml.h:24
+#: mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Cannot delete folder &quot;{0}&quot;."
 
-#: mail/mail.error.xml.h:25
+#: mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Cannot delete system folder &quot;{0}&quot;."
 
-#: mail/mail.error.xml.h:26
+#: mail/mail.error.xml.h:28
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 
-#: mail/mail.error.xml.h:27
+#: mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 
-#: mail/mail.error.xml.h:28
+#: mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Cannot open source &quot;{1}&quot;"
 
-#: mail/mail.error.xml.h:29
+#: mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Cannot open source &quot;{2}&quot;."
 
-#: mail/mail.error.xml.h:30
+#: mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Cannot open target &quot;{2}&quot;."
 
-#: mail/mail.error.xml.h:31
+#: mail/mail.error.xml.h:33
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem.  You will not be able to use this provider until you can accept its "
@@ -13556,31 +13763,31 @@ msgstr ""
 "problem.  You will not be able to use this provider until you can accept its "
 "licence."
 
-#: mail/mail.error.xml.h:32
+#: mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 
-#: mail/mail.error.xml.h:33
+#: mail/mail.error.xml.h:35
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "Cannot rename or move system folder &quot;{0}&quot;."
 
-#: mail/mail.error.xml.h:34
+#: mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
 msgstr "Cannot save changes to account."
 
-#: mail/mail.error.xml.h:35
+#: mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Cannot save to directory &quot;{0}&quot;."
 
-#: mail/mail.error.xml.h:36
+#: mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Cannot save to file &quot;{0}&quot;."
 
-#: mail/mail.error.xml.h:37
+#: mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Cannot set signature script &quot;{0}&quot;."
 
-#: mail/mail.error.xml.h:38
+#: mail/mail.error.xml.h:40
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13588,63 +13795,63 @@ msgstr ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 
-#: mail/mail.error.xml.h:39
+#: mail/mail.error.xml.h:41
 msgid "Could not save signature file."
 msgstr "Could not save signature file."
 
-#: mail/mail.error.xml.h:40
+#: mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Delete &quot;{0}&quot;?"
 
-#: mail/mail.error.xml.h:41
+#: mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "Delete account?"
 
-#: mail/mail.error.xml.h:42
+#: mail/mail.error.xml.h:44
 msgid "Discard changed?"
 msgstr "Discard changes?"
 
-#: mail/mail.error.xml.h:43
+#: mail/mail.error.xml.h:45
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Do you want the operation to be performed in the subfolders?"
 
-#: mail/mail.error.xml.h:44
+#: mail/mail.error.xml.h:46
 msgid "Do you wish to save your changes?"
 msgstr "Do you wish to save your changes?"
 
-#: mail/mail.error.xml.h:45
+#: mail/mail.error.xml.h:47
 msgid "Don't delete"
 msgstr "Don't delete"
 
-#: mail/mail.error.xml.h:46
+#: mail/mail.error.xml.h:48
 msgid "Enter password."
 msgstr "Enter password."
 
-#: mail/mail.error.xml.h:47
+#: mail/mail.error.xml.h:49
 msgid "Error loading filter definitions."
 msgstr "Error loading filter definitions."
 
-#: mail/mail.error.xml.h:48
+#: mail/mail.error.xml.h:50
 msgid "Error while performing operation."
 msgstr "Error while performing operation."
 
-#: mail/mail.error.xml.h:49
+#: mail/mail.error.xml.h:51
 msgid "Error while {0}."
 msgstr "Error while {0}."
 
-#: mail/mail.error.xml.h:50
+#: mail/mail.error.xml.h:52
 msgid "File exists but cannot overwrite it."
 msgstr "File exists but cannot be overwritten."
 
-#: mail/mail.error.xml.h:51
+#: mail/mail.error.xml.h:53
 msgid "File exists but is not a regular file."
 msgstr "File exists but is not a regular file."
 
-#: mail/mail.error.xml.h:52
+#: mail/mail.error.xml.h:54
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "If you continue, you will not be able to recover these messages."
 
-#: mail/mail.error.xml.h:53
+#: mail/mail.error.xml.h:55
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -13652,7 +13859,7 @@ msgstr ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 
-#: mail/mail.error.xml.h:54
+#: mail/mail.error.xml.h:56
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13660,11 +13867,11 @@ msgstr ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 
-#: mail/mail.error.xml.h:56
+#: mail/mail.error.xml.h:58
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "If you proceed, the account information will be deleted permanently."
 
-#: mail/mail.error.xml.h:57
+#: mail/mail.error.xml.h:59
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13672,19 +13879,19 @@ msgstr ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 
-#: mail/mail.error.xml.h:58
+#: mail/mail.error.xml.h:60
 msgid "Ignore"
 msgstr "Ignore"
 
-#: mail/mail.error.xml.h:59
+#: mail/mail.error.xml.h:61
 msgid "Invalid authentication"
 msgstr "Invalid authentication"
 
-#: mail/mail.error.xml.h:60
+#: mail/mail.error.xml.h:62
 msgid "Mail filters automatically updated."
 msgstr "Mail filters automatically updated."
 
-#: mail/mail.error.xml.h:61
+#: mail/mail.error.xml.h:63
 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 "
@@ -13696,31 +13903,31 @@ msgstr ""
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
 
-#: mail/mail.error.xml.h:62
+#: mail/mail.error.xml.h:64
 msgid "Mark all messages as read"
 msgstr "Mark all messages as read"
 
-#: mail/mail.error.xml.h:63
+#: mail/mail.error.xml.h:65
 msgid "Mark all messages as read in the selected folder"
 msgstr "Mark all messages as read in the selected folder"
 
-#: mail/mail.error.xml.h:64
+#: mail/mail.error.xml.h:66
 msgid "Missing folder."
 msgstr "Missing folder."
 
-#: mail/mail.error.xml.h:66
+#: mail/mail.error.xml.h:68
 msgid "No sources selected."
 msgstr "No sources selected."
 
-#: mail/mail.error.xml.h:67
+#: mail/mail.error.xml.h:69
 msgid "Opening too many messages at once may take a long time."
 msgstr "Opening too many messages at once may take a long time."
 
-#: mail/mail.error.xml.h:68
+#: mail/mail.error.xml.h:70
 msgid "Please check your account settings and try again."
 msgstr "Please check your account settings and try again."
 
-#: mail/mail.error.xml.h:69
+#: mail/mail.error.xml.h:71
 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."
@@ -13728,7 +13935,7 @@ msgstr ""
 "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."
 
-#: mail/mail.error.xml.h:70
+#: mail/mail.error.xml.h:72
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13740,39 +13947,47 @@ msgstr ""
 "{0}\n"
 "Send anyway?"
 
-#: mail/mail.error.xml.h:73
+#: mail/mail.error.xml.h:75
+msgid "Please provide an unique name to identify this signature."
+msgstr "Please provide an unique name to identify this signature."
+
+#: mail/mail.error.xml.h:76
 msgid "Please wait."
 msgstr "Please wait."
 
-#: mail/mail.error.xml.h:74
+#: mail/mail.error.xml.h:77
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problem migrating old mail folder &quot;{0}&quot;."
 
-#: mail/mail.error.xml.h:75
+#: mail/mail.error.xml.h:78
 msgid "Querying server"
 msgstr "Querying server"
 
-#: mail/mail.error.xml.h:76
+#: mail/mail.error.xml.h:79
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Querying server for a list of supported authentication mechanisms."
 
-#: mail/mail.error.xml.h:77
+#: mail/mail.error.xml.h:80
 msgid "Read receipt requested."
 msgstr "Read receipt requested."
 
-#: mail/mail.error.xml.h:78
+#: mail/mail.error.xml.h:81
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 
-#: mail/mail.error.xml.h:79
+#: mail/mail.error.xml.h:82
 msgid "Search Folders automatically updated."
 msgstr "Search Folders automatically updated."
 
-#: mail/mail.error.xml.h:80
+#: mail/mail.error.xml.h:83
 msgid "Send Receipt"
 msgstr "Send Receipt"
 
-#: mail/mail.error.xml.h:81
+#: mail/mail.error.xml.h:84
+msgid "Signature Already Exists"
+msgstr "Signature Already Exists"
+
+#: mail/mail.error.xml.h:85
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -13780,7 +13995,7 @@ msgstr ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
 
-#: mail/mail.error.xml.h:82
+#: mail/mail.error.xml.h:86
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13796,7 +14011,7 @@ msgstr ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 
-#: mail/mail.error.xml.h:85
+#: mail/mail.error.xml.h:89
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -13810,7 +14025,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "and has been updated."
 
-#: mail/mail.error.xml.h:90
+#: mail/mail.error.xml.h:94
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -13824,7 +14039,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "And have been updated."
 
-#: mail/mail.error.xml.h:95
+#: mail/mail.error.xml.h:99
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application.  "
 "Sendmail reports the following error: status 67: mail not sent.\n"
@@ -13836,11 +14051,11 @@ msgstr ""
 "The message is stored in the Outbox folder.  Check the message for errors "
 "and resend."
 
-#: mail/mail.error.xml.h:97
+#: mail/mail.error.xml.h:101
 msgid "The script file must exist and be executable."
 msgstr "The script file must exist and be executable."
 
-#: mail/mail.error.xml.h:98
+#: mail/mail.error.xml.h:102
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13848,13 +14063,13 @@ msgstr ""
 "This folder may have been added implicitl.,\n"
 "Go to the Search Folder editor to add it explicitly, if required."
 
-#: mail/mail.error.xml.h:100
+#: mail/mail.error.xml.h:104
 msgid ""
 "This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 "This message cannot be sent because you have not specified any Recipients"
 
-#: mail/mail.error.xml.h:101
+#: mail/mail.error.xml.h:105
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13862,15 +14077,15 @@ msgstr ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 
-#: mail/mail.error.xml.h:102
+#: mail/mail.error.xml.h:106
 msgid "This signature has been changed, but has not been saved."
 msgstr "This signature has been changed, but has not been saved."
 
-#: mail/mail.error.xml.h:103
+#: mail/mail.error.xml.h:107
 msgid "Unable to connect to the GroupWise server."
 msgstr "Unable to connect to the GroupWise server."
 
-#: mail/mail.error.xml.h:104
+#: mail/mail.error.xml.h:108
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
@@ -13878,39 +14093,39 @@ msgstr ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
 
-#: mail/mail.error.xml.h:105
+#: mail/mail.error.xml.h:109
 msgid "Unable to read license file."
 msgstr "Unable to read licence file."
 
-#: mail/mail.error.xml.h:106
+#: mail/mail.error.xml.h:110
 msgid "Use _Default"
 msgstr "Use _Default"
 
-#: mail/mail.error.xml.h:107
+#: mail/mail.error.xml.h:111
 msgid "Use default drafts folder?"
 msgstr "Use default drafts folder?"
 
-#: mail/mail.error.xml.h:108
+#: mail/mail.error.xml.h:112
 msgid "You have not filled in all of the required information."
 msgstr "You have not filled in all of the required information."
 
-#: mail/mail.error.xml.h:109
+#: mail/mail.error.xml.h:113
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "You have unsent messages, do you wish to quit anyway?"
 
-#: mail/mail.error.xml.h:110
+#: mail/mail.error.xml.h:114
 msgid "You may not create two accounts with the same name."
 msgstr "You may not create two accounts with the same name."
 
-#: mail/mail.error.xml.h:111
+#: mail/mail.error.xml.h:115
 msgid "You must name this Search Folder."
 msgstr "You must name this Search Folder."
 
-#: mail/mail.error.xml.h:112
+#: mail/mail.error.xml.h:116
 msgid "You must specify a folder."
 msgstr "You must specify a folder."
 
-#: mail/mail.error.xml.h:113
+#: mail/mail.error.xml.h:117
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13920,28 +14135,28 @@ msgstr ""
 "Either select the folders individually, and/or by select all local folders, "
 "all remote folders, or both."
 
-#: mail/mail.error.xml.h:115
+#: mail/mail.error.xml.h:119
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "Failed to log into your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 
-#: mail/mail.error.xml.h:116
+#: mail/mail.error.xml.h:120
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "Your message with the subject &quot;{0}&quot; was not delivered."
 
-#: mail/mail.error.xml.h:117
+#: mail/mail.error.xml.h:121
 msgid "_Append"
 msgstr "_Append"
 
-#: mail/mail.error.xml.h:118
+#: mail/mail.error.xml.h:122
 msgid "_Discard changes"
 msgstr "_Discard changes"
 
-#: mail/mail.error.xml.h:120
+#: mail/mail.error.xml.h:124
 msgid "_Expunge"
 msgstr "_Expunge"
 
-#: mail/mail.error.xml.h:121
+#: mail/mail.error.xml.h:125
 msgid "_Open Messages"
 msgstr "_Open Messages"
 
@@ -15209,7 +15424,7 @@ msgstr "Proxy Login"
 
 #: plugins/groupwise-features/proxy-login.c:219
 #: plugins/groupwise-features/proxy-login.c:261
-#: plugins/groupwise-features/proxy.c:497
+#: plugins/groupwise-features/proxy.c:501
 #: plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -15219,7 +15434,11 @@ msgstr "%sEnter password for %s (user %s)"
 msgid "_Proxy Login..."
 msgstr "_Proxy Login..."
 
-#: plugins/groupwise-features/proxy.c:679
+#: plugins/groupwise-features/proxy.c:690
+msgid "The Proxy tab will be available only when the account is online."
+msgstr "The Proxy tab will be available only when the account is online."
+
+#: plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "The Proxy tab will be available only when the account is enabled."
 
@@ -15243,6 +15462,58 @@ msgstr "Sharing"
 msgid "Track Message Status..."
 msgstr "Track Message Status..."
 
+#: plugins/ipod-sync/ical-format.c:137 plugins/save-calendar/ical-format.c:137
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar format (.ics)"
+
+#: plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
+msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
+msgstr "Synchronize the selected task/calendar/addressbook with Apple iPod"
+
+#: plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+msgid "Synchronize to iPod"
+msgstr "Synchronize to iPod"
+
+#: plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
+msgid "iPod Synchronization"
+msgstr "iPod Synchronization"
+
+#: plugins/ipod-sync/sync.c:158
+msgid "No output directory!"
+msgstr "No output directory!"
+
+#: plugins/ipod-sync/sync.c:159
+msgid ""
+"The output directory was not found on iPod! Please ensure that iPod has been "
+"correctly set up and try again."
+msgstr ""
+"The output directory was not found on iPod! Please ensure that iPod has been "
+"correctly set up and try again."
+
+#: plugins/ipod-sync/sync.c:174 plugins/ipod-sync/sync.c:202
+msgid "Could not export data!"
+msgstr "Could not export data!"
+
+#: plugins/ipod-sync/sync.c:203
+msgid "Exporting data failed."
+msgstr "Exporting data failed."
+
+#: plugins/ipod-sync/sync.c:231
+msgid "Could not open addressbook!"
+msgstr "Could not open addressbook!"
+
+#: plugins/ipod-sync/sync.c:232
+msgid "Could not open the Evolution addressbook to export data."
+msgstr "Could not open the Evolution addressbook to export data."
+
+#: plugins/ipod-sync/sync.c:291
+msgid "Could not open calendar/todo!"
+msgstr "Could not open calendar/todo!"
+
+#: plugins/ipod-sync/sync.c:292
+msgid "Could not open the Evolution calendar/todo list to export data."
+msgstr "Could not open the Evolution calendar/todo list to export data."
+
 #: plugins/itip-formatter/itip-formatter.c:724
 msgid "Unable to parse item"
 msgstr "Unable to parse item"
@@ -16050,7 +16321,8 @@ msgstr "Gives an option to print mail from composer"
 
 #: plugins/print-message/org-gnome-print-message.xml.h:1
 #: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail-message.xml.h:77 ui/evolution-tasks.xml.h:15
+#: ui/evolution-mail-message.xml.h:77 ui/evolution-memos.xml.h:12
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Print Pre_view"
 
@@ -16180,10 +16452,6 @@ msgstr "Encapsulate values with:"
 msgid "Comma separated value format (.csv)"
 msgstr "Comma separated value format (.csv)"
 
-#: plugins/save-calendar/ical-format.c:137
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar format (.ics)"
-
 #: plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Save Selected"
@@ -18283,6 +18551,38 @@ msgstr "_Close"
 msgid "_File"
 msgstr "_File"
 
+#: ui/evolution-memos.xml.h:3
+msgid "Copy selected memo"
+msgstr "Copy selected memo"
+
+#: ui/evolution-memos.xml.h:5
+msgid "Cut selected memo"
+msgstr "Cut selected memo"
+
+#: ui/evolution-memos.xml.h:7
+msgid "Delete selected memos"
+msgstr "Delete selected memos"
+
+#: ui/evolution-memos.xml.h:9
+msgid "Paste memo from the clipboard"
+msgstr "Paste memo from the clipboard"
+
+#: ui/evolution-memos.xml.h:10
+msgid "Previews the list of memos to be printed"
+msgstr "Previews the list of memos to be printed"
+
+#: ui/evolution-memos.xml.h:13
+msgid "Print the list of memos"
+msgstr "Print the list of memos"
+
+#: ui/evolution-memos.xml.h:14
+msgid "View the selected memo"
+msgstr "View the selected memo"
+
+#: ui/evolution-memos.xml.h:18
+msgid "_Open Memo"
+msgstr "_Open Memo"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Attach"
@@ -18794,6 +19094,10 @@ msgstr "By _Follow Up Flag"
 msgid "_Messages"
 msgstr "_Messages"
 
+#: views/memos/galview.xml.h:1
+msgid "_Memos"
+msgstr "_Memos"
+
 #: views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "With _Due Date"