Updated Canadian English translation.

* en_CA.po: Updated Canadian English translation. svn path=/trunk/; revision=28382
author: Adam Weinberger <adamw@src.gnome.org> 2005-01-13 02:22:02 +0800
committer: Adam Weinberger <adamw@src.gnome.org> 2005-01-13 02:22:02 +0800
commit: 90c261f15939271cbe959c87b7c3ef689b308f1d (patch)
tree: e12f19ea1b693cfe6f9e0b833276613ec1d36a6b /po
parent: bba1aae4836973892519532ecaf526d3bbecb806 (diff)
download: gsoc2013-evolution-90c261f15939271cbe959c87b7c3ef689b308f1d.tar
gsoc2013-evolution-90c261f15939271cbe959c87b7c3ef689b308f1d.tar.gz
gsoc2013-evolution-90c261f15939271cbe959c87b7c3ef689b308f1d.tar.bz2
gsoc2013-evolution-90c261f15939271cbe959c87b7c3ef689b308f1d.tar.lz
gsoc2013-evolution-90c261f15939271cbe959c87b7c3ef689b308f1d.tar.xz
gsoc2013-evolution-90c261f15939271cbe959c87b7c3ef689b308f1d.tar.zst
gsoc2013-evolution-90c261f15939271cbe959c87b7c3ef689b308f1d.zip
2 files changed, 4213 insertions, 6224 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 07bb417c90..ebcc9a5a35 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-12  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2005-01-11  Priit Laes  <plaes@cvs.gnome.org>
 
 	* et.po: Translation updated.
diff --git a/po/en_CA.po b/po/en_CA.po
index 9b01712c86..c7bce28be3 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -1,15 +1,15 @@
 # Canadian English translation of evolution
-# Copyright (C) 2004 Adam Weinberger and the GNOME Foundation
+# Copyright (C) 2004-2005 Adam Weinberger and the GNOME Foundation
 # This file is distributed under the same licence as the evolution package.
-# Maintainer: Adam Weinberger <adamw@gnome.org>
+# Adam Weinberger <adamw@gnome.org>, 2004, 2005.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-29 11:58-0400\n"
-"PO-Revision-Date: 2004-09-29 19:18-0400\n"
+"POT-Creation-Date: 2005-01-12 13:03-0500\n"
+"PO-Revision-Date: 2005-01-12 19:18-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@FreeBSD.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,37 +19,238 @@ msgstr ""
 
 #: a11y/addressbook/ea-addressbook-view.c:94
 #: a11y/addressbook/ea-addressbook-view.c:103
-#: a11y/addressbook/ea-minicard-view.c:119
+#: a11y/addressbook/ea-minicard-view.c:172
 msgid "evolution addressbook"
 msgstr "evolution addressbook"
 
-#: a11y/addressbook/ea-minicard-view.c:101
+#: a11y/addressbook/ea-minicard.c:31
+#: calendar/gui/alarm-notify/alarm-queue.c:863
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Open"
+
+#: a11y/addressbook/ea-minicard.c:138
+msgid "Contact List: "
+msgstr "Contact List: "
+
+#: a11y/addressbook/ea-minicard.c:139
+msgid "Contact: "
+msgstr "Contact: "
+
+#: a11y/addressbook/ea-minicard.c:165
+msgid "evolution minicard"
+msgstr "evolution minicard"
+
+#: a11y/addressbook/ea-minicard-view.c:34
+#: addressbook/gui/component/addressbook-component.c:97
+msgid "New Contact"
+msgstr "New Contact"
+
+#: a11y/addressbook/ea-minicard-view.c:35
+#: addressbook/gui/component/addressbook-component.c:105
+msgid "New Contact List"
+msgstr "New Contact List"
+
+#: a11y/addressbook/ea-minicard-view.c:153
 msgid "current addressbook folder "
 msgstr "current addressbook folder "
 
-#: a11y/addressbook/ea-minicard-view.c:102
+#: a11y/addressbook/ea-minicard-view.c:154
 msgid "have "
 msgstr "have "
 
-#: a11y/addressbook/ea-minicard-view.c:102
+#: a11y/addressbook/ea-minicard-view.c:154
 msgid "has "
 msgstr "has "
 
-#: a11y/addressbook/ea-minicard-view.c:104
+#: a11y/addressbook/ea-minicard-view.c:156
 msgid " cards"
 msgstr " cards"
 
-#: a11y/addressbook/ea-minicard-view.c:104
+#: a11y/addressbook/ea-minicard-view.c:156
 msgid " card"
 msgstr " card"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "contact's header: "
+#: a11y/calendar/ea-cal-view.c:306
+msgid "New Appointment"
+msgstr "New Appointment"
 
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution minicard"
+#: a11y/calendar/ea-cal-view.c:307
+msgid "New All Day Event"
+msgstr "New All Day Event"
+
+#: a11y/calendar/ea-cal-view.c:308 calendar/gui/e-calendar-view.c:1366
+msgid "New Meeting"
+msgstr "New Meeting"
+
+#: a11y/calendar/ea-cal-view.c:309
+msgid "Go to Today"
+msgstr "Go to Today"
+
+#: a11y/calendar/ea-cal-view.c:310
+msgid "Go to Date"
+msgstr "Go to Date"
+
+#: a11y/calendar/ea-cal-view-event.c:235
+msgid "alarm "
+msgstr "alarm "
+
+#: a11y/calendar/ea-cal-view-event.c:241
+msgid "recurrence "
+msgstr "recurrence "
+
+#: a11y/calendar/ea-cal-view-event.c:247
+msgid "time-zone "
+msgstr "timezone "
+
+#: a11y/calendar/ea-cal-view-event.c:253
+msgid "meeting "
+msgstr "meeting "
+
+#: a11y/calendar/ea-cal-view-event.c:258
+msgid "event. Summary is "
+msgstr "event. Summary is "
+
+#: a11y/calendar/ea-cal-view-event.c:269
+msgid "empty"
+msgstr "empty"
+
+#: a11y/calendar/ea-cal-view-event.c:288
+msgid "calendar view event"
+msgstr "calendar view event"
+
+#: a11y/calendar/ea-cal-view-event.c:505
+msgid "Grab Focus"
+msgstr "Grab Focus"
+
+#: a11y/calendar/ea-day-view.c:147 a11y/calendar/ea-week-view.c:148
+#, c-format
+msgid ", %d event"
+msgstr ", %d event"
+
+#: a11y/calendar/ea-day-view.c:147 a11y/calendar/ea-week-view.c:148
+#, c-format
+msgid ", %d events"
+msgstr ", %d events"
+
+#: a11y/calendar/ea-day-view.c:150
+msgid "work week view :"
+msgstr "work week view :"
+
+#: a11y/calendar/ea-day-view.c:154
+msgid "day view :"
+msgstr "day view :"
+
+#: a11y/calendar/ea-day-view.c:181
+msgid "calendar view for a work week"
+msgstr "calendar view for a work week"
+
+#: a11y/calendar/ea-day-view.c:183
+msgid "calendar view for one or more days"
+msgstr "calendar view for one or more days"
+
+#: a11y/calendar/ea-day-view-main-item.c:299
+#: a11y/calendar/ea-week-view-main-item.c:301
+msgid "a table to view and select the current time range"
+msgstr "a table to view and select the current time range"
+
+#: a11y/calendar/ea-gnome-calendar.c:187 calendar/gui/calendar-component.c:520
+msgid "%A %d %b %Y"
+msgstr "%A %d %b %Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
+#: a11y/calendar/ea-gnome-calendar.c:190 calendar/gui/calendar-component.c:523
+#: calendar/gui/e-day-view.c:1511 calendar/gui/e-day-view-top-item.c:719
+#: calendar/gui/e-week-view-main-item.c:321
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: a11y/calendar/ea-gnome-calendar.c:192 a11y/calendar/ea-gnome-calendar.c:197
+#: a11y/calendar/ea-gnome-calendar.c:199 calendar/gui/calendar-component.c:525
+#: calendar/gui/calendar-component.c:530 calendar/gui/calendar-component.c:532
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
+
+#: a11y/calendar/ea-gnome-calendar.c:216 a11y/calendar/ea-gnome-calendar.c:222
+#: a11y/calendar/ea-gnome-calendar.c:228 a11y/calendar/ea-gnome-calendar.c:230
+#: calendar/gui/calendar-component.c:544 calendar/gui/calendar-component.c:551
+#: calendar/gui/calendar-component.c:557 calendar/gui/calendar-component.c:559
+msgid "%d %b %Y"
+msgstr "%d %b %Y"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: a11y/calendar/ea-gnome-calendar.c:220 calendar/gui/calendar-component.c:549
+#: calendar/gui/e-day-view.c:1527 calendar/gui/e-day-view-top-item.c:723
+#: calendar/gui/e-week-view-main-item.c:335
+msgid "%d %b"
+msgstr "%d %b"
+
+#: a11y/calendar/ea-gnome-calendar.c:247 a11y/calendar/ea-gnome-calendar.c:255
+#: calendar/importers/icalendar-importer.c:734
+msgid "Gnome Calendar"
+msgstr "Gnome Calendar"
+
+#: a11y/calendar/ea-gnome-calendar.c:290
+msgid "search bar"
+msgstr "search bar"
+
+#: a11y/calendar/ea-gnome-calendar.c:291
+msgid "evolution calendar search bar"
+msgstr "Evolution calendar search bar"
+
+#: a11y/calendar/ea-jump-button.c:149
+msgid "Jump button"
+msgstr "Jump button"
+
+#: a11y/calendar/ea-jump-button.c:158
+msgid "Click here, you can find more events."
+msgstr "Click here to find more events."
+
+#: a11y/calendar/ea-week-view.c:153
+msgid "month view :"
+msgstr "month view :"
+
+#: a11y/calendar/ea-week-view.c:158
+msgid "week view :"
+msgstr "week view :"
+
+#: a11y/calendar/ea-week-view.c:185
+msgid "calendar view for a month"
+msgstr "calendar view for a month"
+
+#: a11y/calendar/ea-week-view.c:187
+msgid "calendar view for one or more weeks"
+msgstr "calendar view for one or more weeks"
+
+#: a11y/widgets/ea-calendar-item.c:293 a11y/widgets/ea-calendar-item.c:299
+msgid " %d %B %Y"
+msgstr " %d %B %Y"
+
+#: a11y/widgets/ea-calendar-item.c:301
+msgid "calendar (from "
+msgstr "calendar (from "
+
+#: a11y/widgets/ea-calendar-item.c:303
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2261
+msgid " to "
+msgstr " to "
+
+#: a11y/widgets/ea-calendar-item.c:305
+msgid ")"
+msgstr ")"
+
+#: a11y/widgets/ea-calendar-item.c:337
+msgid "evolution calendar item"
+msgstr "Evolution calendar item"
 
 #. addressbook:ldap-init primary
 #: addressbook/addressbook-errors.xml.h:2
@@ -59,11 +260,11 @@ msgstr "This addressbook could not be opened."
 #. addressbook:ldap-init secondary
 #: addressbook/addressbook-errors.xml.h:4
 msgid ""
-"This addressbook server might unreachable or the server name may be "
+"This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
-"This addressbook server might unreachable, the server name may be "
-"misspelled, or your network connection could be down."
+"This addressbook server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
 
 #. addressbook:ldap-auth primary
 #: addressbook/addressbook-errors.xml.h:6
@@ -116,8 +317,18 @@ msgstr "LDAP server did not respond with valid schema information."
 msgid "Could not remove addressbook."
 msgstr "Could not remove addressbook."
 
-#. addressbook:edit-categories primary
+#. addressbook:ask-delete-addressbook primary
 #: addressbook/addressbook-errors.xml.h:22
+msgid "Delete address book '{0}'?"
+msgstr "Delete address book '{0}'?"
+
+#. addressbook:ask-delete-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "This address book will be removed permanently."
+msgstr "This address book will be removed permanently."
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:26
 msgid "Category editor not available."
 msgstr "Category editor not available."
 
@@ -132,9 +343,9 @@ msgstr "Category editor not available."
 #. mail:session-message-error-cancel secondary
 #. mail:ask-session-password secondary
 #. mail:filter-load-error secondary
-#: addressbook/addressbook-errors.xml.h:24
-#: addressbook/addressbook-errors.xml.h:32
-#: addressbook/addressbook-errors.xml.h:36 mail/mail-errors.xml.h:70
+#: addressbook/addressbook-errors.xml.h:28
+#: addressbook/addressbook-errors.xml.h:36
+#: addressbook/addressbook-errors.xml.h:40 mail/mail-errors.xml.h:70
 #: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
 #: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
 #: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
@@ -145,33 +356,33 @@ msgstr "{0}"
 #. addressbook:generic-error secondary
 #. mail-composer:no-attach secondary
 #. mail:no-save-path secondary
-#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:30
 #: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
 msgid "{1}"
 msgstr "{1}"
 
 #. addressbook:load-error title
-#: addressbook/addressbook-errors.xml.h:28
+#: addressbook/addressbook-errors.xml.h:32
 msgid "Unable to open addressbook"
 msgstr "Unable to open addressbook"
 
 #. addressbook:load-error primary
-#: addressbook/addressbook-errors.xml.h:30
+#: addressbook/addressbook-errors.xml.h:34
 msgid "Error loading addressbook."
 msgstr "Error loading addressbook."
 
 #. addressbook:search-error primary
-#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38
 msgid "Unable to perform search."
 msgstr "Unable to perform search."
 
 #. addressbook:prompt-save primary
-#: addressbook/addressbook-errors.xml.h:38
+#: addressbook/addressbook-errors.xml.h:42
 msgid "Would you like to save your changes?"
 msgstr "Would you like to save your changes?"
 
 #. addressbook:prompt-save secondary
-#: addressbook/addressbook-errors.xml.h:40
+#: addressbook/addressbook-errors.xml.h:44
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
@@ -179,17 +390,17 @@ msgstr ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 
-#: addressbook/addressbook-errors.xml.h:41
+#: addressbook/addressbook-errors.xml.h:45
 msgid "_Discard"
 msgstr "_Discard"
 
 #. addressbook:prompt-move primary
-#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/addressbook-errors.xml.h:47
 msgid "Cannot move contact."
 msgstr "Cannot move contact."
 
 #. addressbook:prompt-move secondary
-#: addressbook/addressbook-errors.xml.h:45
+#: addressbook/addressbook-errors.xml.h:49
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -198,34 +409,34 @@ msgstr ""
 "cannot be removed from the source. Do you want to save a copy instead?"
 
 #. addressbook:save-error primary
-#: addressbook/addressbook-errors.xml.h:47
+#: addressbook/addressbook-errors.xml.h:51
 msgid "Unable to save contact(s)."
 msgstr "Unable to save contact(s)."
 
 #. addressbook:save-error secondary
-#: addressbook/addressbook-errors.xml.h:49
+#: addressbook/addressbook-errors.xml.h:53
 msgid "Error saving contacts to {0}: {1}"
 msgstr "Error saving contacts to {0}: {1}"
 
 #. addressbook:backend-died primary
-#: addressbook/addressbook-errors.xml.h:51
+#: addressbook/addressbook-errors.xml.h:55
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "The Evolution addressbook has quit unexpectedly."
 
 #. addressbook:backend-died secondary
-#: addressbook/addressbook-errors.xml.h:53
+#: addressbook/addressbook-errors.xml.h:57
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 
 #. addressbook:ask-list-add-exists primary
-#: addressbook/addressbook-errors.xml.h:55
+#: addressbook/addressbook-errors.xml.h:59
 msgid "Address '{0}' already exists."
 msgstr "Address '{0}' already exists."
 
 #. addressbook:ask-list-add-exists secondary
-#: addressbook/addressbook-errors.xml.h:57
+#: addressbook/addressbook-errors.xml.h:61
 msgid ""
 "A contact already exists with this address.  Would you like to add a new "
 "card with the same address anyway?"
@@ -233,7 +444,8 @@ msgstr ""
 "A contact with this address already exists.  Would you like to add a new "
 "card with the same address anyway?"
 
-#: addressbook/addressbook-errors.xml.h:58 mail/em-vfolder-rule.c:494
+#: addressbook/addressbook-errors.xml.h:62 mail/em-vfolder-rule.c:494
+#: plugins/shared-folder/properties.glade.h:17
 msgid "_Add"
 msgstr "_Add"
 
@@ -251,102 +463,111 @@ msgstr "Could not load addressbook"
 msgid "Could not read pilot's Address application block"
 msgstr "Could not read pilot's Address application block"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Autocompletion"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "C_ontacts"
-msgstr "C_ontacts"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Certificates"
-msgstr "Certificates"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "Configure autocomplete here"
-
-#. Create the contacts group
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: addressbook/gui/component/addressbook-view.c:1144
-#: calendar/gui/migration.c:378
-msgid "Contacts"
-msgstr "Contacts"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook"
-msgstr "Evolution Addressbook"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution Addressbook address pop-up"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Addressbook address viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Addressbook card viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Evolution Addressbook component"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime Certificate Management Control"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution folder settings configuration control"
+#: addressbook/gui/component/addressbook.c:98
+msgid "Accessing LDAP Server anonymously"
+msgstr "Accessing LDAP Server anonymously"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manage your S/MIME certificates here"
-msgstr "Manage your S/MIME certificates here"
+#: addressbook/gui/component/addressbook.c:185
+#: plugins/groupwise-account-setup/camel-gw-listener.c:494
+msgid "Failed to authenticate.\n"
+msgstr "Failed to authenticate.\n"
 
-#: addressbook/gui/component/addressbook-component.c:93
-msgid "New Contact"
-msgstr "New Contact"
+#: addressbook/gui/component/addressbook.c:192
+#: plugins/groupwise-account-setup/camel-gw-listener.c:483
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sEnter password for %s (user %s)"
 
-#: addressbook/gui/component/addressbook-component.c:94
+#: addressbook/gui/component/addressbook-component.c:98
 msgid "_Contact"
 msgstr "_Contact"
 
-#: addressbook/gui/component/addressbook-component.c:95
+#: addressbook/gui/component/addressbook-component.c:99
 msgid "Create a new contact"
 msgstr "Create a new contact"
 
-#: addressbook/gui/component/addressbook-component.c:101
-msgid "New Contact List"
-msgstr "New Contact List"
-
-#: addressbook/gui/component/addressbook-component.c:102
+#: addressbook/gui/component/addressbook-component.c:106
 msgid "Contact _List"
 msgstr "Contact _List"
 
-#: addressbook/gui/component/addressbook-component.c:103
+#: addressbook/gui/component/addressbook-component.c:107
 msgid "Create a new contact list"
 msgstr "Create a new contact list"
 
-#: addressbook/gui/component/addressbook-component.c:109
-#: addressbook/gui/component/addressbook-view.c:813
+#: addressbook/gui/component/addressbook-component.c:113
+#: addressbook/gui/component/addressbook-config.c:1116
+#: addressbook/gui/component/addressbook-view.c:757
 msgid "New Address Book"
 msgstr "New Address Book"
 
-#: addressbook/gui/component/addressbook-component.c:110
+#: addressbook/gui/component/addressbook-component.c:114
 msgid "Address _Book"
 msgstr "Address _Book"
 
-#: addressbook/gui/component/addressbook-component.c:111
+#: addressbook/gui/component/addressbook-component.c:115
 msgid "Create a new address book"
 msgstr "Create a new address book"
 
-#: addressbook/gui/component/addressbook-component.c:184
+#: addressbook/gui/component/addressbook-component.c:188
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Failed upgrading Addressbook settings or folders."
 
+#: addressbook/gui/component/addressbook-config.c:315
+msgid "Base"
+msgstr "Base"
+
+#: addressbook/gui/component/addressbook-config.c:510
+#: calendar/gui/dialogs/calendar-setup.c:191
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Type:"
+
+#: addressbook/gui/component/addressbook-config.c:609
+msgid "Copy book content locally for offline operation"
+msgstr "Copy book content locally for offline operation"
+
+#: addressbook/gui/component/addressbook-config.c:904
+#: addressbook/gui/component/ldap-config.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.c:361
+#: calendar/gui/dialogs/calendar-setup.c:372
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: mail/em-folder-properties.c:213 mail/mail-config.glade.h:85
+#: smime/gui/smime-ui.glade.h:27
+msgid "General"
+msgstr "General"
+
+#: addressbook/gui/component/addressbook-config.c:905
+#: mail/importers/pine-importer.c:479
+msgid "Addressbook"
+msgstr "Addressbook"
+
+#: addressbook/gui/component/addressbook-config.c:909
+msgid "Server Information"
+msgstr "Server Information"
+
+#: addressbook/gui/component/addressbook-config.c:911
+msgid "Authentication"
+msgstr "Authentication"
+
+#: addressbook/gui/component/addressbook-config.c:914
+#: addressbook/gui/component/ldap-config.glade.h:18
+#: mail/mail-dialogs.glade.h:12 smime/gui/smime-ui.glade.h:19
+msgid "Details"
+msgstr "Details"
+
+#: addressbook/gui/component/addressbook-config.c:915
+msgid "Searching"
+msgstr "Searching"
+
+#: addressbook/gui/component/addressbook-config.c:917
+msgid "Downloading"
+msgstr "Downloading"
+
+#: addressbook/gui/component/addressbook-config.c:1114
+#: addressbook/gui/component/ldap-config.glade.h:14
+msgid "Address Book Properties"
+msgstr "Address Book Properties"
+
 #: addressbook/gui/component/addressbook-migrate.c:72
 #: calendar/gui/migration.c:142 mail/em-migrate.c:1160
 msgid "Migrating..."
@@ -363,7 +584,7 @@ msgstr "Migrating `%s':"
 #: addressbook/gui/component/addressbook-migrate.c:493
 #: calendar/gui/migration.c:452 calendar/gui/migration.c:545
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-component.c:252 mail/mail-vfolder.c:218
+#: mail/mail-component.c:270 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "On This Computer"
 
@@ -375,7 +596,7 @@ msgstr "On This Computer"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:460 calendar/gui/migration.c:553
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:102
 msgid "Personal"
 msgstr "Personal"
 
@@ -434,41 +655,26 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 
-#: addressbook/gui/component/addressbook-view.c:711
-#, c-format
-msgid "Address book '%s' will be removed. Are you sure you want to continue?"
-msgstr "Address book '%s' will be removed. Are you sure you want to continue?"
-
-#: addressbook/gui/component/addressbook-view.c:814
-#: addressbook/gui/widgets/e-addressbook-view.c:1124
-#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:382
+#: addressbook/gui/component/addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-view.c:934
+#: calendar/gui/calendar-component.c:386 calendar/gui/tasks-component.c:330
 #: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-calendar.xml.h:5 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Delete"
 
-#: addressbook/gui/component/addressbook-view.c:815
-#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:384
+#: addressbook/gui/component/addressbook-view.c:760
+#: calendar/gui/calendar-component.c:387 calendar/gui/tasks-component.c:331
 msgid "Properties..."
 msgstr "Properties..."
 
-#: addressbook/gui/component/addressbook.c:98
-msgid "Accessing LDAP Server anonymously"
-msgstr "Accessing LDAP Server anonymously"
-
-#: addressbook/gui/component/addressbook.c:184
-#: camel/providers/groupwise/camel-gw-listener.c:420
-msgid "Failed to authenticate.\n"
-msgstr "Failed to authenticate.\n"
-
-#: addressbook/gui/component/addressbook.c:191
-#: camel/providers/groupwise/camel-gw-listener.c:409
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sEnter password for %s (user %s)"
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:1118
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: calendar/gui/migration.c:378
+msgid "Contacts"
+msgstr "Contacts"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList XML for the list of completion URIs"
@@ -498,18 +704,18 @@ msgstr "Show the \"Preview\" pane."
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid ""
-"The number of characters that must be typed before evolution will attempt to "
+"The number of characters that must be typed before Evolution will attempt to "
 "autocomplete"
 msgstr ""
-"The number of characters that must be typed before evolution will attempt to "
+"The number of characters that must be typed before Evolution will attempt to "
 "autocomplete"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 msgid ""
-"The number of characters that must be typed before evolution will attempt to "
+"The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
-"The number of characters that must be typed before evolution will attempt to "
+"The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
@@ -520,8 +726,55 @@ msgstr "URI for the folder last used in the select names dialogue"
 msgid "URI for the folder last used in the select names dialog."
 msgstr "URI for the folder last used in the select names dialogue."
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Autocompletion"
+msgstr "Autocompletion"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "C_ontacts"
+msgstr "C_ontacts"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Certificates"
+msgstr "Certificates"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Configure autocomplete here"
+msgstr "Configure autocomplete here"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook"
+msgstr "Evolution Addressbook"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution Addressbook address pop-up"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Addressbook address viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Addressbook card viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook component"
+msgstr "Evolution Addressbook component"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime Certificate Management Control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution folder settings configuration control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manage your S/MIME certificates here"
+msgstr "Manage your S/MIME certificates here"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
@@ -537,6 +790,7 @@ msgstr "URI for the folder last used in the select names dialogue."
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
+#: plugins/shared-folder/properties.glade.h:3
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -590,11 +844,8 @@ msgstr "<b>Type:</b>"
 msgid "Add Address Book"
 msgstr "Add Address Book"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
-msgid "Address Book Properties"
-msgstr "Address Book Properties"
-
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:86
+#: addressbook/gui/component/ldap-config.glade.h:15
+#: mail/em-account-editor.c:292
 msgid "Always"
 msgstr "Always"
 
@@ -606,11 +857,6 @@ msgstr "Anonymously"
 msgid "Basic"
 msgstr "Basic"
 
-#: addressbook/gui/component/ldap-config.glade.h:18
-#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
-msgid "Details"
-msgstr "Details"
-
 #: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Distinguished name"
@@ -629,18 +875,12 @@ msgstr ""
 msgid "Find Possible Search Bases"
 msgstr "Find Possible Search Bases"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/em-folder-properties.c:212 mail/mail-config.glade.h:82
-#: smime/gui/smime-ui.glade.h:27
-msgid "General"
-msgstr "General"
-
 #: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Lo_gin:"
 msgstr "Lo_gin:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:88
+#: addressbook/gui/component/ldap-config.glade.h:25
+#: mail/em-account-editor.c:290
 msgid "Never"
 msgstr "Never"
 
@@ -730,12 +970,12 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
-"This is the method evolution will use to authenticate you.  Note that "
+"This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
-"This is the method evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your ldap "
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
 "server."
 
 #: addressbook/gui/component/ldap-config.glade.h:38
@@ -764,7 +1004,8 @@ msgstr "Using distinguished name (DN)"
 msgid "Using email address"
 msgstr "Using email address"
 
-#: addressbook/gui/component/ldap-config.glade.h:42 mail/mail-account-gui.c:87
+#: addressbook/gui/component/ldap-config.glade.h:42
+#: mail/em-account-editor.c:291
 msgid "Whenever Possible"
 msgstr "Whenever Possible"
 
@@ -785,7 +1026,8 @@ msgid "_Log in method:"
 msgstr "_Log in method:"
 
 #: addressbook/gui/component/ldap-config.glade.h:47
-#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:158
+#: calendar/gui/dialogs/calendar-setup.c:243
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:161
 msgid "_Name:"
 msgstr "_Name:"
 
@@ -814,88 +1056,13 @@ msgid "cards"
 msgstr "cards"
 
 #: addressbook/gui/component/ldap-config.glade.h:54
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:12
 #: calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:16
+#: mail/em-account-editor.c:1817 plugins/calendar-http/calendar-http.c:263
 msgid "minutes"
 msgstr "minutes"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution Addressbook name selection interface"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Remove All"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
-#: addressbook/gui/component/select-names/e-select-names.c:702
-#: calendar/gui/dialogs/cal-prefs-dialog.c:724
-msgid "Remove"
-msgstr "Remove"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:222
-msgid "View Contact List"
-msgstr "View Contact List"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:222
-msgid "View Contact Info"
-msgstr "View Contact Info"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:229
-#: addressbook/gui/component/select-names/e-select-names-popup.c:330
-msgid "Send HTML Mail?"
-msgstr "Send HTML Mail?"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
-msgid "Add to Contacts"
-msgstr "Add to Contacts"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:348
-msgid "Unnamed Contact"
-msgstr "Unnamed Contact"
-
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Name"
-
-#: addressbook/gui/component/select-names/e-select-names-table-model.c:351
-#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:228
-msgid "Source"
-msgstr "Source"
-
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Select Contacts from Address Book"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "<b>Contacts</b>"
-msgstr "<b>Contacts</b>"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>Show Contacts</b>"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Address _Book:"
-msgstr "Address _Book:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "C_ategory:"
-msgstr "C_ategory:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "_Find"
-msgstr "_Find"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Search:"
-msgstr "_Search:"
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Email</b>"
@@ -934,7 +1101,7 @@ msgstr "<b>Work</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "AIM"
 msgstr "AIM"
 
@@ -968,14 +1135,14 @@ msgstr "Company:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: addressbook/gui/contact-editor/e-contact-editor.c:272
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:172
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:168
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Contact"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:526
+#: addressbook/gui/contact-editor/e-contact-editor.c:533
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
@@ -1067,10 +1234,10 @@ msgstr "Web Log:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
 #: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:235
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:147
 msgid "Work"
 msgstr "Work"
 
@@ -1091,23 +1258,39 @@ msgstr "_File under:"
 msgid "_Where:"
 msgstr "_Where:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:322
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Are you sure you want\n"
+"to delete this contact?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:352
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Address"
 msgstr "Address"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:186
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:182
 #: addressbook/gui/widgets/e-addressbook-model.c:309
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
+#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
+#: addressbook/gui/widgets/e-minicard-view.c:519
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: addressbook/gui/widgets/e-minicard-view.c:498
-#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Editable"
 
@@ -1848,8 +2031,8 @@ msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Saint Vincent And The Grena-dines"
-msgstr "Saint Vincent And The Grena-dines"
+msgid "Saint Vincent And The Grenadines"
+msgstr "Saint Vincent And The Grenadines"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Samoa"
@@ -2079,65 +2262,43 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:351
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "MSN"
+msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
 #: addressbook/gui/contact-editor/e-contact-editor.c:188
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/widgets/eab-contact-display.c:348
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Service"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Location"
-msgstr "Location"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Username"
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "GroupWise"
+msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
 #: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:231
 msgid "Home"
 msgstr "Home"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
 #: addressbook/gui/contact-editor/e-contact-editor.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:239
 msgid "Other"
 msgstr "Other"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:338
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:337
-msgid "MSN"
-msgstr "MSN"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
-#: addressbook/gui/widgets/eab-contact-display.c:334
-msgid "GroupWise"
-msgstr "GroupWise"
-
 #: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Source Book"
@@ -2154,23 +2315,27 @@ msgstr "Is New Contact"
 msgid "Writable Fields"
 msgstr "Writable Fields"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:300
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+msgid "Required Fields"
+msgstr "Required Fields"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:307
 msgid "Changed"
 msgstr "Changed"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2457
+#: addressbook/gui/contact-editor/e-contact-editor.c:2463
 msgid "This contact belongs to these categories:"
 msgstr "This contact belongs to these categories:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2550
+#: addressbook/gui/contact-editor/e-contact-editor.c:2556
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2551
+#: addressbook/gui/contact-editor/e-contact-editor.c:2557
 msgid "No image"
 msgstr "No image"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2779
+#: addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2178,10 +2343,38 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2807
+#: addressbook/gui/contact-editor/e-contact-editor.c:2885
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: plugins/plugin-manager/plugin-manager.c:44
+#: plugins/save-attachments/save-attachments.c:362
+msgid "Name"
+msgstr "Name"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Service"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:587
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Location"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Username"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Contact Quick-Add"
@@ -2191,7 +2384,7 @@ msgid "_Edit Full"
 msgstr "_Edit Full"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:156
 msgid "_Full Name:"
 msgstr "_Full Name:"
 
@@ -2199,22 +2392,6 @@ msgstr "_Full Name:"
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Are you sure you want\n"
-"to delete these contacts?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:322
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Are you sure you want\n"
-"to delete this contact?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Address _2:"
@@ -2341,7 +2518,7 @@ msgid "Add an email to the List"
 msgstr "Add an email to the List"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:813
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:819
 msgid "Contact List Editor"
 msgstr "Contact List Editor"
 
@@ -2350,7 +2527,7 @@ msgid "Insert email adresses from Adress Book"
 msgstr "Insert email addresses from Address Book"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:714
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:709
 msgid "Members"
 msgstr "Members"
 
@@ -2374,24 +2551,22 @@ msgstr "_List name:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Type an email address or drag a contact into the list below:"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:165
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:161
 #: addressbook/gui/widgets/e-addressbook-model.c:295
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:221
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:377
+#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-minicard-view.c:505
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
-#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Book"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:179
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:175
 msgid "Is New List"
 msgstr "Is New List"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:736
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Required Participants"
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:712
+msgid "Contact List Members"
+msgstr "Contact List Members"
 
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
@@ -2431,403 +2606,11 @@ msgstr ""
 "in this folder.  Would you like to add it anyway?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:170
+#: addressbook/gui/search/e-addressbook-search-dialog.c:160
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Advanced Search"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-msgid "No contacts"
-msgstr "No contacts"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "%d contact"
-msgstr[1] "%d contacts"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:235
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#: addressbook/gui/widgets/e-minicard-view.c:491
-msgid "Query"
-msgstr "Query"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "Error getting book view"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "Model"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "Error modifying card"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-msgid "Name begins with"
-msgstr "Name begins with"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:168
-msgid "Email begins with"
-msgstr "Email begins with"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:169
-#: calendar/gui/cal-search-bar.c:54
-msgid "Category is"
-msgstr "Category is"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:170
-#: calendar/gui/cal-search-bar.c:49
-msgid "Any field contains"
-msgstr "Any field contains"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:171
-#: addressbook/gui/widgets/e-addressbook-view.c:176
-msgid "Advanced..."
-msgstr "Advanced..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:242
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:227
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "Type"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:544
-msgid "Address Book"
-msgstr "Address Book"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:888
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
-#: addressbook/gui/widgets/e-addressbook-view.c:2098
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard..."
-msgstr "Save as VCard..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1095
-msgid "New Contact..."
-msgstr "New Contact..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1096
-msgid "New Contact List..."
-msgstr "New Contact List..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-msgid "Go to Folder..."
-msgstr "Go to Folder..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
-msgid "Import..."
-msgstr "Import..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1102
-msgid "Search for Contacts..."
-msgstr "Search for Contacts..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1103
-msgid "Address Book Sources..."
-msgstr "Address Book Sources..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1105
-msgid "Pilot Settings..."
-msgstr "Pilot Settings..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1109
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Forward Contact"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1110
-msgid "Send Message to Contact"
-msgstr "Send Message to Contact"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1111 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Print"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
-msgid "Print Envelope"
-msgstr "Print Envelope"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1117
-msgid "Copy to Address Book..."
-msgstr "Copy to Address Book..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1118
-msgid "Move to Address Book..."
-msgstr "Move to Address Book..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1121
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Cut"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1122
-#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:380
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Copy"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1123
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Paste"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1128
-#: calendar/gui/e-calendar-view.c:1418
-msgid "Current View"
-msgstr "Current View"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1683
-#: calendar/gui/cal-search-bar.c:358
-msgid "Any Category"
-msgstr "Any Category"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "Assistant"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Assistant Phone"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Business Fax"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "Business Phone"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "Business Phone 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "Callback Phone"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "Car Phone"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Categories"
-msgstr "Categories"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "Company Phone"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:547 smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Email"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Email 3"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Family Name"
-msgstr "Family Name"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "File As"
-msgstr "File As"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Given Name"
-msgstr "Given Name"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "Home Fax"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "Home Phone"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone 2"
-msgstr "Home Phone 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "ISDN Phone"
-msgstr "ISDN Phone"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Journal"
-msgstr "Journal"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Manager"
-msgstr "Manager"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:366
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "Nickname"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:377
-msgid "Note"
-msgstr "Note"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "Office"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:347
-msgid "Organization"
-msgstr "Organization"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "Other Fax"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Other Phone"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "Pager"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "Primary Phone"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:234
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Role"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Spouse"
-msgstr "Spouse"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
-msgid "TTYTDD"
-msgstr "TTYTDD"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "Title"
-msgstr "Title"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-msgid "Unit"
-msgstr "Unit"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Web Site"
-msgstr "Web Site"
-
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:137
-msgid "Width"
-msgstr "Width"
-
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:144
-msgid "Height"
-msgstr "Height"
-
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:152
-msgid "Has Focus"
-msgstr "Has Focus"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Field"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Field Name"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Text Model"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Max field name length"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Column Width"
-
-#: addressbook/gui/widgets/e-minicard-view.c:164
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-
-#: addressbook/gui/widgets/e-minicard-view.c:167
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"There are no items to show in this view."
-
-#: addressbook/gui/widgets/e-minicard-view.c:477
-msgid "Adapter"
-msgstr "Adapter"
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Selected"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Has Cursor"
-
 #: addressbook/gui/widgets/eab-contact-display.c:133
 #: addressbook/gui/widgets/eab-contact-display.c:196
 msgid "(map)"
@@ -2838,55 +2621,76 @@ msgstr "(map)"
 msgid "map"
 msgstr "map"
 
-#: addressbook/gui/widgets/eab-contact-display.c:261
-#: addressbook/gui/widgets/eab-contact-display.c:528
+#: addressbook/gui/widgets/eab-contact-display.c:274
+#: addressbook/gui/widgets/eab-contact-display.c:541
 msgid "List Members"
 msgstr "List Members"
 
-#: addressbook/gui/widgets/eab-contact-display.c:324
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:339
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organization"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
 msgid "Position"
 msgstr "Position"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Video Conferencing"
 msgstr "Video Conferencing"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:378
 msgid "Phone"
 msgstr "Phone"
 
-#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/widgets/eab-contact-display.c:368
 msgid "work"
 msgstr "work"
 
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/eab-contact-display.c:582
+#: addressbook/gui/widgets/eab-contact-display.c:376
+#: addressbook/gui/widgets/eab-contact-display.c:595
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:379
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
+#: addressbook/gui/widgets/eab-contact-display.c:383
 msgid "personal"
 msgstr "personal"
 
-#: addressbook/gui/widgets/eab-contact-display.c:543
+#: addressbook/gui/widgets/eab-contact-display.c:390
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Note"
+
+#: addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Job Title"
 msgstr "Job Title"
 
-#: addressbook/gui/widgets/eab-contact-display.c:574
+#: addressbook/gui/widgets/eab-contact-display.c:560
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Email"
+
+#: addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Home page"
 msgstr "Home page"
 
@@ -2941,12 +2745,9 @@ msgstr "Protocol not supported"
 #. E_BOOK_ERROR_CANCELLED
 #: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-cal-model-tasks.c:353 calendar/gui/e-cal-model-tasks.c:656
-#: calendar/gui/e-calendar-table.c:473 calendar/gui/print.c:2349
-#: camel/camel-service.c:723 camel/camel-service.c:887
-#: camel/camel-service.c:1015 camel/providers/pop3/camel-pop3-store.c:421
-#: camel/providers/pop3/camel-pop3-store.c:502
+#: calendar/gui/e-cal-component-preview.c:232
+#: calendar/gui/e-calendar-table.c:457 calendar/gui/e-cal-model-tasks.c:347
+#: calendar/gui/e-cal-model-tasks.c:660 calendar/gui/print.c:2352
 msgid "Cancelled"
 msgstr "Cancelled"
 
@@ -2957,6 +2758,7 @@ msgstr "Could not cancel"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: addressbook/gui/widgets/eab-gui-util.c:63
+#: calendar/gui/comp-editor-factory.c:431
 msgid "Authentication Failed"
 msgstr "Authentication Failed"
 
@@ -2981,7 +2783,17 @@ msgstr "No such source"
 msgid "Other error"
 msgstr "Other error"
 
-#: addressbook/gui/widgets/eab-gui-util.c:91
+#: addressbook/gui/widgets/eab-gui-util.c:90
+msgid ""
+"We were unable to open this addressbook. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the addressbook once in online mode to download its contents"
+msgstr ""
+"We were unable to open this addressbook. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the addressbook once in online mode to download its contents"
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2989,7 +2801,7 @@ msgstr ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
 
-#: addressbook/gui/widgets/eab-gui-util.c:98
+#: addressbook/gui/widgets/eab-gui-util.c:105
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2997,7 +2809,7 @@ msgstr ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3007,7 +2819,7 @@ msgstr ""
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
 "Evolution package."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:117
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3015,7 +2827,7 @@ msgstr ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 
-#: addressbook/gui/widgets/eab-gui-util.c:130
+#: addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3027,7 +2839,7 @@ msgstr ""
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:136
+#: addressbook/gui/widgets/eab-gui-util.c:143
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3039,45 +2851,45 @@ msgstr ""
 "more specific or raise the time limit in the directory server\n"
 "preferences for this addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:142
+#: addressbook/gui/widgets/eab-gui-util.c:149
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "The backend for this addressbook was unable to parse this query."
 
-#: addressbook/gui/widgets/eab-gui-util.c:145
+#: addressbook/gui/widgets/eab-gui-util.c:152
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "The backend for this addressbook refused to perform this query."
 
-#: addressbook/gui/widgets/eab-gui-util.c:148
+#: addressbook/gui/widgets/eab-gui-util.c:155
 msgid "This query did not complete successfully."
 msgstr "This query did not complete successfully."
 
-#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:177
 msgid "Error adding list"
 msgstr "Error adding list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:170
-#: addressbook/gui/widgets/eab-gui-util.c:643
+#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:181
+#: addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error modifying list"
 msgstr "Error modifying list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:181
+#: addressbook/gui/widgets/eab-gui-util.c:188
 msgid "Error modifying contact"
 msgstr "Error modifying contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:200
 msgid "Error removing list"
 msgstr "Error removing list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:193
-#: addressbook/gui/widgets/eab-gui-util.c:601
+#: addressbook/gui/widgets/eab-gui-util.c:200
+#: addressbook/gui/widgets/eab-gui-util.c:608
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:275
+#: addressbook/gui/widgets/eab-gui-util.c:282
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3092,7 +2904,7 @@ msgstr[1] ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:304
+#: addressbook/gui/widgets/eab-gui-util.c:311
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3101,44 +2913,44 @@ msgstr ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:308
+#: addressbook/gui/widgets/eab-gui-util.c:315
 msgid "Overwrite"
 msgstr "Overwrite"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:386
+#: addressbook/gui/widgets/eab-gui-util.c:393
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:548
+#: addressbook/gui/widgets/eab-gui-util.c:555
 msgid "list"
 msgstr "list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:697
+#: addressbook/gui/widgets/eab-gui-util.c:704
 msgid "Move contact to"
 msgstr "Move contact to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:699
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Copy contact to"
 msgstr "Copy contact to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:702
+#: addressbook/gui/widgets/eab-gui-util.c:709
 msgid "Move contacts to"
 msgstr "Move contacts to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:704
+#: addressbook/gui/widgets/eab-gui-util.c:711
 msgid "Copy contacts to"
 msgstr "Copy contacts to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:707
+#: addressbook/gui/widgets/eab-gui-util.c:714
 msgid "Select target addressbook."
 msgstr "Select target addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:930
+#: addressbook/gui/widgets/eab-gui-util.c:937
 msgid "Multiple VCards"
 msgstr "Multiple VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:933
+#: addressbook/gui/widgets/eab-gui-util.c:940
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -3148,37 +2960,51 @@ msgstr "VCard for %s"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:199
+#: addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(none)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:432
+#: addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Primary Email"
 
-#: addressbook/gui/widgets/eab-popup-control.c:568
+#: addressbook/gui/widgets/eab-popup-control.c:441
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:451
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Email 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Select an Action"
 
-#: addressbook/gui/widgets/eab-popup-control.c:576
+#: addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Create a new contact \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:592
+#: addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Add address to existing contact \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:870
+#: addressbook/gui/widgets/eab-popup-control.c:869
 msgid "Querying Address Book..."
 msgstr "Querying Address Book..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:953
+#: addressbook/gui/widgets/eab-popup-control.c:952
 msgid "Edit Contact Info"
 msgstr "Edit Contact Info"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1008
+#: addressbook/gui/widgets/eab-popup-control.c:982
+msgid "Add to Contacts"
+msgstr "Add to Contacts"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
 msgid "Merge E-Mail Address"
 msgstr "Merge E-Mail Address"
 
@@ -3202,28 +3028,376 @@ msgstr "Show Compact VCard"
 msgid "Save in addressbook"
 msgstr "Save in addressbook"
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+msgid "No contacts"
+msgstr "No contacts"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d contact"
+msgstr[1] "%d contacts"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
+#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-minicard-view.c:512
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+msgid "Query"
+msgstr "Query"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "Error getting book view"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+msgid "Model"
+msgstr "Model"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Error modifying card"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Name begins with"
+msgstr "Name begins with"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+msgid "Email begins with"
+msgstr "Email begins with"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
+msgstr "Category is"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: calendar/gui/cal-search-bar.c:48
+msgid "Any field contains"
+msgstr "Any field contains"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:177
+msgid "Advanced..."
+msgstr "Advanced..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:229
+msgid "Source"
+msgstr "Source"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:243
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:244
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Type"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:540
+#: plugins/shared-folder/properties.glade.h:6
+msgid "Address Book"
+msgstr "Address Book"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:803
+#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:1972
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard..."
+msgstr "Save as VCard..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:917
+msgid "New Contact..."
+msgstr "New Contact..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:918
+msgid "New Contact List..."
+msgstr "New Contact List..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:922
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Forward Contact"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:923
+msgid "Send Message to Contact"
+msgstr "Send Message to Contact"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:924 calendar/gui/print.c:2483
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Print"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:927
+msgid "Copy to Address Book..."
+msgstr "Copy to Address Book..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:928
+msgid "Move to Address Book..."
+msgstr "Move to Address Book..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Cut"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:932
+#: calendar/gui/calendar-component.c:385 calendar/gui/tasks-component.c:329
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Copy"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:933
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Paste"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1526
+#: calendar/gui/cal-search-bar.c:346
+msgid "Any Category"
+msgstr "Any Category"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "Assistant"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "Assistant Phone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "Business Fax"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "Business Phone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "Business Phone 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "Callback Phone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "Car Phone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "Categories"
+msgstr "Categories"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr "Company Phone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Family Name"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "File As"
+msgstr "File As"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Given Name"
+msgstr "Given Name"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Home Fax"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "Home Phone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr "Home Phone 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "ISDN Phone"
+msgstr "ISDN Phone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Journal"
+msgstr "Journal"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "Manager"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Nickname"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "Office"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Other Fax"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "Other Phone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Pager"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "Primary Phone"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:251
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Role"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Spouse"
+msgstr "Spouse"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "Title"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+msgid "Unit"
+msgstr "Unit"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Web Site"
+msgstr "Web Site"
+
+#: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
+msgid "Width"
+msgstr "Width"
+
+#: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
+msgid "Height"
+msgstr "Height"
+
+#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
+msgid "Has Focus"
+msgstr "Has Focus"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Selected"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Has Cursor"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "Field"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "Field Name"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "Text Model"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "Max field name length"
+
+#: addressbook/gui/widgets/e-minicard-view.c:171
+msgid ""
+"\n"
+"\n"
+"Search for the Contact\n"
+"\n"
+"or double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Search for the Contact\n"
+"\n"
+"or double-click here to create a new Contact."
+
+#: addressbook/gui/widgets/e-minicard-view.c:174
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+
+#: addressbook/gui/widgets/e-minicard-view.c:179
+msgid ""
+"\n"
+"\n"
+"Search for the Contact."
+msgstr ""
+"\n"
+"\n"
+"Search for the Contact."
+
+#: addressbook/gui/widgets/e-minicard-view.c:181
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"There are no items to show in this view."
+
+#: addressbook/gui/widgets/e-minicard-view.c:498
+msgid "Adapter"
+msgstr "Adapter"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Column Width"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
 msgid "Card View"
 msgstr "Card View"
 
-#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:26
 msgid "GTK Tree View"
 msgstr "GTK Tree View"
 
-#: addressbook/gui/widgets/test-reflow.c:119
-msgid "Reflow Test"
-msgstr "Reflow Test"
-
-#: addressbook/gui/widgets/test-reflow.c:120
-#: addressbook/printing/test-contact-print-style-editor.c:54
-#: addressbook/printing/test-print.c:53
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Copyright (C) 2000, Ximian, Inc."
-
-#: addressbook/gui/widgets/test-reflow.c:122
-msgid "This should test the reflow canvas item"
-msgstr "This should test the reflow canvas item"
-
 #: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF importer"
@@ -3237,18 +3411,9 @@ msgid "Evolution VCard Importer"
 msgstr "Evolution VCard Importer"
 
 #: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Evolution VCard importer"
-
-#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Print envelope"
-
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Print contacts"
@@ -3258,6 +3423,11 @@ msgstr "Print contacts"
 msgid "Print contact"
 msgstr "Print contact"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Print envelope"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3347,15 +3517,10 @@ msgid "Number of columns:"
 msgstr "Number of columns:"
 
 #: addressbook/printing/e-contact-print.glade.h:23
-#: camel/providers/groupwise/camel-groupwise-provider.c:59
-#: camel/providers/imap/camel-imap-provider.c:64
-#: camel/providers/local/camel-local-provider.c:43
-#: camel/providers/local/camel-local-provider.c:79
-#: camel/providers/local/camel-local-provider.c:99
 msgid "Options"
 msgstr "Options"
 
-#: addressbook/printing/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24 e-util/eggtrayicon.c:118
 msgid "Orientation"
 msgstr "Orientation"
 
@@ -3420,6 +3585,7 @@ msgid "Top:"
 msgstr "Top:"
 
 #: addressbook/printing/e-contact-print.glade.h:40
+#: calendar/gui/dialogs/calendar-setup.c:175
 msgid "Type:"
 msgstr "Type:"
 
@@ -3435,6 +3601,11 @@ msgstr "_Font..."
 msgid "Contact Print Style Editor Test"
 msgstr "Contact Print Style Editor Test"
 
+#: addressbook/printing/test-contact-print-style-editor.c:54
+#: addressbook/printing/test-print.c:53
+msgid "Copyright (C) 2000, Ximian, Inc."
+msgstr "Copyright (C) 2000, Ximian, Inc."
+
 #: addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
 msgstr "This should test the contact print style editor widget"
@@ -3447,20 +3618,6 @@ msgstr "Contact Print Test"
 msgid "This should test the contact print code"
 msgstr "This should test the contact print code"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Can not open file"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr "Couldn't get list of addressbooks"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr "failed to open book"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Specify the output file instead of standard output"
@@ -3482,14 +3639,14 @@ msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
 #: addressbook/tools/evolution-addressbook-export.c:61
-msgid "Export in asynchronous mode "
-msgstr "Export in asynchronous mode "
+msgid "Export in asynchronous mode"
+msgstr "Export in asynchronous mode"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
+"The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
-"The number of cards in one output file in asychronous mode,default size 100."
+"The number of cards in one output file in asychronous mode, default size 100."
 
 #: addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
@@ -3517,6 +3674,20 @@ msgstr "In normal mode, there is no need for the size option."
 msgid "Unhandled error"
 msgstr "Unhandled error"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Can not open file"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "Couldn't get list of addressbooks"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "failed to open book"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Error loading default addressbook."
@@ -3529,10 +3700,6 @@ msgstr "Input File"
 msgid "No filename provided."
 msgstr "No filename provided."
 
-#: addressbook/util/e-destination.c:578
-msgid "Unnamed List"
-msgstr "Unnamed List"
-
 #. calendar:prompt-cancel-meeting primary
 #. calendar:prompt-cancel-task primary
 #: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
@@ -3812,7 +3979,61 @@ msgstr "The Evolution calendar has quit unexpectedly."
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Your calendars will not be available until Evolution is restarted."
 
-#: calendar/common/authentication.c:47 calendar/gui/e-pub-utils.c:301
+#. calendar:prompt-delete-calendar primary
+#: calendar/calendar-errors.xml.h:116
+msgid "Delete calendar '{0}'?"
+msgstr "Delete calendar '{0}'?"
+
+#. calendar:prompt-delete-calendar secondary
+#: calendar/calendar-errors.xml.h:118
+msgid "This calendar will be removed permanently."
+msgstr "This calendar will be removed permanently."
+
+#. calendar:prompt-delete-task-list primary
+#: calendar/calendar-errors.xml.h:120
+msgid "Delete task list '{0}'?"
+msgstr "Delete task list '{0}'?"
+
+#. calendar:prompt-delete-task-list secondary
+#: calendar/calendar-errors.xml.h:122
+msgid "This task list will be removed permanently."
+msgstr "This task list will be removed permanently."
+
+#. calendar:prompt-send-no-subject-calendar primary
+#: calendar/calendar-errors.xml.h:124
+msgid "Are you sure you want to send the appointment without a summary?"
+msgstr "Are you sure you want to send the appointment without a summary?"
+
+#. calendar:prompt-send-no-subject-calendar secondary
+#: calendar/calendar-errors.xml.h:126
+msgid ""
+"Adding a meaningful Summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
+msgstr ""
+"Adding a meaningful Summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
+
+#: calendar/calendar-errors.xml.h:127 calendar/calendar-errors.xml.h:132
+#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+msgid "_Send"
+msgstr "_Send"
+
+#. calendar:prompt-send-no-subject-task primary
+#: calendar/calendar-errors.xml.h:129
+msgid "Are you sure you want to send the task without a summary?"
+msgstr "Are you sure you want to send the task without a summary?"
+
+#. calendar:prompt-send-no-subject-task secondary
+#: calendar/calendar-errors.xml.h:131
+msgid ""
+"Adding a meaningful Summary to your task will give your recipients an idea "
+"of what your appointment is about."
+msgstr ""
+"Adding a meaningful Summary to your task will give your recipients an idea "
+"of what your appointment is about."
+
+#: calendar/common/authentication.c:49 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Enter password"
@@ -3842,112 +4063,97 @@ msgstr "Default Priority:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Could not read pilot's ToDo application block"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Calendar and Tasks"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:1085
-msgid "Calendars"
-msgstr "Calendars"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure your timezone, Calendar and Task List here "
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:79
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minute"
+msgstr[1] "minutes"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Calendar and Tasks"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Calendar configuration control"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Calendar scheduling message viewer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Calendar/Task editor"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution's Calendar component"
-msgstr "Evolution's Calendar component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-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:1199 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:425 calendar/gui/tasks-component.c:895
-#: calendar/gui/tasks-control.c:408 calendar/importers/icalendar-importer.c:83
-#: calendar/importers/icalendar-importer.c:709
-#: camel/providers/groupwise/camel-gw-listener.c:332
-msgid "Tasks"
-msgstr "Tasks"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: calendar/gui/dialogs/event-editor.c:138 calendar/gui/print.c:2298
+msgid "Appointment"
+msgstr "Appointment"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "_Calendars"
-msgstr "_Calendars"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+msgid "Appointment Title"
+msgstr "Appointment Title"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tasks"
+#. End time
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: plugins/itip-formatter/itip-view.c:830
+msgid "End time:"
+msgstr "End time:"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Calendar alarm notification service"
+#. Location
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/e-itip-control.c:1118 plugins/itip-formatter/itip-view.c:813
+msgid "Location:"
+msgstr "Location:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
-msgid "Starting:"
-msgstr "Starting:"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:5
+msgid "Snooze _time:"
+msgstr "Snooze _time:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
-msgid "Ending:"
-msgstr "Ending:"
+#. Start time
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: plugins/itip-formatter/itip-view.c:821
+msgid "Start time:"
+msgstr "Start time:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
-msgid "Evolution Alarm"
-msgstr "Evolution Alarm"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:11
+#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22 ui/evolution.xml.h:38
+msgid "_Edit"
+msgstr "_Edit"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
-#, c-format
-msgid "Alarm on %s"
-msgstr "Alarm on %s"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:8
+msgid "_Snooze"
+msgstr "_Snooze"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-msgid "Snooze _time (minutes):"
-msgstr "Snooze _time (minutes):"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:9
+msgid "description of appointment"
+msgstr "description of appointment"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "_Edit appointment"
-msgstr "_Edit appointment"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:10
+msgid "end-time"
+msgstr "end-time"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "_Snooze"
-msgstr "_Snooze"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:11
+msgid "location"
+msgstr "location"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:893
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Open"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:13
+msgid "start-time"
+msgstr "start-time"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:895
+#: calendar/gui/alarm-notify/alarm-queue.c:864
 msgid "Dismiss"
 msgstr "Dismiss"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:897
+#: calendar/gui/alarm-notify/alarm-queue.c:865
 msgid "Dismiss All"
 msgstr "Dismiss All"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:962
+#: calendar/gui/alarm-notify/alarm-queue.c:947
+msgid "No summary available."
+msgstr "No summary available."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:956
+#: calendar/gui/alarm-notify/alarm-queue.c:958
 msgid "No description available."
 msgstr "No description available."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:981
+#: calendar/gui/alarm-notify/alarm-queue.c:966
+msgid "No location information available."
+msgstr "No location information available."
+
+#: calendar/gui/alarm-notify/alarm-queue.c:982
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3960,12 +4166,12 @@ msgstr ""
 "Starting at %s\n"
 "Ending at %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1081
-#: calendar/gui/alarm-notify/alarm-queue.c:1105
+#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1108
 msgid "Warning"
 msgstr "Warning"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1085
+#: calendar/gui/alarm-notify/alarm-queue.c:1088
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3977,7 +4183,7 @@ msgstr ""
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialogue box instead."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1111
+#: calendar/gui/alarm-notify/alarm-queue.c:1114
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3994,10 +4200,14 @@ msgstr ""
 "\n"
 "Are you sure you want to run this program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1125
+#: calendar/gui/alarm-notify/alarm-queue.c:1128
 msgid "Do not ask me about this program again."
 msgstr "Do not ask me about this program again."
 
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Calendar alarm notification service"
+
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialize Bonobo"
@@ -4095,78 +4305,61 @@ msgid "Show where events end in week and month views"
 msgstr "Show where events end in week and month views"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "The url template to use as a free/busy data fallback"
+msgstr "The URL template to use as a free/busy data fallback"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Time last alarm ran"
 msgstr "Time last alarm ran"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "Units for determining when to hide tasks"
 msgstr "Units for determining when to hide tasks"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Units of default reminder"
 msgstr "Units of default reminder"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Weekday the week starts on"
 msgstr "Weekday the week starts on"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether or not to use the notification tray for display alarms"
 msgstr "Whether or not to use the notification tray for displaying alarms"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Whether to ask for confirmation on appointment deletion"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Whether to ask for confirmation when folder is expunged"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to hide completed tasks"
 msgstr "Whether to hide completed tasks"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to set a default reminder for events"
 msgstr "Whether to set a default reminder for events"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Whether to show times in 24h format instead of using am/pm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Whether to show week numbers in date navigator"
 msgstr "Whether to show week numbers in date navigator"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Summary contains"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Description contains"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Comment contains"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "Location contains"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:343
-msgid "Unmatched"
-msgstr "Unmatched"
-
-#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:570
-#: calendar/gui/dialogs/select-source-dialog.c:112
-#: calendar/gui/gnome-cal.c:1910
-#: camel/providers/groupwise/camel-gw-listener.c:331
-#: camel/providers/groupwise/camel-gw-listener.c:361
+#: calendar/gui/calendar-commands.c:120 calendar/gui/calendar-component.c:568
+#: calendar/gui/dialogs/calendar-setup.c:362 calendar/gui/gnome-cal.c:1925
+#: plugins/groupwise-account-setup/camel-gw-listener.c:405
+#: plugins/groupwise-account-setup/camel-gw-listener.c:435
 msgid "Calendar"
 msgstr "Calendar"
 
-#: calendar/gui/calendar-commands.c:352
+#: calendar/gui/calendar-commands.c:355
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -4176,187 +4369,147 @@ msgstr ""
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 
-#: calendar/gui/calendar-commands.c:358
+#: calendar/gui/calendar-commands.c:361
 msgid "Purge events older than"
 msgstr "Purge events older than"
 
-#: calendar/gui/calendar-commands.c:363
+#: calendar/gui/calendar-commands.c:366
 #: calendar/gui/dialogs/alarm-dialog.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:14
+#: plugins/calendar-http/calendar-http.c:265
 msgid "days"
 msgstr "days"
 
-#: calendar/gui/calendar-commands.c:432
-msgid "%A %d %B %Y"
-msgstr "%A %d %B %Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:525
-#: calendar/gui/e-day-view-top-item.c:714 calendar/gui/e-day-view.c:1588
-#: calendar/gui/e-week-view-main-item.c:329
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
-#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:527
-#: calendar/gui/calendar-component.c:532 calendar/gui/calendar-component.c:534
-msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
-
-#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
-#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
-msgid "%d %B %Y"
-msgstr "%d %B %Y"
-
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:465
-#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
-msgid "%d %B"
-msgstr "%d %B"
-
-#: calendar/gui/calendar-component.c:370
-#, c-format
-msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
-msgstr "Calendar '%s' will be removed. Are you sure you want to continue?"
-
-#: calendar/gui/calendar-component.c:432
+#: calendar/gui/calendar-component.c:384
+#: calendar/gui/dialogs/calendar-setup.c:442
 msgid "New Calendar"
 msgstr "New Calendar"
 
-#: calendar/gui/calendar-component.c:522
-msgid "%A %d %b %Y"
-msgstr "%A %d %b %Y"
-
-#: calendar/gui/calendar-component.c:546 calendar/gui/calendar-component.c:553
-#: calendar/gui/calendar-component.c:559 calendar/gui/calendar-component.c:561
-msgid "%d %b %Y"
-msgstr "%d %b %Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/calendar-component.c:551
-#: calendar/gui/e-day-view-top-item.c:718 calendar/gui/e-day-view.c:1604
-#: calendar/gui/e-week-view-main-item.c:343
-msgid "%d %b"
-msgstr "%d %b"
-
-#: calendar/gui/calendar-component.c:641
+#: calendar/gui/calendar-component.c:701
 msgid "Failed upgrading calendars."
 msgstr "Failed upgrading calendars."
 
-#: calendar/gui/calendar-component.c:937
+#: calendar/gui/calendar-component.c:997
 #, 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"
 
-#: calendar/gui/calendar-component.c:953
+#: calendar/gui/calendar-component.c:1013
 msgid "There is no calendar available for creating events and meetings"
 msgstr "There is no calendar available for creating events and meetings"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1123
+msgid "Calendar Source Selector"
+msgstr "Calendar Source Selector"
+
+#: calendar/gui/calendar-component.c:1148
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Calendars"
+msgstr "Calendars"
+
+#: calendar/gui/calendar-component.c:1314
 msgid "New appointment"
 msgstr "New appointment"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1315
 msgid "_Appointment"
 msgstr "_Appointment"
 
-#: calendar/gui/calendar-component.c:1253
+#: calendar/gui/calendar-component.c:1316
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
-#: calendar/gui/calendar-component.c:1259
+#: calendar/gui/calendar-component.c:1322
 msgid "New meeting"
 msgstr "New meeting"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1323
 msgid "M_eeting"
 msgstr "M_eeting"
 
-#: calendar/gui/calendar-component.c:1261
+#: calendar/gui/calendar-component.c:1324
 msgid "Create a new meeting request"
 msgstr "Create a new meeting request"
 
-#: calendar/gui/calendar-component.c:1267
+#: calendar/gui/calendar-component.c:1330
 msgid "New all day appointment"
 msgstr "New all day appointment"
 
-#: calendar/gui/calendar-component.c:1268
+#: calendar/gui/calendar-component.c:1331
 msgid "All Day A_ppointment"
 msgstr "All Day A_ppointment"
 
-#: calendar/gui/calendar-component.c:1269
+#: calendar/gui/calendar-component.c:1332
 msgid "Create a new all-day appointment"
 msgstr "Create a new all-day appointment"
 
-#: calendar/gui/calendar-component.c:1275
+#: calendar/gui/calendar-component.c:1338
 msgid "New calendar"
 msgstr "New calendar"
 
-#: calendar/gui/calendar-component.c:1276
+#: calendar/gui/calendar-component.c:1339
 msgid "Cale_ndar"
 msgstr "Cale_ndar"
 
-#: calendar/gui/calendar-component.c:1277
+#: calendar/gui/calendar-component.c:1340
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
-#: calendar/gui/calendar-offline-handler.c:192
-#, c-format
-msgid "backend_go_offline(): %s"
-msgstr "backend_go_offline(): %s"
-
-#: calendar/gui/calendar-offline-handler.c:215
-#, c-format
-msgid "backend_go_online(): %s"
-msgstr "backend_go_online(): %s"
-
-#: calendar/gui/calendar-view-factory.c:118
+#: calendar/gui/calendar-view-factory.c:109
 msgid "Day View"
 msgstr "Day View"
 
-#: calendar/gui/calendar-view-factory.c:121
+#: calendar/gui/calendar-view-factory.c:112
 msgid "Work Week View"
 msgstr "Work Week View"
 
-#: calendar/gui/calendar-view-factory.c:124
+#: calendar/gui/calendar-view-factory.c:115
 msgid "Week View"
 msgstr "Week View"
 
-#: calendar/gui/calendar-view-factory.c:127
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Month View"
 msgstr "Month View"
 
-#: calendar/gui/comp-editor-factory.c:409
+#: calendar/gui/cal-search-bar.c:49
+msgid "Summary contains"
+msgstr "Summary contains"
+
+#: calendar/gui/cal-search-bar.c:50
+msgid "Description contains"
+msgstr "Description contains"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Comment contains"
+msgstr "Comment contains"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Location contains"
+msgstr "Location contains"
+
+#: calendar/gui/cal-search-bar.c:350
+msgid "Unmatched"
+msgstr "Unmatched"
+
+#: calendar/gui/comp-editor-factory.c:413
 msgid "Error while opening the calendar"
 msgstr "Error while opening the calendar"
 
-#: calendar/gui/comp-editor-factory.c:420
+#: calendar/gui/comp-editor-factory.c:419
 msgid "Method not supported when opening the calendar"
 msgstr "Method not supported when opening the calendar"
 
-#: calendar/gui/comp-editor-factory.c:426
+#: calendar/gui/comp-editor-factory.c:425
 msgid "Permission denied to open the calendar"
 msgstr "Permission denied to open the calendar"
 
-#: calendar/gui/comp-editor-factory.c:474
-#, c-format
-msgid "open_client(): %s"
-msgstr "open_client(): %s"
+#: calendar/gui/comp-editor-factory.c:437 shell/e-shell.c:1259
+msgid "Unknown error"
+msgstr "Unknown error"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:2
-msgid "<b>Alarm</b>\t"
-msgstr "<b>Alarm</b>\t"
+msgid "<b>Alarm</b>"
+msgstr "<b>Alarm</b>"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:3
 msgid "<b>Options</b>"
@@ -4447,7 +4600,8 @@ msgid "hour(s)"
 msgstr "hour(s)"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:15
+#: plugins/calendar-http/calendar-http.c:264
 msgid "hours"
 msgstr "hours"
 
@@ -4456,10 +4610,26 @@ msgid "minute(s)"
 msgstr "minute(s)"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:28
+msgid "option menu to choose alarm action"
+msgstr "option menu to choose alarm action"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:29
+msgid "option menu to choose alarm relative"
+msgstr "option menu to choose alarm relative"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:30
+msgid "option menu to choose alarm time"
+msgstr "option menu to choose alarm time"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:31
+msgid "option menu to choose alarm value units"
+msgstr "option menu to choose alarm value units"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:32
 msgid "start of appointment"
 msgstr "start of appointment"
 
-#: calendar/gui/dialogs/alarm-list-dialog.c:192
+#: calendar/gui/dialogs/alarm-list-dialog.c:199
 msgid "Action/Trigger"
 msgstr "Action/Trigger"
 
@@ -4471,34 +4641,96 @@ msgstr "A_dd"
 msgid "Alarms"
 msgstr "Alarms"
 
+#: calendar/gui/dialogs/calendar-setup.c:284
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Copy calendar contents locally for offline operation"
+
+#: calendar/gui/dialogs/calendar-setup.c:336
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "C_olour:"
+
+#: calendar/gui/dialogs/calendar-setup.c:373
+msgid "Tasks List"
+msgstr "Tasks List"
+
+#: calendar/gui/dialogs/calendar-setup.c:440
+msgid "Calendar Properties"
+msgstr "Calendar Properties"
+
+#: calendar/gui/dialogs/calendar-setup.c:506
+msgid "Task List Properties"
+msgstr "Task List Properties"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Add Calendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Task List"
+msgstr "Add Task List"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:103
+msgid "Pick a color"
+msgstr "Pick a colour"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "_Add Calendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Task List"
+msgstr "_Add Task List"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#: plugins/calendar-http/calendar-http.c:248
+msgid "_Refresh:"
+msgstr "_Refresh:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: plugins/calendar-http/calendar-http.c:120
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:21
+#: plugins/calendar-http/calendar-http.c:266
+msgid "weeks"
+msgstr "weeks"
+
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:481
-#: mail/em-composer-prefs.c:678 mail/em-composer-prefs.c:937
+#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
+#: calendar/gui/dialogs/cal-prefs-dialog.c:576 mail/em-account-prefs.c:470
+#: mail/em-composer-prefs.c:678 mail/em-composer-prefs.c:945
+#: plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "Enabled"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:721
+#: calendar/gui/dialogs/cal-prefs-dialog.c:730
 msgid "Are you sure you want to remove this URL?"
 msgstr "Are you sure you want to remove this URL?"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:729
+#: calendar/gui/dialogs/cal-prefs-dialog.c:733
+msgid "Remove"
+msgstr "Remove"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:738
 msgid "Don't Remove"
 msgstr "Don't Remove"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:778
-#: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:328
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:387
+#: calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: calendar/gui/dialogs/cal-prefs-dialog.c:853 mail/em-account-prefs.c:317
+#: mail/em-account-prefs.c:345 mail/em-account-prefs.c:376
 #: mail/em-composer-prefs.c:597 mail/em-composer-prefs.c:655
 #: mail/em-composer-prefs.c:685
 msgid "Disable"
 msgstr "Disable"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.c:778
-#: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:328
-#: mail/em-account-prefs.c:356 mail/em-account-prefs.c:389
+#: calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: calendar/gui/dialogs/cal-prefs-dialog.c:820
+#: calendar/gui/dialogs/cal-prefs-dialog.c:855 mail/em-account-prefs.c:317
+#: mail/em-account-prefs.c:345 mail/em-account-prefs.c:378
 #: mail/em-composer-prefs.c:597 mail/em-composer-prefs.c:655
 #: mail/em-composer-prefs.c:685
 msgid "Enable"
@@ -4529,282 +4761,230 @@ msgid "<b>Alerts</b>"
 msgstr "<b>Alerts</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+msgid "<b>Default Free/Busy Server</b>"
+msgstr "<b>Default Free/Busy Server</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "<b>General</b>"
 msgstr "<b>General</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "<b>Publishing</b>"
+msgstr "<b>Publishing</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "<b>Task List</b>"
 msgstr "<b>Task List</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<b>Time</b>"
 msgstr "<b>Time</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<b>Work Week</b>"
 msgstr "<b>Work Week</b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#, no-c-format
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Calendar and Tasks Settings"
 msgstr "Calendar and Tasks Settings"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Color for overdue tasks"
 msgstr "Colour for overdue tasks"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Color for tasks due today"
 msgstr "Colour for tasks due today"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Day _ends:"
 msgstr "Day _ends:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Days"
 msgstr "Days"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Display"
 msgstr "Display"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:72
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "E_nable"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Free/Busy Publishing"
-msgstr "Free/Busy Publishing"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+msgid "Free/Busy"
+msgstr "Free/Busy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:739
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/recurrence-page.c:1031
+#: calendar/gui/e-itip-control.c:732
 msgid "Friday"
 msgstr "Friday"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Hours"
 msgstr "Hours"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Minutes"
 msgstr "Minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:735
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/recurrence-page.c:1027
+#: calendar/gui/e-itip-control.c:728
 msgid "Monday"
 msgstr "Monday"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "S_un"
 msgstr "S_un"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:740
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/recurrence-page.c:1032
+#: calendar/gui/e-itip-control.c:733
 msgid "Saturday"
 msgstr "Saturday"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Sh_ow a reminder"
 msgstr "Sh_ow a reminder"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Show week _numbers in date navigator"
 msgstr "Show week _numbers in date navigator"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1051
-#: calendar/gui/e-itip-control.c:734
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:727
 msgid "Sunday"
 msgstr "Sunday"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "T_asks due today:"
 msgstr "T_asks due today:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "T_hu"
 msgstr "T_hu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:738
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+msgid "Template:"
+msgstr "Template:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/recurrence-page.c:1030
+#: calendar/gui/e-itip-control.c:731
 msgid "Thursday"
 msgstr "Thursday"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Time _zone:"
 msgstr "Time _zone:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Time format:"
 msgstr "Time format:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:1028
+#: calendar/gui/e-itip-control.c:729
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "W_eek starts:"
 msgstr "W_eek starts:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:737
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/recurrence-page.c:1029
+#: calendar/gui/e-itip-control.c:730
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Work days:"
 msgstr "Work days:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_12 hour (AM/PM)"
 msgstr "_12 hour (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "_24 hour"
 msgstr "_24 hour"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Add URL"
 msgstr "_Add URL"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Ask for confirmation when deleting items"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Compress weekends in month view"
 msgstr "_Compress weekends in month view"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Day begins:"
 msgstr "_Day begins:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
-#: mail/mail-config.glade.h:149 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:22
-msgid "_Edit"
-msgstr "_Edit"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Fri"
 msgstr "_Fri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Hide completed tasks after"
 msgstr "_Hide completed tasks after"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Mon"
 msgstr "_Mon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Overdue tasks:"
 msgstr "_Overdue tasks:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Sat"
 msgstr "_Sat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Show appointment end times in week and month views"
 msgstr "_Show appointment end times in week and month views"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Time divisions:"
 msgstr "_Time divisions:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Tue"
 msgstr "_Tue"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Wed"
 msgstr "_Wed"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "before every appointment"
 msgstr "before every appointment"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "You must specify a location to get the calendar from."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "The source location '%s' is not well-formed."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "The source location '%s' is not a webcal source."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Source with name '%s' already exists in the selected group"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Add Calendar"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+msgid "option menu to choose reminder units"
+msgstr "option menu to choose reminder units"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Task List"
-msgstr "Add Task List"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "C_olour:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:100
-msgid "Pick a color"
-msgstr "Pick a colour"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "_Add Calendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Task List"
-msgstr "_Add Task List"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "_Refresh:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Type:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
-msgid "weeks"
-msgstr "weeks"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+msgid "option menu to choose time units"
+msgstr "option menu to choose time units"
 
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
@@ -4850,73 +5030,98 @@ msgstr "%s  You have made changes. Forget those changes and update the editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  You have made no changes, update the editor?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validation error: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " to "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Completed "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Completed "
+#: calendar/gui/dialogs/comp-editor.c:279
+msgid "Could not update object"
+msgstr "Could not update object"
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Due "
+#: calendar/gui/dialogs/comp-editor.c:417 composer/e-msg-composer.c:2315
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> File Attached"
+msgstr[1] "<b>%d</b> Files Attached"
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Due "
+#: calendar/gui/dialogs/comp-editor.c:470 composer/e-msg-composer.c:2344
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Hide _Attachment Bar (drop attachments here)"
 
-#: calendar/gui/dialogs/comp-editor.c:264
-msgid "Could not update object"
-msgstr "Could not update object"
+#: calendar/gui/dialogs/comp-editor.c:473
+#: calendar/gui/dialogs/comp-editor.c:517 composer/e-msg-composer.c:2347
+#: composer/e-msg-composer.c:3466
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Show _Attachment Bar (drop attachments here)"
 
-#: calendar/gui/dialogs/comp-editor.c:878
-#: calendar/gui/dialogs/comp-editor.c:915
+#: calendar/gui/dialogs/comp-editor.c:1046
+#: calendar/gui/dialogs/comp-editor.c:1089
 msgid "Edit Appointment"
 msgstr "Edit Appointment"
 
-#: calendar/gui/dialogs/comp-editor.c:883
-#: calendar/gui/dialogs/comp-editor.c:920
+#: calendar/gui/dialogs/comp-editor.c:1052
+#: calendar/gui/dialogs/comp-editor.c:1095
+#, c-format
+msgid "Meeting - %s"
+msgstr "Meeting - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:1054
+#: calendar/gui/dialogs/comp-editor.c:1097
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appointment - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:886
-#: calendar/gui/dialogs/comp-editor.c:923
+#: calendar/gui/dialogs/comp-editor.c:1058
+#: calendar/gui/dialogs/comp-editor.c:1101
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Assigned Task - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:1060
+#: calendar/gui/dialogs/comp-editor.c:1103
 #, c-format
 msgid "Task - %s"
 msgstr "Task - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:889
-#: calendar/gui/dialogs/comp-editor.c:926
+#: calendar/gui/dialogs/comp-editor.c:1063
+#: calendar/gui/dialogs/comp-editor.c:1106
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journal entry - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:900
-#: calendar/gui/dialogs/comp-editor.c:936
+#: calendar/gui/dialogs/comp-editor.c:1074
+#: calendar/gui/dialogs/comp-editor.c:1116
 msgid "No summary"
 msgstr "No summary"
 
-#: calendar/gui/dialogs/comp-editor.c:1302
-#: calendar/gui/dialogs/comp-editor.c:1335
-#: calendar/gui/dialogs/comp-editor.c:1359
+#: calendar/gui/dialogs/comp-editor.c:1548
+#: calendar/gui/dialogs/comp-editor.c:1581
+#: calendar/gui/dialogs/comp-editor.c:1605
 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:1383
+#: calendar/gui/dialogs/comp-editor.c:1629
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Validation error: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2265
+msgid " (Completed "
+msgstr " (Completed "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2267
+msgid "Completed "
+msgstr "Completed "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2272
+msgid " (Due "
+msgstr " (Due "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2274
+msgid "Due "
+msgstr "Due "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
 msgstr "Could not open source"
@@ -4989,70 +5194,66 @@ msgstr "Delegate To:"
 msgid "Enter Delegate"
 msgstr "Enter Delegate"
 
-#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
-msgid "Appointment"
-msgstr "Appointment"
-
-#: calendar/gui/dialogs/event-editor.c:162
+#: calendar/gui/dialogs/event-editor.c:147
 msgid "Recurrence"
 msgstr "Recurrence"
 
-#: calendar/gui/dialogs/event-editor.c:169
-#: calendar/gui/dialogs/event-editor.c:239
-#: calendar/gui/dialogs/event-editor.c:381
+#: calendar/gui/dialogs/event-editor.c:159
+#: calendar/gui/dialogs/event-editor.c:231
+#: calendar/gui/dialogs/event-editor.c:376
 msgid "Scheduling"
 msgstr "Scheduling"
 
-#: calendar/gui/dialogs/event-editor.c:176
-#: calendar/gui/dialogs/event-editor.c:242
-#: calendar/gui/dialogs/event-editor.c:384
+#: calendar/gui/dialogs/event-editor.c:166
+#: calendar/gui/dialogs/event-editor.c:234
+#: calendar/gui/dialogs/event-editor.c:379
 msgid "Invitations"
 msgstr "Invitations"
 
-#: calendar/gui/dialogs/event-page.c:692
+#: calendar/gui/dialogs/event-page.c:716
 msgid "Event with no start date"
 msgstr "Event with no start date"
 
-#: calendar/gui/dialogs/event-page.c:695
+#: calendar/gui/dialogs/event-page.c:719
 msgid "Event with no end date"
 msgstr "Event with no end date"
 
-#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
+#: calendar/gui/dialogs/event-page.c:885 calendar/gui/dialogs/task-page.c:551
 msgid "Start date is wrong"
 msgstr "Start date is wrong"
 
-#: calendar/gui/dialogs/event-page.c:865
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End date is wrong"
 msgstr "End date is wrong"
 
-#: calendar/gui/dialogs/event-page.c:888
+#: calendar/gui/dialogs/event-page.c:918
 msgid "Start time is wrong"
 msgstr "Start time is wrong"
 
-#: calendar/gui/dialogs/event-page.c:895
+#: calendar/gui/dialogs/event-page.c:925
 msgid "End time is wrong"
 msgstr "End time is wrong"
 
-#: calendar/gui/dialogs/event-page.c:1605
+#: calendar/gui/dialogs/event-page.c:1666
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Unable to open the calendar '%s'."
 
-#: calendar/gui/dialogs/event-page.c:1804
+#: calendar/gui/dialogs/event-page.c:1872
 #, 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:1812
+#: calendar/gui/dialogs/event-page.c:1880
 #, 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:1820
+#: calendar/gui/dialogs/event-page.c:1888
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -5080,122 +5281,138 @@ msgid "<b>Date and Time</b>"
 msgstr "<b>Date and Time</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:2
+msgid "<b>Send Options</b>"
+msgstr "<b>Send Options</b>"
+
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "A_ll day event"
 msgstr "A_ll day event"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
+msgid "Ad_vanced  send options"
+msgstr "Ad_vanced  send options"
+
+#: calendar/gui/dialogs/event-page.glade.h:10
 msgid "C_ustomize..."
 msgstr "C_ustomize..."
 
-#: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Ca_tegories..."
 msgstr "Ca_tegories..."
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:12
 msgid "Cale_ndar:"
 msgstr "Cale_ndar:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Classi_fication:"
 msgstr "Classi_fication:"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:355 calendar/gui/e-calendar-table.c:377
+#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:361 calendar/gui/e-cal-list-view.c:255
+#: calendar/gui/e-cal-model.c:305
 msgid "Confidential"
 msgstr "Confidential"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:15
+msgid "Event Description"
+msgstr "Event Description"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
 msgid "Locat_ion:"
 msgstr "Locat_ion:"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:353 calendar/gui/e-calendar-table.c:376
+#: calendar/gui/dialogs/event-page.glade.h:17
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:360 calendar/gui/e-cal-list-view.c:254
+#: calendar/gui/e-cal-model.c:303
 msgid "Private"
 msgstr "Private"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
-#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:344 calendar/gui/e-cal-model.c:351
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/dialogs/event-page.glade.h:18
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:359 calendar/gui/e-cal-list-view.c:253
+#: calendar/gui/e-cal-model.c:294 calendar/gui/e-cal-model.c:301
 msgid "Public"
 msgstr "Public"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:19
 msgid "Show time as _busy"
 msgstr "Show time as _busy"
 
-#: calendar/gui/dialogs/event-page.glade.h:17
-#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:20
+#: calendar/gui/dialogs/task-page.glade.h:14
 msgid "Su_mmary:"
 msgstr "Su_mmary:"
 
-#: calendar/gui/dialogs/event-page.glade.h:18
+#: calendar/gui/dialogs/event-page.glade.h:21
 msgid "This appointment has customized alarms"
 msgstr "This appointment has customized alarms"
 
-#: calendar/gui/dialogs/event-page.glade.h:19
+#: calendar/gui/dialogs/event-page.glade.h:22
 msgid "_Alarm"
 msgstr "_Alarm"
 
-#: calendar/gui/dialogs/event-page.glade.h:20
+#: calendar/gui/dialogs/event-page.glade.h:23
 msgid "_Description:"
 msgstr "_Description:"
 
-#: calendar/gui/dialogs/event-page.glade.h:21
-#: calendar/gui/e-meeting-time-sel.c:613
+#: calendar/gui/dialogs/event-page.glade.h:24
+#: calendar/gui/e-meeting-time-sel.c:642
 msgid "_End time:"
 msgstr "_End time:"
 
-#: calendar/gui/dialogs/event-page.glade.h:22
-#: calendar/gui/e-meeting-time-sel.c:594
+#: calendar/gui/dialogs/event-page.glade.h:25
+#: calendar/gui/e-meeting-time-sel.c:615
 msgid "_Start time:"
 msgstr "_Start time:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
 #. Put the "None" and "UTC" entries at the top of the combo's list.
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:316
+#: calendar/gui/dialogs/meeting-page.c:296
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-cal-model-tasks.c:648 calendar/gui/e-itip-control.c:1111
-#: composer/e-msg-composer.c:2098 filter/filter-rule.c:877
-#: mail/em-account-prefs.c:442 mail/em-folder-view.c:955
-#: mail/mail-account-gui.c:1578 mail/mail-account-gui.c:2023
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
-#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
+#: calendar/gui/e-cal-model-tasks.c:652 calendar/gui/e-itip-control.c:1104
+#: composer/e-msg-composer.c:2122 filter/filter-rule.c:878
+#: mail/em-account-editor.c:675 mail/em-account-editor.c:1268
+#: mail/em-account-prefs.c:431 mail/em-folder-view.c:961
+#: plugins/itip-formatter/itip-formatter.c:1365
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:190
+#: widgets/misc/e-cell-date-edit.c:248 widgets/misc/e-dateedit.c:458
+#: widgets/misc/e-dateedit.c:1497 widgets/misc/e-dateedit.c:1651
 msgid "None"
 msgstr "None"
 
-#: calendar/gui/dialogs/meeting-page.c:449
+#: calendar/gui/dialogs/meeting-page.c:432
 msgid "The organizer selected no longer has an account."
 msgstr "The organizer selected no longer has an account."
 
-#: calendar/gui/dialogs/meeting-page.c:455
+#: calendar/gui/dialogs/meeting-page.c:438
 msgid "An organizer is required."
 msgstr "An organizer is required."
 
-#: calendar/gui/dialogs/meeting-page.c:470
+#: calendar/gui/dialogs/meeting-page.c:453
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: calendar/gui/dialogs/meeting-page.c:795
+#: calendar/gui/dialogs/meeting-page.c:778
 msgid "_Delegate To..."
 msgstr "_Delegate To..."
 
-#: calendar/gui/dialogs/meeting-page.c:799
+#: calendar/gui/dialogs/meeting-page.c:781
 #: composer/e-msg-composer-attachment-bar.c:440
+#: plugins/shared-folder/properties.glade.h:19
 msgid "_Remove"
 msgstr "_Remove"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:218
+#: calendar/gui/e-meeting-list-view.c:235
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Attendee"
@@ -5231,16 +5448,16 @@ msgid "Member"
 msgstr "Member"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:258
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/dialogs/task-editor.c:145
 #: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: calendar/gui/e-meeting-list-view.c:265
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:63
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -5254,7 +5471,7 @@ msgid "C_hange Organizer"
 msgstr "C_hange Organizer"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:415
+#: calendar/gui/e-meeting-time-sel.c:428
 msgid "Con_tacts..."
 msgstr "Con_tacts..."
 
@@ -5263,6 +5480,10 @@ msgid "Or_ganizer:"
 msgstr "Or_ganizer:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:7
+msgid "Organizer"
+msgstr "Organizer"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:8
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizer:"
@@ -5333,55 +5554,55 @@ msgstr "This and Future Instances"
 msgid "All Instances"
 msgstr "All Instances"
 
-#: calendar/gui/dialogs/recurrence-page.c:511
+#: calendar/gui/dialogs/recurrence-page.c:493
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "This appointment contains recurrences that Evolution cannot edit."
 
-#: calendar/gui/dialogs/recurrence-page.c:817
+#: calendar/gui/dialogs/recurrence-page.c:799
 msgid "Recurrence date is invalid"
 msgstr "Recurrence date is invalid"
 
-#: calendar/gui/dialogs/recurrence-page.c:928
+#: calendar/gui/dialogs/recurrence-page.c:910
 msgid "on"
 msgstr "on"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "first"
 msgstr "first"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:972
 msgid "second"
 msgstr "second"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:973
 msgid "third"
 msgstr "third"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:974
 msgid "fourth"
 msgstr "fourth"
 
-#: calendar/gui/dialogs/recurrence-page.c:993
+#: calendar/gui/dialogs/recurrence-page.c:975
 msgid "last"
 msgstr "last"
 
-#: calendar/gui/dialogs/recurrence-page.c:1016
+#: calendar/gui/dialogs/recurrence-page.c:998
 msgid "Other Date"
 msgstr "Other Date"
 
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1026
 msgid "day"
 msgstr "day"
 
-#: calendar/gui/dialogs/recurrence-page.c:1181
+#: calendar/gui/dialogs/recurrence-page.c:1163
 msgid "on the"
 msgstr "on the"
 
-#: calendar/gui/dialogs/recurrence-page.c:1367
+#: calendar/gui/dialogs/recurrence-page.c:1349
 msgid "occurrences"
 msgstr "occurrences"
 
-#: calendar/gui/dialogs/recurrence-page.c:2320
+#: calendar/gui/dialogs/recurrence-page.c:2302
 msgid "Date/Time"
 msgstr "Date/Time"
 
@@ -5429,25 +5650,14 @@ msgstr "week(s)"
 msgid "year(s)"
 msgstr "year(s)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
-msgid "Select destination"
-msgstr "Select destination"
-
-#: calendar/gui/dialogs/select-source-dialog.c:110
-msgid "_Destination"
-msgstr "_Destination"
-
-#: calendar/gui/dialogs/select-source-dialog.c:112
-msgid "Task List"
-msgstr "Task List"
-
-#: calendar/gui/dialogs/task-details-page.c:427
+#: calendar/gui/dialogs/task-details-page.c:410
+#: calendar/gui/dialogs/task-details-page.c:429
 msgid "Completed date is wrong"
 msgstr "Completed date is wrong"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:1
-msgid "<span weight=\"bold\">Miscellaneous\t</span>"
-msgstr "<span weight=\"bold\">Miscellaneous\t</span>"
+msgid "<span weight=\"bold\">Miscellaneous</span>"
+msgstr "<span weight=\"bold\">Miscellaneous</span>"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "<span weight=\"bold\">Status</span>"
@@ -5456,44 +5666,45 @@ msgstr "<span weight=\"bold\">Status</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-cal-model-tasks.c:351 calendar/gui/e-cal-model-tasks.c:654
-#: calendar/gui/e-calendar-table.c:472 calendar/gui/e-itip-control.c:903
-#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
-#: calendar/gui/print.c:2346
+#: calendar/gui/e-cal-component-preview.c:229
+#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-tasks.c:345
+#: calendar/gui/e-cal-model-tasks.c:658 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-meeting-store.c:196 calendar/gui/e-meeting-store.c:219
+#: calendar/gui/print.c:2349
 msgid "Completed"
 msgstr "Completed"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:397 mail/message-list.c:1013
+#: calendar/gui/e-cal-component-preview.c:248
+#: calendar/gui/e-calendar-table.c:381 mail/message-list.c:1011
 msgid "High"
 msgstr "High"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-cal-model-tasks.c:349 calendar/gui/e-cal-model-tasks.c:652
-#: calendar/gui/e-cal-model-tasks.c:727 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/print.c:2343
+#: calendar/gui/e-cal-component-preview.c:226
+#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-tasks.c:343
+#: calendar/gui/e-cal-model-tasks.c:656 calendar/gui/e-cal-model-tasks.c:731
+#: calendar/gui/print.c:2346
 msgid "In Progress"
 msgstr "In Progress"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:399 mail/message-list.c:1011
+#: calendar/gui/e-cal-component-preview.c:252
+#: calendar/gui/e-calendar-table.c:383 mail/message-list.c:1009
 msgid "Low"
 msgstr "Low"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:949
-#: calendar/gui/e-calendar-table.c:398 mail/message-list.c:1012
+#: calendar/gui/e-cal-component-preview.c:250
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:899
+#: mail/message-list.c:1010
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-cal-model-tasks.c:347 calendar/gui/e-cal-model-tasks.c:650
-#: calendar/gui/e-calendar-table.c:470 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-component-preview.c:236
+#: calendar/gui/e-calendar-table.c:454 calendar/gui/e-cal-model-tasks.c:341
+#: calendar/gui/e-cal-model-tasks.c:654 calendar/gui/print.c:2343
 msgid "Not Started"
 msgstr "Not Started"
 
@@ -5502,7 +5713,7 @@ msgid "P_ercent complete:"
 msgstr "P_ercent complete:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:400
+#: calendar/gui/e-calendar-table.c:384
 msgid "Undefined"
 msgstr "Undefined"
 
@@ -5522,46 +5733,54 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Web Page:"
 
-#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+#: calendar/gui/dialogs/task-editor.c:136 calendar/gui/print.c:2300
 msgid "Task"
 msgstr "Task"
 
-#: calendar/gui/dialogs/task-editor.c:165
-#: calendar/gui/dialogs/task-editor.c:225
-#: calendar/gui/dialogs/task-editor.c:361
+#: calendar/gui/dialogs/task-editor.c:156
+#: calendar/gui/dialogs/task-editor.c:218
+#: calendar/gui/dialogs/task-editor.c:357
 msgid "Assignment"
 msgstr "Assignment"
 
-#: calendar/gui/dialogs/task-page.c:496 calendar/gui/dialogs/task-page.c:553
+#: calendar/gui/dialogs/task-page.c:524
 msgid "Due date is wrong"
 msgstr "Due date is wrong"
 
-#: calendar/gui/dialogs/task-page.c:840
+#: calendar/gui/dialogs/task-page.c:868
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Unable to open tasks in '%s'."
 
-#: calendar/gui/dialogs/task-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "<span weight=\"bold\">Basics</span>"
 msgstr "<span weight=\"bold\">Basics</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "<span weight=\"bold\">Date and Time</span>"
 msgstr "<span weight=\"bold\">Date and Time</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:5
+msgid "Ad_vanced send options"
+msgstr "Ad_vanced send options"
+
+#: calendar/gui/dialogs/task-page.glade.h:10
 msgid "D_escription:"
 msgstr "D_escription:"
 
-#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Sta_rt date:"
 msgstr "Sta_rt date:"
 
-#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:15
+msgid "Task Description"
+msgstr "Task Description"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
 msgid "_Due date:"
 msgstr "_Due date:"
 
-#: calendar/gui/dialogs/task-page.glade.h:13
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "_Group:"
 msgstr "_Group:"
 
@@ -5684,275 +5903,188 @@ 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:71 mail/em-folder-view.c:2417
+#: calendar/gui/e-cal-component-preview.c:70 mail/em-folder-view.c:2467
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
 
-#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+#: calendar/gui/e-cal-component-preview.c:155 filter/filter-rule.c:795
 msgid "Untitled"
 msgstr "Untitled"
 
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:1115 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-cal-component-preview.c:186
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Summary:"
 
-#: calendar/gui/e-cal-component-preview.c:194
-#: calendar/gui/e-cal-component-preview.c:205
+#: calendar/gui/e-cal-component-preview.c:193
+#: calendar/gui/e-cal-component-preview.c:204
 msgid "Start Date:"
 msgstr "Start Date:"
 
-#: calendar/gui/e-cal-component-preview.c:216
+#: calendar/gui/e-cal-component-preview.c:215
 msgid "Due Date:"
 msgstr "Due Date:"
 
 #. write status
-#: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:1139
+#. Status
+#: calendar/gui/e-cal-component-preview.c:222
+#: calendar/gui/e-itip-control.c:1132 plugins/itip-formatter/itip-view.c:838
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-cal-component-preview.c:247
+#: calendar/gui/e-cal-component-preview.c:246
 msgid "Priority:"
 msgstr "Priority:"
 
-#: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:67
+#: calendar/gui/e-cal-component-preview.c:267
+#: calendar/gui/e-itip-control.c:1164 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Description:"
 
-#: calendar/gui/e-cal-component-preview.c:300
+#: 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"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-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:22
-msgid "Summary"
-msgstr "Summary"
-
-#: calendar/gui/e-cal-model-calendar.c:181 calendar/gui/e-calendar-table.c:449
-msgid "Free"
-msgstr "Free"
-
-#: calendar/gui/e-cal-model-calendar.c:184 calendar/gui/e-calendar-table.c:450
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Busy"
-
-#: calendar/gui/e-cal-model-tasks.c:303
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:303
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:305 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:305
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/e-cal-model-tasks.c:602
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/e-cal-model-tasks.c:1013 calendar/gui/e-cal-model.c:955
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Yes"
-
-#: calendar/gui/e-cal-model-tasks.c:1013 calendar/gui/e-cal-model.c:955
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "No"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:357 calendar/gui/e-cal-model.c:360
-#: calendar/gui/e-itip-control.c:1156 calendar/gui/e-itip-control.c:1297
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1763 camel/camel-gpg-context.c:1814
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1402
-#: camel/providers/imap4/camel-imap4-engine.c:1432
-#: camel/providers/imap4/camel-imap4-engine.c:1464
-#: camel/providers/imap4/camel-imap4-engine.c:1506
-#: camel/providers/imap4/camel-imap4-store.c:1194
-#: camel/providers/imap4/camel-imap4-utils.c:457
-#: camel/providers/smtp/camel-smtp-transport.c:161
-#: camel/providers/smtp/camel-smtp-transport.c:216 mail/em-utils.c:1155
-#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Unknown"
-
-#: calendar/gui/e-cal-model.c:951
-msgid "Recurring"
-msgstr "Recurring"
-
-#: calendar/gui/e-cal-model.c:953
-msgid "Assigned"
-msgstr "Assigned"
-
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:403
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:404
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:405
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:422
+#: calendar/gui/e-calendar-table.c:406
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:407
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:408
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:409
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:410
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:411
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:412
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:413
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:703 calendar/gui/e-calendar-view.c:658
+#: calendar/gui/e-calendar-table.c:433 calendar/gui/e-cal-model-calendar.c:179
+msgid "Free"
+msgstr "Free"
+
+#: calendar/gui/e-calendar-table.c:434 calendar/gui/e-cal-model-calendar.c:182
+#: calendar/gui/e-meeting-time-sel.c:412
+msgid "Busy"
+msgstr "Busy"
+
+#: calendar/gui/e-calendar-table.c:689 calendar/gui/e-calendar-view.c:652
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
 
-#: calendar/gui/e-calendar-table.c:867 calendar/gui/e-calendar-view.c:762
+#: calendar/gui/e-calendar-table.c:868 calendar/gui/e-calendar-view.c:756
 msgid "Updating objects"
 msgstr "Updating objects"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1084
-#: calendar/gui/e-calendar-view.c:1431 calendar/gui/e-calendar-view.c:1512
-#: mail/em-folder-view.c:921 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-view.c:1064
+#: composer/e-msg-composer.c:1201
+msgid "Save as..."
+msgstr "Save as..."
+
+#: calendar/gui/e-calendar-table.c:1151 calendar/gui/e-calendar-view.c:1389
+#: mail/em-folder-view.c:927 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Open"
 
-#: calendar/gui/e-calendar-table.c:1044
+#: calendar/gui/e-calendar-table.c:1152
 msgid "Open _Web Page"
 msgstr "Open _Web Page"
 
-#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1090
-#: calendar/gui/e-calendar-view.c:1432 calendar/gui/e-calendar-view.c:1518
-#: mail/em-folder-view.c:923 mail/em-popup.c:496
+#: calendar/gui/e-calendar-table.c:1153 calendar/gui/e-calendar-view.c:1390
+#: mail/em-folder-view.c:929 mail/em-popup.c:498
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Save As..."
 
-#: calendar/gui/e-calendar-table.c:1046 calendar/gui/e-calendar-table.c:1088
-#: calendar/gui/e-calendar-view.c:1410 calendar/gui/e-calendar-view.c:1433
-#: calendar/gui/e-calendar-view.c:1516 ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
+#: calendar/gui/e-calendar-table.c:1154 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1391 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Print..."
 
-#: calendar/gui/e-calendar-table.c:1050 calendar/gui/e-calendar-table.c:1079
-#: calendar/gui/e-calendar-view.c:1438 calendar/gui/e-calendar-view.c:1482
+#: calendar/gui/e-calendar-table.c:1158 calendar/gui/e-calendar-view.c:1395
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ut"
 
-#: calendar/gui/e-calendar-table.c:1051 calendar/gui/e-calendar-table.c:1077
-#: calendar/gui/e-calendar-view.c:1439 calendar/gui/e-calendar-view.c:1480
-#: mail/em-folder-tree.c:1020 mail/message-list.c:1709
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
-#: ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1159 calendar/gui/e-calendar-view.c:1396
+#: composer/e-msg-composer.c:2901 mail/em-folder-tree.c:1036
+#: mail/message-list.c:1712 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Copy"
 
-#: calendar/gui/e-calendar-table.c:1052 calendar/gui/e-calendar-table.c:1086
-#: calendar/gui/e-calendar-view.c:1414 calendar/gui/e-calendar-view.c:1440
-#: calendar/gui/e-calendar-view.c:1514 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1160 calendar/gui/e-calendar-view.c:1373
+#: calendar/gui/e-calendar-view.c:1397 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Paste"
 
-#: calendar/gui/e-calendar-table.c:1056
+#: calendar/gui/e-calendar-table.c:1164
 msgid "_Assign Task"
 msgstr "_Assign Task"
 
-#: calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1165
 msgid "_Forward as iCalendar"
 msgstr "_Forward as iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1058
+#: calendar/gui/e-calendar-table.c:1166
 msgid "_Mark as Complete"
 msgstr "_Mark as Complete"
 
-#: calendar/gui/e-calendar-table.c:1059
+#: calendar/gui/e-calendar-table.c:1167
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Mark Selected Tasks as Complete"
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/e-calendar-table.c:1063 calendar/gui/e-calendar-table.c:1081
-#: calendar/gui/e-calendar-view.c:1451 calendar/gui/e-calendar-view.c:1484
-#: mail/em-folder-tree.c:2740 mail/em-folder-view.c:946
+#: calendar/gui/e-calendar-table.c:1171 calendar/gui/e-calendar-view.c:1408
+#: mail/em-folder-tree.c:2754 mail/em-folder-view.c:952
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Delete"
 
-#: calendar/gui/e-calendar-table.c:1064 calendar/gui/e-calendar-table.c:1082
+#: calendar/gui/e-calendar-table.c:1172
 msgid "_Delete Selected Tasks"
 msgstr "_Delete Selected Tasks"
 
-#: calendar/gui/e-calendar-table.c:1199 calendar/gui/e-calendar-view.c:1060
-#: composer/e-msg-composer.c:1179
-msgid "Save as..."
-msgstr "Save as..."
-
-#: calendar/gui/e-calendar-table.c:1377
+#: calendar/gui/e-calendar-table.c:1323
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Click to add a task"
@@ -5962,8 +6094,7 @@ msgstr "Click to add a task"
 msgid "% Complete"
 msgstr "% Complete"
 
-#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
-#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:616
+#: calendar/gui/e-calendar-table.etspec.h:5 mail/mail-send-recv.c:611
 msgid "Complete"
 msgstr "Complete"
 
@@ -5983,92 +6114,153 @@ msgstr "Priority"
 msgid "Start date"
 msgstr "Start date"
 
+#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-cal-list-view.etspec.h:5 mail/mail-dialogs.glade.h:21
+msgid "Summary"
+msgstr "Summary"
+
 #: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Task sort"
 
-#: calendar/gui/e-calendar-view.c:1176
+#: calendar/gui/e-calendar-view.c:1179
 msgid "Moving items"
 msgstr "Moving items"
 
-#: calendar/gui/e-calendar-view.c:1178
+#: calendar/gui/e-calendar-view.c:1181
 msgid "Copying items"
 msgstr "Copying items"
 
-#: calendar/gui/e-calendar-view.c:1403 calendar/gui/e-calendar-view.c:1492
+#: calendar/gui/e-calendar-view.c:1364
 msgid "New _Appointment..."
 msgstr "New _Appointment..."
 
-#: calendar/gui/e-calendar-view.c:1404 calendar/gui/e-calendar-view.c:1497
+#: calendar/gui/e-calendar-view.c:1365
 msgid "New All Day _Event"
 msgstr "New All Day _Event"
 
-#: calendar/gui/e-calendar-view.c:1405 calendar/gui/e-calendar-view.c:1502
-msgid "New Meeting"
-msgstr "New Meeting"
-
-#: calendar/gui/e-calendar-view.c:1406 calendar/gui/e-calendar-view.c:1507
+#: calendar/gui/e-calendar-view.c:1367
 msgid "New Task"
 msgstr "New Task"
 
-#: calendar/gui/e-calendar-view.c:1420 ui/evolution-calendar.xml.h:26
+#. FIXME: hook in this somehow
+#: calendar/gui/e-calendar-view.c:1377
+msgid "Current View"
+msgstr "Current View"
+
+#: calendar/gui/e-calendar-view.c:1379 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Select _Today"
 
-#: calendar/gui/e-calendar-view.c:1421
+#: calendar/gui/e-calendar-view.c:1380
 msgid "_Select Date..."
 msgstr "_Select Date..."
 
-#: calendar/gui/e-calendar-view.c:1425 ui/evolution-calendar.xml.h:45
+#. TODO: Why is this in a context menu when it applies globally?
+#: calendar/gui/e-calendar-view.c:1385 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publish Free/Busy Information"
 
-#: calendar/gui/e-calendar-view.c:1444
+#: calendar/gui/e-calendar-view.c:1401
 msgid "Cop_y to Calendar..."
 msgstr "Cop_y to Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1445
+#: calendar/gui/e-calendar-view.c:1402
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ve to Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1446
+#: calendar/gui/e-calendar-view.c:1403
 msgid "_Schedule Meeting..."
 msgstr "_Schedule Meeting..."
 
-#: calendar/gui/e-calendar-view.c:1447
+#: calendar/gui/e-calendar-view.c:1404
 msgid "_Forward as iCalendar..."
 msgstr "_Forward as iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1452
+#: calendar/gui/e-calendar-view.c:1409
 msgid "Make this Occurrence _Movable"
 msgstr "Make this Occurrence _Movable"
 
-#: calendar/gui/e-calendar-view.c:1453 calendar/gui/e-calendar-view.c:1485
+#: calendar/gui/e-calendar-view.c:1410
 msgid "Delete this _Occurrence"
 msgstr "Delete this _Occurrence"
 
-#: calendar/gui/e-calendar-view.c:1454 calendar/gui/e-calendar-view.c:1486
+#: calendar/gui/e-calendar-view.c:1411
 msgid "Delete _All Occurrences"
 msgstr "Delete _All Occurrences"
 
-#: calendar/gui/e-calendar-view.c:1488
-msgid "Go to _Today"
-msgstr "Go to _Today"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "End Date"
 
-#: calendar/gui/e-calendar-view.c:1490
-msgid "_Go to Date..."
-msgstr "_Go to Date..."
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Start Date"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:307 calendar/gui/e-cal-model.c:310
+#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-meeting-list-view.c:139
+#: calendar/gui/e-meeting-list-view.c:153 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:1157 plugins/itip-formatter/itip-formatter.c:249
+#: plugins/itip-formatter/itip-formatter.c:1387
+#: plugins/plugin-manager/plugin-manager.c:72 shell/e-component-registry.c:202
+#: shell/e-component-registry.c:206 widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Unknown"
+
+#: calendar/gui/e-cal-model.c:901
+msgid "Recurring"
+msgstr "Recurring"
+
+#: calendar/gui/e-cal-model.c:903
+msgid "Assigned"
+msgstr "Assigned"
+
+#: calendar/gui/e-cal-model.c:905 calendar/gui/e-cal-model-tasks.c:1017
+#: calendar/gui/e-meeting-list-view.c:163 calendar/gui/e-meeting-store.c:168
+#: calendar/gui/e-meeting-store.c:178 calendar/gui/e-meeting-store.c:808
+msgid "Yes"
+msgstr "Yes"
+
+#: calendar/gui/e-cal-model.c:905 calendar/gui/e-cal-model-tasks.c:1017
+#: calendar/gui/e-meeting-list-view.c:164 calendar/gui/e-meeting-store.c:180
+msgid "No"
+msgstr "No"
 
-#: calendar/gui/e-calendar-view.c:1520 ui/evolution.xml.h:35
-msgid "_Settings..."
-msgstr "_Settings..."
+#: calendar/gui/e-cal-model-tasks.c:297
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:297
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:299 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:299
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/e-cal-model-tasks.c:606
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:115 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
@@ -6078,12 +6270,12 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-cell-date-edit-text.c:125
+#: calendar/gui/e-cell-date-edit-text.c:123
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6094,10 +6286,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minute divisions"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:748 calendar/gui/e-week-view.c:513
+#: calendar/gui/print.c:841
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:751 calendar/gui/e-week-view.c:516
+#: calendar/gui/print.c:843
+msgid "pm"
+msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
@@ -6105,114 +6304,112 @@ msgstr "%02i minute divisions"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: calendar/gui/e-day-view-top-item.c:710 calendar/gui/e-day-view.c:1571
-#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
+#: calendar/gui/e-day-view.c:1494 calendar/gui/e-day-view-top-item.c:715
+#: calendar/gui/e-week-view-main-item.c:312 calendar/gui/print.c:1517
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:583
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:586
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:527
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minute divisions"
 
-#: calendar/gui/e-itip-control.c:768
+#: calendar/gui/e-itip-control.c:761
 msgid "Yes. (Complex Recurrence)"
 msgstr "Yes. (Complex Recurrence)"
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:772
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Every day"
 msgstr[1] "Every day"
 
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Every week"
 msgstr[1] "Every week"
 
-#: calendar/gui/e-itip-control.c:786
+#: calendar/gui/e-itip-control.c:779
 #, 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:794
+#: calendar/gui/e-itip-control.c:787
 msgid " and "
 msgstr " and "
 
-#: calendar/gui/e-itip-control.c:801
+#: calendar/gui/e-itip-control.c:794
 #, c-format
 msgid "The %s day of "
 msgstr "The %s day of "
 
-#: calendar/gui/e-itip-control.c:814
+#: calendar/gui/e-itip-control.c:807
 #, c-format
 msgid "The %s %s of "
 msgstr "The %s %s of "
 
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:814
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "every month"
 msgstr[1] "every month"
 
-#: calendar/gui/e-itip-control.c:825
+#: calendar/gui/e-itip-control.c:818
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Every year"
 msgstr[1] "Every year"
 
-#: calendar/gui/e-itip-control.c:836
+#: calendar/gui/e-itip-control.c:829
 #, 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:845
+#: calendar/gui/e-itip-control.c:838
 msgid ", ending on "
 msgstr ", ending on "
 
-#: calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:862
 msgid "Starts"
 msgstr "Starts"
 
-#: calendar/gui/e-itip-control.c:882
+#: calendar/gui/e-itip-control.c:875
 msgid "Ends"
 msgstr "Ends"
 
-#: calendar/gui/e-itip-control.c:916
+#: calendar/gui/e-itip-control.c:909
 msgid "Due"
 msgstr "Due"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-itip-control.c:1013
+#: calendar/gui/e-itip-control.c:949 calendar/gui/e-itip-control.c:1006
 msgid "iCalendar Information"
 msgstr "iCalendar Information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:973
+#: calendar/gui/e-itip-control.c:966
 msgid "iCalendar Error"
 msgstr "iCalendar Error"
 
-#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1089
+#: calendar/gui/e-itip-control.c:1038 calendar/gui/e-itip-control.c:1054
+#: calendar/gui/e-itip-control.c:1065 calendar/gui/e-itip-control.c:1082
+#: plugins/itip-formatter/itip-view.c:285
+#: plugins/itip-formatter/itip-view.c:286
+#: plugins/itip-formatter/itip-view.c:353
+#: plugins/itip-formatter/itip-view.c:354
 msgid "An unknown person"
 msgstr "An unknown person"
 
-#: calendar/gui/e-itip-control.c:1096
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:1089
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6220,27 +6417,25 @@ msgstr ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 
-#: calendar/gui/e-itip-control.c:1125
-msgid "Location:"
-msgstr "Location:"
-
-#: calendar/gui/e-itip-control.c:1144 calendar/gui/e-meeting-list-view.c:158
-#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
-#: calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:1137 calendar/gui/e-meeting-list-view.c:175
+#: calendar/gui/e-meeting-store.c:188 calendar/gui/e-meeting-store.c:211
+#: calendar/gui/itip-utils.c:422 plugins/itip-formatter/itip-formatter.c:1378
 msgid "Accepted"
 msgstr "Accepted"
 
-#: calendar/gui/e-itip-control.c:1148 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:1141 calendar/gui/itip-utils.c:425
+#: plugins/itip-formatter/itip-formatter.c:1381
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
-#: calendar/gui/e-itip-control.c:1152 calendar/gui/e-meeting-list-view.c:159
-#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
+#: calendar/gui/e-itip-control.c:1145 calendar/gui/e-meeting-list-view.c:176
+#: calendar/gui/e-meeting-store.c:190 calendar/gui/e-meeting-store.c:213
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
+#: plugins/itip-formatter/itip-formatter.c:1384
 msgid "Declined"
 msgstr "Declined"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1229
 msgid ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
@@ -6248,263 +6443,265 @@ msgstr ""
 "The meeting has been cancelled. However, it could not be found in your "
 "calendars"
 
-#: calendar/gui/e-itip-control.c:1238
+#: calendar/gui/e-itip-control.c:1231
 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"
+"The task has been cancelled. However, it could not be found in your task "
+"lists"
 
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1310
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> has published meeting information."
 
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1311
 msgid "Meeting Information"
 msgstr "Meeting Information"
 
-#: calendar/gui/e-itip-control.c:1324
+#: calendar/gui/e-itip-control.c:1317
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1319
 #, 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:1327
+#: calendar/gui/e-itip-control.c:1320
 msgid "Meeting Proposal"
 msgstr "Meeting Proposal"
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 #, 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:1334
+#: calendar/gui/e-itip-control.c:1327
 msgid "Meeting Update"
 msgstr "Meeting Update"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 #, 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:1339
+#: calendar/gui/e-itip-control.c:1332
 msgid "Meeting Update Request"
 msgstr "Meeting Update Request"
 
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1339
 #, 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:1347
+#: calendar/gui/e-itip-control.c:1340
 msgid "Meeting Reply"
 msgstr "Meeting Reply"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1347
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> has cancelled a meeting."
 
-#: calendar/gui/e-itip-control.c:1355
+#: calendar/gui/e-itip-control.c:1348
 msgid "Meeting Cancellation"
 msgstr "Meeting Cancelation"
 
-#: calendar/gui/e-itip-control.c:1365 calendar/gui/e-itip-control.c:1442
-#: calendar/gui/e-itip-control.c:1482
+#: calendar/gui/e-itip-control.c:1358 calendar/gui/e-itip-control.c:1435
+#: calendar/gui/e-itip-control.c:1475
 #, 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:1366
+#: calendar/gui/e-itip-control.c:1359
 msgid "Bad Meeting Message"
 msgstr "Bad Meeting Message"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> has published task information."
 
-#: calendar/gui/e-itip-control.c:1394
+#: calendar/gui/e-itip-control.c:1387
 msgid "Task Information"
 msgstr "Task Information"
 
-#: calendar/gui/e-itip-control.c:1401
+#: calendar/gui/e-itip-control.c:1394
 #, 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:1403
+#: calendar/gui/e-itip-control.c:1396
 #, 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:1404
+#: calendar/gui/e-itip-control.c:1397
 msgid "Task Proposal"
 msgstr "Task Proposal"
 
 #. FIXME Whats going on here?
-#: calendar/gui/e-itip-control.c:1410
+#: calendar/gui/e-itip-control.c:1403
 #, 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:1411
+#: calendar/gui/e-itip-control.c:1404
 msgid "Task Update"
 msgstr "Task Update"
 
-#: calendar/gui/e-itip-control.c:1415
+#: calendar/gui/e-itip-control.c:1408
 #, 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:1416
+#: calendar/gui/e-itip-control.c:1409
 msgid "Task Update Request"
 msgstr "Task Update Request"
 
-#: calendar/gui/e-itip-control.c:1423
+#: calendar/gui/e-itip-control.c:1416
 #, 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:1424
+#: calendar/gui/e-itip-control.c:1417
 msgid "Task Reply"
 msgstr "Task Reply"
 
-#: calendar/gui/e-itip-control.c:1431
+#: calendar/gui/e-itip-control.c:1424
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> has cancelled a task."
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1425
 msgid "Task Cancellation"
 msgstr "Task Cancelation"
 
-#: calendar/gui/e-itip-control.c:1443
+#: calendar/gui/e-itip-control.c:1436
 msgid "Bad Task Message"
 msgstr "Bad Task Message"
 
-#: calendar/gui/e-itip-control.c:1467
+#: calendar/gui/e-itip-control.c:1460
 #, 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:1468
+#: calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Information"
 msgstr "Free/Busy Information"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 #, 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:1473
+#: calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Request"
 msgstr "Free/Busy Request"
 
-#: calendar/gui/e-itip-control.c:1477
+#: calendar/gui/e-itip-control.c:1470
 #, 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:1478
+#: calendar/gui/e-itip-control.c:1471
 msgid "Free/Busy Reply"
 msgstr "Free/Busy Reply"
 
-#: calendar/gui/e-itip-control.c:1483
+#: calendar/gui/e-itip-control.c:1476
 msgid "Bad Free/Busy Message"
 msgstr "Bad Free/Busy Message"
 
-#: calendar/gui/e-itip-control.c:1558
+#: calendar/gui/e-itip-control.c:1551
 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:1617
+#: calendar/gui/e-itip-control.c:1610
 msgid "The message contains only unsupported requests."
 msgstr "The message contains only unsupported requests."
 
-#: calendar/gui/e-itip-control.c:1650
+#: calendar/gui/e-itip-control.c:1643
 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:1682
+#: calendar/gui/e-itip-control.c:1675
 msgid "The attachment has no viewable calendar items"
 msgstr "The attachment has no viewable calendar items"
 
-#: calendar/gui/e-itip-control.c:1916
+#: calendar/gui/e-itip-control.c:1909
 msgid "Update complete\n"
 msgstr "Update complete\n"
 
-#: calendar/gui/e-itip-control.c:1944
+#: calendar/gui/e-itip-control.c:1937
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is invalid and cannot be updated\n"
 
-#: calendar/gui/e-itip-control.c:1954
+#: calendar/gui/e-itip-control.c:1947
 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:1966
+#: calendar/gui/e-itip-control.c:1959
 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:1983
+#: calendar/gui/e-itip-control.c:1976
 msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1979
+#: plugins/itip-formatter/itip-formatter.c:844
 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:2013
+#: calendar/gui/e-itip-control.c:2006
 msgid "Removal Complete"
 msgstr "Removal Complete"
 
-#: calendar/gui/e-itip-control.c:2036 calendar/gui/e-itip-control.c:2084
+#: calendar/gui/e-itip-control.c:2029 calendar/gui/e-itip-control.c:2077
 msgid "Item sent!\n"
 msgstr "Item sent!\n"
 
-#: calendar/gui/e-itip-control.c:2038 calendar/gui/e-itip-control.c:2088
+#: calendar/gui/e-itip-control.c:2031 calendar/gui/e-itip-control.c:2081
 msgid "The item could not be sent!\n"
 msgstr "The item could not be sent!\n"
 
-#: calendar/gui/e-itip-control.c:2168
+#: calendar/gui/e-itip-control.c:2161
 msgid "Choose an action:"
 msgstr "Choose an action:"
 
-#: calendar/gui/e-itip-control.c:2239
+#: calendar/gui/e-itip-control.c:2232
 msgid "Update"
 msgstr "Update"
 
-#: calendar/gui/e-itip-control.c:2267
+#: calendar/gui/e-itip-control.c:2260
 msgid "Accept"
 msgstr "Accept"
 
-#: calendar/gui/e-itip-control.c:2268
+#: calendar/gui/e-itip-control.c:2261
 msgid "Tentatively accept"
 msgstr "Tentatively accept"
 
-#: calendar/gui/e-itip-control.c:2269
+#: calendar/gui/e-itip-control.c:2262
 msgid "Decline"
 msgstr "Decline"
 
-#: calendar/gui/e-itip-control.c:2298
+#: calendar/gui/e-itip-control.c:2291
 msgid "Send Free/Busy Information"
 msgstr "Send Free/Busy Information"
 
-#: calendar/gui/e-itip-control.c:2326
+#: calendar/gui/e-itip-control.c:2319
 msgid "Update respondent status"
 msgstr "Update respondent status"
 
-#: calendar/gui/e-itip-control.c:2354
+#: calendar/gui/e-itip-control.c:2347
 msgid "Send Latest Information"
 msgstr "Send Latest Information"
 
-#: calendar/gui/e-itip-control.c:2382 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:411 mail/mail-send-recv.c:465
+#: calendar/gui/e-itip-control.c:2375 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:408 mail/mail-send-recv.c:460
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancel"
@@ -6550,6 +6747,11 @@ msgstr "date-start"
 msgid "Chair Persons"
 msgstr "Chair Persons"
 
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:124
+msgid "Required Participants"
+msgstr "Required Participants"
+
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Optional Participants"
@@ -6558,153 +6760,153 @@ msgstr "Optional Participants"
 msgid "Resources"
 msgstr "Resources"
 
-#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
-#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:99
+#: calendar/gui/e-meeting-store.c:116 calendar/gui/e-meeting-store.c:802
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
-#: calendar/gui/e-meeting-store.c:109
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:101
+#: calendar/gui/e-meeting-store.c:118
 msgid "Group"
 msgstr "Group"
 
-#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
-#: calendar/gui/e-meeting-store.c:111
+#: calendar/gui/e-meeting-list-view.c:137 calendar/gui/e-meeting-store.c:103
+#: calendar/gui/e-meeting-store.c:120
 msgid "Resource"
 msgstr "Resource"
 
-#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
-#: calendar/gui/e-meeting-store.c:113
+#: calendar/gui/e-meeting-list-view.c:138 calendar/gui/e-meeting-store.c:105
+#: calendar/gui/e-meeting-store.c:122
 msgid "Room"
 msgstr "Room"
 
-#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
-#: calendar/gui/e-meeting-store.c:142
+#: calendar/gui/e-meeting-list-view.c:149 calendar/gui/e-meeting-store.c:134
+#: calendar/gui/e-meeting-store.c:151
 msgid "Chair"
 msgstr "Chair"
 
-#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
-#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
+#: calendar/gui/e-meeting-list-view.c:150 calendar/gui/e-meeting-store.c:136
+#: calendar/gui/e-meeting-store.c:153 calendar/gui/e-meeting-store.c:805
 msgid "Required Participant"
 msgstr "Required Participant"
 
-#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
-#: calendar/gui/e-meeting-store.c:146
+#: calendar/gui/e-meeting-list-view.c:151 calendar/gui/e-meeting-store.c:138
+#: calendar/gui/e-meeting-store.c:155
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
-#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
-#: calendar/gui/e-meeting-store.c:148
+#: calendar/gui/e-meeting-list-view.c:152 calendar/gui/e-meeting-store.c:140
+#: calendar/gui/e-meeting-store.c:157
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
-#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
+#: calendar/gui/e-meeting-list-view.c:174 calendar/gui/e-meeting-store.c:186
+#: calendar/gui/e-meeting-store.c:209 calendar/gui/e-meeting-store.c:815
 msgid "Needs Action"
 msgstr "Needs Action"
 
-#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
+#: calendar/gui/e-meeting-list-view.c:177 calendar/gui/e-meeting-store.c:192
+#: calendar/gui/e-meeting-store.c:215 calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "Tentative"
 
-#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
-#: calendar/gui/e-meeting-store.c:208
+#: calendar/gui/e-meeting-list-view.c:178 calendar/gui/e-meeting-store.c:194
+#: calendar/gui/e-meeting-store.c:217
 msgid "Delegated"
 msgstr "Delegated"
 
-#: calendar/gui/e-meeting-store.c:189 calendar/gui/e-meeting-store.c:212
+#: calendar/gui/e-meeting-store.c:198 calendar/gui/e-meeting-store.c:221
 msgid "In Process"
 msgstr "In Process"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:452
-#: calendar/gui/e-meeting-time-sel.c:2069
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2102 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:413 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Out of Office"
 
-#: calendar/gui/e-meeting-time-sel.c:401
+#: calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "No Information"
 
-#: calendar/gui/e-meeting-time-sel.c:432
+#: calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
 msgstr "O_ptions"
 
-#: calendar/gui/e-meeting-time-sel.c:449
+#: calendar/gui/e-meeting-time-sel.c:462
 msgid "Show _only working hours"
 msgstr "Show _only working hours"
 
-#: calendar/gui/e-meeting-time-sel.c:459
+#: calendar/gui/e-meeting-time-sel.c:472
 msgid "Show _zoomed out"
 msgstr "Show _zoomed out"
 
-#: calendar/gui/e-meeting-time-sel.c:474
+#: calendar/gui/e-meeting-time-sel.c:487
 msgid "_Update free/busy"
 msgstr "_Update free/busy"
 
-#: calendar/gui/e-meeting-time-sel.c:489
+#: calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:507
+#: calendar/gui/e-meeting-time-sel.c:520
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:535
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "_All people and resources"
 
-#: calendar/gui/e-meeting-time-sel.c:548
+#: calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "All _people and one resource"
 
-#: calendar/gui/e-meeting-time-sel.c:557
+#: calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "_Required people"
 
-#: calendar/gui/e-meeting-time-sel.c:566
+#: calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "Required people and _one resource"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2104
+#: calendar/gui/e-meeting-time-sel-item.c:444
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
+#: calendar/gui/e-meeting-time-sel.c:2137
+#: calendar/gui/e-meeting-time-sel-item.c:448 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a %d/%m/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#. This is a strftime() format for a short date. %m = month,
+#. %d = day of month, %Y = year (all digits).
+#: calendar/gui/e-meeting-time-sel-item.c:452 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1660
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Enter the password for %s"
 
-#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2313
+#: calendar/gui/e-tasks.c:734 calendar/gui/gnome-cal.c:2429
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6713,50 +6915,125 @@ msgstr ""
 "Error on %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:792
+#: calendar/gui/e-tasks.c:782
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: calendar/gui/e-tasks.c:874
+#: calendar/gui/e-tasks.c:864
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
 
-#: calendar/gui/e-tasks.c:1071
+#: calendar/gui/e-tasks.c:1061
 msgid "Completing tasks..."
 msgstr "Completing tasks..."
 
-#: calendar/gui/e-tasks.c:1094
+#: calendar/gui/e-tasks.c:1084
 msgid "Deleting selected objects..."
 msgstr "Deleting selected objects..."
 
-#: calendar/gui/e-tasks.c:1121
+#: calendar/gui/e-tasks.c:1111
 msgid "Expunging"
 msgstr "Expunging"
 
-#: calendar/gui/gnome-cal.c:722
+#: calendar/gui/e-tasks.c:1189
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: calendar/gui/print.c:1822 calendar/gui/tasks-component.c:408
+#: calendar/gui/tasks-component.c:881 calendar/gui/tasks-control.c:410
+#: calendar/importers/icalendar-importer.c:83
+#: calendar/importers/icalendar-importer.c:709
+#: plugins/groupwise-account-setup/camel-gw-listener.c:406
+msgid "Tasks"
+msgstr "Tasks"
+
+#: calendar/gui/e-timezone-entry.c:133
+msgid "Timezone Button"
+msgstr "Timezone Button"
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:329 calendar/gui/print.c:1501
+msgid "%d %B"
+msgstr "%d %B"
+
+#: calendar/gui/gnome-cal.c:718
 msgid "Updating query"
 msgstr "Updating query"
 
-#: calendar/gui/gnome-cal.c:2090
+#. bonobo displays this string so it must be in locale
+#: calendar/gui/gnome-cal.c:2040 widgets/menus/gal-view-menus.c:351
+msgid "Custom View"
+msgstr "Custom View"
+
+#: calendar/gui/gnome-cal.c:2041
+msgid "Save Custom View"
+msgstr "Save Custom View"
+
+#: calendar/gui/gnome-cal.c:2046 widgets/menus/gal-view-menus.c:373
+msgid "Define Views..."
+msgstr "Define Views..."
+
+#: calendar/gui/gnome-cal.c:2206
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Loading appointments at %s"
 
-#: calendar/gui/gnome-cal.c:2109
+#: calendar/gui/gnome-cal.c:2225
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Loading tasks at %s"
 
-#: calendar/gui/gnome-cal.c:2202
+#: calendar/gui/gnome-cal.c:2318
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
 
-#: calendar/gui/gnome-cal.c:3171
+#: calendar/gui/gnome-cal.c:3286
 msgid "Purging"
 msgstr "Purging"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "Calendar and Tasks"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure your timezone, Calendar and Task List here "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Calendar and Tasks"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Calendar configuration control"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Calendar scheduling message viewer"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Calendar/Task editor"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution's Calendar component"
+msgstr "Evolution's Calendar component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution's Tasks component"
+msgstr "Evolution's Tasks component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "_Calendars"
+msgstr "_Calendars"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tasks"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6901,322 +7178,321 @@ msgid "On The Web"
 msgstr "On The Web"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:736 calendar/gui/migration.c:888
+#: calendar/gui/migration.c:738 calendar/gui/migration.c:905
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Unable to migrate old settings from evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:765
+#: calendar/gui/migration.c:767
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Unable to migrate calendar `%s'"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:917
+#: calendar/gui/migration.c:934
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Unable to migrate tasks `%s'"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "1st"
 msgstr "1st"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "2nd"
 msgstr "2nd"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "3rd"
 msgstr "3rd"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "4th"
 msgstr "4th"
 
-#: calendar/gui/print.c:489
+#: calendar/gui/print.c:492
 msgid "5th"
 msgstr "5th"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "6th"
 msgstr "6th"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "7th"
 msgstr "7th"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "8th"
 msgstr "8th"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "9th"
 msgstr "9th"
 
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:493
 msgid "10th"
 msgstr "10th"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "11th"
 msgstr "11th"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "12th"
 msgstr "12th"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "13th"
 msgstr "13th"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "14th"
 msgstr "14th"
 
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:494
 msgid "15th"
 msgstr "15th"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "16th"
 msgstr "16th"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "17th"
 msgstr "17th"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "18th"
 msgstr "18th"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "19th"
 msgstr "19th"
 
-#: calendar/gui/print.c:492
+#: calendar/gui/print.c:495
 msgid "20th"
 msgstr "20th"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "21st"
 msgstr "21st"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "22nd"
 msgstr "22nd"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "23rd"
 msgstr "23rd"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "24th"
 msgstr "24th"
 
-#: calendar/gui/print.c:493
+#: calendar/gui/print.c:496
 msgid "25th"
 msgstr "25th"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "26th"
 msgstr "26th"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "27th"
 msgstr "27th"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "28th"
 msgstr "28th"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "29th"
 msgstr "29th"
 
-#: calendar/gui/print.c:494
+#: calendar/gui/print.c:497
 msgid "30th"
 msgstr "30th"
 
-#: calendar/gui/print.c:495
+#: calendar/gui/print.c:498
 msgid "31st"
 msgstr "31st"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "Su"
 msgstr "Su"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "Mo"
 msgstr "Mo"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "Tu"
 msgstr "Tu"
 
-#: calendar/gui/print.c:570
+#: calendar/gui/print.c:573
 msgid "We"
 msgstr "We"
 
-#: calendar/gui/print.c:571
+#: calendar/gui/print.c:574
 msgid "Th"
 msgstr "Th"
 
-#: calendar/gui/print.c:571
+#: calendar/gui/print.c:574
 msgid "Fr"
 msgstr "Fr"
 
-#: calendar/gui/print.c:571
+#: calendar/gui/print.c:574
 msgid "Sa"
 msgstr "Sa"
 
 #. Day
-#: calendar/gui/print.c:1914
+#: calendar/gui/print.c:1917
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Selected day (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
+#: calendar/gui/print.c:1942 calendar/gui/print.c:1946
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1940
+#: calendar/gui/print.c:1943
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
-#: calendar/gui/print.c:1947
+#: calendar/gui/print.c:1947 calendar/gui/print.c:1949
+#: calendar/gui/print.c:1950
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1951
+#: calendar/gui/print.c:1954
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Selected week (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1959
+#: calendar/gui/print.c:1962
 msgid "Selected month (%b %Y)"
 msgstr "Selected month (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1966
+#: calendar/gui/print.c:1969
 msgid "Selected year (%Y)"
 msgstr "Selected year (%Y)"
 
-#: calendar/gui/print.c:2356
+#: calendar/gui/print.c:2359
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2373
+#: calendar/gui/print.c:2376
 #, c-format
 msgid "Priority: %s"
 msgstr "Priority: %s"
 
-#: calendar/gui/print.c:2385
+#: calendar/gui/print.c:2388
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percent Complete: %i"
 
-#: calendar/gui/print.c:2397
+#: calendar/gui/print.c:2400
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2411
+#: calendar/gui/print.c:2414
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2425
 msgid "Contacts: "
 msgstr "Contacts: "
 
-#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
+#: calendar/gui/print.c:2562 calendar/gui/print.c:2648
+#: calendar/gui/print.c:2740 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Print Preview"
 
-#: calendar/gui/print.c:2593
+#: calendar/gui/print.c:2596
 msgid "Print Item"
 msgstr "Print Item"
 
-#: calendar/gui/print.c:2759
+#: calendar/gui/print.c:2762
 msgid "Print Setup"
 msgstr "Print Setup"
 
-#: calendar/gui/tasks-component.c:314
-#, c-format
-msgid "Task List '%s' will be removed. Are you sure you want to continue?"
-msgstr "Task List '%s' will be removed. Are you sure you want to continue?"
-
-#: calendar/gui/tasks-component.c:378
+#: calendar/gui/tasks-component.c:328
 msgid "New Task List"
 msgstr "New Task List"
 
-#: calendar/gui/tasks-component.c:421
+#: calendar/gui/tasks-component.c:404
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d task"
 msgstr[1] "%d tasks"
 
-#: calendar/gui/tasks-component.c:423 mail/mail-component.c:523
+#: calendar/gui/tasks-component.c:406 mail/mail-component.c:523
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d selected"
 msgstr[1] ", %d selected"
 
-#: calendar/gui/tasks-component.c:470
+#: calendar/gui/tasks-component.c:453
 msgid "Failed upgrading tasks."
 msgstr "Failed upgrading tasks."
 
-#: calendar/gui/tasks-component.c:764
+#: calendar/gui/tasks-component.c:747
 #, 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:779
+#: calendar/gui/tasks-component.c:762
 msgid "There is no calendar available for creating tasks"
 msgstr "There is no calendar available for creating tasks"
 
-#: calendar/gui/tasks-component.c:1053
+#: calendar/gui/tasks-component.c:856
+msgid "Task Source Selector"
+msgstr "Task Source Selector"
+
+#: calendar/gui/tasks-component.c:1039
 msgid "New task"
 msgstr "New task"
 
-#: calendar/gui/tasks-component.c:1054
+#: calendar/gui/tasks-component.c:1040
 msgid "_Task"
 msgstr "_Task"
 
-#: calendar/gui/tasks-component.c:1055
+#: calendar/gui/tasks-component.c:1041
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: calendar/gui/tasks-component.c:1061
+#: calendar/gui/tasks-component.c:1047
 msgid "New assigned task"
 msgstr "New assigned task"
 
-#: calendar/gui/tasks-component.c:1062
+#: calendar/gui/tasks-component.c:1048
 msgid "Assigne_d Task"
 msgstr "Assigne_d Task"
 
-#: calendar/gui/tasks-component.c:1063
+#: calendar/gui/tasks-component.c:1049
 msgid "Create a new assigned task"
 msgstr "Create a new assigned task"
 
-#: calendar/gui/tasks-component.c:1069
+#: calendar/gui/tasks-component.c:1055
 msgid "New task list"
 msgstr "New task list"
 
-#: calendar/gui/tasks-component.c:1070
+#: calendar/gui/tasks-component.c:1056
 msgid "Task l_ist"
 msgstr "Task l_ist"
 
-#: calendar/gui/tasks-component.c:1071
+#: calendar/gui/tasks-component.c:1057
 msgid "Create a new task list"
 msgstr "Create a new task list"
 
-#: calendar/gui/tasks-control.c:370
+#: calendar/gui/tasks-control.c:372
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -7228,15 +7504,15 @@ msgstr ""
 "\n"
 "Really erase these tasks?"
 
-#: calendar/gui/tasks-control.c:373
+#: calendar/gui/tasks-control.c:375
 msgid "Do not ask me again."
 msgstr "Do not ask me again."
 
-#: calendar/gui/tasks-control.c:431
+#: calendar/gui/tasks-control.c:433
 msgid "Print Tasks"
 msgstr "Print Tasks"
 
-#: calendar/gui/weekday-picker.c:326
+#: calendar/gui/weekday-picker.c:318
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
@@ -7280,10 +7556,6 @@ msgstr ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 
-#: calendar/importers/icalendar-importer.c:734
-msgid "Gnome Calendar"
-msgstr "Gnome Calendar"
-
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -8813,3133 +9085,6 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: camel/camel-cipher-context.c:103
-msgid "Signing is not supported by this cipher"
-msgstr "Signing is not supported by this cipher"
-
-#: camel/camel-cipher-context.c:129
-msgid "Signing message"
-msgstr "Signing message"
-
-#: camel/camel-cipher-context.c:146
-msgid "Verifying is not supported by this cipher"
-msgstr "Verifying is not supported by this cipher"
-
-#: camel/camel-cipher-context.c:172
-msgid "Verifying message"
-msgstr "Verifying message"
-
-#: camel/camel-cipher-context.c:190
-msgid "Encryption is not supported by this cipher"
-msgstr "Encryption is not supported by this cipher"
-
-#: camel/camel-cipher-context.c:216
-msgid "Encrypting message"
-msgstr "Encrypting message"
-
-#: camel/camel-cipher-context.c:233
-msgid "Decryption is not supported by this cipher"
-msgstr "Decryption is not supported by this cipher"
-
-#: camel/camel-cipher-context.c:255
-msgid "Decrypting message"
-msgstr "Decrypting message"
-
-#: camel/camel-cipher-context.c:272
-msgid "You may not import keys with this cipher"
-msgstr "You may not import keys with this cipher"
-
-#: camel/camel-cipher-context.c:302
-msgid "You may not export keys with this cipher"
-msgstr "You may not export keys with this cipher"
-
-#: camel/camel-data-cache.c:134
-msgid "Unable to create cache path"
-msgstr "Unable to create cache path"
-
-#: camel/camel-data-cache.c:376
-#, c-format
-msgid "Could not remove cache entry: %s: %s"
-msgstr "Could not remove cache entry: %s: %s"
-
-#: camel/camel-disco-diary.c:195
-#, c-format
-msgid ""
-"Could not write log entry: %s\n"
-"Further operations on this server will not be replayed when you\n"
-"reconnect to the network."
-msgstr ""
-"Could not write log entry: %s\n"
-"Further operations on this server will not be replayed when you\n"
-"reconnect to the network."
-
-#: camel/camel-disco-diary.c:258
-#, c-format
-msgid ""
-"Could not open `%s':\n"
-"%s\n"
-"Changes made to this folder will not be resynchronized."
-msgstr ""
-"Could not open `%s':\n"
-"%s\n"
-"Changes made to this folder will not be resynchronized."
-
-#: camel/camel-disco-diary.c:294
-msgid "Resynchronizing with server"
-msgstr "Resynchronizing with server"
-
-#: camel/camel-disco-folder.c:42
-msgid "Copy folder content locally for offline operation"
-msgstr "Copy folder content locally for offline operation"
-
-#: camel/camel-disco-folder.c:104
-msgid "Downloading new messages for offline mode"
-msgstr "Downloading new messages for offline mode"
-
-#: camel/camel-disco-folder.c:467
-#, c-format
-msgid "Preparing folder '%s' for offline"
-msgstr "Preparing folder '%s' for offline"
-
-#: camel/camel-disco-store.c:405
-msgid "You must be working online to complete this operation"
-msgstr "You must be working online to complete this operation"
-
-#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
-#: camel/camel-process.c:48
-#, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Failed to create pipe to '%s': %s"
-
-#: camel/camel-filter-driver.c:713 camel/camel-process.c:90
-#, c-format
-msgid "Failed to create child process '%s': %s"
-msgstr "Failed to create child process '%s': %s"
-
-#: camel/camel-filter-driver.c:756
-#, c-format
-msgid "Invalid message stream received from %s: %s"
-msgstr "Invalid message stream received from %s: %s"
-
-#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
-msgid "Syncing folders"
-msgstr "Syncing folders"
-
-#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
-#, c-format
-msgid "Error parsing filter: %s: %s"
-msgstr "Error parsing filter: %s: %s"
-
-#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1429
-#, c-format
-msgid "Error executing filter: %s: %s"
-msgstr "Error executing filter: %s: %s"
-
-#: camel/camel-filter-driver.c:1119
-msgid "Unable to open spool folder"
-msgstr "Unable to open spool folder"
-
-#: camel/camel-filter-driver.c:1128
-msgid "Unable to process spool folder"
-msgstr "Unable to process spool folder"
-
-#: camel/camel-filter-driver.c:1143
-#, c-format
-msgid "Getting message %d (%d%%)"
-msgstr "Getting message %d (%d%%)"
-
-#: camel/camel-filter-driver.c:1147
-msgid "Cannot open message"
-msgstr "Cannot open message"
-
-#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
-#, c-format
-msgid "Failed on message %d"
-msgstr "Failed on message %d"
-
-#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
-msgid "Syncing folder"
-msgstr "Syncing folder"
-
-#: camel/camel-filter-driver.c:1235
-#, c-format
-msgid "Getting message %d of %d"
-msgstr "Getting message %d of %d"
-
-#: camel/camel-filter-driver.c:1250
-#, c-format
-msgid "Failed at message %d of %d"
-msgstr "Failed at message %d of %d"
-
-#: camel/camel-filter-search.c:136
-msgid "Failed to retrieve message"
-msgstr "Failed to retrieve message"
-
-#: camel/camel-filter-search.c:386
-msgid "Invalid arguments to (system-flag)"
-msgstr "Invalid arguments to (system-flag)"
-
-#: camel/camel-filter-search.c:401
-msgid "Invalid arguments to (user-tag)"
-msgstr "Invalid arguments to (user-tag)"
-
-#: camel/camel-filter-search.c:549
-#, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Failed to create create child process '%s': %s"
-
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: camel/camel-filter-search.c:671 camel/camel-filter-search.c:679
-#, c-format
-msgid "Error executing filter search: %s: %s"
-msgstr "Error executing filter search: %s: %s"
-
-#: camel/camel-folder-search.c:356 camel/camel-folder-search.c:477
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Cannot parse search expression: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:366 camel/camel-folder-search.c:487
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Error executing search expression: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:673 camel/camel-folder-search.c:706
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) requires a single bool result"
-
-#: camel/camel-folder-search.c:756
-msgid "(match-threads) not allowed inside match-all"
-msgstr "(match-threads) not allowed inside match-all"
-
-#: camel/camel-folder-search.c:759 camel/camel-folder-search.c:763
-msgid "(match-threads) requires a match type string"
-msgstr "(match-threads) requires a match type string"
-
-#: camel/camel-folder-search.c:785
-msgid "(match-threads) expects an array result"
-msgstr "(match-threads) expects an array result"
-
-#: camel/camel-folder-search.c:791
-msgid "(match-threads) requires the folder set"
-msgstr "(match-threads) requires the folder set"
-
-#: camel/camel-folder-search.c:880
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Performing query on unknown header: %s"
-
-#: camel/camel-folder.c:651
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Unsupported operation: append message: for %s"
-
-#: camel/camel-folder.c:1260
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Unsupported operation: search by expression: for %s"
-
-#: camel/camel-folder.c:1300
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Unsupported operation: search by uids: for %s"
-
-#: camel/camel-folder.c:1414
-msgid "Moving messages"
-msgstr "Moving messages"
-
-#: camel/camel-folder.c:1414
-msgid "Copying messages"
-msgstr "Copying messages"
-
-#: camel/camel-folder.c:1663
-msgid "Learning junk"
-msgstr "Learning junk"
-
-#: camel/camel-folder.c:1680
-msgid "Learning non-junk"
-msgstr "Learning non-junk"
-
-#: camel/camel-folder.c:1699
-msgid "Filtering new message(s)"
-msgstr "Filtering new message(s)"
-
-#: camel/camel-gpg-context.c:735
-#, c-format
-msgid ""
-"Unexpected GnuPG status message encountered:\n"
-"\n"
-"%s"
-msgstr ""
-"Unexpected GnuPG status message encountered:\n"
-"\n"
-"%s"
-
-#: camel/camel-gpg-context.c:749
-msgid "Failed to parse gpg userid hint."
-msgstr "Failed to parse gpg userid hint."
-
-#: camel/camel-gpg-context.c:773
-msgid "Failed to parse gpg passphrase request."
-msgstr "Failed to parse gpg passphrase request."
-
-#: camel/camel-gpg-context.c:787
-#, c-format
-msgid ""
-"You need a passphrase to unlock the key for\n"
-"user: \"%s\""
-msgstr ""
-"You need a passphrase to unlock the key for\n"
-"user: \"%s\""
-
-#: camel/camel-gpg-context.c:804 camel/camel-gpg-context.c:1314
-#: camel/camel-gpg-context.c:1498 camel/camel-gpg-context.c:1589
-#: camel/camel-gpg-context.c:1697 camel/providers/nntp/camel-nntp-store.c:1236
-#: mail/mail-ops.c:717 mail/mail-send-recv.c:612
-msgid "Cancelled."
-msgstr "Cancelled."
-
-#: camel/camel-gpg-context.c:822
-msgid "Failed to unlock secret key: 3 bad passphrases given."
-msgstr "Failed to unlock secret key: 3 bad passphrases given."
-
-#: camel/camel-gpg-context.c:828
-#, c-format
-msgid "Unexpected response from GnuPG: %s"
-msgstr "Unexpected response from GnuPG: %s"
-
-#: camel/camel-gpg-context.c:880
-msgid "Failed to encrypt: No valid recipients specified."
-msgstr "Failed to encrypt: No valid recipients specified."
-
-#: camel/camel-gpg-context.c:1157
-#, c-format
-msgid ""
-"Failed to GPG %s: %s\n"
-"\n"
-"%s"
-msgstr ""
-"Failed to GPG %s: %s\n"
-"\n"
-"%s"
-
-#: camel/camel-gpg-context.c:1162
-#, c-format
-msgid "Failed to GPG %s: %s\n"
-msgstr "Failed to GPG %s: %s\n"
-
-#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:420
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "Could not generate signing data: %s"
-
-#: camel/camel-gpg-context.c:1307 camel/camel-gpg-context.c:1762
-#: camel/camel-gpg-context.c:1813
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "Failed to execute gpg: %s"
-
-#: camel/camel-gpg-context.c:1331 camel/camel-gpg-context.c:1491
-#: camel/camel-gpg-context.c:1582 camel/camel-gpg-context.c:1605
-#: camel/camel-gpg-context.c:1690 camel/camel-gpg-context.c:1714
-#: camel/camel-gpg-context.c:1784 camel/camel-gpg-context.c:1835
-msgid "Failed to execute gpg."
-msgstr "Failed to execute gpg."
-
-#: camel/camel-gpg-context.c:1350
-msgid "This is a digitally signed message part"
-msgstr "This is a digitally signed message part"
-
-#: camel/camel-gpg-context.c:1431 camel/camel-gpg-context.c:1437
-#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:723
-#: camel/camel-smime-context.c:734 camel/camel-smime-context.c:741
-msgid "Cannot verify message signature: Incorrect message format"
-msgstr "Cannot verify message signature: Incorrect message format"
-
-#: camel/camel-gpg-context.c:1477
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "Cannot verify message signature: could not create temp file: %s"
-
-#: camel/camel-gpg-context.c:1565
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "Could not generate encrypting data: %s"
-
-#: camel/camel-gpg-context.c:1623
-msgid "This is a digitally encrypted message part"
-msgstr "This is a digitally encrypted message part"
-
-#: camel/camel-gpg-context.c:1721 camel/camel-smime-context.c:997
-msgid "Encrypted content"
-msgstr "Encrypted content"
-
-#: camel/camel-gpg-context.c:1740
-msgid "Unable to parse message content"
-msgstr "Unable to parse message content"
-
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Cannot build locking helper pipe: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Cannot fork locking helper: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Could not lock '%s': protocol error with lock-helper"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Could not lock '%s'"
-
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Could not create lock file for %s: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Timed out trying to get lock file on %s. Try again later."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Failed to get lock using fcntl(2): %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Failed to get lock using flock(2): %s"
-
-#: camel/camel-movemail.c:104
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Could not check mail file %s: %s"
-
-#: camel/camel-movemail.c:117
-#, c-format
-msgid "Could not open mail file %s: %s"
-msgstr "Could not open mail file %s: %s"
-
-#: camel/camel-movemail.c:125
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
-msgstr "Could not open temporary mail file %s: %s"
-
-#: camel/camel-movemail.c:154
-#, c-format
-msgid "Failed to store mail in temp file %s: %s"
-msgstr "Failed to store mail in temp file %s: %s"
-
-#: camel/camel-movemail.c:184
-#, c-format
-msgid "Could not create pipe: %s"
-msgstr "Could not create pipe: %s"
-
-#: camel/camel-movemail.c:196
-#, c-format
-msgid "Could not fork: %s"
-msgstr "Could not fork: %s"
-
-#: camel/camel-movemail.c:234
-#, c-format
-msgid "Movemail program failed: %s"
-msgstr "Movemail program failed: %s"
-
-#: camel/camel-movemail.c:235
-msgid "(Unknown error)"
-msgstr "(Unknown error)"
-
-#: camel/camel-movemail.c:258
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Error reading mail file: %s"
-
-#: camel/camel-movemail.c:269
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Error writing mail temp file: %s"
-
-#: camel/camel-movemail.c:462 camel/camel-movemail.c:529
-#, c-format
-msgid "Error copying mail temp file: %s"
-msgstr "Error copying mail temp file: %s"
-
-#: camel/camel-multipart-encrypted.c:230 camel/camel-multipart-encrypted.c:245
-msgid "Failed to decrypt MIME part: protocol error"
-msgstr "Failed to decrypt MIME part: protocol error"
-
-#: camel/camel-multipart-encrypted.c:258
-msgid "Failed to decrypt MIME part: invalid structure"
-msgstr "Failed to decrypt MIME part: invalid structure"
-
-#: camel/camel-multipart-signed.c:674 camel/camel-multipart-signed.c:725
-msgid "parse error"
-msgstr "parse error"
-
-#: camel/camel-provider.c:59
-msgid "Virtual folder email provider"
-msgstr "Virtual folder email provider"
-
-#: camel/camel-provider.c:61
-msgid "For reading mail as a query of another set of folders"
-msgstr "For reading mail as a query of another set of folders"
-
-#: camel/camel-provider.c:172
-#, c-format
-msgid "Could not load %s: Module loading not supported on this system."
-msgstr "Could not load %s: Module loading not supported on this system."
-
-#: camel/camel-provider.c:181
-#, c-format
-msgid "Could not load %s: %s"
-msgstr "Could not load %s: %s"
-
-#: camel/camel-provider.c:189
-#, c-format
-msgid "Could not load %s: No initialization code in module."
-msgstr "Could not load %s: No initialization code in module."
-
-#: camel/camel-provider.c:356 camel/camel-session.c:161
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "No provider available for protocol `%s'"
-
-#: camel/camel-sasl-anonymous.c:35
-msgid "Anonymous"
-msgstr "Anonymous"
-
-#: camel/camel-sasl-anonymous.c:37
-msgid "This option will connect to the server using an anonymous login."
-msgstr "This option will connect to the server using an anonymous login."
-
-#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:88
-msgid "Authentication failed."
-msgstr "Authentication failed."
-
-#: camel/camel-sasl-anonymous.c:121
-#, c-format
-msgid ""
-"Invalid email address trace information:\n"
-"%s"
-msgstr ""
-"Invalid email address trace information:\n"
-"%s"
-
-#: camel/camel-sasl-anonymous.c:133
-#, c-format
-msgid ""
-"Invalid opaque trace information:\n"
-"%s"
-msgstr ""
-"Invalid opaque trace information:\n"
-"%s"
-
-#: camel/camel-sasl-anonymous.c:145
-#, c-format
-msgid ""
-"Invalid trace information:\n"
-"%s"
-msgstr ""
-"Invalid trace information:\n"
-"%s"
-
-#: camel/camel-sasl-cram-md5.c:36
-msgid "CRAM-MD5"
-msgstr "CRAM-MD5"
-
-#: camel/camel-sasl-cram-md5.c:38
-msgid ""
-"This option will connect to the server using a secure CRAM-MD5 password, if "
-"the server supports it."
-msgstr ""
-"This option will connect to the server using a secure CRAM-MD5 password, if "
-"the server supports it."
-
-#: camel/camel-sasl-digest-md5.c:49
-msgid "DIGEST-MD5"
-msgstr "DIGEST-MD5"
-
-#: camel/camel-sasl-digest-md5.c:51
-msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, "
-"if the server supports it."
-msgstr ""
-"This option will connect to the server using a secure DIGEST-MD5 password, "
-"if the server supports it."
-
-#: camel/camel-sasl-digest-md5.c:814
-msgid "Server challenge too long (>2048 octets)\n"
-msgstr "Server challenge too long (>2048 octets)\n"
-
-#: camel/camel-sasl-digest-md5.c:823
-msgid "Server challenge invalid\n"
-msgstr "Server challenge invalid\n"
-
-#: camel/camel-sasl-digest-md5.c:829
-msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "Server challenge contained invalid \"Quality of Protection\" token\n"
-
-#: camel/camel-sasl-digest-md5.c:859
-msgid "Server response did not contain authorization data\n"
-msgstr "Server response did not contain authorization data\n"
-
-#: camel/camel-sasl-digest-md5.c:877
-msgid "Server response contained incomplete authorization data\n"
-msgstr "Server response contained incomplete authorization data\n"
-
-#: camel/camel-sasl-digest-md5.c:887
-msgid "Server response does not match\n"
-msgstr "Server response does not match\n"
-
-#: camel/camel-sasl-gssapi.c:52
-msgid "GSSAPI"
-msgstr "GSSAPI"
-
-#: camel/camel-sasl-gssapi.c:54
-msgid "This option will connect to the server using Kerberos 5 authentication."
-msgstr ""
-"This option will connect to the server using Kerberos 5 authentication."
-
-#: camel/camel-sasl-gssapi.c:152
-msgid ""
-"The specified mechanism is not supported by the provided credential, or is "
-"unrecognized by the implementation."
-msgstr ""
-"The specified mechanism is not supported by the provided credential, or is "
-"unrecognized by the implementation."
-
-#: camel/camel-sasl-gssapi.c:157
-msgid "The provided target_name parameter was ill-formed."
-msgstr "The provided target_name parameter was ill-formed."
-
-#: camel/camel-sasl-gssapi.c:160
-msgid ""
-"The provided target_name parameter contained an invalid or unsupported type "
-"of name."
-msgstr ""
-"The provided target_name parameter contained an invalid or unsupported type "
-"of name."
-
-#: camel/camel-sasl-gssapi.c:164
-msgid ""
-"The input_token contains different channel bindings to those specified via "
-"the input_chan_bindings parameter."
-msgstr ""
-"The input_token contains different channel bindings to those specified via "
-"the input_chan_bindings parameter."
-
-#: camel/camel-sasl-gssapi.c:169
-msgid ""
-"The input_token contains an invalid signature, or a signature that could not "
-"be verified."
-msgstr ""
-"The input_token contains an invalid signature, or a signature that could not "
-"be verified."
-
-#: camel/camel-sasl-gssapi.c:173
-msgid ""
-"The supplied credentials were not valid for context initiation, or the "
-"credential handle did not reference any credentials."
-msgstr ""
-"The supplied credentials were not valid for context initiation, or the "
-"credential handle did not reference any credentials."
-
-#: camel/camel-sasl-gssapi.c:178
-msgid "The supplied context handle did not refer to a valid context."
-msgstr "The supplied context handle did not refer to a valid context."
-
-#: camel/camel-sasl-gssapi.c:181
-msgid "The consistency checks performed on the input_token failed."
-msgstr "The consistency checks performed on the input_token failed."
-
-#: camel/camel-sasl-gssapi.c:184
-msgid "The consistency checks performed on the credential failed."
-msgstr "The consistency checks performed on the credential failed."
-
-#: camel/camel-sasl-gssapi.c:187
-msgid "The referenced credentials have expired."
-msgstr "The referenced credentials have expired."
-
-#: camel/camel-sasl-gssapi.c:193 camel/camel-sasl-gssapi.c:241
-#: camel/camel-sasl-gssapi.c:277 camel/camel-sasl-gssapi.c:292
-#: camel/camel-sasl-kerberos4.c:225
-#: camel/providers/imap/camel-imap-store.c:1198
-msgid "Bad authentication response from server."
-msgstr "Bad authentication response from server."
-
-#: camel/camel-sasl-gssapi.c:302
-msgid "Unsupported security layer."
-msgstr "Unsupported security layer."
-
-#: camel/camel-sasl-kerberos4.c:41
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: camel/camel-sasl-kerberos4.c:43
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr ""
-"This option will connect to the server using Kerberos 4 authentication."
-
-#: camel/camel-sasl-kerberos4.c:168
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Could not get Kerberos ticket:\n"
-"%s"
-
-#: camel/camel-sasl-login.c:33
-msgid "Login"
-msgstr "Login"
-
-#: camel/camel-sasl-login.c:35 camel/camel-sasl-plain.c:35
-msgid "This option will connect to the server using a simple password."
-msgstr "This option will connect to the server using a simple password."
-
-#: camel/camel-sasl-login.c:128
-msgid "Unknown authentication state."
-msgstr "Unknown authentication state."
-
-#: camel/camel-sasl-ntlm.c:32
-msgid "NTLM / SPA"
-msgstr "NTLM / SPA"
-
-#: camel/camel-sasl-ntlm.c:34
-msgid ""
-"This option will connect to a Windows-based server using NTLM / Secure "
-"Password Authentication."
-msgstr ""
-"This option will connect to a Windows-based server using NTLM / Secure "
-"Password Authentication."
-
-#: camel/camel-sasl-plain.c:33
-msgid "PLAIN"
-msgstr "PLAIN"
-
-#: camel/camel-sasl-popb4smtp.c:37
-msgid "POP before SMTP"
-msgstr "POP before SMTP"
-
-#: camel/camel-sasl-popb4smtp.c:39
-msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "This option will authorise a POP connection before attempting SMTP"
-
-#: camel/camel-sasl-popb4smtp.c:104
-msgid "POP Source URI"
-msgstr "POP Source URI"
-
-#: camel/camel-sasl-popb4smtp.c:107
-msgid "POP Before SMTP auth using an unknown transport"
-msgstr "POP Before SMTP auth using an unknown transport"
-
-#: camel/camel-sasl-popb4smtp.c:112
-msgid "POP Before SMTP auth using a non-pop source"
-msgstr "POP Before SMTP auth using a non-pop source"
-
-#: camel/camel-search-private.c:151
-#, c-format
-msgid "Regular expression compilation failed: %s: %s"
-msgstr "Regular expression compilation failed: %s: %s"
-
-#: camel/camel-service.c:273
-#, c-format
-msgid "URL '%s' needs a username component"
-msgstr "URL '%s' needs a username component"
-
-#: camel/camel-service.c:277
-#, c-format
-msgid "URL '%s' needs a host component"
-msgstr "URL '%s' needs a host component"
-
-#: camel/camel-service.c:281
-#, c-format
-msgid "URL '%s' needs a path component"
-msgstr "URL '%s' needs a path component"
-
-#: camel/camel-service.c:742
-msgid "cannot create thread"
-msgstr "cannot create thread"
-
-#: camel/camel-service.c:891
-#, c-format
-msgid "Resolving: %s"
-msgstr "Resolving: %s"
-
-#: camel/camel-service.c:912
-msgid "Host lookup failed"
-msgstr "Host lookup failed"
-
-#: camel/camel-service.c:1019
-msgid "Resolving address"
-msgstr "Resolving address"
-
-#: camel/camel-service.c:1039
-msgid "Name lookup failed"
-msgstr "Name lookup failed"
-
-#: camel/camel-session.c:283
-#, c-format
-msgid ""
-"Could not create directory %s:\n"
-"%s"
-msgstr ""
-"Could not create directory %s:\n"
-"%s"
-
-#: camel/camel-smime-context.c:105
-#, c-format
-msgid "Enter security pass-phrase for `%s'"
-msgstr "Enter security passphrase for `%s'"
-
-#: camel/camel-smime-context.c:262
-#, c-format
-msgid "Cannot find certificate for '%s'"
-msgstr "Cannot find certificate for '%s'"
-
-#: camel/camel-smime-context.c:268
-msgid "Cannot create CMS message"
-msgstr "Cannot create CMS message"
-
-#: camel/camel-smime-context.c:273
-msgid "Cannot create CMS signed data"
-msgstr "Cannot create CMS signed data"
-
-#: camel/camel-smime-context.c:279
-msgid "Cannot attach CMS signed data"
-msgstr "Cannot attach CMS signed data"
-
-#: camel/camel-smime-context.c:286
-msgid "Cannot attach CMS data"
-msgstr "Cannot attach CMS data"
-
-#: camel/camel-smime-context.c:292
-msgid "Cannot create CMS Signer information"
-msgstr "Cannot create CMS Signer information"
-
-#: camel/camel-smime-context.c:298
-msgid "Cannot find certificate chain"
-msgstr "Cannot find certificate chain"
-
-#: camel/camel-smime-context.c:304
-msgid "Cannot add CMS Signing time"
-msgstr "Cannot add CMS Signing time"
-
-#: camel/camel-smime-context.c:326 camel/camel-smime-context.c:338
-#, c-format
-msgid "Encryption certificate for '%s' does not exist"
-msgstr "Encryption certificate for '%s' does not exist"
-
-#: camel/camel-smime-context.c:345
-msgid "Cannot add SMIMEEncKeyPrefs attribute"
-msgstr "Cannot add SMIMEEncKeyPrefs attribute"
-
-#: camel/camel-smime-context.c:350
-msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
-msgstr "Cannot add MS SMIMEEncKeyPrefs attribute"
-
-#: camel/camel-smime-context.c:355
-msgid "Cannot add encryption certificate"
-msgstr "Cannot add encryption certificate"
-
-#: camel/camel-smime-context.c:361
-msgid "Cannot add CMS Signer information"
-msgstr "Cannot add CMS Signer information"
-
-#: camel/camel-smime-context.c:431 camel/camel-smime-context.c:879
-msgid "Cannot create encoder context"
-msgstr "Cannot create encoder context"
-
-#: camel/camel-smime-context.c:437
-msgid "Failed to add data to CMS encoder"
-msgstr "Failed to add data to CMS encoder"
-
-#: camel/camel-smime-context.c:442 camel/camel-smime-context.c:896
-msgid "Failed to encode data"
-msgstr "Failed to encode data"
-
-#: camel/camel-smime-context.c:515
-msgid "Unverified"
-msgstr "Unverified"
-
-#: camel/camel-smime-context.c:517
-msgid "Good signature"
-msgstr "Good signature"
-
-#: camel/camel-smime-context.c:519
-msgid "Bad signature"
-msgstr "Bad signature"
-
-#: camel/camel-smime-context.c:521
-msgid "Content tampered with or altered in transit"
-msgstr "Content tampered with or altered in transit"
-
-#: camel/camel-smime-context.c:523
-msgid "Signing certificate not found"
-msgstr "Signing certificate not found"
-
-#: camel/camel-smime-context.c:525
-msgid "Signing certificate not trusted"
-msgstr "Signing certificate not trusted"
-
-#: camel/camel-smime-context.c:527
-msgid "Signature algorithm unknown"
-msgstr "Signature algorithm unknown"
-
-#: camel/camel-smime-context.c:529
-msgid "Signature algorithm unsupported"
-msgstr "Siganture algorithm unsupported"
-
-#: camel/camel-smime-context.c:531
-msgid "Malformed signature"
-msgstr "Malformed signature"
-
-#: camel/camel-smime-context.c:533
-msgid "Processing error"
-msgstr "Processing error"
-
-#: camel/camel-smime-context.c:570
-msgid "No signed data in signature"
-msgstr "No signed data in signature"
-
-#: camel/camel-smime-context.c:577
-msgid "Digests missing from enveloped data"
-msgstr "Digests missing from enveloped data"
-
-#: camel/camel-smime-context.c:590 camel/camel-smime-context.c:600
-msgid "Cannot calculate digests"
-msgstr "Cannot calculate digests"
-
-#: camel/camel-smime-context.c:605
-msgid "Cannot set message digests"
-msgstr "Cannot set message digests"
-
-#: camel/camel-smime-context.c:615 camel/camel-smime-context.c:620
-msgid "Certificate import failed"
-msgstr "Certificate import failed"
-
-#: camel/camel-smime-context.c:630
-msgid "Certificate is the only message, cannot verify certificates"
-msgstr "Certificate is the only message; cannot verify certificates"
-
-#: camel/camel-smime-context.c:633
-msgid "Certificate is the only message, certificates imported and verified"
-msgstr "Certificate is the only message; certificates imported and verified"
-
-#: camel/camel-smime-context.c:637
-msgid "Cannot find signature digests"
-msgstr "Cannot find signature digests"
-
-#: camel/camel-smime-context.c:653
-#, c-format
-msgid "Signer: %s <%s>: %s\n"
-msgstr "Signer: %s <%s>: %s\n"
-
-#: camel/camel-smime-context.c:754
-msgid "Decoder failed"
-msgstr "Decoder failed"
-
-#: camel/camel-smime-context.c:806
-#, c-format
-msgid "Cannot find certificate for `%s'"
-msgstr "Cannot find certificate for `%s'"
-
-#: camel/camel-smime-context.c:813
-msgid "Cannot find common bulk encryption algorithm"
-msgstr "Cannot find common bulk encryption algorithm"
-
-#. PORT_GetError(); ??
-#: camel/camel-smime-context.c:822
-msgid "Cannot allocate slot for encryption bulk key"
-msgstr "Cannot allocate slot for encryption bulk key"
-
-#: camel/camel-smime-context.c:833
-msgid "Cannot create CMS Message"
-msgstr "Cannot create CMS Message"
-
-#: camel/camel-smime-context.c:839
-msgid "Cannot create CMS Enveloped data"
-msgstr "Cannot create CMS Enveloped data"
-
-#: camel/camel-smime-context.c:845
-msgid "Cannot attach CMS Enveloped data"
-msgstr "Cannot attach CMS Enveloped data"
-
-#: camel/camel-smime-context.c:851
-msgid "Cannot attach CMS data object"
-msgstr "Cannot attach CMS data object"
-
-#: camel/camel-smime-context.c:860
-msgid "Cannot create CMS Recipient information"
-msgstr "Cannot create CMS Recipient information"
-
-#: camel/camel-smime-context.c:865
-msgid "Cannot add CMS Recipient information"
-msgstr "Cannot add CMS Recipient information"
-
-#: camel/camel-smime-context.c:890
-msgid "Failed to add data to encoder"
-msgstr "Failed to add data to encoder"
-
-#: camel/camel-smime-context.c:977
-#, c-format
-msgid "Decoder failed, error %d"
-msgstr "Decoder failed, error %d"
-
-#: camel/camel-smime-context.c:984
-msgid "S/MIME Decrypt: No encrypted content found"
-msgstr "S/MIME Decrypt: No encrypted content found"
-
-#: camel/camel-smime-context.c:1011
-msgid "import keys: unimplemented"
-msgstr "import keys: unimplemented"
-
-#: camel/camel-smime-context.c:1019
-msgid "export keys: unimplemented"
-msgstr "export keys: unimplemented"
-
-#: camel/camel-store.c:214
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Cannot get folder: Invalid operation on this store"
-
-#: camel/camel-store.c:244
-#, c-format
-msgid "Cannot create folder `%s': folder exists"
-msgstr "Cannot create folder `%s': folder exists"
-
-#: camel/camel-store.c:298
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Cannot create folder: Invalid operation on this store"
-
-#: camel/camel-store.c:326
-#, c-format
-msgid "Cannot create folder: %s: folder exists"
-msgstr "Cannot create folder: %s: folder exists"
-
-#: camel/camel-store.c:390 camel/camel-vee-store.c:367
-#, c-format
-msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "Cannot delete folder: %s: Invalid operation"
-
-#: camel/camel-store.c:440 camel/camel-vee-store.c:404
-#: camel/providers/local/camel-maildir-store.c:233
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Cannot rename folder: %s: Invalid operation"
-
-#: camel/camel-store.c:778
-msgid "Trash"
-msgstr "Trash"
-
-#: camel/camel-store.c:780 mail/em-filter-i18n.h:35
-#: mail/mail-config.glade.h:90 ui/evolution-mail-message.xml.h:48
-msgid "Junk"
-msgstr "Junk"
-
-#: camel/camel-tcp-stream-openssl.c:568
-msgid "Unable to get issuer's certificate"
-msgstr "Unable to get issuer's certificate"
-
-#: camel/camel-tcp-stream-openssl.c:570
-msgid "Unable to get Certificate Revocation List"
-msgstr "Unable to get Certificate Revocation List"
-
-#: camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to decrypt certificate signature"
-msgstr "Unable to decrypt certificate signature"
-
-#: camel/camel-tcp-stream-openssl.c:574
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "Unable to decrypt Certificate Revocation List signature"
-
-#: camel/camel-tcp-stream-openssl.c:576
-msgid "Unable to decode issuer's public key"
-msgstr "Unable to decode issuer's public key"
-
-#: camel/camel-tcp-stream-openssl.c:578
-msgid "Certificate signature failure"
-msgstr "Certificate signature failure"
-
-#: camel/camel-tcp-stream-openssl.c:580
-msgid "Certificate Revocation List signature failure"
-msgstr "Certificate Revocation List signature failure"
-
-#: camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate not yet valid"
-msgstr "Certificate not yet valid"
-
-#: camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate has expired"
-msgstr "Certificate has expired"
-
-#: camel/camel-tcp-stream-openssl.c:586
-msgid "CRL not yet valid"
-msgstr "CRL not yet valid"
-
-#: camel/camel-tcp-stream-openssl.c:588
-msgid "CRL has expired"
-msgstr "CRL has expired"
-
-#: camel/camel-tcp-stream-openssl.c:593
-msgid "Error in CRL"
-msgstr "Error in CRL"
-
-#: camel/camel-tcp-stream-openssl.c:595
-msgid "Out of memory"
-msgstr "Out of memory"
-
-#: camel/camel-tcp-stream-openssl.c:597
-msgid "Zero-depth self-signed certificate"
-msgstr "Zero-depth self-signed certificate"
-
-#: camel/camel-tcp-stream-openssl.c:599
-msgid "Self-signed certificate in chain"
-msgstr "Self-signed certificate in chain"
-
-#: camel/camel-tcp-stream-openssl.c:601
-msgid "Unable to get issuer's certificate locally"
-msgstr "Unable to get issuer's certificate locally"
-
-#: camel/camel-tcp-stream-openssl.c:603
-msgid "Unable to verify leaf signature"
-msgstr "Unable to verify leaf signature"
-
-#: camel/camel-tcp-stream-openssl.c:605
-msgid "Certificate chain too long"
-msgstr "Certificate chain too long"
-
-#: camel/camel-tcp-stream-openssl.c:607
-msgid "Certificate Revoked"
-msgstr "Certificate Revoked"
-
-#: camel/camel-tcp-stream-openssl.c:609
-msgid "Invalid Certificate Authority (CA)"
-msgstr "Invalid Certificate Authority (CA)"
-
-#: camel/camel-tcp-stream-openssl.c:611
-msgid "Path length exceeded"
-msgstr "Path length exceeded"
-
-#: camel/camel-tcp-stream-openssl.c:613
-msgid "Invalid purpose"
-msgstr "Invalid purpose"
-
-#: camel/camel-tcp-stream-openssl.c:615
-msgid "Certificate untrusted"
-msgstr "Certificate untrusted"
-
-#: camel/camel-tcp-stream-openssl.c:617
-msgid "Certificate rejected"
-msgstr "Certificate rejected"
-
-#: camel/camel-tcp-stream-openssl.c:620
-msgid "Subject/Issuer mismatch"
-msgstr "Subject/Issuer mismatch"
-
-#: camel/camel-tcp-stream-openssl.c:622
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID mismatch"
-
-#: camel/camel-tcp-stream-openssl.c:624
-msgid "AKID/Issuer serial mismatch"
-msgstr "AKID/Issuer serial mismatch"
-
-#: camel/camel-tcp-stream-openssl.c:626
-msgid "Key usage does not support certificate signing"
-msgstr "Key usage does not support certificate signing"
-
-#: camel/camel-tcp-stream-openssl.c:629
-msgid "Error in application verification"
-msgstr "Error in application verification"
-
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:827
-#, c-format
-msgid ""
-"Issuer:            %s\n"
-"Subject:           %s\n"
-"Fingerprint:       %s\n"
-"Signature:         %s"
-msgstr ""
-"Issuer:            %s\n"
-"Subject:           %s\n"
-"Fingerprint:       %s\n"
-"Signature:         %s"
-
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833
-msgid "GOOD"
-msgstr "GOOD"
-
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833
-msgid "BAD"
-msgstr "BAD"
-
-#: camel/camel-tcp-stream-openssl.c:704
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-
-#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:837
-#, c-format
-msgid ""
-"SSL Certificate check for %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept?"
-msgstr ""
-"SSL Certificate check for %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept?"
-
-#: camel/camel-tcp-stream-ssl.c:881
-#, c-format
-msgid ""
-"Certificate problem: %s\n"
-"Issuer: %s"
-msgstr ""
-"Certificate problem: %s\n"
-"Issuer: %s"
-
-#: camel/camel-tcp-stream-ssl.c:933
-#, c-format
-msgid ""
-"Bad certificate domain: %s\n"
-"Issuer: %s"
-msgstr ""
-"Bad certificate domain: %s\n"
-"Issuer: %s"
-
-#: camel/camel-tcp-stream-ssl.c:951
-#, c-format
-msgid ""
-"Certificate expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"Certificate expired: %s\n"
-"Issuer: %s"
-
-#: camel/camel-tcp-stream-ssl.c:968
-#, c-format
-msgid ""
-"Certificate revocation list expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"Certificate revocation list expired: %s\n"
-"Issuer: %s"
-
-#: camel/camel-url.c:293
-#, c-format
-msgid "Could not parse URL `%s'"
-msgstr "Could not parse URL `%s'"
-
-#: camel/camel-vee-folder.c:604
-#, c-format
-msgid "Error storing `%s': %s"
-msgstr "Error storing `%s': %s"
-
-#: camel/camel-vee-folder.c:646
-#, c-format
-msgid "No such message %s in %s"
-msgstr "No such message %s in %s"
-
-#: camel/camel-vee-folder.c:813 camel/camel-vee-folder.c:819
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "Cannot copy or move messages into a Virtual Folder"
-
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "Cannot delete folder: %s: No such folder"
-
-#: camel/camel-vee-store.c:412
-#, c-format
-msgid "Cannot rename folder: %s: No such folder"
-msgstr "Cannot rename folder: %s: No such folder"
-
-#: camel/camel-vtrash-folder.c:45
-msgid "Cannot copy messages to the Trash folder"
-msgstr "Cannot copy messages to the Trash folder"
-
-#: camel/camel-vtrash-folder.c:47
-msgid "Cannot copy messages to the Junk folder"
-msgstr "Cannot copy messages to the Junk folder"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:54
-#: camel/providers/imap4/camel-imap4-provider.c:35
-msgid "Checking for new mail"
-msgstr "Checking for new mail"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:56
-#: camel/providers/imap/camel-imap-provider.c:46
-#: camel/providers/imap4/camel-imap4-provider.c:37
-msgid "Check for new messages in all folders"
-msgstr "Check for new messages in all folders"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:61
-msgid "Apply filters to new messages in Inbox on this server"
-msgstr "Apply filters to new messages in Inbox on this server"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:63
-#: camel/providers/imap/camel-imap-provider.c:68
-msgid "Check new messages for Junk contents"
-msgstr "Check new messages for Junk contents"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:65
-#: camel/providers/imap/camel-imap-provider.c:70
-msgid "Only check for Junk messages in the INBOX folder"
-msgstr "Only check for Junk messages in the INBOX folder"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:67
-#: camel/providers/imap/camel-imap-provider.c:72
-msgid "Automatically synchronize remote mail locally"
-msgstr "Automatically synchronize remote mail locally"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "Address Book and Calendar"
-msgstr "Address Book and Calendar"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:75
-msgid "Post Office Agent:"
-msgstr "Post Office Agent:"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:78
-msgid "Post Office Agent SOAP Port:"
-msgstr "Post Office Agent SOAP Port:"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:81
-msgid "Use Secure Connection (SSL)"
-msgstr "Use Secure Connection (SSL)"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:94
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:96
-msgid "For accessing Novell Groupwise servers"
-msgstr "For accessing Novell Groupwise servers"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:111
-#: camel/providers/imap/camel-imap-provider.c:96
-#: camel/providers/imap4/camel-imap4-provider.c:70
-#: camel/providers/imapp/camel-imapp-provider.c:66
-#: camel/providers/nntp/camel-nntp-provider.c:72
-#: camel/providers/pop3/camel-pop3-provider.c:72
-msgid "Password"
-msgstr "Password"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:113
-#: camel/providers/imap/camel-imap-provider.c:98
-#: camel/providers/imapp/camel-imapp-provider.c:68
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr ""
-"This option will connect to the IMAP server using a plaintext password."
-
-#: camel/providers/groupwise/camel-gw-listener.c:362
-msgid "Checklist"
-msgstr "Checklist"
-
-#: camel/providers/imap/camel-imap-command.c:218
-#: camel/providers/imap/camel-imap-command.c:257
-#: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3182
-msgid "Operation cancelled"
-msgstr "Operation cancelled"
-
-#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3185
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "Server unexpectedly disconnected: %s"
-
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/imap4/camel-imap4-store.c:260
-#: camel/providers/pop3/camel-pop3-store.c:508
-#: camel/providers/pop3/camel-pop3-store.c:515
-#: camel/providers/pop3/camel-pop3-store.c:521 shell/e-shell.c:1230
-msgid "Unknown error"
-msgstr "Unknown error"
-
-#. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:320
-#, c-format
-msgid ""
-"Alert from IMAP server %s@%s:\n"
-"%s"
-msgstr ""
-"Alert from IMAP server %s@%s:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-command.c:389
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Unexpected response from IMAP server: %s"
-
-#: camel/providers/imap/camel-imap-command.c:399
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP command failed: %s"
-
-#: camel/providers/imap/camel-imap-command.c:457
-msgid "Server response ended too soon."
-msgstr "Server response ended too soon."
-
-#: camel/providers/imap/camel-imap-command.c:649
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "IMAP server response did not contain %s information"
-
-#: camel/providers/imap/camel-imap-command.c:685
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Unexpected OK response from IMAP server: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:226
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Could not create directory %s: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:245
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "Could not load summary for %s"
-
-#: camel/providers/imap/camel-imap-folder.c:330
-msgid "Folder was destroyed and recreated on server."
-msgstr "Folder was destroyed and recreated on server."
-
-#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:573
-msgid "Scanning for changed messages"
-msgstr "Scanning for changed messages"
-
-#: camel/providers/imap/camel-imap-folder.c:1938
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "Unable to retrieve message: %s"
-
-#: camel/providers/imap/camel-imap-folder.c:1975
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Cannot get message: %s\n"
-"  %s"
-
-#: camel/providers/imap/camel-imap-folder.c:1975
-#: camel/providers/local/camel-maildir-folder.c:245
-#: camel/providers/local/camel-mbox-folder.c:416
-#: camel/providers/local/camel-mh-folder.c:203
-msgid "No such message"
-msgstr "No such message"
-
-#: camel/providers/imap/camel-imap-folder.c:2017
-#: camel/providers/imap/camel-imap-folder.c:2620
-#: camel/providers/nntp/camel-nntp-folder.c:221
-msgid "This message is not currently available"
-msgstr "This message is not currently available"
-
-#: camel/providers/imap/camel-imap-folder.c:2283
-#: camel/providers/imap/camel-imap-folder.c:2353
-msgid "Fetching summary information for new messages"
-msgstr "Fetching summary information for new messages"
-
-#: camel/providers/imap/camel-imap-folder.c:2461
-#, c-format
-msgid "Incomplete server response: no information provided for message %d"
-msgstr "Incomplete server response: no information provided for message %d"
-
-#: camel/providers/imap/camel-imap-folder.c:2469
-#, c-format
-msgid "Incomplete server response: no UID provided for message %d"
-msgstr "Incomplete server response: no UID provided for message %d"
-
-#: camel/providers/imap/camel-imap-folder.c:2482
-#, c-format
-msgid ""
-"Unexpected server response: Identical UIDs provided for messages %d and %d"
-msgstr ""
-"Unexpected server response: Identical UIDs provided for messages %d and %d"
-
-#: camel/providers/imap/camel-imap-folder.c:2658
-msgid "Could not find message body in FETCH response."
-msgstr "Could not find message body in FETCH response."
-
-#: camel/providers/imap/camel-imap-message-cache.c:156
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Could not open cache directory: %s"
-
-#: camel/providers/imap/camel-imap-message-cache.c:253
-#: camel/providers/imap/camel-imap-message-cache.c:310
-#: camel/providers/imap/camel-imap-message-cache.c:341
-#: camel/providers/imap/camel-imap-message-cache.c:373
-#, c-format
-msgid "Failed to cache message %s: %s"
-msgstr "Failed to cache message %s: %s"
-
-#: camel/providers/imap/camel-imap-message-cache.c:418
-#, c-format
-msgid "Failed to cache %s: %s"
-msgstr "Failed to cache %s: %s"
-
-#: camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "Checking for New Mail"
-
-#: camel/providers/imap/camel-imap-provider.c:49
-msgid "Connection to Server"
-msgstr "Connection to Server"
-
-#: camel/providers/imap/camel-imap-provider.c:51
-msgid "Use custom command to connect to server"
-msgstr "Use custom command to connect to server"
-
-#: camel/providers/imap/camel-imap-provider.c:53
-msgid "Command:"
-msgstr "Command:"
-
-#: camel/providers/imap/camel-imap-provider.c:56
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/nntp/camel-nntp-provider.c:42
-msgid "Folders"
-msgstr "Folders"
-
-#: camel/providers/imap/camel-imap-provider.c:58
-#: camel/providers/imap4/camel-imap4-provider.c:42
-msgid "Show only subscribed folders"
-msgstr "Show only subscribed folders"
-
-#: camel/providers/imap/camel-imap-provider.c:60
-#: camel/providers/imap4/camel-imap4-provider.c:44
-msgid "Override server-supplied folder namespace"
-msgstr "Override server-supplied folder namespace"
-
-#: camel/providers/imap/camel-imap-provider.c:62
-#: camel/providers/imap4/camel-imap4-provider.c:46
-msgid "Namespace"
-msgstr "Namespace"
-
-#: camel/providers/imap/camel-imap-provider.c:66
-msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Apply filters to new messages in INBOX on this server"
-
-#: camel/providers/imap/camel-imap-provider.c:79
-msgid "IMAP"
-msgstr "IMAP"
-
-#: camel/providers/imap/camel-imap-provider.c:81
-msgid "For reading and storing mail on IMAP servers."
-msgstr "For reading and storing mail on IMAP servers."
-
-#: camel/providers/imap/camel-imap-store.c:422
-#: camel/providers/imap4/camel-imap4-store.c:177
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
-
-#: camel/providers/imap/camel-imap-store.c:424
-#: camel/providers/imap4/camel-imap4-store.c:179
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP service for %s on %s"
-
-#: camel/providers/imap/camel-imap-store.c:534
-#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/imap4/camel-imap4-store.c:209
-#: camel/providers/imap4/camel-imap4-store.c:224
-#: camel/providers/nntp/camel-nntp-store.c:197
-#: camel/providers/nntp/camel-nntp-store.c:212
-#: camel/providers/pop3/camel-pop3-store.c:165
-#: camel/providers/pop3/camel-pop3-store.c:180
-#: camel/providers/smtp/camel-smtp-transport.c:253
-#: camel/providers/smtp/camel-smtp-transport.c:268
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "Could not connect to %s: %s"
-
-#: camel/providers/imap/camel-imap-store.c:535
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/nntp/camel-nntp-store.c:198
-#: camel/providers/pop3/camel-pop3-store.c:166
-#: camel/providers/smtp/camel-smtp-transport.c:254
-msgid "SSL unavailable"
-msgstr "SSL unavailable"
-
-#: camel/providers/imap/camel-imap-store.c:546
-#: camel/providers/imap/camel-imap-store.c:809
-#: camel/providers/imap4/camel-imap4-store.c:221
-#: camel/providers/imapp/camel-imapp-store.c:237
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/nntp/camel-nntp-store.c:228
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:265
-msgid "Connection cancelled"
-msgstr "Connection cancelled"
-
-#: camel/providers/imap/camel-imap-store.c:653
-#: camel/providers/imap/camel-imap-store.c:675
-#: camel/providers/imap4/camel-imap4-store.c:246
-#: camel/providers/imap4/camel-imap4-store.c:259
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Failed to connect to IMAP server %s in secure mode: %s"
-
-#: camel/providers/imap/camel-imap-store.c:654
-#: camel/providers/smtp/camel-smtp-transport.c:321
-msgid "STARTTLS not supported"
-msgstr "STARTTLS not supported"
-
-#: camel/providers/imap/camel-imap-store.c:676
-#: camel/providers/imap4/camel-imap4-store.c:247
-#: camel/providers/pop3/camel-pop3-store.c:243
-msgid "SSL negotiations failed"
-msgstr "SSL negotiations failed"
-
-#: camel/providers/imap/camel-imap-store.c:812
-#, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "Could not connect with command \"%s\": %s"
-
-#: camel/providers/imap/camel-imap-store.c:1230
-#, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "IMAP server %s does not support requested authentication type %s"
-
-#: camel/providers/imap/camel-imap-store.c:1240
-#: camel/providers/smtp/camel-smtp-transport.c:474
-#, c-format
-msgid "No support for authentication type %s"
-msgstr "No support for authentication type %s"
-
-#: camel/providers/imap/camel-imap-store.c:1263
-#: camel/providers/imapp/camel-imapp-store.c:353
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%sPlease enter the IMAP password for %s@%s"
-
-#: camel/providers/imap/camel-imap-store.c:1277
-msgid "You didn't enter a password."
-msgstr "You didn't enter a password."
-
-#: camel/providers/imap/camel-imap-store.c:1306
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:1825
-#: camel/providers/imap/camel-imap-store.c:2015
-#, c-format
-msgid "No such folder %s"
-msgstr "No such folder %s"
-
-#: camel/providers/imap/camel-imap-store.c:1843
-#: camel/providers/imap/camel-imap-store.c:2221
-#: camel/providers/imap4/camel-imap4-store.c:735
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1901
-#: camel/providers/imap/camel-imap-store.c:2282
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "The parent folder is not allowed to contain subfolders"
-
-#: camel/providers/imap/camel-imap-store.c:1956
-#: camel/providers/local/camel-maildir-store.c:140
-#: camel/providers/local/camel-mbox-store.c:210
-#: camel/providers/local/camel-mh-store.c:237
-#, c-format
-msgid "Cannot create folder `%s': folder exists."
-msgstr "Cannot create folder `%s': folder exists."
-
-#: camel/providers/imap/camel-imap-store.c:2232
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "Unknown parent folder: %s"
-
-#: camel/providers/imap4/camel-imap4-command.c:550
-#: camel/providers/imap4/camel-imap4-command.c:557
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Failed sending command to IMAP server %s: %s"
-
-#: camel/providers/imap4/camel-imap4-command.c:656
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Unexpected response from IMAP4 server %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:230
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Unexpected greeting from IMAP server %s."
-
-#: camel/providers/imap4/camel-imap4-engine.c:414
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Cannot select folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-engine.c:420
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Cannot select folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1401
-#: camel/providers/imap4/camel-imap4-engine.c:1431
-#: camel/providers/imap4/camel-imap4-engine.c:1463
-#: camel/providers/imap4/camel-imap4-engine.c:1505
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "IMAP4 server %s unexpectedly disconnected: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:359
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Cannot sync flags to folder `%s': Unknown"
-
-#: camel/providers/imap4/camel-imap4-folder.c:365
-#, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Cannot sync flags to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:502
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Cannot expunge folder `%s': Unknown"
-
-#: camel/providers/imap4/camel-imap4-folder.c:507
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Cannot expunge folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:697
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "Cannot get message %s from folder `%s': No such message"
-
-#: camel/providers/imap4/camel-imap4-folder.c:702
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "Cannot get message %s from folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:827
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Cannot append message to folder `%s': Unknown error"
-
-#: camel/providers/imap4/camel-imap4-folder.c:856
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Cannot append message to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:935
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr "Cannot move messages from folder `%s' to folder `%s': Unknown"
-
-#: camel/providers/imap4/camel-imap4-folder.c:939
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-
-#: camel/providers/imap4/camel-imap4-folder.c:947
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr "Cannot move messages from folder `%s' to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:951
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL!!"
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-
-#: camel/providers/imap4/camel-imap4-store.c:334
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-
-#: camel/providers/imap4/camel-imap4-store.c:379
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sPlease enter the IMAP password for %s on host %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:449
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Cannot authenticate to IMAP server %s using %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:672
-#, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Cannot get folder `%s' on IMAP server %s: Unknown"
-
-#: camel/providers/imap4/camel-imap4-store.c:786
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Cannot create folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:792
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Cannot create folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:823
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Cannot delete folder `%s': Special folder"
-
-#: camel/providers/imap4/camel-imap4-store.c:882
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Cannot delete folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:887
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Cannot delete folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:907
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "Cannot rename folder `%s' to `%s': Special folder"
-
-#: camel/providers/imap4/camel-imap4-store.c:939
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:944
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "Cannot rename folder `%s' to `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:1192
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1194
-msgid "Bad command"
-msgstr "Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:1270
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Cannot subscribe to folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:1275
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Cannot subscribe to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:1335
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:1340
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Cannot unsubscribe from folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-utils.c:250
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Unexpected token in response from IMAP server %s: "
-
-#: camel/providers/imap4/camel-imap4-utils.c:273
-msgid "No data"
-msgstr "No data"
-
-#: camel/providers/imap4/camel-imap4-utils.c:456
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP server %s unexpectedly disconnected: %s"
-
-#: camel/providers/imapp/camel-imapp-provider.c:40
-#: camel/providers/pop3/camel-pop3-provider.c:39
-msgid "Message storage"
-msgstr "Message storage"
-
-#: camel/providers/imapp/camel-imapp-provider.c:48
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#: camel/providers/imapp/camel-imapp-provider.c:50
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-
-#: camel/providers/imapp/camel-imapp-store.c:240
-#, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "Could not connect to %s (port %s): %s"
-
-#: camel/providers/imapp/camel-imapp-store.c:337
-#, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Could not connect to POP server on %s"
-
-#: camel/providers/local/camel-local-folder.c:179
-msgid "Index message body data"
-msgstr "Index message body data"
-
-#. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:391
-#, c-format
-msgid "~%s (%s)"
-msgstr "~%s (%s)"
-
-#. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:395
-#: camel/providers/local/camel-local-folder.c:398
-#, c-format
-msgid "mailbox:%s (%s)"
-msgstr "mailbox:%s (%s)"
-
-#. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:402
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: camel/providers/local/camel-local-provider.c:45
-msgid "Use the `.folders' folder summary file (exmh)"
-msgstr "Use the `.folders' folder summary file (exmh)"
-
-#: camel/providers/local/camel-local-provider.c:52
-msgid "MH-format mail directories"
-msgstr "MH-format mail directories"
-
-#: camel/providers/local/camel-local-provider.c:53
-msgid "For storing local mail in MH-like mail directories."
-msgstr "For storing local mail in MH-like mail directories."
-
-#: camel/providers/local/camel-local-provider.c:68
-msgid "Local delivery"
-msgstr "Local delivery"
-
-#: camel/providers/local/camel-local-provider.c:69
-msgid ""
-"For retrieving (moving) local mail from standard mbox formated spools into "
-"folders managed by Evolution."
-msgstr ""
-"For retrieving (moving) local mail from standard mbox formated spools into "
-"folders managed by Evolution."
-
-#: camel/providers/local/camel-local-provider.c:81
-#: camel/providers/local/camel-local-provider.c:100
-msgid "Apply filters to new messages in INBOX"
-msgstr "Apply filters to new messages in INBOX"
-
-#: camel/providers/local/camel-local-provider.c:88
-msgid "Maildir-format mail directories"
-msgstr "Maildir-format mail directories"
-
-#: camel/providers/local/camel-local-provider.c:89
-msgid "For storing local mail in maildir directories."
-msgstr "For storing local mail in maildir directories."
-
-#: camel/providers/local/camel-local-provider.c:101
-msgid "Store status headers in Elm/Pine/Mutt format"
-msgstr "Store status headers in Elm/Pine/Mutt format"
-
-#: camel/providers/local/camel-local-provider.c:108
-msgid "Standard Unix mbox spool or directory"
-msgstr "Standard Unix mbox spool or directory"
-
-#: camel/providers/local/camel-local-provider.c:109
-msgid ""
-"For reading and storing local mail in external standard mbox spool files.\n"
-"May also be used to read a tree of Elm, Pine, or Mutt style folders."
-msgstr ""
-"For reading and storing local mail in external standard mbox spool files.\n"
-"May also be used to read a tree of Elm, Pine, or Mutt style folders."
-
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:254
-#: camel/providers/local/camel-mbox-store.c:353
-#: camel/providers/local/camel-spool-store.c:117
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "Store root %s is not an absolute path"
-
-#: camel/providers/local/camel-local-store.c:150
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "Store root %s is not a regular directory"
-
-#: camel/providers/local/camel-local-store.c:159
-#: camel/providers/local/camel-local-store.c:167
-#: camel/providers/local/camel-local-store.c:265
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Cannot get folder: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:179
-msgid "Local stores do not have an inbox"
-msgstr "Local stores do not have an inbox"
-
-#: camel/providers/local/camel-local-store.c:225
-#, c-format
-msgid "Local mail file %s"
-msgstr "Local mail file %s"
-
-#: camel/providers/local/camel-local-store.c:334
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Could not rename folder %s to %s: %s"
-
-#: camel/providers/local/camel-local-store.c:399
-#, c-format
-msgid "Could not rename '%s': %s"
-msgstr "Could not rename '%s': %s"
-
-#: camel/providers/local/camel-local-store.c:424
-#: camel/providers/local/camel-mbox-store.c:282
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Could not delete folder summary file `%s': %s"
-
-#: camel/providers/local/camel-local-store.c:434
-#: camel/providers/local/camel-mbox-store.c:294
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Could not delete folder index file `%s': %s"
-
-#: camel/providers/local/camel-local-store.c:457
-#: camel/providers/local/camel-mbox-store.c:318
-#, c-format
-msgid "Could not delete folder meta file `%s': %s"
-msgstr "Could not delete folder meta file `%s': %s"
-
-#: camel/providers/local/camel-local-summary.c:406
-#, c-format
-msgid "Could not save summary: %s: %s"
-msgstr "Could not save summary: %s: %s"
-
-#: camel/providers/local/camel-local-summary.c:465
-msgid "Unable to add message to summary: unknown reason"
-msgstr "Unable to add message to summary: unknown reason"
-
-#. Inbox is always first
-#. translators: standard local mailbox names
-#: camel/providers/local/camel-maildir-folder.c:75
-#: camel/providers/local/camel-maildir-store.c:233
-#: camel/providers/local/camel-maildir-store.c:249
-#: camel/providers/local/camel-spool-store.c:452
-#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
-#: mail/mail-component.c:136
-msgid "Inbox"
-msgstr "Inbox"
-
-#: camel/providers/local/camel-maildir-folder.c:215
-msgid "Maildir append message cancelled"
-msgstr "Maildir append message cancelled"
-
-#: camel/providers/local/camel-maildir-folder.c:218
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Cannot append message to maildir folder: %s: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:244
-#: camel/providers/local/camel-maildir-folder.c:258
-#: camel/providers/local/camel-maildir-folder.c:267
-#: camel/providers/local/camel-mbox-folder.c:415
-#: camel/providers/local/camel-mbox-folder.c:434
-#: camel/providers/local/camel-mbox-folder.c:465
-#: camel/providers/local/camel-mbox-folder.c:473
-#: camel/providers/local/camel-mh-folder.c:202
-#: camel/providers/local/camel-mh-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:222
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:268
-msgid "Invalid message contents"
-msgstr "Invalid message contents"
-
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:152
-#: camel/providers/local/camel-mh-store.c:205
-#, c-format
-msgid "Cannot get folder `%s': %s"
-msgstr "Cannot get folder `%s': %s"
-
-#: camel/providers/local/camel-maildir-store.c:114
-#: camel/providers/local/camel-mbox-store.c:160
-#: camel/providers/local/camel-mh-store.c:212
-#, c-format
-msgid "Cannot get folder `%s': folder does not exist."
-msgstr "Cannot get folder `%s': folder does not exist."
-
-#: camel/providers/local/camel-maildir-store.c:122
-#: camel/providers/local/camel-mbox-store.c:182
-#: camel/providers/local/camel-mbox-store.c:194
-#, c-format
-msgid "Cannot create folder `%s': %s"
-msgstr "Cannot create folder `%s': %s"
-
-#: camel/providers/local/camel-maildir-store.c:137
-#, c-format
-msgid "Cannot get folder `%s': not a maildir directory."
-msgstr "Cannot get folder `%s': not a maildir directory."
-
-#: camel/providers/local/camel-maildir-store.c:176
-#: camel/providers/local/camel-maildir-store.c:214
-#: camel/providers/local/camel-mh-store.c:261
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Could not delete folder `%s': %s"
-
-#: camel/providers/local/camel-maildir-store.c:178
-msgid "not a maildir directory"
-msgstr "not a maildir directory"
-
-#: camel/providers/local/camel-maildir-store.c:356
-#: camel/providers/local/camel-spool-store.c:319
-#: camel/providers/local/camel-spool-store.c:333
-#, c-format
-msgid "Could not scan folder `%s': %s"
-msgstr "Could not scan folder `%s': %s"
-
-#: camel/providers/local/camel-maildir-summary.c:420
-#: camel/providers/local/camel-maildir-summary.c:551
-#, c-format
-msgid "Cannot open maildir directory path: %s: %s"
-msgstr "Cannot open maildir directory path: %s: %s"
-
-#: camel/providers/local/camel-maildir-summary.c:544
-msgid "Checking folder consistency"
-msgstr "Checking folder consistency"
-
-#: camel/providers/local/camel-maildir-summary.c:647
-msgid "Checking for new messages"
-msgstr "Checking for new messages"
-
-#: camel/providers/local/camel-maildir-summary.c:736
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-mbox-summary.c:543
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-spool-summary.c:138
-msgid "Storing folder"
-msgstr "Storing folder"
-
-#: camel/providers/local/camel-mbox-folder.c:223
-#: camel/providers/local/camel-spool-folder.c:176
-#, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr "Cannot create folder lock on %s: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:282
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Cannot open mailbox: %s: %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:342
-msgid "Mail append cancelled"
-msgstr "Mail append cancelled"
-
-#: camel/providers/local/camel-mbox-folder.c:345
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Cannot append message to mbox file: %s: %s"
-
-#: camel/providers/local/camel-mbox-folder.c:466
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "The folder appears to be irrecoverably corrupted."
-
-#: camel/providers/local/camel-mbox-folder.c:474
-#: camel/providers/local/camel-mh-folder.c:223
-msgid "Message construction failed."
-msgstr "Message construction failed."
-
-#: camel/providers/local/camel-mbox-store.c:174
-#: camel/providers/local/camel-mbox-store.c:359
-msgid "Cannot create a folder by this name."
-msgstr "Cannot create a folder by this name."
-
-#: camel/providers/local/camel-mbox-store.c:204
-#, c-format
-msgid "Cannot get folder `%s': not a regular file."
-msgstr "Cannot get folder `%s': not a regular file."
-
-#: camel/providers/local/camel-mbox-store.c:234
-#: camel/providers/local/camel-mbox-store.c:245
-#: camel/providers/local/camel-mbox-store.c:268
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Could not delete folder `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:253
-#, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' is not a regular file."
-
-#: camel/providers/local/camel-mbox-store.c:260
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr "Folder `%s' is not empty. Not deleted."
-
-#: camel/providers/local/camel-mbox-store.c:372
-#, c-format
-msgid "Cannot create directory `%s': %s."
-msgstr "Cannot create directory `%s': %s."
-
-#: camel/providers/local/camel-mbox-store.c:386
-#, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Cannot create folder: %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:388
-msgid "Folder already exists"
-msgstr "Folder already exists"
-
-#: camel/providers/local/camel-mbox-store.c:470
-msgid "The new folder name is illegal."
-msgstr "The new folder name is illegal."
-
-#: camel/providers/local/camel-mbox-store.c:483
-#, c-format
-msgid "Could not rename `%s': `%s': %s"
-msgstr "Could not rename `%s': `%s': %s"
-
-#: camel/providers/local/camel-mbox-store.c:558
-#, c-format
-msgid "Could not rename '%s' to %s: %s"
-msgstr "Could not rename '%s' to %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:376
-#, c-format
-msgid "Could not open folder: %s: %s"
-msgstr "Could not open folder: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:424
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Fatal mail parser error near position %ld in folder %s"
-
-#: camel/providers/local/camel-mbox-summary.c:480
-#, c-format
-msgid "Cannot check folder: %s: %s"
-msgstr "Cannot check folder: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:639
-#: camel/providers/local/camel-spool-summary.c:143
-#, c-format
-msgid "Could not open file: %s: %s"
-msgstr "Could not open file: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:560
-#: camel/providers/local/camel-spool-summary.c:163
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr "Cannot open temporary mailbox: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:573
-#: camel/providers/local/camel-mbox-summary.c:737
-#, c-format
-msgid "Could not close source folder %s: %s"
-msgstr "Could not close source folder %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:582
-#, c-format
-msgid "Could not close temp folder: %s"
-msgstr "Could not close temp folder: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:593
-#, c-format
-msgid "Could not rename folder: %s"
-msgstr "Could not rename folder: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:677
-#: camel/providers/local/camel-mbox-summary.c:685
-#: camel/providers/local/camel-mbox-summary.c:878
-#: camel/providers/local/camel-mbox-summary.c:886
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Summary and folder mismatch, even after a sync"
-
-#: camel/providers/local/camel-mbox-summary.c:812
-#: camel/providers/local/camel-spool-summary.c:335
-#, c-format
-msgid "Unknown error: %s"
-msgstr "Unknown error: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:847
-#, c-format
-msgid "Could not store folder: %s"
-msgstr "Could not store folder: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:941
-#: camel/providers/local/camel-mbox-summary.c:967
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr "Error writing to temp mailbox: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:958
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Writing to tmp mailbox failed: %s: %s"
-
-#: camel/providers/local/camel-mh-folder.c:175
-msgid "MH append message cancelled"
-msgstr "MH append message cancelled"
-
-#: camel/providers/local/camel-mh-folder.c:178
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Cannot append message to mh folder: %s: %s"
-
-#: camel/providers/local/camel-mh-store.c:220
-#, c-format
-msgid "Could not create folder `%s': %s"
-msgstr "Could not create folder `%s': %s"
-
-#: camel/providers/local/camel-mh-store.c:232
-#, c-format
-msgid "Cannot get folder `%s': not a directory."
-msgstr "Cannot get folder `%s': not a directory."
-
-#: camel/providers/local/camel-mh-summary.c:245
-#, c-format
-msgid "Cannot open MH directory path: %s: %s"
-msgstr "Cannot open MH directory path: %s: %s"
-
-#: camel/providers/local/camel-spool-store.c:123
-#, c-format
-msgid "Spool `%s' cannot be opened: %s"
-msgstr "Spool `%s' cannot be opened: %s"
-
-#: camel/providers/local/camel-spool-store.c:135
-#, c-format
-msgid "Spool `%s' is not a regular file or directory"
-msgstr "Spool `%s' is not a regular file or directory"
-
-#: camel/providers/local/camel-spool-store.c:154
-#, c-format
-msgid "Folder `%s/%s' does not exist."
-msgstr "Folder `%s/%s' does not exist."
-
-#: camel/providers/local/camel-spool-store.c:164
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Could not open folder `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-spool-store.c:168
-#, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Folder `%s' does not exist."
-
-#: camel/providers/local/camel-spool-store.c:173
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Could not create folder `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-spool-store.c:181
-#, c-format
-msgid "`%s' is not a mailbox file."
-msgstr "`%s' is not a mailbox file."
-
-#: camel/providers/local/camel-spool-store.c:198
-msgid "Store does not support an INBOX"
-msgstr "Store does not support an INBOX"
-
-#: camel/providers/local/camel-spool-store.c:210
-#, c-format
-msgid "Spool mail file %s"
-msgstr "Spool mail file %s"
-
-#: camel/providers/local/camel-spool-store.c:210
-#, c-format
-msgid "Spool folder tree %s"
-msgstr "Spool folder tree %s"
-
-#: camel/providers/local/camel-spool-store.c:218
-msgid "Spool folders cannot be renamed"
-msgstr "Spool folders cannot be renamed"
-
-#: camel/providers/local/camel-spool-store.c:226
-msgid "Spool folders cannot be deleted"
-msgstr "Spool folders cannot be deleted"
-
-#: camel/providers/local/camel-spool-summary.c:176
-#: camel/providers/local/camel-spool-summary.c:186
-#: camel/providers/local/camel-spool-summary.c:196
-#, c-format
-msgid "Could not sync temporary folder %s: %s"
-msgstr "Could not sync temporary folder %s: %s"
-
-#: camel/providers/local/camel-spool-summary.c:212
-#, c-format
-msgid "Could not sync spool folder %s: %s"
-msgstr "Could not sync spool folder %s: %s"
-
-#: camel/providers/local/camel-spool-summary.c:243
-#: camel/providers/local/camel-spool-summary.c:262
-#: camel/providers/local/camel-spool-summary.c:275
-#, c-format
-msgid ""
-"Could not sync spool folder %s: %s\n"
-"Folder may be corrupt, copy saved in `%s'"
-msgstr ""
-"Could not sync spool folder %s: %s\n"
-"Folder may be corrupt, copy saved in `%s'"
-
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:1128
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Please enter the NNTP password for %s@%s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Server rejected username"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Failed to send username to server"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Server rejected username/password"
-
-#: camel/providers/nntp/camel-nntp-folder.c:148
-#: camel/providers/nntp/camel-nntp-folder.c:150
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/nntp/camel-nntp-folder.c:235
-#: camel/providers/pop3/camel-pop3-folder.c:434
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:502
-#: camel/providers/pop3/camel-pop3-folder.c:513
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Cannot get message %s: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/nntp/camel-nntp-folder.c:233
-#: camel/providers/nntp/camel-nntp-folder.c:372
-#: camel/providers/pop3/camel-pop3-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:431
-#: camel/providers/pop3/camel-pop3-folder.c:492
-#: camel/providers/pop3/camel-pop3-folder.c:510
-msgid "User cancelled"
-msgstr "User cancelled"
-
-#: camel/providers/nntp/camel-nntp-folder.c:177
-#: camel/providers/nntp/camel-nntp-folder.c:209
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr "Internal error: uid in invalid format: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:329
-#: camel/providers/nntp/camel-nntp-folder.c:332
-#: camel/providers/nntp/camel-nntp-folder.c:374
-#: camel/providers/nntp/camel-nntp-folder.c:376
-#, c-format
-msgid "Posting failed: %s"
-msgstr "Posting failed: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:394
-msgid "You cannot post NNTP messages while working offline!"
-msgstr "You cannot post NNTP messages while working offline!"
-
-#: camel/providers/nntp/camel-nntp-folder.c:405
-msgid "You cannot copy messages from a NNTP folder!"
-msgstr "You cannot copy messages from a NNTP folder!"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:44
-msgid "Could not get group list from server."
-msgstr "Could not get group list from server."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:97
-#: camel/providers/nntp/camel-nntp-grouplist.c:106
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "Unable to load grouplist file for %s: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:157
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Unable to save grouplist file for %s: %s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:44
-msgid ""
-"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr ""
-"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-
-#: camel/providers/nntp/camel-nntp-provider.c:46
-msgid "In the subscription dialog, show relative folder names"
-msgstr "In the subscription dialogue, show relative folder names"
-
-#: camel/providers/nntp/camel-nntp-provider.c:53
-msgid "USENET news"
-msgstr "USENET news"
-
-#: camel/providers/nntp/camel-nntp-provider.c:55
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "This is a provider for reading from and posting toUSENET newsgroups."
-
-#: camel/providers/nntp/camel-nntp-provider.c:74
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-
-#: camel/providers/nntp/camel-nntp-store.c:113
-#: camel/providers/nntp/camel-nntp-store.c:1238
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP Command failed: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:231
-#, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "Could not read greeting from %s: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:243
-#, c-format
-msgid "NNTP server %s returned error code %d: %s"
-msgstr "NNTP server %s returned error code %d: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:404
-#, c-format
-msgid "USENET News via %s"
-msgstr "USENET News via %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:783
-#, c-format
-msgid ""
-"Error retrieving newsgroups:\n"
-"\n"
-"%s"
-msgstr ""
-"Error retrieving newsgroups:\n"
-"\n"
-"%s"
-
-#: camel/providers/nntp/camel-nntp-store.c:877
-msgid ""
-"You cannot subscribe to this newsgroup:\n"
-"\n"
-"No such newsgroup. The selected item is a probably a parent folder."
-msgstr ""
-"You cannot subscribe to this newsgroup:\n"
-"\n"
-"No such newsgroup. The selected item is a probably a parent folder."
-
-#: camel/providers/nntp/camel-nntp-store.c:909
-msgid ""
-"You cannot unsubscribe to this newsgroup:\n"
-"\n"
-"newsgroup does not exist!"
-msgstr ""
-"You cannot unsubscribe to this newsgroup:\n"
-"\n"
-"newsgroup does not exist!"
-
-#: camel/providers/nntp/camel-nntp-store.c:934
-msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "You cannot create a folder in a News store: subscribe instead."
-
-#: camel/providers/nntp/camel-nntp-store.c:942
-msgid "You cannot rename a folder in a News store."
-msgstr "You cannot rename a folder in a News store."
-
-#: camel/providers/nntp/camel-nntp-store.c:950
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "You cannot remove a folder in a News store: unsubscribe instead."
-
-#: camel/providers/nntp/camel-nntp-store.c:1120
-msgid "Authentication requested but no username provided"
-msgstr "Authentication requested but no username provided"
-
-#: camel/providers/nntp/camel-nntp-store.c:1150
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "Cannot authenticate to server: %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:1267
-msgid "Not connected."
-msgstr "Not connected."
-
-#: camel/providers/nntp/camel-nntp-store.c:1318
-#, c-format
-msgid "No such folder: %s"
-msgstr "No such folder: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:219
-#: camel/providers/nntp/camel-nntp-summary.c:315
-#, c-format
-msgid "%s: Scanning new messages"
-msgstr "%s: Scanning new messages"
-
-#: camel/providers/nntp/camel-nntp-summary.c:226
-#, c-format
-msgid "Unexpected server response from xover: %s"
-msgstr "Unexpected server response from xover: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:329
-#, c-format
-msgid "Unexpected server response from head: %s"
-msgstr "Unexpected server response from head: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:369
-msgid "Use cancel"
-msgstr "Use cancel"
-
-#: camel/providers/nntp/camel-nntp-summary.c:371
-#, c-format
-msgid "Operation failed: %s"
-msgstr "Operation failed: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:247
-msgid "Retrieving POP summary"
-msgstr "Retrieving POP summary"
-
-#: camel/providers/pop3/camel-pop3-folder.c:266
-#, c-format
-msgid "Cannot get POP summary: %s"
-msgstr "Cannot get POP summary: %s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:309
-msgid "Expunging deleted messages"
-msgstr "Expunging deleted messages"
-
-#: camel/providers/pop3/camel-pop3-folder.c:405
-#, c-format
-msgid "No message with uid %s"
-msgstr "No message with uid %s"
-
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:412
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "Retrieving POP message %d"
-
-#: camel/providers/pop3/camel-pop3-folder.c:502 composer/e-msg-composer.c:1211
-#: composer/e-msg-composer.c:1232
-msgid "Unknown reason"
-msgstr "Unknown reason"
-
-#: camel/providers/pop3/camel-pop3-provider.c:41
-msgid "Leave messages on server"
-msgstr "Leave messages on server"
-
-#: camel/providers/pop3/camel-pop3-provider.c:44
-#, c-format
-msgid "Delete after %s day(s)"
-msgstr "Delete after %s day(s)"
-
-#: camel/providers/pop3/camel-pop3-provider.c:47
-msgid "Disable support for all POP3 extensions"
-msgstr "Disable support for all POP3 extensions"
-
-#: camel/providers/pop3/camel-pop3-provider.c:55
-msgid "POP"
-msgstr "POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:57
-msgid "For connecting to and downloading mail from POP servers."
-msgstr "For connecting to and downloading mail from POP servers."
-
-#: camel/providers/pop3/camel-pop3-provider.c:74
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-
-#: camel/providers/pop3/camel-pop3-provider.c:84
-msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-msgstr ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
-
-#: camel/providers/pop3/camel-pop3-store.c:200
-#, c-format
-msgid "Failed to read a valid greeting from POP server %s"
-msgstr "Failed to read a valid greeting from POP server %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:213
-#: camel/providers/pop3/camel-pop3-store.c:230
-#: camel/providers/pop3/camel-pop3-store.c:242
-#, c-format
-msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "Failed to connect to POP server %s in secure mode: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:214
-msgid "STLS not supported"
-msgstr "STLS not supported"
-
-#: camel/providers/pop3/camel-pop3-store.c:336
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "Could not connect to POP server %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:377
-#: camel/providers/pop3/camel-pop3-store.c:491
-#, c-format
-msgid ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
-msgstr ""
-"Unable to connect to POP server %s: No support for requested authentication "
-"mechanism."
-
-#: camel/providers/pop3/camel-pop3-store.c:393
-#, c-format
-msgid "SASL `%s' Login failed for POP server %s: %s"
-msgstr "SASL `%s' Login failed for POP server %s: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:405
-#, c-format
-msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "Cannot login to POP server %s: SASL Protocol error"
-
-#: camel/providers/pop3/camel-pop3-store.c:424
-#, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "Failed to authenticate on POP server %s: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:450
-#, c-format
-msgid "%sPlease enter the POP password for %s on host %s"
-msgstr "%sPlease enter the POP password for %s on host %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:505
-#: camel/providers/pop3/camel-pop3-store.c:518
-#, c-format
-msgid ""
-"Unable to connect to POP server %s.\n"
-"Error sending password: %s"
-msgstr ""
-"Unable to connect to POP server %s.\n"
-"Error sending password: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:512
-#, c-format
-msgid ""
-"Unable to connect to POP server %s.\n"
-"Error sending username: %s"
-msgstr ""
-"Unable to connect to POP server %s.\n"
-"Error sending username: %s"
-
-#: camel/providers/pop3/camel-pop3-store.c:617
-#, c-format
-msgid "No such folder `%s'."
-msgstr "No such folder `%s'."
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:37
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:39
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-msgstr ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:114
-msgid "Could not parse recipient list"
-msgstr "Could not parse recipient list"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:145
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Could not create pipe to sendmail: %s: mail not sent"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:166
-#, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Could not fork sendmail: %s: mail not sent"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
-#, c-format
-msgid "Could not send message: %s"
-msgstr "Could not send message: %s"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:234
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail exited with signal %s: mail not sent."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:241
-#, c-format
-msgid "Could not execute %s: mail not sent."
-msgstr "Could not execute %s: mail not sent."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:246
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail exited with status %d: mail not sent."
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:260
-msgid "sendmail"
-msgstr "sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-transport.c:262
-msgid "Mail delivery via the sendmail program"
-msgstr "Mail delivery via the sendmail program"
-
-#: camel/providers/smtp/camel-smtp-provider.c:38
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:40
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "For delivering mail by connecting to a remote mailhub using SMTP."
-
-#: camel/providers/smtp/camel-smtp-transport.c:163
-msgid "Syntax error, command unrecognized"
-msgstr "Syntax error, command unrecognized"
-
-#: camel/providers/smtp/camel-smtp-transport.c:165
-msgid "Syntax error in parameters or arguments"
-msgstr "Syntax error in parameters or arguments"
-
-#: camel/providers/smtp/camel-smtp-transport.c:167
-msgid "Command not implemented"
-msgstr "Command not implemented"
-
-#: camel/providers/smtp/camel-smtp-transport.c:169
-msgid "Command parameter not implemented"
-msgstr "Command parameter not implemented"
-
-#: camel/providers/smtp/camel-smtp-transport.c:171
-msgid "System status, or system help reply"
-msgstr "System status, or system help reply"
-
-#: camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Help message"
-msgstr "Help message"
-
-#: camel/providers/smtp/camel-smtp-transport.c:175
-msgid "Service ready"
-msgstr "Service ready"
-
-#: camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Service closing transmission channel"
-msgstr "Service closing transmission channel"
-
-#: camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Service not available, closing transmission channel"
-msgstr "Service not available, closing transmission channel"
-
-#: camel/providers/smtp/camel-smtp-transport.c:181
-msgid "Requested mail action okay, completed"
-msgstr "Requested mail action okay, completed"
-
-#: camel/providers/smtp/camel-smtp-transport.c:183
-msgid "User not local; will forward to <forward-path>"
-msgstr "User not local; will forward to <forward-path>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:185
-msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Requested mail action not taken: mailbox unavailable"
-
-#: camel/providers/smtp/camel-smtp-transport.c:187
-msgid "Requested action not taken: mailbox unavailable"
-msgstr "Requested action not taken: mailbox unavailable"
-
-#: camel/providers/smtp/camel-smtp-transport.c:189
-msgid "Requested action aborted: error in processing"
-msgstr "Requested action aborted: error in processing"
-
-#: camel/providers/smtp/camel-smtp-transport.c:191
-msgid "User not local; please try <forward-path>"
-msgstr "User not local; please try <forward-path>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:193
-msgid "Requested action not taken: insufficient system storage"
-msgstr "Requested action not taken: insufficient system storage"
-
-#: camel/providers/smtp/camel-smtp-transport.c:195
-msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr "Requested mail action aborted: exceeded storage allocation"
-
-#: camel/providers/smtp/camel-smtp-transport.c:197
-msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Requested action not taken: mailbox name not allowed"
-
-#: camel/providers/smtp/camel-smtp-transport.c:199
-msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr "Start mail input; end with <CRLF>.<CRLF>"
-
-#: camel/providers/smtp/camel-smtp-transport.c:201
-msgid "Transaction failed"
-msgstr "Transaction failed"
-
-#: camel/providers/smtp/camel-smtp-transport.c:205
-msgid "A password transition is needed"
-msgstr "A password transition is needed"
-
-#: camel/providers/smtp/camel-smtp-transport.c:207
-msgid "Authentication mechanism is too weak"
-msgstr "Authentication mechanism is too weak"
-
-#: camel/providers/smtp/camel-smtp-transport.c:209
-msgid "Encryption required for requested authentication mechanism"
-msgstr "Encryption required for requested authentication mechanism"
-
-#: camel/providers/smtp/camel-smtp-transport.c:211
-msgid "Temporary authentication failure"
-msgstr "Temporary authentication failure"
-
-#: camel/providers/smtp/camel-smtp-transport.c:213
-msgid "Authentication required"
-msgstr "Authentication required"
-
-#: camel/providers/smtp/camel-smtp-transport.c:290
-msgid "Welcome response error"
-msgstr "Welcome response error"
-
-#: camel/providers/smtp/camel-smtp-transport.c:320
-#: camel/providers/smtp/camel-smtp-transport.c:353
-#, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "Failed to connect to SMTP server %s in secure mode: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:329
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "STARTTLS command failed: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:344
-msgid "STARTTLS command failed"
-msgstr "STARTTLS command failed"
-
-#: camel/providers/smtp/camel-smtp-transport.c:464
-#, c-format
-msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "SMTP server %s does not support requested authentication type %s."
-
-#: camel/providers/smtp/camel-smtp-transport.c:502
-#, c-format
-msgid "%sPlease enter the SMTP password for %s on host %s"
-msgstr "%sPlease enter the SMTP password for %s on host %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:521
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:645
-#, c-format
-msgid "SMTP server %s"
-msgstr "SMTP server %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:647
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "SMTP mail delivery via %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:665
-msgid "Cannot send message: service not connected."
-msgstr "Cannot send message: service not connected."
-
-#: camel/providers/smtp/camel-smtp-transport.c:671
-msgid "Cannot send message: sender address not valid."
-msgstr "Cannot send message: sender address not valid."
-
-#: camel/providers/smtp/camel-smtp-transport.c:675
-msgid "Sending message"
-msgstr "Sending message"
-
-#: camel/providers/smtp/camel-smtp-transport.c:690
-msgid "Cannot send message: no recipients defined."
-msgstr "Cannot send message: no recipients defined."
-
-#: camel/providers/smtp/camel-smtp-transport.c:701
-msgid "Cannot send message: one or more invalid recipients"
-msgstr "Cannot send message: one or more invalid recipients"
-
-#: camel/providers/smtp/camel-smtp-transport.c:870
-msgid "SMTP Greeting"
-msgstr "SMTP Greeting"
-
-#: camel/providers/smtp/camel-smtp-transport.c:887
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "HELO command failed: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:904
-msgid "HELO command failed"
-msgstr "HELO command failed"
-
-#: camel/providers/smtp/camel-smtp-transport.c:970
-msgid "SMTP Authentication"
-msgstr "SMTP Authentication"
-
-#: camel/providers/smtp/camel-smtp-transport.c:976
-msgid "Error creating SASL authentication object."
-msgstr "Error creating SASL authentication object."
-
-#: camel/providers/smtp/camel-smtp-transport.c:993
-#: camel/providers/smtp/camel-smtp-transport.c:1004
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "AUTH command failed: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1010
-msgid "AUTH command failed"
-msgstr "AUTH command failed"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1072
-msgid "Bad authentication response from server.\n"
-msgstr "Bad authentication response from server.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1097
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM command failed: %s: mail not sent"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1114
-msgid "MAIL FROM command failed"
-msgstr "MAIL FROM command failed"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1138
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "RCPT TO command failed: %s: mail not sent"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1157
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> failed"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1196
-#: camel/providers/smtp/camel-smtp-transport.c:1254
-#: camel/providers/smtp/camel-smtp-transport.c:1273
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "DATA command failed: %s: mail not sent"
-
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: camel/providers/smtp/camel-smtp-transport.c:1213
-#: camel/providers/smtp/camel-smtp-transport.c:1289
-msgid "DATA command failed"
-msgstr "DATA command failed"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1312
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "RSET command failed: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1328
-msgid "RSET command failed"
-msgstr "RSET command failed"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1351
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "QUIT command failed: %s"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1365
-msgid "QUIT command failed"
-msgstr "QUIT command failed"
-
 #: composer/e-msg-composer-attachment-bar.c:101
 #, c-format
 msgid "%.0fK"
@@ -11959,7 +9104,7 @@ msgstr "%.0fG"
 msgid "attachment"
 msgstr "attachment"
 
-#: composer/e-msg-composer-attachment-bar.c:441 mail/em-folder-tree.c:2744
+#: composer/e-msg-composer-attachment-bar.c:441 mail/em-folder-tree.c:2758
 #: ui/evolution-mail-list.xml.h:27
 msgid "_Properties"
 msgstr "_Properties"
@@ -11997,15 +9142,95 @@ msgstr "MIME type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suggest automatic display of attachment"
 
-#: composer/e-msg-composer-hdrs.c:513
+#: composer/e-msg-composer.c:727
+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:734
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+
+#: composer/e-msg-composer.c:1233 composer/e-msg-composer.c:1254
+msgid "Unknown reason"
+msgstr "Unknown reason"
+
+#: composer/e-msg-composer.c:1291
+msgid "Could not open file"
+msgstr "Could not open file"
+
+#: composer/e-msg-composer.c:1299
+msgid "Unable to retrieve message from editor"
+msgstr "Unable to retrieve message from editor"
+
+#: composer/e-msg-composer.c:1569
+msgid "Untitled Message"
+msgstr "Untitled Message"
+
+#: composer/e-msg-composer.c:1599
+msgid "Open file"
+msgstr "Open file"
+
+#: composer/e-msg-composer.c:2006 mail/em-account-editor.c:578
+#: mail/em-account-editor.c:623 mail/em-account-editor.c:690
+msgid "Autogenerated"
+msgstr "Autogenerated"
+
+#: composer/e-msg-composer.c:2105
+msgid "Si_gnature:"
+msgstr "Si_gnature:"
+
+#: composer/e-msg-composer.c:2364 composer/e-msg-composer.c:3355
+#: composer/e-msg-composer.c:3356
+msgid "Compose a message"
+msgstr "Compose a message"
+
+#: composer/e-msg-composer.c:2671
+#, c-format
+msgid "Attached message - %s"
+msgstr "Attached message - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2676 composer/e-msg-composer.c:2839
+#, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Attached message"
+msgstr[1] "%d attached messages"
+
+#: composer/e-msg-composer.c:2902 mail/em-folder-tree.c:1037
+#: mail/em-folder-tree.c:2255 mail/em-folder-view.c:823
+#: mail/message-list.c:1713
+msgid "_Move"
+msgstr "_Move"
+
+#: composer/e-msg-composer.c:2904 mail/em-folder-tree.c:1039
+#: mail/message-list.c:1715
+msgid "Cancel _Drag"
+msgstr "Cancel _Drag"
+
+#: composer/e-msg-composer.c:4536
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+
+#: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Posting destination"
 
-#: composer/e-msg-composer-hdrs.c:514
+#: composer/e-msg-composer-hdrs.c:513
 msgid "Choose folders to post the message to."
 msgstr "Choose folders to post the message to."
 
-#: composer/e-msg-composer-hdrs.c:548
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Click here for the address book"
 
@@ -12016,45 +9241,45 @@ msgstr "Click here for the address book"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:578
-msgid "Reply-To:"
-msgstr "Reply-To:"
+#: composer/e-msg-composer-hdrs.c:577
+msgid "_Reply-To:"
+msgstr "_Reply-To:"
 
 #.
 #. * From
 #.
 #: composer/e-msg-composer-hdrs.c:584
-msgid "From:"
-msgstr "From:"
+msgid "Fr_om:"
+msgstr "Fr_om:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:590
-msgid "Subject:"
-msgstr "Subject:"
+#: composer/e-msg-composer-hdrs.c:591
+msgid "S_ubject:"
+msgstr "S_ubject:"
 
-#: composer/e-msg-composer-hdrs.c:599
-msgid "To:"
-msgstr "To:"
+#: composer/e-msg-composer-hdrs.c:601
+msgid "_To:"
+msgstr "_To:"
 
-#: composer/e-msg-composer-hdrs.c:600
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Enter the recipients of the message"
 msgstr "Enter the recipients of the message"
 
-#: composer/e-msg-composer-hdrs.c:603
-msgid "Cc:"
-msgstr "Cc:"
+#: composer/e-msg-composer-hdrs.c:605
+msgid "_Cc:"
+msgstr "_Cc:"
 
-#: composer/e-msg-composer-hdrs.c:604
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Enter the addresses that will receive a carbon copy of the message"
 
-#: composer/e-msg-composer-hdrs.c:607
-msgid "Bcc:"
-msgstr "Bcc:"
+#: composer/e-msg-composer-hdrs.c:609
+msgid "_Bcc:"
+msgstr "_Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:608
+#: composer/e-msg-composer-hdrs.c:610
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -12065,97 +9290,22 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:615
-msgid "Post To:"
-msgstr "Post To:"
+#: composer/e-msg-composer-hdrs.c:617
+msgid "_Post To:"
+msgstr "_Post To:"
 
-#: composer/e-msg-composer-hdrs.c:620
+#: composer/e-msg-composer-hdrs.c:622
 msgid "Click here to select folders to post to"
 msgstr "Click here to select folders to post to"
 
+#: composer/e-msg-composer-hdrs.c:628
+msgid "Post To:"
+msgstr "Post To:"
+
 #: composer/e-msg-composer-select-file.c:187
 msgid "Attach file(s)"
 msgstr "Attach file(s)"
 
-#: composer/e-msg-composer.c:705
-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:712
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-
-#: composer/e-msg-composer.c:1269
-msgid "Could not open file"
-msgstr "Could not open file"
-
-#: composer/e-msg-composer.c:1277
-msgid "Unable to retrieve message from editor"
-msgstr "Unable to retrieve message from editor"
-
-#: composer/e-msg-composer.c:1547
-msgid "Untitled Message"
-msgstr "Untitled Message"
-
-#: composer/e-msg-composer.c:1577
-msgid "Open file"
-msgstr "Open file"
-
-#: composer/e-msg-composer.c:1984 mail/mail-account-gui.c:1498
-msgid "Autogenerated"
-msgstr "Autogenerated"
-
-#: composer/e-msg-composer.c:2083
-msgid "Signature:"
-msgstr "Signature:"
-
-#: composer/e-msg-composer.c:2284
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> File Attached"
-msgstr[1] "<b>%d</b> Files Attached"
-
-#: composer/e-msg-composer.c:2313
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Hide _Attachment Bar (drop attachments here)"
-
-#: composer/e-msg-composer.c:2316 composer/e-msg-composer.c:3272
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Show _Attachment Bar (drop attachments here)"
-
-#: composer/e-msg-composer.c:2333 composer/e-msg-composer.c:3164
-#: composer/e-msg-composer.c:3165
-msgid "Compose a message"
-msgstr "Compose a message"
-
-#: composer/e-msg-composer.c:2635
-#, c-format
-msgid "Attached message - %s"
-msgstr "Attached message - %s"
-
-#. translators, this count will always be >1
-#: composer/e-msg-composer.c:2640 composer/e-msg-composer.c:2784
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "Attached message"
-msgstr[1] "%d attached messages"
-
-#: composer/e-msg-composer.c:4343
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
@@ -12305,6 +9455,7 @@ msgstr "Could not create composer window."
 msgid "Unable to activate the address selector control."
 msgstr "Unable to activate the address selector control."
 
+#. mail-composer:no-editor-control secondary
 #: composer/mail-composer-errors.xml.h:54
 msgid ""
 "Unable to activate the HTML editor control.\n"
@@ -12317,7 +9468,7 @@ msgstr ""
 "Please make sure that you have the correct version of gtkhtml and libgtkhtml "
 "installed."
 
-#: data/evolution.desktop.in.in.h:1 shell/main.c:503
+#: data/evolution.desktop.in.in.h:1 shell/main.c:520
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -12450,11 +9601,15 @@ msgstr ""
 msgid "Overwrite file?"
 msgstr "Overwrite file?"
 
-#: e-util/e-passwords.c:464
+#: e-util/eggtrayicon.c:119
+msgid "The orientation of the tray."
+msgstr "The orientation of the tray."
+
+#: e-util/e-passwords.c:468
 msgid "_Remember this password"
 msgstr "_Remember this password"
 
-#: e-util/e-passwords.c:465
+#: e-util/e-passwords.c:469
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Remember this password for the remainder of this session"
 
@@ -12538,7 +9693,7 @@ msgstr "%H:%M:%S"
 #. without seconds.
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: widgets/misc/e-dateedit.c:1431 widgets/misc/e-dateedit.c:1697
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -12547,7 +9702,7 @@ msgstr "%I:%M %p"
 #. without seconds.
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
+#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1694
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -12683,71 +9838,6 @@ msgstr "Please choose another name."
 msgid "Choose a file"
 msgstr "Choose a file"
 
-#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:88
-msgid "Important"
-msgstr "Important"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
-#: mail/mail-config.glade.h:135
-msgid "To Do"
-msgstr "To Do"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
-#: mail/mail-config.glade.h:91
-msgid "Later"
-msgstr "Later"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:790
-msgid "Rule name:"
-msgstr "Rule name:"
-
-#: filter/filter-rule.c:817
-msgid "<b>If</b>"
-msgstr "<b>If</b>"
-
-#: filter/filter-rule.c:854
-msgid "if all criteria are met"
-msgstr "if all criteria are met"
-
-#: filter/filter-rule.c:854
-msgid "if any criteria are met"
-msgstr "if any criteria are met"
-
-#: filter/filter-rule.c:856
-msgid "Execute actions"
-msgstr "Execute actions"
-
-#: filter/filter-rule.c:877
-msgid "All related"
-msgstr "All related"
-
-#: filter/filter-rule.c:877
-msgid "Replies"
-msgstr "Replies"
-
-#: filter/filter-rule.c:877
-msgid "Replies and parents"
-msgstr "Replies and parents"
-
-#: filter/filter-rule.c:879
-msgid "Include threads"
-msgstr "Include threads"
-
-#: filter/filter-rule.c:974
-msgid "incoming"
-msgstr "incoming"
-
-#: filter/filter-rule.c:974
-msgid "outgoing"
-msgstr "outgoing"
-
 #: filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>_Filter Rules</b>"
@@ -12756,11 +9846,15 @@ msgstr "<b>_Filter Rules</b>"
 msgid "Compare against"
 msgstr "Compare against"
 
-#: filter/filter.glade.h:3
+#: filter/filter.glade.h:3 filter/filter-rule.c:975
 msgid "Incoming"
 msgstr "Incoming"
 
 #: filter/filter.glade.h:4
+msgid "Show filters for mail:"
+msgstr "Show filters for mail:"
+
+#: filter/filter.glade.h:5
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12768,7 +9862,7 @@ msgstr ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -12776,7 +9870,7 @@ msgstr ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:9
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -12784,34 +9878,95 @@ msgstr ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:12
 msgid "a time relative to the current time"
 msgstr "a time relative to the current time"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:13
 msgid "ago"
 msgstr "ago"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:17
 msgid "months"
 msgstr "months"
 
-#: filter/filter.glade.h:17 mail/mail-config.glade.h:170
+#: filter/filter.glade.h:18 mail/mail-config.glade.h:173
 msgid "seconds"
 msgstr "seconds"
 
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:19
 msgid "the current time"
 msgstr "the current time"
 
-#: filter/filter.glade.h:19
+#: filter/filter.glade.h:20
 msgid "the time you specify"
 msgstr "the time you specify"
 
-#: filter/filter.glade.h:21
+#: filter/filter.glade.h:22
 msgid "years"
 msgstr "years"
 
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:91
+msgid "Important"
+msgstr "Important"
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:139
+msgid "To Do"
+msgstr "To Do"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:94
+msgid "Later"
+msgstr "Later"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+msgid "_Rule name:"
+msgstr "_Rule name:"
+
+#: filter/filter-rule.c:818
+msgid "<b>If</b>"
+msgstr "<b>If</b>"
+
+#: filter/filter-rule.c:855
+msgid "if all criteria are met"
+msgstr "if all criteria are met"
+
+#: filter/filter-rule.c:855
+msgid "if any criteria are met"
+msgstr "if any criteria are met"
+
+#: filter/filter-rule.c:857
+msgid "Execute actions"
+msgstr "Execute actions"
+
+#: filter/filter-rule.c:878
+msgid "All related"
+msgstr "All related"
+
+#: filter/filter-rule.c:878
+msgid "Replies"
+msgstr "Replies"
+
+#: filter/filter-rule.c:878
+msgid "Replies and parents"
+msgstr "Replies and parents"
+
+#: filter/filter-rule.c:880
+msgid "Include threads"
+msgstr "Include threads"
+
+#: filter/filter-rule.c:975
+msgid "Outgoing"
+msgstr "Outgoing"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Add Rule"
@@ -12824,109 +9979,92 @@ msgstr "Edit Rule"
 msgid "Rule name"
 msgstr "Rule name"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Composer Preferences"
+#: mail/em-account-editor.c:377
+#, c-format
+msgid "%s License Agreement"
+msgstr "%s Licence Agreement"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-account-editor.c:384
+#, c-format
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
 msgstr ""
-"Configure mail preferences, including security and message display, here"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Configure spell-checking, signatures, and the message composer here"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Configure your email accounts here"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution Mail"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Mail accounts configuration control"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution Mail component"
+"\n"
+"Please read carefully the licence agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution Mail composer"
+#: mail/em-account-editor.c:454 mail/em-filter-folder-element.c:237
+#: mail/em-vfolder-rule.c:494
+msgid "Select Folder"
+msgstr "Select Folder"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution Mail composer configuration control"
+#: mail/em-account-editor.c:1809
+msgid "Automatically check for _new mail every"
+msgstr "Automatically check for _new mail every"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Mail preferences control"
+#. Most sections for this is auto-generated fromt the camel config
+#: mail/em-account-editor.c:2078 mail/em-account-editor.c:2156
+msgid "Receiving Options"
+msgstr "Receiving Options"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:420
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:531
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Mail"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Mail Accounts"
-msgstr "Mail Accounts"
+#: mail/em-account-editor.c:2079 mail/em-account-editor.c:2157
+msgid "Checking for New Mail"
+msgstr "Checking for New Mail"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:93
-msgid "Mail Preferences"
-msgstr "Mail Preferences"
+#: mail/em-account-editor.c:2501 mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "Account Editor"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "_Mail"
-msgstr "_Mail"
+#: mail/em-account-editor.c:2501 mail/mail-config.glade.h:80
+msgid "Evolution Account Assistant"
+msgstr "Evolution Account Assistant"
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:433
+#: mail/em-account-prefs.c:422
 msgid "[Default]"
 msgstr "[Default]"
 
-#: mail/em-account-prefs.c:487
+#: mail/em-account-prefs.c:476
 msgid "Account name"
 msgstr "Account name"
 
-#: mail/em-account-prefs.c:489
+#: mail/em-account-prefs.c:478
 msgid "Protocol"
 msgstr "Protocol"
 
 #: mail/em-composer-prefs.c:306 mail/em-composer-prefs.c:425
-#: mail/mail-config.c:1049
+#: mail/mail-config.c:935
 msgid "Unnamed"
 msgstr "Unnamed"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:949
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: mail/em-composer-prefs.c:987
+#: mail/em-composer-prefs.c:995
 msgid "Add signature script"
 msgstr "Add signature script"
 
-#: mail/em-composer-prefs.c:1007
+#: mail/em-composer-prefs.c:1015
 msgid "Signature(s)"
 msgstr "Signature(s)"
 
-#: mail/em-composer-utils.c:890
+#: mail/em-composer-utils.c:897
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: mail/em-composer-utils.c:1503
+#: mail/em-composer-utils.c:1513
 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:1550
+#: mail/em-composer-utils.c:1560
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -12938,11 +10076,6 @@ msgstr ""
 msgid "_Filter Rules"
 msgstr "_Filter Rules"
 
-#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
-#: mail/mail-account-gui.c:1354
-msgid "Select Folder"
-msgstr "Select Folder"
-
 #. Automatically generated. Do not edit.
 #: mail/em-filter-i18n.h:2
 msgid "Adjust Score"
@@ -13068,11 +10201,16 @@ msgstr "is not"
 msgid "is not Flagged"
 msgstr "is not Flagged"
 
+#: mail/em-filter-i18n.h:35 mail/mail-config.glade.h:93
+#: ui/evolution-mail-message.xml.h:48
+msgid "Junk"
+msgstr "Junk"
+
 #: mail/em-filter-i18n.h:36
 msgid "Junk Test"
 msgstr "Junk Test"
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:954
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:960
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Label"
@@ -13082,109 +10220,113 @@ msgid "Mailing list"
 msgstr "Mailing list"
 
 #: mail/em-filter-i18n.h:39
+msgid "Match All"
+msgstr "Match All"
+
+#: mail/em-filter-i18n.h:40
 msgid "Message Body"
 msgstr "Message Body"
 
-#: mail/em-filter-i18n.h:40
+#: mail/em-filter-i18n.h:41
 msgid "Message Header"
 msgstr "Message Header"
 
-#: mail/em-filter-i18n.h:41
+#: mail/em-filter-i18n.h:42
 msgid "Message is Junk"
 msgstr "Message is Junk"
 
-#: mail/em-filter-i18n.h:42
+#: mail/em-filter-i18n.h:43
 msgid "Message is not Junk"
 msgstr "Message is not Junk"
 
-#: mail/em-filter-i18n.h:43
+#: mail/em-filter-i18n.h:44
 msgid "Move to Folder"
 msgstr "Move to Folder"
 
-#: mail/em-filter-i18n.h:44
+#: mail/em-filter-i18n.h:45
 msgid "Pipe to Program"
 msgstr "Pipe to Program"
 
-#: mail/em-filter-i18n.h:45
+#: mail/em-filter-i18n.h:46
 msgid "Play Sound"
 msgstr "Play Sound"
 
-#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:80
+#: mail/em-filter-i18n.h:47 mail/message-tag-followup.c:80
 msgid "Read"
 msgstr "Read"
 
-#: mail/em-filter-i18n.h:47
+#: mail/em-filter-i18n.h:48
 msgid "Recipients"
 msgstr "Recipients"
 
-#: mail/em-filter-i18n.h:48
+#: mail/em-filter-i18n.h:49
 msgid "Regex Match"
 msgstr "Regex Match"
 
-#: mail/em-filter-i18n.h:49
+#: mail/em-filter-i18n.h:50
 msgid "Replied to"
 msgstr "Replied to"
 
-#: mail/em-filter-i18n.h:50
+#: mail/em-filter-i18n.h:51
 msgid "returns"
 msgstr "returns"
 
-#: mail/em-filter-i18n.h:51
+#: mail/em-filter-i18n.h:52
 msgid "returns greater than"
 msgstr "returns greater than"
 
-#: mail/em-filter-i18n.h:52
+#: mail/em-filter-i18n.h:53
 msgid "returns less than"
 msgstr "returns less than"
 
-#: mail/em-filter-i18n.h:53
+#: mail/em-filter-i18n.h:54
 msgid "Run Program"
 msgstr "Run Program"
 
-#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+#: mail/em-filter-i18n.h:55 mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Score"
 
-#: mail/em-filter-i18n.h:55
+#: mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Sender"
 
-#: mail/em-filter-i18n.h:56
+#: mail/em-filter-i18n.h:57
 msgid "Set Status"
 msgstr "Set Status"
 
-#: mail/em-filter-i18n.h:57
+#: mail/em-filter-i18n.h:58
 msgid "Size (kB)"
 msgstr "Size (kB)"
 
-#: mail/em-filter-i18n.h:58
+#: mail/em-filter-i18n.h:59
 msgid "sounds like"
 msgstr "sounds like"
 
-#: mail/em-filter-i18n.h:59
+#: mail/em-filter-i18n.h:60
 msgid "Source Account"
 msgstr "Source Account"
 
-#: mail/em-filter-i18n.h:60
+#: mail/em-filter-i18n.h:61
 msgid "Specific header"
 msgstr "Specific header"
 
-#: mail/em-filter-i18n.h:61
+#: mail/em-filter-i18n.h:62
 msgid "starts with"
 msgstr "starts with"
 
-#: mail/em-filter-i18n.h:63
+#: mail/em-filter-i18n.h:64
 msgid "Stop Processing"
 msgstr "Stop Processing"
 
-#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1569
-#: mail/em-format-quote.c:306 mail/em-format.c:824 mail/em-mailer-prefs.c:88
+#: mail/em-filter-i18n.h:65 mail/em-format.c:853 mail/em-format-html.c:1534
+#: mail/em-format-quote.c:306 mail/em-mailer-prefs.c:88
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:330
-#: smime/lib/e-cert.c:1131
+#: plugins/shared-folder/properties.glade.h:14 smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Subject"
 
-#: mail/em-filter-i18n.h:65
+#: mail/em-filter-i18n.h:66
 msgid "Unset Status"
 msgstr "Unset Status"
 
@@ -13193,24 +10335,24 @@ msgstr "Unset Status"
 msgid "<b>Then</b>"
 msgstr "<b>Then</b>"
 
-#: mail/em-folder-browser.c:132
+#: mail/em-folder-browser.c:133
 msgid "Create _Virtual Folder From Search..."
 msgstr "Create _Virtual Folder From Search..."
 
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:142
+#: mail/em-folder-properties.c:143
 msgid "Total message:"
 msgid_plural "Total messages:"
 msgstr[0] "Total message:"
 msgstr[1] "Total messages:"
 
-#: mail/em-folder-properties.c:154
+#: mail/em-folder-properties.c:155
 msgid "Unread message:"
 msgid_plural "Unread messages:"
 msgstr[0] "Unread message:"
 msgstr[1] "Unread messages:"
 
-#: mail/em-folder-properties.c:268
+#: mail/em-folder-properties.c:269 plugins/shared-folder/properties.glade.h:9
 msgid "Folder Properties"
 msgstr "Folder Properties"
 
@@ -13222,8 +10364,8 @@ msgstr "<click here to select a folder>"
 msgid "Create New Folder"
 msgstr "Create New Folder"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2457
-#: mail/mail-component.c:732
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2471
+#: mail/mail-component.c:732 plugins/shared-folder/share-folder-common.c:332
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
@@ -13235,273 +10377,429 @@ msgstr "Create"
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
-#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
-#: mail/mail-vfolder.c:872
-msgid "VFolders"
-msgstr "VFolders"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
-msgid "UNMATCHED"
-msgstr "UNMATCHED"
+#: mail/em-folder-tree.c:678
+msgid "Mail Folder Tree"
+msgstr "Mail Folder Tree"
 
-#: mail/em-folder-tree-model.c:491 mail/em-folder-tree-model.c:795
-msgid "Loading..."
-msgstr "Loading..."
-
-#: mail/em-folder-tree.c:895
+#: mail/em-folder-tree.c:911
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: mail/em-folder-tree.c:897
+#: mail/em-folder-tree.c:913
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: mail/em-folder-tree.c:904 mail/message-list.c:1614
+#: mail/em-folder-tree.c:920 mail/message-list.c:1617
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: mail/em-folder-tree.c:906 mail/message-list.c:1616
+#: mail/em-folder-tree.c:922 mail/message-list.c:1619
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: mail/em-folder-tree.c:922
+#: mail/em-folder-tree.c:938
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: mail/em-folder-tree.c:1018 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:1034 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Copy to Folder"
 
-#: mail/em-folder-tree.c:1019 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:1035 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Move to Folder"
 
-#: mail/em-folder-tree.c:1021 mail/em-folder-tree.c:2241
-#: mail/em-folder-view.c:817 mail/message-list.c:1710
-msgid "_Move"
-msgstr "_Move"
-
-#: mail/em-folder-tree.c:1023 mail/message-list.c:1712
-msgid "Cancel _Drag"
-msgstr "Cancel _Drag"
-
-#: mail/em-folder-tree.c:1718 mail/mail-ops.c:1014
+#: mail/em-folder-tree.c:1734 mail/mail-ops.c:1017
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanning folders in \"%s\""
 
-#: mail/em-folder-tree.c:2227 mail/em-folder-tree.c:2241
-#: mail/em-folder-view.c:817 mail/em-folder-view.c:832
+#: mail/em-folder-tree.c:2241 mail/em-folder-tree.c:2255
+#: mail/em-folder-view.c:823 mail/em-folder-view.c:838
 #: mail/importers/evolution-mbox-importer.c:120
 #: mail/importers/evolution-outlook-importer.c:134
 msgid "Select folder"
 msgstr "Select folder"
 
-#: mail/em-folder-tree.c:2227 mail/em-folder-view.c:832
+#: mail/em-folder-tree.c:2241 mail/em-folder-view.c:838
 msgid "C_opy"
 msgstr "C_opy"
 
-#: mail/em-folder-tree.c:2268
+#: mail/em-folder-tree.c:2282 plugins/shared-folder/share-folder-common.c:138
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creating folder `%s'"
 
-#: mail/em-folder-tree.c:2457 mail/mail-component.c:732
+#: mail/em-folder-tree.c:2471 mail/mail-component.c:732
+#: plugins/shared-folder/share-folder-common.c:332
 msgid "Create folder"
 msgstr "Create folder"
 
-#: mail/em-folder-tree.c:2650
+#: mail/em-folder-tree.c:2664
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rename the \"%s\" folder to:"
 
-#: mail/em-folder-tree.c:2652
+#: mail/em-folder-tree.c:2666
 msgid "Rename Folder"
 msgstr "Rename Folder"
 
-#: mail/em-folder-tree.c:2728 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2742 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:49
 msgid "_View"
 msgstr "_View"
 
-#: mail/em-folder-tree.c:2729
+#: mail/em-folder-tree.c:2743
 msgid "Open in _New Window"
 msgstr "Open in _New Window"
 
-#: mail/em-folder-tree.c:2733
+#: mail/em-folder-tree.c:2747
 msgid "_Copy..."
 msgstr "_Copy..."
 
-#: mail/em-folder-tree.c:2734
+#: mail/em-folder-tree.c:2748
 msgid "_Move..."
 msgstr "_Move..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2738
+#: mail/em-folder-tree.c:2752
 msgid "_New Folder..."
 msgstr "_New Folder..."
 
-#: mail/em-folder-tree.c:2741
+#: mail/em-folder-tree.c:2755
 msgid "_Rename..."
 msgstr "_Rename..."
 
-#: mail/em-folder-view.c:922 ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:880
+msgid "VFolders"
+msgstr "VFolders"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "UNMATCHED"
+
+#. Inbox is always first
+#. translators: standard local mailbox names
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+#: mail/mail-component.c:138
+msgid "Inbox"
+msgstr "Inbox"
+
+#: mail/em-folder-tree-model.c:491 mail/em-folder-tree-model.c:795
+msgid "Loading..."
+msgstr "Loading..."
+
+#: mail/em-folder-view.c:426 mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:531
+#: mail/mail-component.c:582
+msgid "Mail"
+msgstr "Mail"
+
+#: mail/em-folder-view.c:928 ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Message..."
 
-#: mail/em-folder-view.c:924
+#: mail/em-folder-view.c:930
 msgid "_Print"
 msgstr "_Print"
 
-#: mail/em-folder-view.c:927 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:933 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: mail/em-folder-view.c:928 mail/em-popup.c:500
+#: mail/em-folder-view.c:934 mail/em-popup.c:502
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
-#: mail/em-folder-view.c:929 mail/em-popup.c:501
+#: mail/em-folder-view.c:935 mail/em-popup.c:503
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: mail/em-folder-view.c:930 mail/em-popup.c:503
+#: mail/em-folder-view.c:936 mail/em-popup.c:505
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Forward"
 
-#: mail/em-folder-view.c:933
+#: mail/em-folder-view.c:939
 msgid "Follo_w Up..."
 msgstr "Follo_w Up..."
 
-#: mail/em-folder-view.c:934
+#: mail/em-folder-view.c:940
 msgid "Fla_g Completed"
 msgstr "Fla_g Completed"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:941
 msgid "Cl_ear Flag"
 msgstr "Cl_ear Flag"
 
-#: mail/em-folder-view.c:938 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:944 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:945
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:946
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:947
 msgid "_Mark as Unimportant"
 msgstr "_Mark as Unimportant"
 
-#: mail/em-folder-view.c:942 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:948 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: mail/em-folder-view.c:943 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:949 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:953
 msgid "U_ndelete"
 msgstr "U_ndelete"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:956
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ve to Folder..."
 
-#: mail/em-folder-view.c:951 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:957 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder..."
 
-#: mail/em-folder-view.c:959
+#: mail/em-folder-view.c:965
 msgid "Add Sender to Address_book"
 msgstr "Add Sender to Address_book"
 
-#: mail/em-folder-view.c:962
+#: mail/em-folder-view.c:968
 msgid "Appl_y Filters"
 msgstr "Appl_y Filters"
 
-#: mail/em-folder-view.c:963
+#: mail/em-folder-view.c:969
 msgid "F_ilter Junk"
 msgstr "F_ilter Junk"
 
-#: mail/em-folder-view.c:966
+#: mail/em-folder-view.c:972
 msgid "Crea_te Rule From Message"
 msgstr "Crea_te Rule From Message"
 
-#: mail/em-folder-view.c:967
+#: mail/em-folder-view.c:973
 msgid "VFolder on _Subject"
 msgstr "VFolder on _Subject"
 
-#: mail/em-folder-view.c:968
+#: mail/em-folder-view.c:974
 msgid "VFolder on Se_nder"
 msgstr "VFolder on Se_nder"
 
-#: mail/em-folder-view.c:969
+#: mail/em-folder-view.c:975
 msgid "VFolder on _Recipients"
 msgstr "VFolder on _Recipients"
 
-#: mail/em-folder-view.c:970
+#: mail/em-folder-view.c:976
 msgid "VFolder on Mailing _List"
 msgstr "VFolder on Mailing _List"
 
-#: mail/em-folder-view.c:974
+#: mail/em-folder-view.c:980
 msgid "Filter on Sub_ject"
 msgstr "Filter on Sub_ject"
 
-#: mail/em-folder-view.c:975
+#: mail/em-folder-view.c:981
 msgid "Filter on Sen_der"
 msgstr "Filter on Sen_der"
 
-#: mail/em-folder-view.c:976
+#: mail/em-folder-view.c:982
 msgid "Filter on Re_cipients"
 msgstr "Filter on Re_cipients"
 
-#: mail/em-folder-view.c:977
+#: mail/em-folder-view.c:983
 msgid "Filter on _Mailing List"
 msgstr "Filter on _Mailing List"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1747 mail/em-folder-view.c:1790
+#: mail/em-folder-view.c:1760 mail/em-folder-view.c:1803
 msgid "Default"
 msgstr "Default"
 
-#: mail/em-folder-view.c:1887
+#: mail/em-folder-view.c:1900
 msgid "Print Message"
 msgstr "Print Message"
 
-#: mail/em-folder-view.c:2148
+#: mail/em-folder-view.c:2179
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: mail/em-folder-view.c:2412
+#: mail/em-folder-view.c:2462
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
 
+#: mail/em-format.c:848 mail/em-format-html.c:1425 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:83 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:326
+msgid "From"
+msgstr "From"
+
+#: mail/em-format.c:849 mail/em-format-html.c:1425 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:84
+msgid "Reply-To"
+msgstr "Reply-To"
+
+#: mail/em-format.c:850 mail/em-format-html.c:1425 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "To"
+
+#: mail/em-format.c:851 mail/em-format-html.c:1425 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:86
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format.c:852 mail/em-format-html.c:1425 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:87
+msgid "Bcc"
+msgstr "Bcc"
+
+#: mail/em-format.c:854 mail/em-format-html.c:1578 mail/em-format-quote.c:322
+#: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Date"
+
+#: mail/em-format.c:855 mail/em-format-html.c:1601 mail/em-mailer-prefs.c:90
+msgid "Newsgroups"
+msgstr "Newsgroups"
+
+#: mail/em-format.c:1104
+#, c-format
+msgid "%s attachment"
+msgstr "%s attachment"
+
+#: mail/em-format.c:1143 mail/em-format.c:1276
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Could not parse S/MIME message: Unknown error"
+
+#: mail/em-format.c:1266
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Unsupported encryption type for multipart/encrypted"
+
+#: mail/em-format.c:1414
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Could not parse MIME message. Displaying as source."
+
+#: mail/em-format.c:1433
+msgid "Unsupported signature format"
+msgstr "Unsupported signature format"
+
+#: mail/em-format.c:1441
+msgid "Error verifying signature"
+msgstr "Error verifying signature"
+
+#: mail/em-format.c:1441
+msgid "Unknown error verifying signature"
+msgstr "Unknown error verifying signature"
+
+#: mail/em-format-html.c:473 mail/em-format-html.c:475
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Retrieving `%s'"
+
+#: mail/em-format-html.c:580 mail/em-format-html-display.c:638
+msgid "Unsigned"
+msgstr "Unsigned"
+
+#: mail/em-format-html.c:581 mail/em-format-html-display.c:639
+msgid "Valid signature"
+msgstr "Valid signature"
+
+#: mail/em-format-html.c:582 mail/em-format-html-display.c:640
+msgid "Invalid signature"
+msgstr "Invalid signature"
+
+#: mail/em-format-html.c:583
+msgid "Valid signature but cannot verify sender"
+msgstr "Valid signature but cannot verify sender"
+
+#: mail/em-format-html.c:589 mail/em-format-html-display.c:647
+msgid "Unencrypted"
+msgstr "Unencrypted"
+
+#: mail/em-format-html.c:590 mail/em-format-html-display.c:648
+msgid "Encrypted, weak"
+msgstr "Encrypted, weak"
+
+#: mail/em-format-html.c:591 mail/em-format-html-display.c:649
+msgid "Encrypted"
+msgstr "Encrypted"
+
+#: mail/em-format-html.c:592 mail/em-format-html-display.c:650
+msgid "Encrypted, strong"
+msgstr "Encrypted, strong"
+
+#: mail/em-format-html.c:841
+msgid "Malformed external-body part."
+msgstr "Malformed external-body part."
+
+#: mail/em-format-html.c:871
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pointer to FTP site (%s)"
+
+#: mail/em-format-html.c:882
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Pointer to local file (%s) valid at site \"%s\""
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Pointer to local file (%s)"
+
+#: mail/em-format-html.c:905
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pointer to remote data (%s)"
+
+#: mail/em-format-html.c:916
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pointer to unknown external data (\"%s\" type)"
+
+#: mail/em-format-html.c:1138
+msgid "Formatting message"
+msgstr "Formatting message"
+
+#. pseudo-header
+#: mail/em-format-html.c:1538 mail/em-format-quote.c:315
+#: mail/em-mailer-prefs.c:984
+msgid "Mailer"
+msgstr "Mailer"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1565
+msgid "<I> (%a, %R %Z)</I>"
+msgstr "<I> (%a, %R %Z)</I>"
+
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: mail/em-format-html.c:1568
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
 #. message-search popup match count string
 #: mail/em-format-html-display.c:405
 #, c-format
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: mail/em-format-html-display.c:638 mail/em-format-html.c:580
-msgid "Unsigned"
-msgstr "Unsigned"
-
 #: mail/em-format-html-display.c:638
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13510,10 +10808,6 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:581
-msgid "Valid signature"
-msgstr "Valid signature"
-
 #: mail/em-format-html-display.c:639
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13522,10 +10816,6 @@ 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:640 mail/em-format-html.c:582
-msgid "Invalid signature"
-msgstr "Invalid signature"
-
 #: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
@@ -13546,10 +10836,6 @@ msgstr ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:589
-msgid "Unencrypted"
-msgstr "Unencrypted"
-
 #: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13558,10 +10844,6 @@ msgstr ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:590
-msgid "Encrypted, weak"
-msgstr "Encrypted, weak"
-
 #: mail/em-format-html-display.c:648
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
@@ -13572,10 +10854,6 @@ 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:649 mail/em-format-html.c:591
-msgid "Encrypted"
-msgstr "Encrypted"
-
 #: mail/em-format-html-display.c:649
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
@@ -13584,10 +10862,6 @@ 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:650 mail/em-format-html.c:592
-msgid "Encrypted, strong"
-msgstr "Encrypted, strong"
-
 #: mail/em-format-html-display.c:650
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
@@ -13606,154 +10880,36 @@ msgstr "_View Certificate"
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: mail/em-format-html-display.c:1001
+#: mail/em-format-html-display.c:995
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completed on %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1009
+#: mail/em-format-html-display.c:1003
 msgid "Overdue:"
 msgstr "Overdue:"
 
-#: mail/em-format-html-display.c:1012
+#: mail/em-format-html-display.c:1006
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "by %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1059
+#: mail/em-format-html-display.c:1053
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: mail/em-format-html-display.c:1060
+#: mail/em-format-html-display.c:1054
 msgid "_Hide"
 msgstr "_Hide"
 
+#: mail/em-format-html-display.c:1298
+msgid "Attachment Button"
+msgstr "Attachment Button"
+
 #: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: mail/em-format-html.c:473 mail/em-format-html.c:475
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Retrieving `%s'"
-
-#: mail/em-format-html.c:583
-msgid "Valid signature but cannot verify sender"
-msgstr "Valid signature but cannot verify sender"
-
-#: mail/em-format-html.c:869
-msgid "Malformed external-body part."
-msgstr "Malformed external-body part."
-
-#: mail/em-format-html.c:899
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pointer to FTP site (%s)"
-
-#: mail/em-format-html.c:910
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Pointer to local file (%s) valid at site \"%s\""
-
-#: mail/em-format-html.c:912
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pointer to local file (%s)"
-
-#: mail/em-format-html.c:933
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pointer to remote data (%s)"
-
-#: mail/em-format-html.c:944
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pointer to unknown external data (\"%s\" type)"
-
-#: mail/em-format-html.c:1184
-msgid "Formatting message"
-msgstr "Formatting message"
-
-#: mail/em-format-html.c:1460 mail/em-format-quote.c:193 mail/em-format.c:819
-#: mail/em-mailer-prefs.c:83 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:326
-msgid "From"
-msgstr "From"
-
-#: mail/em-format-html.c:1460 mail/em-format-quote.c:193 mail/em-format.c:820
-#: mail/em-mailer-prefs.c:84
-msgid "Reply-To"
-msgstr "Reply-To"
-
-#: mail/em-format-html.c:1460 mail/em-format-quote.c:193 mail/em-format.c:821
-#: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "To"
-
-#: mail/em-format-html.c:1460 mail/em-format-quote.c:193 mail/em-format.c:822
-#: mail/em-mailer-prefs.c:86
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1460 mail/em-format-quote.c:193 mail/em-format.c:823
-#: mail/em-mailer-prefs.c:87
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: mail/em-format-html.c:1573 mail/em-format-quote.c:315
-#: mail/em-mailer-prefs.c:976
-msgid "Mailer"
-msgstr "Mailer"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1600
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1603
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1613 mail/em-format-quote.c:322 mail/em-format.c:825
-#: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Date"
-
-#: mail/em-format-html.c:1636 mail/em-format.c:826 mail/em-mailer-prefs.c:90
-msgid "Newsgroups"
-msgstr "Newsgroups"
-
-#: mail/em-format.c:1075
-#, c-format
-msgid "%s attachment"
-msgstr "%s attachment"
-
-#: mail/em-format.c:1114 mail/em-format.c:1247
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Could not parse S/MIME message: Unknown error"
-
-#: mail/em-format.c:1237
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Unsupported encryption type for multipart/encrypted"
-
-#: mail/em-format.c:1398
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Could not parse MIME message. Displaying as source."
-
-#: mail/em-format.c:1417
-msgid "Unsupported signature format"
-msgstr "Unsupported signature format"
-
-#: mail/em-format.c:1425
-msgid "Error verifying signature"
-msgstr "Error verifying signature"
-
-#: mail/em-format.c:1425
-msgid "Unknown error verifying signature"
-msgstr "Unknown error verifying signature"
-
-#: mail/em-junk-filter.c:87
+#: mail/em-junk-filter.c:110
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (built-in)"
 
@@ -13815,17 +10971,17 @@ msgstr "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Unable to copy POP3 keep-on-server data `%s': %s"
 
-#: mail/em-migrate.c:2415 mail/em-migrate.c:2427
+#: mail/em-migrate.c:2494 mail/em-migrate.c:2506
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Failed to create local mail storage `%s': %s"
 
-#: mail/em-migrate.c:2578
+#: mail/em-migrate.c:2657
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Unable to create local mail folders at `%s': %s"
 
-#: mail/em-migrate.c:2596
+#: mail/em-migrate.c:2675
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -13833,36 +10989,36 @@ msgstr ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 
-#: mail/em-popup.c:384
+#: mail/em-popup.c:386
 msgid "Save As..."
 msgstr "Save As..."
 
-#: mail/em-popup.c:403
+#: mail/em-popup.c:405
 #, c-format
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: mail/em-popup.c:497
+#: mail/em-popup.c:499
 msgid "Set as _Background"
 msgstr "Set as _Background"
 
-#: mail/em-popup.c:499
+#: mail/em-popup.c:501
 msgid "_Reply to sender"
 msgstr "_Reply to sender"
 
-#: mail/em-popup.c:551
+#: mail/em-popup.c:553
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: mail/em-popup.c:552
+#: mail/em-popup.c:554
 msgid "Se_nd message to..."
 msgstr "Se_nd message to..."
 
-#: mail/em-popup.c:553
+#: mail/em-popup.c:555
 msgid "_Add to Addressbook"
 msgstr "_Add to Addressbook"
 
-#: mail/em-popup.c:684
+#: mail/em-popup.c:686
 #, c-format
 msgid "Open in %s..."
 msgstr "Open in %s..."
@@ -13909,7 +11065,7 @@ msgid "Add address"
 msgstr "Add address"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1053
+#: mail/em-utils.c:1055
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
@@ -14384,33 +11540,59 @@ msgstr "port for starting user runned spamd"
 msgid "spamd port"
 msgstr "spamd port"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "Composer Preferences"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Configure mail preferences, including security and message display, here"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Configure spell-checking, signatures, and the message composer here"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "Configure your email accounts here"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution Mail"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution Mail accounts configuration control"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution Mail component"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolution Mail composer"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution Mail composer configuration control"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail preferences control"
+msgstr "Evolution Mail preferences control"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Mail Accounts"
+msgstr "Mail Accounts"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Mail Preferences"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+msgid "_Mail"
+msgstr "_Mail"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14458,17 +11640,45 @@ msgstr "Select folder to import into"
 
 #: mail/importers/evolution-mbox-importer.c:223
 #: mail/importers/evolution-outlook-importer.c:257
-#: mail/importers/mail-importer.c:227
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importing `%s'"
 
 #: mail/importers/evolution-outlook-importer.c:305
-#: mail/importers/mail-importer.c:141
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Importing mailbox"
 
-#: mail/importers/mail-importer.c:362
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:363
 #, c-format
 msgid "Scanning %s"
 msgstr "Scanning %s"
@@ -14562,10 +11772,6 @@ msgstr "Evolution is importing your old Pine data"
 msgid "Importing Pine data"
 msgstr "Importing Pine data"
 
-#: mail/importers/pine-importer.c:479
-msgid "Addressbook"
-msgstr "Addressbook"
-
 #: mail/importers/pine-importer.c:498
 msgid ""
 "Evolution has found Pine mail files.\n"
@@ -14578,45 +11784,6 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:156
-msgid "Evolution Account Editor"
-msgstr "Evolution Account Editor"
-
-#: mail/mail-account-gui.c:253
-#, c-format
-msgid ""
-"\n"
-"Please read carefully the license agreement\n"
-"for %s displayed below\n"
-"and tick the check box for accepting it\n"
-msgstr ""
-"\n"
-"Please read carefully the licence agreement\n"
-"for %s displayed below\n"
-"and tick the check box for accepting it\n"
-
-#: mail/mail-account-gui.c:259
-#, c-format
-msgid "%s License Agreement"
-msgstr "%s Licence Agreement"
-
-#: mail/mail-account-gui.c:964 mail/mail-config.glade.h:154
-msgid "_Host:"
-msgstr "_Host:"
-
-#: mail/mail-account-gui.c:968 mail/mail-config.glade.h:138
-msgid "User_name:"
-msgstr "User_name:"
-
-#: mail/mail-account-gui.c:972 mail/mail-config.glade.h:160
-msgid "_Path:"
-msgstr "_Path:"
-
-#: mail/mail-account-gui.c:1783
-msgid "Select individual file"
-msgstr "Select individual file"
-
 #: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
@@ -14641,15 +11808,15 @@ msgstr "%s mailing list"
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
-#: mail/mail-component.c:137
+#: mail/mail-component.c:139
 msgid "Drafts"
 msgstr "Drafts"
 
-#: mail/mail-component.c:138
+#: mail/mail-component.c:140
 msgid "Outbox"
 msgstr "Outbox"
 
-#: mail/mail-component.c:139
+#: mail/mail-component.c:141
 msgid "Sent"
 msgstr "Sent"
 
@@ -14726,82 +11893,10 @@ msgstr "Mail _Folder"
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: mail/mail-component.c:826
+#: mail/mail-component.c:841
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Failed upgrading Mail settings or folders."
 
-#: mail/mail-config-druid.c:363 mail/mail-config.glade.h:87
-msgid "Identity"
-msgstr "Identity"
-
-#: mail/mail-config-druid.c:365 mail/mail-config.glade.h:103
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-
-#: mail/mail-config-druid.c:371 mail/mail-config-druid.c:378
-msgid "Receiving Mail"
-msgstr "Receiving Mail"
-
-#: mail/mail-config-druid.c:373
-msgid ""
-"Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system administrator or Internet Service Provider."
-
-#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:104
-msgid "Please select among the following options"
-msgstr "Please select among the following options"
-
-#: mail/mail-config-druid.c:383 mail/mail-config.glade.h:120
-msgid "Sending Mail"
-msgstr "Sending Mail"
-
-#: mail/mail-config-druid.c:385 mail/mail-config.glade.h:102
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-
-#: mail/mail-config-druid.c:390 mail/mail-config.glade.h:36
-msgid "Account Management"
-msgstr "Account Management"
-
-#: mail/mail-config-druid.c:392 mail/mail-config.glade.h:144
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-msgstr ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Checking Service"
-
-#. FIXME: make this use e-error.
-#. * It has to be modal otherwise we can get nasty re-entrancy whilst waiting for the
-#. * subthread to complete.
-#. * FIXME: make this whole function async to deal with this issue
-#: mail/mail-config.c:977 mail/mail-config.c:981
-msgid "Connecting to server..."
-msgstr "Connecting to server..."
-
 #: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
 msgid "    "
 msgstr "    "
@@ -14811,8 +11906,8 @@ msgid " Ch_eck for Supported Types "
 msgstr " Ch_eck for Supported Types "
 
 #: mail/mail-config.glade.h:5
-msgid "<b>SSL is not supported in this build of evolution</b>"
-msgstr "<b>SSL is not supported in this build of evolution</b>"
+msgid "<b>SSL is not supported in this build of Evolution</b>"
+msgstr "<b>SSL is not supported in this build of Evolution</b>"
 
 #: mail/mail-config.glade.h:6
 msgid "<b>S_ignatures</b>"
@@ -14866,7 +11961,7 @@ msgstr "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Filter Options</span>"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:19 plugins/itip-formatter/itip-formatter.c:1637
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">General</span>"
 
@@ -14926,25 +12021,25 @@ msgstr "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Server Configuration</span>"
 
-#: mail/mail-config.glade.h:34
-msgid "A_lso encrypt to self when sending encrypted mail"
-msgstr "A_lso encrypt to self when sending encrypted mail"
-
 #: mail/mail-config.glade.h:35
-msgid "Account Editor"
-msgstr "Account Editor"
+msgid "Account Management"
+msgstr "Account Management"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:36
 msgid "Add Ne_w Signature..."
 msgstr "Add Ne_w Signature..."
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:37
 msgid "Add _Script"
 msgstr "Add _Script"
 
+#: mail/mail-config.glade.h:38
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "Al_ways sign outgoing messages when using this account"
+
 #: mail/mail-config.glade.h:39
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "Al_ways encrypt to myself when sending encrypted mail"
+msgid "Also encrypt to sel_f when sending encrypted mail"
+msgstr "Also encrypt to sel_f when sending encrypted mail"
 
 #: mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
@@ -14955,13 +12050,13 @@ msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Always _blind carbon-copy (bcc) to:"
 
 #: mail/mail-config.glade.h:42
-msgid "Always _sign outgoing messages when using this account"
-msgstr "Always _sign outgoing messages when using this account"
-
-#: mail/mail-config.glade.h:43
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Always _trust keys in my keyring when encrypting"
 
+#: mail/mail-config.glade.h:43
+msgid "Always encrypt to _myself when sending encrypted mail"
+msgstr "Always encrypt to _myself when sending encrypted mail"
+
 #: mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "Attach original message"
@@ -15007,18 +12102,26 @@ msgid "Checks incoming mail messages to be Junk"
 msgstr "Checks incoming mail messages to be Junk"
 
 #: mail/mail-config.glade.h:55
+msgid "Cle_ar"
+msgstr "Cle_ar"
+
+#: mail/mail-config.glade.h:56
+msgid "Clea_r"
+msgstr "Clea_r"
+
+#: mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "Colour for _misspelled words:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Colors"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
 msgstr "Confirm _when expunging a folder"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15034,103 +12137,107 @@ msgstr ""
 "\n"
 "Click \"Apply\" to save your settings."
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "De_fault"
 msgstr "De_fault"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "Default character e_ncoding:"
 msgstr "Default character e_ncoding:"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Defaults"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
+msgid "Digitally _sign outgoing messages (by default)"
+msgstr "Digitally _sign outgoing messages (by default)"
+
+#: mail/mail-config.glade.h:71
 msgid "Do not quote original message"
 msgstr "Do not quote original message"
 
-#: mail/mail-config.glade.h:69
-msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr "Don't sign _meeting requests (for Outlook compatibility)"
-
-#: mail/mail-config.glade.h:70 shell/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:72 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Done"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Drafts _Folder:"
 msgstr "Drafts _Folder:"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "Email Accounts"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "Email _Address:"
 msgstr "Email _Address:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Empty trash folders on e_xit"
 msgstr "Empty trash folders on e_xit"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
 msgstr "Encry_ption certificate:"
 
-#: mail/mail-config.glade.h:77
-msgid "Evolution Account Assistant"
-msgstr "Evolution Account Assistant"
+#: mail/mail-config.glade.h:79
+msgid "Encrypt out_going messages (by default)"
+msgstr "Encrypt out_going messages (by default)"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:81
 msgid "Execute Command..."
 msgstr "Execute Command..."
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Fi_xed-width:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Font Properties"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Format messages in _HTML"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:86
 msgid "HTML Mail"
 msgstr "HTML Mail"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:87
 msgid "Headers"
 msgstr "Headers"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:88
 msgid "Highlight _quotations with"
 msgstr "Highlight _quotations with"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:89
 msgid "I_nclude remote tests"
 msgstr "I_nclude remote tests"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
+msgid "Identity"
+msgstr "Identity"
+
+#: mail/mail-config.glade.h:92
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:95
 msgid "Mail Configuration"
 msgstr "Mail Configuration"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:97
 msgid "Mailbox location"
 msgstr "Mailbox location"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Message Composer"
 msgstr "Message Composer"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:99
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -15138,119 +12245,149 @@ msgstr ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Or_ganization:"
 msgstr "Or_ganization:"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid "Play sound file when new mail arri_ves"
 msgstr "Play sound file when new mail arri_ves"
 
 #: mail/mail-config.glade.h:105
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+
+#: mail/mail-config.glade.h:106
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+
+#: mail/mail-config.glade.h:107
+msgid "Please select among the following options"
+msgstr "Please select among the following options"
+
+#: mail/mail-config.glade.h:108
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Pr_ompt when sending messages with only Bcc recipients defined"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:109
 msgid "Quote original message"
 msgstr "Quote original message"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:110
 msgid "Quoted"
 msgstr "Quoted"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Re_member password"
 msgstr "Re_member password"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Re_ply-To:"
 msgstr "Re_ply-To:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Receiving Email"
 msgstr "Receiving Email"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Remember _password"
 msgstr "Remember _password"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
+msgid "S_elect..."
+msgstr "S_elect..."
+
+#: mail/mail-config.glade.h:116
 msgid "S_tandard Font:"
 msgstr "S_tandard Font:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:117
+msgid "Se_lect..."
+msgstr "Se_lect..."
+
+#: mail/mail-config.glade.h:118
 msgid "Security"
 msgstr "Security"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:119
 msgid "Select HTML fixed width font"
 msgstr "Select HTML fixed width font"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:120
 msgid "Select HTML fixed width font for printing"
 msgstr "Select HTML fixed width font for printing"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:121
 msgid "Select HTML variable width font"
 msgstr "Select HTML variable width font"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:122
 msgid "Select HTML variable width font for printing"
 msgstr "Select HTML variable width font for printing"
 
-#: mail/mail-config.glade.h:118
-msgid "Select..."
-msgstr "Select..."
-
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:123
 msgid "Sending Email"
 msgstr "Sending Email"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
+msgid "Sending Mail"
+msgstr "Sending Mail"
+
+#: mail/mail-config.glade.h:125
 msgid "Sent _Messages Folder:"
 msgstr "Sent _Messages Folder:"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:126
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver requires authentication"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:127
 msgid "Server _Type: "
 msgstr "Server _Type: "
 
-#: mail/mail-config.glade.h:124
-msgid "Si_gning certificate:"
-msgstr "Si_gning certificate:"
+#: mail/mail-config.glade.h:128
+msgid "Sig_ning certificate:"
+msgstr "Sig_ning certificate:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:129
 msgid "Signat_ure:"
 msgstr "Signat_ure:"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:130
 msgid "Signatures"
 msgstr "Signatures"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:131
 msgid "Specify _filename:"
 msgstr "Specify _filename:"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:132
 msgid "Spell Checking"
 msgstr "Spell Checking"
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:133
 msgid "T_erminal Font:"
 msgstr "T_erminal Font:"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:134
 msgid "T_ype: "
 msgstr "T_ype: "
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:135
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15260,7 +12397,7 @@ msgstr ""
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:138
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15270,7 +12407,7 @@ msgstr ""
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:140
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15278,11 +12415,15 @@ msgstr ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
+msgid "User_name:"
+msgstr "User_name:"
+
+#: mail/mail-config.glade.h:143
 msgid "V_ariable-width:"
 msgstr "V_ariable-width:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:144
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15292,83 +12433,101 @@ msgstr ""
 "\n"
 "Click \"Forward\" to begin. "
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:148
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+
+#: mail/mail-config.glade.h:149
 msgid "_Add Signature"
 msgstr "_Add Signature"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:150
 msgid "_Always load images from the Internet"
 msgstr "_Always load images from the Internet"
 
-#: mail/mail-config.glade.h:147
-msgid "_Digitally sign outgoing messages (by default)"
-msgstr "_Digitally sign outgoing messages (by default)"
-
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Do not notify me when new mail arrives"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
+msgid "_Don't sign meeting requests (for Outlook compatibility)"
+msgstr "_Don't sign meeting requests (for Outlook compatibility)"
+
+#: mail/mail-config.glade.h:154
 msgid "_Enable"
 msgstr "_Enable"
 
-#: mail/mail-config.glade.h:151
-msgid "_Encrypt outgoing messages (by default)"
-msgstr "_Encrypt outgoing messages (by default)"
-
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:155
 msgid "_Forward style:"
 msgstr "_Forward style:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:157
+msgid "_Host:"
+msgstr "_Host:"
+
+#: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "_Load images if sender is in address book"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:159
 msgid "_Make this my default account"
 msgstr "_Make this my default account"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:160
 msgid "_Mark messages as read after"
 msgstr "_Mark messages as read after"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:162
 msgid "_Never load images from the Internet"
 msgstr "_Never load images from the Internet"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
+msgid "_Path:"
+msgstr "_Path:"
+
+#: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Prompt when sending HTML messages to contacts that don't want them"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:165
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Prompt when sending messages with an empty subject line"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:166
 msgid "_Reply style:"
 msgstr "_Reply style:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:167
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:168
 msgid "_Show animated images"
 msgstr "_Show animated images"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:169
 msgid "_Use Secure Connection:"
 msgstr "_Use Secure Connection:"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:170
 msgid "_Use the same fonts as other applications"
 msgstr "_Use the same fonts as other applications"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:171
 msgid "color"
 msgstr "colour"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "description"
 
@@ -15395,51 +12554,47 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr "<span weight=\"bold\">Encryption</span>"
 
 #: mail/mail-dialogs.glade.h:10
-msgid "Accept License"
-msgstr "Accept Licence"
+msgid "Case _Sensitive"
+msgstr "Case _Sensitive"
 
 #: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "C_ompleted"
+msgid "Co_mpleted"
+msgstr "Co_mpleted"
 
-#: mail/mail-dialogs.glade.h:12
-msgid "Case Sensitive"
-msgstr "Case Sensitive"
+#: mail/mail-dialogs.glade.h:13
+msgid "F_ind:"
+msgstr "F_ind:"
 
 #: mail/mail-dialogs.glade.h:14
 msgid "Find in Message"
 msgstr "Find in Message"
 
-#: mail/mail-dialogs.glade.h:15
-msgid "Find:"
-msgstr "Find:"
-
-#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:295
+#: mail/mail-dialogs.glade.h:15 mail/message-tag-followup.c:295
 #: mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Flag to Follow Up"
 
-#: mail/mail-dialogs.glade.h:17
+#: mail/mail-dialogs.glade.h:16
 msgid "Folder Subscriptions"
 msgstr "Folder Subscriptions"
 
-#: mail/mail-dialogs.glade.h:18
+#: mail/mail-dialogs.glade.h:17
 msgid "License Agreement"
 msgstr "Licence Agreement"
 
-#: mail/mail-dialogs.glade.h:19
+#: mail/mail-dialogs.glade.h:18
 msgid "None Selected"
 msgstr "None Selected"
 
-#: mail/mail-dialogs.glade.h:20
+#: mail/mail-dialogs.glade.h:19
 msgid "S_erver:"
 msgstr "S_erver:"
 
-#: mail/mail-dialogs.glade.h:21
+#: mail/mail-dialogs.glade.h:20
 msgid "Security Information"
 msgstr "Security Information"
 
-#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+#: mail/mail-dialogs.glade.h:22 mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -15447,22 +12602,26 @@ msgstr ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 
-#: mail/mail-dialogs.glade.h:25
-msgid "Tick this to accept the license agreement"
-msgstr "Tick this to accept the licence agreement"
+#: mail/mail-dialogs.glade.h:24
+msgid "_Accept License"
+msgstr "_Accept Licence"
 
-#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#: mail/mail-dialogs.glade.h:25 mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Due By:"
 
-#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Flag:"
 
-#: mail/mail-dialogs.glade.h:28
+#: mail/mail-dialogs.glade.h:27
 msgid "_Subscribe"
 msgstr "_Subscribe"
 
+#: mail/mail-dialogs.glade.h:28
+msgid "_Tick this to accept the license agreement"
+msgstr "_Check this to accept the licence agreement"
+
 #: mail/mail-dialogs.glade.h:29
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
@@ -15516,6 +12675,7 @@ msgstr ""
 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:ask-send-html secondary
 #: mail/mail-errors.xml.h:12
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
@@ -15528,11 +12688,6 @@ msgstr ""
 "{0}\n"
 "Send anyway?"
 
-#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
-#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
-msgid "_Send"
-msgstr "_Send"
-
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
@@ -15553,6 +12708,7 @@ msgstr ""
 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:ask-send-only-bcc-contact secondary
 #: mail/mail-errors.xml.h:24
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
@@ -15667,6 +12823,7 @@ msgstr ""
 msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr "Your message with the subject \"{0}\" was not delivered."
 
+#. mail:camel-exception secondary
 #: mail/mail-errors.xml.h:59
 msgid ""
 "The message was sent via the \"sendmail\" external application.  Sendmail "
@@ -15935,6 +13092,7 @@ msgstr "Cannot add vFolder \"{0}\"."
 msgid "vFolders automatically updated."
 msgstr "vFolders automatically updated."
 
+#. mail:vfolder-updated secondary
 #: mail/mail-errors.xml.h:196
 msgid ""
 "The following vFolder(s):\n"
@@ -15954,6 +13112,7 @@ msgstr ""
 msgid "Mail filters automatically updated."
 msgstr "Mail filters automatically updated."
 
+#. mail:filter-updated secondary
 #: mail/mail-errors.xml.h:204
 msgid ""
 "The following filter rule(s):\n"
@@ -15988,6 +13147,7 @@ msgstr "You must name this vFolder."
 msgid "No sources selected."
 msgstr "No sources selected."
 
+#. mail:vfolder-no-source secondary
 #: mail/mail-errors.xml.h:220
 msgid ""
 "You must specify at least one folder as a source.\n"
@@ -16004,6 +13164,7 @@ msgstr ""
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problem migrating old mail folder \"{0}\"."
 
+#. mail:ask-migrate-existing secondary
 #: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
@@ -16033,6 +13194,7 @@ msgstr "_Append"
 msgid "Unable to read license file."
 msgstr "Unable to read licence file."
 
+#. mail:no-load-license secondary
 #: mail/mail-errors.xml.h:236
 msgid ""
 "Cannot read the license file \"{0}\", due to an\n"
@@ -16045,7 +13207,23 @@ msgstr ""
 "until\n"
 "      you can accept its licence."
 
+#. mail:checking-service title
 #: mail/mail-errors.xml.h:240
+msgid "Querying server"
+msgstr "Querying server"
+
+#. mail:checking-service primary
+#: mail/mail-errors.xml.h:242
+msgid "Please wait."
+msgstr "Please wait."
+
+#. mail:checking-service secondary
+#: mail/mail-errors.xml.h:244
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr "Querying server for a list of supported authentication mechanisms."
+
+#. mail:gw-accountsetup-error primary
+#: mail/mail-errors.xml.h:246
 msgid ""
 "Unable to connect to the GroupWise\n"
 "server."
@@ -16053,7 +13231,8 @@ msgstr ""
 "Unable to connect to the GroupWise\n"
 "server."
 
-#: mail/mail-errors.xml.h:243
+#. mail:gw-accountsetup-error secondary
+#: mail/mail-errors.xml.h:249
 msgid ""
 "\n"
 "Please check your account settings and try again.\n"
@@ -16061,25 +13240,25 @@ msgstr ""
 "\n"
 "Please check your account settings and try again.\n"
 
-#: mail/mail-folder-cache.c:807
+#: mail/mail-folder-cache.c:813
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:101
 msgid "Filtering Folder"
 msgstr "Filtering Folder"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:262
 msgid "Fetching Mail"
 msgstr "Fetching Mail"
 
-#: mail/mail-ops.c:554
+#: mail/mail-ops.c:556
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Failed to apply outgoing filters: %s"
 
-#: mail/mail-ops.c:579
+#: mail/mail-ops.c:581
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16088,110 +13267,114 @@ msgstr ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 
-#: mail/mail-ops.c:588
+#: mail/mail-ops.c:590
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Failed to append to local `Sent' folder: %s"
 
-#: mail/mail-ops.c:684
+#: mail/mail-ops.c:687
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
 
-#: mail/mail-ops.c:715
+#: mail/mail-ops.c:718
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Failed to send %d of %d messages"
 
-#: mail/mail-ops.c:719
+#: mail/mail-ops.c:720 mail/mail-send-recv.c:607
+msgid "Cancelled."
+msgstr "Cancelled."
+
+#: mail/mail-ops.c:722
 msgid "Complete."
 msgstr "Complete."
 
-#: mail/mail-ops.c:816
+#: mail/mail-ops.c:819
 msgid "Saving message to folder"
 msgstr "Saving message to folder"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moving messages to %s"
 
-#: mail/mail-ops.c:901
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copying messages to %s"
 
-#: mail/mail-ops.c:1127
+#: mail/mail-ops.c:1130
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
-#: mail/mail-ops.c:1170
+#: mail/mail-ops.c:1173
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opening folder %s"
 
-#: mail/mail-ops.c:1242
+#: mail/mail-ops.c:1245
 #, c-format
 msgid "Opening store %s"
 msgstr "Opening store %s"
 
-#: mail/mail-ops.c:1320
+#: mail/mail-ops.c:1323
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removing folder %s"
 
-#: mail/mail-ops.c:1414
+#: mail/mail-ops.c:1417
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Storing folder '%s'"
 
-#: mail/mail-ops.c:1479
+#: mail/mail-ops.c:1482
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: mail/mail-ops.c:1480
+#: mail/mail-ops.c:1483
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Storing account '%s'"
 
-#: mail/mail-ops.c:1535
+#: mail/mail-ops.c:1538
 msgid "Refreshing folder"
 msgstr "Refreshing folder"
 
-#: mail/mail-ops.c:1571 mail/mail-ops.c:1622
+#: mail/mail-ops.c:1574 mail/mail-ops.c:1625
 msgid "Expunging folder"
 msgstr "Expunging folder"
 
-#: mail/mail-ops.c:1619
+#: mail/mail-ops.c:1622
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Emptying trash in '%s'"
 
-#: mail/mail-ops.c:1620
+#: mail/mail-ops.c:1623
 msgid "Local Folders"
 msgstr "Local Folders"
 
-#: mail/mail-ops.c:1703
+#: mail/mail-ops.c:1706
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Retrieving message %s"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1778
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Retrieving %d message"
 msgstr[1] "Retrieving %d message(s)"
 
-#: mail/mail-ops.c:1861
+#: mail/mail-ops.c:1864
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Saving %d message"
 msgstr[1] "Saving %d messsage(s)"
 
-#: mail/mail-ops.c:1911
+#: mail/mail-ops.c:1914
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16200,7 +13383,7 @@ msgstr ""
 "Unable to create output file: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1939
+#: mail/mail-ops.c:1942
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16209,11 +13392,11 @@ msgstr ""
 "Error saving messages to: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2010
+#: mail/mail-ops.c:2013
 msgid "Saving attachment"
 msgstr "Saving attachment"
 
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2025
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16222,21 +13405,25 @@ msgstr ""
 "Cannot create output file: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2032
+#: mail/mail-ops.c:2035
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Could not write data: %s"
 
-#: mail/mail-ops.c:2180
+#: mail/mail-ops.c:2185
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnecting from %s"
 
-#: mail/mail-ops.c:2180
+#: mail/mail-ops.c:2185
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnecting to %s"
 
+#: mail/mail-ops.c:2301
+msgid "Checking Service"
+msgstr "Checking Service"
+
 #: mail/mail-send-recv.c:158
 msgid "Cancelling..."
 msgstr "Canceling..."
@@ -16256,19 +13443,19 @@ msgstr "Path: %s, Type: %s"
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:321
+#: mail/mail-send-recv.c:320
 msgid "Send & Receive Mail"
 msgstr "Send & Receive Mail"
 
-#: mail/mail-send-recv.c:324
+#: mail/mail-send-recv.c:323
 msgid "Cancel _All"
 msgstr "Cancel _All"
 
-#: mail/mail-send-recv.c:413
+#: mail/mail-send-recv.c:410
 msgid "Updating..."
 msgstr "Updating..."
 
-#: mail/mail-send-recv.c:413 mail/mail-send-recv.c:467
+#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:462
 msgid "Waiting..."
 msgstr "Waiting..."
 
@@ -16285,15 +13472,16 @@ msgstr "Enter Password"
 msgid "User canceled operation."
 msgstr "User cancelled operation."
 
-#: mail/mail-signature-editor.c:371
+#: mail/mail-signature-editor.c:372
 msgid "Edit signature"
 msgstr "Edit signature"
 
-#: mail/mail-signature-editor.c:411
+#: mail/mail-signature-editor.c:412
 msgid "Enter a name for this signature."
 msgstr "Enter a name for this signature."
 
-#: mail/mail-signature-editor.c:414
+#: mail/mail-signature-editor.c:415
+#: plugins/shared-folder/properties.glade.h:11
 msgid "Name:"
 msgstr "Name:"
 
@@ -16336,79 +13524,85 @@ msgstr "Updating vFolders for '%s:%s'"
 msgid "Updating vFolders for '%s'"
 msgstr "Updating vFolders for '%s'"
 
-#: mail/mail-vfolder.c:942
+#: mail/mail-vfolder.c:950
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:981
+#: mail/mail-vfolder.c:989
 msgid "Edit VFolder"
 msgstr "Edit VFolder"
 
-#: mail/mail-vfolder.c:1065
+#: mail/mail-vfolder.c:1073
 msgid "New VFolder"
 msgstr "New VFolder"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:999
 msgid "Unseen"
 msgstr "Unseen"
 
-#: mail/message-list.c:1002
+#: mail/message-list.c:1000
 msgid "Seen"
 msgstr "Seen"
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1001
 msgid "Answered"
 msgstr "Answered"
 
-#: mail/message-list.c:1004
+#: mail/message-list.c:1002
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: mail/message-list.c:1005
+#: mail/message-list.c:1003
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: mail/message-list.c:1009
+#: mail/message-list.c:1007
 msgid "Lowest"
 msgstr "Lowest"
 
-#: mail/message-list.c:1010
+#: mail/message-list.c:1008
 msgid "Lower"
 msgstr "Lower"
 
-#: mail/message-list.c:1014
+#: mail/message-list.c:1012
 msgid "Higher"
 msgstr "Higher"
 
-#: mail/message-list.c:1015
+#: mail/message-list.c:1013
 msgid "Highest"
 msgstr "Highest"
 
-#: mail/message-list.c:1338
+#: mail/message-list.c:1341
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1345
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: mail/message-list.c:1348 plugins/itip-formatter/itip-view.c:160
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: mail/message-list.c:1354
+#: mail/message-list.c:1357
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: mail/message-list.c:1366
+#: mail/message-list.c:1369
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1374
+#: mail/message-list.c:1377
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1376
+#: mail/message-list.c:1379
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3396
+#: mail/message-list.c:2044
+msgid "Message List"
+msgstr "Message List"
+
+#: mail/message-list.c:3409
 msgid "Generating message list"
 msgstr "Generating message list"
 
@@ -16508,39 +13702,843 @@ msgstr "Subject contains"
 msgid "Subject does not contain"
 msgstr "Subject does not contain"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Shell"
+#: plugins/backup-restore/backup.c:109
+msgid "Backup Evolution directory"
+msgstr "Back up Evolution directory"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution Test"
+#: plugins/backup-restore/backup.c:111
+msgid "Restore Evolution directory"
+msgstr "Restore Evolution directory"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution Test component"
+#: plugins/backup-restore/backup.c:113
+msgid "Check Evolution archive"
+msgstr "Check Evolution archive"
+
+#: plugins/backup-restore/backup.c:115
+msgid "Restart Evolution"
+msgstr "Restart Evolution"
+
+#: plugins/backup-restore/backup-restore.c:51
+msgid "Select name of Evolution archive"
+msgstr "Select name of Evolution archive"
+
+#: plugins/backup-restore/backup-restore.c:61
+msgid "_Restart Evolution after backup"
+msgstr "_Restart Evolution after backup"
+
+#: plugins/backup-restore/backup-restore.c:89
+msgid "Select Evolution archive to restore"
+msgstr "Select Evolution archive to restore"
+
+#: plugins/backup-restore/backup-restore.c:97
+msgid "_Restart Evolution after restore"
+msgstr "_Restart Evolution after restore"
+
+#: plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+msgid "Backup Settings..."
+msgstr "Back Up Settings..."
+
+#: plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+msgid "Backup and restore Evolution data and settings"
+msgstr "Back up and restore Evolution data and settings"
+
+#: plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+msgid "Restore Settings..."
+msgstr "Restore Settings..."
+
+#: plugins/bbdb/bbdb.c:387
+msgid "Automatic Contacts"
+msgstr "Automatic Contacts"
+
+#: plugins/bbdb/bbdb.c:396
+msgid "<span weight=\"bold\">Automatic Contacts</span>"
+msgstr "<span weight=\"bold\">Automatic Contacts</span>"
+
+#. Enable BBDB checkbox
+#: plugins/bbdb/bbdb.c:409
+msgid ""
+"_Automatically create entries in the addressbook when responding to mail"
+msgstr ""
+"_Automatically create entries in the addressbook when responding to mail"
+
+#: plugins/bbdb/bbdb.c:427
+msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
+msgstr "<span weight=\"bold\">Instant Messaging Contacts</span>"
+
+#. Enable Gaim Checkbox
+#: plugins/bbdb/bbdb.c:440
+msgid ""
+"Periodically synchronize contact information and images from my _instant "
+"messenger"
+msgstr ""
+"Periodically synchronize contact information and images from my _instant "
+"messenger"
+
+#. Synchronize now button.
+#: plugins/bbdb/bbdb.c:447
+msgid "Synchronize with _buddy list now"
+msgstr "Synchronize with _buddy list now"
+
+#: plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Unsubscribing from folder \"%s\""
+
+#: plugins/groupwise-account-setup/camel-gw-listener.c:436
+msgid "Checklist"
+msgstr "Checklist"
+
+#: plugins/itip-formatter/itip-formatter.c:697
+msgid "Unable to parse item"
+msgstr "Unable to parse item"
+
+#: plugins/itip-formatter/itip-formatter.c:750
+#, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr "Unable to send item to calendar '%s'.  %s"
+
+#: plugins/itip-formatter/itip-formatter.c:761
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr "Sent to calendar '%s' as accepted"
+
+#: plugins/itip-formatter/itip-formatter.c:765
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr "Sent to calendar '%s' as tentative"
+
+#: plugins/itip-formatter/itip-formatter.c:770
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr "Sent to calendar '%s' as declined"
+
+#: plugins/itip-formatter/itip-formatter.c:775
+#, c-format
+msgid "Sent to calendar '%s' as cancelled"
+msgstr "Sent to calendar '%s' as cancelled"
+
+#: plugins/itip-formatter/itip-formatter.c:825
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr "Attendee status could not be updated because the status is invalid"
+
+#: plugins/itip-formatter/itip-formatter.c:836
+#, c-format
+msgid "Unable to update attendee statusAttendee status updated. %s"
+msgstr ""
+"Unable to update attendee status.\n"
+"Attendee status updated. %s"
+
+#: plugins/itip-formatter/itip-formatter.c:840
+msgid "Attendee status updated"
+msgstr "Attendee status updated"
+
+#: plugins/itip-formatter/itip-formatter.c:965
+msgid "The calendar attached is not valid"
+msgstr "The calendar attached is not valid"
+
+#: plugins/itip-formatter/itip-formatter.c:966
+msgid ""
+"The message claims to contain a calendar, but the calendar is not valid "
+"iCalendar."
+msgstr ""
+"The message claims to contain a calendar, but the calendar is not valid "
+"iCalendar."
+
+#: plugins/itip-formatter/itip-formatter.c:1000
+#: plugins/itip-formatter/itip-formatter.c:1056
+msgid "The item in the calendar is not valid"
+msgstr "The item in the calendar is not valid"
+
+#: plugins/itip-formatter/itip-formatter.c:1001
+#: plugins/itip-formatter/itip-formatter.c:1057
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+"The message contains a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+
+#: plugins/itip-formatter/itip-formatter.c:1012
+msgid "The calendar attached contains multiple items"
+msgstr "The calendar attached contains multiple items"
+
+#: plugins/itip-formatter/itip-formatter.c:1013
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+
+#: plugins/itip-formatter/itip-formatter.c:1628
+msgid "Meetings and Tasks"
+msgstr "Meetings and Tasks"
+
+#. Delete message after acting
+#. FIXME Need a schema for this
+#: plugins/itip-formatter/itip-formatter.c:1651
+msgid "_Delete message after acting"
+msgstr "_Delete message after acting"
+
+#: plugins/itip-formatter/itip-formatter.c:1661
+msgid "<span weight=\"bold\">Conflict Search</span>"
+msgstr "<span weight=\"bold\">Conflict Search</span>"
+
+#. Source selector
+#: plugins/itip-formatter/itip-formatter.c:1674
+msgid "Select the calendars to search for meeting conflicts"
+msgstr "Select the calendars to search for meeting conflicts"
+
+#. strftime format of a weekday and a date.
+#: plugins/itip-formatter/itip-view.c:146 ui/evolution-calendar.xml.h:34
+#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:450
+msgid "Today"
+msgstr "Today"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:151
+msgid "Today %H:%M"
+msgstr "Today %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: plugins/itip-formatter/itip-view.c:155
+msgid "Today %H:%M:%S"
+msgstr "Today %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: plugins/itip-formatter/itip-view.c:164
+msgid "Today %l:%M:%S %p"
+msgstr "Today %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: plugins/itip-formatter/itip-view.c:172
+#: plugins/itip-formatter/itip-view.c:224
+msgid "%A, %B %e"
+msgstr "%A, %e %B"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:177
+#: plugins/itip-formatter/itip-view.c:229
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %e %B %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: plugins/itip-formatter/itip-view.c:181
+#: plugins/itip-formatter/itip-view.c:233
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %e %B %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:186
+#: plugins/itip-formatter/itip-view.c:238
+msgid "%A, %B %e %l:%M %p"
+msgstr "%A, %e %B %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: plugins/itip-formatter/itip-view.c:190
+#: plugins/itip-formatter/itip-view.c:242
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %e %B %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: plugins/itip-formatter/itip-view.c:198
+#, c-format
+msgid "%A"
+msgstr "%A"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:203
+msgid "%A %H:%M"
+msgstr "%A %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: plugins/itip-formatter/itip-view.c:207
+msgid "%A %H:%M:%S"
+msgstr "%A %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:212
+msgid "%A %l:%M %p"
+msgstr "%A %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: plugins/itip-formatter/itip-view.c:216
+msgid "%A %l:%M:%S %p"
+msgstr "%A %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: plugins/itip-formatter/itip-view.c:248
+msgid "%A, %B %e, %Y"
+msgstr "%A, %e %B, %Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:253
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%A, %e %B, %Y %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: plugins/itip-formatter/itip-view.c:257
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%A, %e %B, %Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: plugins/itip-formatter/itip-view.c:262
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%A, %e %B, %Y %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: plugins/itip-formatter/itip-view.c:266
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%A, %e %B, %Y %l:%M:%S %p"
+
+#: plugins/itip-formatter/itip-view.c:291
+#, c-format
+msgid "<b>%s</b> through %s has published the following meeting information:"
+msgstr "<b>%s</b> through %s has published the following meeting information:"
+
+#: plugins/itip-formatter/itip-view.c:293
+#, c-format
+msgid "<b>%s</b> has published the following meeting information:"
+msgstr "<b>%s</b> has published the following meeting information:"
+
+#: plugins/itip-formatter/itip-view.c:298
+#, c-format
+msgid "<b>%s</b> requests the presence of %s at the following meeting:"
+msgstr "<b>%s</b> requests the presence of %s at the following meeting:"
+
+#: plugins/itip-formatter/itip-view.c:301
+#, c-format
+msgid "<b>%s</b> through %s requests your presence at the following meeting:"
+msgstr "<b>%s</b> through %s requests your presence at the following meeting:"
+
+#: plugins/itip-formatter/itip-view.c:303
+#, c-format
+msgid "<b>%s</b> requests your presence at the following meeting:"
+msgstr "<b>%s</b> requests your presence at the following meeting:"
+
+#: plugins/itip-formatter/itip-view.c:309
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+msgstr "<b>%s</b> through %s wishes to add to an existing meeting:"
+
+#: plugins/itip-formatter/itip-view.c:311
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting:"
+msgstr "<b>%s</b> wishes to add to an existing meeting:"
+
+#: plugins/itip-formatter/itip-view.c:314
+#, c-format
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgstr ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
+
+#: plugins/itip-formatter/itip-view.c:317
+#, c-format
+msgid "<b>%s</b> has sent back the following meeting response:"
+msgstr "<b>%s</b> has sent back the following meeting response:"
+
+#: plugins/itip-formatter/itip-view.c:321
+#, c-format
+msgid "<b>%s</b> through %s has cancelled the following meeting:"
+msgstr "<b>%s</b> through %s has cancelled the following meeting:"
+
+#: plugins/itip-formatter/itip-view.c:323
+#, c-format
+msgid "<b>%s</b> has cancelled the following meeting."
+msgstr "<b>%s</b> has cancelled the following meeting."
+
+#: plugins/itip-formatter/itip-view.c:326
+#, c-format
+msgid "<b>%s</b> has proposed the following meeting changes."
+msgstr "<b>%s</b> has proposed the following meeting changes."
+
+#: plugins/itip-formatter/itip-view.c:330
+#, c-format
+msgid "<b>%s</b> through %s has declined the following meeting changes:"
+msgstr "<b>%s</b> through %s has declined the following meeting changes:"
+
+#: plugins/itip-formatter/itip-view.c:332
+#, c-format
+msgid "<b>%s</b> has declined the following meeting changes."
+msgstr "<b>%s</b> has declined the following meeting changes."
+
+#: plugins/itip-formatter/itip-view.c:359
+#, c-format
+msgid "<b>%s</b> through %s has published the following task:"
+msgstr "<b>%s</b> through %s has published the following task:"
+
+#: plugins/itip-formatter/itip-view.c:361
+#, c-format
+msgid "<b>%s</b> has published the following task:"
+msgstr "<b>%s</b> has published the following task:"
+
+#: plugins/itip-formatter/itip-view.c:366
+#, c-format
+msgid "<b>%s</b> requests the assignment of %s to the following task:"
+msgstr "<b>%s</b> requests the assignment of %s to the following task:"
+
+#: plugins/itip-formatter/itip-view.c:369
+#, c-format
+msgid "<b>%s</b> through %s has assigned you a task:"
+msgstr "<b>%s</b> through %s has assigned you a task:"
+
+#: plugins/itip-formatter/itip-view.c:371
+#, c-format
+msgid "<b>%s</b> has assigned you a task:"
+msgstr "<b>%s</b> has assigned you a task:"
+
+#: plugins/itip-formatter/itip-view.c:377
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing task:"
+msgstr "<b>%s</b> through %s wishes to add to an existing task:"
+
+#: plugins/itip-formatter/itip-view.c:379
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task:"
+msgstr "<b>%s</b> wishes to add to an existing task:"
+
+#: plugins/itip-formatter/itip-view.c:382
+#, c-format
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+"<b>%s</b> wishes to receive the latest information for the following "
+"assigned task:"
+
+#: plugins/itip-formatter/itip-view.c:385
+#, c-format
+msgid "<b>%s</b> has sent back the following assigned task response:"
+msgstr "<b>%s</b> has sent back the following assigned task response:"
+
+#: plugins/itip-formatter/itip-view.c:389
+#, c-format
+msgid "<b>%s</b> through %s has cancelled the following assigned task:"
+msgstr "<b>%s</b> through %s has cancelled the following assigned task:"
+
+#: plugins/itip-formatter/itip-view.c:391
+#, c-format
+msgid "<b>%s</b> has cancelled the following assigned task:"
+msgstr "<b>%s</b> has cancelled the following assigned task:"
+
+#: plugins/itip-formatter/itip-view.c:394
+#, c-format
+msgid "<b>%s</b> has proposed the following task assignment changes:"
+msgstr "<b>%s</b> has proposed the following task assignment changes:"
+
+#: plugins/itip-formatter/itip-view.c:398
+#, c-format
+msgid "<b>%s</b> through %s has declined the following assigned task:"
+msgstr "<b>%s</b> through %s has declined the following assigned task:"
+
+#: plugins/itip-formatter/itip-view.c:400
+#, c-format
+msgid "<b>%s</b> has declined the following assigned task:"
+msgstr "<b>%s</b> has declined the following assigned task:"
+
+#. Comment
+#: plugins/itip-formatter/itip-view.c:846
+#: plugins/itip-formatter/itip-view.c:896
+msgid "Comment:"
+msgstr "Comment:"
+
+#: plugins/itip-formatter/itip-view.c:1573
+msgid "_Calendar:"
+msgstr "_Calendar:"
+
+#. org.gnome.mailing-list-actions:no-header primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
+msgid "Action not available"
+msgstr "Action not available"
+
+#. org.gnome.mailing-list-actions:no-header secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
+msgid ""
+"This message does not contain the header information required for this "
+"action."
+msgstr ""
+"This message does not contain the header information required for this "
+"action."
+
+#. org.gnome.mailing-list-actions:posting-not-allowed primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
+msgid "Posting not allowed"
+msgstr "Posting not allowed"
+
+#. org.gnome.mailing-list-actions:posting-not-allowed secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+
+#. org.gnome.mailing-list-actions:ask-send-message primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
+msgid "Send e-mail message to mailing list?"
+msgstr "Send e-mail message to mailing list?"
+
+#. org.gnome.mailing-list-actions:ask-send-message secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
+msgid ""
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
+msgstr ""
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or preview and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:15
+msgid "_Send message"
+msgstr "_Send message"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
+msgid "_Edit message"
+msgstr "_Edit message"
+
+#. org.gnome.mailing-list-actions:malformed-header primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
+msgid "Malformed header"
+msgstr "Malformed header"
+
+#. org.gnome.mailing-list-actions:malformed-header secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+
+#. org.gnome.mailing-list-actions:no-action primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
+msgid "No e-mail action"
+msgstr "No e-mail action"
+
+#. org.gnome.mailing-list-actions:no-action secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
+msgid ""
+"The action could not be performed. This means the header for this action did "
+"not contain any action we could handle.\n"
+"\n"
+"Header: {0}"
+msgstr ""
+"The action could not be performed. This means the header for this action did "
+"not contain any action we could handle.\n"
+"\n"
+"Header: {0}"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+msgid "Contact list _owner"
+msgstr "Contact list _owner"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "Contact the owner of the mailing list this message belongs to"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+msgid "Get an archive of the list this message belongs to"
+msgstr "Get an archive of the list this message belongs to"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+msgid "Get information about the usage of the list this message belongs to"
+msgstr "Get information about the usage of the list this message belongs to"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
+msgid "Get list _archive"
+msgstr "Get list _archive"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+msgid "Get list _usage information"
+msgstr "Get list _usage information"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
+msgid "Mailing _List"
+msgstr "Mailing _List"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "Post a message to the mailing list this message belongs to"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "Subscribe to the mailing list this message belongs to"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
+msgid "Unsubscribe to the mailing list this message belongs to"
+msgstr "Unsubscribe to the mailing list this message belongs to"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+msgid "_Post message to list"
+msgstr "_Post message to list"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+msgid "_Subscribe to list"
+msgstr "_Subscribe to list"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+msgid "_Un-subscribe to list"
+msgstr "_Un-subscribe to list"
+
+#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+msgid "Enable and disable plugins"
+msgstr "Enable and disable plugins"
+
+#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
+msgid "Manage Plugins..."
+msgstr "Manage Plugins..."
+
+#: plugins/plugin-manager/plugin-manager.c:45
+msgid "Author(s)"
+msgstr "Author(s)"
+
+#: plugins/plugin-manager/plugin-manager.c:46
+msgid "Id"
+msgstr "ID"
+
+#: plugins/plugin-manager/plugin-manager.c:47
+msgid "Path"
+msgstr "Path"
+
+#: plugins/plugin-manager/plugin-manager.c:48
+msgid "Description"
+msgstr "Description"
+
+#. Setup the ui
+#: plugins/plugin-manager/plugin-manager.c:188
+msgid "Plugin Manager"
+msgstr "Plugin Manager"
+
+#: plugins/plugin-manager/plugin-manager.c:201
+msgid "Note: Some changes will not take effect until restart"
+msgstr "Note: Some changes will not take effect until restart"
+
+#: plugins/plugin-manager/plugin-manager.c:210
+msgid "Plugin"
+msgstr "Plugin"
+
+#: plugins/prefer-plain/prefer-plain.c:105
+msgid "Show HTML if present"
+msgstr "Show HTML if present"
+
+#: plugins/prefer-plain/prefer-plain.c:106
+msgid "Prefer PLAIN"
+msgstr "Prefer PLAIN"
+
+#: plugins/prefer-plain/prefer-plain.c:107
+msgid "Only ever show PLAIN"
+msgstr "Only ever show PLAIN"
+
+#: plugins/prefer-plain/prefer-plain.c:150
+msgid "HTML Mode"
+msgstr "HTML Mode"
+
+#: plugins/save-attachments/org-gnome-save-attachments.xml.h:1
+msgid "Save Attachments ..."
+msgstr "Save Attachments ..."
+
+#: plugins/save-attachments/org-gnome-save-attachments.xml.h:2
+msgid "Save all attachments"
+msgstr "Save all attachments"
+
+#: plugins/save-attachments/save-attachments.c:331
+msgid "Select save base name"
+msgstr "Select save base name"
+
+#: plugins/save-attachments/save-attachments.c:351
+msgid "MIME Type"
+msgstr "MIME Type"
+
+#: plugins/save-attachments/save-attachments.c:359
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr "Save"
+
+#: plugins/save-calendar/csv-format.c:167
+#, c-format
+msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
+msgstr "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
+
+#: plugins/save-calendar/csv-format.c:370
+#, c-format
+msgid ""
+"Uid%sSummary%sDescription List%sCategories List%sComment List%sCompleted%"
+"sCreated%sContact List%sStart%sEnd%sDue%sPercent Done%sPriority%sUrl%"
+"sAttendees List%sLocation%sModified%s"
+msgstr ""
+"UID%sSummary%sDescription List%sCategories List%sComment List%sCompleted%"
+"sCreated%sContact List%sStart%sEnd%sDue%sPercent Done%sPriority%sURL%"
+"sAttendees List%sLocation%sModified%s"
+
+#: plugins/save-calendar/csv-format.c:519
+msgid "Advanced options for the CSV format"
+msgstr "Advanced options for the CSV format"
+
+#: plugins/save-calendar/csv-format.c:526
+msgid "Prepend a header"
+msgstr "Prepend a header"
+
+#: plugins/save-calendar/csv-format.c:535
+msgid "Value delimiter:"
+msgstr "Value delimiter:"
+
+#: plugins/save-calendar/csv-format.c:541
+msgid "Record delimiter:"
+msgstr "Record delimiter:"
+
+#: plugins/save-calendar/csv-format.c:547
+msgid "Encapsulate values with:"
+msgstr "Encapsulate values with:"
+
+#: plugins/save-calendar/csv-format.c:569
+msgid "Comma separated value format (.csv)"
+msgstr "Comma separated value format (.csv)"
+
+#: plugins/save-calendar/ical-format.c:120
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar format (.ics)"
+
+#: plugins/save-calendar/rdf-format.c:390
+msgid "RDF format (.rdf)"
+msgstr "RDF format (.rdf)"
+
+#: plugins/save-calendar/save-calendar.c:172
+#: plugins/save-calendar/save-calendar.c:182
+msgid "Select destination file"
+msgstr "Select destination file"
+
+#: plugins/save-calendar/save-calendar.c:217
+#, c-format
+msgid ""
+"The suggested filename extension of this filetype (%s) is unused in the "
+"chosen filename. Do you want to continue?"
+msgstr ""
+"The suggested filename extension of this filetype (%s) is unused in the "
+"chosen filename. Do you want to continue?"
+
+#: plugins/shared-folder/properties.glade.h:1
+msgid ""
+"\n"
+"Share List"
+msgstr ""
+"\n"
+"Share List"
+
+#: plugins/shared-folder/properties.glade.h:4
+msgid "Ad_d"
+msgstr "Ad_d"
+
+#: plugins/shared-folder/properties.glade.h:5
+msgid "Additional Access"
+msgstr "Additional Access"
+
+#: plugins/shared-folder/properties.glade.h:7
+msgid "Delet_e"
+msgstr "Delet_e"
+
+#: plugins/shared-folder/properties.glade.h:8
+msgid "Edi_t"
+msgstr "Edi_t"
+
+#: plugins/shared-folder/properties.glade.h:10
+msgid "Message"
+msgstr "Message"
+
+#: plugins/shared-folder/properties.glade.h:12
+msgid "Sen_d Custom Notification"
+msgstr "Sen_d Custom Notification"
+
+#: plugins/shared-folder/properties.glade.h:13
+msgid "Shared Folder Notification"
+msgstr "Shared Folder Notification"
+
+#: plugins/shared-folder/properties.glade.h:15
+msgid "The participants will receive the following notification.\n"
+msgstr "The participants will receive the following notification.\n"
+
+#: plugins/shared-folder/properties.glade.h:18
+msgid "_Not Shared"
+msgstr "_Not Shared"
+
+#: plugins/shared-folder/properties.glade.h:20
+msgid "_Shared With ..."
+msgstr "_Shared With ..."
+
+#: plugins/shared-folder/properties.glade.h:21
+msgid "_Sharing"
+msgstr "_Sharing"
+
+#: plugins/shared-folder/share-folder-common.c:303
+msgid "Users"
+msgstr "Users"
+
+#: plugins/shared-folder/share-folder-common.c:304
+msgid "Enter the users and set permissions"
+msgstr "Enter the users and set permissions"
+
+#: plugins/shared-folder/share-folder-common.c:382
+msgid "Sharing"
+msgstr "Sharing"
+
+#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
+#: plugins/subject-thread/subject-thread.c:54
+msgid "Fall back to threading messages by sub_ject"
+msgstr "Fall back to threading messages by sub_ject"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
+msgid "Button style"
+msgstr "Button style"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+msgid "Buttons are visible"
+msgstr "Buttons are visible"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "Default width of the folder bar pane"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:2
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window height"
 msgstr "Default window height"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:3
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window width"
 msgstr "Default window width"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Evolution configuration version"
 msgstr "Evolution configuration version"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID or alias of the component to be shown by default at start-up."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
 "If set to true, Evolution will start up in offline mode instead of online "
 "mode."
@@ -16548,7 +14546,7 @@ msgstr ""
 "If set to true, Evolution will start up in offline mode instead of online "
 "mode."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
 "If set to true, the warning dialog in development versions of Evolution is "
 "not displayed."
@@ -16556,29 +14554,43 @@ msgstr ""
 "If set to true, the warning dialogue in development versions of Evolution is "
 "not displayed."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Last upgraded Evolution configuration version"
 msgstr "Last upgraded Evolution configuration version"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid ""
+"The style of the displayed buttons. Can be text, icons, both, toolbar. If "
+"toolbar is set, the style of the toolbar is followed as determined by the "
+"GNOME setting."
+msgstr ""
+"The style of the displayed buttons. Can be text, icons, both, toolbar. If "
+"toolbar is set, the style of the toolbar is followed as determined by the "
+"GNOME setting."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Toolbar is visible"
 msgstr "Toolbar is visible"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Whether Evolution should start up in offline mode"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:15
+msgid "Whether the buttons should be visible."
+msgstr "Whether the buttons should be visible."
+
+#: shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "Whether the toolbar should be visible."
 msgstr "Whether the toolbar should be visible."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:13
+#: shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "Whether to skip the development warning dialog"
 msgstr "Whether to skip the development warning dialogue"
 
@@ -16594,7 +14606,36 @@ msgstr "Active Connections"
 msgid "Click OK to close these connections and go offline"
 msgstr "Click OK to close these connections and go offline"
 
-#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
+#: shell/e-shell.c:597
+msgid "Uknown system error."
+msgstr "Uknown system error."
+
+#: shell/e-shell.c:805 shell/e-shell.c:806
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: shell/e-shell.c:1249 widgets/misc/e-cell-date-edit.c:256
+msgid "OK"
+msgstr "OK"
+
+#: shell/e-shell.c:1251
+msgid "Invalid arguments"
+msgstr "Invalid arguments"
+
+#: shell/e-shell.c:1253
+msgid "Cannot register on OAF"
+msgstr "Cannot register on OAF"
+
+#: shell/e-shell.c:1255
+msgid "Configuration Database not found"
+msgstr "Configuration Database not found"
+
+#: shell/e-shell.c:1257
+msgid "Generic error"
+msgstr "Generic error"
+
+#: shell/e-shell-folder-title-bar.c:586 shell/e-shell-folder-title-bar.c:587
 msgid "(Untitled)"
 msgstr "(Untitled)"
 
@@ -16731,11 +14772,11 @@ msgstr "Unable to execute importer"
 msgid "_Import"
 msgstr "_Import"
 
-#: shell/e-shell-offline-handler.c:594
+#: shell/e-shell-offline-handler.c:589
 msgid "Closing connections..."
 msgstr "Closing connections..."
 
-#: shell/e-shell-settings-dialog.c:326
+#: shell/e-shell-settings-dialog.c:318
 msgid "Evolution Settings"
 msgstr "Evolution Settings"
 
@@ -16777,6 +14818,23 @@ msgstr "Folder name cannot contain the character \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' and '..' are reserved folder names."
 
+#: shell/e-shell-window.c:341
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Evolution is currently online.  Click on this button to work offline."
+
+#: shell/e-shell-window.c:349
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution is in the process of going offline."
+
+#: shell/e-shell-window.c:356
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Evolution is currently offline.  Click on this button to work online."
+
+#: shell/e-shell-window.c:708
+#, c-format
+msgid "Switch to %s"
+msgstr "Switch to %s"
+
 #: shell/e-shell-window-commands.c:67
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "The GNOME Pilot tools do not appear to be installed on this system."
@@ -16805,65 +14863,19 @@ msgstr "Adam Weinberger <adamw@FreeBSD.org>"
 msgid "Groupware Suite"
 msgstr "Groupware Suite"
 
-#: shell/e-shell-window-commands.c:679
+#: shell/e-shell-window-commands.c:680
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: shell/e-shell-window-commands.c:692 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:693 ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: shell/e-shell-window-commands.c:705 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:706 ui/evolution.xml.h:34
 msgid "Work Offline"
 msgstr "Work Offline"
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Evolution is currently online.  Click on this button to work offline."
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution is in the process of going offline."
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution is currently offline.  Click on this button to work online."
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr "Switch to %s"
-
-#: shell/e-shell.c:589
-msgid "Uknown system error."
-msgstr "Uknown system error."
-
-#: shell/e-shell.c:797 shell/e-shell.c:798
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: shell/e-shell.c:1220 widgets/misc/e-cell-date-edit.c:265
-msgid "OK"
-msgstr "OK"
-
-#: shell/e-shell.c:1222
-msgid "Invalid arguments"
-msgstr "Invalid arguments"
-
-#: shell/e-shell.c:1224
-msgid "Cannot register on OAF"
-msgstr "Cannot register on OAF"
-
-#: shell/e-shell.c:1226
-msgid "Configuration Database not found"
-msgstr "Configuration Database not found"
-
-#: shell/e-shell.c:1228
-msgid "Generic error"
-msgstr "Generic error"
-
-#: shell/e-user-creatable-items-handler.c:691
+#: shell/e-user-creatable-items-handler.c:685
 msgid "New"
 msgstr "New"
 
@@ -16885,27 +14897,25 @@ msgstr "Welcome"
 
 #: shell/evolution-startup-wizard.glade.h:6
 msgid ""
-"Welcome to Evolution. The next few screens will allow\n"
-"Evolution to connect to your email accounts, and to import\n"
-"files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"Welcome to Evolution. The next few screens will allow\n"
-"Evolution to connect to your email accounts, and to import\n"
-"files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 
-#: shell/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:9
 msgid ""
-"You have successfully entered all of the information\n"
-"needed to set up Evolution. \n"
+"You have successfully entered all of the information needed to set up "
+"Evolution. \n"
 "\n"
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
-"You have successfully entered all of the information\n"
-"needed to set up Evolution. \n"
+"You have successfully entered all of the information needed to set up "
+"Evolution. \n"
 "\n"
 "Click the \"Apply\" button to save your settings. "
 
@@ -16921,6 +14931,18 @@ msgstr "_Test"
 msgid "Create a new test item"
 msgstr "Create a new test item"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution Shell"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution Test"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution Test component"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Click \"Import\" to begin importing the file into Evolution. "
@@ -16979,8 +15001,9 @@ msgstr "Don't ask me again"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution can import data from the following files:"
 
-#: shell/main.c:226
-#, c-format
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:237
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -17014,7 +15037,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: shell/main.c:250
+#: shell/main.c:261
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17022,35 +15045,43 @@ msgstr ""
 "Thanks\n"
 "The Evolution Team\n"
 
-#: shell/main.c:257
+#: shell/main.c:268
 msgid "Don't tell me again"
 msgstr "Don't tell me again"
 
-#: shell/main.c:462
+#: shell/main.c:473
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution activating the specified component"
 
-#: shell/main.c:464
+#: shell/main.c:475
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
-#: shell/main.c:466
+#: shell/main.c:477
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: shell/main.c:469
-msgid "Forcibly shut down all evolution components"
-msgstr "Forcibly shut down all evolution components"
+#: shell/main.c:480
+msgid "Forcibly shut down all Evolution components"
+msgstr "Forcibly shut down all Evolution components"
 
-#: shell/main.c:473
+#: shell/main.c:484
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forcibly re-migrate from Evolution 1.4"
 
-#: shell/main.c:476
+#: shell/main.c:487
 msgid "Send the debugging output of all components to a file."
 msgstr "Send the debugging output of all components to a file."
 
-#: shell/main.c:507
+#: shell/main.c:490
+msgid "Disable the mono plugin environment."
+msgstr "Disable the mono plugin environment."
+
+#: shell/main.c:493
+msgid "Disable loading of any plugins."
+msgstr "Disable loading of any plugins."
+
+#: shell/main.c:524
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17064,6 +15095,7 @@ msgstr ""
 msgid "Insufficient disk space for upgrade."
 msgstr "Insufficient disk space for upgrade."
 
+#. shell:upgrade-nospace secondary
 #: shell/shell-errors.xml.h:4
 msgid ""
 "Upgrading your data and settings will require upto {0} of disk space, but "
@@ -17078,6 +15110,7 @@ msgstr ""
 "You will need to make more space available in your home directory before you "
 "can continue."
 
+#. shell:upgrade-failed primary
 #: shell/shell-errors.xml.h:8
 msgid ""
 "Upgrade from previous version failed:\n"
@@ -17086,6 +15119,7 @@ msgstr ""
 "Upgrade from previous version failed:\n"
 "{0}"
 
+#. shell:upgrade-failed secondary
 #: shell/shell-errors.xml.h:11
 msgid ""
 "{1}\n"
@@ -17108,6 +15142,7 @@ msgstr "Continue"
 msgid "Delete old data from version {0}?"
 msgstr "Delete old data from version {0}?"
 
+#. shell:upgrade-remove-1-4 secondary
 #: shell/shell-errors.xml.h:21
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
@@ -17138,6 +15173,7 @@ msgstr "_Keep Data"
 msgid "Really delete old data?"
 msgstr "Really delete old data?"
 
+#. shell:upgrade-remove-1-4-confirm secondary
 #: shell/shell-errors.xml.h:32
 msgid ""
 "The entire contents of the \"evolution\" directory is about to be be "
@@ -17172,6 +15208,7 @@ msgstr "Cannot start Evolution"
 msgid "Evolution can not start."
 msgstr "Evolution cannot start."
 
+#. shell:noshell secondary
 #: shell/shell-errors.xml.h:43
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
@@ -17182,6 +15219,7 @@ msgstr ""
 "\n"
 "Click help for details"
 
+#. shell:noshell-reason secondary
 #: shell/shell-errors.xml.h:51
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
@@ -17207,26 +15245,6 @@ msgstr ""
 "\n"
 "Edit trust settings:"
 
-#: smime/gui/cert-trust-dialog.c:145
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-"Because you trust the certificate authority that issued this certificate, "
-"you then trust the authenticity of this certificate unless otherwise "
-"indicated here"
-
-#: smime/gui/cert-trust-dialog.c:149
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, you then do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-
 #: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:142
 #: smime/gui/certificate-manager.c:375 smime/gui/certificate-manager.c:383
 #: smime/gui/certificate-manager.c:595 smime/gui/certificate-manager.c:603
@@ -17260,6 +15278,26 @@ msgstr "E-Mail Address"
 msgid "Certificate Viewer: %s"
 msgstr "Certificate Viewer: %s"
 
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+"Because you trust the certificate authority that issued this certificate, "
+"you then trust the authenticity of this certificate unless otherwise "
+"indicated here"
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, you then do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+
 #: smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
@@ -17275,7 +15313,7 @@ msgid "Enter new password"
 msgstr "Enter new password"
 
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:121
+#: smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -17284,7 +15322,7 @@ msgstr ""
 "Issued to:\n"
 "  Subject: %s\n"
 
-#: smime/gui/e-cert-selector.c:122
+#: smime/gui/e-cert-selector.c:120
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -17293,7 +15331,7 @@ msgstr ""
 "Issued by:\n"
 "  Subject: %s\n"
 
-#: smime/gui/e-cert-selector.c:169
+#: smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Select certificate"
 
@@ -17475,11 +15513,6 @@ msgstr "_Edit CA Trust"
 msgid "dialog1"
 msgstr "dialogue1"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-msgid "Certificate already exists"
-msgstr "Certificate already exists"
-
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -17679,6 +15712,11 @@ msgstr "Subject Unique ID"
 msgid "Certificate Signature Value"
 msgstr "Certificate Signature Value"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Certificate already exists"
+
 #: smime/lib/e-pkcs12.c:264
 msgid "PKCS12 File Password"
 msgstr "PKCS12 File Password"
@@ -17765,8 +15803,7 @@ msgid "Previews the contacts to be printed"
 msgstr "Previews the contacts to be printed"
 
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
-#: ui/evolution-tasks.xml.h:15
+#: ui/evolution-mail-message.xml.h:81 ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Print Pre_view"
 
@@ -17815,16 +15852,14 @@ msgid "View the current contact"
 msgstr "View the current contact"
 
 #: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-contact-list-editor.xml.h:11
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
+#: ui/evolution-mail-global.xml.h:15 ui/evolution-mail-list.xml.h:23
+#: ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-tasks.xml.h:19
+#: ui/evolution.xml.h:36
 msgid "_Actions"
 msgstr "_Actions"
 
-#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Forward Contact..."
 msgstr "_Forward Contact..."
 
@@ -17948,11 +15983,6 @@ msgstr "Show one week"
 msgid "Show the working week"
 msgstr "Show the working week"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
-#: widgets/misc/e-dateedit.c:435
-msgid "Today"
-msgstr "Today"
-
 #: ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "View the current appointment"
@@ -17969,76 +15999,6 @@ msgstr "Work Week"
 msgid "_Open Appointment"
 msgstr "_Open Appointment"
 
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
-msgid "C_lose"
-msgstr "C_lose"
-
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:4
-msgid "Close"
-msgstr "Close"
-
-#: ui/evolution-comp-editor.xml.h:3
-msgid "Close this item"
-msgstr "Close this item"
-
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
-msgid "Delete this item"
-msgstr "Delete this item"
-
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
-msgid "Main toolbar"
-msgstr "Main toolbar"
-
-#: ui/evolution-comp-editor.xml.h:7
-msgid "Preview the printed item"
-msgstr "Preview the printed item"
-
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
-msgid "Print this item"
-msgstr "Print this item"
-
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Save _As..."
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
-#: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:7
-msgid "Save and Close"
-msgstr "Save and Close"
-
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-signature-editor.xml.h:8
-msgid "Save and _Close"
-msgstr "Save and _Close"
-
-#: ui/evolution-comp-editor.xml.h:14
-msgid "Save the item and close the dialog box"
-msgstr "Save the item and close the dialogue box"
-
-#: ui/evolution-comp-editor.xml.h:15
-msgid "Save this item to disk"
-msgstr "Save this item to disk"
-
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13
-#: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:29
-msgid "_File"
-msgstr "_File"
-
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "Copy selected text to the clipboard"
@@ -18064,81 +16024,6 @@ msgstr "Select _All"
 msgid "Select all text"
 msgstr "Select all text"
 
-#: ui/evolution-contact-editor.xml.h:6
-msgid "Print En_velope..."
-msgstr "Print En_velope..."
-
-#: ui/evolution-contact-editor.xml.h:11
-msgid "Save the contact and close the dialog box"
-msgstr "Save the contact and close the dialogue box"
-
-#: ui/evolution-contact-editor.xml.h:12
-msgid "Send _Message to Contact..."
-msgstr "Send _Message to Contact..."
-
-#: ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Save"
-
-#: ui/evolution-contact-list-editor.xml.h:4
-msgid "Delete this list"
-msgstr "Delete this list"
-
-#: ui/evolution-contact-list-editor.xml.h:8
-msgid "Save the list and close the dialog box"
-msgstr "Save the list and close the dialogue box"
-
-#: ui/evolution-contact-list-editor.xml.h:9
-msgid "Se_nd list to other..."
-msgstr "Se_nd list to other..."
-
-#: ui/evolution-contact-list-editor.xml.h:10
-msgid "Send _message to list..."
-msgstr "Send _message to list..."
-
-#: ui/evolution-contact-list-editor.xml.h:12
-msgid "_Delete..."
-msgstr "_Delete..."
-
-#: ui/evolution-event-editor.xml.h:1
-msgid "Cancel Mee_ting"
-msgstr "Cancel Mee_ting"
-
-#: ui/evolution-event-editor.xml.h:2
-msgid "Cancel the meeting for this item"
-msgstr "Cancel the meeting for this item"
-
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-msgid "Forward as i_Calendar"
-msgstr "Forward as i_Calendar"
-
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
-msgid "Forward this item via email"
-msgstr "Forward this item via email"
-
-#: ui/evolution-event-editor.xml.h:6
-msgid "Meeting"
-msgstr "Meeting"
-
-#: ui/evolution-event-editor.xml.h:7
-msgid "Obtain the latest meeting information"
-msgstr "Obtain the latest meeting information"
-
-#: ui/evolution-event-editor.xml.h:8
-msgid "Re_fresh Meeting"
-msgstr "Re_fresh Meeting"
-
-#: ui/evolution-event-editor.xml.h:9
-msgid "Schedule _Meeting"
-msgstr "Schedule _Meeting"
-
-#: ui/evolution-event-editor.xml.h:10
-msgid "Schedule a meeting for this item"
-msgstr "Schedule a meeting for this item"
-
 #: ui/evolution-executive-summary.xml.h:1
 msgid "Customize My Evolution"
 msgstr "Customize My Evolution"
@@ -18297,6 +16182,33 @@ msgstr "_Invert Selection"
 msgid "_Threaded Message List"
 msgstr "_Threaded Message List"
 
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Close"
+
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Close this window"
+
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
+msgid "Main toolbar"
+msgstr "Main toolbar"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:37
+msgid "_Close"
+msgstr "_Close"
+
+#: ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:39
+msgid "_File"
+msgstr "_File"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "A_dd Sender to Address Book"
@@ -18689,7 +16601,7 @@ msgstr "_Previous Message"
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:48
 msgid "_Tools"
 msgstr "_Tools"
 
@@ -18697,16 +16609,6 @@ msgstr "_Tools"
 msgid "_Undelete"
 msgstr "_Undelete"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Close this window"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Close"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Attach"
@@ -18759,15 +16661,14 @@ msgstr "S/MIME Encrypt"
 msgid "S/MIME Sign"
 msgstr "S/MIME Sign"
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save"
-msgstr "Save"
-
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Save As"
 
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Save _As..."
+
 #: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Save _Draft"
@@ -18879,6 +16780,11 @@ msgstr "_Post-To Field"
 msgid "_Reply-To Field"
 msgstr "_Reply-To Field"
 
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Save"
+
 #: ui/evolution-message-composer.xml.h:51
 msgid "_Security"
 msgstr "_Security"
@@ -18887,10 +16793,22 @@ msgstr "_Security"
 msgid "_To Field"
 msgstr "_To Field"
 
+#: ui/evolution-signature-editor.xml.h:1
+msgid "C_lose"
+msgstr "C_lose"
+
 #: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
 
+#: ui/evolution-signature-editor.xml.h:7
+msgid "Save and Close"
+msgstr "Save and Close"
+
+#: ui/evolution-signature-editor.xml.h:8
+msgid "Save and _Close"
+msgstr "Save and _Close"
+
 #: ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file and close the window"
 msgstr "Save the current file and close the window"
@@ -18923,30 +16841,6 @@ msgstr "Subscribe"
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: ui/evolution-task-editor.xml.h:1
-msgid "Assign Task"
-msgstr "Assign Task"
-
-#: ui/evolution-task-editor.xml.h:2
-msgid "Assign this task to others"
-msgstr "Assign this task to others"
-
-#: ui/evolution-task-editor.xml.h:3
-msgid "Cancel Task"
-msgstr "Cancel Task"
-
-#: ui/evolution-task-editor.xml.h:4
-msgid "Cancel this task"
-msgstr "Cancel this task"
-
-#: ui/evolution-task-editor.xml.h:7
-msgid "Obtain the latest task information"
-msgstr "Obtain the latest task information"
-
-#: ui/evolution-task-editor.xml.h:8
-msgid "Re_fresh Task"
-msgstr "Re_fresh Task"
-
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr "Copy selected task"
@@ -19008,98 +16902,146 @@ msgid "Create a new window displaying this folder"
 msgstr "Create a new window displaying this folder"
 
 #: ui/evolution.xml.h:7
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr "Display window buttons using the desktop toolbar setting"
+
+#: ui/evolution.xml.h:8
+msgid "Display window buttons with icons and text"
+msgstr "Display window buttons with icons and text"
+
+#: ui/evolution.xml.h:9
+msgid "Display window buttons with icons only"
+msgstr "Display window buttons with icons only"
+
+#: ui/evolution.xml.h:10
+msgid "Display window buttons with text only"
+msgstr "Display window buttons with text only"
+
+#: ui/evolution.xml.h:11
 msgid "E_xit"
 msgstr "E_xit"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:12
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:13
 msgid "Exit the program"
 msgstr "Exit the program"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:14
 msgid "Forget _Passwords"
 msgstr "Forget _Passwords"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:15
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Forget remembered passwords so you will be prompted for them again"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:16
+msgid "Hide window buttons"
+msgstr "Hide window buttons"
+
+#: ui/evolution.xml.h:17
+msgid "Icons _and text"
+msgstr "Icons _and text"
+
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Import data from other programs"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:20
 msgid "New _Window"
 msgstr "New _Window"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:21
 msgid "Pi_lot Settings..."
 msgstr "Pi_lot Settings..."
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:22
+msgid "Prefere_nces"
+msgstr "Prefere_nces"
+
+#: ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "Send / Receive"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:24
 msgid "Send queued items and retrieve new items"
 msgstr "Send queued items and retrieve new items"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:25
 msgid "Set up Pilot configuration"
 msgstr "Set up Pilot configuration"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Show information about Evolution"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "Submit Bug Report"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "Submit _Bug Report"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:29
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Submit a bug report using Bug Buddy"
 
-#: ui/evolution.xml.h:23
-msgid "T_oolbar"
-msgstr "T_oolbar"
-
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "Toggle whether we are working offline."
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
+msgid "Tool_bar"
+msgstr "Tool_bar"
+
+#: ui/evolution.xml.h:32
+msgid "Tool_bar style"
+msgstr "Tool_bar style"
+
+#: ui/evolution.xml.h:33
+msgid "Window B_uttons"
+msgstr "Window B_uttons"
+
+#: ui/evolution.xml.h:35
 msgid "_About Evolution..."
 msgstr "_About Evolution..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "_Help"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:41
+msgid "_Hide buttons"
+msgstr "_Hide buttons"
+
+#: ui/evolution.xml.h:42
+msgid "_Icons only"
+msgstr "_Icons only"
+
+#: ui/evolution.xml.h:43
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:44
 msgid "_New"
 msgstr "_New"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:45
 msgid "_Quick Reference"
 msgstr "_Quick Reference"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:46
 msgid "_Send / Receive"
 msgstr "_Send / Receive"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:47
+msgid "_Text only"
+msgstr "_Text only"
+
+#: ui/evolution.xml.h:50
 msgid "_Window"
 msgstr "_Window"
 
@@ -19167,8 +17109,8 @@ msgstr "With _Due Date"
 msgid "With _Status"
 msgstr "With _Status"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:640
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:195
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:637
 msgid "UTC"
 msgstr "UTC"
 
@@ -19185,6 +17127,10 @@ msgid "Select a Time Zone"
 msgstr "Select a Time Zone"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+msgid "TimeZone Combobox"
+msgstr "TimeZone Combobox"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -19198,40 +17144,39 @@ msgstr ""
 msgid "_Current View"
 msgstr "_Current View"
 
-#. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:351
-msgid "Custom View"
-msgstr "Custom View"
-
 #: widgets/menus/gal-view-menus.c:360
 msgid "Save Custom View..."
 msgstr "Save Custom View..."
 
-#: widgets/menus/gal-view-menus.c:373
-msgid "Define Views..."
-msgstr "Define Views..."
+#: widgets/misc/e-calendar.c:177 widgets/misc/e-calendar.c:201
+msgid "Previous Button"
+msgstr "Previous Button"
+
+#: widgets/misc/e-calendar.c:226
+msgid "Month Calendar"
+msgstr "Month Calendar"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:423
+#: widgets/misc/e-calendar-item.c:415
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1128
+#: widgets/misc/e-calendar-item.c:1123
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:444
 msgid "Now"
 msgstr "Now"
 
-#: widgets/misc/e-cell-date-edit.c:805
+#: widgets/misc/e-cell-date-edit.c:801
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "The time must be in the format: %s"
 
-#: widgets/misc/e-cell-percent.c:77
+#: widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "The percent value must be between 0 and 100, inclusive"
 
@@ -19322,26 +17267,54 @@ msgstr "Other..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:83 widgets/misc/e-error.c:84
-#: widgets/misc/e-error.c:126
+#: widgets/misc/e-dateedit.c:313
+msgid "Date and Time Entry"
+msgstr "Date and Time Entry"
+
+#: widgets/misc/e-dateedit.c:332
+msgid "Text entry to input date"
+msgstr "Text entry to input date"
+
+#: widgets/misc/e-dateedit.c:333
+msgid "Text Date Entry"
+msgstr "Text Date Entry"
+
+#: widgets/misc/e-dateedit.c:350
+msgid "Click this button to show a calendar"
+msgstr "Click this button to show a calendar"
+
+#: widgets/misc/e-dateedit.c:351
+msgid "Date Button"
+msgstr "Date Button"
+
+#: widgets/misc/e-dateedit.c:371
+msgid "Combo box to select time"
+msgstr "Combo box to select time"
+
+#: widgets/misc/e-dateedit.c:372
+msgid "Time Combo Box"
+msgstr "Time Combo Box"
+
+#: widgets/misc/e-error.c:84 widgets/misc/e-error.c:85
+#: widgets/misc/e-error.c:127
 msgid "Evolution Error"
 msgstr "Evolution Error"
 
-#: widgets/misc/e-error.c:85 widgets/misc/e-error.c:86
-#: widgets/misc/e-error.c:124
+#: widgets/misc/e-error.c:86 widgets/misc/e-error.c:87
+#: widgets/misc/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolution Warning"
 
-#: widgets/misc/e-error.c:123
+#: widgets/misc/e-error.c:124
 msgid "Evolution Information"
 msgstr "Evolution Information"
 
-#: widgets/misc/e-error.c:125
+#: widgets/misc/e-error.c:126
 msgid "Evolution Query"
 msgstr "Evolution Query"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:421
+#: widgets/misc/e-error.c:436
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19433,6 +17406,18 @@ msgstr "_Advanced..."
 msgid "Choose Image"
 msgstr "Choose Image"
 
+#: widgets/misc/e-map.c:647
+msgid "World Map"
+msgstr "World Map"
+
+#: widgets/misc/e-map.c:649
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should select the timezone from the below combo box instead."
+msgstr ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should select the timezone from the below combo box instead."
+
 #: widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "Sync with:"
@@ -19493,12 +17478,12 @@ msgstr "Cannot save file \"{0}\"."
 msgid "Cannot open file \"{0}\"."
 msgstr "Cannot open file \"{0}\"."
 
-#: widgets/misc/e-task-widget.c:212
+#: widgets/misc/e-task-widget.c:208
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:217
+#: widgets/misc/e-task-widget.c:213
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
author	Adam Weinberger <adamw@src.gnome.org>	2005-01-13 02:22:02 +0800
committer	Adam Weinberger <adamw@src.gnome.org>	2005-01-13 02:22:02 +0800
commit	90c261f15939271cbe959c87b7c3ef689b308f1d (patch)
tree	e12f19ea1b693cfe6f9e0b833276613ec1d36a6b /po
parent	bba1aae4836973892519532ecaf526d3bbecb806 (diff)
download	gsoc2013-evolution-90c261f15939271cbe959c87b7c3ef689b308f1d.tar gsoc2013-evolution-90c261f15939271cbe959c87b7c3ef689b308f1d.tar.gz gsoc2013-evolution-90c261f15939271cbe959c87b7c3ef689b308f1d.tar.bz2 gsoc2013-evolution-90c261f15939271cbe959c87b7c3ef689b308f1d.tar.lz gsoc2013-evolution-90c261f15939271cbe959c87b7c3ef689b308f1d.tar.xz gsoc2013-evolution-90c261f15939271cbe959c87b7c3ef689b308f1d.tar.zst gsoc2013-evolution-90c261f15939271cbe959c87b7c3ef689b308f1d.zip