[evolution] Updated British English translation



commit da8a02d18f542d504b7941eeae5d6d6e16ca920f
Author: Bruce Cowan <bcowan fastmail co uk>
Date:   Wed Feb 24 14:26:53 2010 +0000

    Updated British English translation

 po/en_GB.po |14925 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 7647 insertions(+), 7278 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index bdcfd22..00ca3ab 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,20 +1,22 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Robert Brady <rwb197 zepler org>, 2000.
 # Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
-# Bruce Cowan <bcowan fastmail co uk>, 2009.
-#: ../shell/main.c:507
+# Bruce Cowan <bcowan fastmail co uk>, 2009, 2010.
+#: ../shell/main.c:512
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 19:16+0100\n"
-"PO-Revision-Date: 2009-09-08 19:41+0100\n"
+"POT-Creation-Date: 2010-02-24 14:26+0000\n"
+"PO-Revision-Date: 2010-02-24 14:25+0100\n"
 "Last-Translator: Bruce Cowan <bcowan fastmail co uk>\n"
 "Language-Team: British English <en li org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.5.2\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
@@ -82,52 +84,43 @@ msgid "Delete address book '{0}'?"
 msgstr "Delete address book '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading address book."
-msgstr "Error loading address book."
-
-#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Error saving {0} to {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Failed to authenticate with LDAP server."
 msgstr "Failed to authenticate with LDAP server."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1116
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
 msgid "Failed to delete contact"
 msgstr "Failed to delete contact"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise Address book creation:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP server did not respond with valid schema information."
 
-#: ../addressbook/addressbook.error.xml.h:19
-#: ../calendar/calendar.error.xml.h:54
-msgid "Server Version"
-msgstr "Server Version"
-
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Some features may not work properly with your current server"
 msgstr "Some features may not work properly with your current server"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "The Evolution address book has quit unexpectedly."
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:20
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "The image you have selected is large. Do you want to resize and store it?"
 
 #  addressbook:ldap-search-base secondary
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -137,15 +130,15 @@ msgstr ""
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This address book could not be opened."
 msgstr "This address book could not be opened."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book server does not have any suggested search bases."
 msgstr "This address book server does not have any suggested search bases."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:24
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -153,31 +146,31 @@ msgstr ""
 "This address book server might be unreachable, the server name may be "
 "misspelt, or your network connection could be down."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book will be removed permanently."
 msgstr "This address book will be removed permanently."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This server does not support LDAPv3 schema information."
 msgstr "This server does not support LDAPv3 schema information."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to open address book"
 msgstr "Unable to open address book"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to perform search."
 msgstr "Unable to perform search."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "Unable to save {0}."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Would you like to save your changes?"
 msgstr "Would you like to save your changes?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:31
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -185,7 +178,7 @@ msgstr ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -195,11 +188,11 @@ msgstr ""
 "problems using Evolution. For best results the server should be upgraded to "
 "a supported version"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "You do not have permission to delete contacts in this address book."
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
@@ -207,391 +200,417 @@ msgstr ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:35
 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/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:519
-#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../plugins/groupwise-features/junk-settings.ui.h:4
+#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Add"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "_Discard"
 msgstr "_Discard"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Do not save"
 msgstr "_Do not save"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Resize"
 msgstr "_Resize"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Use as it is"
 msgstr "_Use as it is"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
+#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:44
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:598
+#: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "Default Sync Address:"
 
-#: ../addressbook/conduit/address-conduit.c:1621
-#: ../addressbook/conduit/address-conduit.c:1622
+#: ../addressbook/conduit/address-conduit.c:1631
+#: ../addressbook/conduit/address-conduit.c:1632
 msgid "Could not load address book"
 msgstr "Could not load address book"
 
-#: ../addressbook/conduit/address-conduit.c:1699
-#: ../addressbook/conduit/address-conduit.c:1702
+#: ../addressbook/conduit/address-conduit.c:1709
+#: ../addressbook/conduit/address-conduit.c:1712
 msgid "Could not read pilot's Address application block"
 msgstr "Could not read pilot's Address application block"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "<b>Email</b>"
-msgstr "<b>E-mail</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "<b>Home</b>"
-msgstr "<b>Home</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "<b>Instant Messaging</b>"
-msgstr "<b>Instant Messaging</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "<b>Job</b>"
-msgstr "<b>Job</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>Miscellaneous</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
-msgid "<b>Notes</b>"
-msgstr "<b>Notes</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "<b>Other</b>"
-msgstr "<b>Other</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "<b>Telephone</b>"
-msgstr "<b>Telephone</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "<b>Web Addresses</b>"
-msgstr "<b>Web Addresses</b>"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../calendar/gui/e-calendar-view.c:1987
+msgid "Anniversary"
+msgstr "Anniversary"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "<b>Work</b>"
-msgstr "<b>Work</b>"
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-display.c:582
+#: ../calendar/gui/e-calendar-view.c:1986 ../shell/main.c:111
+msgid "Birthday"
+msgstr "Birthday"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegoriesâ?¦"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:312
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1238
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Calendar:"
+msgstr "Calendar:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Contact"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:592
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:607
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2496
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:811
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+msgid "Email"
+msgstr "E-mail"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+msgid "Free/Busy:"
+msgstr "Free/Busy:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 msgid "Full _Name..."
 msgstr "Full _Nameâ?¦"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:70
+msgid "Home"
+msgstr "Home"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+msgid "Home Page:"
+msgstr "Home Page:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Image"
 msgstr "Image"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+msgid "Instant Messaging"
+msgstr "Instant Messaging"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+msgid "Job"
+msgstr "Job"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Mailing Address"
 msgstr "Mailing Address"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../calendar/gui/dialogs/task-details-page.ui.h:11
+msgid "Miscellaneous"
+msgstr "Miscellaneous"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Nic_kname:"
 msgstr "Nic_kname:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 msgid "Notes"
 msgstr "Notes"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:71
+#: ../addressbook/gui/widgets/eab-contact-display.c:460
+#: ../calendar/gui/e-calendar-view.c:1695
+msgid "Other"
+msgstr "Other"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Personal Information"
 msgstr "Personal Information"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Telephone"
 msgstr "Telephone"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+msgid "Video Chat:"
+msgstr "Video Chat:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+msgid "Web Addresses"
+msgstr "Web Addresses"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+msgid "Web Log:"
+msgstr "Web Log:"
+
+#. red
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../mail/e-mail-migrate.c:961
+msgid "Work"
+msgstr "Work"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 msgid "_Address:"
 msgstr "_Address:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Anniversary:"
 msgstr "_Anniversary:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Assistant:"
 msgstr "_Assistant:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Birthday:"
 msgstr "_Birthday:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../calendar/gui/dialogs/event-page.c:822
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1910
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../plugins/itip-formatter/itip-view.c:1909
 msgid "_Calendar:"
 msgstr "_Calendar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_City:"
 msgstr "_City:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Company:"
 msgstr "_Company:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_Country:"
 msgstr "_Country:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Department:"
 msgstr "_Department:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_File under:"
 msgstr "_File under:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Free/Busy:"
 msgstr "_Free/Busy:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Home Page:"
 msgstr "_Home Page:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Manager:"
 msgstr "_Manager:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Office:"
 msgstr "_Office:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_PO Box:"
 msgstr "_PO Box:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Profession:"
 msgstr "_Profession:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Spouse:"
 msgstr "_Spouse:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_State/Province:"
 msgstr "_State/Province/County:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fullname.glade.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_Title:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Video Chat:"
 msgstr "_Video Chat:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "_Wants to receive HTML mail"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Web Log:"
 msgstr "_Web Log:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_Where:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/Postal Code:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../e-util/e-logger.c:171 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/exchange-operations/exchange-delegates.c:951
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
+#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1159
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
 #: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../widgets/menus/gal-define-views-dialog.c:315
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:61
+#: ../widgets/menus/gal-view-new-dialog.c:60
 msgid "Name"
 msgstr "Name"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:340
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1258
-#: ../addressbook/gui/widgets/e-addressbook-model.c:523
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:428
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
+#: ../addressbook/gui/widgets/e-addressbook-model.c:522
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:542
+#: ../addressbook/gui/widgets/e-minicard-view.c:548
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
-#: ../widgets/text/e-text.c:3675
+#: ../widgets/table/e-cell-text.c:1655 ../widgets/text/e-text.c:3429
+#: ../widgets/text/e-text.c:3430
 msgid "Editable"
 msgstr "Editable"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:538
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:534
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:539
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#. red
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:76
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../modules/mail/e-mail-shell-migrate.c:956
-msgid "Work"
-msgstr "Work"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:77
-msgid "Home"
-msgstr "Home"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:445
-#: ../calendar/gui/e-calendar-view.c:1603
-msgid "Other"
-msgstr "Other"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:536
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
 msgid "Error modifying contact"
 msgstr "Error modifying contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Source Book"
 msgstr "Source Book"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
 msgid "Target Book"
 msgstr "Target Book"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
 msgid "Is New Contact"
 msgstr "Is New Contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
 msgid "Writable Fields"
 msgstr "Writable Fields"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
 msgid "Required Fields"
 msgstr "Required Fields"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
 msgid "Changed"
 msgstr "Changed"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:602
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2488
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2491
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Contact Editor â?? %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2883
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2888
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2884
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2889
 msgid "_No image"
 msgstr "_No image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3155
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3162
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -599,187 +618,194 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3159
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3166
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3166
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3173
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3181
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3192
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' is empty"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3205
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3213
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:328
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
 msgid "Contact Quick-Add"
 msgstr "Contact Quick-Add"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:331
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
 msgid "_Edit Full"
 msgstr "_Edit Full"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
 msgid "_Full name"
 msgstr "_Full name"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "E_mail"
 msgstr "E_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:427
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "_Select Address Book"
 msgstr "_Select Address Book"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:171 ../shell/e-shell-window.c:323
-#, fuzzy
+#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
 msgid "Shell"
-msgstr "Seychelles"
+msgstr "Shell"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:172 ../shell/e-shell-window.c:324
+#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
 msgid "The EShell singleton"
-msgstr ""
+msgstr "The EShell singleton"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr."
-msgstr ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr."
+#: ../addressbook/gui/contact-editor/fullname.ui.h:1
+msgid "Dr."
+msgstr "Dr."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq."
-msgstr ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:2
+msgid "Esq."
+msgstr "Esq."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Full Name"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:4
+msgid "I"
+msgstr "I"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:5
+msgid "II"
+msgstr "II"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:6
+msgid "III"
+msgstr "III"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:7
+msgid "Jr."
+msgstr "Jr."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:8
+msgid "Miss"
+msgstr "Miss"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:9
+msgid "Mr."
+msgstr "Mr."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:10
+msgid "Mrs."
+msgstr "Mrs."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:11
+msgid "Ms."
+msgstr "Ms."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:12
+msgid "Sr."
+msgstr "Sr."
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "_First:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
 msgid "_Last:"
 msgstr "_Last:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "_Middle:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgid "_Suffix:"
 msgstr "_Suffix:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "<b>Members</b>"
-msgstr "<b>Members</b>"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
 msgid "Contact List Editor"
 msgstr "Contact List Editor"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
-#: ../calendar/gui/e-day-view-time-item.c:815
-#: ../calendar/gui/e-timezone-entry.c:319
-msgid "Select..."
-msgstr "Selectâ?¦"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+msgid "Members"
+msgstr "Members"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Hide addresses when sending mail to this list"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "_List name:"
 msgstr "_List name:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../mail/mail-config.ui.h:154
+msgid "_Select..."
+msgstr "_Selectâ?¦"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Type an e-mail address or drag a contact into the list below:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
 msgid "Contact List Members"
 msgstr "Contact List Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:928
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1319
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
 msgid "_Members"
 msgstr "_Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
 msgid "Error adding list"
 msgstr "Error adding list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1170
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
 msgid "Error modifying list"
 msgstr "Error modifying list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1184
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
 msgid "Error removing list"
 msgstr "Error removing list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1228
-#: ../addressbook/gui/widgets/e-addressbook-model.c:513
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:414
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
+#: ../addressbook/gui/widgets/e-addressbook-model.c:512
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:528
+#: ../addressbook/gui/widgets/e-minicard-view.c:534
 msgid "Book"
 msgstr "Book"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1248
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
 msgid "Is New List"
 msgstr "Is New List"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Changed Contact:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
 msgid "Conflicting Contact:"
 msgstr "Conflicting Contact:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Duplicate Contact Detected"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
@@ -787,15 +813,15 @@ msgstr ""
 "The name or e-mail of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
 msgstr "New Contact:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
 msgid "Original Contact:"
 msgstr "Original Contact:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -803,82 +829,71 @@ msgstr ""
 "The name or e-mail address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:213
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:231
 msgid "_Merge"
 msgstr "_Merge"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:198
+#: ../addressbook/gui/merging/eab-contact-merging.c:216
 msgid "Merge Contact"
 msgstr "Merge Contact"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:266
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:510
-#: ../addressbook/gui/widgets/eab-contact-display.c:515
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
-#: ../addressbook/gui/widgets/eab-contact-display.c:786
-#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
-msgid "Email"
-msgstr "E-mail"
-
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:876
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
-#: ../modules/calendar/e-memo-shell-view-actions.c:795
-#: ../modules/calendar/e-task-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:970
 msgid "Any field contains"
 msgstr "Any field contains"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:883
+#: ../modules/addressbook/e-book-shell-view-actions.c:908
 msgid "Email begins with"
 msgstr "E-mail begins with"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:890
+#: ../modules/addressbook/e-book-shell-view-actions.c:915
 msgid "Name contains"
 msgstr "Name contains"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:143
+#: ../addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No contacts"
 msgstr "No contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:147
+#: ../addressbook/gui/widgets/e-addressbook-model.c:146
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contact"
 msgstr[1] "%d contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:308
+#: ../addressbook/gui/widgets/e-addressbook-model.c:307
 msgid "Error getting book view"
 msgstr "Error getting book view"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:533
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:421
+#: ../addressbook/gui/widgets/e-addressbook-model.c:532
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:535
+#: ../addressbook/gui/widgets/e-minicard-view.c:541
 msgid "Query"
 msgstr "Query"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:707
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-model.c:706
 msgid "Search Interrupted"
-msgstr "Search Filter"
+msgstr "Search Interrupted"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:435
-#: ../addressbook/gui/widgets/e-addressbook-view.c:645
-#: ../calendar/gui/e-calendar-table.c:886 ../calendar/gui/e-memo-table.c:669
-#: ../modules/calendar/e-memo-shell-content.c:597
-#: ../modules/calendar/e-task-shell-content.c:620
-#: ../widgets/table/e-table-click-to-add.c:507
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
+#: ../addressbook/gui/widgets/e-addressbook-view.c:758
+#: ../calendar/gui/e-memo-table.c:1048 ../calendar/gui/e-task-table.c:1347
+#: ../modules/calendar/e-memo-shell-content.c:607
+#: ../modules/calendar/e-task-shell-content.c:629
+#: ../widgets/table/e-table-click-to-add.c:511
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3344
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
-#: ../widgets/text/e-text.c:3542
+#: ../widgets/table/e-table.c:3359
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3296
+#: ../widgets/text/e-text.c:3297
 msgid "Model"
 msgstr "Model"
 
@@ -886,82 +901,81 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Error modifying card"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:655
-#: ../calendar/gui/e-calendar-table.c:897 ../calendar/gui/e-memo-table.c:680
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+msgid "Cut selected contacts to the clipboard"
+msgstr "Cut selected contacts to the clipboard"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+msgid "Copy selected contacts to the clipboard"
+msgstr "Copy selected contacts to the clipboard"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+msgid "Paste contacts from the clipboard"
+msgstr "Paste contacts from the clipboard"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
+msgid "Delete selected contacts"
+msgstr "Delete selected contacts"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+msgid "Select all visible contacts"
+msgstr "Select all visible contacts"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:774
+#: ../calendar/gui/e-memo-table.c:1065 ../calendar/gui/e-task-table.c:1364
 msgid "Shell View"
-msgstr "Select View: %s"
+msgstr "Shell View"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:666
+#: ../addressbook/gui/widgets/e-addressbook-view.c:785
 msgid "Source"
 msgstr "Source"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1134
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
 msgid "Are you sure you want to delete these contact lists?"
-msgstr ""
-"Are you sure you want\n"
-"to delete these contact lists?"
+msgstr "Are you sure you want to delete these contact lists?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1138
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
 msgid "Are you sure you want to delete this contact list?"
-msgstr ""
-"Are you sure you want\n"
-"to delete these contact lists?"
+msgstr "Are you sure you want to delete this contact list?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1142
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
-msgstr ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
+msgstr "Are you sure you want to delete this contact list (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1148
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
 msgid "Are you sure you want to delete these contacts?"
-msgstr ""
-"Are you sure you want\n"
-"to delete these contacts?"
+msgstr "Are you sure you want to delete these contacts?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1152
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
 msgid "Are you sure you want to delete this contact?"
-msgstr ""
-"Are you sure you want\n"
-"to delete these contacts?"
+msgstr "Are you sure you want to delete this contact?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1156
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
-msgstr ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
-msgid "Save as vCard..."
-msgstr "Save as vCardâ?¦"
+msgstr "Are you sure you want to delete this contact (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1345
-#, fuzzy, c-format
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
-"Opening %d contact will open %d new window as well.\n"
-"Do you really want to display this contact?"
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1350
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
 msgid "_Don't Display"
 msgstr "_Don't Display"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1351
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
 msgid "Display _All Contacts"
 msgstr "Display _All Contacts"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:553
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Assistant"
 msgstr "Assistant"
 
@@ -990,7 +1004,7 @@ msgid "Car Phone"
 msgstr "Car Phone"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -998,7 +1012,7 @@ msgid "Categories"
 msgstr "Categories"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:548
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
 msgid "Company"
 msgstr "Company"
 
@@ -1047,22 +1061,22 @@ msgid "Journal"
 msgstr "Journal"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
 msgid "Manager"
 msgstr "Manager"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:526
+#: ../addressbook/gui/widgets/eab-contact-display.c:532
 msgid "Nickname"
 msgstr "Nickname"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Note"
 msgstr "Note"
 
@@ -1091,14 +1105,13 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:573
+#: ../calendar/gui/e-meeting-list-view.c:578
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "Role"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:584
 msgid "Spouse"
 msgstr "Spouse"
 
@@ -1117,7 +1130,7 @@ msgid "Telex"
 msgstr "Telex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:519
+#: ../shell/e-shell-view.c:748
 msgid "Title"
 msgstr "Title"
 
@@ -1132,27 +1145,27 @@ msgstr "Website"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:521
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-group-container.c:994
-#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-click-to-add.c:525
+#: ../widgets/table/e-table-col.c:121
+#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-container.c:1003
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
-#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
+#: ../widgets/table/e-table-item.c:2879 ../widgets/table/e-table-item.c:2880
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Width"
 msgstr "Width"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:528
-#: ../widgets/table/e-table-group-container.c:987
-#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-click-to-add.c:532
+#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-group-container.c:996
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
-#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
+#: ../widgets/table/e-table-item.c:2885 ../widgets/table/e-table-item.c:2886
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 msgid "Height"
 msgstr "Height"
 
@@ -1181,7 +1194,7 @@ msgstr "Max field name length"
 msgid "Column Width"
 msgstr "Column Width"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -1191,7 +1204,7 @@ msgstr ""
 "\n"
 "Searching for the Contactsâ?¦"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -1205,7 +1218,7 @@ msgstr ""
 "\n"
 "or double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -1219,7 +1232,7 @@ msgstr ""
 "\n"
 "Double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1229,7 +1242,7 @@ msgstr ""
 "\n"
 "Search for the Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:192
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1239,9 +1252,9 @@ msgstr ""
 "\n"
 "There are no items to show in this view."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:521
+#: ../addressbook/gui/widgets/e-minicard-view.c:527
 msgid "Adapter"
-msgstr "Adapter"
+msgstr "Adaptor"
 
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
@@ -1289,265 +1302,255 @@ msgstr[1] "current address book folder %s has %d cards"
 msgid "Open"
 msgstr "Open"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:141
+#: ../addressbook/gui/widgets/ea-minicard.c:153
 msgid "Contact List: "
 msgstr "Contact List: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:142
+#: ../addressbook/gui/widgets/ea-minicard.c:154
 msgid "Contact: "
 msgstr "Contact: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:168
+#: ../addressbook/gui/widgets/ea-minicard.c:180
 msgid "evolution minicard"
 msgstr "evolution minicard"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
 msgid "Copy _Email Address"
 msgstr "Copy _E-mail Address"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:196
-#: ../widgets/misc/e-web-view.c:330
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../widgets/misc/e-web-view.c:370
+msgid "Copy the email address to the clipboard"
+msgstr "Copy the e-mail address to the clipboard"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../widgets/misc/e-web-view.c:375
 msgid "_Send New Message To..."
 msgstr "_Send New Message Toâ?¦"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:206
-#: ../widgets/misc/e-web-view.c:303
-msgid "_Copy Link Location"
-msgstr "_Copy Link Location"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:213
-#: ../widgets/misc/e-web-view.c:313
-msgid "_Open Link in Browser"
-msgstr "_Open Link in Browser"
+#: ../addressbook/gui/widgets/eab-contact-display.c:183
+#: ../widgets/misc/e-web-view.c:377
+msgid "Send a mail message to this address"
+msgstr "Send a mail message to this address"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:289
-#: ../addressbook/gui/widgets/eab-contact-display.c:291
+#: ../addressbook/gui/widgets/eab-contact-display.c:258
+#: ../addressbook/gui/widgets/eab-contact-display.c:260
 msgid "(map)"
 msgstr "(map)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:309
-#: ../addressbook/gui/widgets/eab-contact-display.c:320
+#: ../addressbook/gui/widgets/eab-contact-display.c:278
+#: ../addressbook/gui/widgets/eab-contact-display.c:289
 msgid "map"
 msgstr "map"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:404
-#: ../addressbook/gui/widgets/eab-contact-display.c:753
+#: ../addressbook/gui/widgets/eab-contact-display.c:415
+#: ../addressbook/gui/widgets/eab-contact-display.c:778
 msgid "List Members"
 msgstr "List Members"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Department"
 msgstr "Department"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Profession"
 msgstr "Profession"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Position"
 msgstr "Position"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
 #: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../modules/calendar/e-cal-shell-view-actions.c:214
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
-#: ../modules/calendar/e-cal-shell-view.c:329
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:572
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
-#: ../plugins/hula-account-setup/camel-hula-listener.c:372
-#: ../plugins/hula-account-setup/camel-hula-listener.c:400
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view.c:465
+#: ../plugins/groupwise-features/camel-gw-listener.c:420
+#: ../plugins/groupwise-features/camel-gw-listener.c:445
+#: ../plugins/groupwise-features/camel-gw-listener.c:560
+#: ../plugins/hula-account-setup/camel-hula-listener.c:371
+#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
 msgid "Calendar"
 msgstr "Calendar"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Free/Busy"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Phone"
 msgstr "Phone"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:565
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
 msgid "Address"
 msgstr "Address"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Home Page"
 msgstr "Home Page"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
 msgid "Web Log"
 msgstr "Web Log"
 
-#. XXX Allow the category icons to be referenced as named
-#. *     icons, since GtkAction does not support GdkPixbufs.
-#. Get the icon file for some default category.  Doesn't matter
-#. * which, so long as it has an icon.  We're just interested in
-#. * the directory components.
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
-#: ../calendar/gui/e-calendar-view.c:1894 ../shell/main.c:127
-msgid "Birthday"
-msgstr "Birthday"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
-#: ../calendar/gui/e-calendar-view.c:1895
-msgid "Anniversary"
-msgstr "Anniversary"
-
+#. orange
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#. orange
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../mail/e-mail-migrate.c:962
 #: ../modules/addressbook/e-book-shell-backend.c:175
 #: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:167
+#: ../modules/calendar/e-cal-shell-backend.c:171
 #: ../modules/calendar/e-cal-shell-migrate.c:574
-#: ../modules/calendar/e-memo-shell-backend.c:152
+#: ../modules/calendar/e-memo-shell-backend.c:154
 #: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:156
+#: ../modules/calendar/e-task-shell-backend.c:158
 #: ../modules/calendar/e-task-shell-migrate.c:511
-#: ../modules/mail/e-mail-shell-migrate.c:957
-#: ../plugins/email-custom-header/email-custom-header.c:336
+#: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "Personal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:771
+#: ../addressbook/gui/widgets/eab-contact-display.c:796
 msgid "Job Title"
 msgstr "Job Title"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:807
+#: ../addressbook/gui/widgets/eab-contact-display.c:833
 msgid "Home page"
 msgstr "Home page"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:815
+#: ../addressbook/gui/widgets/eab-contact-display.c:842
 msgid "Blog"
 msgstr "Blog"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:1031
+#: ../widgets/misc/e-web-view.c:750
+#, c-format
+msgid "Click to mail %s"
+msgstr "Click to mail %s"
+
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Success"
 msgstr "Success"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Backend busy"
 msgstr "Backend busy"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Repository offline"
 msgstr "Repository offline"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Address Book does not exist"
 msgstr "Address Book does not exist"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "No Self Contact defined"
 msgstr "No Self Contact defined"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Permission denied"
 msgstr "Permission denied"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Contact not found"
 msgstr "Contact not found"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Contact ID already exists"
 msgstr "Contact ID already exists"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Protocol not supported"
 msgstr "Protocol not supported"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-#: ../calendar/gui/e-cal-component-preview.c:201
+#. To Translators: This is task status
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:295
 #: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:781
-#: ../calendar/gui/e-calendar-table.c:224
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:800 ../calendar/gui/print.c:2578
+#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/print.c:2651
 msgid "Canceled"
 msgstr "Cancelled"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Could not cancel"
 msgstr "Could not cancel"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Authentication Failed"
 msgstr "Authentication Failed"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Authentication Required"
 msgstr "Authentication Required"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "TLS not Available"
 msgstr "TLS not Available"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "No such source"
 msgstr "No such source"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Not available in offline mode"
 msgstr "Not available in offline mode"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Other error"
 msgstr "Other error"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Invalid server version"
 msgstr "Invalid server version"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Unsupported authentication method"
 msgstr "Unsupported authentication method"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1557,7 +1560,7 @@ msgstr ""
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the address book once in online mode to download its contents."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:113
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1566,7 +1569,7 @@ msgstr ""
 "This address book cannot be opened.  Please check that the path %s exists "
 "and that permissions are set to access it."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1574,7 +1577,7 @@ msgstr ""
 "This version of Evolution does not have LDAP support compiled into it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1582,11 +1585,11 @@ msgstr ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:142
+#: ../addressbook/gui/widgets/eab-gui-util.c:145
 msgid "Detailed error message:"
 msgstr "Detailed error message:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:165
+#: ../addressbook/gui/widgets/eab-gui-util.c:168
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1598,7 +1601,7 @@ msgstr ""
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this address book."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:174
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1610,68 +1613,44 @@ msgstr ""
 "more specific or raise the time limit in the directory server\n"
 "preferences for this address book."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:180
 msgid "The backend for this address book was unable to parse this query."
 msgstr "The backend for this address book was unable to parse this query."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:180
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book refused to perform this query."
 msgstr "The backend for this address book refused to perform this query."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "This query did not complete successfully."
 msgstr "This query did not complete successfully."
 
-#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
-msgid "Overwrite"
-msgstr "Overwrite"
-
-#. more than one, finding the total number of contacts might
-#. * hit performance while saving large number of contacts
-#.
-#: ../addressbook/gui/widgets/eab-gui-util.c:255
-#: ../addressbook/gui/widgets/eab-gui-util.c:258
-msgid "contact"
-msgid_plural "contacts"
-msgstr[0] "contact"
-msgstr[1] "contacts"
-
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:304
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:341
+#: ../addressbook/gui/widgets/eab-gui-util.c:244
 msgid "Select Address Book"
 msgstr "Select Address Book"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:455
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "list"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:597
+#: ../addressbook/gui/widgets/eab-gui-util.c:432
 msgid "Move contact to"
 msgstr "Move contact to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:599
+#: ../addressbook/gui/widgets/eab-gui-util.c:434
 msgid "Copy contact to"
 msgstr "Copy contact to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:602
+#: ../addressbook/gui/widgets/eab-gui-util.c:437
 msgid "Move contacts to"
 msgstr "Move contacts to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:604
+#: ../addressbook/gui/widgets/eab-gui-util.c:439
 msgid "Copy contacts to"
 msgstr "Copy contacts to"
 
@@ -1679,51 +1658,51 @@ msgstr "Copy contacts to"
 msgid "Card View"
 msgstr "Card View"
 
-#: ../addressbook/importers/evolution-csv-importer.c:660
-#: ../addressbook/importers/evolution-ldif-importer.c:512
-#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-ldif-importer.c:516
+#: ../addressbook/importers/evolution-vcard-importer.c:253
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:5
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
 msgid "Importing..."
 msgstr "Importingâ?¦"
 
-#: ../addressbook/importers/evolution-csv-importer.c:861
+#: ../addressbook/importers/evolution-csv-importer.c:858
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:862
+#: ../addressbook/importers/evolution-csv-importer.c:859
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-csv-importer.c:870
+#: ../addressbook/importers/evolution-csv-importer.c:867
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:871
+#: ../addressbook/importers/evolution-csv-importer.c:868
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-csv-importer.c:879
+#: ../addressbook/importers/evolution-csv-importer.c:876
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:880
+#: ../addressbook/importers/evolution-csv-importer.c:877
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:679
+#: ../addressbook/importers/evolution-ldif-importer.c:689
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:690
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF importer"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:556
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:557
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard Importer"
 
@@ -1777,47 +1756,48 @@ msgstr ""
 msgid "NUMBER"
 msgstr "NUMBER"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:99
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Command line arguments error, please use --help option to see the usage."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:113
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "Only support csv or vcard format."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "In async mode, output must be file."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:130
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "In normal mode, there is no need for the size option."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:161
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "Unhandled error"
 
-#: ../addressbook/util/addressbook.c:102
+#: ../addressbook/util/addressbook.c:103
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accessing LDAP Server anonymously"
 
-#: ../addressbook/util/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
+#: ../addressbook/util/addressbook.c:210
+#: ../plugins/groupwise-features/camel-gw-listener.c:525
 msgid "Failed to authenticate.\n"
 msgstr "Failed to authenticate.\n"
 
-#: ../addressbook/util/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
+#: ../addressbook/util/addressbook.c:217
+#: ../plugins/groupwise-features/camel-gw-listener.c:505
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Enter password for %s (user %s)"
 
-#: ../addressbook/util/addressbook.c:222
+#: ../addressbook/util/addressbook.c:225
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:518
-#: ../plugins/publish-calendar/publish-calendar.c:215
+#: ../plugins/caldav/caldav-browse-server.c:809
+#: ../plugins/google-account-setup/google-source.c:440
+#: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Enter password"
@@ -1907,96 +1887,100 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Are you sure you want to delete the appointment titled '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "Are you sure you want to delete the meeting titled '{0}'?"
+
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Are you sure you want to delete the memo '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Are you sure you want to delete these {0} appointments?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Are you sure you want to delete these {0} memos?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Are you sure you want to delete these {0} tasks?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Are you sure you want to delete this appointment?"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:182
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:191
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Are you sure you want to delete this meeting?"
 
-#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:188
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:197
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Are you sure you want to delete this memo?"
 
-#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:185
+#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/gui/dialogs/delete-comp.c:194
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Are you sure you want to delete this task?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Are you sure you want to save the memo without a summary?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:27
 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/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:28
 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/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Calendar repository is offline."
 msgstr "Calendar repository is offline."
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "Cannot create a new event"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Cannot save event"
 msgstr "Cannot save event"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete calendar '{0}'?"
 msgstr "Delete calendar '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete memo list '{0}'?"
 msgstr "Delete memo list '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Delete task list '{0}'?"
 msgstr "Delete task list '{0}'?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Do _not Send"
 msgstr "Do _not Send"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Download in progress. Do you want to save the appointment?"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Download in progress. Do you want to save the task?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid "Editor could not be loaded."
 msgstr "Editor could not be loaded."
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -2004,30 +1988,30 @@ msgstr ""
 "E-mail invitations will be sent to all participants and allow them to accept "
 "this task."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "E-mail invitations will be sent to all participants and allow them to reply."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
 msgstr "Error loading calendar"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading memo list"
 msgstr "Error loading memo list"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
 msgid "Error loading task list"
 msgstr "Error loading task list"
 
 #. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
 msgid "Error on '{0}'"
 msgstr "Error on '{0}'"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2035,7 +2019,7 @@ msgstr ""
 "If you do not send a cancellation notice, the other participants may not "
 "know the meeting is cancelled."
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2043,7 +2027,7 @@ msgstr ""
 "If you do not send a cancellation notice, the other participants may not "
 "know the memo has been deleted."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2051,23 +2035,11 @@ msgstr ""
 "If you do not send a cancellation notice, the other participants may not "
 "know the task has been deleted."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:49
 msgid "No response from the server."
 msgstr "No response from the server."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "Save Appointment"
-msgstr "Save Appointment"
-
 #: ../calendar/calendar.error.xml.h:50
-msgid "Save Memo"
-msgstr "Save Memo"
-
-#: ../calendar/calendar.error.xml.h:51
-msgid "Save Task"
-msgstr "Save Task"
-
-#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2075,7 +2047,7 @@ msgstr ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2083,7 +2055,7 @@ msgstr ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2091,7 +2063,7 @@ msgstr ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2099,93 +2071,98 @@ msgstr ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
 msgid "Some features may not work properly with your current server."
 msgstr "Some features may not work properly with your current server."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "The Evolution calendar has quit unexpectedly."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "The Evolution calendars have quit unexpectedly."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "The Evolution memo has quit unexpectedly."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "The Evolution tasks have quit unexpectedly."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
 msgid "The calendar is not marked for offline usage."
 msgstr "The calendar is not marked for offline usage."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
 msgid "The memo list is not marked for offline usage."
 msgstr "The memo list is not marked for offline usage"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
 msgid "The task list is not marked for offline usage."
 msgstr "The task list is not marked for offline usage."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:62
 msgid "This calendar will be removed permanently."
 msgstr "This calendar will be removed permanently."
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:63
 msgid "This memo list will be removed permanently."
 msgstr "This memo list will be removed permanently."
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:64
 msgid "This task list will be removed permanently."
 msgstr "This task list will be removed permanently."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:65
 msgid "Unable to load the calendar"
 msgstr "Unable to load the calendar"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Would you like to save your changes to this appointment?"
 
 #  calendar:prompt-save-task primary
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:67
+msgid "Would you like to save your changes to this meeting?"
+msgstr "Would you like to save your changes to this meeting?"
+
+#  calendar:prompt-save-task primary
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this memo?"
 msgstr "Would you like to save your changes to this memo?"
 
 #  calendar:prompt-save-task primary
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this task?"
 msgstr "Would you like to save your changes to this task?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Would you like to send a cancellation notice for this memo?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Would you like to send all the participants a cancellation notice?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Would you like to send meeting invitations to participants?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send this task to participants?"
 msgstr "Would you like to send this task to participants?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Would you like to send updated meeting information to participants?"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send updated task information to participants?"
 msgstr "Would you like to send updated task information to participants?"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:76
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2195,101 +2172,273 @@ msgstr ""
 "problems using Evolution. For best results, the server should be upgraded to "
 "a supported version."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:77
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "You have changed this appointment, but not yet saved it."
 
 #  calendar:prompt-save-task secondary
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:78
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "You have changed this meeting, but not yet saved it."
+
+#  calendar:prompt-save-task secondary
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this task, but not yet saved it."
 msgstr "You have changed this task, but not yet saved it."
 
 #  calendar:prompt-save-task secondary
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "You have made changes to this memo, but not yet saved them."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:81
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Your calendars will not be available until Evolution is restarted."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Your memos will not be available until Evolution is restarted."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Your tasks will not be available until Evolution is restarted."
 
-#: ../calendar/calendar.error.xml.h:85
-#: ../composer/mail-composer.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:84
+#: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "_Discard Changes"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:332
+#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
 msgid "_Save"
 msgstr "_Save"
 
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:86
 msgid "_Save Changes"
 msgstr "_Save Changes"
 
-#: ../calendar/calendar.error.xml.h:88
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:87
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Send"
 
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:88
 msgid "_Send Notice"
 msgstr "_Send Notice"
 
-#: ../calendar/calendar.error.xml.h:90
+#: ../calendar/calendar.error.xml.h:89
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:255
+#: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "Split Multi-Day Events:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1520
-#: ../calendar/conduits/calendar/calendar-conduit.c:1521
-#: ../calendar/conduits/memo/memo-conduit.c:814
-#: ../calendar/conduits/memo/memo-conduit.c:815
-#: ../calendar/conduits/todo/todo-conduit.c:1014
-#: ../calendar/conduits/todo/todo-conduit.c:1015
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
+#: ../calendar/conduits/calendar/calendar-conduit.c:1533
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/memo/memo-conduit.c:822
+#: ../calendar/conduits/todo/todo-conduit.c:1022
+#: ../calendar/conduits/todo/todo-conduit.c:1023
 msgid "Could not start evolution-data-server"
 msgstr "Could not start evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
-#: ../calendar/conduits/calendar/calendar-conduit.c:1631
+#: ../calendar/conduits/calendar/calendar-conduit.c:1640
+#: ../calendar/conduits/calendar/calendar-conduit.c:1643
 msgid "Could not read pilot's Calendar application block"
 msgstr "Could not read pilot's Calendar application block"
 
-#: ../calendar/conduits/memo/memo-conduit.c:908
-#: ../calendar/conduits/memo/memo-conduit.c:911
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "Could not read pilot's Memo application block"
 
-#: ../calendar/conduits/memo/memo-conduit.c:955
-#: ../calendar/conduits/memo/memo-conduit.c:958
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "Could not write pilot's Memo application block"
 
-#: ../calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/todo/todo-conduit.c:231
 msgid "Default Priority:"
 msgstr "Default Priority:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1098
-#: ../calendar/conduits/todo/todo-conduit.c:1101
+#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1109
 msgid "Could not read pilot's ToDo application block"
 msgstr "Could not read pilot's ToDo application block"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1143
-#: ../calendar/conduits/todo/todo-conduit.c:1146
+#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1154
 msgid "Could not write pilot's ToDo application block"
 msgstr "Could not write pilot's ToDo application block"
 
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minute"
+msgstr[1] "minutes"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "hour"
+msgstr[1] "hours"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+msgid "Start time"
+msgstr "Start time"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
+msgid "Appointments"
+msgstr "Appointments"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
+msgid "Dismiss _All"
+msgstr "Dismiss _All"
+
+#. Location
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
+#: ../calendar/gui/e-itip-control.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1031
+msgid "Location:"
+msgstr "Location:"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
+msgid "Snooze _time:"
+msgstr "Snooze _time:"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
+msgid "_Dismiss"
+msgstr "_Dismiss"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1015
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:151
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1605
+#: ../widgets/menus/gal-define-views.ui.h:5
+msgid "_Edit"
+msgstr "_Edit"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+msgid "_Snooze"
+msgstr "_Snooze"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../filter/filter.ui.h:15
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+msgid "hours"
+msgstr "hours"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+msgid "location of appointment"
+msgstr "location of appointment"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/google-account-setup/google-contacts-source.c:331
+msgid "minutes"
+msgstr "minutes"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
+msgid "No summary available."
+msgstr "No summary available."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+msgid "No description available."
+msgstr "No description available."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+msgid "No location information available."
+msgstr "No location information available."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#, c-format
+msgid "You have %d alarms"
+msgstr "You have %d alarms"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../e-util/e-non-intrusive-error-dialog.h:39
+msgid "Warning"
+msgstr "Warning"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+msgid ""
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email.  Evolution will display\n"
+"a normal reminder dialog box instead."
+msgstr ""
+"Evolution does not support calendar reminders with\n"
+"e-mail notifications yet, but this reminder was\n"
+"configured to send an e-mail.  Evolution will display\n"
+"a normal reminder dialogue box instead."
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#, c-format
+msgid ""
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
+msgstr ""
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+msgid "Do not ask me about this program again."
+msgstr "Do not ask me about this program again."
+
+#: ../calendar/gui/alarm-notify/util.c:44
+msgid "invalid time"
+msgstr "invalid time"
+
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/misc.c:116
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hour"
+msgstr[1] "%d hours"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/misc.c:122
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minute"
+msgstr[1] "%d minutes"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/misc.c:126
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d second"
+msgstr[1] "%d seconds"
+
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
 msgstr "Alarm programs"
@@ -2411,11 +2560,11 @@ msgstr "Hour the workday starts on, in twenty four hour format, 0 to 23."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the memo preview pane in the main window."
-msgstr ""
+msgstr "If \"true\", show the memo preview pane in the main window."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "If \"true\", show the task preview pane in the main window."
-msgstr ""
+msgstr "If \"true\", show the task preview pane in the main window."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Intervals shown in Day and Work Week views, in minutes."
@@ -2463,18 +2612,16 @@ msgid "Maximum number of recently used timezones to remember."
 msgstr "Maximum number of recently used timezones to remember."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
-#, fuzzy
 msgid "Memo layout style"
-msgstr "_Reply style:"
+msgstr "Memo layout style"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (horizontal)"
-msgstr ""
+msgstr "Memo preview pane position (horizontal)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
-#, fuzzy
 msgid "Memo preview pane position (vertical)"
-msgstr "Month view vertical pane position"
+msgstr "Memo preview pane position (vertical)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday ends on, 0 to 59."
@@ -2522,15 +2669,15 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the memo preview pane when oriented vertically."
-msgstr ""
+msgstr "Position of the memo preview pane when orientated vertically."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented horizontally."
-msgstr ""
+msgstr "Position of the task preview pane when orientated horizontally."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Position of the task preview pane when oriented vertically."
-msgstr ""
+msgstr "Position of the task preview pane when orientated vertically."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
@@ -2609,14 +2756,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "Show status field in the event/task/meeting editor"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
-#, fuzzy
 msgid "Show the memo preview pane"
-msgstr "Show the \"Preview\" pane"
+msgstr "Show the memo preview pane"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
-#, fuzzy
 msgid "Show the task preview pane"
-msgstr "Show the \"Preview\" pane"
+msgstr "Show the task preview pane"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show timezone field in the event/meeting editor"
@@ -2644,17 +2789,15 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task layout style"
-msgstr ""
+msgstr "Task layout style"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
-#, fuzzy
 msgid "Task preview pane position (horizontal)"
-msgstr "Tasks vertical pane position"
+msgstr "Task preview pane position (horizontal)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
-#, fuzzy
 msgid "Task preview pane position (vertical)"
-msgstr "Tasks vertical pane position"
+msgstr "Task preview pane position (vertical)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Tasks due today color"
@@ -2683,6 +2826,9 @@ msgid ""
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
 "list. \"1\" (Vertical View) places the preview pane next to the memo list."
 msgstr ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid ""
@@ -2690,6 +2836,9 @@ msgid ""
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "The second timezone for a Day View"
@@ -2873,19 +3022,19 @@ msgstr "Workday start minute"
 msgid "Invalid object"
 msgstr "Invalid object"
 
-#: ../calendar/gui/calendar-view-factory.c:113
+#: ../calendar/gui/calendar-view-factory.c:117
 msgid "Day View"
 msgstr "Day View"
 
-#: ../calendar/gui/calendar-view-factory.c:116
+#: ../calendar/gui/calendar-view-factory.c:120
 msgid "Work Week View"
 msgstr "Work Week View"
 
-#: ../calendar/gui/calendar-view-factory.c:119
+#: ../calendar/gui/calendar-view-factory.c:123
 msgid "Week View"
 msgstr "Week View"
 
-#: ../calendar/gui/calendar-view-factory.c:122
+#: ../calendar/gui/calendar-view-factory.c:126
 msgid "Month View"
 msgstr "Month View"
 
@@ -2914,10 +3063,11 @@ msgstr "Category"
 msgid "Classification"
 msgstr "Classification"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:262
-#: ../calendar/gui/e-cal-model.c:526 ../calendar/gui/e-calendar-table.c:704
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:487
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Confidential"
 
@@ -2925,7 +3075,7 @@ msgstr "Confidential"
 #: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
 #: ../widgets/misc/e-attachment-tree-view.c:496
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "Description"
 
@@ -2946,8 +3096,9 @@ msgstr "Exist"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:721
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
 msgstr "Location"
 
@@ -2956,20 +3107,21 @@ msgstr "Location"
 msgid "Organizer"
 msgstr "Organiser"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:261
-#: ../calendar/gui/e-cal-model.c:524 ../calendar/gui/e-calendar-table.c:703
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:486
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Private"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:260
-#: ../calendar/gui/e-cal-model.c:515 ../calendar/gui/e-cal-model.c:522
-#: ../calendar/gui/e-calendar-table.c:702 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
+#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
+#: ../calendar/gui/e-task-table.c:485 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Public"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:295
+#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Recurrence"
 
@@ -2978,7 +3130,7 @@ msgstr "Recurrence"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:356
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Summary"
 msgstr "Summary"
 
@@ -3007,478 +3159,441 @@ msgstr "is"
 msgid "is not"
 msgstr "is not"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:627
+#: ../calendar/gui/dialogs/alarm-dialog.c:626
 msgid "Edit Alarm"
 msgstr "Edit Alarm"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:822
+#: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Pop up an alert"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/dialogs/alarm-dialog.c:818
 #: ../calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Play a sound"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/dialogs/alarm-dialog.c:819
 #: ../calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Run a program"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/dialogs/alarm-dialog.c:820
 #: ../calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Send an e-mail"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
-msgid "<b>Alarm</b>"
-msgstr "<b>Alarm</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
-msgid "<b>Options</b>"
-msgstr "<b>Options</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
-msgid "<b>Repeat</b>"
-msgstr "<b>Repeat</b>"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
 msgid "Add Alarm"
 msgstr "Add Alarm"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+msgid "Alarm"
+msgstr "Alarm"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "Custom _message"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Custom alarm sound"
 msgstr "Custom alarm sound"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 msgid "Mes_sage:"
 msgstr "Mes_sage:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+msgid "Options"
+msgstr "Options"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+msgid "Repeat"
+msgstr "Repeat"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
 msgstr "Select A File"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Send To:"
 msgstr "Send To:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Arguments:"
 msgstr "_Arguments:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the alarm"
 msgstr "_Repeat the alarm"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
 msgstr "_Sound:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
-msgid ""
-"before\n"
-"after"
-msgstr ""
-"before\n"
-"after"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+msgid "after"
+msgstr "after"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
+msgid "before"
+msgstr "before"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
+msgid "day(s)"
+msgstr "day(s)"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "days"
+msgstr "days"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+msgid "end of appointment"
+msgstr "end of appointment"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "extra times every"
 msgstr "extra times every"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
-msgid ""
-"minute(s)\n"
-"hour(s)\n"
-"day(s)"
-msgstr ""
-"minute(s)\n"
-"hour(s)\n"
-"day(s)"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+msgid "hour(s)"
+msgstr "hour(s)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-msgid ""
-"minutes\n"
-"hours\n"
-"days"
-msgstr ""
-"minutes\n"
-"hours\n"
-"days"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+msgid "minute(s)"
+msgstr "minute(s)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
-msgid ""
-"start of appointment\n"
-"end of appointment"
-msgstr ""
-"start of appointment\n"
-"end of appointment"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+msgid "start of appointment"
+msgstr "start of appointment"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "Action/Trigger"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 msgid "A_dd"
 msgstr "A_dd"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 msgid "Alarms"
 msgstr "Alarms"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:553
-msgid "_Suggest automatic display of attachment"
-msgstr "_Suggest automatic display of attachment"
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
-msgid "Attach file(s)"
-msgstr "Attach file(s)"
-
-#. an empty string is the same as 'None'
+#. Translators: "None" indicates no second time zone set for a day view
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/event-page.c:2905
-#: ../calendar/gui/e-cal-model-tasks.c:773
-#: ../calendar/gui/e-day-view-time-item.c:788
-#: ../calendar/gui/e-itip-control.c:1159 ../filter/filter-rule.c:946
-#: ../mail/em-account-editor.c:919 ../mail/em-account-editor.c:1728
-#: ../modules/mail/e-mail-junk-hook.c:95
-#: ../plugins/calendar-weather/calendar-weather.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:378
-#: ../plugins/email-custom-header/email-custom-header.c:393
-#: ../plugins/exchange-operations/exchange-delegates-user.c:179
-#: ../plugins/itip-formatter/itip-formatter.c:2217
-#: ../widgets/misc/e-account-tree-view.c:124 ../widgets/misc/e-dateedit.c:1555
-#: ../widgets/misc/e-dateedit.c:1766
-#: ../widgets/misc/e-signature-combo-box.c:75
-#: ../widgets/table/e-cell-date-edit.c:312
+#: ../calendar/gui/e-day-view-time-item.c:797
+msgctxt "cal-second-zone"
 msgid "None"
 msgstr "None"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/e-day-view-time-item.c:824
+#: ../calendar/gui/e-timezone-entry.c:319
+msgid "Select..."
+msgstr "Selectâ?¦"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:499
 msgid "Selected Calendars for Alarms"
 msgstr "Selected Calendars for Alarms"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:788
 msgid "Time and date:"
 msgstr "Time and date:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
 msgid "Date only:"
 msgstr "Date only:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "(Shown in a Day View)"
-msgstr "(Shown in a Day View)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid ""
-"60 minutes\n"
-"30 minutes\n"
-"15 minutes\n"
-"10 minutes\n"
-"05 minutes"
-msgstr ""
-"60 minutes\n"
-"30 minutes\n"
-"15 minutes\n"
-"10 minutes\n"
-"05 minutes"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, 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 e-mail address.</i>"
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr "%u and %d will be replaced by user and domain from the e-mail address."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<span weight=\"bold\">Alarms</span>"
-msgstr "<span weight=\"bold\">Alarms</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
+msgid "(Shown in a Day View)"
+msgstr "(Shown in a Day View)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">Alerts</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
+msgid "05 minutes"
+msgstr "05 minutes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ../mail/mail-config.glade.h:14
-msgid "<span weight=\"bold\">Date/Time Format</span>"
-msgstr "<span weight=\"bold\">Date/Time Format</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
+msgid "10 minutes"
+msgstr "10 minutes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">Default Free/Busy Server</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
+msgid "15 minutes"
+msgstr "15 minutes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: ../mail/mail-config.glade.h:18
-#: ../plugins/publish-calendar/publish-calendar.glade.h:1
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">General</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
+msgid "30 minutes"
+msgstr "30 minutes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">Task List</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
+msgid "60 minutes"
+msgstr "60 minutes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "<span weight=\"bold\">Time</span>"
-msgstr "<span weight=\"bold\">Time</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+msgid "Alerts"
+msgstr "Alerts"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">Work Week</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
+#: ../mail/mail-config.ui.h:28
+#: ../modules/addressbook/autocompletion-config.c:153
+msgid "Date/Time Format"
+msgstr "Date/Time Format"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
 msgid "Day _ends:"
 msgstr "Day _ends:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
+msgid "Days"
+msgstr "Days"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
+msgid "Default Free/Busy Server"
+msgstr "Default Free/Busy Server"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
 msgid "Display"
 msgstr "Display"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
 msgid "Display alarms in _notification area only"
 msgstr "Display alarms in _notification area only"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Friday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
 #: ../calendar/gui/dialogs/calendar-setup.c:367
 #: ../calendar/gui/dialogs/calendar-setup.c:378
 #: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:82
-#: ../modules/addressbook/addressbook-config.c:1015
-#: ../modules/addressbook/ldap-config.glade.h:17
-#: ../plugins/itip-formatter/itip-formatter.c:2567
-#: ../smime/gui/smime-ui.glade.h:28
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
+#: ../modules/addressbook/addressbook-config.c:985
+#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "General"
 msgstr "General"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days"
-msgstr ""
-"Minutes\n"
-"Hours\n"
-"Days"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
+msgid "Hours"
+msgstr "Hours"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
+msgid "Minutes"
+msgstr "Minutes"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
 #: ../calendar/gui/dialogs/recurrence-page.c:1109
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Monday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday"
-msgstr ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: ../mail/mail-config.glade.h:102
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#. Translators: Used in send options dialog
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
+#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
+msgid "None"
+msgstr "None"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
+#: ../mail/mail-config.ui.h:80
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
 msgstr "S_un"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 #: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:741
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Saturday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
 msgid "Sc_roll Month View by a week"
 msgstr "Sc_roll Month View by a week"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Se_cond zone:"
 msgstr "Se_cond zone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Select the calendars for alarm notification"
 msgstr "Select the calendars for alarm notification"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Sh_ow a reminder"
 msgstr "Sh_ow a reminder"
 
-#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Show a _reminder"
 msgstr "Show a _reminder"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Show week _numbers in date navigator"
 msgstr "Show week _numbers in date navigator"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "Show week n_umber in Day and Work Week View"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 #: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Sunday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "T_asks due today:"
 msgstr "T_asks due today:"
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_hu"
 msgstr "T_hu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+msgid "Task List"
+msgstr "Task List"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "Template:"
 msgstr "Template:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
 #: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Thursday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../e-util/e-non-intrusive-error-dialog.c:287
+#: ../widgets/misc/e-dateedit.c:613
+msgid "Time"
+msgstr "Time"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Time _zone:"
 msgstr "Time _zone:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Time format:"
 msgstr "Time format:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1110
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 msgid "Use s_ystem time zone"
 msgstr "Use s_ystem time zone"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1111
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Wee_k starts on:"
 msgstr "Wee_k starts on:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
+msgid "Work Week"
+msgstr "Work Week"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Work days:"
 msgstr "Work days:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 hour (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 msgid "_24 hour"
 msgstr "_24 hour"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Ask for confirmation when deleting items"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "_Compress weekends in month view"
 msgstr "_Compress weekends in month view"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_Day begins:"
 msgstr "_Day begins:"
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Fri"
 msgstr "_Fri"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Hide completed tasks after"
 msgstr "_Hide completed tasks after"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Mon"
 msgstr "_Mon"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Overdue tasks:"
 msgstr "_Overdue tasks:"
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Sat"
 msgstr "_Sat"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "_Show appointment end times in week and month view"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Time divisions:"
 msgstr "_Time divisions:"
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Tue"
 msgstr "_Tue"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Wed"
 msgstr "_Wed"
 
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "before every anniversary/birthday"
 msgstr "before every anniversary/birthday"
 
-#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "before every appointment"
 msgstr "before every appointment"
 
@@ -3487,15 +3602,14 @@ msgid "Type:"
 msgstr "Type:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:542
+#: ../modules/addressbook/addressbook-config.c:500
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.glade.h:150
-#: ../modules/addressbook/ldap-config.glade.h:36
-#: ../plugins/groupwise-features/properties.glade.h:11
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
+#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
 msgid "_Name:"
 msgstr "_Name:"
@@ -3516,10 +3630,6 @@ msgstr "Cop_y memo list contents locally for offline operation"
 msgid "Colo_r:"
 msgstr "Colou_r:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-msgid "Task List"
-msgstr "Task List"
-
 #: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "Memo List"
@@ -3597,225 +3707,233 @@ msgstr "%s  You have made no changes, update the editor?"
 msgid "Validation error: %s"
 msgstr "Validation error: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2350
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
 msgid " to "
 msgstr " to "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:194 ../calendar/gui/print.c:2354
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
 msgid " (Completed "
 msgstr " (Completed "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:196 ../calendar/gui/print.c:2356
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
 msgid "Completed "
 msgstr "Completed "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:201 ../calendar/gui/print.c:2361
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
 msgid " (Due "
 msgstr " (Due "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:203 ../calendar/gui/print.c:2363
+#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
 msgid "Due "
 msgstr "Due "
 
-#: ../calendar/gui/dialogs/comp-editor.c:238
+#: ../calendar/gui/dialogs/comp-editor.c:246
 msgid "Could not save attachments"
 msgstr "Could not save attachments"
 
-#: ../calendar/gui/dialogs/comp-editor.c:501
+#: ../calendar/gui/dialogs/comp-editor.c:509
 msgid "Could not update object"
 msgstr "Could not update object"
 
-#: ../calendar/gui/dialogs/comp-editor.c:596
+#: ../calendar/gui/dialogs/comp-editor.c:604
 msgid "Edit Appointment"
 msgstr "Edit Appointment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:603
+#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
 msgid "Meeting - %s"
 msgstr "Meeting â?? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:605
+#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appointment â?? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:611
+#: ../calendar/gui/dialogs/comp-editor.c:619
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Assigned Task â?? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:613
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Task - %s"
 msgstr "Task â?? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:618
+#: ../calendar/gui/dialogs/comp-editor.c:626
 #, c-format
 msgid "Memo - %s"
 msgstr "Memo â?? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:634
+#: ../calendar/gui/dialogs/comp-editor.c:642
 msgid "No Summary"
 msgstr "No Summary"
 
-#: ../calendar/gui/dialogs/comp-editor.c:788
+#: ../calendar/gui/dialogs/comp-editor.c:751
 msgid "Keep original item?"
 msgstr "Keep original item?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:992
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Click here to close the current window"
 msgstr "Click here to close the current window"
 
-#: ../calendar/gui/dialogs/comp-editor.c:999
-msgid "Copy selected text to the clipboard"
-msgstr "Copy selected text to the clipboard"
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1444
+#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+msgid "Copy the selection"
+msgstr "Copy the selection"
+
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1451
+#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
+#: ../widgets/misc/e-web-view.c:959
+msgid "Cut the selection"
+msgstr "Cut the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1006
-msgid "Cut selected text to the clipboard"
-msgstr "Cut selected text to the clipboard"
+#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../shell/e-shell-window-actions.c:1458
+#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+msgid "Delete the selection"
+msgstr "Delete the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1013
+#: ../calendar/gui/dialogs/comp-editor.c:966
 msgid "Click here to view help available"
 msgstr "Click here to view help available"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1020
-msgid "Paste text from the clipboard"
-msgstr "Paste text from the clipboard"
+#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1493
+#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:971
+msgid "Paste the clipboard"
+msgstr "Paste the clipboard"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1041
+#: ../calendar/gui/dialogs/comp-editor.c:994
 msgid "Click here to save the current window"
 msgstr "Click here to save the current window"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1048
+#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1563
+#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Select all text"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1055
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 msgid "_Classification"
 msgstr "_Classification"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1062
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-#: ../filter/filter.glade.h:11 ../mail/e-mail-browser.c:111
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
-#: ../shell/e-shell-window-actions.c:1599
-#: ../widgets/menus/gal-define-views.glade.h:5
-msgid "_Edit"
-msgstr "_Edit"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1069 ../mail/e-mail-browser.c:104
-#: ../shell/e-shell-window-actions.c:1606
-#: ../widgets/misc/e-signature-editor.c:214
+#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1612
+#: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_File"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1076
-#: ../shell/e-shell-window-actions.c:1613
+#: ../calendar/gui/dialogs/comp-editor.c:1029
+#: ../shell/e-shell-window-actions.c:1619
 msgid "_Help"
 msgstr "_Help"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../composer/e-composer-actions.c:351
 msgid "_Options"
 msgstr "_Options"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097 ../mail/e-mail-browser.c:118
-#: ../shell/e-shell-window-actions.c:1648
+#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1654
 msgid "_View"
 msgstr "_View"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1107
-#: ../composer/e-composer-actions.c:304
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../composer/e-composer-actions.c:279
 msgid "_Attachment..."
 msgstr "_Attachmentâ?¦"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1109
+#: ../calendar/gui/dialogs/comp-editor.c:1062
 msgid "Click here to attach a file"
 msgstr "Click here to attach a file"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1070
 msgid "_Categories"
 msgstr "_Categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1072
 msgid "Toggles whether to display categories"
 msgstr "Toggles whether to display categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 msgid "Time _Zone"
 msgstr "Time _Zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
+#: ../calendar/gui/dialogs/comp-editor.c:1080
 msgid "Toggles whether the time zone is displayed"
 msgstr "Toggles whether the time zone is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Classify as public"
 msgstr "Classify as public"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1096
 msgid "_Private"
 msgstr "_Private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1098
 msgid "Classify as private"
 msgstr "Classify as private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Confidential"
 msgstr "_Confidential"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1152
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Classify as confidential"
 msgstr "Classify as confidential"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1113
 msgid "R_ole Field"
 msgstr "R_ole Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1162
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "Toggles whether the Role field is displayed"
 msgstr "Toggles whether the Role field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1168
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1170
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Toggles whether the RSVP field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "_Status Field"
 msgstr "_Status Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "Toggles whether the Status field is displayed"
 msgstr "Toggles whether the Status field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1184
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Type Field"
 msgstr "_Type Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1186
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Toggles whether the Attendee Type is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1210
-#: ../composer/e-composer-private.c:68
+#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "Recent _Documents"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1683
-#: ../composer/e-composer-actions.c:507
+#: ../composer/e-composer-actions.c:475
 msgid "Attach"
 msgstr "Attach"
 
@@ -3823,34 +3941,34 @@ msgstr "Attach"
 msgid "Save"
 msgstr "Save"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2013
-#: ../calendar/gui/dialogs/comp-editor.c:2062
-#: ../calendar/gui/dialogs/comp-editor.c:2944
+#: ../calendar/gui/dialogs/comp-editor.c:2015
+#: ../calendar/gui/dialogs/comp-editor.c:2064
+#: ../calendar/gui/dialogs/comp-editor.c:2955
 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:2912 ../mail/em-utils.c:359
-#: ../plugins/prefer-plain/prefer-plain.c:91
+#: ../calendar/gui/dialogs/comp-editor.c:2923
+#: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "attachment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2974
+#: ../calendar/gui/dialogs/comp-editor.c:2985
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:64
+#: ../calendar/gui/dialogs/copy-source-dialog.c:91
 msgid "Could not open source"
 msgstr "Could not open source"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:72
+#: ../calendar/gui/dialogs/copy-source-dialog.c:99
 msgid "Could not open destination"
 msgstr "Could not open destination"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:81
+#: ../calendar/gui/dialogs/copy-source-dialog.c:108
 msgid "Destination is read only"
 msgstr "Destination is read only"
 
-#: ../calendar/gui/dialogs/delete-comp.c:205
+#: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Delete this item from all other recipient's mailboxes?"
 
@@ -3902,146 +4020,145 @@ msgstr "The memo could not be deleted due to an error"
 msgid "The item could not be deleted due to an error"
 msgstr "The item could not be deleted due to an error"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
 msgstr "Contactsâ?¦"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:416
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
 msgstr "Delegate To:"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 msgid "Enter Delegate"
 msgstr "Enter Delegate"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:201
 msgid "_Alarms"
 msgstr "_Alarms"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "Click here to set or unset alarms for this event"
 msgstr "Click here to set or unset alarms for this event"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:208
 msgid "_Recurrence"
 msgstr "_Recurrence"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:210
 msgid "Make this a recurring event"
 msgstr "Make this a recurring event"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:215
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../plugins/groupwise-features/send-options.c:211
+#: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "Send Options"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
-#: ../calendar/gui/dialogs/task-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "Insert advanced send options"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:225
 msgid "All _Day Event"
 msgstr "All _Day Event"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Toggles whether to have All Day Event"
 msgstr "Toggles whether to have All Day Event"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:233
 msgid "Show Time as _Busy"
 msgstr "Show Time as _Busy"
 
-#: ../calendar/gui/dialogs/event-editor.c:236
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "Toggles whether to show time as busy"
 msgstr "Toggles whether to show time as busy"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 msgid "_Free/Busy"
 msgstr "_Free/Busy"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/event-editor.c:246
 msgid "Query free / busy information for the attendees"
 msgstr "Query free / busy information for the attendees"
 
-#: ../calendar/gui/dialogs/event-editor.c:292
+#: ../calendar/gui/dialogs/event-editor.c:291
 msgid "Appoint_ment"
 msgstr "Appoint_ment"
 
-#: ../calendar/gui/dialogs/event-page.c:750
+#: ../calendar/gui/dialogs/event-page.c:751
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "Event cannot be edited, because the selected calendar is read only"
 
-#: ../calendar/gui/dialogs/event-page.c:754
+#: ../calendar/gui/dialogs/event-page.c:755
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Event cannot be fully edited, because you are not the organiser"
 
-#: ../calendar/gui/dialogs/event-page.c:766
-#: ../calendar/gui/dialogs/event-page.c:2662
+#: ../calendar/gui/dialogs/event-page.c:767
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "This event has alarms"
 
-#: ../calendar/gui/dialogs/event-page.c:829
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.c:830
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganiser:"
 
-#: ../calendar/gui/dialogs/event-page.c:876
+#: ../calendar/gui/dialogs/event-page.c:877
 msgid "_Delegatees"
 msgstr "_Delegatees"
 
-#: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.c:879
 msgid "Atte_ndees"
 msgstr "Atte_ndees"
 
-#: ../calendar/gui/dialogs/event-page.c:1064
+#: ../calendar/gui/dialogs/event-page.c:1094
 msgid "Event with no start date"
 msgstr "Event with no start date"
 
-#: ../calendar/gui/dialogs/event-page.c:1067
+#: ../calendar/gui/dialogs/event-page.c:1097
 msgid "Event with no end date"
 msgstr "Event with no end date"
 
-#: ../calendar/gui/dialogs/event-page.c:1238
-#: ../calendar/gui/dialogs/memo-page.c:654
-#: ../calendar/gui/dialogs/task-page.c:833
+#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/memo-page.c:655
+#: ../calendar/gui/dialogs/task-page.c:861
 msgid "Start date is wrong"
 msgstr "Start date is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1248
+#: ../calendar/gui/dialogs/event-page.c:1278
 msgid "End date is wrong"
 msgstr "End date is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1271
+#: ../calendar/gui/dialogs/event-page.c:1301
 msgid "Start time is wrong"
 msgstr "Start time is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1308
 msgid "End time is wrong"
 msgstr "End time is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1440
-#: ../calendar/gui/dialogs/memo-page.c:695
-#: ../calendar/gui/dialogs/task-page.c:893
+#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/memo-page.c:696
+#: ../calendar/gui/dialogs/task-page.c:921
 msgid "The organizer selected no longer has an account."
 msgstr "The organiser selected no longer has an account."
 
-#: ../calendar/gui/dialogs/event-page.c:1446
-#: ../calendar/gui/dialogs/memo-page.c:701
-#: ../calendar/gui/dialogs/task-page.c:899
+#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/memo-page.c:702
+#: ../calendar/gui/dialogs/task-page.c:927
 msgid "An organizer is required."
 msgstr "An organiser is required."
 
-#: ../calendar/gui/dialogs/event-page.c:1471
-#: ../calendar/gui/dialogs/task-page.c:923
+#: ../calendar/gui/dialogs/event-page.c:1501
+#: ../calendar/gui/dialogs/task-page.c:951
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: ../calendar/gui/dialogs/event-page.c:2535
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Unable to open the calendar '%s'."
@@ -4052,172 +4169,145 @@ msgstr "Unable to open the calendar '%s'."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2579
-#: ../calendar/gui/dialogs/memo-page.c:910
-#: ../calendar/gui/dialogs/task-page.c:1717
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:914
+#: ../calendar/gui/dialogs/task-page.c:1743
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "You are acting on behalf of %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2879
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, 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:2885
+#: ../calendar/gui/dialogs/event-page.c:2943
 #, 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:2891
+#: ../calendar/gui/dialogs/event-page.c:2949
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minute before appointment"
 msgstr[1] "%d minutes before appointment"
 
-#: ../calendar/gui/dialogs/event-page.c:2904
+#: ../calendar/gui/dialogs/event-page.c:2962
 msgid "Customize"
 msgstr "Customise"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid ""
-"15 minutes before appointment\n"
-"1 hour before appointment\n"
-"1 day before appointment"
-msgstr ""
-"15 minutes before appointment\n"
-"1 hour before appointment\n"
-"1 day before appointment"
+#. Translators: "None" for "No alarm set"
+#: ../calendar/gui/dialogs/event-page.c:2964
+msgctxt "cal-alarms"
+msgid "None"
+msgstr "None"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:1
+msgid "1 day before appointment"
+msgstr "1 day before appointment"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+msgid "1 hour before appointment"
+msgstr "1 hour before appointment"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:3
+msgid "15 minutes before appointment"
+msgstr "15 minutes before appointment"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:5
 msgid "Attendee_s..."
 msgstr "Attendee_sâ?¦"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 #: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "Attendees"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "Custom Alarm:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "Event Description"
 msgstr "Event Description"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
 msgid "Su_mmary:"
 msgstr "Su_mmary:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Alarm"
 msgstr "_Alarm"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Description:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:363
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:356
 msgid "_Location:"
 msgstr "_Location:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "_Time:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../mail/mail-config.glade.h:167 ../mail/mail-dialogs.glade.h:21
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
-#: ../smime/gui/smime-ui.glade.h:49
-msgid ""
-"a\n"
-"b"
-msgstr ""
-"a\n"
-"b"
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgid "for"
+msgstr "for"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-msgid ""
-"for\n"
-"until"
-msgstr ""
-"for\n"
-"until"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:23
-#: ../plugins/caldav/caldav-source.c:449
-#: ../plugins/calendar-file/calendar-file.c:294
-#: ../plugins/calendar-http/calendar-http.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:515
-#: ../plugins/google-account-setup/google-contacts-source.c:331
-#: ../plugins/google-account-setup/google-source.c:740
-#, fuzzy
-msgid "hours"
-msgstr "hour"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../modules/addressbook/ldap-config.glade.h:43
-#: ../plugins/caldav/caldav-source.c:448
-#: ../plugins/calendar-file/calendar-file.c:293
-#: ../plugins/calendar-http/calendar-http.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:514
-#: ../plugins/google-account-setup/google-contacts-source.c:330
-#: ../plugins/google-account-setup/google-source.c:739
-msgid "minutes"
-msgstr "minutes"
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+msgid "until"
+msgstr "until"
 
-#: ../calendar/gui/dialogs/memo-editor.c:110 ../calendar/gui/print.c:2499
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
 msgid "Memo"
 msgstr "Memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:347
+#: ../calendar/gui/dialogs/memo-page.c:350
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Memo cannot be edited, because the selected memo list is read only"
 
-#: ../calendar/gui/dialogs/memo-page.c:351
+#: ../calendar/gui/dialogs/memo-page.c:354
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Memo cannot be fully edited, because you are not the organiser"
 
-#: ../calendar/gui/dialogs/memo-page.c:871
+#: ../calendar/gui/dialogs/memo-page.c:875
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Unable to open memos in '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1037 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:938 ../mail/em-format-html.c:2137
-#: ../mail/em-format-html.c:2195 ../mail/em-format-html.c:2220
+#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
+#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
+#: ../mail/em-format-html.c:2299 ../mail/em-format-html.c:2324
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "To"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Sta_rt date:"
 msgstr "Sta_rt date:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "T_o:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:378
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/memo-page.ui.h:7
+#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Group:"
 
@@ -4392,54 +4482,37 @@ msgstr "Could not get a selection to delete."
 msgid "Date/Time"
 msgstr "Date/Time"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "<b>Exceptions</b>"
-msgstr "<b>Exceptions</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
-msgid "<b>Preview</b>"
-msgstr "<b>Preview</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "<b>Recurrence</b>"
-msgstr "<b>Recurrence</b>"
-
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
 msgid "Every"
 msgstr "Every"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
+msgid "Exceptions"
+msgstr "Exceptions"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+msgid "Preview"
+msgstr "Preview"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
 msgid "This appointment rec_urs"
 msgstr "This appointment rec_urs"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid ""
-"day(s)\n"
-"week(s)\n"
-"month(s)\n"
-"year(s)"
-msgstr ""
-"day(s)\n"
-"week(s)\n"
-"month(s)\n"
-"year(s)"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+msgid "forever"
+msgstr "forever"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
-msgid ""
-"for\n"
-"until\n"
-"forever"
-msgstr ""
-"for\n"
-"until\n"
-"forever"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgid "month(s)"
+msgstr "month(s)"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+msgid "week(s)"
+msgstr "week(s)"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+msgid "year(s)"
+msgstr "year(s)"
 
 #: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
@@ -4454,119 +4527,165 @@ msgstr "Notify new attendees _only"
 msgid "Completed date is wrong"
 msgstr "Completed date is wrong"
 
-#: ../calendar/gui/dialogs/task-details-page.c:484
+#: ../calendar/gui/dialogs/task-details-page.c:485
 msgid "Web Page"
 msgstr "Web Page"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:1
-msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\">Miscellaneous</span>"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:292
+#: ../calendar/gui/e-cal-model-tasks.c:463
+#: ../calendar/gui/e-cal-model-tasks.c:737
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
+#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:212
+#: ../calendar/gui/e-task-table.c:227 ../calendar/gui/e-task-table.c:582
+#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:367
+msgid "Completed"
+msgstr "Completed"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "<span weight=\"bold\">Status</span>"
-msgstr "<span weight=\"bold\">Status</span>"
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-task-table.c:507 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+msgid "High"
+msgstr "High"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-msgid ""
-"High\n"
-"Normal\n"
-"Low\n"
-"Undefined"
-msgstr ""
-"High\n"
-"Normal\n"
-"Low\n"
-"Undefined"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:289
+#: ../calendar/gui/e-cal-model-tasks.c:461
+#: ../calendar/gui/e-cal-model-tasks.c:735
+#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:581
+#: ../calendar/gui/print.c:2645
+msgid "In Progress"
+msgstr "In Progress"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-msgid ""
-"Not Started\n"
-"In Progress\n"
-"Completed\n"
-"Canceled"
-msgstr ""
-"Not Started\n"
-"In Progress\n"
-"Completed\n"
-"Cancelled"
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/e-cal-component-preview.c:318
+#: ../calendar/gui/e-task-table.c:509 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+msgid "Low"
+msgstr "Low"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:508
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../widgets/misc/e-send-options.ui.h:13
+msgid "Normal"
+msgstr "Normal"
+
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:15
+#: ../calendar/gui/e-cal-component-preview.c:299
+#: ../calendar/gui/e-cal-model-tasks.c:459
+#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:208
+#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:580
+#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "Not Started"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
 msgid "P_ercent complete:"
 msgstr "P_ercent complete:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
 msgid "Stat_us:"
 msgstr "Stat_us:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/dialogs/task-details-page.ui.h:18
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:1743
+#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "Status"
+
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:20
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:24
+msgid "Undefined"
+msgstr "Undefined"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
 msgstr "_Date completed:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Priority:"
 msgstr "_Priority:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:23
 msgid "_Web Page:"
 msgstr "_Web Page:"
 
-#: ../calendar/gui/dialogs/task-editor.c:113
+#: ../calendar/gui/dialogs/task-editor.c:112
 msgid "_Status Details"
 msgstr "_Status Details"
 
-#: ../calendar/gui/dialogs/task-editor.c:115
+#: ../calendar/gui/dialogs/task-editor.c:114
 msgid "Click to change or view the status details of the task"
 msgstr "Click to change or view the status details of the task"
 
-#: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:360
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "_Send Options"
 
-#: ../calendar/gui/dialogs/task-editor.c:335
+#: ../calendar/gui/dialogs/task-editor.c:334
 msgid "_Task"
 msgstr "_Task"
 
-#: ../calendar/gui/dialogs/task-editor.c:338
+#: ../calendar/gui/dialogs/task-editor.c:337
 msgid "Task Details"
 msgstr "Task Details"
 
-#: ../calendar/gui/dialogs/task-page.c:334
+#: ../calendar/gui/dialogs/task-page.c:336
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "Task cannot be edited, because the selected task list is read only"
 
-#: ../calendar/gui/dialogs/task-page.c:338
+#: ../calendar/gui/dialogs/task-page.c:340
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Task cannot be fully edited, because you are not the organiser"
 
-#: ../calendar/gui/dialogs/task-page.c:386
-#: ../calendar/gui/dialogs/task-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_ser:"
 
-#: ../calendar/gui/dialogs/task-page.c:806
+#: ../calendar/gui/dialogs/task-page.c:834
 msgid "Due date is wrong"
 msgstr "Due date is wrong"
 
-#: ../calendar/gui/dialogs/task-page.c:1674
+#: ../calendar/gui/dialogs/task-page.c:1700
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Unable to open tasks in '%s'."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:1
 msgid "Atte_ndees..."
 msgstr "Atte_ndeesâ?¦"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "Categor_iesâ?¦"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "D_ue date:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:7
 msgid "Time zone:"
 msgstr "Time zone:"
 
@@ -4586,31 +4705,6 @@ msgid_plural "%d weeks"
 msgstr[0] "%d week"
 msgstr[1] "%d weeks"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:406 ../calendar/gui/misc.c:116
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hour"
-msgstr[1] "%d hours"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:412 ../calendar/gui/misc.c:122
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minute"
-msgstr[1] "%d minutes"
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/e-alarm-list.c:418 ../calendar/gui/misc.c:126
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d second"
-msgstr[1] "%d seconds"
-
 #: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Unknown action to be performed"
@@ -4671,108 +4765,53 @@ 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:110 ../filter/filter-rule.c:863
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "Untitled"
 
-#: ../calendar/gui/e-cal-component-preview.c:116
-#, fuzzy
+#: ../calendar/gui/e-cal-component-preview.c:198
 msgid "Categories:"
-msgstr "Categories"
+msgstr "Categories:"
 
-#: ../calendar/gui/e-cal-component-preview.c:151
-#: ../calendar/gui/e-itip-control.c:1163
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Summary:"
 
-#: ../calendar/gui/e-cal-component-preview.c:158
-#: ../calendar/gui/e-cal-component-preview.c:169
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:259
 msgid "Start Date:"
 msgstr "Start Date:"
 
-#: ../calendar/gui/e-cal-component-preview.c:180
+#: ../calendar/gui/e-cal-component-preview.c:272
 msgid "Due Date:"
 msgstr "Due Date:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:191
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/exchange-operations/exchange-account-setup.c:283
-#: ../plugins/itip-formatter/itip-view.c:1054
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1176
+#: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:195
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:777
-#: ../calendar/gui/e-cal-model-tasks.c:854
-#: ../calendar/gui/e-calendar-table.c:220
-#: ../calendar/gui/e-calendar-table.c:231
-#: ../calendar/gui/e-calendar-table.c:798 ../calendar/gui/print.c:2572
-msgid "In Progress"
-msgstr "In Progress"
-
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/e-cal-component-preview.c:198
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:779
-#: ../calendar/gui/e-calendar-table.c:222
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:799 ../calendar/gui/e-itip-control.c:948
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/print.c:2575 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:360
-msgid "Completed"
-msgstr "Completed"
-
-#: ../calendar/gui/e-cal-component-preview.c:205
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:775
-#: ../calendar/gui/e-calendar-table.c:218
-#: ../calendar/gui/e-calendar-table.c:229
-#: ../calendar/gui/e-calendar-table.c:797 ../calendar/gui/print.c:2569
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "Not Started"
-
-#: ../calendar/gui/e-cal-component-preview.c:216
+#: ../calendar/gui/e-cal-component-preview.c:312
 msgid "Priority:"
 msgstr "Priority:"
 
-#: ../calendar/gui/e-cal-component-preview.c:218
-#: ../calendar/gui/e-calendar-table.c:724 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1077
-msgid "High"
-msgstr "High"
-
-#: ../calendar/gui/e-cal-component-preview.c:220
-#: ../calendar/gui/e-cal-model.c:1232 ../calendar/gui/e-calendar-table.c:725
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1076
-msgid "Normal"
-msgstr "Normal"
-
-#: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-calendar-table.c:726 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1075
-msgid "Low"
-msgstr "Low"
-
-#: ../calendar/gui/e-cal-component-preview.c:239
-#: ../calendar/gui/e-itip-control.c:1219
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:65
+#: ../calendar/gui/e-cal-component-preview.c:337
+#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:34
 msgid "Description:"
 msgstr "Description:"
 
-#: ../calendar/gui/e-cal-component-preview.c:263
+#: ../calendar/gui/e-cal-component-preview.c:368
 msgid "Web Page:"
 msgstr "Web Page:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Created"
 msgstr "Created"
 
@@ -4792,17 +4831,16 @@ msgid "Start Date"
 msgstr "Start Date"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:776
+#: ../calendar/gui/e-task-table.c:559
 msgid "Free"
 msgstr "Free"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:777
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:560
 msgid "Busy"
 msgstr "Busy"
 
-#: ../calendar/gui/e-cal-model-tasks.c:727
+#: ../calendar/gui/e-cal-model-tasks.c:681
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4812,7 +4850,13 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1129 ../calendar/gui/e-cal-model.c:1238
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:731
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "None"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
 #: ../calendar/gui/e-meeting-store.c:856
@@ -4820,149 +4864,53 @@ msgstr ""
 msgid "Yes"
 msgstr "Yes"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1129 ../calendar/gui/e-cal-model.c:1238
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:174
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "No"
 
-#: ../calendar/gui/e-cal-model.c:362 ../calendar/gui/gnome-cal.c:523
-#: ../shell/e-shell.c:720
-#, fuzzy
+#: ../calendar/gui/e-cal-model.c:377
+msgid "Default Client"
+msgstr "Default Client"
+
+#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
+#: ../shell/e-shell.c:836
 msgid "Shell Settings"
-msgstr "Settings"
+msgstr "Shell Settings"
 
-#: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:524
-#: ../shell/e-shell.c:721
-#, fuzzy
+#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
+#: ../shell/e-shell.c:837
 msgid "Application-wide settings"
-msgstr "Autocompletion Settings"
+msgstr "Application-wide settings"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:528 ../calendar/gui/e-itip-control.c:1204
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-itip-control.c:1336
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:977
-#: ../calendar/gui/print.c:994 ../e-util/e-charset.c:52
-#: ../mail/em-utils.c:1224 ../plugins/itip-formatter/itip-formatter.c:449
-#: ../plugins/itip-formatter/itip-formatter.c:2242
+#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:931
+#: ../plugins/itip-formatter/itip-formatter.c:461
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../calendar/gui/e-cal-model.c:1234
+#: ../calendar/gui/e-cal-model.c:1306
 msgid "Recurring"
 msgstr "Recurring"
 
-#: ../calendar/gui/e-cal-model.c:1236
+#: ../calendar/gui/e-cal-model.c:1308
 msgid "Assigned"
 msgstr "Assigned"
 
-#: ../calendar/gui/e-calendar-table.c:337 ../calendar/gui/e-memo-table.c:270
-msgid "* No Summary *"
-msgstr "* No Summary *"
-
-#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:1743 ../calendar/gui/e-memo-table.c:306
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organiser: %s <%s>"
-
-#. With SunOne accounts, there may be no ':' in organiser.value
-#. With SunOne accouts, there may be no ':' in organiser.value
-#. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-view.c:1747 ../calendar/gui/e-memo-table.c:309
+#: ../calendar/gui/e-cal-model.c:2203
 #, c-format
-msgid "Organizer: %s"
-msgstr "Organiser: %s"
-
-#: ../calendar/gui/e-calendar-table.c:415 ../calendar/gui/e-memo-table.c:348
-msgid "Start: "
-msgstr "Start: "
-
-#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/e-memo-table.c:366
-msgid "Due: "
-msgstr "Due: "
-
-#: ../calendar/gui/e-calendar-table.c:727 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "Undefined"
-
-#: ../calendar/gui/e-calendar-table.c:746
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-calendar-table.c:747
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-calendar-table.c:748
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-calendar-table.c:749
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-calendar-table.c:750
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-calendar-table.c:751
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-calendar-table.c:752
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-calendar-table.c:753
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-calendar-table.c:754
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-calendar-table.c:755
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-calendar-table.c:756
-msgid "100%"
-msgstr "100%"
-
-#: ../calendar/gui/e-calendar-table.c:864 ../calendar/gui/print.c:1973
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:751
-#: ../modules/calendar/e-cal-shell-content.c:405
-#: ../modules/calendar/e-task-shell-view-actions.c:284
-#: ../modules/calendar/e-task-shell-view-actions.c:301
-#: ../modules/calendar/e-task-shell-view.c:426
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:586
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
-msgid "Tasks"
-msgstr "Tasks"
-
-#: ../calendar/gui/e-calendar-table.c:1108
-#: ../calendar/gui/e-calendar-view.c:610 ../calendar/gui/e-memo-table.c:894
-msgid "Deleting selected objects"
-msgstr "Deleting selected objects"
-
-#: ../calendar/gui/e-calendar-table.c:1403
-#: ../calendar/gui/e-calendar-view.c:828 ../calendar/gui/e-memo-table.c:1118
-msgid "Updating objects"
-msgstr "Updating objects"
+msgid "Opening %s"
+msgstr "Opening %s"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -4987,7 +4935,7 @@ msgstr "Due date"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Priority"
 msgstr "Priority"
 
@@ -4995,82 +4943,113 @@ msgstr "Priority"
 msgid "Start date"
 msgstr "Start date"
 
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1651
-#: ../calendar/gui/e-meeting-list-view.c:598
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "Status"
-
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:561
+#: ../calendar/gui/e-meeting-list-view.c:566
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
 #: ../widgets/misc/e-attachment-tree-view.c:554
 msgid "Type"
 msgstr "Type"
 
-#: ../calendar/gui/e-calendar-view.c:1598
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:392
+msgid "Cut selected events to the clipboard"
+msgstr "Cut selected events to the clipboard"
+
+#: ../calendar/gui/e-calendar-view.c:398
+msgid "Copy selected events to the clipboard"
+msgstr "Copy selected events to the clipboard"
+
+#: ../calendar/gui/e-calendar-view.c:404
+msgid "Paste events from the clipboard"
+msgstr "Paste events from the clipboard"
+
+#: ../calendar/gui/e-calendar-view.c:410
+msgid "Delete selected events"
+msgstr "Delete selected events"
+
+#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:186
+#: ../calendar/gui/e-task-table.c:264
+msgid "Deleting selected objects"
+msgstr "Deleting selected objects"
+
+#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:841
+#: ../calendar/gui/e-task-table.c:1062
+msgid "Updating objects"
+msgstr "Updating objects"
+
+#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2230
+#: ../plugins/itip-formatter/itip-formatter.c:2326
 msgid "Accepted"
 msgstr "Accepted"
 
-#: ../calendar/gui/e-calendar-view.c:1599
-#: ../calendar/gui/e-itip-control.c:1200
+#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2236
+#: ../plugins/itip-formatter/itip-formatter.c:2332
 msgid "Declined"
 msgstr "Declined"
 
-#: ../calendar/gui/e-calendar-view.c:1600
+#: ../calendar/gui/e-calendar-view.c:1692
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:542
 msgid "Tentative"
 msgstr "Tentative"
 
-#: ../calendar/gui/e-calendar-view.c:1601
+#: ../calendar/gui/e-calendar-view.c:1693
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2239
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "Delegated"
 msgstr "Delegated"
 
-#: ../calendar/gui/e-calendar-view.c:1602
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Needs action"
 msgstr "Needs action"
 
+#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
+#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:526
+#: ../calendar/gui/e-task-table.c:737
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organiser: %s <%s>"
+
+#. With SunOne accouts, there may be no ':' in organiser.value
+#. With SunOne accounts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:531
+#: ../calendar/gui/e-task-table.c:740
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organiser: %s"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1763 ../calendar/gui/print.c:2531
+#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
 #, c-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1794
+#: ../calendar/gui/e-calendar-view.c:1886
 #, c-format
 msgid "Time: %s %s"
 msgstr "Time: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:162
+#: ../calendar/gui/e-cell-date-edit-text.c:160
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:165
+#: ../calendar/gui/e-cell-date-edit-text.c:163
 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:173
+#: ../calendar/gui/e-cell-date-edit-text.c:171
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5083,12 +5062,12 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:750
+#: ../calendar/gui/e-day-view-time-item.c:759
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minute divisions"
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:780
 msgid "Show the second time zone"
 msgstr "Show the second time zone"
 
@@ -5098,8 +5077,8 @@ msgstr "Show the second time zone"
 #. 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:843 ../calendar/gui/e-day-view.c:1888
-#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1665
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1884
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5109,10 +5088,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:847 ../calendar/gui/e-day-view.c:1905
-#: ../calendar/gui/e-week-view-main-item.c:368
-#: ../calendar/gui/ea-gnome-calendar.c:189
-#: ../modules/calendar/e-cal-shell-view-private.c:856
+#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1901
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:894
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5121,50 +5100,50 @@ msgstr "%a %d %b"
 #. 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/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1921
-#: ../calendar/gui/e-week-view-main-item.c:382
-#: ../calendar/gui/ea-gnome-calendar.c:219
-#: ../modules/calendar/e-cal-shell-view-private.c:892
+#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1917
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../modules/calendar/e-cal-shell-view-private.c:930
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1124 ../calendar/gui/e-week-view.c:510
-#: ../calendar/gui/print.c:824
+#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1127 ../calendar/gui/e-week-view.c:513
-#: ../calendar/gui/print.c:826
+#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2626
+#: ../calendar/gui/e-day-view.c:2614
 #, c-format
 msgid "Week %d"
 msgstr "Week %d"
 
-#: ../calendar/gui/e-itip-control.c:767
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Yes. (Complex Recurrence)"
 
-#: ../calendar/gui/e-itip-control.c:784
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Every day"
 msgstr[1] "Every %d days"
 
-#: ../calendar/gui/e-itip-control.c:797
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Every week"
 msgstr[1] "Every %d weeks"
 
-#: ../calendar/gui/e-itip-control.c:804
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -5172,35 +5151,35 @@ msgstr[0] "Every week on "
 msgstr[1] "Every %d weeks on "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:815
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " and "
 
-#: ../calendar/gui/e-itip-control.c:824
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "The %s day of "
 
-#: ../calendar/gui/e-itip-control.c:840
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "The %s %s of "
 
-#: ../calendar/gui/e-itip-control.c:851
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "every month"
 msgstr[1] "every %d months"
 
-#: ../calendar/gui/e-itip-control.c:863
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Every year"
 msgstr[1] "Every %d years"
 
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:874
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -5208,47 +5187,45 @@ msgstr[0] "a total of %d time"
 msgstr[1] "a total of %d times"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:887
+#: ../calendar/gui/e-itip-control.c:885
 msgid ", ending on "
 msgstr ", ending on "
 
 #. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:909
+#: ../calendar/gui/e-itip-control.c:906
 msgid "Starts"
 msgstr "Starts"
 
 #. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:923
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "Ends"
 
-#: ../calendar/gui/e-itip-control.c:963
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/e-itip-control.c:943
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Due"
 msgstr "Due"
 
-#: ../calendar/gui/e-itip-control.c:1004 ../calendar/gui/e-itip-control.c:1061
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
 msgid "iCalendar Information"
 msgstr "iCalendar Information"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1021
+#: ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Error"
 msgstr "iCalendar Error"
 
-#: ../calendar/gui/e-itip-control.c:1093 ../calendar/gui/e-itip-control.c:1109
-#: ../calendar/gui/e-itip-control.c:1120 ../calendar/gui/e-itip-control.c:1137
-#: ../plugins/itip-formatter/itip-view.c:346
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:434
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:522
-#: ../plugins/itip-formatter/itip-view.c:523
+#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
+#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:526
 msgid "An unknown person"
 msgstr "An unknown person"
 
-#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1144
+#: ../calendar/gui/e-itip-control.c:1132
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5256,18 +5233,19 @@ msgstr ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 
-#. Location
-#: ../calendar/gui/e-itip-control.c:1173
-#: ../plugins/itip-formatter/itip-view.c:1023
-msgid "Location:"
-msgstr "Location:"
+#. Translators: "None" used as a default value for events without Summary received by mail
+#: ../calendar/gui/e-itip-control.c:1147
+#: ../plugins/itip-formatter/itip-formatter.c:2313
+msgctxt "cal-itip"
+msgid "None"
+msgstr "None"
 
-#: ../calendar/gui/e-itip-control.c:1196
-#: ../plugins/itip-formatter/itip-formatter.c:2233
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2329
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
-#: ../calendar/gui/e-itip-control.c:1283
+#: ../calendar/gui/e-itip-control.c:1277
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
@@ -5275,298 +5253,298 @@ msgstr ""
 "The meeting has been cancelled, however it could not be found in your "
 "calendars"
 
-#: ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1279
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "The task has been cancelled, however it could not be found in your task lists"
 
-#: ../calendar/gui/e-itip-control.c:1362
+#: ../calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> has published meeting information."
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1357
 msgid "Meeting Information"
 msgstr "Meeting Information"
 
-#: ../calendar/gui/e-itip-control.c:1369
+#: ../calendar/gui/e-itip-control.c:1363
 #, 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:1371
+#: ../calendar/gui/e-itip-control.c:1365
 #, 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:1372
+#: ../calendar/gui/e-itip-control.c:1366
 msgid "Meeting Proposal"
 msgstr "Meeting Proposal"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> wishes to be added to an existing meeting."
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Update"
 msgstr "Meeting Update"
 
-#: ../calendar/gui/e-itip-control.c:1383
+#: ../calendar/gui/e-itip-control.c:1377
 #, 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:1384
+#: ../calendar/gui/e-itip-control.c:1378
 msgid "Meeting Update Request"
 msgstr "Meeting Update Request"
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1385
 #, 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:1392
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Reply"
 msgstr "Meeting Reply"
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> has cancelled a meeting."
 
-#: ../calendar/gui/e-itip-control.c:1400
+#: ../calendar/gui/e-itip-control.c:1394
 msgid "Meeting Cancelation"
 msgstr "Meeting Cancellation"
 
-#: ../calendar/gui/e-itip-control.c:1410 ../calendar/gui/e-itip-control.c:1487
-#: ../calendar/gui/e-itip-control.c:1527
+#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
+#: ../calendar/gui/e-itip-control.c:1521
 #, 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:1411
+#: ../calendar/gui/e-itip-control.c:1405
 msgid "Bad Meeting Message"
 msgstr "Bad Meeting Message"
 
-#: ../calendar/gui/e-itip-control.c:1438
+#: ../calendar/gui/e-itip-control.c:1432
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> has published task information."
 
-#: ../calendar/gui/e-itip-control.c:1439
+#: ../calendar/gui/e-itip-control.c:1433
 msgid "Task Information"
 msgstr "Task Information"
 
-#: ../calendar/gui/e-itip-control.c:1446
+#: ../calendar/gui/e-itip-control.c:1440
 #, 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:1448
+#: ../calendar/gui/e-itip-control.c:1442
 #, 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:1449
+#: ../calendar/gui/e-itip-control.c:1443
 msgid "Task Proposal"
 msgstr "Task Proposal"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> wishes to be added to an existing task."
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Update"
 msgstr "Task Update"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1454
 #, 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:1461
+#: ../calendar/gui/e-itip-control.c:1455
 msgid "Task Update Request"
 msgstr "Task Update Request"
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1462
 #, 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:1469
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Reply"
 msgstr "Task Reply"
 
-#: ../calendar/gui/e-itip-control.c:1476
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> has cancelled a task."
 
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Task Cancelation"
 msgstr "Task Cancellation"
 
-#: ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1482
 msgid "Bad Task Message"
 msgstr "Bad Task Message"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1506
 #, 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:1513
+#: ../calendar/gui/e-itip-control.c:1507
 msgid "Free/Busy Information"
 msgstr "Free/Busy Information"
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1511
 #, 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:1518
+#: ../calendar/gui/e-itip-control.c:1512
 msgid "Free/Busy Request"
 msgstr "Free/Busy Request"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1516
 #, 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:1523
+#: ../calendar/gui/e-itip-control.c:1517
 msgid "Free/Busy Reply"
 msgstr "Free/Busy Reply"
 
-#: ../calendar/gui/e-itip-control.c:1528
+#: ../calendar/gui/e-itip-control.c:1522
 msgid "Bad Free/Busy Message"
 msgstr "Bad Free/Busy Message"
 
-#: ../calendar/gui/e-itip-control.c:1604
+#: ../calendar/gui/e-itip-control.c:1598
 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:1663
+#: ../calendar/gui/e-itip-control.c:1657
 msgid "The message contains only unsupported requests."
 msgstr "The message contains only unsupported requests."
 
-#: ../calendar/gui/e-itip-control.c:1696
+#: ../calendar/gui/e-itip-control.c:1690
 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:1734
+#: ../calendar/gui/e-itip-control.c:1728
 msgid "The attachment has no viewable calendar items"
 msgstr "The attachment has no viewable calendar items"
 
-#: ../calendar/gui/e-itip-control.c:1976
+#: ../calendar/gui/e-itip-control.c:1970
 msgid "Update complete\n"
 msgstr "Update complete\n"
 
-#: ../calendar/gui/e-itip-control.c:2010
+#: ../calendar/gui/e-itip-control.c:2004
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is invalid and cannot be updated\n"
 
-#: ../calendar/gui/e-itip-control.c:2027
+#: ../calendar/gui/e-itip-control.c:2022
 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:2045
+#: ../calendar/gui/e-itip-control.c:2040
 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:2069
+#: ../calendar/gui/e-itip-control.c:2064
 msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
-#: ../calendar/gui/e-itip-control.c:2076
-#: ../plugins/itip-formatter/itip-formatter.c:1394
+#: ../calendar/gui/e-itip-control.c:2071
+#: ../plugins/itip-formatter/itip-formatter.c:1421
 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:2107 ../calendar/gui/e-itip-control.c:2164
+#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
 msgid "Item sent!\n"
 msgstr "Item sent!\n"
 
-#: ../calendar/gui/e-itip-control.c:2113 ../calendar/gui/e-itip-control.c:2172
+#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
 msgid "The item could not be sent!\n"
 msgstr "The item could not be sent!\n"
 
-#: ../calendar/gui/e-itip-control.c:2290
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Choose an action:"
 msgstr "Choose an action:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2319
-#: ../calendar/gui/e-meeting-list-view.c:586
+#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-meeting-list-view.c:591
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2359
+#: ../calendar/gui/e-itip-control.c:2329
 msgid "Update"
 msgstr "Update"
 
-#: ../calendar/gui/e-itip-control.c:2383
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../calendar/gui/e-itip-control.c:2353
+#: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "Accept"
 
-#: ../calendar/gui/e-itip-control.c:2384
+#: ../calendar/gui/e-itip-control.c:2354
 msgid "Tentatively accept"
 msgstr "Tentatively accept"
 
-#: ../calendar/gui/e-itip-control.c:2385
-#: ../plugins/groupwise-features/process-meeting.c:54
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "Decline"
 
-#: ../calendar/gui/e-itip-control.c:2410
+#: ../calendar/gui/e-itip-control.c:2380
 msgid "Send Free/Busy Information"
 msgstr "Send Free/Busy Information"
 
-#: ../calendar/gui/e-itip-control.c:2434
+#: ../calendar/gui/e-itip-control.c:2404
 msgid "Update respondent status"
 msgstr "Update respondent status"
 
-#: ../calendar/gui/e-itip-control.c:2458
+#: ../calendar/gui/e-itip-control.c:2428
 msgid "Send Latest Information"
 msgstr "Send Latest Information"
 
-#: ../calendar/gui/e-itip-control.c:2482
-#: ../modules/mail/e-mail-shell-view-actions.c:1210
+#: ../calendar/gui/e-itip-control.c:2452
+#: ../modules/mail/e-mail-shell-view-actions.c:1032
 #: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.ui.h:1
 msgid "--to--"
 msgstr "--to--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.ui.h:2
 msgid "Calendar Message"
 msgstr "Calendar Message"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.ui.h:3
 msgid "Date:"
 msgstr "Date:"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.ui.h:5
 msgid "Loading Calendar"
 msgstr "Loading Calendar"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.ui.h:6
 msgid "Loading calendar..."
 msgstr "Loading calendarâ?¦"
 
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.ui.h:7
 msgid "Organizer:"
 msgstr "Organiser:"
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.ui.h:8
 msgid "Server Message:"
 msgstr "Server Message:"
 
@@ -5588,49 +5566,49 @@ msgstr "Resources"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
 #: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:973
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
 #: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
-#: ../calendar/gui/print.c:974 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Group"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
 #: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/print.c:975
+#: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Resource"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
 #: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../calendar/gui/print.c:976
+#: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Room"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
 #: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:990
+#: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Chair"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:991
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Required Participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
-#: ../calendar/gui/print.c:992
+#: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/print.c:993
+#: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
@@ -5641,7 +5619,7 @@ msgid "Needs Action"
 msgstr "Needs Action"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:541
+#: ../calendar/gui/e-meeting-list-view.c:546
 msgid "Attendee                          "
 msgstr "Attendee                          "
 
@@ -5652,7 +5630,7 @@ 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2272
+#: ../calendar/gui/e-meeting-time-sel.c:2284
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -5661,7 +5639,7 @@ msgstr "%A, %d %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2303
+#: ../calendar/gui/e-meeting-time-sel.c:2315
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -5671,67 +5649,67 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "Out of Office"
 msgstr "Out of Office"
 
-#: ../calendar/gui/e-meeting-time-sel.c:546
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "No Information"
 msgstr "No Information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "A_ttendees..."
 msgstr "A_ttendeesâ?¦"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:581
 msgid "O_ptions"
 msgstr "O_ptions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:598
 msgid "Show _only working hours"
 msgstr "Show _only working hours"
 
-#: ../calendar/gui/e-meeting-time-sel.c:609
+#: ../calendar/gui/e-meeting-time-sel.c:608
 msgid "Show _zoomed out"
 msgstr "Show _zoomed out"
 
-#: ../calendar/gui/e-meeting-time-sel.c:624
+#: ../calendar/gui/e-meeting-time-sel.c:623
 msgid "_Update free/busy"
 msgstr "_Update free/busy"
 
-#: ../calendar/gui/e-meeting-time-sel.c:639
+#: ../calendar/gui/e-meeting-time-sel.c:638
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:657
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: ../calendar/gui/e-meeting-time-sel.c:672
+#: ../calendar/gui/e-meeting-time-sel.c:671
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:689
+#: ../calendar/gui/e-meeting-time-sel.c:688
 msgid "_All people and resources"
 msgstr "_All people and resources"
 
-#: ../calendar/gui/e-meeting-time-sel.c:698
+#: ../calendar/gui/e-meeting-time-sel.c:697
 msgid "All _people and one resource"
 msgstr "All _people and one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:707
+#: ../calendar/gui/e-meeting-time-sel.c:706
 msgid "_Required people"
 msgstr "_Required people"
 
-#: ../calendar/gui/e-meeting-time-sel.c:716
+#: ../calendar/gui/e-meeting-time-sel.c:714
 msgid "Required people and _one resource"
 msgstr "Required people and _one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:762
+#: ../calendar/gui/e-meeting-time-sel.c:760
 msgid "_Start time:"
 msgstr "_Start time:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:799
+#: ../calendar/gui/e-meeting-time-sel.c:797
 msgid "_End time:"
 msgstr "_End time:"
 
@@ -5759,18 +5737,131 @@ msgstr "Language"
 msgid "Member"
 msgstr "Member"
 
-#: ../calendar/gui/e-memo-table.c:647
-#: ../modules/calendar/e-cal-shell-content.c:429
-#: ../modules/calendar/e-memo-shell-view-actions.c:253
-#: ../modules/calendar/e-memo-shell-view-actions.c:270
-#: ../modules/calendar/e-memo-shell-view.c:279
+#: ../calendar/gui/e-memo-table.c:410
+#: ../modules/calendar/e-cal-shell-content.c:399
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view.c:289
+#: ../plugins/caldav/caldav-browse-server.c:432
 msgid "Memos"
 msgstr "Memos"
 
+#: ../calendar/gui/e-memo-table.c:488 ../calendar/gui/e-task-table.c:701
+msgid "* No Summary *"
+msgstr "* No Summary *"
+
+#: ../calendar/gui/e-memo-table.c:572 ../calendar/gui/e-task-table.c:781
+msgid "Start: "
+msgstr "Start: "
+
+#: ../calendar/gui/e-memo-table.c:590 ../calendar/gui/e-task-table.c:799
+msgid "Due: "
+msgstr "Due: "
+
+#: ../calendar/gui/e-memo-table.c:706
+msgid "Cut selected memos to the clipboard"
+msgstr "Cut selected memos to the clipboard"
+
+#: ../calendar/gui/e-memo-table.c:712
+msgid "Copy selected memos to the clipboard"
+msgstr "Copy selected memos to the clipboard"
+
+#: ../calendar/gui/e-memo-table.c:718
+msgid "Paste memos from the clipboard"
+msgstr "Paste memos from the clipboard"
+
+#: ../calendar/gui/e-memo-table.c:724
+#: ../modules/calendar/e-memo-shell-view-actions.c:569
+msgid "Delete selected memos"
+msgstr "Delete selected memos"
+
+#: ../calendar/gui/e-memo-table.c:730
+msgid "Select all visible memos"
+msgstr "Select all visible memos"
+
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Click to add a memo"
 
+#: ../calendar/gui/e-task-table.c:529
+msgid "0%"
+msgstr "0%"
+
+#: ../calendar/gui/e-task-table.c:530
+msgid "10%"
+msgstr "10%"
+
+#: ../calendar/gui/e-task-table.c:531
+msgid "20%"
+msgstr "20%"
+
+#: ../calendar/gui/e-task-table.c:532
+msgid "30%"
+msgstr "30%"
+
+#: ../calendar/gui/e-task-table.c:533
+msgid "40%"
+msgstr "40%"
+
+#: ../calendar/gui/e-task-table.c:534
+msgid "50%"
+msgstr "50%"
+
+#: ../calendar/gui/e-task-table.c:535
+msgid "60%"
+msgstr "60%"
+
+#: ../calendar/gui/e-task-table.c:536
+msgid "70%"
+msgstr "70%"
+
+#: ../calendar/gui/e-task-table.c:537
+msgid "80%"
+msgstr "80%"
+
+#: ../calendar/gui/e-task-table.c:538
+msgid "90%"
+msgstr "90%"
+
+#: ../calendar/gui/e-task-table.c:539
+msgid "100%"
+msgstr "100%"
+
+#: ../calendar/gui/e-task-table.c:623 ../calendar/gui/print.c:2043
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../modules/calendar/e-cal-shell-content.c:359
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view.c:437
+#: ../plugins/caldav/caldav-browse-server.c:430
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+msgid "Tasks"
+msgstr "Tasks"
+
+#: ../calendar/gui/e-task-table.c:927
+msgid "Cut selected tasks to the clipboard"
+msgstr "Cut selected tasks to the clipboard"
+
+#: ../calendar/gui/e-task-table.c:933
+msgid "Copy selected tasks to the clipboard"
+msgstr "Copy selected tasks to the clipboard"
+
+#: ../calendar/gui/e-task-table.c:939
+msgid "Paste tasks from the clipboard"
+msgstr "Paste tasks from the clipboard"
+
+#: ../calendar/gui/e-task-table.c:945
+#: ../modules/calendar/e-task-shell-view-actions.c:693
+msgid "Delete selected tasks"
+msgstr "Delete selected tasks"
+
+#: ../calendar/gui/e-task-table.c:951
+msgid "Select all visible tasks"
+msgstr "Select all visible tasks"
+
 #: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "Select Timezone"
@@ -5778,67 +5869,65 @@ msgstr "Select Timezone"
 #. 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:376 ../calendar/gui/print.c:1646
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:263
+#: ../calendar/gui/ea-cal-view-event.c:276
 msgid "It has alarms."
 msgstr "It has alarms."
 
-#: ../calendar/gui/ea-cal-view-event.c:266
+#: ../calendar/gui/ea-cal-view-event.c:279
 msgid "It has recurrences."
 msgstr "It has recurrences."
 
-#: ../calendar/gui/ea-cal-view-event.c:269
+#: ../calendar/gui/ea-cal-view-event.c:282
 msgid "It is a meeting."
 msgstr "It is a meeting."
 
-#: ../calendar/gui/ea-cal-view-event.c:275
+#: ../calendar/gui/ea-cal-view-event.c:288
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Calendar Event: Summary is %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:277
+#: ../calendar/gui/ea-cal-view-event.c:290
 msgid "Calendar Event: It has no summary."
 msgstr "Calendar Event: It has no summary."
 
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:312
 msgid "calendar view event"
 msgstr "calendar view event"
 
-#: ../calendar/gui/ea-cal-view-event.c:525
+#: ../calendar/gui/ea-cal-view-event.c:540
 msgid "Grab Focus"
 msgstr "Grab Focus"
 
-#: ../calendar/gui/ea-cal-view.c:298
+#: ../calendar/gui/ea-cal-view.c:300
 msgid "New Appointment"
 msgstr "New Appointment"
 
-#: ../calendar/gui/ea-cal-view.c:299
+#: ../calendar/gui/ea-cal-view.c:301
 msgid "New All Day Event"
 msgstr "New All Day Event"
 
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:302
 msgid "New Meeting"
 msgstr "New Meeting"
 
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:303
 msgid "Go to Today"
 msgstr "Go to Today"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "Go to Date"
 msgstr "Go to Date"
 
-#: ../calendar/gui/ea-day-view-main-item.c:300
-#: ../calendar/gui/ea-week-view-main-item.c:297
+#: ../calendar/gui/ea-day-view-main-item.c:308
+#: ../calendar/gui/ea-week-view-main-item.c:340
 msgid "a table to view and select the current time range"
 msgstr "a table to view and select the current time range"
 
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:147 ../calendar/gui/ea-week-view.c:146
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5847,14 +5936,14 @@ msgstr[1] "It has %d events."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:148
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
 msgid "It has no events."
 msgstr "It has no events."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:158
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Work Week View: %s. %s"
@@ -5862,55 +5951,55 @@ msgstr "Work Week View: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Day View: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:195
+#: ../calendar/gui/ea-day-view.c:197
 msgid "calendar view for a work week"
 msgstr "calendar view for a work week"
 
-#: ../calendar/gui/ea-day-view.c:197
+#: ../calendar/gui/ea-day-view.c:199
 msgid "calendar view for one or more days"
 msgstr "calendar view for one or more days"
 
-#: ../calendar/gui/ea-gnome-calendar.c:186
-#: ../modules/calendar/e-cal-shell-view-private.c:852
+#: ../calendar/gui/ea-gnome-calendar.c:46
+#: ../calendar/gui/ea-gnome-calendar.c:54
+#: ../calendar/importers/icalendar-importer.c:780
+msgid "Gnome Calendar"
+msgstr "Gnome Calendar"
+
+#: ../calendar/gui/ea-gnome-calendar.c:197
+#: ../modules/calendar/e-cal-shell-view-private.c:890
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:191
-#: ../calendar/gui/ea-gnome-calendar.c:196
-#: ../calendar/gui/ea-gnome-calendar.c:198
-#: ../modules/calendar/e-cal-shell-view-private.c:859
-#: ../modules/calendar/e-cal-shell-view-private.c:865
-#: ../modules/calendar/e-cal-shell-view-private.c:868
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:209
+#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:903
+#: ../modules/calendar/e-cal-shell-view-private.c:906
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:215
-#: ../calendar/gui/ea-gnome-calendar.c:221
-#: ../calendar/gui/ea-gnome-calendar.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:229
-#: ../modules/calendar/e-cal-shell-view-private.c:885
-#: ../modules/calendar/e-cal-shell-view-private.c:896
-#: ../modules/calendar/e-cal-shell-view-private.c:903
-#: ../modules/calendar/e-cal-shell-view-private.c:906
+#: ../calendar/gui/ea-gnome-calendar.c:226
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:240
+#: ../modules/calendar/e-cal-shell-view-private.c:923
+#: ../modules/calendar/e-cal-shell-view-private.c:934
+#: ../modules/calendar/e-cal-shell-view-private.c:941
+#: ../modules/calendar/e-cal-shell-view-private.c:944
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:245
-#: ../calendar/gui/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:782
-msgid "Gnome Calendar"
-msgstr "Gnome Calendar"
-
-#: ../calendar/gui/ea-jump-button.c:146
+#: ../calendar/gui/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "Jump button"
 
-#: ../calendar/gui/ea-jump-button.c:155
+#: ../calendar/gui/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "Click here, you can find more events."
 
@@ -5932,49 +6021,63 @@ msgstr "calendar view for a month"
 msgid "calendar view for one or more weeks"
 msgstr "calendar view for one or more weeks"
 
-#: ../calendar/gui/gnome-cal.c:1944
-#, c-format
-msgid "Loading appointments at %s"
-msgstr "Loading appointments at %s"
+#: ../calendar/gui/gnome-cal.c:2144
+msgid "Purging"
+msgstr "Purging"
 
-#: ../calendar/gui/gnome-cal.c:2030
-#, c-format
-msgid "Opening %s"
-msgstr "Opening %s"
+#: ../calendar/gui/goto-dialog.ui.h:1
+msgid "April"
+msgstr "April"
+
+#: ../calendar/gui/goto-dialog.ui.h:2
+msgid "August"
+msgstr "August"
+
+#: ../calendar/gui/goto-dialog.ui.h:3
+msgid "December"
+msgstr "December"
+
+#: ../calendar/gui/goto-dialog.ui.h:4
+msgid "February"
+msgstr "February"
+
+#: ../calendar/gui/goto-dialog.ui.h:5
+msgid "January"
+msgstr "January"
+
+#: ../calendar/gui/goto-dialog.ui.h:6
+msgid "July"
+msgstr "July"
+
+#: ../calendar/gui/goto-dialog.ui.h:7
+msgid "June"
+msgstr "June"
 
-#: ../calendar/gui/goto-dialog.glade.h:1
-msgid ""
-"January\n"
-"February\n"
-"March\n"
-"April\n"
-"May\n"
-"June\n"
-"July\n"
-"August\n"
-"September\n"
-"October\n"
-"November\n"
-"December"
-msgstr ""
-"January\n"
-"February\n"
-"March\n"
-"April\n"
-"May\n"
-"June\n"
-"July\n"
-"August\n"
-"September\n"
-"October\n"
-"November\n"
-"December"
-
-#: ../calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.ui.h:8
+msgid "March"
+msgstr "March"
+
+#: ../calendar/gui/goto-dialog.ui.h:9
+msgid "May"
+msgstr "May"
+
+#: ../calendar/gui/goto-dialog.ui.h:10
+msgid "November"
+msgstr "November"
+
+#: ../calendar/gui/goto-dialog.ui.h:11
+msgid "October"
+msgstr "October"
+
+#: ../calendar/gui/goto-dialog.ui.h:12
 msgid "Select Date"
 msgstr "Select Date"
 
-#: ../calendar/gui/goto-dialog.glade.h:14
+#: ../calendar/gui/goto-dialog.ui.h:13
+msgid "September"
+msgstr "September"
+
+#: ../calendar/gui/goto-dialog.ui.h:14
 msgid "_Select Today"
 msgstr "_Select Today"
 
@@ -5987,23 +6090,23 @@ msgstr "An organiser must be set."
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:780
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
 msgid "Event information"
 msgstr "Event information"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
 msgid "Task information"
 msgstr "Task information"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
 msgid "Memo information"
 msgstr "Memo information"
 
-#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
-#: ../calendar/gui/itip-utils.c:642
+#: ../calendar/gui/itip-utils.c:645
 msgid "Calendar information"
 msgstr "Calendar information"
 
@@ -6011,7 +6114,7 @@ msgstr "Calendar information"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:676
+#: ../calendar/gui/itip-utils.c:679
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Accepted"
@@ -6020,7 +6123,7 @@ msgstr "Accepted"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:683
+#: ../calendar/gui/itip-utils.c:686
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
@@ -6032,7 +6135,7 @@ msgstr "Tentatively Accepted"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:738
+#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Declined"
@@ -6041,7 +6144,7 @@ msgstr "Declined"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:697
+#: ../calendar/gui/itip-utils.c:700
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegated"
@@ -6049,7 +6152,7 @@ msgstr "Delegated"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:710
+#: ../calendar/gui/itip-utils.c:713
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Updated"
@@ -6057,7 +6160,7 @@ msgstr "Updated"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:717
+#: ../calendar/gui/itip-utils.c:720
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancel"
@@ -6065,7 +6168,7 @@ msgstr "Cancel"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:724
+#: ../calendar/gui/itip-utils.c:727
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Refresh"
@@ -6073,219 +6176,227 @@ msgstr "Refresh"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:731
+#: ../calendar/gui/itip-utils.c:734
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Counter-proposal"
 
-#: ../calendar/gui/itip-utils.c:801
+#: ../calendar/gui/itip-utils.c:804
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Free/Busy information (%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:809
+#: ../calendar/gui/itip-utils.c:812
 msgid "iCalendar information"
 msgstr "iCalendar information"
 
-#: ../calendar/gui/itip-utils.c:980
+#: ../calendar/gui/itip-utils.c:832
+msgid "Unable to book a resource, the new event collides with some other."
+msgstr "Unable to book a resource, the new event collides with some other."
+
+#: ../calendar/gui/itip-utils.c:834
+msgid "Unable to book a resource, error: "
+msgstr "Unable to book a resource, error: "
+
+#: ../calendar/gui/itip-utils.c:987
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "1st"
 msgstr "1st"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "2nd"
 msgstr "2nd"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "3rd"
 msgstr "3rd"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "4th"
 msgstr "4th"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:508
 msgid "5th"
 msgstr "5th"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "6th"
 msgstr "6th"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "7th"
 msgstr "7th"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "8th"
 msgstr "8th"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "9th"
 msgstr "9th"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:509
 msgid "10th"
 msgstr "10th"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "11th"
 msgstr "11th"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "12th"
 msgstr "12th"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "13th"
 msgstr "13th"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "14th"
 msgstr "14th"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:510
 msgid "15th"
 msgstr "15th"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "16th"
 msgstr "16th"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "17th"
 msgstr "17th"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "18th"
 msgstr "18th"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "19th"
 msgstr "19th"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:511
 msgid "20th"
 msgstr "20th"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "21st"
 msgstr "21st"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "22nd"
 msgstr "22nd"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "23rd"
 msgstr "23rd"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "24th"
 msgstr "24th"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:512
 msgid "25th"
 msgstr "25th"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "26th"
 msgstr "26th"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "27th"
 msgstr "27th"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "28th"
 msgstr "28th"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "29th"
 msgstr "29th"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:513
 msgid "30th"
 msgstr "30th"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:514
 msgid "31st"
 msgstr "31st"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "Su"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "Mo"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "Tu"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "We"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "Th"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2495
+#: ../calendar/gui/print.c:2564
 msgid "Appointment"
 msgstr "Appointment"
 
-#: ../calendar/gui/print.c:2497
+#: ../calendar/gui/print.c:2566
 msgid "Task"
 msgstr "Task"
 
-#: ../calendar/gui/print.c:2522
+#: ../calendar/gui/print.c:2591
 #, c-format
 msgid "Summary: %s"
 msgstr "Summary: %s"
 
-#: ../calendar/gui/print.c:2545
+#: ../calendar/gui/print.c:2615
 msgid "Attendees: "
 msgstr "Attendees: "
 
-#: ../calendar/gui/print.c:2585
+#: ../calendar/gui/print.c:2658
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2599
+#: ../calendar/gui/print.c:2673
 #, c-format
 msgid "Priority: %s"
 msgstr "Priority: %s"
 
-#: ../calendar/gui/print.c:2614
+#: ../calendar/gui/print.c:2691
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percent Complete: %i"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2702
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2638
+#: ../calendar/gui/print.c:2715
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: ../calendar/gui/print.c:2649
+#: ../calendar/gui/print.c:2726
 msgid "Contacts: "
 msgstr "Contacts: "
 
@@ -6315,8 +6426,8 @@ msgid "Appointments and Meetings"
 msgstr "Appointments and Meetings"
 
 #: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:630
-#: ../plugins/itip-formatter/itip-formatter.c:1737
+#: ../calendar/importers/icalendar-importer.c:628
+#: ../plugins/itip-formatter/itip-formatter.c:1833
 msgid "Opening calendar"
 msgstr "Opening calendar"
 
@@ -6340,11 +6451,11 @@ msgstr "vCalendar files (.vcf)"
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:746
+#: ../calendar/importers/icalendar-importer.c:744
 msgid "Calendar Events"
 msgstr "Calendar Events"
 
-#: ../calendar/importers/icalendar-importer.c:783
+#: ../calendar/importers/icalendar-importer.c:781
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution Calendar intelligent importer"
 
@@ -6897,7 +7008,7 @@ msgid "America/Nassau"
 msgstr "America/Nassau"
 
 #: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "America/New_York"
 msgstr "America/New_York"
 
@@ -7902,180 +8013,172 @@ msgid "Untitled Message"
 msgstr "Untitled Message"
 
 #: ../composer/e-composer-actions.c:202
-#: ../modules/calendar/e-cal-shell-view-memopad.c:251
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
-#: ../modules/calendar/e-memo-shell-view-actions.c:489
-#: ../modules/calendar/e-task-shell-view-actions.c:616
 msgid "Save as..."
 msgstr "Save asâ?¦"
 
-#: ../composer/e-composer-actions.c:306
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:281
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "Attach a file"
 msgstr "Attach a file"
 
-#: ../composer/e-composer-actions.c:311
-#: ../widgets/misc/e-signature-editor.c:200
+#: ../composer/e-composer-actions.c:286
+#: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "_Close"
 
-#: ../composer/e-composer-actions.c:313
+#: ../composer/e-composer-actions.c:288
 msgid "Close the current file"
 msgstr "Close the current file"
 
-#: ../composer/e-composer-actions.c:318
+#: ../composer/e-composer-actions.c:293
 msgid "_Print..."
 msgstr "_Printâ?¦"
 
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:300
 msgid "Print Pre_view"
 msgstr "Print Pre_view"
 
-#: ../composer/e-composer-actions.c:334
+#: ../composer/e-composer-actions.c:309
 msgid "Save the current file"
 msgstr "Save the current file"
 
-#: ../composer/e-composer-actions.c:339
+#: ../composer/e-composer-actions.c:314
 msgid "Save _As..."
 msgstr "Save _Asâ?¦"
 
-#: ../composer/e-composer-actions.c:341
+#: ../composer/e-composer-actions.c:316
 msgid "Save the current file with a different name"
 msgstr "Save the current file with a different name"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:321
 msgid "Save as _Draft"
 msgstr "Save as _Draft"
 
-#: ../composer/e-composer-actions.c:348
+#: ../composer/e-composer-actions.c:323
 msgid "Save as draft"
 msgstr "Save as draft"
 
-#: ../composer/e-composer-actions.c:353 ../composer/e-composer-private.c:192
+#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
 msgid "S_end"
 msgstr "S_end"
 
-#: ../composer/e-composer-actions.c:355
+#: ../composer/e-composer-actions.c:330
 msgid "Send this message"
 msgstr "Send this message"
 
-#: ../composer/e-composer-actions.c:362
-msgid "Insert Send options"
-msgstr "Insert Send options"
-
-#: ../composer/e-composer-actions.c:367
+#: ../composer/e-composer-actions.c:335
 msgid "New _Message"
 msgstr "New _Message"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:337
 msgid "Open New Message window"
 msgstr "Open New Message window"
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:344
 msgid "Character _Encoding"
 msgstr "Character _Encoding"
 
-#: ../composer/e-composer-actions.c:383
-msgid "_Security"
-msgstr "_Security"
-
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "PGP _Encrypt"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:363
 msgid "Encrypt this message with PGP"
 msgstr "Encrypt this message with PGP"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:369
 msgid "PGP _Sign"
 msgstr "PGP _Sign"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:371
 msgid "Sign this message with your PGP key"
 msgstr "Sign this message with your PGP key"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:377
 msgid "_Prioritize Message"
 msgstr "_Prioritise Message"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:379
 msgid "Set the message priority to high"
 msgstr "Set the message priority to high"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:385
 msgid "Re_quest Read Receipt"
 msgstr "Re_quest Read Receipt"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:387
 msgid "Get delivery notification when your message is read"
 msgstr "Get delivery notification when your message is read"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:393
 msgid "S/MIME En_crypt"
 msgstr "S/MIME En_crypt"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:395
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Encrypt this message with your S/MIME Encryption Certificate"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:401
 msgid "S/MIME Sig_n"
 msgstr "S/MIME Sig_n"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:403
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Sign this message with your S/MIME Signature Certificate"
 
-#: ../composer/e-composer-actions.c:441
+#: ../composer/e-composer-actions.c:409
 msgid "_Bcc Field"
 msgstr "_Bcc Field"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:411
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Toggles whether the BCC field is displayed"
 
-#: ../composer/e-composer-actions.c:449
+#: ../composer/e-composer-actions.c:417
 msgid "_Cc Field"
 msgstr "_Cc Field"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the CC field is displayed"
 msgstr "Toggles whether the CC field is displayed"
 
-#: ../composer/e-composer-actions.c:457
+#: ../composer/e-composer-actions.c:425
 msgid "_From Field"
 msgstr "_From Field"
 
-#: ../composer/e-composer-actions.c:459
+#: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Toggles whether the From chooser is displayed"
 
-#: ../composer/e-composer-actions.c:465
+#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
 msgstr "_Reply-To Field"
 
-#: ../composer/e-composer-actions.c:467
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Toggles whether the Reply-To field is displayed"
 
-#: ../composer/e-composer-actions.c:510
+#: ../composer/e-composer-actions.c:478
 msgid "Save Draft"
 msgstr "Save Draft"
 
-#: ../composer/e-composer-autosave.c:445
-msgid "Unable to retrieve message from editor"
-msgstr "Unable to retrieve message from editor"
+#: ../composer/e-composer-header.c:129
+msgid "Show"
+msgstr "Show"
+
+#: ../composer/e-composer-header.c:137
+msgid "Hide"
+msgstr "Hide"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the recipients of the message"
 msgstr "Enter the recipients of the message"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:44
 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-composer-header-table.c:46
+#: ../composer/e-composer-header-table.c:47
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8083,52 +8186,50 @@ msgstr ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 
-#: ../composer/e-composer-header-table.c:949
+#: ../composer/e-composer-header-table.c:959
 msgid "Fr_om:"
 msgstr "Fr_om:"
 
-#: ../composer/e-composer-header-table.c:949
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:936
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:301
+#: ../composer/e-composer-header-table.c:959
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
 msgstr "From"
 
-#: ../composer/e-composer-header-table.c:958
+#: ../composer/e-composer-header-table.c:968
 msgid "_Reply-To:"
 msgstr "_Reply-To:"
 
-#: ../composer/e-composer-header-table.c:963
+#: ../composer/e-composer-header-table.c:973
 msgid "_To:"
 msgstr "_To:"
 
-#: ../composer/e-composer-header-table.c:969
+#: ../composer/e-composer-header-table.c:979
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:969
-#, fuzzy
-msgid "Show CC"
-msgstr "Show"
+#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
 
-#: ../composer/e-composer-header-table.c:975
+#: ../composer/e-composer-header-table.c:985
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:975
-#, fuzzy
-msgid "Show BCC"
-msgstr "Show"
+#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
 
-#: ../composer/e-composer-header-table.c:980
+#: ../composer/e-composer-header-table.c:990
 msgid "_Post To:"
 msgstr "_Post To:"
 
-#: ../composer/e-composer-header-table.c:984
+#: ../composer/e-composer-header-table.c:994
 msgid "S_ubject:"
 msgstr "S_ubject:"
 
-#: ../composer/e-composer-header-table.c:993
+#: ../composer/e-composer-header-table.c:1003
 msgid "Si_gnature:"
 msgstr "Si_gnature:"
 
@@ -8140,23 +8241,39 @@ msgstr "Click here for the address book"
 msgid "Click here to select folders to post to"
 msgstr "Click here to select folders to post to"
 
-#: ../composer/e-composer-private.c:208
+#: ../composer/e-composer-private.c:199
+msgid "Undo the last action"
+msgstr "Undo the last action"
+
+#: ../composer/e-composer-private.c:203
+msgid "Redo the last undone action"
+msgstr "Redo the last undone action"
+
+#: ../composer/e-composer-private.c:207
+msgid "Search for text"
+msgstr "Search for text"
+
+#: ../composer/e-composer-private.c:211
+msgid "Search for and replace text"
+msgstr "Search for and replace text"
+
+#: ../composer/e-composer-private.c:301
 msgid "Save draft"
 msgstr "Save draft"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:191 ../mail/em-utils.c:144
-#: ../plugins/attachment-reminder/attachment-reminder.c:129
+#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:150
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "_Do not show this message again."
 
-#: ../composer/e-msg-composer.c:900
+#: ../composer/e-msg-composer.c:983
 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:907
+#: ../composer/e-msg-composer.c:990
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8164,11 +8281,15 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 
-#: ../composer/e-msg-composer.c:1334 ../composer/e-msg-composer.c:2112
+#: ../composer/e-msg-composer.c:1379
+msgid "Unable to reconstruct message from autosave file"
+msgstr "Unable to reconstruct message from autosave file"
+
+#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
 msgid "Compose Message"
 msgstr "Compose Message"
 
-#: ../composer/e-msg-composer.c:3320
+#: ../composer/e-msg-composer.c:3310
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -8236,22 +8357,18 @@ msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "Could not save to autosave file &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:12
-msgid "Directories can not be attached to Messages."
-msgstr "Directories can not be attached to Messages."
-
-#: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
 msgstr "Do you want to recover unfinished messages?"
 
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "Download in progress. Do you want to send the mail?"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Error saving to autosave because &quot;{1}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:15
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -8259,31 +8376,11 @@ msgstr ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 
-#: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Send options available only for Novell GroupWise and Microsoft Exchange "
-"accounts."
-msgstr ""
-"Send options available only for Novell GroupWise and Microsoft Exchange "
-"accounts."
-
-#: ../composer/mail-composer.error.xml.h:18
-msgid "Send options not available."
-msgstr "Send options not available."
-
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:16
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "The file `{0}' is not a regular file and cannot be sent in a message."
 
-#: ../composer/mail-composer.error.xml.h:20
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
-
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:17
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -8295,51 +8392,56 @@ msgstr ""
 "Please make sure that you have the correct version of gtkhtml and libgtkhtml "
 "installed."
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:20
 msgid "Unable to activate the address selector control."
 msgstr "Unable to activate the address selector control."
 
-#: ../composer/mail-composer.error.xml.h:25
-msgid "Unfinished messages found"
-msgstr "Unfinished messages found"
-
-#: ../composer/mail-composer.error.xml.h:26
-msgid "Warning: Modified Message"
-msgstr "Warning: Modified Message"
-
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:21
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "You cannot attach the file `{0}' to this message."
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
 msgstr "You need to configure an account before you can compose mail."
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:23
 msgid "_Continue Editing"
 msgstr "_Continue Editing"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:25
 msgid "_Do not Recover"
 msgstr "_Do not Recover"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:26
 msgid "_Recover"
 msgstr "_Recover"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Save Draft"
 msgstr "_Save Draft"
 
-#: ../data/evolution.desktop.in.in.h:1
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+msgid "Calendar event notifications"
+msgstr "Calendar event notifications"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Evolution Alarm Notify"
+msgstr "Evolution Alarm Notify"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:786
+#: ../shell/e-shell-window-private.c:258
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/evolution.desktop.in.in.h:2
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution Mail and Calendar"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:653
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:653
 msgid "Groupware Suite"
 msgstr "Groupware Suite"
 
-#: ../data/evolution.desktop.in.in.h:3
+#: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "Manage your e-mail, contacts and schedule"
 
@@ -8351,6 +8453,43 @@ msgstr "address card"
 msgid "calendar information"
 msgstr "calendar information"
 
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:224
+#, c-format
+msgid "%s (cancelled)"
+msgstr "%s (cancelled)"
+
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:227
+#, c-format
+msgid "%s (completed)"
+msgstr "%s (completed)"
+
+#. Translators: This is an activity whose percent
+#. * complete is unknown.
+#: ../e-util/e-activity.c:231
+#, c-format
+msgid "%s..."
+msgstr "%sâ?¦"
+
+#: ../e-util/e-activity.c:236
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% complete)"
+
+#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+msgid "Evolution Error"
+msgstr "Evolution Error"
+
+#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+msgid "Evolution Warning"
+msgstr "Evolution Warning"
+
+#: ../e-util/e-alert.c:634
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr "Internal error, unknown error '%s' requested"
+
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
 msgstr "Arabic"
@@ -8426,14 +8565,14 @@ msgstr "Visual"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1665
-#: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:304
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../plugins/itip-formatter/itip-view.c:195
+#: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "Today"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow"
 msgstr "Tomorrow"
 
@@ -8460,116 +8599,104 @@ msgstr "Use locale default"
 msgid "Format:"
 msgstr "Format:"
 
-#: ../e-util/e-error.c:77 ../e-util/e-error.c:78 ../e-util/e-error.c:120
-msgid "Evolution Error"
-msgstr "Evolution Error"
+#: ../e-util/e-file-utils.c:136
+msgid "(Unknown Filename)"
+msgstr "(Unknown Filename)"
 
-#: ../e-util/e-error.c:79 ../e-util/e-error.c:80 ../e-util/e-error.c:118
-msgid "Evolution Warning"
-msgstr "Evolution Warning"
-
-#: ../e-util/e-error.c:117
-msgid "Evolution Information"
-msgstr "Evolution Information"
-
-#: ../e-util/e-error.c:119
-msgid "Evolution Query"
-msgstr "Evolution Query"
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:140
+#, c-format
+msgid "Writing \"%s\""
+msgstr "Writing \"%s\""
 
-#. setup a dummy error
-#: ../e-util/e-error.c:452
+#. Translators: The first string value is the basename of a
+#. * remote file, the second string value is the hostname.
+#: ../e-util/e-file-utils.c:145
 #, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "Internal error, unknown error '%s' requested"
+msgid "Writing \"%s\" to %s"
+msgstr "Writing \"%s\" to %s"
 
-#: ../e-util/e-logger.c:172
-#, fuzzy
+#: ../e-util/e-logger.c:175
 msgid "Name of the logger"
-msgstr "Name of the component being logged"
+msgstr "Name of the logger"
 
 #: ../e-util/e-module.c:188
-#, fuzzy
 msgid "Filename"
-msgstr "F_ilename:"
+msgstr "Filename"
 
 #: ../e-util/e-module.c:189
-#, fuzzy
 msgid "The filename of the module"
-msgstr "The filename to display in the mail."
+msgstr "The filename of the module"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:191
+#: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "Debug Logs"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:205
+#: ../e-util/e-non-intrusive-error-dialog.c:208
 msgid "Show _errors in the status bar for"
 msgstr "Show _errors in the status bar for"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:223
+#: ../e-util/e-non-intrusive-error-dialog.c:226
 msgid "second(s)."
 msgstr "second(s)."
 
-#: ../e-util/e-non-intrusive-error-dialog.c:229
+#: ../e-util/e-non-intrusive-error-dialog.c:232
 msgid "Log Messages:"
 msgstr "Log Messages:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:274
+#: ../e-util/e-non-intrusive-error-dialog.c:279
 msgid "Log Level"
 msgstr "Log Level"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:282
-#: ../widgets/misc/e-dateedit.c:493
-msgid "Time"
-msgstr "Time"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2583
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Messages"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:301 ../mail/e-mail-browser.c:97
-#: ../shell/e-shell-window-actions.c:1459
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1430
 msgid "Close this window"
 msgstr "Close this window"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Error"
 msgstr "Error"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Errors"
 msgstr "Errors"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
-msgid "Warning"
-msgstr "Warning"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warnings and Errors"
 msgstr "Warnings and Errors"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Debug"
 msgstr "Debug"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Error, Warnings and Debug messages"
 msgstr "Error, Warnings and Debug messages"
 
-#: ../e-util/e-plugin.c:291 ../filter/rule-editor.c:802
-#: ../modules/mail/em-composer-prefs.c:474
+#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
 #: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:717
+#: ../plugins/publish-calendar/publish-calendar.c:827
 #: ../widgets/misc/e-account-tree-view.c:205
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../e-util/e-plugin.c:292
+#: ../e-util/e-plugin.c:296
 msgid "Whether the plugin is enabled"
 msgstr "Whether the plugin is enabled"
 
+#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "weeks"
+
 #: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "An error occurred while printing"
@@ -8584,11 +8711,11 @@ msgid ""
 msgstr ""
 "The printing system did not report any additional details about the error."
 
-#: ../e-util/e-signature.c:695
+#: ../e-util/e-signature.c:701
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
 msgid "Because \"{1}\"."
 msgstr "Because \"{1}\"."
 
@@ -8608,304 +8735,303 @@ msgstr "Do you wish to overwrite it?"
 msgid "File exists \"{0}\"."
 msgstr "File exists \"{0}\"."
 
-#: ../e-util/e-system.error.xml.h:6
-msgid "Overwrite file?"
-msgstr "Overwrite file?"
-
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
 msgid "_Overwrite"
 msgstr "_Overwrite"
 
-#: ../e-util/e-util.c:133
+#: ../e-util/e-util.c:140
 msgid "Could not open the link."
 msgstr "Could not open the link."
 
-#: ../e-util/e-util.c:183
+#: ../e-util/e-util.c:190
 msgid "Could not display help for Evolution."
 msgstr "Could not display help for Evolution."
 
-#: ../e-util/gconf-bridge.c:1222
+#: ../e-util/gconf-bridge.c:1276
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf error: %s"
 
-#: ../e-util/gconf-bridge.c:1233
+#: ../e-util/gconf-bridge.c:1287
 msgid "All further errors shown only on terminal."
 msgstr "All further errors shown only on terminal."
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:937
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
 #: ../modules/mail/em-mailer-prefs.c:78
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:939
-#: ../mail/em-format-html.c:2138 ../mail/em-format-html.c:2202
-#: ../mail/em-format-html.c:2223 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
+#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2306
+#: ../mail/em-format-html.c:2327 ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:940
-#: ../mail/em-format-html.c:2139 ../mail/em-format-html.c:2208
-#: ../mail/em-format-html.c:2226 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2312
+#: ../mail/em-format-html.c:2330 ../modules/mail/em-mailer-prefs.c:81
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:941
-#: ../mail/em-filter-i18n.h:74 ../mail/message-list.etspec.h:18
-#: ../mail/message-tag-followup.c:305 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1112
+#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
+#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
 msgid "Subject"
 msgstr "Subject"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2318
-#: ../modules/mail/em-mailer-prefs.c:1120
+#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2422
+#: ../modules/mail/em-mailer-prefs.c:1130
 msgid "Mailer"
 msgstr "Mailer"
 
-#: ../em-format/em-format-quote.c:429 ../mail/em-composer-utils.c:1135
+#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: ../em-format/em-format.c:942 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:429
-#: ../widgets/misc/e-dateedit.c:451
+#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
+#: ../widgets/misc/e-dateedit.c:567
 msgid "Date"
 msgstr "Date"
 
-#: ../em-format/em-format.c:943 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:85
-#: ../plugins/face/org-gnome-face.eplug.xml.h:4
+#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Face"
 
-#: ../em-format/em-format.c:1297
+#: ../em-format/em-format.c:1319
 #, c-format
 msgid "%s attachment"
 msgstr "%s attachment"
 
-#: ../em-format/em-format.c:1335
+#: ../em-format/em-format.c:1374
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Could not parse S/MIME message: Unknown error"
 
-#: ../em-format/em-format.c:1472 ../em-format/em-format.c:1629
+#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Could not parse MIME message. Displaying as source."
 
-#: ../em-format/em-format.c:1480
+#: ../em-format/em-format.c:1520
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Unsupported encryption type for multipart/encrypted"
 
-#: ../em-format/em-format.c:1490
+#: ../em-format/em-format.c:1532
 msgid "Could not parse PGP/MIME message"
 msgstr "Could not parse PGP/MIME message"
 
-#: ../em-format/em-format.c:1490
+#: ../em-format/em-format.c:1532
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Could not parse PGP/MIME message: Unknown error"
 
-#: ../em-format/em-format.c:1648
+#: ../em-format/em-format.c:1698
 msgid "Unsupported signature format"
 msgstr "Unsupported signature format"
 
-#: ../em-format/em-format.c:1656 ../em-format/em-format.c:1794
+#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
 msgid "Error verifying signature"
 msgstr "Error verifying signature"
 
-#: ../em-format/em-format.c:1656 ../em-format/em-format.c:1785
-#: ../em-format/em-format.c:1794
+#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
+#: ../em-format/em-format.c:1847
 msgid "Unknown error verifying signature"
 msgstr "Unknown error verifying signature"
 
-#: ../em-format/em-format.c:1868
+#: ../em-format/em-format.c:1924
 msgid "Could not parse PGP message"
 msgstr "Could not parse PGP message"
 
-#: ../em-format/em-format.c:1868
+#: ../em-format/em-format.c:1924
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Could not parse PGP message: Unknown error"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 second ago"
 msgstr[1] "%d seconds ago"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 second in the future"
 msgstr[1] "%d seconds in the future"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minute ago"
 msgstr[1] "%d minutes ago"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 minute in the future"
 msgstr[1] "%d minutes in the future"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 hour ago"
 msgstr[1] "%d hours ago"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 hour in the future"
 msgstr[1] "%d hours in the future"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 day ago"
 msgstr[1] "%d days ago"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 day in the future"
 msgstr[1] "%d days in the future"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 week ago"
 msgstr[1] "%d weeks ago"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 week in the future"
 msgstr[1] "%d weeks in the future"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 month ago"
 msgstr[1] "%d months ago"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 month in the future"
 msgstr[1] "%d months in the future"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 year ago"
 msgstr[1] "%d years ago"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 year in the future"
 msgstr[1] "%d years in the future"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/e-filter-datespec.c:116
 msgid "<click here to select a date>"
 msgstr "<click here to select a date>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
+#: ../filter/e-filter-datespec.c:141
 msgid "now"
 msgstr "now"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/e-filter-datespec.c:126
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:442
+#: ../filter/e-filter-datespec.c:269
 msgid "Select a time to compare against"
 msgstr "Select a time to compare against"
 
-#: ../filter/filter-file.c:281
-msgid "Choose a file"
-msgstr "Choose a file"
-
-#: ../filter/filter-part.c:528
-msgid "Test"
-msgstr "Test"
+#: ../filter/e-filter-file.c:184
+msgid "Choose a File"
+msgstr "Choose a File"
 
-#: ../filter/filter-rule.c:858
+#: ../filter/e-filter-rule.c:659
 msgid "R_ule name:"
 msgstr "R_ule name:"
 
-#: ../filter/filter-rule.c:886
+#: ../filter/e-filter-rule.c:689
 msgid "Find items that meet the following conditions"
 msgstr "Find items that meet the following conditions"
 
-#: ../filter/filter-rule.c:920
+#: ../filter/e-filter-rule.c:723
 msgid "A_dd Condition"
 msgstr "A_dd Condition"
 
-#: ../filter/filter-rule.c:926
+#: ../filter/e-filter-rule.c:732
 msgid "If all conditions are met"
 msgstr "If all conditions are met"
 
-#: ../filter/filter-rule.c:926
+#: ../filter/e-filter-rule.c:733
 msgid "If any conditions are met"
 msgstr "If any conditions are met"
 
-#: ../filter/filter-rule.c:928
+#: ../filter/e-filter-rule.c:736
 msgid "_Find items:"
 msgstr "_Find items:"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/e-filter-rule.c:760
 msgid "All related"
 msgstr "All related"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
 msgid "Replies"
 msgstr "Replies"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/e-filter-rule.c:762
 msgid "Replies and parents"
 msgstr "Replies and parents"
 
-#: ../filter/filter-rule.c:946
+#: ../filter/e-filter-rule.c:763
 msgid "No reply or parent"
 msgstr "No reply or parent"
 
-#: ../filter/filter-rule.c:948
+#: ../filter/e-filter-rule.c:766
 msgid "I_nclude threads"
 msgstr "I_nclude threads"
 
-#: ../filter/filter-rule.c:1042 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:295
+#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:301
 msgid "Incoming"
 msgstr "Incoming"
 
-#: ../filter/filter-rule.c:1042 ../mail/em-utils.c:296
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:302
 msgid "Outgoing"
 msgstr "Outgoing"
 
+#: ../filter/e-rule-editor.c:265
+msgid "Add Rule"
+msgstr "Add Rule"
+
+#: ../filter/e-rule-editor.c:352
+msgid "Edit Rule"
+msgstr "Edit Rule"
+
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "Bad regular expression &quot;{0}&quot;."
@@ -8926,7 +9052,7 @@ msgstr "Missing date."
 msgid "Missing file name."
 msgstr "Missing file name."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
 msgid "Missing name."
 msgstr "Missing name."
 
@@ -8950,19 +9076,15 @@ msgstr "You must name this filter."
 msgid "You must specify a file name."
 msgstr "You must specify a file name."
 
-#: ../filter/filter.glade.h:1
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>_Filter Rules</b>"
-
-#: ../filter/filter.glade.h:2
+#: ../filter/filter.ui.h:1
 msgid "Compare against"
 msgstr "Compare against"
 
-#: ../filter/filter.glade.h:4
+#: ../filter/filter.ui.h:3
 msgid "Show filters for mail:"
 msgstr "Show filters for mail:"
 
-#: ../filter/filter.glade.h:5
+#: ../filter/filter.ui.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -8970,7 +9092,7 @@ msgstr ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 
-#: ../filter/filter.glade.h:7
+#: ../filter/filter.ui.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -8978,7 +9100,7 @@ msgstr ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 
-#: ../filter/filter.glade.h:9
+#: ../filter/filter.ui.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -8986,120 +9108,101 @@ msgstr ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 
-#: ../filter/filter.glade.h:12
-msgid ""
-"ago\n"
-"in the future"
-msgstr ""
-"ago\n"
-"in the future"
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+msgid "_Filter Rules"
+msgstr "_Filter Rules"
 
-#: ../filter/filter.glade.h:14
-msgid ""
-"seconds\n"
-"minutes\n"
-"hours\n"
-"days\n"
-"weeks\n"
-"months\n"
-"years"
-msgstr ""
-"seconds\n"
-"minutes\n"
-"hours\n"
-"days\n"
-"weeks\n"
-"months\n"
-"years"
+#: ../filter/filter.ui.h:12
+msgid "a time relative to the current time"
+msgstr "a time relative to the current time"
 
-#: ../filter/filter.glade.h:21
-msgid ""
-"the current time\n"
-"the time you specify\n"
-"a time relative to the current time"
-msgstr ""
-"the current time\n"
-"the time you specify\n"
-"a time relative to the current time"
+#: ../filter/filter.ui.h:13
+msgid "ago"
+msgstr "ago"
 
-#: ../filter/rule-editor.c:382
-msgid "Add Rule"
-msgstr "Add Rule"
+#: ../filter/filter.ui.h:16
+msgid "in the future"
+msgstr "in the future"
 
-#: ../filter/rule-editor.c:465
-msgid "Edit Rule"
-msgstr "Edit Rule"
+#: ../filter/filter.ui.h:18
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+msgid "months"
+msgstr "months"
+
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+msgid "seconds"
+msgstr "seconds"
+
+#: ../filter/filter.ui.h:20
+msgid "the current time"
+msgstr "the current file"
+
+#: ../filter/filter.ui.h:21
+msgid "the time you specify"
+msgstr "the time you specify"
 
-#: ../filter/rule-editor.c:812
-msgid "Rule name"
-msgstr "Rule name"
+#: ../filter/filter.ui.h:23
+msgid "years"
+msgstr "years"
 
-#: ../mail/e-mail-attachment-bar.c:121 ../mail/em-format-html-display.c:1271
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
+#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
+#: ../mail/em-format-html-display.c:1025 ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
+#: ../widgets/misc/e-attachment-paned.c:153
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Attachment"
 msgstr[1] "Attachments"
 
-#: ../mail/e-mail-attachment-bar.c:614
-#: ../widgets/misc/e-attachment-paned.c:607
+#: ../mail/e-mail-attachment-bar.c:617
+#: ../widgets/misc/e-attachment-paned.c:612
 msgid "Icon View"
 msgstr "Icon View"
 
-#: ../mail/e-mail-attachment-bar.c:615
-#: ../widgets/misc/e-attachment-paned.c:608
+#: ../mail/e-mail-attachment-bar.c:618
+#: ../widgets/misc/e-attachment-paned.c:613
 msgid "List View"
 msgstr "List View"
 
-#: ../mail/e-mail-browser.c:617
-#, fuzzy
+#: ../mail/e-mail-browser.c:729 ../shell/e-shell-window.c:631
+msgid "Focus Tracker"
+msgstr "Focus Tracker"
+
+#: ../mail/e-mail-browser.c:739
 msgid "Shell Module"
-msgstr "Selection Mode"
+msgstr "Shell Module"
 
-#: ../mail/e-mail-browser.c:618 ../mail/message-list.c:2467
+#: ../mail/e-mail-browser.c:740 ../mail/message-list.c:2589
 msgid "The mail shell backend"
-msgstr ""
+msgstr "The mail shell backend"
 
-#: ../mail/e-mail-browser.c:628
-#, fuzzy
+#: ../mail/e-mail-browser.c:750
 msgid "Show Deleted"
-msgstr "Deleted"
+msgstr "Show Deleted"
 
-#: ../mail/e-mail-browser.c:629
-#, fuzzy
+#: ../mail/e-mail-browser.c:751
 msgid "Show deleted messages"
-msgstr "Forwarded messages"
-
-#: ../mail/e-mail-browser.c:663
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/e-shell-window-private.c:207
-msgid "Evolution"
-msgstr "Evolution"
+msgstr "Show deleted messages"
 
 #: ../mail/e-mail-display.c:66
-#, fuzzy
 msgid "_Add to Address Book..."
-msgstr "_Add to Address Book"
+msgstr "_Add to Address Bookâ?¦"
 
 #: ../mail/e-mail-display.c:73
-#, fuzzy
 msgid "_To This Address"
 msgstr "_To this Address"
 
 #: ../mail/e-mail-display.c:80
-#, fuzzy
 msgid "_From This Address"
-msgstr "_From this Address"
+msgstr "_From This Address"
 
 #: ../mail/e-mail-display.c:89
-#, fuzzy
 msgid "Create Search _Folder"
-msgstr "Create _Search Folder"
+msgstr "Create Search _Folder"
 
 #: ../mail/e-mail-label-dialog.c:220
-#, fuzzy
 msgid "_Label name:"
-msgstr "Label _Name:"
+msgstr "_Label name:"
 
 #: ../mail/e-mail-label-list-store.c:41
 msgid "I_mportant"
@@ -9126,7 +9229,7 @@ msgid "_Later"
 msgstr "_Later"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:555
+#: ../modules/mail/e-mail-shell-view-actions.c:515
 msgid "Add Label"
 msgstr "Add Label"
 
@@ -9135,697 +9238,772 @@ msgid "Edit Label"
 msgstr "Edit Label"
 
 #: ../mail/e-mail-label-manager.c:349
-#, fuzzy
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
 msgstr ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
 
 #: ../mail/e-mail-label-tree-view.c:86
 msgid "Color"
 msgstr "Colour"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:599 ../mail/em-folder-tree.c:2347
-#: ../modules/mail/e-mail-shell-view-private.c:763
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:593
+#: ../mail/em-folder-tree-model.c:658 ../mail/em-folder-tree.c:2582
+#: ../modules/mail/e-mail-shell-view-private.c:961
 msgid "Inbox"
 msgstr "Inbox"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:592
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:651
 msgid "Drafts"
 msgstr "Drafts"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:602
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:661
 msgid "Outbox"
 msgstr "Outbox"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:604
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:663
 msgid "Sent"
 msgstr "Sent"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:595
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:654
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:591
+#: ../plugins/templates/templates.c:574
 msgid "Templates"
 msgstr "Templates"
 
+#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Important"
+
+#. green
+#: ../mail/e-mail-migrate.c:963
+msgid "To Do"
+msgstr "To Do"
+
+#. blue
+#: ../mail/e-mail-migrate.c:964
+msgid "Later"
+msgstr "Later"
+
+#: ../mail/e-mail-migrate.c:1110
+#: ../modules/addressbook/e-book-shell-migrate.c:76
+#: ../modules/calendar/e-cal-shell-migrate.c:123
+#: ../modules/calendar/e-task-shell-migrate.c:90
+msgid "Migrating..."
+msgstr "Migratingâ?¦"
+
+#: ../mail/e-mail-migrate.c:1143
+msgid "Migration"
+msgstr "Migration"
+
+#: ../mail/e-mail-migrate.c:1183
+#: ../modules/addressbook/e-book-shell-migrate.c:128
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-task-shell-migrate.c:132
+#, c-format
+msgid "Migrating '%s':"
+msgstr "Migrating '%s':"
+
+#: ../mail/e-mail-migrate.c:1594
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Unable to create new folder `%s': %s"
+
+#: ../mail/e-mail-migrate.c:1622
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "Unable to copy folder `%s' to `%s': %s"
+
+#: ../mail/e-mail-migrate.c:1817
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Unable to scan for existing mailboxes at `%s': %s"
+
+#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2927
+msgid "Migrating Folders"
+msgstr "Migrating Folders"
+
+#: ../mail/e-mail-migrate.c:1824
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your foldersâ?¦"
+
+#: ../mail/e-mail-migrate.c:2027
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Unable to open old POP keep-on-server data `%s': %s"
+
+#: ../mail/e-mail-migrate.c:2043
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "Unable to create POP3 keep-on-server data directory `%s': %s"
+
+#: ../mail/e-mail-migrate.c:2075
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr "Unable to copy POP3 keep-on-server data `%s': %s"
+
+#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Failed to create local mail storage `%s': %s"
+
+#: ../mail/e-mail-migrate.c:2928
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your foldersâ?¦"
+
+#. On This Computer is always first, and Search Folders
+#. * is always last.
+#. create the local source group
+#: ../mail/e-mail-migrate.c:2943 ../mail/e-mail-store.c:229
+#: ../mail/em-folder-tree-model.c:144 ../mail/em-folder-tree-model.c:146
+#: ../mail/mail-vfolder.c:215 ../mail/message-list.c:1617
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:501
+msgid "On This Computer"
+msgstr "On This Computer"
+
+#: ../mail/e-mail-migrate.c:3023
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "Unable to create local mail folders at `%s': %s"
+
+#: ../mail/e-mail-migrate.c:3041
+#, c-format
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:107
-#: ../modules/calendar/e-task-shell-view-actions.c:576
-#, fuzzy
+#: ../mail/e-mail-reader-utils.c:105
+#: ../modules/calendar/e-task-shell-view-actions.c:572
 msgid "Do not ask me again"
-msgstr "Do not ask me again."
+msgstr "Do not ask me again"
 
-#: ../mail/e-mail-reader.c:215 ../mail/e-mail-reader.c:604
-#: ../mail/em-account-editor.c:667 ../mail/em-filter-folder-element.c:258
-#: ../mail/em-folder-utils.c:393 ../mail/em-vfolder-rule.c:519
-msgid "Select Folder"
-msgstr "Select Folder"
+#: ../mail/e-mail-reader.c:208 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "Copy to Folder"
 
-#: ../mail/e-mail-reader.c:215 ../mail/em-folder-utils.c:388
+#: ../mail/e-mail-reader.c:208 ../mail/em-folder-utils.c:385
 msgid "C_opy"
 msgstr "C_opy"
 
-#: ../mail/e-mail-reader.c:604 ../mail/em-folder-utils.c:388
+#: ../mail/e-mail-reader.c:582 ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "Move to Folder"
+
+#: ../mail/e-mail-reader.c:582 ../mail/em-folder-utils.c:385
 msgid "_Move"
 msgstr "_Move"
 
-#: ../mail/e-mail-reader.c:1082
+#: ../mail/e-mail-reader.c:808
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "Save Message"
+msgstr[1] "Save Messages"
+
+#. Translators: This is a part of a suggested file name
+#. * used when saving a message or multiple messages to an
+#. * mbox format, when the first message doesn't have a
+#. * Subject. The extension ".mbox" is appended to this
+#. * string, thus it will be something like "Message.mbox"
+#. * at the end.
+#: ../mail/e-mail-reader.c:829 ../plugins/groupwise-features/properties.ui.h:5
+#: ../widgets/table/e-table-click-to-add.c:518
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "Message"
+msgstr[1] "Messages"
+
+#: ../mail/e-mail-reader.c:1087
 msgid "A_dd Sender to Address Book"
 msgstr "A_dd Sender to Address Book"
 
-#: ../mail/e-mail-reader.c:1084
-#, fuzzy
+#: ../mail/e-mail-reader.c:1089
 msgid "Add sender to address book"
-msgstr "Add Sender to Address Book"
+msgstr "Add sender to address book"
 
-#: ../mail/e-mail-reader.c:1089
+#: ../mail/e-mail-reader.c:1094
 msgid "Check for _Junk"
 msgstr "Check for _Junk"
 
-#: ../mail/e-mail-reader.c:1091
+#: ../mail/e-mail-reader.c:1096
 msgid "Filter the selected messages for junk status"
 msgstr "Filter the selected messages for junk status"
 
-#: ../mail/e-mail-reader.c:1098
-msgid "Copy selected messages to the clipboard"
-msgstr "Copy selected messages to the clipboard"
-
-#: ../mail/e-mail-reader.c:1103
+#: ../mail/e-mail-reader.c:1101
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folderâ?¦"
 
-#: ../mail/e-mail-reader.c:1105
+#: ../mail/e-mail-reader.c:1103
 msgid "Copy selected messages to another folder"
 msgstr "Copy selected messages to another folder"
 
-#: ../mail/e-mail-reader.c:1110
+#: ../mail/e-mail-reader.c:1108
 msgid "_Delete Message"
 msgstr "_Delete Message"
 
-#: ../mail/e-mail-reader.c:1112
+#: ../mail/e-mail-reader.c:1110
 msgid "Mark the selected messages for deletion"
 msgstr "Mark the selected messages for deletion"
 
-#: ../mail/e-mail-reader.c:1117
+#: ../mail/e-mail-reader.c:1115
 msgid "Filter on Mailing _List..."
 msgstr "Filter on Mailing _Listâ?¦"
 
-#: ../mail/e-mail-reader.c:1119
+#: ../mail/e-mail-reader.c:1117
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Create a rule to filter messages to this mailing list"
 
-#: ../mail/e-mail-reader.c:1124
+#: ../mail/e-mail-reader.c:1122
 msgid "Filter on _Recipients..."
 msgstr "Filter on _Recipientsâ?¦"
 
-#: ../mail/e-mail-reader.c:1126
+#: ../mail/e-mail-reader.c:1124
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Create a rule to filter messages to these recipients"
 
-#: ../mail/e-mail-reader.c:1131
+#: ../mail/e-mail-reader.c:1129
 msgid "Filter on Se_nder..."
 msgstr "Filter on Se_nderâ?¦"
 
-#: ../mail/e-mail-reader.c:1133
+#: ../mail/e-mail-reader.c:1131
 msgid "Create a rule to filter messages from this sender"
 msgstr "Create a rule to filter messages from this sender"
 
-#: ../mail/e-mail-reader.c:1138
+#: ../mail/e-mail-reader.c:1136
 msgid "Filter on _Subject..."
 msgstr "Filter on _Subjectâ?¦"
 
-#: ../mail/e-mail-reader.c:1140
+#: ../mail/e-mail-reader.c:1138
 msgid "Create a rule to filter messages with this subject"
 msgstr "Create a rule to filter messages with this subject"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1143
 msgid "A_pply Filters"
 msgstr "A_pply Filters"
 
-#: ../mail/e-mail-reader.c:1147
+#: ../mail/e-mail-reader.c:1145
 msgid "Apply filter rules to the selected messages"
 msgstr "Apply filter rules to the selected messages"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1150
 msgid "_Find in Message..."
 msgstr "_Find in Messageâ?¦"
 
-#: ../mail/e-mail-reader.c:1154
+#: ../mail/e-mail-reader.c:1152
 msgid "Search for text in the body of the displayed message"
 msgstr "Search for text in the body of the displayed message"
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1157
 msgid "_Clear Flag"
 msgstr "_Clear Flag"
 
-#: ../mail/e-mail-reader.c:1161
-#, fuzzy
+#: ../mail/e-mail-reader.c:1159
 msgid "Remove the follow-up flag from the selected messages"
-msgstr "Create a new task from the selected message"
+msgstr "Remove the follow-up flag from the selected messages"
 
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1164
 msgid "_Flag Completed"
 msgstr "_Flag Completed"
 
-#: ../mail/e-mail-reader.c:1168
-#, fuzzy
+#: ../mail/e-mail-reader.c:1166
 msgid "Set the follow-up flag to completed on the selected messages"
-msgstr "Select all messages in the same thread as the selected message"
+msgstr "Set the follow-up flag to completed on the selected messages"
 
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1171
 msgid "Follow _Up..."
 msgstr "Follow _Upâ?¦"
 
-#: ../mail/e-mail-reader.c:1175
-#, fuzzy
+#: ../mail/e-mail-reader.c:1173
 msgid "Flag the selected messages for follow-up"
-msgstr "Flag selected messages for follow-up"
+msgstr "Flag the selected messages for follow-up"
 
-#: ../mail/e-mail-reader.c:1180
-#: ../modules/mail/e-mail-attachment-handler.c:134
-msgid "_Forward"
-msgstr "_Forward"
-
-#: ../mail/e-mail-reader.c:1182
-msgid "Forward the selected message to someone"
-msgstr "Forward the selected message to someone"
-
-#: ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1178
 msgid "_Attached"
 msgstr "_Attached"
 
-#: ../mail/e-mail-reader.c:1189
+#: ../mail/e-mail-reader.c:1180 ../mail/e-mail-reader.c:1187
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Forward the selected message to someone as an attachment"
 
-#: ../mail/e-mail-reader.c:1194
+#: ../mail/e-mail-reader.c:1185
+msgid "Forward As _Attached"
+msgstr "Forward As _Attached"
+
+#: ../mail/e-mail-reader.c:1192
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ../mail/e-mail-reader.c:1196
+#: ../mail/e-mail-reader.c:1194 ../mail/e-mail-reader.c:1201
 msgid "Forward the selected message in the body of a new message"
 msgstr "Forward the selected message in the body of a new message"
 
-#: ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1199
+msgid "Forward As _Inline"
+msgstr "Forward As _Inline"
+
+#: ../mail/e-mail-reader.c:1206
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ../mail/e-mail-reader.c:1203
+#: ../mail/e-mail-reader.c:1208 ../mail/e-mail-reader.c:1215
 msgid "Forward the selected message quoted like a reply"
 msgstr "Forward the selected message quoted like a reply"
 
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1213
+msgid "Forward As _Quoted"
+msgstr "Forward As _Quoted"
+
+#: ../mail/e-mail-reader.c:1220
 msgid "_Load Images"
 msgstr "_Load Images"
 
-#: ../mail/e-mail-reader.c:1210
+#: ../mail/e-mail-reader.c:1222
 msgid "Force images in HTML mail to be loaded"
 msgstr "Force images in HTML mail to be loaded"
 
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1227
 msgid "_Important"
 msgstr "_Important"
 
-#: ../mail/e-mail-reader.c:1217
+#: ../mail/e-mail-reader.c:1229
 msgid "Mark the selected messages as important"
 msgstr "Mark the selected messages as important"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1234
 msgid "_Junk"
 msgstr "_Junk"
 
-#: ../mail/e-mail-reader.c:1224
+#: ../mail/e-mail-reader.c:1236
 msgid "Mark the selected messages as junk"
 msgstr "Mark the selected messages as junk"
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1241
 msgid "_Not Junk"
 msgstr "_Not Junk"
 
-#: ../mail/e-mail-reader.c:1231
-#, fuzzy
-msgid "Mark the selected messasges as not being junk"
+#: ../mail/e-mail-reader.c:1243
+msgid "Mark the selected messages as not being junk"
 msgstr "Mark the selected messages as not being junk"
 
-#: ../mail/e-mail-reader.c:1236
+#: ../mail/e-mail-reader.c:1248
 msgid "_Read"
 msgstr "_Read"
 
-#: ../mail/e-mail-reader.c:1238
+#: ../mail/e-mail-reader.c:1250
 msgid "Mark the selected messages as having been read"
 msgstr "Mark the selected messages as having been read"
 
-#: ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1255
 msgid "Uni_mportant"
 msgstr "Uni_mportant"
 
-#: ../mail/e-mail-reader.c:1245
+#: ../mail/e-mail-reader.c:1257
 msgid "Mark the selected messages as unimportant"
 msgstr "Mark the selected messages as unimportant"
 
-#: ../mail/e-mail-reader.c:1250
+#: ../mail/e-mail-reader.c:1262
 msgid "_Unread"
 msgstr "_Unread"
 
-#: ../mail/e-mail-reader.c:1252
+#: ../mail/e-mail-reader.c:1264
 msgid "Mark the selected messages as not having been read"
 msgstr "Mark the selected messages as not having been read"
 
-#: ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1269
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Messageâ?¦"
 
-#: ../mail/e-mail-reader.c:1259
+#: ../mail/e-mail-reader.c:1271
 msgid "Open the selected messages in the composer for editing"
 msgstr "Open the selected messages in the composer for editing"
 
-#: ../mail/e-mail-reader.c:1264
+#: ../mail/e-mail-reader.c:1276
 msgid "Compose _New Message"
 msgstr "Compose _New Message"
 
-#: ../mail/e-mail-reader.c:1266
+#: ../mail/e-mail-reader.c:1278
 msgid "Open a window for composing a mail message"
 msgstr "Open a window for composing a mail message"
 
-#: ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1283
 msgid "_Open in New Window"
 msgstr "_Open in New Window"
 
-#: ../mail/e-mail-reader.c:1273
+#: ../mail/e-mail-reader.c:1285
 msgid "Open the selected messages in a new window"
 msgstr "Open the selected messages in a new window"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1290
 msgid "_Move to Folder..."
 msgstr "_Move to Folderâ?¦"
 
-#: ../mail/e-mail-reader.c:1280
+#: ../mail/e-mail-reader.c:1292
 msgid "Move selected messages to another folder"
 msgstr "Move selected messages to another folder"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1297
 msgid "_Next Message"
 msgstr "_Next Message"
 
-#: ../mail/e-mail-reader.c:1287
+#: ../mail/e-mail-reader.c:1299
 msgid "Display the next message"
 msgstr "Display the next message"
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1304
 msgid "Next _Important Message"
 msgstr "Next _Important Message"
 
-#: ../mail/e-mail-reader.c:1294
+#: ../mail/e-mail-reader.c:1306
 msgid "Display the next important message"
 msgstr "Display the next important message"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1311
 msgid "Next _Thread"
 msgstr "Next _Thread"
 
-#: ../mail/e-mail-reader.c:1301
+#: ../mail/e-mail-reader.c:1313
 msgid "Display the next thread"
 msgstr "Display the next thread"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1318
 msgid "Next _Unread Message"
 msgstr "Next _Unread Message"
 
-#: ../mail/e-mail-reader.c:1308
+#: ../mail/e-mail-reader.c:1320
 msgid "Display the next unread message"
 msgstr "Display the next unread message"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1325
 msgid "_Previous Message"
 msgstr "_Previous Message"
 
-#: ../mail/e-mail-reader.c:1315
+#: ../mail/e-mail-reader.c:1327
 msgid "Display the previous message"
 msgstr "Display the previous message"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1332
 msgid "Pr_evious Important Message"
 msgstr "Pr_evious Important Message"
 
-#: ../mail/e-mail-reader.c:1322
+#: ../mail/e-mail-reader.c:1334
 msgid "Display the previous important message"
 msgstr "Display the previous important message"
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1339
 msgid "P_revious Unread Message"
 msgstr "P_revious Unread Message"
 
-#: ../mail/e-mail-reader.c:1329
+#: ../mail/e-mail-reader.c:1341
 msgid "Display the previous unread message"
 msgstr "Display the previous unread message"
 
-#: ../mail/e-mail-reader.c:1336
+#: ../mail/e-mail-reader.c:1348
 msgid "Print this message"
 msgstr "Print this message"
 
-#: ../mail/e-mail-reader.c:1343
+#: ../mail/e-mail-reader.c:1355
 msgid "Preview the message to be printed"
 msgstr "Preview the message to be printed"
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1360
 msgid "Re_direct"
 msgstr "Re_direct"
 
-#: ../mail/e-mail-reader.c:1350
+#: ../mail/e-mail-reader.c:1362
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirect (bounce) the selected message to someone"
 
-#: ../mail/e-mail-reader.c:1355
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../mail/e-mail-reader.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 #: ../modules/mail/e-mail-attachment-handler.c:141
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: ../mail/e-mail-reader.c:1357
-#, fuzzy
+#: ../mail/e-mail-reader.c:1369
 msgid "Compose a reply to all the recipients of the selected message"
-msgstr "Compose a reply to all of the recipients of the selected message"
+msgstr "Compose a reply to all the recipients of the selected message"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1374
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
-#: ../mail/e-mail-reader.c:1364
+#: ../mail/e-mail-reader.c:1376
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Compose a reply to the mailing list of the selected message"
 
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1381
 #: ../modules/mail/e-mail-attachment-handler.c:148
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: ../mail/e-mail-reader.c:1371
+#: ../mail/e-mail-reader.c:1383
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Compose a reply to the sender of the selected message"
 
-#: ../mail/e-mail-reader.c:1376
-#, fuzzy
+#: ../mail/e-mail-reader.c:1388
 msgid "_Save as mbox..."
-msgstr "Save asâ?¦"
+msgstr "_Save as mboxâ?¦"
 
-#: ../mail/e-mail-reader.c:1378
-#, fuzzy
+#: ../mail/e-mail-reader.c:1390
 msgid "Save selected messages as an mbox file"
-msgstr "Save the selected messages as a text file"
+msgstr "Save selected messages as a mbox file"
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1395
 msgid "Search Folder from Mailing _List..."
 msgstr "Search Folder from Mailing _Listâ?¦"
 
-#: ../mail/e-mail-reader.c:1385
-#, fuzzy
+#: ../mail/e-mail-reader.c:1397
 msgid "Create a search folder for this mailing list"
-msgstr "Create a Search Folder for this mailing list"
+msgstr "Create a Search folder for this mailing list"
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1402
 msgid "Search Folder from Recipien_ts..."
 msgstr "Search Folder from Recipien_tsâ?¦"
 
-#: ../mail/e-mail-reader.c:1392
-#, fuzzy
+#: ../mail/e-mail-reader.c:1404
 msgid "Create a search folder for these recipients"
-msgstr "Create a Search Folder for these recipients"
+msgstr "Create a Search folder for these recipients"
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1409
 msgid "Search Folder from Sen_der..."
 msgstr "Search Folder from Sen_derâ?¦"
 
-#: ../mail/e-mail-reader.c:1399
-#, fuzzy
+#: ../mail/e-mail-reader.c:1411
 msgid "Create a search folder for this sender"
-msgstr "Create a Search Folder for this sender"
+msgstr "Create a Search folder for this sender"
 
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1416
 msgid "Search Folder from S_ubject..."
 msgstr "Search Folder from S_ubjectâ?¦"
 
-#: ../mail/e-mail-reader.c:1406
-#, fuzzy
+#: ../mail/e-mail-reader.c:1418
 msgid "Create a search folder for this subject"
-msgstr "Create a Search Folder for this subject"
-
-#: ../mail/e-mail-reader.c:1411
-msgid "Select _All Text"
-msgstr "Select _All Text"
+msgstr "Create a Search folder for this subject"
 
-#: ../mail/e-mail-reader.c:1413
-msgid "Select all the text in a message"
-msgstr "Select all the text in a message"
-
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1423
 msgid "_Message Source"
 msgstr "_Message Source"
 
-#: ../mail/e-mail-reader.c:1420
+#: ../mail/e-mail-reader.c:1425
 msgid "Show the raw email source of the message"
 msgstr "Show the raw e-mail source of the message"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1437
 msgid "_Undelete Message"
 msgstr "_Undelete Message"
 
-#: ../mail/e-mail-reader.c:1434
+#: ../mail/e-mail-reader.c:1439
 msgid "Undelete the selected messages"
 msgstr "Undelete the selected messages"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1444
 msgid "_Normal Size"
 msgstr "_Normal Size"
 
-#: ../mail/e-mail-reader.c:1441
+#: ../mail/e-mail-reader.c:1446
 msgid "Reset the text to its original size"
 msgstr "Reset the text to its original size"
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1451
 msgid "_Zoom In"
 msgstr "_Zoom In"
 
-#: ../mail/e-mail-reader.c:1448
+#: ../mail/e-mail-reader.c:1453
 msgid "Increase the text size"
 msgstr "Increase the text size"
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1458
 msgid "Zoom _Out"
 msgstr "Zoom _Out"
 
-#: ../mail/e-mail-reader.c:1455
+#: ../mail/e-mail-reader.c:1460
 msgid "Decrease the text size"
 msgstr "Decrease the text size"
 
-#: ../mail/e-mail-reader.c:1462
+#: ../mail/e-mail-reader.c:1467
 msgid "Create R_ule"
 msgstr "Create R_ule"
 
-#: ../mail/e-mail-reader.c:1469
+#: ../mail/e-mail-reader.c:1474
 msgid "Ch_aracter Encoding"
 msgstr "Ch_aracter Encoding"
 
-#: ../mail/e-mail-reader.c:1476
-#, fuzzy
+#: ../mail/e-mail-reader.c:1481
 msgid "F_orward As"
-msgstr "F_orward Asâ?¦"
+msgstr "F_orward As"
 
-#: ../mail/e-mail-reader.c:1483
+#: ../mail/e-mail-reader.c:1488
 msgid "_Go To"
 msgstr "_Go To"
 
-#: ../mail/e-mail-reader.c:1490
-#, fuzzy
+#: ../mail/e-mail-reader.c:1495
 msgid "Mar_k As"
-msgstr "Mar_k as"
+msgstr "Mar_k As"
 
-#: ../mail/e-mail-reader.c:1497
+#: ../mail/e-mail-reader.c:1502
 msgid "_Message"
 msgstr "_Message"
 
-#: ../mail/e-mail-reader.c:1504
+#: ../mail/e-mail-reader.c:1509
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:1521
+#: ../mail/e-mail-reader.c:1534
 msgid "Mark for Follo_w Up..."
 msgstr "Mark for Follo_w Upâ?¦"
 
-#: ../mail/e-mail-reader.c:1529
+#: ../mail/e-mail-reader.c:1542
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: ../mail/e-mail-reader.c:1533
+#: ../mail/e-mail-reader.c:1546
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: ../mail/e-mail-reader.c:1537
+#: ../mail/e-mail-reader.c:1550
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: ../mail/e-mail-reader.c:1541
+#: ../mail/e-mail-reader.c:1554
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: ../mail/e-mail-reader.c:1545
-#, fuzzy
+#: ../mail/e-mail-reader.c:1558
 msgid "Mark as Uni_mportant"
-msgstr "Mark as Un_important"
+msgstr "Mark as Uni_mportant"
 
-#: ../mail/e-mail-reader.c:1549
+#: ../mail/e-mail-reader.c:1562
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: ../mail/e-mail-reader.c:1585
+#: ../mail/e-mail-reader.c:1598
 msgid "_Caret Mode"
 msgstr "_Caret Mode"
 
-#: ../mail/e-mail-reader.c:1587
+#: ../mail/e-mail-reader.c:1600
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Show a blinking cursor in the body of displayed messages"
 
-#: ../mail/e-mail-reader.c:1593
+#: ../mail/e-mail-reader.c:1606
 msgid "All Message _Headers"
 msgstr "All Message _Headers"
 
-#: ../mail/e-mail-reader.c:1595
+#: ../mail/e-mail-reader.c:1608
 msgid "Show messages with all email headers"
 msgstr "Show messages with all e-mail headers"
 
-#: ../mail/e-mail-reader.c:1807
+#: ../mail/e-mail-reader.c:1831
 msgid "Unable to retrieve message"
 msgstr "Unable to retrieve message"
 
+#: ../mail/e-mail-reader.c:1876 ../mail/mail-ops.c:1849
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "Retrieving message '%s'"
+
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2208
-#: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:612
-#: ../plugins/google-account-setup/google-source.c:783
+#: ../mail/e-mail-reader.c:2370
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:534
+#: ../plugins/google-account-setup/google-source.c:656
 #: ../widgets/misc/e-account-tree-view.c:234
 msgid "Default"
 msgstr "Default"
 
-#: ../mail/e-mail-reader.c:2353 ../mail/em-filter-i18n.h:14
-#: ../modules/addressbook/e-book-shell-view-actions.c:979
-#: ../modules/calendar/e-cal-shell-view-actions.c:1686
-#: ../modules/calendar/e-memo-shell-view-actions.c:905
-#: ../modules/calendar/e-task-shell-view-actions.c:1105
-#: ../plugins/groupwise-features/share-folder.c:765
+#: ../mail/e-mail-reader.c:2489
+#: ../modules/mail/e-mail-attachment-handler.c:134
+msgid "_Forward"
+msgstr "_Forward"
+
+#: ../mail/e-mail-reader.c:2490
+msgid "Forward the selected message to someone"
+msgstr "Forward the selected message to someone"
+
+#: ../mail/e-mail-reader.c:2534 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Delete"
 
-#: ../mail/e-mail-reader.c:2357
-#: ../modules/calendar/e-cal-shell-view-actions.c:1194
+#: ../mail/e-mail-reader.c:2538
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Next"
 
-#: ../mail/e-mail-reader.c:2361
-#: ../modules/calendar/e-cal-shell-view-actions.c:1187
+#: ../mail/e-mail-reader.c:2542
+#: ../modules/calendar/e-cal-shell-view-actions.c:1243
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Previous"
 
-#: ../mail/e-mail-reader.c:2365 ../mail/message-tag-followup.c:62
+#: ../mail/e-mail-reader.c:2546 ../mail/mail-dialogs.ui.h:18
 msgid "Reply"
 msgstr "Reply"
 
-#: ../mail/e-mail-search-bar.c:77
-#, c-format
-msgid "Matches: %d"
-msgstr "Matches: %d"
-
-#: ../mail/e-mail-search-bar.c:552
-msgid "Close the find bar"
-msgstr "Close the find bar"
-
-#: ../mail/e-mail-search-bar.c:560
-msgid "Fin_d:"
-msgstr "Fin_d:"
-
-#: ../mail/e-mail-search-bar.c:572
-msgid "Clear the search"
-msgstr "Clear the search"
-
-#: ../mail/e-mail-search-bar.c:595
-msgid "_Previous"
-msgstr "_Previous"
-
-#: ../mail/e-mail-search-bar.c:601
-msgid "Find the previous occurrence of the phrase"
-msgstr "Find the previous occurrence of the phrase"
-
-#: ../mail/e-mail-search-bar.c:611
-msgid "_Next"
-msgstr "_Next"
-
-#: ../mail/e-mail-search-bar.c:617
-msgid "Find the next occurrence of the phrase"
-msgstr "Find the next occurrence of the phrase"
-
-#: ../mail/e-mail-search-bar.c:627
-msgid "Mat_ch case"
-msgstr "Mat_ch case"
-
-#: ../mail/e-mail-search-bar.c:655
-msgid "Reached bottom of page, continued from top"
-msgstr "Reached bottom of page, continued from top"
-
-#: ../mail/e-mail-search-bar.c:677
-msgid "Reached top of page, continued from bottom"
-msgstr "Reached top of page, continued from bottom"
-
-#. On This Computer is always first, and Search Folders
-#. * is always last.
-#. create the local source group
-#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:144
-#: ../mail/em-folder-tree-model.c:146 ../mail/mail-vfolder.c:220
-#: ../mail/message-list.c:1555
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:120
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:107
-#: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:110
-#: ../modules/calendar/e-task-shell-migrate.c:501
-#: ../modules/mail/e-mail-shell-migrate.c:2931
-msgid "On This Computer"
-msgstr "On This Computer"
+#: ../mail/e-mail-tag-editor.c:292
+msgid "Flag to Follow Up"
+msgstr "Flag to Follow Up"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:486
+#: ../mail/em-account-editor.c:500 ../mail/mail-config.ui.h:72
+#: ../modules/addressbook/ldap-config.ui.h:10
 msgid "No encryption"
 msgstr "No encryption"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:490
+#: ../mail/em-account-editor.c:504 ../mail/mail-config.ui.h:120
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "TLS encryption"
 msgstr "TLS encryption"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:494
+#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:93
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "SSL encryption"
 msgstr "SSL encryption"
 
-#: ../mail/em-account-editor.c:587
+#: ../mail/em-account-editor.c:595
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s Licence Agreement"
 
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:602
 #, c-format
 msgid ""
 "\n"
@@ -9838,23 +10016,35 @@ msgstr ""
 "for %s displayed below\n"
 "and tick the check box for accepting it\n"
 
-#: ../mail/em-account-editor.c:1002
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:882 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "None"
+
+#: ../mail/em-account-editor.c:965
 msgid "Never"
 msgstr "Never"
 
-#: ../mail/em-account-editor.c:1003
+#: ../mail/em-account-editor.c:966
 msgid "Always"
 msgstr "Always"
 
-#: ../mail/em-account-editor.c:1004
+#: ../mail/em-account-editor.c:967
 msgid "Ask for each message"
 msgstr "Ask for each message"
 
-#: ../mail/em-account-editor.c:2084
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "None"
+
+#: ../mail/em-account-editor.c:2055
 msgid "Mail Configuration"
 msgstr "Mail Configuration"
 
-#: ../mail/em-account-editor.c:2085
+#: ../mail/em-account-editor.c:2056
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9864,12 +10054,12 @@ msgstr ""
 "\n"
 "Click \"Forward\" to begin."
 
-#: ../mail/em-account-editor.c:2087 ../mail/em-account-editor.c:2213
-#: ../mail/mail-config.glade.h:87
+#: ../mail/em-account-editor.c:2058 ../mail/em-account-editor.c:2194
+#: ../mail/mail-config.ui.h:58
 msgid "Identity"
 msgstr "Identity"
 
-#: ../mail/em-account-editor.c:2088
+#: ../mail/em-account-editor.c:2059
 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 "
@@ -9879,20 +10069,20 @@ msgstr ""
 "below do not need to be filled in, unless you wish to include this "
 "information in e-mail you send."
 
-#: ../mail/em-account-editor.c:2090 ../mail/em-account-editor.c:2254
-#: ../mail/mail-config.glade.h:107
+#: ../mail/em-account-editor.c:2061 ../mail/em-account-editor.c:2231
+#: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "Receiving E-mail"
 
-#: ../mail/em-account-editor.c:2091
+#: ../mail/em-account-editor.c:2062
 msgid "Please configure the following account settings."
 msgstr "Please configure the following account settings."
 
-#: ../mail/em-account-editor.c:2093 ../mail/em-account-editor.c:2714
+#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2708
 msgid "Sending Email"
 msgstr "Sending E-mail"
 
-#: ../mail/em-account-editor.c:2094
+#: ../mail/em-account-editor.c:2065
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -9900,25 +10090,23 @@ 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/em-account-editor.c:2096
+#: ../mail/em-account-editor.c:2067
 msgid "Account Management"
 msgstr "Account Management"
 
-#: ../mail/em-account-editor.c:2097
-#, fuzzy
+#: ../mail/em-account-editor.c:2068
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"Please enter a descriptive name for this account in the space below. This "
-"name will be used for display purposes only."
+"Please enter a descriptive name for this account in the space below.\n"
+"This name will be used for display purposes only."
 
-#: ../mail/em-account-editor.c:2101
+#: ../mail/em-account-editor.c:2072
 msgid "Done"
 msgstr "Done"
 
-#: ../mail/em-account-editor.c:2102
-#, fuzzy
+#: ../mail/em-account-editor.c:2073
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9928,65 +10116,52 @@ msgid ""
 msgstr ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
-"You are now ready to send and receive e-mail \n"
-"using Evolution. \n"
+"You are now ready to send and receive e-mail using Evolution.\n"
 "\n"
 "Click \"Apply\" to save your settings."
 
-#: ../mail/em-account-editor.c:2526
+#: ../mail/em-account-editor.c:2518
 msgid "Check for _new messages every"
 msgstr "Check for _new messages every"
 
-#: ../mail/em-account-editor.c:2534
+#: ../mail/em-account-editor.c:2526
 msgid "minu_tes"
 msgstr "minu_tes"
 
-#: ../mail/em-account-editor.c:2776 ../mail/mail-config.glade.h:63
+#: ../mail/em-account-editor.c:2772 ../mail/mail-config.ui.h:31
 msgid "Defaults"
 msgstr "Defaults"
 
-#. Security settings
-#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:113
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../mail/em-account-editor.c:2834 ../mail/mail-config.ui.h:100
 msgid "Security"
 msgstr "Security"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2879 ../mail/em-account-editor.c:2947
+#: ../mail/em-account-editor.c:2871 ../mail/em-account-editor.c:2939
 msgid "Receiving Options"
 msgstr "Receiving Options"
 
-#: ../mail/em-account-editor.c:2880 ../mail/em-account-editor.c:2948
+#: ../mail/em-account-editor.c:2872 ../mail/em-account-editor.c:2940
 msgid "Checking for New Messages"
 msgstr "Checking for New Messages"
 
-#: ../mail/em-account-editor.c:3407 ../mail/mail-config.glade.h:35
+#: ../mail/em-account-editor.c:3408
 msgid "Account Editor"
 msgstr "Account Editor"
 
-#: ../mail/em-account-editor.c:3407
+#: ../mail/em-account-editor.c:3408
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistant"
 
-#: ../mail/em-composer-utils.c:1590
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr ""
-"No destination address provided; forward of the message has been cancelled."
-
-#: ../mail/em-composer-utils.c:1596
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "No account found to use; forward of the message has been cancelled."
-
-#: ../mail/em-composer-utils.c:2063
+#: ../mail/em-composer-utils.c:1954
 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:2110
+#: ../mail/em-composer-utils.c:2001
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9994,21 +10169,21 @@ msgstr ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 
-#: ../mail/em-composer-utils.c:2253
+#: ../mail/em-composer-utils.c:2145
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
-#: ../mail/em-composer-utils.c:2431
+#: ../mail/em-composer-utils.c:2326
 msgid "Posting destination"
 msgstr "Posting destination"
 
-#: ../mail/em-composer-utils.c:2432
+#: ../mail/em-composer-utils.c:2327
 msgid "Choose folders to post the message to."
 msgstr "Choose folders to post the message to."
 
-#: ../mail/em-filter-editor.c:188
-msgid "_Filter Rules"
-msgstr "_Filter Rules"
+#: ../mail/em-filter-folder-element.c:258
+msgid "Select Folder"
+msgstr "Select Folder"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -10023,26 +10198,14 @@ msgstr "Assign Colour"
 msgid "Assign Score"
 msgstr "Assign Score"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Beep"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "Completed On"
 
-#: ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "Copy to Folder"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Date received"
@@ -10099,10 +10262,6 @@ msgstr "Follow Up"
 msgid "Forward to"
 msgstr "Forward to"
 
-#: ../mail/em-filter-i18n.h:30 ../modules/mail/e-mail-shell-migrate.c:955
-msgid "Important"
-msgstr "Important"
-
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "is after"
@@ -10127,7 +10286,7 @@ msgstr "is not set"
 msgid "is set"
 msgstr "is set"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:88
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
 msgid "Junk"
 msgstr "Junk"
 
@@ -10167,10 +10326,6 @@ msgstr "Message is not Junk"
 msgid "Message Location"
 msgstr "Message Location"
 
-#: ../mail/em-filter-i18n.h:51
-msgid "Move to Folder"
-msgstr "Move to Folder"
-
 #: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "Pipe to Program"
@@ -10179,8 +10334,8 @@ msgstr "Pipe to Program"
 msgid "Play Sound"
 msgstr "Play Sound"
 
-#. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
+#. Past tense, as in "has been read".
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
 msgid "Read"
 msgstr "Read"
 
@@ -10261,11 +10416,11 @@ msgid "Unset Status"
 msgstr "Unset Status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:530
 msgid "Then"
 msgstr "Then"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:561
 msgid "Add Ac_tion"
 msgstr "Add Ac_tion"
 
@@ -10295,7 +10450,7 @@ msgid "Quota usage"
 msgstr "Quota usage"
 
 #: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Folder Properties"
 msgstr "Folder Properties"
 
@@ -10303,17 +10458,17 @@ msgstr "Folder Properties"
 msgid "<click here to select a folder>"
 msgstr "<click here to select a folder>"
 
-#: ../mail/em-folder-selector.c:267
+#: ../mail/em-folder-selector.c:266
 msgid "C_reate"
 msgstr "C_reate"
 
-#: ../mail/em-folder-selector.c:271
+#: ../mail/em-folder-selector.c:270
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
 #. load store to mail component
 #: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
-#: ../mail/mail-vfolder.c:978 ../mail/mail-vfolder.c:1034
+#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
 msgid "Search Folders"
 msgstr "Search Folders"
 
@@ -10322,15 +10477,19 @@ msgstr "Search Folders"
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:662 ../mail/em-folder-tree-model.c:998
+#: ../mail/em-folder-tree-model.c:726 ../mail/em-folder-tree-model.c:1063
 msgid "Loading..."
 msgstr "Loadingâ?¦"
 
-#: ../mail/em-folder-tree.c:183 ../mail/mail-ops.c:1069
+#: ../mail/em-folder-tree.c:188
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanning folders in \"%s\""
 
+#: ../mail/em-folder-tree.c:601
+msgid "Folder names cannot contain '/'"
+msgstr "Folder names cannot contain '/'"
+
 #. Translators: This is the string used for displaying the
 #. * folder names in folder trees. The first "%s" will be
 #. * replaced by the folder's name and "%u" will be replaced
@@ -10349,85 +10508,74 @@ msgstr "Scanning folders in \"%s\""
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:831
+#: ../mail/em-folder-tree.c:1083
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1154
+#: ../mail/em-folder-tree.c:1289
 msgid "Mail Folder Tree"
 msgstr "Mail Folder Tree"
 
-#: ../mail/em-folder-tree.c:1321
+#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: ../mail/em-folder-tree.c:1323
+#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: ../mail/em-folder-tree.c:1330 ../mail/message-list.c:2052
+#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2103
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: ../mail/em-folder-tree.c:1332 ../mail/message-list.c:2054
+#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2105
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: ../mail/em-folder-tree.c:1347
+#: ../mail/em-folder-tree.c:1515
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: ../mail/em-folder-utils.c:99
-#, c-format
-msgid "Copying `%s' to `%s'"
-msgstr "Copying `%s' to `%s'"
+#: ../mail/em-folder-utils.c:386
+msgid "Move Folder To"
+msgstr "Move Folder To"
 
-#: ../mail/em-folder-utils.c:511
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Rename the \"%s\" folder to:"
-
-#: ../mail/em-folder-utils.c:513
-msgid "Rename Folder"
-msgstr "Rename Folder"
-
-#: ../mail/em-folder-utils.c:519
-msgid "Folder names cannot contain '/'"
-msgstr "Folder names cannot contain '/'"
+#: ../mail/em-folder-utils.c:386
+msgid "Copy Folder To"
+msgstr "Copy Folder To"
 
-#: ../mail/em-folder-utils.c:595
-#: ../plugins/groupwise-features/share-folder-common.c:144
+#: ../mail/em-folder-utils.c:507
+#: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creating folder `%s'"
 
-#: ../mail/em-folder-utils.c:757
-#, fuzzy
+#: ../mail/em-folder-utils.c:670
 msgid "Create Folder"
-msgstr "Create folder"
+msgstr "Create Folder"
 
-#: ../mail/em-folder-utils.c:758
-#: ../plugins/groupwise-features/install-shared.c:167
-#: ../plugins/groupwise-features/share-folder-common.c:386
+#: ../mail/em-folder-utils.c:671
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
-#: ../mail/em-folder-utils.c:774
+#: ../mail/em-folder-utils.c:687
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Unsubscribing from folder \"%s\""
 
-#: ../mail/em-format-html-display.c:108 ../mail/em-format-html.c:1453
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: ../mail/em-format-html-display.c:108
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10435,11 +10583,11 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: ../mail/em-format-html-display.c:109 ../mail/em-format-html.c:1454
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
 msgid "Valid signature"
 msgstr "Valid signature"
 
-#: ../mail/em-format-html-display.c:109
+#: ../mail/em-format-html-display.c:104
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10447,11 +10595,11 @@ msgstr ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 
-#: ../mail/em-format-html-display.c:110 ../mail/em-format-html.c:1455
+#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
-#: ../mail/em-format-html-display.c:110
+#: ../mail/em-format-html-display.c:105
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10459,11 +10607,11 @@ msgstr ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 
-#: ../mail/em-format-html-display.c:111 ../mail/em-format-html.c:1456
+#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
 msgid "Valid signature, but cannot verify sender"
 msgstr "Valid signature, but cannot verify sender"
 
-#: ../mail/em-format-html-display.c:111
+#: ../mail/em-format-html-display.c:106
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10471,11 +10619,11 @@ msgstr ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 
-#: ../mail/em-format-html-display.c:112 ../mail/em-format-html.c:1457
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
 msgid "Signature exists, but need public key"
 msgstr "Signature exists, but need public key"
 
-#: ../mail/em-format-html-display.c:112
+#: ../mail/em-format-html-display.c:107
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -10483,11 +10631,11 @@ msgstr ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 
-#: ../mail/em-format-html-display.c:119 ../mail/em-format-html.c:1463
+#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
-#: ../mail/em-format-html-display.c:119
+#: ../mail/em-format-html-display.c:114
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -10495,11 +10643,11 @@ msgstr ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 
-#: ../mail/em-format-html-display.c:120 ../mail/em-format-html.c:1464
+#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
-#: ../mail/em-format-html-display.c:120
+#: ../mail/em-format-html-display.c:115
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -10509,11 +10657,11 @@ msgstr ""
 "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:121 ../mail/em-format-html.c:1465
+#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: ../mail/em-format-html-display.c:121
+#: ../mail/em-format-html-display.c:116
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -10521,11 +10669,11 @@ msgstr ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 
-#: ../mail/em-format-html-display.c:122 ../mail/em-format-html.c:1466
+#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
-#: ../mail/em-format-html-display.c:122
+#: ../mail/em-format-html-display.c:117
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -10535,15 +10683,15 @@ msgstr ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 
-#: ../mail/em-format-html-display.c:259 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: ../mail/em-format-html-display.c:274
+#: ../mail/em-format-html-display.c:261
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: ../mail/em-format-html-display.c:525
+#: ../mail/em-format-html-display.c:509
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10551,28 +10699,28 @@ msgstr ""
 "Evolution cannot render this e-mail as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 
-#: ../mail/em-format-html-display.c:795
+#: ../mail/em-format-html-display.c:738
 msgid "Completed on"
 msgstr "Completed on"
 
-#: ../mail/em-format-html-display.c:803
+#: ../mail/em-format-html-display.c:746
 msgid "Overdue:"
 msgstr "Overdue:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:807
+#: ../mail/em-format-html-display.c:750
 msgid "by"
 msgstr "by"
 
-#: ../mail/em-format-html-display.c:1204 ../mail/em-format-html-display.c:1243
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html-display.c:997
 msgid "View _Unformatted"
 msgstr "View _Unformatted"
 
-#: ../mail/em-format-html-display.c:1206
+#: ../mail/em-format-html-display.c:960
 msgid "Hide _Unformatted"
 msgstr "Hide _Unformatted"
 
-#: ../mail/em-format-html-display.c:1263
+#: ../mail/em-format-html-display.c:1017
 msgid "O_pen With"
 msgstr "O_pen With"
 
@@ -10585,44 +10733,44 @@ msgstr "Page %d of %d"
 msgid "Formatting message"
 msgstr "Formatting message"
 
-#: ../mail/em-format-html.c:342
+#: ../mail/em-format-html.c:356
 msgid "Formatting Message..."
 msgstr "Formatting Messageâ?¦"
 
-#: ../mail/em-format-html.c:1304 ../mail/em-format-html.c:1313
+#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Retrieving `%s'"
 
-#: ../mail/em-format-html.c:1759
+#: ../mail/em-format-html.c:1854
 msgid "Unknown external-body part."
 msgstr "Unknown external-body part."
 
-#: ../mail/em-format-html.c:1767
+#: ../mail/em-format-html.c:1862
 msgid "Malformed external-body part."
 msgstr "Malformed external-body part."
 
-#: ../mail/em-format-html.c:1797
+#: ../mail/em-format-html.c:1892
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointer to FTP site (%s)"
 
-#: ../mail/em-format-html.c:1808
+#: ../mail/em-format-html.c:1903
 #, 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:1810
+#: ../mail/em-format-html.c:1905
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointer to local file (%s)"
 
-#: ../mail/em-format-html.c:1831
+#: ../mail/em-format-html.c:1926
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointer to remote data (%s)"
 
-#: ../mail/em-format-html.c:1842
+#: ../mail/em-format-html.c:1937
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointer to unknown external data (\"%s\" type)"
@@ -10630,46 +10778,38 @@ msgstr "Pointer to unknown external data (\"%s\" type)"
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:2483
+#: ../mail/em-format-html.c:2595
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 
-#: ../mail/em-subscribe-editor.c:607
+#: ../mail/em-subscribe-editor.c:586
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "This store does not support subscriptions, or they are not enabled."
 
-#: ../mail/em-subscribe-editor.c:640
+#: ../mail/em-subscribe-editor.c:619
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: ../mail/em-subscribe-editor.c:644
+#: ../mail/em-subscribe-editor.c:623
 msgid "Folder"
 msgstr "Folder"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:860
+#: ../mail/em-subscribe-editor.c:835
 msgid "Please select a server."
 msgstr "Please select a server."
 
-#: ../mail/em-subscribe-editor.c:896
+#: ../mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "No server has been selected"
 
-#: ../mail/em-utils.c:305
+#: ../mail/em-utils.c:311
 msgid "Message Filters"
 msgstr "Message Filters"
 
-#: ../mail/em-utils.c:357
-msgid "message"
-msgstr "message"
-
-#: ../mail/em-utils.c:645
-msgid "Save Message..."
-msgstr "Save Messageâ?¦"
-
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1108
+#: ../mail/em-utils.c:815
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
@@ -10678,39 +10818,33 @@ msgstr "Messages from %s"
 msgid "Search _Folders"
 msgstr "Search _Folders"
 
-#: ../mail/em-vfolder-rule.c:596
-msgid "Search Folder source"
-msgstr "Search Folder source"
+#: ../mail/em-vfolder-rule.c:522
+msgid "Add Folder"
+msgstr "Add Folder"
 
 #: ../mail/evolution-mail.schemas.in.h:1
-#, fuzzy
 msgid "\"Filter Editor\" window height"
-msgstr "Default window height"
+msgstr "\"Filter Editor\" window height"
 
 #: ../mail/evolution-mail.schemas.in.h:2
-#, fuzzy
 msgid "\"Filter Editor\" window maximize state"
-msgstr "\"Send and Receive Mail\" window maximise state"
+msgstr "\"Filter Editor\" window maximise state"
 
 #: ../mail/evolution-mail.schemas.in.h:3
-#, fuzzy
 msgid "\"Filter Editor\" window width"
-msgstr "Default window width"
+msgstr "\"Filter Editor\" window width"
 
 #: ../mail/evolution-mail.schemas.in.h:4
-#, fuzzy
 msgid "\"Search Folder Editor\" window height"
-msgstr "Default window height"
+msgstr "\"Search Folder Editor\" window height"
 
 #: ../mail/evolution-mail.schemas.in.h:5
-#, fuzzy
 msgid "\"Search Folder Editor\" window maximize state"
-msgstr "\"Send and Receive Mail\" window maximise state"
+msgstr "\"Search Folder Editor\" window maximise state"
 
 #: ../mail/evolution-mail.schemas.in.h:6
-#, fuzzy
 msgid "\"Search Folder Editor\" window width"
-msgstr "Search Folder based on Mailing _List"
+msgstr "\"Search Folder Editor\" window width"
 
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Send and Receive Mail\" window height"
@@ -10821,18 +10955,16 @@ msgid "Default height of the Composer Window."
 msgstr "Default height of the Composer Window."
 
 #: ../mail/evolution-mail.schemas.in.h:32
-#, fuzzy
 msgid "Default height of the mail browser window."
-msgstr "Default height of the Composer Window."
+msgstr "Default height of the mail browser window."
 
 #: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default height of the subscribe dialog."
 msgstr "Default height of the subscribe dialogue."
 
 #: ../mail/evolution-mail.schemas.in.h:34
-#, fuzzy
 msgid "Default maximized state of the mail browser window."
-msgstr "Default width of the Composer Window."
+msgstr "Default maximised state of the mail browser window."
 
 #: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default reply style"
@@ -10847,9 +10979,8 @@ msgid "Default width of the Composer Window."
 msgstr "Default width of the Composer Window."
 
 #: ../mail/evolution-mail.schemas.in.h:38
-#, fuzzy
 msgid "Default width of the mail browser window."
-msgstr "Default width of the Composer Window."
+msgstr "Default width of the mail browser window."
 
 #: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default width of the subscribe dialog."
@@ -10914,26 +11045,30 @@ msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Disable or enable ellipsizing of folder names in side bar"
 
 #: ../mail/evolution-mail.schemas.in.h:49
+msgid "Do not add signature delimiter"
+msgstr "Do not add signature delimiter"
+
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Draw spelling error indicators on words as you type."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Empty Junk folders on exit"
 msgstr "Empty Junk folders on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty Trash folders on exit"
 msgstr "Empty Wastebasket folders on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Empty all Junk folders when exiting Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Empty all Wastebasket folders when exiting Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -10941,31 +11076,31 @@ msgstr ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Enable caret mode, so that you can see a cursor when reading mail."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable or disable magic space bar"
 msgstr "Enable or disable magic space bar"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Enable or disable the prompt whilst marking multiple messages."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable or disable type ahead search feature"
 msgstr "Enable or disable type ahead search feature"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable search folders"
 msgstr "Enable search folders"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable search folders on startup."
 msgstr "Enable search folders on startup."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -10973,7 +11108,7 @@ msgstr ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -10981,19 +11116,19 @@ msgstr ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable to render message text part of limited size."
 msgstr "Enable to render message text part of limited size."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "Enable/disable caret mode"
 
-#: ../mail/evolution-mail.schemas.in.h:65 ../mail/mail-config.glade.h:74
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Encode file names in an Outlook/GMail way"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -11005,19 +11140,19 @@ msgstr ""
 "because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
 "standard."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Height of the message-list pane"
 msgstr "Height of the message-list pane"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Height of the message-list pane."
 msgstr "Height of the message-list pane."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Hides the per-folder preview and removes the selection"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -11025,7 +11160,7 @@ msgstr ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -11036,25 +11171,23 @@ msgstr ""
 "component viewer in GNOME's MIME type database may be used for displaying "
 "content."
 
-#: ../mail/evolution-mail.schemas.in.h:72
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
 msgstr ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
 
-#: ../mail/evolution-mail.schemas.in.h:73
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11062,35 +11195,31 @@ msgstr ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 
-#: ../mail/evolution-mail.schemas.in.h:75
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
 "value is not used by Evolution since the \"Filter Editor\" window cannot be "
 "maximized. This key exists only as an implementation detail."
 msgstr ""
-"Initial maximise state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximises or unmaximises the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximised. This key exists only as an implementation "
-"detail."
+"Initial maximise state of the \"Filter Editor\" window. The value updates "
+"when the user maximises or unmaximises the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximised. This key exists only as an implementation detail."
 
-#: ../mail/evolution-mail.schemas.in.h:76
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
 "particular value is not used by Evolution since the \"Search Folder Editor\" "
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
-"Initial maximise state of the \"Send and Receive Mail\" window. The value "
+"Initial maximise state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximises or unmaximises the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximised. This key exists only as an implementation "
-"detail."
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximised. This key exists only as an implementation detail."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11104,25 +11233,23 @@ msgstr ""
 "\" window cannot be maximised. This key exists only as an implementation "
 "detail."
 
-#: ../mail/evolution-mail.schemas.in.h:78
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
 msgstr ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
 
-#: ../mail/evolution-mail.schemas.in.h:79
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11130,14 +11257,6 @@ msgstr ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 
-#: ../mail/evolution-mail.schemas.in.h:81
-msgid ""
-"It disables/enables the repeated prompts to ask if offline sync is required "
-"before going into offline mode."
-msgstr ""
-"It disables/enables the repeated prompts to ask if offline synchronisation "
-"is required before going into offline mode."
-
 #: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
@@ -11157,9 +11276,8 @@ msgid "Last time empty trash was run"
 msgstr "Last time empty wastebasket was run"
 
 #: ../mail/evolution-mail.schemas.in.h:85
-#, fuzzy
 msgid "Layout style"
-msgstr "Lay_out"
+msgstr "Layout style"
 
 #: ../mail/evolution-mail.schemas.in.h:87
 msgid "List of Labels and their associated colors"
@@ -11236,18 +11354,16 @@ msgid "Logfile to log filter actions."
 msgstr "Logfile to log filter actions."
 
 #: ../mail/evolution-mail.schemas.in.h:102
-#, fuzzy
 msgid "Mail browser height"
-msgstr "Uniform row height"
+msgstr "Mail browser height"
 
 #: ../mail/evolution-mail.schemas.in.h:103
 msgid "Mail browser maximized"
-msgstr ""
+msgstr "Mail browser maximised"
 
 #: ../mail/evolution-mail.schemas.in.h:104
-#, fuzzy
 msgid "Mail browser width"
-msgstr "E-mail begins with"
+msgstr "Mail browser width"
 
 #: ../mail/evolution-mail.schemas.in.h:105
 msgid "Mark as Seen after specified timeout"
@@ -11304,26 +11420,22 @@ msgstr ""
 "Prompt the user when he or she tries to send a message without a Subject."
 
 #: ../mail/evolution-mail.schemas.in.h:118
-msgid "Prompt to check if the user wants to go offline immediately"
-msgstr "Prompt to check if the user wants to go offline immediately"
-
-#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when deleting messages in search folder"
 msgstr "Prompt when deleting messages in search folder"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when user expunges"
 msgstr "Prompt when user expunges"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Prompt when user tries to open 10 or more messages at once"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11331,62 +11443,70 @@ msgstr ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Prompt when user tries to send a message with no To or Cc recipients."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Prompt when user tries to send unwanted HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt while marking multiple messages"
 msgstr "Prompt while marking multiple messages"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Put personalized signatures at the top of replies"
 msgstr "Put personalised signatures at the top of replies"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Put the cursor at the bottom of replies"
 msgstr "Put the cursor at the bottom of replies"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Recognise emoticons in text and replace them with images."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize links in text and replace them."
 msgstr "Recognise links in text and replace them."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Run junk test on incoming mail."
 msgstr "Run junk test on incoming mail."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Save directory"
 msgstr "Save directory"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Search for the sender photo in local address books"
 msgstr "Search for the sender photo in local address books"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Send HTML mail by default"
 msgstr "Send HTML mail by default"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default."
 msgstr "Send HTML mail by default."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Sender email-address column in the message list"
 msgstr "Sender e-mail address column in the message list"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Server synchronization interval"
 msgstr "Server synchronisation interval"
 
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+
 #: ../mail/evolution-mail.schemas.in.h:138
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Show \"Bcc\" field when sending a mail message"
@@ -11416,14 +11536,12 @@ msgid "Show Animations"
 msgstr "Show Animations"
 
 #: ../mail/evolution-mail.schemas.in.h:145
-#, fuzzy
 msgid "Show all message headers"
-msgstr "Collapse all message threads"
+msgstr "Show all message headers"
 
 #: ../mail/evolution-mail.schemas.in.h:146
-#, fuzzy
 msgid "Show all the headers when viewing a messages."
-msgstr "Show \"Reply To\" field when sending a mail message"
+msgstr "Show all the headers when viewing a messages."
 
 #: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show animated images as animations."
@@ -11442,10 +11560,14 @@ msgid "Show image animations"
 msgstr "Show image animations"
 
 #: ../mail/evolution-mail.schemas.in.h:151
+msgid "Show original \"Date\" header value."
+msgstr "Show original \"Date\" header value."
+
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show photo of the sender"
 msgstr "Show photo of the sender"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11453,7 +11575,7 @@ msgstr ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11461,7 +11583,7 @@ msgstr ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11469,7 +11591,7 @@ msgstr ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11477,15 +11599,7 @@ msgstr ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 
-#: ../mail/evolution-mail.schemas.in.h:156
-msgid "Show the \"Preview\" pane"
-msgstr "Show the \"Preview\" pane"
-
 #: ../mail/evolution-mail.schemas.in.h:157
-msgid "Show the \"Preview\" pane."
-msgstr "Show the \"Preview\" pane."
-
-#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11493,7 +11607,7 @@ msgstr ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11501,7 +11615,7 @@ msgstr ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -11509,6 +11623,16 @@ msgstr ""
 "Show the e-mail address of the sender in a separate column in the message "
 "list."
 
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid ""
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
+msgstr ""
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
+
 #: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Show the photo of the sender in the message reading pane."
@@ -11560,6 +11684,10 @@ msgid ""
 "message list. \"1\" (Vertical View) places the preview pane next to the "
 "message list."
 msgstr ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
 
 #: ../mail/evolution-mail.schemas.in.h:173
 msgid "The terminal font for mail display."
@@ -11656,58 +11784,50 @@ msgstr ""
 "restart."
 
 #: ../mail/evolution-mail.schemas.in.h:185
-msgid "Thread the message list."
-msgstr "Thread the message list."
-
-#: ../mail/evolution-mail.schemas.in.h:186
-msgid "Thread the message-list"
-msgstr "Thread the message-list"
-
-#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Thread the message-list based on Subject"
 msgstr "Thread the message-list based on Subject"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Timeout for marking message as seen"
 msgstr "Timeout for marking message as seen"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Timeout for marking message as seen."
 msgstr "Timeout for marking message as seen."
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "UID string of the default account."
 msgstr "UID string of the default account."
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Underline colour for misspelt words when using inline spelling."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Use SpamAssassin daemon and client"
 msgstr "Use SpamAssassin daemon and client"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Use SpamAssassin daemon and client (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use custom fonts"
 msgstr "Use custom fonts"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Use custom fonts for displaying mail."
 msgstr "Use custom fonts for displaying mail."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use only local spam tests."
 msgstr "Use only local spam tests."
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Use only the local spam tests (no DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -11717,7 +11837,7 @@ msgstr ""
 "message. This determines whether the cursor is placed at the top of the "
 "message or the bottom."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -11727,20 +11847,20 @@ msgstr ""
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Variable width font"
 msgstr "Variable width font"
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Whether a read receipt request gets added to every message by default."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Whether to disable ellipsizing feature of folder names in the side bar."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11748,25 +11868,25 @@ msgstr ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Whether sort threads based on latest message in that thread"
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Width of the message-list pane"
 msgstr "Width of the message-list pane"
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Width of the message-list pane."
 msgstr "Width of the message-list pane."
 
-#: ../mail/importers/elm-importer.c:182
+#: ../mail/importers/elm-importer.c:178
 msgid "Importing Elm data"
 msgstr "Importing Elm data"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../modules/mail/e-mail-shell-view.c:481
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../modules/mail/e-mail-shell-view.c:952
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 msgid "Mail"
 msgstr "Mail"
 
@@ -11778,425 +11898,337 @@ msgstr "Evolution Elm importer"
 msgid "Import mail from Elm."
 msgstr "Import mail from Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:83
-#: ../plugins/pst-import/pst-importer.c:310
+#: ../mail/importers/evolution-mbox-importer.c:115
+#: ../plugins/pst-import/pst-importer.c:311
 msgid "Destination folder:"
 msgstr "Destination folder:"
 
-#: ../mail/importers/evolution-mbox-importer.c:87
-#: ../plugins/pst-import/pst-importer.c:303
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
 msgid "Select folder"
 msgstr "Select folder"
 
-#: ../mail/importers/evolution-mbox-importer.c:87
-#: ../plugins/pst-import/pst-importer.c:303
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
 msgid "Select folder to import into"
 msgstr "Select folder to import into"
 
-#: ../mail/importers/evolution-mbox-importer.c:223
+#: ../mail/importers/evolution-mbox-importer.c:260
+#: ../shell/e-shell-utils.c:218
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:224
+#: ../mail/importers/evolution-mbox-importer.c:261
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer Berkeley Mailbox format folders"
 
-#: ../mail/importers/mail-importer.c:131
+#: ../mail/importers/mail-importer.c:71
 msgid "Importing mailbox"
 msgstr "Importing mailbox"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:215
-#: ../plugins/pst-import/pst-importer.c:455
-#: ../plugins/pst-import/pst-importer.c:561 ../shell/e-shell-importer.c:526
+#: ../mail/importers/mail-importer.c:155
+#: ../plugins/pst-import/pst-importer.c:456
+#: ../plugins/pst-import/pst-importer.c:562
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importing `%s'"
 
-#: ../mail/importers/mail-importer.c:358
+#: ../mail/importers/mail-importer.c:298
 #, c-format
 msgid "Scanning %s"
 msgstr "Scanning %s"
 
-#: ../mail/importers/pine-importer.c:225
+#: ../mail/importers/pine-importer.c:221
 msgid "Importing Pine data"
 msgstr "Importing Pine data"
 
-#: ../mail/importers/pine-importer.c:383
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../mail/importers/pine-importer.c:379
+#: ../modules/addressbook/addressbook-config.c:986
 msgid "Address Book"
 msgstr "Address Book"
 
-#: ../mail/importers/pine-importer.c:424
+#: ../mail/importers/pine-importer.c:420
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine importer"
 
-#: ../mail/importers/pine-importer.c:425
+#: ../mail/importers/pine-importer.c:421
 msgid "Import mail from Pine."
 msgstr "Import mail from Pine."
 
-#: ../mail/mail-autofilter.c:71
+#: ../mail/mail-autofilter.c:73
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail to %s"
 
-#: ../mail/mail-autofilter.c:234 ../mail/mail-autofilter.c:273
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail from %s"
 
-#: ../mail/mail-autofilter.c:257
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "Subject is %s"
 
-#: ../mail/mail-autofilter.c:292
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: ../mail/mail-autofilter.c:364
+#: ../mail/mail-autofilter.c:366
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
-#: ../mail/mail-config.glade.h:1
-#, fuzzy
-msgid " Ch_eck for Supported Types"
-msgstr " Ch_eck for Supported Types "
-
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(Note: Requires restart of the application)"
 
-#: ../mail/mail-config.glade.h:4
-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:5
-msgid "<b>Sender Photograph</b>"
-msgstr "<b>Sender Photograph</b>"
-
-#: ../mail/mail-config.glade.h:6
-msgid "<b>Sig_natures</b>"
-msgstr "<b>Sig_natures</b>"
-
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.ui.h:2
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>Top Posting Option</b> (Not Recommended)"
 
-#: ../mail/mail-config.glade.h:8
-msgid "<b>_Languages</b>"
-msgstr "<b>_Languages</b>"
-
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Account Information</span>"
-msgstr "<span weight=\"bold\">Account Information</span>"
-
-#: ../mail/mail-config.glade.h:11
-msgid "<span weight=\"bold\">Authentication</span>"
-msgstr "<span weight=\"bold\">Authentication</span>"
-
-#: ../mail/mail-config.glade.h:12
-msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr "<span weight=\"bold\">Composing Messages</span>"
-
-#: ../mail/mail-config.glade.h:13
-msgid "<span weight=\"bold\">Configuration</span>"
-msgstr "<span weight=\"bold\">Configuration</span>"
-
-#: ../mail/mail-config.glade.h:15
-msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr "<span weight=\"bold\">Default Behaviour</span>"
-
-#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">Delete Mail</span>"
-
-#: ../mail/mail-config.glade.h:17
-msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
-msgstr "<span weight=\"bold\">Displayed Message _Headers</span>"
-
-#: ../mail/mail-config.glade.h:19
-msgid "<span weight=\"bold\">Labels</span>"
-msgstr "<span weight=\"bold\">Labels</span>"
-
-#: ../mail/mail-config.glade.h:20
-msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr "<span weight=\"bold\">Loading Images</span>"
-
-#: ../mail/mail-config.glade.h:21
-msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\">Message Display</span>"
-
-#: ../mail/mail-config.glade.h:22
-msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr "<span weight=\"bold\">Message Fonts</span>"
-
-#: ../mail/mail-config.glade.h:23
-msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">Message Receipts</span>"
-
-#: ../mail/mail-config.glade.h:24
-#: ../plugins/publish-calendar/publish-calendar.glade.h:3
-msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr "<span weight=\"bold\">Optional Information</span>"
+#: ../mail/mail-config.ui.h:3
+msgid "Account Information"
+msgstr "Account Information"
 
-#: ../mail/mail-config.glade.h:25
-msgid "<span weight=\"bold\">Options</span>"
-msgstr "<span weight=\"bold\">Options</span>"
-
-#: ../mail/mail-config.glade.h:26
-msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-
-#: ../mail/mail-config.glade.h:27
-msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">Printed Fonts</span>"
-
-#: ../mail/mail-config.glade.h:28
-msgid "<span weight=\"bold\">Proxy Settings</span>"
-msgstr "<span weight=\"bold\">Proxy Settings</span>"
-
-#: ../mail/mail-config.glade.h:29
-msgid "<span weight=\"bold\">Required Information</span>"
-msgstr "<span weight=\"bold\">Required Information</span>"
-
-#: ../mail/mail-config.glade.h:30
-msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-
-#: ../mail/mail-config.glade.h:31
-msgid "<span weight=\"bold\">Security</span>"
-msgstr "<span weight=\"bold\">Security</span>"
-
-#: ../mail/mail-config.glade.h:32
-msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\">Sent and Draft Messages</span>"
-
-#: ../mail/mail-config.glade.h:33
-msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr "<span weight=\"bold\">Server Configuration</span>"
-
-#: ../mail/mail-config.glade.h:34
-msgid "<span weight=\"bold\">_Authentication Type</span>"
-msgstr "<span weight=\"bold\">_Authentication Type</span>"
-
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.ui.h:4
 msgid "Add Ne_w Signature..."
 msgstr "Add Ne_w Signatureâ?¦"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.ui.h:5
 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:38
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Also encrypt to sel_f when sending encrypted messages"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Alway_s carbon-copy (cc) to:"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Always _blind carbon-copy (bcc) to:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Always _trust keys in my keyring when encrypting"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Always encrypt to _myself when sending encrypted messages"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "Always request rea_d receipt"
 
-#: ../mail/mail-config.glade.h:44
-msgid ""
-"Attachment\n"
-"Inline\n"
-"Quoted"
-msgstr ""
-"Attachment\n"
-"Inline\n"
-"Quoted"
-
-#: ../mail/mail-config.glade.h:47
-msgid ""
-"Attachment\n"
-"Inline (Outlook style)\n"
-"Quoted\n"
-"Do not quote"
-msgstr ""
-"Attachment\n"
-"Inline (Outlook style)\n"
-"Quoted\n"
-"Do not quote"
+#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+msgid "Authentication"
+msgstr "Authentication"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "Automatically insert _emoticon images"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "C_haracter set:"
 
-#: ../mail/mail-config.glade.h:53
-#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "Ch_eck for Supported Types"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "Check cu_stom headers for junk"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.ui.h:19
 msgid "Check incoming _messages for junk"
 msgstr "Check incoming _messages for junk"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.ui.h:20
 msgid "Check spelling while I _type"
 msgstr "Check spelling while I _type"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.ui.h:21
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Checks incoming mail messages to be Junk"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.ui.h:22
 msgid "Cle_ar"
 msgstr "Cle_ar"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.ui.h:23
 msgid "Clea_r"
 msgstr "Clea_r"
 
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.ui.h:24
 msgid "Color for _misspelled words:"
 msgstr "Colour for _misspelt words:"
 
-#: ../mail/mail-config.glade.h:61
+#: ../mail/mail-config.ui.h:25
+msgid "Composing Messages"
+msgstr "Composing Messages"
+
+#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "Configuration"
+
+#: ../mail/mail-config.ui.h:27
 msgid "Confirm _when expunging a folder"
 msgstr "Confirm _when expunging a folder"
 
-#: ../mail/mail-config.glade.h:62
+#: ../mail/mail-config.ui.h:29
+msgid "Default Behavior"
+msgstr "Default Behaviour"
+
+#: ../mail/mail-config.ui.h:30
 msgid "Default character e_ncoding:"
 msgstr "Default character e_ncoding:"
 
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.ui.h:32
+msgid "Delete Mail"
+msgstr "Delete Mail"
+
+#: ../mail/mail-config.ui.h:33
 msgid "Delete junk messages on e_xit"
 msgstr "Delete junk messages on e_xit"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.ui.h:35
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Digitally sign o_utgoing messages (by default)"
 
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.ui.h:36
+msgid "Displayed Message _Headers"
+msgstr "Displayed Message _Headers"
+
+#: ../mail/mail-config.ui.h:37
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "Do not format messages when text si_ze exceeds"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.ui.h:38
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Do not mar_k messages as junk if sender is in my address book"
 
-#: ../mail/mail-config.glade.h:69
+#: ../mail/mail-config.ui.h:39
+msgid "Do not quote"
+msgstr "Do not quote"
+
+#: ../mail/mail-config.ui.h:40
 msgid "Drafts _Folder:"
 msgstr "Drafts _Folder:"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.ui.h:41
 msgid "Email _Address:"
 msgstr "E-mail _Address:"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.ui.h:42
 msgid "Empty trash folders on e_xit"
 msgstr "Empty wastebasket folders on e_xit"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.ui.h:43
 msgid "Enable Magic S_pacebar"
 msgstr "Enable Magic S_pacebar"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Sea_rch Folders"
 msgstr "Enable Sea_rch Folders"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "Encry_ption certificate:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "Encrypt out_going messages (by default)"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.ui.h:48
 msgid "Fi_xed-width:"
 msgstr "Fi_xed-width:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed width Font:"
 msgstr "Fix_ed width Font:"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.ui.h:50
 msgid "Font Properties"
 msgstr "Font Properties"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.ui.h:51
 msgid "Format messages in _HTML"
 msgstr "Format messages in _HTML"
 
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.ui.h:52
 msgid "Full Nam_e:"
 msgstr "Full Nam_e:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "HTML Messages"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "H_TTP Proxy:"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.ui.h:56
 msgid "Headers"
 msgstr "Headers"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.ui.h:57
 msgid "Highlight _quotations with"
 msgstr "Highlight _quotations with"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.ui.h:59
+msgid "Inline"
+msgstr "Inline"
+
+#: ../mail/mail-config.ui.h:60
+msgid "Inline (Outlook style)"
+msgstr "Inline (Outlook style)"
+
+#: ../mail/mail-config.ui.h:62
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:90 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Labels"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.ui.h:64
 msgid "Languages Table"
 msgstr "Languages Table"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.ui.h:65
+msgid "Loading Images"
+msgstr "Loading Images"
+
+#: ../mail/mail-config.ui.h:66
 msgid "Mail Headers Table"
 msgstr "Mail Headers Table"
 
-#: ../mail/mail-config.glade.h:93 ../modules/mail/e-mail-shell-backend.c:213
-msgid "Mail Preferences"
-msgstr "Mail Preferences"
-
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.ui.h:67
 msgid "Mailbox location"
 msgstr "Mailbox location"
 
-#: ../mail/mail-config.glade.h:95
-msgid "Message Composer"
-msgstr "Message Composer"
+#: ../mail/mail-config.ui.h:68
+msgid "Message Display"
+msgstr "Message Display"
+
+#: ../mail/mail-config.ui.h:69
+msgid "Message Fonts"
+msgstr "Message Fonts"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.ui.h:70
+msgid "Message Receipts"
+msgstr "Message Receipts"
+
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "No _Proxy for:"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.ui.h:73
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12204,115 +12236,172 @@ msgstr ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.ui.h:74
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "Option is ignored if a match for custom junk headers is found."
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.ui.h:75
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+msgid "Optional Information"
+msgstr "Optional Information"
+
+#: ../mail/mail-config.ui.h:77
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.ui.h:78
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.ui.h:79
 msgid "Pass_word:"
 msgstr "Pass_word:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.ui.h:81
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.ui.h:82
 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:105
+#: ../mail/mail-config.ui.h:83
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "Pretty Good Privacy (PGP/GPG)"
+
+#: ../mail/mail-config.ui.h:85
+msgid "Printed Fonts"
+msgstr "Printed Fonts"
+
+#: ../mail/mail-config.ui.h:86
+msgid "Proxy Settings"
+msgstr "Proxy Settings"
+
+#: ../mail/mail-config.ui.h:87
+msgid "Quoted"
+msgstr "Quoted"
+
+#: ../mail/mail-config.ui.h:88
 msgid "Re_member password"
 msgstr "Re_member password"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.ui.h:89
 msgid "Re_ply-To:"
 msgstr "Re_ply-To:"
 
-#: ../mail/mail-config.glade.h:108
+#: ../mail/mail-config.ui.h:91
 msgid "Remember _password"
 msgstr "Remember _password"
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.ui.h:92
+msgid "Required Information"
+msgstr "Required Information"
+
+#: ../mail/mail-config.ui.h:94
+msgid "SSL is not supported in this build of Evolution"
+msgstr "SSL is not supported in this build of Evolution"
+
+#: ../mail/mail-config.ui.h:95
 msgid "S_earch for sender photograph only in local address books"
 msgstr "S_earch for sender photograph only in local address books"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.ui.h:96
 msgid "S_elect..."
 msgstr "S_electâ?¦"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.ui.h:97
 msgid "S_end message receipts:"
 msgstr "S_end message receipts:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.ui.h:98
 msgid "S_tandard Font:"
 msgstr "S_tandard Font:"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.ui.h:99
+msgid "Secure MIME (S/MIME)"
+msgstr "Secure MIME (S/MIME)"
+
+#: ../mail/mail-config.ui.h:101
+msgid "Select Drafts Folder"
+msgstr "Select Drafts Folder"
+
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "Select HTML fixed width font"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.ui.h:103
 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.ui.h:104
 msgid "Select HTML variable width font"
 msgstr "Select HTML variable width font"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font for printing"
 msgstr "Select HTML variable width font for printing"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.ui.h:106
+msgid "Select Sent Folder"
+msgstr "Select Sent Folder"
+
+#: ../mail/mail-config.ui.h:107
+msgid "Sender Photograph"
+msgstr "Sender Photograph"
+
+#: ../mail/mail-config.ui.h:108
 msgid "Sending Mail"
 msgstr "Sending Mail"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.ui.h:109
 msgid "Sent _Messages Folder:"
 msgstr "Sent _Messages Folder:"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.ui.h:110
+msgid "Sent and Draft Messages"
+msgstr "Sent and Draft Messages"
+
+#: ../mail/mail-config.ui.h:111
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver requires authentication"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.ui.h:112
+msgid "Server Configuration"
+msgstr "Server Configuration"
+
+#: ../mail/mail-config.ui.h:113
 msgid "Server _Type:"
 msgstr "Server _Type:"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.ui.h:114
+msgid "Sig_natures"
+msgstr "Sig_natures"
+
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_ning certificate:"
 msgstr "Sig_ning certificate:"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.ui.h:116
 msgid "Signat_ure:"
 msgstr "Signat_ure:"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.ui.h:117
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.ui.h:118
 msgid "Spell Checking"
 msgstr "Spell Checking"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.ui.h:119
 msgid "Start _typing at the bottom on replying"
 msgstr "Start _typing at the bottom on replying"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.ui.h:121
 msgid "T_ype:"
 msgstr "T_ype:"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.ui.h:122
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12320,17 +12409,17 @@ msgstr ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 
-#: ../mail/mail-config.glade.h:129
-#, fuzzy
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used for display purposes only."
+"signature. The name you specify will be used\n"
+"for display purposes only. "
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.ui.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12338,209 +12427,244 @@ 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:134
+#: ../mail/mail-config.ui.h:128
 msgid "Us_ername:"
 msgstr "Us_ername:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.ui.h:129
 msgid "Use Authe_ntication"
 msgstr "Use Authe_ntication"
 
-#: ../mail/mail-config.glade.h:136 ../plugins/caldav/caldav-source.c:405
-#: ../plugins/google-account-setup/google-contacts-source.c:280
-#: ../plugins/google-account-setup/google-source.c:700
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
+#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
+#: ../plugins/google-account-setup/google-contacts-source.c:283
+#: ../plugins/google-account-setup/google-source.c:620
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "User_name:"
 msgstr "User_name:"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.ui.h:131
 msgid "V_ariable-width:"
 msgstr "V_ariable-width:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.ui.h:132
 msgid "_Add Signature"
 msgstr "_Add Signature"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.ui.h:133
 msgid "_Always load images from the Internet"
 msgstr "_Always load images from the Internet"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.ui.h:134
+msgid "_Authentication Type"
+msgstr "_Authentication Type"
+
+#: ../mail/mail-config.ui.h:135
 msgid "_Default junk plugin:"
 msgstr "_Default junk plugin:"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.ui.h:136
 msgid "_Direct connection to the Internet"
 msgstr "_Direct connection to the Internet"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.ui.h:137
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Do not sign meeting requests (for Outlook compatibility)"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.ui.h:138
 msgid "_Forward style:"
 msgstr "_Forward style:"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.ui.h:139
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Keep Signature above the original message on replying"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.ui.h:140
+msgid "_Languages"
+msgstr "_Languages"
+
+#: ../mail/mail-config.ui.h:141
 msgid "_Load images in messages from contacts"
 msgstr "_Load images in messages from contacts"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.ui.h:142
 msgid "_Lookup in local address book only"
 msgstr "_Look up in local address book only"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.ui.h:143
 msgid "_Make this my default account"
 msgstr "_Make this my default account"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.ui.h:144
 msgid "_Manual proxy configuration:"
 msgstr "_Manual proxy configuration:"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.ui.h:145
 msgid "_Mark messages as read after"
 msgstr "_Mark messages as read after"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.ui.h:147
 msgid "_Never load images from the Internet"
 msgstr "_Never load images from the Internet"
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.ui.h:148
 msgid "_Path:"
 msgstr "_Path:"
 
-#: ../mail/mail-config.glade.h:153
+#: ../mail/mail-config.ui.h:149
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Prompt on sending HTML mail to contacts that do not want them"
 
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.ui.h:150
 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:155
+#: ../mail/mail-config.ui.h:151
 msgid "_Reply style:"
 msgstr "_Reply style:"
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.ui.h:152
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.ui.h:153
 msgid "_Secure HTTP Proxy:"
 msgstr "_Secure HTTP Proxy:"
 
-#: ../mail/mail-config.glade.h:158
-msgid "_Select..."
-msgstr "_Selectâ?¦"
-
-#: ../mail/mail-config.glade.h:159
-#: ../modules/addressbook/ldap-config.glade.h:39
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Server:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.ui.h:157
 msgid "_Show image animations"
 msgstr "_Show image animations"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.ui.h:158
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Show the photograph of sender in the message preview"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.ui.h:159
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Shrink To / Cc / Bcc headers to "
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.ui.h:160
 msgid "_Use Secure Connection:"
 msgstr "_Use Secure Connection:"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.ui.h:161
 msgid "_Use system defaults"
 msgstr "_Use system defaults"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.ui.h:162
 msgid "_Use the same fonts as other applications"
 msgstr "_Use the same fonts as other applications"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+msgid "a"
+msgstr "a"
+
+#: ../mail/mail-config.ui.h:164
 msgid "addresses"
 msgstr "addresses"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+msgid "b"
+msgstr "b"
+
+#: ../mail/mail-config.ui.h:166
 msgid "color"
 msgstr "colour"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.ui.h:167
 msgid "description"
 msgstr "description"
 
-#: ../mail/mail-config.glade.h:172
-msgid "seconds"
-msgstr "seconds"
-
-#: ../mail/mail-dialogs.glade.h:1
+#: ../mail/mail-dialogs.ui.h:1
 msgid "    "
 msgstr "    "
 
-#: ../mail/mail-dialogs.glade.h:2
-msgid "<b>Search Folder Sources</b>"
-msgstr "<b>Search Folder Sources</b>"
-
-#: ../mail/mail-dialogs.glade.h:3
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Digital Signature</span>"
-
-#: ../mail/mail-dialogs.glade.h:4
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Encryption</span>"
-
-#: ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "All active remote folders"
 
-#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local and active remote folders"
 msgstr "All local and active remote folders"
 
-#: ../mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.ui.h:4
 msgid "All local folders"
 msgstr "All local folders"
 
-#: ../mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Call"
+msgstr "Call"
+
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "Co_mpleted"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
-msgid "Flag to Follow Up"
-msgstr "Flag to Follow Up"
+#: ../mail/mail-dialogs.ui.h:7
+msgid "Digital Signature"
+msgstr "Digital Signature"
+
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "Do Not Forward"
 
-#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.ui.h:9
+msgid "Encryption"
+msgstr "Encryption"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Folder Subscriptions"
 msgstr "Folder Subscriptions"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.ui.h:11
+msgid "Follow-Up"
+msgstr "Follow-Up"
+
+#: ../mail/mail-dialogs.ui.h:12
+msgid "For Your Information"
+msgstr "For Your Information"
+
+#: ../mail/mail-dialogs.ui.h:13
+msgid "Forward"
+msgstr "Forward"
+
+#: ../mail/mail-dialogs.ui.h:14
 msgid "License Agreement"
 msgstr "Licence Agreement"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.ui.h:15
+msgid "No Response Necessary"
+msgstr "No Response Necessary"
+
+#: ../mail/mail-dialogs.ui.h:19
+msgid "Reply to All"
+msgstr "Reply to All"
+
+#: ../mail/mail-dialogs.ui.h:20
+msgid "Review"
+msgstr "Review"
+
+#: ../mail/mail-dialogs.ui.h:21
 msgid "S_erver:"
 msgstr "S_erver:"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.ui.h:22
+msgid "Search Folder Sources"
+msgstr "Search Folder Sources"
+
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "Security Information"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Specific folders"
 msgstr "Specific folders"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.ui.h:25
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12548,42 +12672,42 @@ 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:17
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Accept License"
 msgstr "_Accept Licence"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Due By:"
 msgstr "_Due By:"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Flag:"
 msgstr "_Flag:"
 
-#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Tick this to accept the license agreement"
 msgstr "_Tick this to accept the licence agreement"
 
-#: ../mail/mail-folder-cache.c:872
+#: ../mail/mail-folder-cache.c:893
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: ../mail/mail-ops.c:110
+#: ../mail/mail-ops.c:95
 msgid "Filtering Selected Messages"
 msgstr "Filtering Selected Messages"
 
-#: ../mail/mail-ops.c:269
+#: ../mail/mail-ops.c:254
 msgid "Fetching Mail"
 msgstr "Fetching Mail"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:585
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Failed to apply outgoing filters: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:605
+#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -12592,123 +12716,126 @@ msgstr ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 
-#: ../mail/mail-ops.c:622
+#: ../mail/mail-ops.c:641
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Failed to append to local `Sent' folder: %s"
 
-#: ../mail/mail-ops.c:730 ../mail/mail-ops.c:811
+#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
 msgid "Sending message"
 msgstr "Sending message"
 
-#: ../mail/mail-ops.c:740
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
 
-#: ../mail/mail-ops.c:767
+#: ../mail/mail-ops.c:789
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Failed to send %d of %d messages"
 
-#: ../mail/mail-ops.c:769 ../mail/mail-send-recv.c:717
+#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
 msgid "Canceled."
 msgstr "Cancelled."
 
-#: ../mail/mail-ops.c:771 ../mail/mail-send-recv.c:719
+#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
 msgid "Complete."
 msgstr "Complete."
 
-#: ../mail/mail-ops.c:883
-msgid "Saving message to folder"
-msgstr "Saving message to folder"
+#: ../mail/mail-ops.c:905
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "Saving message to folder '%s'"
 
-#: ../mail/mail-ops.c:960
+#: ../mail/mail-ops.c:982
 #, c-format
-msgid "Moving messages to %s"
-msgstr "Moving messages to %s"
+msgid "Moving messages to '%s'"
+msgstr "Moving messages to '%s'"
 
-#: ../mail/mail-ops.c:960
+#: ../mail/mail-ops.c:982
 #, c-format
-msgid "Copying messages to %s"
-msgstr "Copying messages to %s"
+msgid "Copying messages to '%s'"
+msgstr "Copying messages to '%s'"
 
-#: ../mail/mail-ops.c:1177
+#: ../mail/mail-ops.c:1091
+#, c-format
+msgid "Scanning folders in '%s'"
+msgstr "Scanning folders in '%s'"
+
+#: ../mail/mail-ops.c:1199
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
-#: ../mail/mail-ops.c:1218
+#: ../mail/mail-ops.c:1240
 #, c-format
-msgid "Opening folder %s"
-msgstr "Opening folder %s"
+msgid "Opening folder '%s'"
+msgstr "Opening folder '%s'"
 
-#: ../mail/mail-ops.c:1284
+#: ../mail/mail-ops.c:1306
 #, c-format
-msgid "Retrieving quota information for folder %s"
-msgstr "Retrieving quota information for folder %s"
+msgid "Retrieving quota information for folder '%s'"
+msgstr "Retrieving quota information for folder '%s'"
 
-#: ../mail/mail-ops.c:1356
+#: ../mail/mail-ops.c:1378
 #, c-format
-msgid "Opening store %s"
-msgstr "Opening store %s"
+msgid "Opening store '%s'"
+msgstr "Opening store '%s'"
 
-#: ../mail/mail-ops.c:1427
+#: ../mail/mail-ops.c:1449
 #, c-format
-msgid "Removing folder %s"
-msgstr "Removing folder %s"
+msgid "Removing folder '%s'"
+msgstr "Removing folder '%s'"
 
-#: ../mail/mail-ops.c:1545
+#: ../mail/mail-ops.c:1567
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Storing folder '%s'"
 
-#: ../mail/mail-ops.c:1608
+#: ../mail/mail-ops.c:1630
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1631
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Storing account '%s'"
 
-#: ../mail/mail-ops.c:1663
-msgid "Refreshing folder"
-msgstr "Refreshing folder"
+#: ../mail/mail-ops.c:1685
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr "Refreshing folder '%s'"
 
-#: ../mail/mail-ops.c:1703 ../mail/mail-ops.c:1753
-msgid "Expunging folder"
-msgstr "Expunging folder"
+#: ../mail/mail-ops.c:1725
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr "Expunging folder '%s'"
 
-#: ../mail/mail-ops.c:1750
+#: ../mail/mail-ops.c:1770
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Emptying wastebasket in '%s'"
 
-#: ../mail/mail-ops.c:1751
+#: ../mail/mail-ops.c:1771
 msgid "Local Folders"
 msgstr "Local Folders"
 
-#: ../mail/mail-ops.c:1832
-#, c-format
-msgid "Retrieving message %s"
-msgstr "Retrieving message %s"
-
-#: ../mail/mail-ops.c:1941
+#: ../mail/mail-ops.c:1967
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Retrieving %d message"
 msgstr[1] "Retrieving %d messages"
 
-#: ../mail/mail-ops.c:2026
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Saving %d message"
 msgstr[1] "Saving %d messages"
 
-#: ../mail/mail-ops.c:2106
+#: ../mail/mail-ops.c:2136
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12717,11 +12844,11 @@ msgstr ""
 "Error saving messages to: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2178
+#: ../mail/mail-ops.c:2208
 msgid "Saving attachment"
 msgstr "Saving attachment"
 
-#: ../mail/mail-ops.c:2196 ../mail/mail-ops.c:2204
+#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12730,122 +12857,131 @@ msgstr ""
 "Cannot create output file: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2219
+#: ../mail/mail-ops.c:2249
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Could not write data: %s"
 
-#: ../mail/mail-ops.c:2364
+#: ../mail/mail-ops.c:2394
 #, c-format
-msgid "Disconnecting from %s"
-msgstr "Disconnecting from %s"
+msgid "Disconnecting from '%s'"
+msgstr "Disconnecting from '%s'"
 
-#: ../mail/mail-ops.c:2364
+#: ../mail/mail-ops.c:2394
 #, c-format
-msgid "Reconnecting to %s"
-msgstr "Reconnecting to %s"
+msgid "Reconnecting to '%s'"
+msgstr "Reconnecting to '%s'"
 
-#: ../mail/mail-ops.c:2460
+#: ../mail/mail-ops.c:2490
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparing account '%s' for offline"
 
-#: ../mail/mail-ops.c:2546
+#: ../mail/mail-ops.c:2576
 msgid "Checking Service"
 msgstr "Checking Service"
 
-#: ../mail/mail-send-recv.c:186
+#: ../mail/mail-send-recv.c:189
 msgid "Canceling..."
 msgstr "Cancellingâ?¦"
 
-#: ../mail/mail-send-recv.c:392
+#: ../mail/mail-send-recv.c:431
 msgid "Send & Receive Mail"
 msgstr "Send & Receive Mail"
 
-#: ../mail/mail-send-recv.c:405
+#: ../mail/mail-send-recv.c:444
 msgid "Cancel _All"
 msgstr "Cancel _All"
 
-#: ../mail/mail-send-recv.c:514
+#: ../mail/mail-send-recv.c:553
 msgid "Updating..."
 msgstr "Updatingâ?¦"
 
-#: ../mail/mail-send-recv.c:514 ../mail/mail-send-recv.c:591
+#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
 msgid "Waiting..."
 msgstr "Waitingâ?¦"
 
-#: ../mail/mail-send-recv.c:830
+#: ../mail/mail-send-recv.c:873
 #, c-format
 msgid "Checking for new mail"
 msgstr "Checking for new mail"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:220
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Enter Passphrase for %s"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:222
 msgid "Enter Passphrase"
 msgstr "Enter Passphrase"
 
-#: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:705
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Enter Password for %s"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:227
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:269
 msgid "User canceled operation."
 msgstr "User cancelled operation."
 
-#: ../mail/mail-tools.c:122
+#: ../mail/mail-session.c:663
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr ""
+"No destination address provided; forward of the message has been cancelled."
+
+#: ../mail/mail-session.c:669
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "No account found to use; forward of the message has been cancelled."
+
+#: ../mail/mail-tools.c:123
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Could not create spool directory `%s': %s"
 
-#: ../mail/mail-tools.c:152
+#: ../mail/mail-tools.c:153
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Trying to movemail a non-mbox source `%s'"
 
-#: ../mail/mail-tools.c:258
+#: ../mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Forwarded message â?? %s"
 
-#: ../mail/mail-tools.c:260
+#: ../mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "Forwarded message"
 
-#: ../mail/mail-tools.c:300
+#: ../mail/mail-tools.c:301
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Invalid folder: `%s'"
 
-#: ../mail/mail-vfolder.c:92
+#: ../mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Setting up Search Folder: %s"
 
-#: ../mail/mail-vfolder.c:237
+#: ../mail/mail-vfolder.c:232
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Updating Search Folders for '%s:%s'"
 
-#: ../mail/mail-vfolder.c:244
+#: ../mail/mail-vfolder.c:239
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Updating Search Folders for '%s'"
 
-#: ../mail/mail-vfolder.c:1085
+#: ../mail/mail-vfolder.c:1172
 msgid "Edit Search Folder"
 msgstr "Edit Search Folder"
 
-#: ../mail/mail-vfolder.c:1183
+#: ../mail/mail-vfolder.c:1274
 msgid "New Search Folder"
 msgstr "New Search Folder"
 
@@ -12932,74 +13068,82 @@ msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Are you sure you want to send a message in HTML format?"
 
 #: ../mail/mail.error.xml.h:16
+msgid "Are you sure you want to send a message with invalid address?"
+msgstr "Are you sure you want to send a message with a invalid address?"
+
+#: ../mail/mail.error.xml.h:17
+msgid "Are you sure you want to send a message with invalid addresses?"
+msgstr "Are you sure you want to send a message with invalid addresses?"
+
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Are you sure you want to send a message with only BCC recipients?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Are you sure you want to send a message without a subject?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Because \"{0}\"."
 msgstr "Because \"{0}\"."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:22
 msgid "Because \"{2}\"."
 msgstr "Because \"{2}\"."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "Blank Signature"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Cannot add Search Folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create folder \"{0}\"."
 msgstr "Cannot create folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create temporary save directory."
 msgstr "Cannot create temporary save directory."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Cannot create the save directory, because \"{1}\""
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Cannot delete folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Cannot delete system folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Cannot edit Search Folder \"{0}\" as it does not exist."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Cannot move folder \"{0}\" to \"{1}\"."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{1}\""
 msgstr "Cannot open source \"{1}\""
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open source \"{2}\"."
 msgstr "Cannot open source \"{2}\"."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot open target \"{2}\"."
 msgstr "Cannot open target \"{2}\"."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:36
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13007,35 +13151,35 @@ msgstr ""
 "Cannot read the licence file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its licence."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Cannot rename \"{0}\" to \"{1}\"."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Cannot rename or move system folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save changes to account."
 msgstr "Cannot save changes to account."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Cannot save to directory \"{0}\"."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot save to file \"{0}\"."
 msgstr "Cannot save to file \"{0}\"."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:42
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Cannot set signature script \"{0}\"."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
 msgid "Check Junk Failed"
 msgstr "Check Junk Failed"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:44
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13043,43 +13187,27 @@ msgstr ""
 "Check to make sure your password is spelt correctly. Remember that many "
 "passwords are case-sensitive; your caps lock might be on."
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:45
 msgid "Could not save signature file."
 msgstr "Could not save signature file."
 
-#: ../mail/mail.error.xml.h:44
-msgid "Delete \"{0}\"?"
-msgstr "Delete \"{0}\"?"
-
-#: ../mail/mail.error.xml.h:45
-msgid "Delete account?"
-msgstr "Delete account?"
-
 #: ../mail/mail.error.xml.h:46
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Delete messages in Search Folder \"{0}\"?"
 
 #: ../mail/mail.error.xml.h:47
-msgid "Delete messages in Search Folder?"
-msgstr "Delete messages in Search Folder?"
-
-#: ../mail/mail.error.xml.h:48
-msgid "Discard changes?"
-msgstr "Discard changes?"
-
-#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "Do not d_elete"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Do not delete"
 msgstr "Do not delete"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do not disable"
 msgstr "Do not disable"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -13087,43 +13215,43 @@ msgstr ""
 "Do you want to locally synchronise the folders that are marked for offline "
 "usage?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "Do you want to mark all messages as read?"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "Do you wish to save your changes?"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "Enter password."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "Error loading filter definitions."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:55
 msgid "Error while performing operation."
 msgstr "Error while performing operation."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "Error while {0}."
 msgstr "Error while {0}."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but cannot overwrite it."
 msgstr "File exists but cannot overwrite it."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but is not a regular file."
 msgstr "File exists but is not a regular file."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "If you continue, you will not be able to recover these messages."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -13131,11 +13259,17 @@ msgstr ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
+msgstr ""
+"If you delete the folder, all of its contents will be deleted permanently."
+
+#: ../mail/mail.error.xml.h:62
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "If you proceed, all proxy accounts will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13143,11 +13277,11 @@ msgstr ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "If you proceed, the account information will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13155,23 +13289,23 @@ msgstr ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Ignore"
 msgstr "Ignore"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Invalid authentication"
 msgstr "Invalid authentication"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Mail Deletion Failed"
 msgstr "Mail Deletion Failed"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:70
 msgid "Mail filters automatically updated."
 msgstr "Mail filters automatically updated."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13183,33 +13317,29 @@ msgstr ""
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
 
-#: ../mail/mail.error.xml.h:73
-msgid "Mark all messages as read"
-msgstr "Mark all messages as read"
-
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:72
 msgid "Missing folder."
 msgstr "Missing folder."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:74
 msgid "No sources selected."
 msgstr "No sources selected."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:75
 msgid "Opening too many messages at once may take a long time."
 msgstr "Opening too many messages at once may take a long time."
 
 #  mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:76
 msgid "Please check your account settings and try again."
 msgstr "Please check your account settings and try again."
 
 #  mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Please enable the account or send using another account."
 msgstr "Please enable the account or send using another account."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -13217,7 +13347,7 @@ msgstr ""
 "Please enter a valid e-mail address in the To: field. You can search for e-"
 "mail addresses by clicking on the To: button next to the entry box."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13227,63 +13357,63 @@ msgstr ""
 "HTML e-mail:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid "Please provide an unique name to identify this signature."
 msgstr "Please provide an unique name to identify this signature."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:82
 msgid "Please wait."
 msgstr "Please wait."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problem migrating old mail folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:86
-msgid "Querying server"
-msgstr "Querying server"
-
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Querying server for a list of supported authentication mechanisms."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "Read receipt requested."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Really delete folder \"{0}\" and all of its subfolders?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:87
+msgid "Really delete folder \"{0}\"?"
+msgstr "Really delete folder \"{0}\"?"
+
+#: ../mail/mail.error.xml.h:88
 msgid "Report Junk Failed"
 msgstr "Report Junk Failed"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:89
 msgid "Report Not Junk Failed"
 msgstr "Report Not Junk Failed"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "Search Folders automatically updated."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:91
 msgid "Send Receipt"
 msgstr "Send Receipt"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:92
 msgid "Signature Already Exists"
 msgstr "Signature Already Exists"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize"
 msgstr "Synchronise"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:94
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Synchronise folders locally for offline usage?"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13291,7 +13421,7 @@ msgstr ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:96
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13307,7 +13437,7 @@ msgstr ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -13321,7 +13451,7 @@ msgstr ""
 "    \"{1}\"\n"
 "And have been updated."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -13335,11 +13465,27 @@ msgstr ""
 "    \"{1}\"\n"
 "And have been updated."
 
+#: ../mail/mail.error.xml.h:109
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
+msgstr ""
+"The following recipient was not recognised as a valid mail address:\n"
+"{0}"
+
 #: ../mail/mail.error.xml.h:111
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+"The following recipients were not recognised as valid mail addresses:\n"
+"{0}"
+
+#: ../mail/mail.error.xml.h:113
 msgid "The script file must exist and be executable."
 msgstr "The script file must exist and be executable."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13347,7 +13493,7 @@ msgstr ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -13355,13 +13501,13 @@ msgstr ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "This message cannot be sent because you have not specified any recipients"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13369,11 +13515,11 @@ msgstr ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:119
 msgid "This signature has been changed, but has not been saved."
 msgstr "This signature has been changed, but has not been saved."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -13382,11 +13528,11 @@ msgstr ""
 "subfolders."
 
 #  mail:gw-accountsetup-error primary
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to connect to the GroupWise server."
 msgstr "Unable to connect to the GroupWise server."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13394,19 +13540,19 @@ msgstr ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:123
 msgid "Unable to read license file."
 msgstr "Unable to read licence file."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:124
 msgid "Use _Default"
 msgstr "Use _Default"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:125
 msgid "Use default drafts folder?"
 msgstr "Use default drafts folder?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13416,31 +13562,31 @@ msgstr ""
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:128
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "You do not have sufficient permissions to delete this mail."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:129
 msgid "You have not filled in all of the required information."
 msgstr "You have not filled in all of the required information."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:130
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "You have unsent messages, do you wish to quit anyway?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:131
 msgid "You may not create two accounts with the same name."
 msgstr "You may not create two accounts with the same name."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:132
 msgid "You must name this Search Folder."
 msgstr "You must name this Search Folder."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:133
 msgid "You must specify a folder."
 msgstr "You must specify a folder."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:134
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13450,110 +13596,115 @@ msgstr ""
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:136
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:137
 msgid "_Append"
 msgstr "_Append"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:138
 msgid "_Discard changes"
 msgstr "_Discard changes"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:139
 msgid "_Do not Synchronize"
 msgstr "_Do not Synchronise"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:140
+#: ../modules/mail/e-mail-shell-view-actions.c:862
 msgid "_Empty Trash"
 msgstr "_Empty Wastebasket"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:141
 msgid "_Expunge"
 msgstr "_Expunge"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:142
 msgid "_Open Messages"
 msgstr "_Open Messages"
 
-#: ../mail/message-list.c:1064
+#: ../mail/message-list.c:1122
 msgid "Unseen"
 msgstr "Unseen"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1123
 msgid "Seen"
 msgstr "Seen"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1124
 msgid "Answered"
 msgstr "Answered"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1125
 msgid "Forwarded"
 msgstr "Forwarded"
 
-#: ../mail/message-list.c:1068
+#: ../mail/message-list.c:1126
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: ../mail/message-list.c:1069
+#: ../mail/message-list.c:1127
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: ../mail/message-list.c:1073
+#: ../mail/message-list.c:1131
 msgid "Lowest"
 msgstr "Lowest"
 
-#: ../mail/message-list.c:1074
+#: ../mail/message-list.c:1132
 msgid "Lower"
 msgstr "Lower"
 
-#: ../mail/message-list.c:1078
+#: ../mail/message-list.c:1136
 msgid "Higher"
 msgstr "Higher"
 
-#: ../mail/message-list.c:1079
+#: ../mail/message-list.c:1137
 msgid "Highest"
 msgstr "Highest"
 
-#: ../mail/message-list.c:1688 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1695 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: ../mail/message-list.c:1704
+#: ../mail/message-list.c:1763
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: ../mail/message-list.c:1716
+#: ../mail/message-list.c:1775
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1724
+#: ../mail/message-list.c:1783
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1726
+#: ../mail/message-list.c:1785
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2466 ../shell/e-shell-view.c:534
+#: ../mail/message-list.c:2537
+msgid "Select all visible messages"
+msgstr "Select all visible messages"
+
+#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:652
 msgid "Shell Backend"
-msgstr ""
+msgstr "Shell Backend"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4054 ../mail/message-list.c:4528
+#: ../mail/message-list.c:4399 ../mail/message-list.c:4887
 msgid "Generating message list"
 msgstr "Generating message list"
 
-#: ../mail/message-list.c:4365
+#: ../mail/message-list.c:4722
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13561,7 +13712,7 @@ msgstr ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 
-#: ../mail/message-list.c:4367
+#: ../mail/message-list.c:4724
 msgid ""
 "There are only hidden messages in this folder. Use View->Show Hidden "
 "Messages to show them."
@@ -13569,7 +13720,7 @@ msgstr ""
 "There are only hidden messages in this folder. Use View->Show Hidden "
 "Messages to show them."
 
-#: ../mail/message-list.c:4369
+#: ../mail/message-list.c:4726
 msgid "There are no messages in this folder."
 msgstr "There are no messages in this folder."
 
@@ -13598,7 +13749,6 @@ msgid "Sent Messages"
 msgstr "Sent Messages"
 
 #: ../mail/message-list.etspec.h:16
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 #: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "Size"
@@ -13607,60 +13757,28 @@ msgstr "Size"
 msgid "Subject - Trimmed"
 msgstr "Subject â?? Trimmed"
 
-#: ../mail/message-tag-followup.c:54
-msgid "Call"
-msgstr "Call"
-
-#: ../mail/message-tag-followup.c:55
-msgid "Do Not Forward"
-msgstr "Do Not Forward"
-
-#: ../mail/message-tag-followup.c:56
-msgid "Follow-Up"
-msgstr "Follow-Up"
-
-#: ../mail/message-tag-followup.c:57
-msgid "For Your Information"
-msgstr "For Your Information"
-
-#: ../mail/message-tag-followup.c:58
-msgid "Forward"
-msgstr "Forward"
-
-#: ../mail/message-tag-followup.c:59
-msgid "No Response Necessary"
-msgstr "No Response Necessary"
-
-#: ../mail/message-tag-followup.c:63
-msgid "Reply to All"
-msgstr "Reply to All"
-
-#: ../mail/message-tag-followup.c:64
-msgid "Review"
-msgstr "Review"
-
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1446
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Body contains"
 msgstr "Body contains"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
 msgid "Message contains"
 msgstr "Message contains"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1460
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "Recipients contain"
 msgstr "Recipients contain"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1467
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 msgid "Sender contains"
 msgstr "Sender contains"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1474
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
 msgid "Subject contains"
 msgstr "Subject contains"
 
@@ -13668,7 +13786,7 @@ msgstr "Subject contains"
 msgid "Subject or Addresses contains"
 msgstr "Subject or Addresses contains"
 
-#: ../modules/addressbook/addressbook-config.c:212
+#: ../modules/addressbook/addressbook-config.c:206
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -13676,7 +13794,7 @@ msgstr ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
 
-#: ../modules/addressbook/addressbook-config.c:214
+#: ../modules/addressbook/addressbook-config.c:208
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -13684,7 +13802,7 @@ msgstr ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
 
-#: ../modules/addressbook/addressbook-config.c:216
+#: ../modules/addressbook/addressbook-config.c:210
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -13694,15 +13812,15 @@ msgstr ""
 "TLS. This means that your connection will be insecure, and that you will be "
 "vulnerable to security exploits."
 
-#: ../modules/addressbook/addressbook-config.c:341
-msgid "Base"
-msgstr "Base"
+#: ../modules/addressbook/addressbook-config.c:592
+msgid "Use in _Birthday & Anniversaries calendar"
+msgstr "Use in _Birthday & Anniversaries calendar"
 
-#: ../modules/addressbook/addressbook-config.c:643
+#: ../modules/addressbook/addressbook-config.c:628
 msgid "Copy _book content locally for offline operation"
 msgstr "Copy _book content locally for offline operation"
 
-#: ../modules/addressbook/addressbook-config.c:754
+#: ../modules/addressbook/addressbook-config.c:736
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -13712,7 +13830,7 @@ msgstr ""
 "list of standard ports has been provided. Ask your system administrator what "
 "port you should specify."
 
-#: ../modules/addressbook/addressbook-config.c:832
+#: ../modules/addressbook/addressbook-config.c:810
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13722,7 +13840,7 @@ msgstr ""
 "setting this to \"E-mail Address\" requires anonymous access to your LDAP "
 "server."
 
-#: ../modules/addressbook/addressbook-config.c:911
+#: ../modules/addressbook/addressbook-config.c:885
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -13734,34 +13852,29 @@ msgstr ""
 "your search base. A search scope of \"one\" will only include the entries "
 "one level beneath your base."
 
-#: ../modules/addressbook/addressbook-config.c:1020
+#: ../modules/addressbook/addressbook-config.c:991
 msgid "Server Information"
 msgstr "Server Information"
 
-#: ../modules/addressbook/addressbook-config.c:1022
-msgid "Authentication"
-msgstr "Authentication"
-
-#: ../modules/addressbook/addressbook-config.c:1025
-#: ../modules/addressbook/ldap-config.glade.h:15
-#: ../smime/gui/smime-ui.glade.h:20
+#: ../modules/addressbook/addressbook-config.c:996
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Details"
 msgstr "Details"
 
-#: ../modules/addressbook/addressbook-config.c:1026
+#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "Searching"
 
-#: ../modules/addressbook/addressbook-config.c:1028
+#: ../modules/addressbook/addressbook-config.c:999
 msgid "Downloading"
 msgstr "Downloading"
 
-#: ../modules/addressbook/addressbook-config.c:1238
-#: ../modules/addressbook/ldap-config.glade.h:9
+#: ../modules/addressbook/addressbook-config.c:1205
 msgid "Address Book Properties"
 msgstr "Address Book Properties"
 
-#: ../modules/addressbook/addressbook-config.c:1240
+#: ../modules/addressbook/addressbook-config.c:1207
 msgid "New Address Book"
 msgstr "New Address Book"
 
@@ -13770,18 +13883,16 @@ msgid "Autocomplete length"
 msgstr "Autocomplete length"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
-#, fuzzy
 msgid "Contact layout style"
-msgstr "Contact Print Test"
+msgstr "Contact layout style"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
 msgid "Contact preview pane position (horizontal)"
-msgstr ""
+msgstr "Contact preview pane position (horizontal)"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
-#, fuzzy
 msgid "Contact preview pane position (vertical)"
-msgstr "Month view vertical pane position"
+msgstr "Contact preview pane position (vertical)"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
 msgid "EFolderList XML for the list of completion URIs"
@@ -13793,11 +13904,11 @@ msgstr "EFolderList XML for the list of completion URIs."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
 msgid "Position of the contact preview pane when oriented horizontally."
-msgstr ""
+msgstr "Position of the contact preview pane when orientated horizontally."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
 msgid "Position of the contact preview pane when oriented vertically."
-msgstr ""
+msgstr "Position of the contact preview pane when orientated vertically."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Show autocompleted name with an address"
@@ -13814,6 +13925,10 @@ msgid ""
 "contact list. \"1\" (Vertical View) places the preview pane next to the "
 "contact list."
 msgstr ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid ""
@@ -13843,12 +13958,7 @@ msgstr ""
 msgid "Whether to show the preview pane."
 msgstr "Whether to show the preview pane."
 
-#: ../modules/addressbook/autocompletion-config.c:153
-msgid "Date/Time Format"
-msgstr "Date/Time Format"
-
 #: ../modules/addressbook/autocompletion-config.c:159
-#: ../modules/mail/em-mailer-prefs.c:1141
 msgid "Table column:"
 msgstr "Table column:"
 
@@ -13872,17 +13982,17 @@ msgid "_Contact"
 msgstr "_Contact"
 
 #: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:703
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "Create a new contact"
 msgstr "Create a new contact"
 
 #: ../modules/addressbook/e-book-shell-backend.c:347
-#, fuzzy
+msgctxt "New"
 msgid "Contact _List"
 msgstr "Contact _List"
 
 #: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:710
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "Create a new contact list"
 msgstr "Create a new contact list"
 
@@ -13892,82 +14002,58 @@ msgid "Address _Book"
 msgstr "Address _Book"
 
 #: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:619
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "Create a new address book"
 msgstr "Create a new address book"
 
 #. Create the contacts group
 #: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:378
-#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/addressbook/e-book-shell-view.c:394
+#: ../modules/calendar/e-cal-shell-backend.c:123
 #: ../modules/calendar/e-cal-shell-migrate.c:480
-#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:579
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../modules/addressbook/e-book-shell-backend.c:595
-#: ../modules/calendar/e-cal-shell-backend.c:758
-#: ../modules/calendar/e-memo-shell-backend.c:582
-#: ../modules/calendar/e-task-shell-backend.c:592
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-backend.c:596
+#: ../modules/calendar/e-cal-shell-backend.c:777
+#: ../modules/calendar/e-memo-shell-backend.c:587
+#: ../modules/calendar/e-task-shell-backend.c:597
 msgid "Source List"
-msgstr "Source"
+msgstr "Source List"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-backend.c:597
 msgid "The registry of address books"
-msgstr "Couldn't get list of address books"
+msgstr "The registry of address books"
 
-#: ../modules/addressbook/e-book-shell-content.c:313
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-content.c:364
 msgid "Current View"
-msgstr "_Current View"
+msgstr "Current View"
 
-#: ../modules/addressbook/e-book-shell-content.c:314
+#: ../modules/addressbook/e-book-shell-content.c:365
 msgid "The currently selected address book view"
-msgstr ""
+msgstr "The currently selected address book view"
 
-#: ../modules/addressbook/e-book-shell-content.c:323
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-content.c:374
 msgid "Previewed Contact"
-msgstr "New Contact"
+msgstr "Previewed Contact"
 
-#: ../modules/addressbook/e-book-shell-content.c:324
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-content.c:375
 msgid "The contact being shown in the preview pane"
-msgstr "Whether to show the preview pane."
+msgstr "The contact being shown in the preview pane"
 
-#: ../modules/addressbook/e-book-shell-content.c:333
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:630
-#: ../modules/mail/e-mail-shell-content.c:697
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-content.c:384
+#: ../modules/calendar/e-memo-shell-content.c:617
+#: ../modules/calendar/e-task-shell-content.c:639
+#: ../modules/mail/e-mail-shell-content.c:688
 msgid "Preview is Visible"
-msgstr "Sidebar is visible"
+msgstr "Preview is Visible"
 
-#: ../modules/addressbook/e-book-shell-content.c:334
-#: ../modules/calendar/e-memo-shell-content.c:608
-#: ../modules/calendar/e-task-shell-content.c:631
-#: ../modules/mail/e-mail-shell-content.c:698
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-content.c:385
+#: ../modules/calendar/e-memo-shell-content.c:618
+#: ../modules/calendar/e-task-shell-content.c:640
+#: ../modules/mail/e-mail-shell-content.c:689
 msgid "Whether the preview pane is visible"
-msgstr "Whether to show the preview pane."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
-#: ../modules/mail/e-mail-shell-migrate.c:1105
-msgid "Migrating..."
-msgstr "Migratingâ?¦"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
-#: ../modules/mail/e-mail-shell-migrate.c:1178
-#, c-format
-msgid "Migrating '%s':"
-msgstr "Migrating '%s':"
+msgstr "Whether the preview pane is visible"
 
 #: ../modules/addressbook/e-book-shell-migrate.c:645
 msgid "LDAP Servers"
@@ -14019,382 +14105,334 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync dataâ?¦"
 
-#: ../modules/addressbook/e-book-shell-sidebar.c:173
-#: ../modules/calendar/e-cal-shell-sidebar.c:561
-#: ../modules/calendar/e-memo-shell-sidebar.c:528
-#: ../modules/calendar/e-task-shell-sidebar.c:526
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-sidebar.c:181
+#: ../modules/calendar/e-cal-shell-sidebar.c:761
+#: ../modules/calendar/e-memo-shell-sidebar.c:687
+#: ../modules/calendar/e-task-shell-sidebar.c:687
 msgid "Source Selector Widget"
-msgstr "Memo Source Selector"
+msgstr "Source Selector Widget"
 
-#: ../modules/addressbook/e-book-shell-sidebar.c:174
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-sidebar.c:182
 msgid "This widget displays groups of address books"
-msgstr "Couldn't get list of address books"
+msgstr "This widget displays groups of address books"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:596
+#: ../modules/addressbook/e-book-shell-view-actions.c:262
+#: ../modules/addressbook/e-book-shell-view-actions.c:539
+msgid "Save as vCard"
+msgstr "Save as vCardâ?¦"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:662
 msgid "Co_py All Contacts To..."
 msgstr "Co_py All Contacts Toâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:598
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Copy the contacts of the selected address book to another"
-msgstr "Copy the contacts of the selected folder into another folder"
+msgstr "Copy the contacts of the selected address book to another"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:603
-msgid "Del_ete Address Book"
-msgstr "Del_ete Address Book"
+#: ../modules/addressbook/e-book-shell-view-actions.c:669
+msgid "D_elete Address Book"
+msgstr "D_elete Address Book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:605
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "Delete the selected address book"
-msgstr "Delete the selected folder"
+msgstr "Delete the selected address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:610
+#: ../modules/addressbook/e-book-shell-view-actions.c:676
 msgid "Mo_ve All Contacts To..."
 msgstr "Mo_ve All Contacts Toâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:612
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Move the contacts of the selected address book to another"
-msgstr "Move the contacts of the selected folder into another folder"
+msgstr "Move the contacts of the selected address book to another"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:617
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "_New Address Book"
 msgstr "_New Address Book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:624
+#: ../modules/addressbook/e-book-shell-view-actions.c:690
 msgid "Address _Book Properties"
 msgstr "Address _Book Properties"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:626
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Show properties of the selected address book"
-msgstr "Change the properties of the selected folder"
+msgstr "Show properties of the selected address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:631
-#: ../modules/calendar/e-cal-shell-view-actions.c:1236
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
-#: ../modules/calendar/e-task-shell-view-actions.c:756
-#: ../modules/mail/e-mail-shell-view-actions.c:1126
+#: ../modules/addressbook/e-book-shell-view-actions.c:697
+#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/mail/e-mail-shell-view-actions.c:946
 msgid "_Rename..."
 msgstr "_Renameâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:633
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
 msgid "Rename the selected address book"
-msgstr "Rename the selected folder"
+msgstr "Rename the selected address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:638
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:704
 msgid "S_ave Address Book as vCard"
-msgstr "S_ave Address Book As vCard"
+msgstr "S_ave Address Book as vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:640
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "Save the contacts of the selected address book as a vCard"
-msgstr "Save the contacts of the selected folder as vCard"
+msgstr "Save the contacts of the selected address book as a vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:647
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:713
 msgid "Stop loading"
-msgstr "Stop Loading"
+msgstr "Stop loading"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:654
-#: ../modules/calendar/e-cal-shell-view-actions.c:1252
-msgid "Copy the selection"
-msgstr "Copy the selection"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:661
-#: ../modules/calendar/e-cal-shell-view-actions.c:1259
-msgid "Cut the selection"
-msgstr "Cut the selection"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:668
-#: ../modules/calendar/e-cal-shell-view-actions.c:1266
-msgid "Paste the clipboard"
-msgstr "Paste the clipboard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:673
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:718
 msgid "_Copy Contact To..."
-msgstr "_Copy Contact toâ?¦"
+msgstr "_Copy Contact Toâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:675
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "Copy selected contacts to another address book"
-msgstr "Copy selected contacts to another folder"
+msgstr "Copy selected contacts to another address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:725
 msgid "_Delete Contact"
 msgstr "_Delete Contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:682
-msgid "Delete selected contacts"
-msgstr "Delete selected contacts"
+#: ../modules/addressbook/e-book-shell-view-actions.c:732
+msgid "_Find in Contact..."
+msgstr "_Find in Contactâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
+msgid "Search for text in the displayed contact"
+msgstr "Search for text in the displayed contact"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:739
 msgid "_Forward Contact..."
 msgstr "_Forward Contactâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:689
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "Send selected contacts to another person"
 msgstr "Send selected contacts to another person"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:746
 msgid "_Move Contact To..."
-msgstr "_Move Contact toâ?¦"
+msgstr "_Move Contact Toâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:696
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "Move selected contacts to another address book"
-msgstr "Move selected contacts to another folder"
+msgstr "Move selected contacts to another address book"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:753
 msgid "_New Contact..."
 msgstr "_New Contactâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#: ../modules/addressbook/e-book-shell-view-actions.c:760
 msgid "New Contact _List..."
 msgstr "New Contact _Listâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
-msgid "_Open"
-msgstr "_Open"
+#: ../modules/addressbook/e-book-shell-view-actions.c:767
+msgid "_Open Contact"
+msgstr "_Open Contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:717
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "View the current contact"
 msgstr "View the current contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:724
-#, fuzzy
-msgid "Save selected contacts as a vCard"
-msgstr "Save selected contacts as a vCard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:731
-msgid "Select all contacts"
-msgstr "Select all contacts"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:774
 msgid "_Send Message to Contact..."
 msgstr "_Send Message to Contactâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:738
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "Send a message to the selected contacts"
 msgstr "Send a message to the selected contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:745
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
-#: ../modules/calendar/e-task-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-task-shell-view-actions.c:805
 msgid "_Actions"
 msgstr "_Actions"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:752
-#: ../modules/calendar/e-memo-shell-view-actions.c:675
-#: ../modules/calendar/e-task-shell-view-actions.c:828
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/addressbook/e-book-shell-view-actions.c:790
+#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/mail/e-mail-shell-view-actions.c:1090
 msgid "_Preview"
 msgstr "_Preview"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:761
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../modules/addressbook/e-book-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-memo-shell-view-actions.c:673
+#: ../modules/calendar/e-task-shell-view-actions.c:825
 msgid "_Delete"
 msgstr "_Delete"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:765
+#: ../modules/addressbook/e-book-shell-view-actions.c:803
 msgid "_Properties"
 msgstr "_Properties"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:773
+#: ../modules/addressbook/e-book-shell-view-actions.c:811
 msgid "_Save as vCard..."
 msgstr "_Save as vCardâ?¦"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:839
 msgid "Contact _Preview"
 msgstr "Contact _Preview"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:823
+#: ../modules/addressbook/e-book-shell-view-actions.c:841
 msgid "Show contact preview window"
 msgstr "Show contact preview window"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:842
-#: ../modules/calendar/e-memo-shell-view-actions.c:761
-#: ../modules/calendar/e-task-shell-view-actions.c:926
-#: ../modules/mail/e-mail-shell-view-actions.c:1363
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/calendar/e-memo-shell-view-actions.c:730
+#: ../modules/calendar/e-task-shell-view-actions.c:894
+#: ../modules/mail/e-mail-shell-view-actions.c:1185
 msgid "_Classic View"
 msgstr "_Classic View"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:844
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:862
 msgid "Show contact preview below the contact list"
-msgstr "Show message preview below the message list"
+msgstr "Show contact preview below the contact list"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:849
-#: ../modules/calendar/e-memo-shell-view-actions.c:768
-#: ../modules/calendar/e-task-shell-view-actions.c:933
-#: ../modules/mail/e-mail-shell-view-actions.c:1370
+#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/calendar/e-memo-shell-view-actions.c:737
+#: ../modules/calendar/e-task-shell-view-actions.c:901
+#: ../modules/mail/e-mail-shell-view-actions.c:1192
 msgid "_Vertical View"
 msgstr "_Vertical View"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:851
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
 msgid "Show contact preview alongside the contact list"
-msgstr "Show contact preview window"
+msgstr "Show contact preview alongside the contact list"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:859
-#: ../modules/calendar/e-cal-shell-view-actions.c:1549
-#: ../modules/calendar/e-memo-shell-view-actions.c:778
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:918
 msgid "Any Category"
 msgstr "Any Category"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:866
-#: ../modules/calendar/e-cal-shell-view-actions.c:1563
-#: ../modules/calendar/e-memo-shell-view-actions.c:785
-#: ../modules/calendar/e-task-shell-view-actions.c:985
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
+#: ../modules/calendar/e-cal-shell-view-actions.c:1608
+#: ../modules/calendar/e-memo-shell-view-actions.c:754
+#: ../modules/calendar/e-task-shell-view-actions.c:953
 msgid "Unmatched"
 msgstr "Unmatched"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:963
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../shell/e-shell-content.c:516
+msgid "Advanced Search"
+msgstr "Advanced Search"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
+msgid "Print all shown contacts"
+msgstr "Print all shown contacts"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
+msgid "Preview the contacts to be printed"
+msgstr "Preview the contacts to be printed"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:941
 msgid "Print selected contacts"
 msgstr "Print selected contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
-#, fuzzy
-msgid "Preview the contacts to be printed"
-msgstr "Previews the contacts to be printed"
+#: ../modules/addressbook/e-book-shell-view-actions.c:956
+msgid "Save as vCard..."
+msgstr "Save as vCardâ?¦"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:958
+msgid "Save selected contacts as a vCard"
+msgstr "Save selected contacts as a vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:322
+#: ../modules/addressbook/e-book-shell-view.c:338
 msgid "_Forward Contacts"
 msgstr "_Forward Contacts"
 
-#: ../modules/addressbook/e-book-shell-view.c:324
+#: ../modules/addressbook/e-book-shell-view.c:340
 msgid "_Forward Contact"
 msgstr "_Forward Contact"
 
-#: ../modules/addressbook/e-book-shell-view.c:355
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view.c:371
 msgid "_Send Message to Contacts"
-msgstr "Send _Message to Contacts"
+msgstr "_Send Message to Contacts"
 
-#: ../modules/addressbook/e-book-shell-view.c:357
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view.c:373
 msgid "_Send Message to List"
-msgstr "Send _Message to List"
+msgstr "_Send Message to List"
 
-#: ../modules/addressbook/e-book-shell-view.c:359
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view.c:375
 msgid "_Send Message to Contact"
-msgstr "Send _Message to Contact"
+msgstr "_Send Message to Contact"
 
-#: ../modules/addressbook/eab-composer-util.c:139
+#: ../modules/addressbook/eab-composer-util.c:137
 msgid "Multiple vCards"
 msgstr "Multiple vCards"
 
-#: ../modules/addressbook/eab-composer-util.c:147
+#: ../modules/addressbook/eab-composer-util.c:145
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard for %s"
 
-#: ../modules/addressbook/eab-composer-util.c:159
-#: ../modules/addressbook/eab-composer-util.c:186
+#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:184
 #, c-format
 msgid "Contact information"
 msgstr "Contact information"
 
-#: ../modules/addressbook/eab-composer-util.c:188
+#: ../modules/addressbook/eab-composer-util.c:186
 #, c-format
 msgid "Contact information for %s"
 msgstr "Contact information for %s"
 
-#: ../modules/addressbook/ldap-config.glade.h:1
+#: ../modules/addressbook/ldap-config.ui.h:1
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.glade.h:2
-msgid ""
-"389\n"
-"636\n"
-"3268"
-msgstr ""
-"389\n"
-"636\n"
-"3268"
+#: ../modules/addressbook/ldap-config.ui.h:2
+msgid "3268"
+msgstr "3268"
+
+#: ../modules/addressbook/ldap-config.ui.h:3
+msgid "389"
+msgstr "389"
 
-#: ../modules/addressbook/ldap-config.glade.h:5
+#: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
-#: ../modules/addressbook/ldap-config.glade.h:6
-msgid "<b>Authentication</b>"
-msgstr "<b>Authentication</b>"
+#: ../modules/addressbook/ldap-config.ui.h:5
+msgid "636"
+msgstr "636"
 
-#: ../modules/addressbook/ldap-config.glade.h:7
-msgid "<b>Downloading</b>"
-msgstr "<b>Downloading</b>"
-
-#: ../modules/addressbook/ldap-config.glade.h:8
-msgid "<b>Searching</b>"
-msgstr "<b>Searching</b>"
-
-#: ../modules/addressbook/ldap-config.glade.h:10
-msgid ""
-"Anonymously\n"
-"Using email address\n"
-"Using distinguished name (DN)"
-msgstr ""
-"Anonymously\n"
-"Using e-mail address\n"
-"Using distinguished name (DN)"
+#: ../modules/addressbook/ldap-config.ui.h:6
+msgid "Anonymously"
+msgstr "Anonymously"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.glade.h:14
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "B_rowse this book until limit reached"
 msgstr "B_rowse this book until limit reached"
 
-#: ../modules/addressbook/ldap-config.glade.h:16
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr ""
-"Evolution will use this e-mail address to authenticate you with the server."
-
-#: ../modules/addressbook/ldap-config.glade.h:18
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "Lo_gin:"
 msgstr "Lo_gin:"
 
-#: ../modules/addressbook/ldap-config.glade.h:19
-msgid ""
-"One\n"
-"Sub"
-msgstr ""
-"One\n"
-"Sub"
-
-#: ../modules/addressbook/ldap-config.glade.h:21
-msgid ""
-"SSL encryption\n"
-"TLS encryption\n"
-"No encryption"
-msgstr ""
-"SSL encryption\n"
-"TLS encryption\n"
-"No encryption"
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:12
+msgid "One"
+msgstr "One"
 
-#: ../modules/addressbook/ldap-config.glade.h:24
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search Filter"
 msgstr "Search Filter"
 
-#: ../modules/addressbook/ldap-config.glade.h:25
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _base:"
 msgstr "Search _base:"
 
-#: ../modules/addressbook/ldap-config.glade.h:26
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid "Search _filter:"
 msgstr "Search _filter:"
 
-#: ../modules/addressbook/ldap-config.glade.h:27
+#: ../modules/addressbook/ldap-config.ui.h:17
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -14402,73 +14440,52 @@ msgstr ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
 
-#: ../modules/addressbook/ldap-config.glade.h:28
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:19
+msgid "Sub"
+msgstr "Sub"
+
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "Supported Search Bases"
 msgstr "Supported Search Bases"
 
-#: ../modules/addressbook/ldap-config.glade.h:29
-msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-
-#: ../modules/addressbook/ldap-config.glade.h:30
-msgid ""
-"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
-"\"."
-msgstr ""
-"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
-"\"."
-
-#: ../modules/addressbook/ldap-config.glade.h:31
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
-msgstr ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
+#: ../modules/addressbook/ldap-config.ui.h:22
+msgid "Using distinguished name (DN)"
+msgstr "Using distinguished name (DN)"
 
-#: ../modules/addressbook/ldap-config.glade.h:32
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
-msgstr ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
+#: ../modules/addressbook/ldap-config.ui.h:23
+msgid "Using email address"
+msgstr "Using e-mail address"
 
-#: ../modules/addressbook/ldap-config.glade.h:33
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Download limit:"
 msgstr "_Download limit:"
 
-#: ../modules/addressbook/ldap-config.glade.h:34
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Find Possible Search Bases"
 msgstr "_Find Possible Search Bases"
 
-#: ../modules/addressbook/ldap-config.glade.h:35
+#: ../modules/addressbook/ldap-config.ui.h:26
 msgid "_Login method:"
 msgstr "_Login method:"
 
-#: ../modules/addressbook/ldap-config.glade.h:37
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../modules/addressbook/ldap-config.glade.h:38
+#: ../modules/addressbook/ldap-config.ui.h:29
 msgid "_Search scope:"
 msgstr "_Search scope:"
 
-#: ../modules/addressbook/ldap-config.glade.h:40
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Timeout:"
 msgstr "_Timeout:"
 
-#: ../modules/addressbook/ldap-config.glade.h:41
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "_Use secure connection:"
 msgstr "_Use secure connection:"
 
-#: ../modules/addressbook/ldap-config.glade.h:42
+#: ../modules/addressbook/ldap-config.ui.h:33
 msgid "cards"
 msgstr "cards"
 
@@ -14493,72 +14510,71 @@ msgid "I_mport to Tasks"
 msgstr "I_mport to Tasks"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:122
+#: ../modules/calendar/e-cal-shell-backend.c:125
 #: ../modules/calendar/e-cal-shell-migrate.c:599
-#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-backend.c:113
 #: ../modules/calendar/e-task-shell-migrate.c:535
 msgid "On The Web"
 msgstr "On The Web"
 
-#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../modules/calendar/e-cal-shell-backend.c:127
 #: ../plugins/calendar-weather/calendar-weather.c:117
 msgid "Weather"
 msgstr "Weather"
 
-#: ../modules/calendar/e-cal-shell-backend.c:238
+#: ../modules/calendar/e-cal-shell-backend.c:242
 #: ../modules/calendar/e-cal-shell-migrate.c:483
 msgid "Birthdays & Anniversaries"
 msgstr "Birthdays & Anniversaries"
 
-#: ../modules/calendar/e-cal-shell-backend.c:424
+#: ../modules/calendar/e-cal-shell-backend.c:446
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:426
-#: ../modules/calendar/e-cal-shell-view-actions.c:1336
+#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:431
+#: ../modules/calendar/e-cal-shell-backend.c:453
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "All Day A_ppointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:433
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgid "Create a new all-day appointment"
 msgstr "Create a new all-day appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:438
+#: ../modules/calendar/e-cal-shell-backend.c:460
 msgctxt "New"
 msgid "M_eeting"
 msgstr "M_eeting"
 
-#: ../modules/calendar/e-cal-shell-backend.c:440
+#: ../modules/calendar/e-cal-shell-backend.c:462
 msgid "Create a new meeting request"
 msgstr "Create a new meeting request"
 
-#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-backend.c:470
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:450
-#: ../modules/calendar/e-cal-shell-view-actions.c:1217
+#: ../modules/calendar/e-cal-shell-backend.c:472
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:485
-#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../modules/calendar/e-cal-shell-backend.c:507
+#: ../plugins/itip-formatter/itip-formatter.c:2657
 msgid "Calendar and Tasks"
 msgstr "Calendar and Tasks"
 
-#: ../modules/calendar/e-cal-shell-backend.c:759
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-backend.c:778
 msgid "The registry of calendars"
-msgstr "Primary calendar"
+msgstr "The registry of calendars"
 
 #: ../modules/calendar/e-cal-shell-migrate.c:131
 msgid ""
@@ -14585,50 +14601,57 @@ msgstr "Unable to migrate old settings from evolution/config.xmldb"
 msgid "Unable to migrate calendar `%s'"
 msgstr "Unable to migrate calendar `%s'"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:152
-#: ../modules/calendar/e-memo-shell-sidebar.c:149
-#: ../modules/calendar/e-task-shell-sidebar.c:147
-#, fuzzy, c-format
+#: ../modules/calendar/e-cal-shell-sidebar.c:167
+#: ../modules/calendar/e-memo-shell-sidebar.c:162
+#: ../modules/calendar/e-task-shell-sidebar.c:162
+#, c-format
 msgid ""
 "Error on %s\n"
 "%s"
 msgstr ""
-"Error on %s:\n"
-" %s"
+"Error on %s\n"
+"%s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:188
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-sidebar.c:226
 msgid "Loading calendars"
-msgstr "Loading Calendar"
+msgstr "Loading calendars"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:428
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-sidebar.c:615
 msgid "Calendar Selector"
-msgstr "Calendar Source Selector"
+msgstr "Calendar Selector"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:551
+#: ../modules/calendar/e-cal-shell-sidebar.c:741
 msgid "Date Navigator Widget"
-msgstr ""
+msgstr "Date Navigator Widget"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:552
+#: ../modules/calendar/e-cal-shell-sidebar.c:742
 msgid "This widget displays a miniature calendar"
-msgstr ""
+msgstr "This widget displays a miniature calendar"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:751
+msgid "Default Calendar Client"
+msgstr "Default Calendar Client"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:562
+#: ../modules/calendar/e-cal-shell-sidebar.c:752
+msgid "Default client for calendar operations"
+msgstr "Default client for calendar operations"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:762
 msgid "This widget displays groups of calendars"
-msgstr ""
+msgstr "This widget displays groups of calendars"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:723
-#, fuzzy, c-format
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-cal-shell-sidebar.c:950
+#, c-format
 msgid "Opening calendar at %s"
-msgstr "Opening calendar"
+msgstr "Opening calendar at %s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:214
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
 msgid "Print"
 msgstr "Print"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:304
+#: ../modules/calendar/e-cal-shell-view-actions.c:306
 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 "
@@ -14640,580 +14663,549 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:321
+#: ../modules/calendar/e-cal-shell-view-actions.c:323
 msgid "Purge events older than"
 msgstr "Purge events older than"
 
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:334
-#: ../plugins/caldav/caldav-source.c:450
-#: ../plugins/calendar-file/calendar-file.c:295
-#: ../plugins/calendar-http/calendar-http.c:325
-#: ../plugins/calendar-weather/calendar-weather.c:516
-#: ../plugins/google-account-setup/google-contacts-source.c:332
-#: ../plugins/google-account-setup/google-source.c:741
-#: ../widgets/misc/e-send-options.glade.h:39
-msgid "days"
-msgstr "days"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:551
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:540
 msgid "Copying Items"
-msgstr "Copying items"
+msgstr "Copying Items"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:801
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:795
 msgid "Moving Items"
-msgstr "Moving items"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1091
-msgid "Save As..."
-msgstr "Save Asâ?¦"
+msgstr "Moving Items"
+
+#. Translators: Default filename part saving an event to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-actions.c:1097
+msgid "event"
+msgstr "event"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1099
+#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
+#: ../modules/calendar/e-memo-shell-view-actions.c:507
+#: ../modules/calendar/e-task-shell-view-actions.c:624
+msgid "Save as iCalendar"
+msgstr "Save as iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1173
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
+#: ../modules/calendar/e-cal-shell-view-actions.c:1229
+#: ../modules/calendar/e-memo-shell-view-actions.c:588
 msgid "_Copy..."
 msgstr "_Copyâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1189
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1236
+msgid "D_elete Calendar"
+msgstr "D_elete Calendar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1238
+msgid "Delete the selected calendar"
+msgstr "Delete the selected calendar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1245
 msgid "Go Back"
-msgstr "Go back"
+msgstr "Go Back"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1196
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
 msgid "Go Forward"
-msgstr "Go forward"
+msgstr "Go Forward"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1201
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "Select _Today"
 msgstr "Select _Today"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1203
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Select today"
 msgstr "Select today"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1208
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
 msgid "Select _Date"
 msgstr "Select _Date"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1210
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 msgid "Select a specific date"
 msgstr "Select a specific date"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1215
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 msgid "_New Calendar"
 msgstr "_New Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1229
-#: ../modules/calendar/e-task-shell-view-actions.c:805
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../modules/calendar/e-task-shell-view-actions.c:796
 msgid "Purg_e"
 msgstr "Purg_e"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1231
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Purge old appointments and meetings"
 msgstr "Purge old appointments and meetings"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1238
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../modules/calendar/e-task-shell-view-actions.c:740
+msgid "Re_fresh"
+msgstr "Re_fresh"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+msgid "Refresh the selected calendar"
+msgstr "Refresh the selected calendar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
 msgid "Rename the selected calendar"
-msgstr "Rename the selected folder"
+msgstr "Rename the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1243
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
 msgid "Show _Only This Calendar"
-msgstr "Show _only this Calendar"
+msgstr "Show _Only This Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 msgid "Cop_y to Calendar..."
 msgstr "Cop_y to Calendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 msgid "_Delegate Meeting..."
 msgstr "_Delegate Meetingâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1287
-msgid "Delete the appointment"
-msgstr "Delete the appointment"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+msgid "_Delete Appointment"
+msgstr "_Delete Appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1292
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1329
+msgid "Delete selected appointments"
+msgstr "Delete selected appointments"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Delete This _Occurrence"
-msgstr "Delete this _Occurrence"
+msgstr "Delete This _Occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+#: ../modules/calendar/e-cal-shell-view-actions.c:1336
 msgid "Delete this occurrence"
 msgstr "Delete this occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1299
-msgid "Delete _All Occurrences"
-msgstr "Delete _All Occurrences"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+msgid "Delete All Occ_urrences"
+msgstr "Delete All Occ_urrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1301
+#: ../modules/calendar/e-cal-shell-view-actions.c:1343
 msgid "Delete all occurrences"
 msgstr "Delete all occurrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1306
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "New All Day _Event..."
-msgstr "New All Day _Event"
+msgstr "New All Day _Eventâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1308
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Create a new all day event"
-msgstr "Create a new all-day appointment"
+msgstr "Create a new all-day event"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1313
-#: ../modules/calendar/e-cal-shell-view-memopad.c:301
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:375
-#: ../modules/calendar/e-memo-shell-view-actions.c:596
-#: ../modules/calendar/e-task-shell-view-actions.c:721
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:581
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "_Forward as iCalendar..."
 msgstr "_Forward as iCalendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1320
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "New _Meeting..."
-msgstr "New _Meeting"
+msgstr "New _Meetingâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1322
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Create a new meeting"
-msgstr "Create a new meeting request"
+msgstr "Create a new meeting"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ve to Calendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "New _Appointment..."
 msgstr "New _Appointmentâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
 msgid "Make this Occurrence _Movable"
 msgstr "Make this Occurrence _Movable"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "_Open Appointment"
 msgstr "_Open Appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "View the current appointment"
 msgstr "View the current appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "_Reply"
 msgstr "_Reply"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+msgid "Save as iCalendar..."
+msgstr "Save as iCalendarâ?¦"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Schedule Meeting..."
 msgstr "_Schedule Meetingâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+msgid "Converts an appointment to a meeting"
+msgstr "Converts an appointment to a meeting"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+msgid "Conv_ert to Appointment..."
+msgstr "Conv_ert to Appointmentâ?¦"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1427
+msgid "Converts a meeting to an appointment"
+msgstr "Converts a meeting to an appointment"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1549
 msgid "Day"
 msgstr "Day"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+#: ../modules/calendar/e-cal-shell-view-actions.c:1551
 msgid "Show one day"
 msgstr "Show one day"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
 msgid "List"
 msgstr "List"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-cal-shell-view-actions.c:1558
 msgid "Show as list"
 msgstr "Show as list"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-cal-shell-view-actions.c:1563
 msgid "Month"
 msgstr "Month"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1520
+#: ../modules/calendar/e-cal-shell-view-actions.c:1565
 msgid "Show one month"
 msgstr "Show one month"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-actions.c:1570
 msgid "Week"
 msgstr "Week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1527
+#: ../modules/calendar/e-cal-shell-view-actions.c:1572
 msgid "Show one week"
 msgstr "Show one week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1532
-msgid "Work Week"
-msgstr "Work Week"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1534
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Show one work week"
-msgstr "Show one week"
+msgstr "Show one work week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1542
-#, fuzzy
-msgid "Active Appointements"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+msgid "Active Appointments"
 msgstr "Active Appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-cal-shell-view-actions.c:1601
 msgid "Next 7 Days' Appointments"
 msgstr "Next 7 Days' Appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
-#: ../modules/calendar/e-memo-shell-view-actions.c:802
-#: ../modules/calendar/e-task-shell-view-actions.c:1002
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-memo-shell-view-actions.c:778
+#: ../modules/calendar/e-task-shell-view-actions.c:977
 msgid "Description contains"
 msgstr "Description contains"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
-#: ../modules/calendar/e-memo-shell-view-actions.c:809
-#: ../modules/calendar/e-task-shell-view-actions.c:1009
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
+#: ../modules/calendar/e-memo-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:984
 msgid "Summary contains"
 msgstr "Summary contains"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1599
+#: ../modules/calendar/e-cal-shell-view-actions.c:1651
 msgid "Print this calendar"
 msgstr "Print this calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1606
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
 msgid "Preview the calendar to be printed"
-msgstr "Previews the calendar to be printed"
+msgstr "Preview the calendar to be printed"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1668
+#: ../modules/calendar/e-cal-shell-view-actions.c:1730
 msgid "Go To"
 msgstr "Go To"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:76
-#: ../modules/calendar/e-memo-shell-view-actions.c:96
-#, fuzzy
-msgid "Deleting selected memos..."
-msgstr "Deleting selected objectsâ?¦"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:275
-#: ../modules/calendar/e-memo-shell-view-actions.c:570
-msgid "Copy selected memo"
-msgstr "Copy selected memo"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:282
-#: ../modules/calendar/e-memo-shell-view-actions.c:577
-msgid "Cut selected memo"
-msgstr "Cut selected memo"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:289
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
-msgid "Paste memo from the clipboard"
-msgstr "Paste memo from the clipboard"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:294
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
-#, fuzzy
-msgid "_Delete Memo"
-msgstr "_Delete Message"
+#. Translators: Default filename part saving a memo to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:505
+msgid "memo"
+msgstr "memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:296
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
-msgid "Delete selected memos"
-msgstr "Delete selected memos"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:308
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:637
 msgid "New _Memo"
-msgstr "New memo"
+msgstr "New _Memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:310
-#: ../modules/calendar/e-memo-shell-backend.c:318
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-cal-shell-view-memopad.c:252
+#: ../modules/calendar/e-memo-shell-backend.c:320
+#: ../modules/calendar/e-memo-shell-view-actions.c:639
 msgid "Create a new memo"
 msgstr "Create a new memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:315
-#: ../modules/calendar/e-memo-shell-view-actions.c:652
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "_Open Memo"
 msgstr "_Open Memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:646
 msgid "View the selected memo"
 msgstr "View the selected memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:322
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:410
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
-#: ../modules/calendar/e-task-shell-view-actions.c:798
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-memo-shell-view-actions.c:651
+#: ../modules/calendar/e-task-shell-view-actions.c:789
 msgid "Open _Web Page"
 msgstr "Open _Web Page"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:341
-#: ../modules/calendar/e-memo-shell-view-actions.c:835
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:811
 msgid "Print the selected memo"
-msgstr "View the selected memo"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:423
-#: ../modules/calendar/e-memo-shell-view.c:223
-#, fuzzy
-msgid "Delete Memo"
-msgid_plural "Delete Memos"
-msgstr[0] "Delegate To"
-msgstr[1] "Delegate To"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:99
-#: ../modules/calendar/e-task-shell-view-actions.c:127
-#, fuzzy
-msgid "Deleting selected tasks..."
-msgstr "Deleting selected objectsâ?¦"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-view-actions.c:686
+msgstr "Print the selected memo"
+
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#. Translators: Default filename part saving a task to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../modules/calendar/e-task-shell-view-actions.c:622
+msgid "task"
+msgstr "task"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "_Assign Task"
 msgstr "_Assign Task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
-#: ../modules/calendar/e-task-shell-view-actions.c:695
-msgid "Copy selected tasks"
-msgstr "Copy selected tasks"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
-#: ../modules/calendar/e-task-shell-view-actions.c:702
-msgid "Cut selected tasks"
-msgstr "Cut selected tasks"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
-#: ../modules/calendar/e-task-shell-view-actions.c:709
-msgid "Paste tasks from the clipboard"
-msgstr "Paste tasks from the clipboard"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
-#: ../modules/calendar/e-task-shell-view-actions.c:714
-#, fuzzy
-msgid "_Delete Task"
-msgstr "_Delete all"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:370
-#: ../modules/calendar/e-task-shell-view-actions.c:716
-msgid "Delete selected tasks"
-msgstr "Delete selected tasks"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
-#: ../modules/calendar/e-task-shell-view-actions.c:770
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "_Mark as Complete"
 msgstr "_Mark as Complete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:763
 msgid "Mark selected tasks as complete"
 msgstr "Mark selected tasks as complete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:389
-#, fuzzy
-msgid "_Mar_k as Incomplete"
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+msgid "_Mark as Incomplete"
 msgstr "_Mark as Incomplete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:391
-#: ../modules/calendar/e-task-shell-view-actions.c:779
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "Mark selected tasks as incomplete"
-msgstr "Mark selected tasks as complete"
+msgstr "Mark selected tasks as incomplete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:396
-#: ../modules/calendar/e-task-shell-view-actions.c:784
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:775
 msgid "New _Task"
 msgstr "New _Task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:398
-#: ../modules/calendar/e-task-shell-backend.c:322
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-backend.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:403
-#: ../modules/calendar/e-task-shell-view-actions.c:791
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:782
 msgid "_Open Task"
 msgstr "_Open Task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:405
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "View the selected task"
 msgstr "View the selected task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:417
-#: ../modules/calendar/e-memo-shell-view-actions.c:666
-#: ../modules/calendar/e-task-shell-view-actions.c:812
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-memo-shell-view-actions.c:826
+#: ../modules/calendar/e-task-shell-view-actions.c:1025
 msgid "_Save as iCalendar..."
-msgstr "_Forward as iCalendarâ?¦"
+msgstr "_Save as iCalendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:429
-#: ../modules/calendar/e-task-shell-view-actions.c:1035
-#, fuzzy
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-task-shell-view-actions.c:1010
 msgid "Print the selected task"
-msgstr "View the selected task"
+msgstr "Print the selected task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:534
-#: ../modules/calendar/e-task-shell-view.c:350
-#, fuzzy
-msgid "Delete Task"
-msgid_plural "Delete Tasks"
-msgstr[0] "Delegate To"
-msgstr[1] "Delegate To"
-
-#: ../modules/calendar/e-memo-shell-backend.c:316
+#: ../modules/calendar/e-memo-shell-backend.c:318
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Mem_o"
 
-#: ../modules/calendar/e-memo-shell-backend.c:323
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-backend.c:325
+msgctxt "New"
 msgid "_Shared Memo"
-msgstr "_Shared memo"
+msgstr "_Shared Memo"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-backend.c:327
 msgid "Create a new shared memo"
-msgstr "Create a shared new memo"
+msgstr "Create a new shared memo"
 
-#: ../modules/calendar/e-memo-shell-backend.c:333
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-backend.c:335
 msgctxt "New"
 msgid "Memo Li_st"
-msgstr "Memo List"
+msgstr "Memo Li_st"
 
-#: ../modules/calendar/e-memo-shell-backend.c:335
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-memo-shell-backend.c:337
+#: ../modules/calendar/e-memo-shell-view-actions.c:604
 msgid "Create a new memo list"
 msgstr "Create a new memo list"
 
-#: ../modules/calendar/e-memo-shell-backend.c:583
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-backend.c:588
 msgid "The registry of memo lists"
-msgstr "Primary memo list"
+msgstr "The registry of memo lists"
 
-#: ../modules/calendar/e-memo-shell-content.c:598
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-content.c:608
 msgid "The memo table model"
-msgstr "Table model"
+msgstr "The memo table model"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:185
+#: ../modules/calendar/e-memo-shell-sidebar.c:221
 msgid "Loading memos"
 msgstr "Loading memos"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:399
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-sidebar.c:569
 msgid "Memo List Selector"
-msgstr "Memo Source Selector"
+msgstr "Memo List Selector"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:677
+msgid "Default Memo Client"
+msgstr "Default Memo Client"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:678
+msgid "Default client for memo operations"
+msgstr "Default client for memo operations"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:529
+#: ../modules/calendar/e-memo-shell-sidebar.c:688
 msgid "This widget displays groups of memo lists"
-msgstr ""
+msgstr "This widget displays groups of memo lists"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:682
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-memo-shell-sidebar.c:868
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Opening memos at %s"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:253
-#: ../modules/calendar/e-memo-shell-view-actions.c:270
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
 msgid "Print Memos"
 msgstr "Print Memos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:567
+msgid "_Delete Memo"
+msgstr "_Delete Memo"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:574
+msgid "_Find in Memo..."
+msgstr "_Find in Memoâ?¦"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:576
+msgid "Search for text in the displayed memo"
+msgstr "Search for text in the displayed memo"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:595
+msgid "D_elete Memo List"
+msgstr "D_elete Memo List"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:597
+msgid "Delete the selected memo list"
+msgstr "Delete the selected memo list"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:602
 msgid "_New Memo List"
 msgstr "_New Memo List"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:618
+msgid "Refresh the selected memo list"
+msgstr "Refresh the selected memo list"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:625
 msgid "Rename the selected memo list"
-msgstr "Rename the selected folder"
+msgstr "Rename the selected memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:630
 msgid "Show _Only This Memo List"
-msgstr "Show _only this Memo List"
+msgstr "Show _Only This Memo List"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:740
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:709
 msgid "Memo _Preview"
-msgstr "_Preview"
+msgstr "Memo _Preview"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:742
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:711
 msgid "Show memo preview pane"
-msgstr "Show preview pane"
+msgstr "Show memo preview pane"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:763
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:732
 msgid "Show memo preview below the memo list"
-msgstr "Show message preview below the message list"
+msgstr "Show memo preview below the memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:770
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:739
 msgid "Show memo preview alongside the memo list"
-msgstr "Show message preview below the message list"
+msgstr "Show memo preview alongside the memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:821
+#: ../modules/calendar/e-memo-shell-view-actions.c:797
 msgid "Print the list of memos"
 msgstr "Print the list of memos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:828
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view-actions.c:804
 msgid "Preview the list of memos to be printed"
-msgstr "Previews the list of memos to be printed"
+msgstr "Preview the list of memos to be printed"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:412
+#: ../modules/calendar/e-memo-shell-view-private.c:414
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d memo"
 msgstr[1] "%d memos"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:416
-#: ../modules/calendar/e-task-shell-view-private.c:510
-#, fuzzy, c-format
+#: ../modules/calendar/e-memo-shell-view-private.c:418
+#: ../modules/calendar/e-task-shell-view-private.c:567
+#, c-format
 msgid "%d selected"
-msgstr ", %d selected"
+msgstr "%d selected"
 
-#: ../modules/calendar/e-memo-shell-view.c:221
-#, fuzzy
+#: ../modules/calendar/e-memo-shell-view.c:223
 msgid "Delete Memos"
-msgstr "_Delete Message"
+msgstr "Delete Memos"
+
+#: ../modules/calendar/e-memo-shell-view.c:225
+msgid "Delete Memo"
+msgstr "Delete Memo"
 
-#: ../modules/calendar/e-task-shell-backend.c:320
+#: ../modules/calendar/e-task-shell-backend.c:322
 msgctxt "New"
 msgid "_Task"
 msgstr "_Task"
 
-#: ../modules/calendar/e-task-shell-backend.c:327
-#, fuzzy
+#: ../modules/calendar/e-task-shell-backend.c:329
+msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Assigne_d Task"
 
-#: ../modules/calendar/e-task-shell-backend.c:329
+#: ../modules/calendar/e-task-shell-backend.c:331
 msgid "Create a new assigned task"
 msgstr "Create a new assigned task"
 
-#: ../modules/calendar/e-task-shell-backend.c:337
-#, fuzzy
+#: ../modules/calendar/e-task-shell-backend.c:339
 msgctxt "New"
 msgid "Tas_k List"
-msgstr "Task List"
+msgstr "Tas_k List"
 
-#: ../modules/calendar/e-task-shell-backend.c:339
-#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/calendar/e-task-shell-backend.c:341
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Create a new task list"
 msgstr "Create a new task list"
 
-#: ../modules/calendar/e-task-shell-backend.c:593
-#, fuzzy
+#: ../modules/calendar/e-task-shell-backend.c:598
 msgid "The registry of task lists"
-msgstr "Primary task list"
+msgstr "The registry of task lists"
 
-#: ../modules/calendar/e-task-shell-content.c:621
-#, fuzzy
+#: ../modules/calendar/e-task-shell-content.c:630
 msgid "The task table model"
-msgstr "Table model"
+msgstr "The task table model"
 
 #: ../modules/calendar/e-task-shell-migrate.c:98
 msgid ""
@@ -15233,30 +15225,38 @@ msgstr ""
 msgid "Unable to migrate tasks `%s'"
 msgstr "Unable to migrate tasks `%s'"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:183
+#: ../modules/calendar/e-task-shell-sidebar.c:221
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:397
-#, fuzzy
+#: ../modules/calendar/e-task-shell-sidebar.c:569
 msgid "Task List Selector"
-msgstr "Task Source Selector"
+msgstr "Task List Selector"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:677
+msgid "Default Task Client"
+msgstr "Default Task Client"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:527
+#: ../modules/calendar/e-task-shell-sidebar.c:678
+msgid "Default client for task operations"
+msgstr "Default client for task operations"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:688
 msgid "This widget displays groups of task lists"
-msgstr ""
+msgstr "This widget displays groups of task lists"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:680
+#. Translators: The string field is a URI.
+#: ../modules/calendar/e-task-shell-sidebar.c:868
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:284
-#: ../modules/calendar/e-task-shell-view-actions.c:301
+#: ../modules/calendar/e-task-shell-view-actions.c:241
+#: ../modules/calendar/e-task-shell-view-actions.c:256
 msgid "Print Tasks"
 msgstr "Print Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:570
+#: ../modules/calendar/e-task-shell-view-actions.c:566
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15268,93 +15268,116 @@ msgstr ""
 "\n"
 "Really erase these tasks?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:728
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:691
+msgid "_Delete Task"
+msgstr "_Delete Task"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:698
+msgid "_Find in Task..."
+msgstr "_Find in Taskâ?¦"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:700
+msgid "Search for text in the displayed task"
+msgstr "Search for text in the displayed task"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "Copy..."
-msgstr "_Copyâ?¦"
+msgstr "Copyâ?¦"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:742
+#: ../modules/calendar/e-task-shell-view-actions.c:719
+msgid "D_elete Task List"
+msgstr "D_elete Task List"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:721
+msgid "Delete the selected task list"
+msgstr "Delete the selected task list"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "_New Task List"
 msgstr "_New Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:758
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:742
+msgid "Refresh the selected task list"
+msgstr "Refresh the selected task list"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 msgid "Rename the selected task list"
-msgstr "Rename the selected folder"
+msgstr "Rename the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:763
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:754
 msgid "Show _Only This Task List"
-msgstr "Show _only this Task List"
+msgstr "Show _Only This Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:777
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "Mar_k as Incomplete"
-msgstr "_Mark as Incomplete"
+msgstr "Mar_k as Incomplete"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:807
+#: ../modules/calendar/e-task-shell-view-actions.c:798
 msgid "Delete completed tasks"
 msgstr "Delete completed tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/calendar/e-task-shell-view-actions.c:873
 msgid "Task _Preview"
 msgstr "Task _Preview"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:907
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:875
 msgid "Show task preview pane"
-msgstr "Show preview pane"
+msgstr "Show task preview pane"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:896
 msgid "Show task preview below the task list"
-msgstr "Show message preview below the message list"
+msgstr "Show task preview below the task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:935
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:903
 msgid "Show task preview alongside the task list"
-msgstr "Show message preview below the message list"
+msgstr "Show task preview alongside the task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:911
 msgid "Active Tasks"
 msgstr "Active Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:925
 msgid "Completed Tasks"
 msgstr "Completed Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-task-shell-view-actions.c:932
 msgid "Next 7 Days' Tasks"
 msgstr "Next 7 Days' Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-task-shell-view-actions.c:939
 msgid "Overdue Tasks"
 msgstr "Overdue Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:978
+#: ../modules/calendar/e-task-shell-view-actions.c:946
 msgid "Tasks with Attachments"
 msgstr "Tasks with Attachments"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1021
+#: ../modules/calendar/e-task-shell-view-actions.c:996
 msgid "Print the list of tasks"
 msgstr "Print the list of tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1028
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view-actions.c:1003
 msgid "Preview the list of tasks to be printed"
-msgstr "Previews the list of tasks to be printed"
+msgstr "Preview the list of tasks to be printed"
+
+#: ../modules/calendar/e-task-shell-view-private.c:461
+msgid "Expunging"
+msgstr "Expunging"
 
-#: ../modules/calendar/e-task-shell-view-private.c:506
+#: ../modules/calendar/e-task-shell-view-private.c:563
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d task"
 msgstr[1] "%d tasks"
 
-#: ../modules/calendar/e-task-shell-view.c:348
-#, fuzzy
+#: ../modules/calendar/e-task-shell-view.c:351
 msgid "Delete Tasks"
-msgstr "Completed Tasks"
+msgstr "Delete Tasks"
+
+#: ../modules/calendar/e-task-shell-view.c:353
+msgid "Delete Task"
+msgstr "Delete Task"
 
 #. Translators: This is only for multiple messages.
 #: ../modules/mail/e-mail-attachment-handler.c:335
@@ -15362,497 +15385,416 @@ msgstr "Completed Tasks"
 msgid "%d attached messages"
 msgstr "%d attached messages"
 
-#: ../modules/mail/e-mail-shell-backend.c:174
+#. Translators: "None" for a junk hook name,
+#. * when the junk plugin is not enabled.
+#: ../modules/mail/e-mail-junk-hook.c:90
+msgctxt "mail-junk-hook"
+msgid "None"
+msgstr "None"
+
+#: ../modules/mail/e-mail-shell-backend.c:168
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: ../modules/mail/e-mail-shell-backend.c:176
+#: ../modules/mail/e-mail-shell-backend.c:170
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: ../modules/mail/e-mail-shell-backend.c:184
+#: ../modules/mail/e-mail-shell-backend.c:178
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: ../modules/mail/e-mail-shell-backend.c:186
+#: ../modules/mail/e-mail-shell-backend.c:180
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: ../modules/mail/e-mail-shell-backend.c:205
+#: ../modules/mail/e-mail-shell-backend.c:199
 msgid "Mail Accounts"
 msgstr "Mail Accounts"
 
-#: ../modules/mail/e-mail-shell-backend.c:221
+#: ../modules/mail/e-mail-shell-backend.c:207
+msgid "Mail Preferences"
+msgstr "Mail Preferences"
+
+#: ../modules/mail/e-mail-shell-backend.c:215
 msgid "Composer Preferences"
 msgstr "Composer Preferences"
 
-#: ../modules/mail/e-mail-shell-backend.c:229
+#: ../modules/mail/e-mail-shell-backend.c:223
 msgid "Network Preferences"
 msgstr "Network Preferences"
 
-#. green
-#: ../modules/mail/e-mail-shell-migrate.c:958
-msgid "To Do"
-msgstr "To Do"
+#: ../modules/mail/e-mail-shell-content.c:678
+msgid "Group by Threads"
+msgstr "Group by Threads"
 
-#. blue
-#: ../modules/mail/e-mail-shell-migrate.c:959
-msgid "Later"
-msgstr "Later"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1138
-msgid "Migration"
-msgstr "Migration"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1588
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Unable to create new folder `%s': %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1616
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Unable to copy folder `%s' to `%s': %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1811
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Unable to scan for existing mailboxes at `%s': %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1817
-#: ../modules/mail/e-mail-shell-migrate.c:2914
-msgid "Migrating Folders"
-msgstr "Migrating Folders"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1818
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your foldersâ?¦"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2021
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "Unable to open old POP keep-on-server data `%s': %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2037
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Unable to create POP3 keep-on-server data directory `%s': %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2069
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "Unable to copy POP3 keep-on-server data `%s': %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2540
-#: ../modules/mail/e-mail-shell-migrate.c:2554
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "Failed to create local mail storage `%s': %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2915
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your foldersâ?¦"
-
-#: ../modules/mail/e-mail-shell-migrate.c:3012
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "Unable to create local mail folders at `%s': %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:3030
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
+#: ../modules/mail/e-mail-shell-content.c:679
+msgid "Whether to group messages by threads"
+msgstr "Whether to group messages by threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1035
-#: ../modules/mail/e-mail-shell-view.c:418
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
-msgstr "Disable Account"
+msgstr "_Disable Account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1037
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:857
 msgid "Disable this account"
-msgstr "Disable Account"
+msgstr "Disable this account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1042
+#: ../modules/mail/e-mail-shell-view-actions.c:864
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "Permanently remove all the deleted messages from all folders"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:869
 msgid "C_reate Search Folder From Search..."
 msgstr "C_reate Search Folder From Searchâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1049
+#: ../modules/mail/e-mail-shell-view-actions.c:876
 msgid "_Download Messages for Offline Usage"
 msgstr "_Download Messages for Offline Usage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1051
-#, fuzzy
-msgid "Download messages of accounts and folders marked for offline"
-msgstr "Download messages of accounts/folders marked for offline"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1056
-msgid "Empty _Trash"
-msgstr "Empty Wastebaske_t"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1058
-#, fuzzy
-msgid "Permanently remove all the deleted messages from all folders"
-msgstr "Permanently remove all deleted messages from all folders"
+#: ../modules/mail/e-mail-shell-view-actions.c:878
+msgid "Download messages of accounts and folders marked for offline usage"
+msgstr "Download messages of accounts and folders marked for offline usage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1063
+#: ../modules/mail/e-mail-shell-view-actions.c:883
 msgid "Fl_ush Outbox"
 msgstr "Fl_ush Outbox"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1070
+#: ../modules/mail/e-mail-shell-view-actions.c:890
 msgid "_Copy Folder To..."
 msgstr "_Copy Folder Toâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1072
+#: ../modules/mail/e-mail-shell-view-actions.c:892
 msgid "Copy the selected folder into another folder"
 msgstr "Copy the selected folder into another folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1079
+#: ../modules/mail/e-mail-shell-view-actions.c:899
 msgid "Permanently remove this folder"
 msgstr "Permanently remove this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1084
+#: ../modules/mail/e-mail-shell-view-actions.c:904
 msgid "E_xpunge"
 msgstr "E_xpunge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1086
+#: ../modules/mail/e-mail-shell-view-actions.c:906
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Permanently remove all deleted messages from this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1091
+#: ../modules/mail/e-mail-shell-view-actions.c:911
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_k All Messages as Read"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1093
+#: ../modules/mail/e-mail-shell-view-actions.c:913
 msgid "Mark all messages in the folder as read"
 msgstr "Mark all messages in the folder as read"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1098
+#: ../modules/mail/e-mail-shell-view-actions.c:918
 msgid "_Move Folder To..."
 msgstr "_Move Folder Toâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1100
+#: ../modules/mail/e-mail-shell-view-actions.c:920
 msgid "Move the selected folder into another folder"
 msgstr "Move the selected folder into another folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1105
+#: ../modules/mail/e-mail-shell-view-actions.c:925
 msgid "_New..."
 msgstr "_Newâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1107
+#: ../modules/mail/e-mail-shell-view-actions.c:927
 msgid "Create a new folder for storing mail"
 msgstr "Create a new folder for storing mail"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1114
+#: ../modules/mail/e-mail-shell-view-actions.c:934
 msgid "Change the properties of this folder"
 msgstr "Change the properties of this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1121
+#: ../modules/mail/e-mail-shell-view-actions.c:941
 msgid "Refresh the folder"
 msgstr "Refresh the folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1128
+#: ../modules/mail/e-mail-shell-view-actions.c:948
 msgid "Change the name of this folder"
 msgstr "Change the name of this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1133
-msgid "Select _All Messages"
-msgstr "Select _All Messages"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1135
-msgid "Select all visible messages"
-msgstr "Select all visible messages"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1140
+#: ../modules/mail/e-mail-shell-view-actions.c:953
 msgid "Select Message _Thread"
 msgstr "Select Message _Thread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1142
+#: ../modules/mail/e-mail-shell-view-actions.c:955
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Select all messages in the same thread as the selected message"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view-actions.c:960
 msgid "Select Message S_ubthread"
 msgstr "Select Message S_ubthread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
+#: ../modules/mail/e-mail-shell-view-actions.c:962
 msgid "Select all replies to the currently selected message"
 msgstr "Select all replies to the currently selected message"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1154
+#: ../modules/mail/e-mail-shell-view-actions.c:967
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:969
 msgid "Unsubscribe from the selected folder"
-msgstr "Rename the selected folder"
+msgstr "Unsubscribe from the selected folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../modules/mail/e-mail-shell-view-actions.c:974
+msgid "Empty _Trash"
+msgstr "Empty Wastebaske_t"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:976
+msgid "Permanently remove all the deleted messages from all accounts"
+msgstr "Permanently remove all the deleted messages from all accounts"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:981
 msgid "_New Label"
 msgstr "_New Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:990
 msgid "N_one"
-msgstr "None"
+msgstr "N_one"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1175
+#: ../modules/mail/e-mail-shell-view-actions.c:997
 msgid "Hide _Read Messages"
 msgstr "Hide _Read Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1177
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Temporarily hide all messages that have already been read"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
 msgid "Hide S_elected Messages"
 msgstr "Hide S_elected Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1184
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
 msgid "Temporarily hide the selected messages"
 msgstr "Temporarily hide the selected messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
 msgid "Show Hidde_n Messages"
 msgstr "Show Hidde_n Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1013
 msgid "Show messages that have been temporarily hidden"
 msgstr "Show messages that have been temporarily hidden"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1034
 msgid "Cancel the current mail operation"
 msgstr "Cancel the current mail operation"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#: ../modules/mail/e-mail-shell-view-actions.c:1039
 msgid "Collapse All _Threads"
 msgstr "Collapse All _Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../modules/mail/e-mail-shell-view-actions.c:1041
 msgid "Collapse all message threads"
 msgstr "Collapse all message threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view-actions.c:1046
 msgid "E_xpand All Threads"
 msgstr "E_xpand All Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view-actions.c:1048
 msgid "Expand all message threads"
 msgstr "Expand all message threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1053
 msgid "_Message Filters"
 msgstr "_Message Filters"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1055
 msgid "Create or edit rules for filtering new mail"
 msgstr "Create or edit rules for filtering new mail"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1238
+#: ../modules/mail/e-mail-shell-view-actions.c:1060
 msgid "Search F_olders"
 msgstr "Search F_olders"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1062
 msgid "Create or edit search folder definitions"
-msgstr "Create or edit Search Folder definitions"
+msgstr "Create or edit search folder definitions"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
 msgid "_Subscriptions..."
 msgstr "_Subscriptionsâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1069
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Subscribe or unsubscribe to folders on remote servers"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1076
 msgid "F_older"
 msgstr "F_older"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1083
 msgid "_Label"
 msgstr "_Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1301
+#: ../modules/mail/e-mail-shell-view-actions.c:1123
 msgid "_New Folder..."
 msgstr "_New Folderâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1325
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
 msgid "Hide _Deleted Messages"
 msgstr "Hide _Deleted Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1149
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Hide deleted messages rather than displaying them with a line through them"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
 msgid "Show Message _Preview"
 msgstr "Show Message _Preview"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1158
 msgid "Show message preview pane"
-msgstr "Show message preview window"
+msgstr "Show message preview pane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1342
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "_Group By Threads"
 msgstr "_Group By Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1344
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Threaded message list"
-msgstr "Threaded Message list"
+msgstr "Threaded message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1365
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Show message preview below the message list"
 msgstr "Show message preview below the message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1372
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "Show message preview alongside the message list"
-msgstr "Show message preview below the message list"
+msgstr "Show message preview alongside the message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1202
 msgid "All Messages"
 msgstr "All Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1387
+#: ../modules/mail/e-mail-shell-view-actions.c:1209
 msgid "Important Messages"
 msgstr "Important Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1394
+#: ../modules/mail/e-mail-shell-view-actions.c:1216
 msgid "Last 5 Days' Messages"
 msgstr "Last 5 Days' Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../modules/mail/e-mail-shell-view-actions.c:1223
 msgid "Messages Not Junk"
 msgstr "Messages Not Junk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1408
+#: ../modules/mail/e-mail-shell-view-actions.c:1230
 msgid "Messages with Attachments"
 msgstr "Messages with Attachments"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1415
+#: ../modules/mail/e-mail-shell-view-actions.c:1237
 msgid "No Label"
 msgstr "No Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1422
+#: ../modules/mail/e-mail-shell-view-actions.c:1244
 msgid "Read Messages"
 msgstr "Read Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1429
+#: ../modules/mail/e-mail-shell-view-actions.c:1251
 msgid "Recent Messages"
 msgstr "Recent Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1436
+#: ../modules/mail/e-mail-shell-view-actions.c:1258
 msgid "Unread Messages"
 msgstr "Unread Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1481
-#, fuzzy
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
 msgid "Subject or Addresses contain"
-msgstr "Subject or Addresses contains"
+msgstr "Subject or Addresses contain"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "All Accounts"
 msgstr "All Accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1498
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
 msgid "Current Account"
 msgstr "Current Account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1505
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
 msgid "Current Folder"
 msgstr "Current Folder"
 
-#: ../modules/mail/e-mail-shell-view-private.c:691
+#: ../modules/mail/e-mail-shell-view-private.c:889
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d selected, "
 msgstr[1] "%d selected, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:702
+#: ../modules/mail/e-mail-shell-view-private.c:900
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d deleted"
 msgstr[1] "%d deleted"
 
-#: ../modules/mail/e-mail-shell-view-private.c:708
-#: ../modules/mail/e-mail-shell-view-private.c:715
+#: ../modules/mail/e-mail-shell-view-private.c:906
+#: ../modules/mail/e-mail-shell-view-private.c:913
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d junk"
 msgstr[1] "%d junk"
 
-#: ../modules/mail/e-mail-shell-view-private.c:721
+#: ../modules/mail/e-mail-shell-view-private.c:919
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d draft"
 msgstr[1] "%d drafts"
 
-#: ../modules/mail/e-mail-shell-view-private.c:727
+#: ../modules/mail/e-mail-shell-view-private.c:925
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d unsent"
 msgstr[1] "%d unsent"
 
-#: ../modules/mail/e-mail-shell-view-private.c:733
+#: ../modules/mail/e-mail-shell-view-private.c:931
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d sent"
 msgstr[1] "%d sent"
 
-#: ../modules/mail/e-mail-shell-view-private.c:745
+#: ../modules/mail/e-mail-shell-view-private.c:943
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d unread, "
 msgstr[1] "%d unread, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:748
+#: ../modules/mail/e-mail-shell-view-private.c:946
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: ../modules/mail/e-mail-shell-view.c:416
+#: ../modules/mail/e-mail-shell-view.c:548
+msgid "All Account Search"
+msgstr "All Account Search"
+
+#: ../modules/mail/e-mail-shell-view.c:685
+msgid "Account Search"
+msgstr "Account Search"
+
+#: ../modules/mail/e-mail-shell-view.c:873
 msgid "Proxy _Logout"
 msgstr "Proxy _Logout"
 
-#: ../modules/mail/em-composer-prefs.c:478
+#: ../modules/mail/em-composer-prefs.c:473
 msgid "Language(s)"
 msgstr "Language(s)"
 
@@ -15884,37 +15826,47 @@ msgstr "Header Name:"
 msgid "Header Value Contains:"
 msgstr "Header Value Contains:"
 
-#: ../modules/mail/em-mailer-prefs.c:326
-#: ../widgets/table/e-table-click-to-add.c:500
+#: ../modules/mail/em-mailer-prefs.c:325
+#: ../widgets/table/e-table-click-to-add.c:504
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "Header"
 
-#: ../modules/mail/em-mailer-prefs.c:330
+#: ../modules/mail/em-mailer-prefs.c:329
 msgid "Contains Value"
 msgstr "Contains Value"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:723 ../modules/mail/em-mailer-prefs.c:777
+#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s plugin is available and the binary is installed."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:786
+#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr ""
 "%s plugin is not available. Please check whether the package is installed."
 
-#: ../modules/mail/em-mailer-prefs.c:752
-msgid "No Junk plugin available"
-msgstr "No Junk plugin available"
+#: ../modules/mail/em-mailer-prefs.c:766
+msgid "No junk plugin available"
+msgstr "No junk plugin available"
+
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
+#: ../modules/mail/em-mailer-prefs.c:1151
+msgid "_Table column:"
+msgstr "_Table column:"
 
-#: ../modules/mail/em-mailer-prefs.c:1140
-msgid "Date header:"
-msgstr "Date header:"
+#. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
+#: ../modules/mail/em-mailer-prefs.c:1153
+msgid "_Date header:"
+msgstr "_Date header:"
+
+#: ../modules/mail/em-mailer-prefs.c:1154
+msgid "Show _original header value"
+msgstr "Show _original header value"
 
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
@@ -15956,17 +15908,12 @@ msgstr ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:476
-#: ../plugins/templates/templates.c:378
+#: ../plugins/attachment-reminder/attachment-reminder.c:514
+#: ../plugins/templates/templates.c:413
 msgid "Keywords"
 msgstr "Keywords"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
-msgid "Attachment Reminder"
-msgstr "Attachment Reminder"
-
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
@@ -15974,49 +15921,51 @@ msgstr ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid "Message has no attachments"
 msgstr "Message has no attachments"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add attachment..."
 msgstr "_Add attachmentâ?¦"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
 msgstr "_Edit Message"
 
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+msgid "Attachment Reminder"
+msgstr "Attachment Reminder"
+
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Reminds you when you forgot to add an attachment to a mail message."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-#, fuzzy
 msgid "Inline Audio"
-msgstr "Inline"
+msgstr "Inline Audio"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-#, fuzzy
 msgid "Play audio attachments directly in mail messages."
-msgstr "Play audio attachments directly from Evolution."
+msgstr "Play audio attachments directly in mail messages."
 
-#: ../plugins/backup-restore/backup-restore.c:143
+#: ../plugins/backup-restore/backup-restore.c:152
 msgid "Select name of the Evolution backup file"
 msgstr "Select name of the Evolution backup file"
 
-#: ../plugins/backup-restore/backup-restore.c:168
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after backup"
 msgstr "_Restart Evolution after backup"
 
-#: ../plugins/backup-restore/backup-restore.c:198
+#: ../plugins/backup-restore/backup-restore.c:209
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Select name of the Evolution backup file to restore"
 
-#: ../plugins/backup-restore/backup-restore.c:219
+#: ../plugins/backup-restore/backup-restore.c:222
 msgid "_Restart Evolution after restore"
 msgstr "_Restart Evolution after restore"
 
-#: ../plugins/backup-restore/backup-restore.c:293
+#: ../plugins/backup-restore/backup-restore.c:290
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16026,39 +15975,37 @@ msgstr ""
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 
-#: ../plugins/backup-restore/backup-restore.c:300
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restore Evolution from the backup file"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Please select an Evolution Archive to restore:"
 
-#: ../plugins/backup-restore/backup-restore.c:310
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "Choose a file to restore"
 
-#: ../plugins/backup-restore/backup-restore.c:318
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Restore from backup"
 msgstr "Restore from backup"
 
-#: ../plugins/backup-restore/backup-restore.c:354
+#: ../plugins/backup-restore/backup-restore.c:353
 msgid "_Backup Settings..."
 msgstr "_Backup Settingsâ?¦"
 
-#: ../plugins/backup-restore/backup-restore.c:356
-#, fuzzy
+#: ../plugins/backup-restore/backup-restore.c:355
 msgid "Backup Evolution data and settings to an archive file"
-msgstr "Backup and restore Evolution data and settings"
+msgstr "Backup Evolution data and settings to an archive file"
 
-#: ../plugins/backup-restore/backup-restore.c:361
+#: ../plugins/backup-restore/backup-restore.c:360
 msgid "R_estore Settings..."
 msgstr "R_estore Settingsâ?¦"
 
-#: ../plugins/backup-restore/backup-restore.c:363
-#, fuzzy
+#: ../plugins/backup-restore/backup-restore.c:362
 msgid "Restore Evolution data and settings from an archive file"
-msgstr "Backup and restore Evolution data and settings"
+msgstr "Restore Evolution data and settings from an archive file"
 
 #: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
@@ -16123,42 +16070,42 @@ msgstr "Removing temporary backup files"
 msgid "Ensuring local sources"
 msgstr "Ensuring local sources"
 
-#: ../plugins/backup-restore/backup.c:429
+#: ../plugins/backup-restore/backup.c:427
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Backing up to the folder %s"
 
-#: ../plugins/backup-restore/backup.c:434
+#: ../plugins/backup-restore/backup.c:432
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restoring from the folder %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:452
 msgid "Evolution Backup"
 msgstr "Evolution Backup"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:452
 msgid "Evolution Restore"
 msgstr "Evolution Restore"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:487
 msgid "Backing up Evolution Data"
 msgstr "Backing up Evolution Data"
 
-#: ../plugins/backup-restore/backup.c:490
+#: ../plugins/backup-restore/backup.c:488
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Please wait while Evolution backs up your data."
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:490
 msgid "Restoring Evolution Data"
 msgstr "Restoring Evolution Data"
 
-#: ../plugins/backup-restore/backup.c:493
+#: ../plugins/backup-restore/backup.c:491
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Please wait while Evolution restores your data."
 
-#: ../plugins/backup-restore/backup.c:511
+#: ../plugins/backup-restore/backup.c:509
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "This may take a while depending on the amount of data in your account."
 
@@ -16223,35 +16170,35 @@ msgstr ""
 "you proceed. If you want Evolution to restart automatically restart after "
 "restore, please enable the toggle button."
 
-#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatic Contacts"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:646
+#: ../plugins/bbdb/bbdb.c:710
 msgid "Create _address book entries when sending mails"
 msgstr "Create _address book entries when sending mails"
 
-#: ../plugins/bbdb/bbdb.c:652
+#: ../plugins/bbdb/bbdb.c:716
 msgid "Select Address book for Automatic Contacts"
 msgstr "Select Address book for Automatic Contacts"
 
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:731
 msgid "Instant Messaging Contacts"
 msgstr "Instant Messaging Contacts"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:682
+#: ../plugins/bbdb/bbdb.c:746
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "Synchronise contact info and images from Pidgin buddy list"
 
-#: ../plugins/bbdb/bbdb.c:688
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Select Address book for Pidgin buddy list"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:763
 msgid "Synchronize with _buddy list now"
 msgstr "Synchronise with _buddy list now"
 
@@ -16273,28 +16220,33 @@ msgstr ""
 "reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 
-#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
+msgid "Bogofilter is not available. Please install it first."
+msgstr "Bogofilter is not available. Please install it first."
+
+#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Error occurred while spawning %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter child process does not respond, killingâ?¦"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Wait for Bogofilter child process interrupted, terminatingâ?¦"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Pipe to Bogofilter failed, error code: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
 msgid "Convert message text to _Unicode"
 msgstr "Convert message text to _Unicode"
 
@@ -16322,39 +16274,130 @@ msgstr "Bogofilter Options"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Filter junk messages using Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:64
+#: ../plugins/caldav/caldav-browse-server.c:198
+msgid "Authentication failed. Server requires correct login."
+msgstr "Authentication failed. Server requires correct login."
+
+#: ../plugins/caldav/caldav-browse-server.c:200
+msgid "Given URL cannot be found."
+msgstr "Given URL cannot be found."
+
+#: ../plugins/caldav/caldav-browse-server.c:204
+#, c-format
+msgid ""
+"Server returned unexpected data.\n"
+"%d - %s"
+msgstr ""
+"Server returned unexpected data.\n"
+"%d - %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
+msgid "Unknown error"
+msgstr "Unknown error"
+
+#: ../plugins/caldav/caldav-browse-server.c:334
+#: ../plugins/caldav/caldav-browse-server.c:585
+msgid "Failed to parse server response."
+msgstr "Failed to parse server response."
+
+#: ../plugins/caldav/caldav-browse-server.c:428
+msgid "Events"
+msgstr "Events"
+
+#: ../plugins/caldav/caldav-browse-server.c:450
+msgid "User's calendars"
+msgstr "User's calendars"
+
+#: ../plugins/caldav/caldav-browse-server.c:558
+#: ../plugins/caldav/caldav-browse-server.c:629
+msgid "Failed to get server URL."
+msgstr "Failed to get server URL."
+
+#: ../plugins/caldav/caldav-browse-server.c:627
+#: ../plugins/caldav/caldav-browse-server.c:668
+#: ../plugins/caldav/caldav-browse-server.c:1272
+msgid "Searching for user's calendars..."
+msgstr "Searching for user's calendarsâ?¦"
+
+#: ../plugins/caldav/caldav-browse-server.c:666
+msgid "Could not find any user calendar."
+msgstr "Could not find any user calendar."
+
+#: ../plugins/caldav/caldav-browse-server.c:794
+#, c-format
+msgid "Previous attempt failed: %s"
+msgstr "Previous attempt failed: %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:796
+#, c-format
+msgid "Previous attempt failed with code %d"
+msgstr "Previous attempt failed with code %d"
+
+#: ../plugins/caldav/caldav-browse-server.c:799
+#, c-format
+msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgstr "Enter password for user <b>%s</b> on server <b>%s</b>"
+
+#: ../plugins/caldav/caldav-browse-server.c:856
+#, c-format
+msgid "Cannot create soup message for URL '%s'"
+msgstr "Cannot create soup message for URL '%s'"
+
+#. fetch content
+#: ../plugins/caldav/caldav-browse-server.c:1091
+msgid "Searching folder content..."
+msgstr "Searching folder content..."
+
+#: ../plugins/caldav/caldav-browse-server.c:1134
+msgid "List of available calendars:"
+msgstr "List of available calendars:"
+
+#: ../plugins/caldav/caldav-browse-server.c:1171
+msgid "Supports"
+msgstr "Supports"
+
+#: ../plugins/caldav/caldav-browse-server.c:1249
+#, c-format
+msgid "Failed to create thread: %s"
+msgstr "Failed to create thread: %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:1357
+#, c-format
+msgid "Server URL '%s' is not a valid URL"
+msgstr "Server URL '%s' is not a valid URL"
+
+#: ../plugins/caldav/caldav-browse-server.c:1363
+msgid "Browse for a CalDAV calendar"
+msgstr "Browse for a CalDAV calendar"
+
+#: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:366
-#: ../plugins/calendar-http/calendar-http.c:171
+#: ../plugins/caldav/caldav-source.c:215
+#: ../plugins/calendar-http/calendar-http.c:92
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:390
-#: ../plugins/google-account-setup/google-contacts-source.c:303
+#: ../plugins/caldav/caldav-source.c:219
+#: ../plugins/google-account-setup/google-contacts-source.c:305
 msgid "Use _SSL"
 msgstr "Use _SSL"
 
-#. add refresh option
-#: ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-file/calendar-file.c:274
-#: ../plugins/calendar-http/calendar-http.c:308
-#: ../plugins/calendar-weather/calendar-weather.c:499
-#: ../plugins/google-account-setup/google-contacts-source.c:322
-#: ../plugins/google-account-setup/google-source.c:717
+#: ../plugins/caldav/caldav-source.c:228
+msgid "Brows_e server for a calendar"
+msgstr "Brows_e server for a calendar"
+
+#: ../plugins/caldav/caldav-source.c:237
+#: ../plugins/calendar-file/calendar-file.c:178
+#: ../plugins/calendar-http/calendar-http.c:111
+#: ../plugins/calendar-weather/calendar-weather.c:393
+#: ../plugins/google-account-setup/google-contacts-source.c:323
+#: ../plugins/google-account-setup/google-source.c:627
 msgid "Re_fresh:"
 msgstr "Re_fresh:"
 
-#: ../plugins/caldav/caldav-source.c:451
-#: ../plugins/calendar-file/calendar-file.c:296
-#: ../plugins/calendar-http/calendar-http.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:517
-#: ../plugins/google-account-setup/google-contacts-source.c:333
-#: ../plugins/google-account-setup/google-source.c:742
-msgid "weeks"
-msgstr "weeks"
-
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "Add CalDAV support to Evolution."
 msgstr "Add CalDAV support to Evolution."
@@ -16363,31 +16406,31 @@ msgstr "Add CalDAV support to Evolution."
 msgid "CalDAV Support"
 msgstr "CalDAV Support"
 
-#: ../plugins/calendar-file/calendar-file.c:208
+#: ../plugins/calendar-file/calendar-file.c:112
 msgid "_Customize options"
 msgstr "_Customise options"
 
-#: ../plugins/calendar-file/calendar-file.c:227
+#: ../plugins/calendar-file/calendar-file.c:131
 msgid "File _name:"
 msgstr "File _name:"
 
-#: ../plugins/calendar-file/calendar-file.c:231
+#: ../plugins/calendar-file/calendar-file.c:135
 msgid "Choose calendar file"
 msgstr "Choose calendar file"
 
-#: ../plugins/calendar-file/calendar-file.c:279
+#: ../plugins/calendar-file/calendar-file.c:183
 msgid "On open"
 msgstr "On open"
 
-#: ../plugins/calendar-file/calendar-file.c:280
+#: ../plugins/calendar-file/calendar-file.c:184
 msgid "On file change"
 msgstr "On file change"
 
-#: ../plugins/calendar-file/calendar-file.c:281
+#: ../plugins/calendar-file/calendar-file.c:185
 msgid "Periodically"
 msgstr "Periodically"
 
-#: ../plugins/calendar-file/calendar-file.c:308
+#: ../plugins/calendar-file/calendar-file.c:200
 msgid "Force read _only"
 msgstr "Force read _only"
 
@@ -16399,11 +16442,11 @@ msgstr "Add local calendars to Evolution."
 msgid "Local Calendars"
 msgstr "Local Calendars"
 
-#: ../plugins/calendar-http/calendar-http.c:369
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_Secure connection"
 msgstr "_Secure connection"
 
-#: ../plugins/calendar-http/calendar-http.c:455
+#: ../plugins/calendar-http/calendar-http.c:186
 msgid "Userna_me:"
 msgstr "Userna_me:"
 
@@ -16455,15 +16498,22 @@ msgstr "Weather: Thunderstorms"
 msgid "Select a location"
 msgstr "Select a location"
 
-#: ../plugins/calendar-weather/calendar-weather.c:597
+#. Translators: "None" location for a weather calendar
+#: ../plugins/calendar-weather/calendar-weather.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:371
+msgctxt "weather-cal-location"
+msgid "None"
+msgstr "None"
+
+#: ../plugins/calendar-weather/calendar-weather.c:446
 msgid "_Units:"
 msgstr "_Units:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:604
+#: ../plugins/calendar-weather/calendar-weather.c:453
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metric (Celsius, cm, etc)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:605
+#: ../plugins/calendar-weather/calendar-weather.c:454
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheit, inches, etc)"
 
@@ -16475,6 +16525,23 @@ msgstr "Add weather calendars to Evolution."
 msgid "Weather Calendars"
 msgstr "Weather Calendars"
 
+#: ../plugins/contacts-map/contacts-map.c:55
+#: ../plugins/contacts-map/contacts-map.c:201
+msgid "Contacts map"
+msgstr "Contacts map"
+
+#: ../plugins/contacts-map/contacts-map.c:56
+msgid "Show a map of all the contacts"
+msgstr "Show a map of all the contacts"
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
+msgid "Add a map showing the location of contacts when possible."
+msgstr "Add a map showing the location of contacts when possible."
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
+msgid "Map for contacts"
+msgstr "Map for contacts"
+
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "Check whether Evolution is the default mailer"
@@ -16497,19 +16564,23 @@ msgstr "Default Mail Client"
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "Do you want to make Evolution your default e-mail client?"
 
-#: ../plugins/default-source/default-source.c:80
+#: ../plugins/default-source/default-source.c:75
 msgid "Mark as _default address book"
 msgstr "Mark as _default address book"
 
-#: ../plugins/default-source/default-source.c:101
+#: ../plugins/default-source/default-source.c:88
+msgid "A_utocomplete with this address book"
+msgstr "A_utocomplete with this address book"
+
+#: ../plugins/default-source/default-source.c:97
 msgid "Mark as _default calendar"
 msgstr "Mark as _default calendar"
 
-#: ../plugins/default-source/default-source.c:102
+#: ../plugins/default-source/default-source.c:98
 msgid "Mark as _default task list"
 msgstr "Mark as _default task list"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:99
 msgid "Mark as _default memo list"
 msgstr "Mark as _default memo list"
 
@@ -16535,41 +16606,40 @@ msgstr ""
 "message. The format for specifying a Header and Header value is: Name of the "
 "custom header followed by \"=\" and the values separated by \";\""
 
-#: ../plugins/email-custom-header/email-custom-header.c:332
+#: ../plugins/email-custom-header/email-custom-header.c:316
 msgid "Security:"
 msgstr "Security:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:337
+#: ../plugins/email-custom-header/email-custom-header.c:321
 msgid "Unclassified"
 msgstr "Unclassified"
 
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgid "Protected"
 msgstr "Protected"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "Secret"
 msgstr "Secret"
 
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:325
 msgid "Top secret"
 msgstr "Top secret"
 
-#: ../plugins/email-custom-header/email-custom-header.c:583
+#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
+#. indicating the header will not be added to a mail message
+#: ../plugins/email-custom-header/email-custom-header.c:379
+msgctxt "email-custom-header"
+msgid "None"
+msgstr "None"
+
+#: ../plugins/email-custom-header/email-custom-header.c:569
 msgid "_Custom Header"
 msgstr "_Custom Header"
 
-#: ../plugins/email-custom-header/email-custom-header.c:905
-msgid "Key"
-msgstr "Key"
-
-#: ../plugins/email-custom-header/email-custom-header.c:916
-#: ../plugins/templates/templates.c:384
-msgid "Values"
-msgstr "Values"
-
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.glade.h:2
+#: ../plugins/email-custom-header/email-custom-header.c:894
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16577,6 +16647,15 @@ msgstr ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
 
+#: ../plugins/email-custom-header/email-custom-header.c:948
+msgid "Key"
+msgstr "Key"
+
+#: ../plugins/email-custom-header/email-custom-header.c:959
+#: ../plugins/templates/templates.c:419
+msgid "Values"
+msgstr "Values"
+
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
 msgid "Add custom headers to outgoing mail messages."
@@ -16586,959 +16665,10 @@ msgstr "Add custom headers to outgoing mail messages."
 msgid "Custom Header"
 msgstr "Custom Header"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
 msgid "Email Custom Header"
 msgstr "E-mail Custom Header"
 
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Open Other User's Folder"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Account:"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Folder Name:"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
-msgid "_User:"
-msgstr "_User:"
-
-#. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
-msgid "Secure Password"
-msgstr "Secure Password"
-
-#. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
-msgstr ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
-msgid "Plaintext Password"
-msgstr "Plaintext Password"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
-msgstr ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-msgid "Out Of Office"
-msgstr "Out Of Office"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
-msgid ""
-"The message specified below will be automatically sent to \n"
-"each person who sends mail to you while you are out of the office."
-msgstr ""
-"The message specified below will be automatically sent to \n"
-"each person who sends mail to you while you are out of the office."
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:290
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
-msgid "I am out of the office"
-msgstr "I am out of the office"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:294
-msgid "I am in the office"
-msgstr "I am in the office"
-
-#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:340
-msgid "Change the password for Exchange account"
-msgstr "Change the password for Exchange account"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:342
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-msgid "Change Password"
-msgstr "Change Password"
-
-#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
-msgid "Manage the delegate settings for Exchange account"
-msgstr "Manage the delegate settings for Exchange account"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
-msgid "Delegation Assistant"
-msgstr "Delegation Assistant"
-
-#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:361
-msgid "Miscelleneous"
-msgstr "Miscelleneous"
-
-#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:371
-msgid "View the size of all Exchange folders"
-msgstr "View the size of all Exchange folders"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:373
-msgid "Folders Size"
-msgstr "Folders Size"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:380
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
-msgid "Exchange Settings"
-msgstr "Exchange Settings"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:726
-msgid "_OWA URL:"
-msgstr "_OWA URL:"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:752
-msgid "A_uthenticate"
-msgstr "A_uthenticate"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:774
-msgid "Mailbox name is _different than user name"
-msgstr "Mailbox name is _different than user name"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:787
-msgid "_Mailbox:"
-msgstr "_Mailbox:"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1001
-msgid "_Authentication Type"
-msgstr "_Authentication Type"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1130
-#: ../plugins/exchange-operations/exchange-contacts.c:217
-#, c-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1132
-#: ../plugins/exchange-operations/exchange-contacts.c:219
-#, c-format
-msgid "0 KB"
-msgstr "0 KB"
-
-#. FIXME: Take care of i18n
-#: ../plugins/exchange-operations/exchange-account-setup.c:1137
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "Size:"
-
-#: ../plugins/exchange-operations/exchange-calendar.c:196
-#: ../plugins/exchange-operations/exchange-contacts.c:170
-msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-
-#. User entered a wrong existing
-#. * password. Prompt him again.
-#.
-#: ../plugins/exchange-operations/exchange-change-password.c:114
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
-msgstr ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
-
-#: ../plugins/exchange-operations/exchange-change-password.c:121
-msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr "The two passwords do not match. Please re-enter the passwords."
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
-msgid "Confirm Password:"
-msgstr "Confirm Password:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
-msgid "Current Password:"
-msgstr "Current Password:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
-msgid "New Password:"
-msgstr "New Password:"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
-msgid "Your current password has expired. Please change your password now."
-msgstr "Your current password has expired. Please change your password now."
-
-#: ../plugins/exchange-operations/exchange-config-listener.c:657
-#, c-format
-msgid "Your password will expire in the next %d days"
-msgstr "Your password will expire in the next %d days"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:142
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
-msgid "Custom"
-msgstr "Custom"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:168
-msgid "Editor (read, create, edit)"
-msgstr "Editor (read, create, edit)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:172
-msgid "Author (read, create)"
-msgstr "Author (read, create)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:176
-msgid "Reviewer (read-only)"
-msgstr "Reviewer (read-only)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:225
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
-msgid "Delegate Permissions"
-msgstr "Delegate Permissions"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:236
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
-#, c-format
-msgid "Permissions for %s"
-msgstr "Permissions for %s"
-
-#. To translators: This is a part of the message to be sent to the delegatee
-#. summarizing the permissions assigned to him.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:326
-msgid ""
-"This message was sent automatically by Evolution to inform you that you have "
-"been designated as a delegate. You can now send messages on my behalf."
-msgstr ""
-"This message was sent automatically by Evolution to inform you that you have "
-"been designated as a delegate. You can now send messages on my behalf."
-
-#. To translators: Another chunk of the same message.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:331
-msgid "You have been given the following permissions on my folders:"
-msgstr "You have been given the following permissions on my folders:"
-
-#. To translators: This message is included if the delegatee has been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:351
-msgid "You are also permitted to see my private items."
-msgstr "You are also permitted to see my private items."
-
-#. To translators: This message is included if the delegatee has not been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:358
-msgid "However you are not permitted to see my private items."
-msgstr "However you are not permitted to see my private items."
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:390
-#, c-format
-msgid "You have been designated as a delegate for %s"
-msgstr "You have been designated as a delegate for %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:416
-msgid "Delegate To"
-msgstr "Delegate To"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:581
-#, c-format
-msgid "Remove the delegate %s?"
-msgstr "Remove the delegate %s?"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:698
-msgid "Could not access Active Directory"
-msgstr "Could not access Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:710
-msgid "Could not find self in Active Directory"
-msgstr "Could not find self in Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:723
-#, c-format
-msgid "Could not find delegate %s in Active Directory"
-msgstr "Could not find delegate %s in Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:735
-#, c-format
-msgid "Could not remove delegate %s"
-msgstr "Could not remove delegate %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:795
-msgid "Could not update list of delegates."
-msgstr "Could not update list of delegates."
-
-#: ../plugins/exchange-operations/exchange-delegates.c:813
-#, c-format
-msgid "Could not add delegate %s"
-msgstr "Could not add delegate %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:980
-msgid "Error reading delegates list."
-msgstr "Error reading delegates list."
-
-#. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
-msgid "C_alendar:"
-msgstr "C_alendar:"
-
-#. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-msgid "Co_ntacts:"
-msgstr "Co_ntacts:"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-msgid "Delegates"
-msgstr "Delegates"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-msgid ""
-"None\n"
-"Reviewer (read-only)\n"
-"Author (read, create)\n"
-"Editor (read, create, edit)"
-msgstr ""
-"None\n"
-"Reviewer (read-only)\n"
-"Author (read, create)\n"
-"Editor (read, create, edit)"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Permissions for"
-msgstr "Permissions for"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
-msgid ""
-"These users will be able to send mail on your behalf\n"
-"and access your folders with the permissions you give them."
-msgstr ""
-"These users will be able to send mail on your behalf\n"
-"and access your folders with the permissions you give them."
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
-msgid "_Delegate can see private items"
-msgstr "_Delegate can see private items"
-
-#. Translators: This is used for permissions for <user> for the folder Inbox.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
-msgid "_Inbox:"
-msgstr "_Inbox:"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
-msgid "_Summarize permissions"
-msgstr "_Summarise permissions"
-
-#. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks:"
-msgstr "_Tasks:"
-
-#: ../plugins/exchange-operations/exchange-folder-permission.c:62
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
-msgid "Permissions..."
-msgstr "Permissionsâ?¦"
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
-msgid "Folder Name"
-msgstr "Folder Name"
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
-msgid "Folder Size"
-msgstr "Folder Size"
-
-#. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
-msgid "User"
-msgstr "User"
-
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr "Subscribe to Other User's Folder"
-
-#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
-msgid "Exchange Folder Tree"
-msgstr "Exchange Folder Tree"
-
-#: ../plugins/exchange-operations/exchange-folder.c:65
-#: ../plugins/exchange-operations/exchange-folder.c:233
-#: ../plugins/exchange-operations/exchange-folder.c:243
-msgid "Unsubscribe Folder..."
-msgstr "Unsubscribe Folderâ?¦"
-
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:518
-#, c-format
-msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "Really unsubscribe from folder \"%s\"?"
-
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:530
-#, c-format
-msgid "Unsubscribe from \"%s\""
-msgstr "Unsubscribe from \"%s\""
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>Out of Office Message:</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>Status:</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "I am currently in the office"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "I am currently out of the office"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "No, Don't Change Status"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "Out of Office Assistant"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "Yes, Change Status"
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
-msgid "Password Expiry Warning..."
-msgstr "Password Expiry Warningâ?¦"
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
-msgid "Your password will expire in 7 days..."
-msgstr "Your password will expire in 7 daysâ?¦"
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
-msgid "_Change Password"
-msgstr "_Change Password"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
-msgid "(Permission denied.)"
-msgstr "(Permission denied.)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
-msgid "Add User:"
-msgstr "Add User:"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
-#: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:932
-#: ../plugins/groupwise-features/share-folder.c:713
-msgid "Add User"
-msgstr "Add User"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-msgid "<b>Permissions</b>"
-msgstr "<b>Permissions</b>"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-msgid "Cannot Delete"
-msgstr "Cannot Delete"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-msgid "Cannot Edit"
-msgstr "Cannot Edit"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-msgid "Create items"
-msgstr "Create items"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
-msgid "Create subfolders"
-msgstr "Create subfolders"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
-msgid "Delete Any Items"
-msgstr "Delete Any Items"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
-msgid "Delete Own Items"
-msgstr "Delete Own Items"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
-msgid "Edit Any Items"
-msgstr "Edit Any Items"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
-msgid "Edit Own Items"
-msgstr "Edit Own Items"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
-msgid "Folder contact"
-msgstr "Folder contact"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
-msgid "Folder owner"
-msgstr "Folder owner"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
-msgid "Folder visible"
-msgstr "Folder visible"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
-msgid "Read items"
-msgstr "Read items"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
-msgid "Role: "
-msgstr "Role: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
-msgid "<b>Message Settings</b>"
-msgstr "<b>Message Settings</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
-msgid "<b>Tracking Options</b>"
-msgstr "<b>Tracking Options</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
-msgid "Exchange - Send Options"
-msgstr "Exchange â?? Send Options"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
-msgid "I_mportance: "
-msgstr "I_mportance: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
-msgid ""
-"Normal\n"
-"High\n"
-"Low"
-msgstr ""
-"Normal\n"
-"High\n"
-"Low"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
-msgid ""
-"Normal\n"
-"Personal\n"
-"Private\n"
-"Confidential"
-msgstr ""
-"Normal\n"
-"Personal\n"
-"Private\n"
-"Confidential"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
-msgid "Request a _delivery receipt for this message"
-msgstr "Request a _delivery receipt for this message"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
-msgid "Request a _read receipt for this message"
-msgstr "Request a _read receipt for this message"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
-msgid "Send as Delegate"
-msgstr "Send as Delegate"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
-msgid "_Sensitivity: "
-msgstr "_Sensitivity: "
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
-msgid "_User"
-msgstr "_User"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:131
-msgid "Select User"
-msgstr "Select User"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:169
-msgid "Address Book..."
-msgstr "Address Bookâ?¦"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
-msgid "Subscribe to Other User's Contacts"
-msgstr "Subscribe to Other User's Contacts"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
-msgid "Subscribe to Other User's Calendar"
-msgstr "Subscribe to Other User's Calendar"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid "Activates the Evolution-Exchange extension package."
-msgstr "Activates the Evolution-Exchange extension package."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
-msgid "Exchange Operations"
-msgstr "Exchange Operations"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
-msgid "Cannot access the \"Exchange settings\" tab in offline mode."
-msgstr "Cannot access the \"Exchange settings\" tab in offline mode."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
-msgid "Cannot change password due to configuration problems."
-msgstr "Cannot change password due to configuration problems."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot display folders."
-msgstr "Cannot display folders."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-msgid "Cannot perform the operation."
-msgstr "Cannot perform the operation."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
-msgstr ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
-msgid "Could not authenticate to server."
-msgstr "Could not authenticate to server."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
-msgid "Could not change password."
-msgstr "Could not change password."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
-msgid ""
-"Could not configure Exchange account because \n"
-"an unknown error occurred. Check the URL, \n"
-"username, and password, and try again."
-msgstr ""
-"Could not configure Exchange account because \n"
-"an unknown error occurred. Check the URL, \n"
-"username, and password, and try again."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
-msgid "Could not connect to Exchange server."
-msgstr "Could not connect to Exchange server."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
-msgid "Could not connect to server {0}."
-msgstr "Could not connect to server {0}."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
-msgid "Could not determine folder permissions for delegates."
-msgstr "Could not determine folder permissions for delegates."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
-msgid "Could not find Exchange Web Storage System."
-msgstr "Could not find Exchange Web Storage System."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
-msgid "Could not locate server {0}."
-msgstr "Could not locate server {0}."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
-msgid "Could not make {0} a delegate"
-msgstr "Could not make {0} a delegate"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
-msgid "Could not read folder permissions"
-msgstr "Could not read folder permissions"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
-msgid "Could not read folder permissions."
-msgstr "Could not read folder permissions."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
-msgid "Could not read out-of-office state"
-msgstr "Could not read out-of-office state"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Could not update folder permissions."
-msgstr "Could not update folder permissions."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-msgid "Could not update out-of-office state"
-msgstr "Could not update out-of-office state"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
-msgid "Evolution requires a restart to load the subscribed user's mailbox"
-msgstr "Evolution requires a restart to load the subscribed user's mailbox"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
-msgid "Exchange Account is offline."
-msgstr "Exchange Account is offline."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
-msgid ""
-"Exchange Connector requires access to certain\n"
-"functionality on the Exchange Server that appears\n"
-"to be disabled or blocked. (This is usually \n"
-"unintentional.) Your Exchange Administrator will \n"
-"need to enable this functionality in order for \n"
-"you to be able to use Evolution Exchange Connector.\n"
-"\n"
-"For information to provide to your Exchange \n"
-"administrator, please follow the link below:\n"
-"\n"
-"{0}\n"
-"  "
-msgstr ""
-"Exchange Connector requires access to certain\n"
-"functionality on the Exchange Server that appears\n"
-"to be disabled or blocked. (This is usually \n"
-"unintentional.) Your Exchange Administrator will \n"
-"need to enable this functionality in order for \n"
-"you to be able to use Evolution Exchange Connector.\n"
-"\n"
-"For information to provide to your Exchange \n"
-"administrator, please follow the link below:\n"
-"\n"
-"{0}\n"
-"  "
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
-msgid "Failed to update delegates:"
-msgstr "Failed to update delegates:"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-msgid "Folder already exists"
-msgstr "Folder already exists"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-msgid "Folder does not exist"
-msgstr "Folder does not exist"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-msgid "Folder offline"
-msgstr "Folder offline"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-msgid "Generic error"
-msgstr "Generic error"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
-msgid "Global Catalog Server is not reachable"
-msgstr "Global Catalogue Server is not reachable"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
-msgid ""
-"If OWA is running on a different path, you must specify that in the account "
-"configuration dialog."
-msgstr ""
-"If OWA is running on a different path, you must specify that in the account "
-"configuration dialogue."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
-msgid "Mailbox for {0} is not on this server."
-msgstr "Mailbox for {0} is not on this server."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
-msgid "Make sure the URL is correct and try again."
-msgstr "Make sure the URL is correct and try again."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
-msgid "Make sure the server name is spelled correctly and try again."
-msgstr "Make sure the server name is spelt correctly and try again."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
-msgid "Make sure the username and password are correct and try again."
-msgstr "Make sure the username and password are correct and try again."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
-msgid "No Global Catalog server configured for this account."
-msgstr "No Global Catalogue server configured for this account."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "No mailbox for user {0} on {1}."
-msgstr "No mailbox for user {0} on {1}."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "No such user {0}"
-msgstr "No such user {0}"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Password successfully changed."
-msgstr "Password successfully changed."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
-msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
-msgstr ""
-"Please enter a Delegate's ID or deselect the Send as a Delegate option."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
-msgid "Please make sure the Global Catalog Server name is correct."
-msgstr "Please make sure the name of the Global Catalogue Server is correct."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
-msgid "Please restart Evolution for changes to take effect"
-msgstr "Please restart Evolution for changes to take effect"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
-msgid "Please select a user."
-msgstr "Please select a user."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
-msgid "Server rejected password because it is too weak."
-msgstr "Server rejected password because it is too weak."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
-msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr "The Exchange account will be disabled when you quit Evolution"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
-msgid "The Exchange account will be removed when you quit Evolution"
-msgstr "The Exchange account will be removed when you quit Evolution"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
-msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr "The Exchange server is not compatible with Exchange Connector."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
-msgid ""
-"The server is running Exchange 5.5. Exchange Connector \n"
-"supports Microsoft Exchange 2000 and 2003 only."
-msgstr ""
-"The server is running Exchange 5.5. Exchange Connector \n"
-"supports Microsoft Exchange 2000 and 2003 only."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
-msgid ""
-"This probably means that your server requires \n"
-"you to specify the Windows domain name \n"
-"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
-"\n"
-"Or you might have just typed your password wrong."
-msgstr ""
-"This probably means that your server requires \n"
-"you to specify the Windows domain name \n"
-"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
-"\n"
-"Or you might have just typed your password wrong."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
-msgid "Try again with a different password."
-msgstr "Try again with a different password."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "Unable to add user to access control list:"
-msgstr "Unable to add user to access control list:"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
-msgid "Unable to edit delegates."
-msgstr "Unable to edit delegates."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-msgid "Unknown error looking up {0}"
-msgstr "Unknown error looking up {0}"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:623
-#: ../plugins/mail-to-task/mail-to-task.c:623
-#: ../plugins/mail-to-task/mail-to-task.c:843
-msgid "Unknown error."
-msgstr "Unknown error."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-msgid "Unknown type"
-msgstr "Unknown type"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-msgid "Unsupported operation"
-msgstr "Unsupported operation"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-msgid "You are nearing your quota available for storing mail on this server."
-msgstr "You are nearing your quota available for storing mail on this server."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
-msgid ""
-"You are permitted to send a message on behalf of only one delegator at a "
-"time."
-msgstr ""
-"You are permitted to send a message on behalf of only one delegator at a "
-"time."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
-msgid "You cannot make yourself your own delegate"
-msgstr "You cannot make yourself your own delegate"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
-msgid "You have exceeded your quota for storing mail on this server."
-msgstr "You have exceeded your quota for storing mail on this server."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
-msgid "You may only configure a single Exchange account."
-msgstr "You may only configure a single Exchange account."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-msgid ""
-"Your current usage is: {0} KB. Try to clear up some space by deleting some "
-"mail."
-msgstr ""
-"Your current usage is: {0} KB. Try to clear up some space by deleting some "
-"mail."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
-msgid ""
-"Your current usage is: {0} KB. You will not be able to either send or "
-"receive mail now."
-msgstr ""
-"Your current usage is: {0} KB. You will not be able to either send or "
-"receive mail now."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
-msgid ""
-"Your current usage is: {0} KB. You will not be able to send mail until you "
-"clear up some space by deleting some mail."
-msgstr ""
-"Your current usage is: {0} KB. You will not be able to send mail until you "
-"clear up some space by deleting some mail."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
-msgid "Your password has expired."
-msgstr "Your password has expired."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
-msgid "{0} cannot be added to an access control list"
-msgstr "{0} cannot be added to an access control list"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
-msgid "{0} is already a delegate"
-msgstr "{0} is already a delegate"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
-msgid "{0} is already in the list"
-msgstr "{0} is already in the list"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
-msgid "Subscribe to Other User's Tasks"
-msgstr "Subscribe to Other User's Tasks"
-
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
-msgid "Check folder permissions"
-msgstr "Check folder permissions"
-
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "Automatically launch editor when key is pressed in the mail composer"
@@ -17568,8 +16698,8 @@ msgstr ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:353
-#: ../plugins/external-editor/external-editor.c:355
+#: ../plugins/external-editor/external-editor.c:375
+#: ../plugins/external-editor/external-editor.c:377
 msgid "Compose in External Editor"
 msgstr "Compose in External Editor"
 
@@ -17617,48 +16747,83 @@ msgstr ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 
-#: ../plugins/face/face.c:58
-msgid "Select a (48*48) png of size < 700bytes"
-msgstr "Select a (48*48) png of size < 700bytes"
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+msgstr "Insert Face picture by default"
+
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
+msgid ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+msgstr ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+
+#: ../plugins/face/face.c:286
+msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
+msgstr "Select a png picture (the best 48*48 of size < 720 bytes)"
+
+#: ../plugins/face/face.c:296
+msgid "Image files"
+msgstr "Image files"
+
+#: ../plugins/face/face.c:355
+msgid "_Insert Face picture by default"
+msgstr "_Insert Face picture by default"
 
-#: ../plugins/face/face.c:68
-msgid "PNG files"
-msgstr "PNG files"
+#: ../plugins/face/face.c:366
+msgid "Load new _Face picture"
+msgstr "Load new _Face picture"
 
-#: ../plugins/face/face.c:125
-msgid "_Face"
-msgstr "_Face"
+#: ../plugins/face/face.c:415
+msgid "Include _Face"
+msgstr "Include _Face"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid ""
-"Attach a small picture of your face to outgoing messages.\n"
-"\n"
-"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
-"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
-"sent messages."
+msgid "Attach a small picture of your face to outgoing messages."
+msgstr "Attach a small picture of your face to outgoing messages."
+
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+msgid "Failed Read"
+msgstr "Failed Read"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+msgid "Invalid Image Size"
+msgstr "Invalid Image Size"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+msgid "Not an image"
+msgstr "Not an image"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+msgid "Please select an image of size 48 * 48"
+msgstr "Please select an image of size 48 * 48"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+msgid "The file cannot be read"
+msgstr "The file cannot be read"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr ""
-"Attach a small picture of your face to outgoing messages.\n"
-"\n"
-"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
-"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
-"sent messages."
+"The file you selected does not look like a valid .png image. Error: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:51
-#: ../plugins/google-account-setup/google-source.c:81
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:82
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:270
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
+#: ../plugins/google-account-setup/google-contacts-source.c:273
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
 msgid "<b>Server</b>"
 msgstr "<b>Server</b>"
 
-#: ../plugins/google-account-setup/google-source.c:517
+#: ../plugins/google-account-setup/google-source.c:439
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "Enter password for user %s to access list of subscribed calendars."
 
-#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/google-account-setup/google-source.c:545
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17667,11 +16832,17 @@ msgstr ""
 "Cannot read data from Google server.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:758
+#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:941
+msgid "Unknown error."
+msgstr "Unknown error."
+
+#: ../plugins/google-account-setup/google-source.c:631
 msgid "Cal_endar:"
 msgstr "Cal_endar:"
 
-#: ../plugins/google-account-setup/google-source.c:793
+#: ../plugins/google-account-setup/google-source.c:666
 msgid "Retrieve _list"
 msgstr "Retrieve _list"
 
@@ -17683,25 +16854,45 @@ msgstr "Add Google Calendars to Evolution."
 msgid "Google Calendars"
 msgstr "Google Calendars"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
 msgid "Checklist"
 msgstr "Checklist"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "Add Novell GroupWise support to Evolution."
-msgstr "Add Novell GroupWise support to Evolution."
+#: ../plugins/groupwise-features/gw-ui.c:112
+msgid "New _Shared Folder..."
+msgstr "New _Shared Folderâ?¦"
+
+#: ../plugins/groupwise-features/gw-ui.c:119
+msgid "_Proxy Login..."
+msgstr "_Proxy Loginâ?¦"
+
+#: ../plugins/groupwise-features/gw-ui.c:170
+msgid "Junk Mail Settings..."
+msgstr "Junk Mail Settingsâ?¦"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "GroupWise Account Setup"
-msgstr "GroupWise Account Setup"
+#: ../plugins/groupwise-features/gw-ui.c:177
+msgid "Track Message Status..."
+msgstr "Track Message Statusâ?¦"
 
-#: ../plugins/groupwise-features/install-shared.c:167
-#: ../plugins/groupwise-features/share-folder-common.c:386
+#: ../plugins/groupwise-features/gw-ui.c:183
+msgid "Retract Mail"
+msgstr "Retract Mail"
+
+#: ../plugins/groupwise-features/gw-ui.c:338
+msgid "Accept Tentatively"
+msgstr "Accept Tentatively"
+
+#: ../plugins/groupwise-features/gw-ui.c:352
+msgid "Rese_nd Meeting..."
+msgstr "Rese_nd Meetingâ?¦"
+
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Create folder"
 msgstr "Create folder"
 
-#: ../plugins/groupwise-features/install-shared.c:218
-#, fuzzy, c-format
+#: ../plugins/groupwise-features/install-shared.c:225
+#, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
 "\n"
@@ -17722,75 +16913,72 @@ msgstr ""
 "%s\n"
 "\n"
 "\n"
-"Click 'Forward' to install the shared folder\n"
+"Click 'Apply' to install the shared folder\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:230
+#: ../plugins/groupwise-features/install-shared.c:237
 msgid "Install the shared folder"
 msgstr "Install the shared folder"
 
-#: ../plugins/groupwise-features/install-shared.c:234
+#: ../plugins/groupwise-features/install-shared.c:241
 msgid "Shared Folder Installation"
 msgstr "Shared Folder Installation"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:80
+#: ../plugins/groupwise-features/junk-mail-settings.c:81
 msgid "Junk Settings"
 msgstr "Junk Settings"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:93
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
+#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "Junk Mail Settings"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:117
-msgid "Junk Mail Settings..."
-msgstr "Junk Mail Settingsâ?¦"
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List:</b>"
-msgstr "<b>Junk List:</b>"
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:2
+#: ../plugins/groupwise-features/junk-settings.ui.h:1
 msgid "Email:"
 msgstr "E-mail:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:5
+#: ../plugins/groupwise-features/junk-settings.ui.h:2
+msgid "Junk List:"
+msgstr "Junk List:"
+
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
 msgid "_Disable"
 msgstr "_Disable"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:6
+#: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "_Enable"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:7
+#: ../plugins/groupwise-features/junk-settings.ui.h:7
 msgid "_Junk List"
 msgstr "_Junk List"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
+#: ../plugins/groupwise-features/junk-settings.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../widgets/table/e-table-config.ui.h:21
 msgid "_Remove"
 msgstr "_Remove"
 
-#: ../plugins/groupwise-features/mail-retract.c:52
+#: ../plugins/groupwise-features/mail-retract.c:81
 msgid "Message Retract"
 msgstr "Message Retract"
 
-#: ../plugins/groupwise-features/mail-retract.c:57
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this ?"
+"sure you want to do this?"
 msgstr ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this ?"
+"sure you want to do this?"
 
-#: ../plugins/groupwise-features/mail-retract.c:76
+#: ../plugins/groupwise-features/mail-retract.c:107
 msgid "Message retracted successfully"
 msgstr "Message retracted successfully"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
-msgid "Retract Mail"
-msgstr "Retract Mail"
+#: ../plugins/groupwise-features/mail-send-options.c:202
+msgid "Insert Send options"
+msgstr "Insert Send options"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
@@ -17863,16 +17051,16 @@ msgid "You have to specify a user name which you want to add to the list"
 msgstr "You have to specify a user name which you want to add to the list"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
-msgid "Do you want to resend the meeting ?"
-msgstr "Do you want to resend the meeting ?"
+msgid "Do you want to resend the meeting?"
+msgstr "Do you want to resend the meeting?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-msgid "Do you want to resend the recurring meeting ?"
-msgstr "Do you want to resend the recurring meeting ?"
+msgid "Do you want to resend the recurring meeting?"
+msgstr "Do you want to resend the recurring meeting?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-msgid "Do you want to retract the original item ?"
-msgstr "Do you want to retract the original item ?"
+msgid "Do you want to retract the original item?"
+msgstr "Do you want to retract the original item?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
 msgid "The original will be removed from the recipient's mailbox."
@@ -17904,225 +17092,191 @@ msgstr "Would you like to accept it?"
 msgid "Would you like to decline it?"
 msgstr "Would you like to decline it?"
 
-#: ../plugins/groupwise-features/process-meeting.c:53
-msgid "Accept Tentatively"
-msgstr "Accept Tentatively"
-
-#: ../plugins/groupwise-features/process-meeting.c:319
-msgid "Rese_nd Meeting..."
-msgstr "Rese_nd Meetingâ?¦"
-
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.ui.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>Users:</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "C_ustomise notification message"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Con_tacts..."
 msgstr "Con_tactsâ?¦"
 
-#: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:514
-msgid "Message"
-msgstr "Message"
-
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.ui.h:6
 msgid "Shared Folder Notification"
 msgstr "Shared Folder Notification"
 
-#: ../plugins/groupwise-features/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "The participants will receive the following notification.\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "_Not Shared"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.ui.h:14
 msgid "_Shared With..."
 msgstr "_Shared Withâ?¦"
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.ui.h:15
 msgid "_Sharing"
 msgstr "_Sharing"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
-msgid "<b>Name</b>"
-msgstr "<b>Name</b>"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "Access Rights"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
 msgid "Add/Edit"
 msgstr "Add/Edit"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
-msgid "Appointments"
-msgstr "Appointments"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
 msgid "Con_tacts"
 msgstr "Con_tacts"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
 msgid "Modify _folders/options/rules/"
 msgstr "Modify _folders/options/rules/"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
 msgid "Read items marked _private"
 msgstr "Read items marked _private"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
 msgid "Reminder Notes"
 msgstr "Reminder Notes"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
 msgid "Subscribe to my _alarms"
 msgstr "Subscribe to my _alarms"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
 msgid "Subscribe to my _notifications"
 msgstr "Subscribe to my _notifications"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
 msgid "_Write"
 msgstr "_Write"
 
-#. To Translators: strip the part in front of the | and the | itself
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
 msgid "permission to read|_Read"
 msgstr "_Read"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-listing.glade.h:2
+#: ../plugins/groupwise-features/proxy-listing.ui.h:1
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>Account Name</b>"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "Proxy Login"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:251
-#: ../plugins/groupwise-features/proxy.c:488
-#: ../plugins/groupwise-features/send-options.c:86
+#: ../plugins/groupwise-features/proxy-login.c:209
+#: ../plugins/groupwise-features/proxy-login.c:252
+#: ../plugins/groupwise-features/proxy.c:495
+#: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sEnter password for %s (user %s)"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
-#. * feature by which one person can send/read mails/appointments using another person's identity
-#. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:513
-msgid "_Proxy Login..."
-msgstr "_Proxy Loginâ?¦"
-
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:689
+#: ../plugins/groupwise-features/proxy.c:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "The Proxy tab will be available only when the account is online."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "The Proxy tab will be available only when the account is enabled."
 
-#: ../plugins/groupwise-features/send-options.c:214
+#: ../plugins/groupwise-features/proxy.c:931
+#: ../plugins/groupwise-features/share-folder.c:701
+msgid "Add User"
+msgstr "Add User"
+
+#: ../plugins/groupwise-features/send-options.c:213
 msgid "Advanced send options"
 msgstr "Advanced send options"
 
-#: ../plugins/groupwise-features/share-folder-common.c:320
-#: ../plugins/groupwise-features/share-folder.c:748
+#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "Users"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
+#: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Enter the users and set permissions"
 msgstr "Enter the users and set permissions"
 
-#: ../plugins/groupwise-features/share-folder-common.c:340
-msgid "New _Shared Folder..."
-msgstr "New _Shared Folderâ?¦"
-
-#: ../plugins/groupwise-features/share-folder-common.c:448
+#: ../plugins/groupwise-features/share-folder-common.c:415
 msgid "Sharing"
 msgstr "Sharing"
 
-#: ../plugins/groupwise-features/share-folder.c:531
+#: ../plugins/groupwise-features/share-folder.c:529
 msgid "Custom Notification"
 msgstr "Custom Notification"
 
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../plugins/groupwise-features/share-folder.c:741
 msgid "Add   "
 msgstr "Add   "
 
-#: ../plugins/groupwise-features/share-folder.c:759
+#: ../plugins/groupwise-features/share-folder.c:747
 msgid "Modify"
 msgstr "Modify"
 
-#: ../plugins/groupwise-features/status-track.c:94
+#: ../plugins/groupwise-features/status-track.c:126
 msgid "Message Status"
 msgstr "Message Status"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:108
+#: ../plugins/groupwise-features/status-track.c:140
 msgid "Subject:"
 msgstr "Subject:"
 
-#: ../plugins/groupwise-features/status-track.c:122
+#: ../plugins/groupwise-features/status-track.c:154
 msgid "From:"
 msgstr "From:"
 
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:169
 msgid "Creation date:"
 msgstr "Creation date:"
 
-#: ../plugins/groupwise-features/status-track.c:176
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Recipient: "
 msgstr "Recipient: "
 
-#: ../plugins/groupwise-features/status-track.c:183
+#: ../plugins/groupwise-features/status-track.c:216
 msgid "Delivered: "
 msgstr "Delivered: "
 
-#: ../plugins/groupwise-features/status-track.c:189
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Opened: "
 msgstr "Opened: "
 
-#: ../plugins/groupwise-features/status-track.c:194
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Accepted: "
 msgstr "Accepted: "
 
-#: ../plugins/groupwise-features/status-track.c:199
+#: ../plugins/groupwise-features/status-track.c:232
 msgid "Deleted: "
 msgstr "Deleted: "
 
-#: ../plugins/groupwise-features/status-track.c:204
+#: ../plugins/groupwise-features/status-track.c:237
 msgid "Declined: "
 msgstr "Declined: "
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:242
 msgid "Completed: "
 msgstr "Completed: "
 
-#: ../plugins/groupwise-features/status-track.c:214
+#: ../plugins/groupwise-features/status-track.c:247
 msgid "Undelivered: "
 msgstr "Undelivered: "
 
-#: ../plugins/groupwise-features/status-track.c:238
-msgid "Track Message Status..."
-msgstr "Track Message Statusâ?¦"
-
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "Add Hula support to Evolution."
 msgstr "Add Hula support to Evolution."
@@ -18131,27 +17285,29 @@ msgstr "Add Hula support to Evolution."
 msgid "Hula Support"
 msgstr "Hula Support"
 
-#: ../plugins/imap-features/imap-headers.c:331
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+msgid "Inline Image"
+msgstr "Inline Image"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+msgid "View image attachments directly in mail messages."
+msgstr "View image attachments directly in mail messages."
+
+#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Custom Headers"
 
-#: ../plugins/imap-features/imap-headers.c:344
+#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP Headers"
 
-#: ../plugins/imap-features/imap-headers.glade.h:1
-msgid "<b>Custom Headers</b>"
-msgstr "<b>Custom Headers</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers</b>"
-msgstr "<b>IMAP Headers</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:3
+#: ../plugins/imap-features/imap-headers.ui.h:1
 msgid "Basic and _Mailing List Headers (Default)"
 msgstr "Basic and _Mailing List Headers (Default)"
 
-#: ../plugins/imap-features/imap-headers.glade.h:4
+#: ../plugins/imap-features/imap-headers.ui.h:3
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
@@ -18161,7 +17317,7 @@ msgstr ""
 "standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
 
-#: ../plugins/imap-features/imap-headers.glade.h:6
+#: ../plugins/imap-features/imap-headers.ui.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -18169,7 +17325,7 @@ msgstr ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
 
-#: ../plugins/imap-features/imap-headers.glade.h:8
+#: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -18177,7 +17333,7 @@ msgstr ""
 "_Basic Headers â?? (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 
-#: ../plugins/imap-features/imap-headers.glade.h:10
+#: ../plugins/imap-features/imap-headers.ui.h:10
 msgid "_Fetch All Headers"
 msgstr "_Fetch All Headers"
 
@@ -18189,173 +17345,140 @@ msgstr "Fine-tune your IMAP accounts."
 msgid "IMAP Features"
 msgstr "IMAP Features"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
-msgid "Hardware Abstraction Layer not loaded"
-msgstr "Hardware Abstraction Layer not loaded"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
-msgid ""
-"The \"hald\" service is required but not currently running. Please enable "
-"the service and rerun this program, or contact your system administrator."
-msgstr ""
-"The \"hald\" service is required but not currently running. Please enable "
-"the service and rerun this program, or contact your system administrator."
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
-msgid "Search for an iPod failed"
-msgstr "Search for an iPod failed"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
-msgid ""
-"Evolution could not find an iPod to synchronize with. Either the iPod is not "
-"connected to the system or it is not powered on."
-msgstr ""
-"Evolution could not find an iPod to synchronise with. Either the iPod is not "
-"connected to the system or it is not powered on."
-
-#: ../plugins/ipod-sync/ical-format.c:119
-#: ../plugins/save-calendar/ical-format.c:163
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar format (.ics)"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize to iPod"
-msgstr "Synchronise to iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize your data with your Apple iPod."
-msgstr "Synchronise your data with your Apple iPod."
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "iPod Synchronisation"
-
-#: ../plugins/itip-formatter/itip-formatter.c:482
-#: ../plugins/itip-formatter/itip-formatter.c:607
+#: ../plugins/itip-formatter/itip-formatter.c:486
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Failed to load the calendar '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:627
+#: ../plugins/itip-formatter/itip-formatter.c:652
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "An appointment in the calendar '%s' conflicts with this meeting"
 
-#: ../plugins/itip-formatter/itip-formatter.c:663
+#: ../plugins/itip-formatter/itip-formatter.c:688
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Found the appointment in the calendar '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:762
+#: ../plugins/itip-formatter/itip-formatter.c:787
 msgid "Unable to find any calendars"
 msgstr "Unable to find any calendars"
 
-#: ../plugins/itip-formatter/itip-formatter.c:769
+#: ../plugins/itip-formatter/itip-formatter.c:794
 msgid "Unable to find this meeting in any calendar"
 msgstr "Unable to find this meeting in any calendar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:773
+#: ../plugins/itip-formatter/itip-formatter.c:798
 msgid "Unable to find this task in any task list"
 msgstr "Unable to find this task in any task list"
 
-#: ../plugins/itip-formatter/itip-formatter.c:777
+#: ../plugins/itip-formatter/itip-formatter.c:802
 msgid "Unable to find this memo in any memo list"
 msgstr "Unable to find this memo in any memo list"
 
-#: ../plugins/itip-formatter/itip-formatter.c:848
+#: ../plugins/itip-formatter/itip-formatter.c:873
 msgid "Opening the calendar. Please wait.."
 msgstr "Opening the calendar. Please wait.."
 
-#: ../plugins/itip-formatter/itip-formatter.c:851
+#: ../plugins/itip-formatter/itip-formatter.c:876
 msgid "Searching for an existing version of this appointment"
 msgstr "Searching for an existing version of this appointment"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1033
+#: ../plugins/itip-formatter/itip-formatter.c:1057
 msgid "Unable to parse item"
 msgstr "Unable to parse item"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1120
+#: ../plugins/itip-formatter/itip-formatter.c:1144
 #, 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:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1156
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sent to calendar '%s' as accepted"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1136
+#: ../plugins/itip-formatter/itip-formatter.c:1160
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sent to calendar '%s' as tentative"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1141
+#: ../plugins/itip-formatter/itip-formatter.c:1165
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sent to calendar '%s' as declined"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1146
+#: ../plugins/itip-formatter/itip-formatter.c:1170
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sent to calendar '%s' as cancelled"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1240
+#: ../plugins/itip-formatter/itip-formatter.c:1264
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organiser has removed the delegate %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1247
+#: ../plugins/itip-formatter/itip-formatter.c:1271
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Sent a cancellation notice to the delegate"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1249
+#: ../plugins/itip-formatter/itip-formatter.c:1273
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Could not send the cancellation notice to the delegate"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1357
+#: ../plugins/itip-formatter/itip-formatter.c:1384
 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:1386
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Unable to update attendee. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1390
+#: ../plugins/itip-formatter/itip-formatter.c:1417
 msgid "Attendee status updated"
 msgstr "Attendee status updated"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1443
 msgid "Meeting information sent"
 msgstr "Meeting information sent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1446
 msgid "Task information sent"
 msgstr "Task information sent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid "Memo information sent"
 msgstr "Memo information sent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1431
+#: ../plugins/itip-formatter/itip-formatter.c:1458
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Unable to send meeting information, the meeting does not exist"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1434
+#: ../plugins/itip-formatter/itip-formatter.c:1461
 msgid "Unable to send task information, the task does not exist"
 msgstr "Unable to send task information, the task does not exist"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1437
+#: ../plugins/itip-formatter/itip-formatter.c:1464
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Unable to send memo information, the memo does not exist"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1505
-#: ../plugins/itip-formatter/itip-formatter.c:1516
+#. Translators: This is a default filename for a calendar.
+#: ../plugins/itip-formatter/itip-formatter.c:1529
+msgid "calendar.ics"
+msgstr "calendar.ics"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1534
+msgid "Save Calendar"
+msgstr "Save Calendar"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid "The calendar attached is not valid"
 msgstr "The calendar attached is not valid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1506
-#: ../plugins/itip-formatter/itip-formatter.c:1517
+#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18363,15 +17486,15 @@ msgstr ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1557
-#: ../plugins/itip-formatter/itip-formatter.c:1585
-#: ../plugins/itip-formatter/itip-formatter.c:1677
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1773
 msgid "The item in the calendar is not valid"
 msgstr "The item in the calendar is not valid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1558
-#: ../plugins/itip-formatter/itip-formatter.c:1586
-#: ../plugins/itip-formatter/itip-formatter.c:1678
+#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1774
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18379,11 +17502,11 @@ msgstr ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1597
+#: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "The calendar attached contains multiple items"
 msgstr "The calendar attached contains multiple items"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1682
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18391,216 +17514,216 @@ msgstr ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2447
 msgid "This meeting recurs"
 msgstr "This meeting recurs"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2347
+#: ../plugins/itip-formatter/itip-formatter.c:2450
 msgid "This task recurs"
 msgstr "This task recurs"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2350
+#: ../plugins/itip-formatter/itip-formatter.c:2453
 msgid "This memo recurs"
 msgstr "This memo recurs"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2583
+#: ../plugins/itip-formatter/itip-formatter.c:2682
 msgid "_Delete message after acting"
 msgstr "_Delete message after acting"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2593
-#: ../plugins/itip-formatter/itip-formatter.c:2626
+#: ../plugins/itip-formatter/itip-formatter.c:2692
+#: ../plugins/itip-formatter/itip-formatter.c:2725
 msgid "Conflict Search"
 msgstr "Conflict Search"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2608
+#: ../plugins/itip-formatter/itip-formatter.c:2707
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Select the calendars to search for meeting conflicts"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:196
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M"
 msgstr "Today %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %H:%M:%S"
 msgstr "Today %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:209
+#: ../plugins/itip-formatter/itip-view.c:213
 msgid "Today %l:%M:%S %p"
 msgstr "Today %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:224
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M"
 msgstr "Tomorrow %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %H:%M:%S"
 msgstr "Tomorrow %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:233
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M %p"
 msgstr "Tomorrow %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:241
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Tomorrow %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:260
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:261
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:270
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:278
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:283
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e"
 msgstr "%A %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:289
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e %B %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e %B %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:298
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e %B %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:306
 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:308
+#: ../plugins/itip-formatter/itip-view.c:312
 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:313
+#: ../plugins/itip-formatter/itip-view.c:317
 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:317
+#: ../plugins/itip-formatter/itip-view.c:321
 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:322
+#: ../plugins/itip-formatter/itip-view.c:326
 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:326
+#: ../plugins/itip-formatter/itip-view.c:330
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:443
+#: ../plugins/itip-formatter/itip-view.c:530
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Please respond on behalf of <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:353
-#: ../plugins/itip-formatter/itip-view.c:441
-#: ../plugins/itip-formatter/itip-view.c:529
+#: ../plugins/itip-formatter/itip-view.c:357
+#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "Received on behalf of <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:362
 #, 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:360
+#: ../plugins/itip-formatter/itip-view.c:364
 #, 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:365
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> has delegated the following meeting to you:"
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:372
 #, 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:370
+#: ../plugins/itip-formatter/itip-view.c:374
 #, 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:376
+#: ../plugins/itip-formatter/itip-view.c:380
 #, 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:378
+#: ../plugins/itip-formatter/itip-view.c:382
 #, 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:382
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18609,89 +17732,89 @@ msgstr ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:388
 #, 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:388
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> through %s has sent back the following meeting response:"
 
-#: ../plugins/itip-formatter/itip-view.c:390
+#: ../plugins/itip-formatter/itip-view.c:394
 #, 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:394
+#: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> through %s has cancelled the following meeting:"
 
-#: ../plugins/itip-formatter/itip-view.c:396
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> has cancelled the following meeting."
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> through %s has proposed the following meeting changes."
 
-#: ../plugins/itip-formatter/itip-view.c:402
+#: ../plugins/itip-formatter/itip-view.c:406
 #, 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:406
+#: ../plugins/itip-formatter/itip-view.c:410
 #, 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:408
+#: ../plugins/itip-formatter/itip-view.c:412
 #, 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:446
+#: ../plugins/itip-formatter/itip-view.c:450
 #, 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:448
+#: ../plugins/itip-formatter/itip-view.c:452
 #, 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:453
+#: ../plugins/itip-formatter/itip-view.c:457
 #, 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:456
+#: ../plugins/itip-formatter/itip-view.c:460
 #, 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:458
+#: ../plugins/itip-formatter/itip-view.c:462
 #, 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:464
+#: ../plugins/itip-formatter/itip-view.c:468
 #, 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:466
+#: ../plugins/itip-formatter/itip-view.c:470
 #, 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:470
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18700,7 +17823,7 @@ msgstr ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:472
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18709,176 +17832,194 @@ msgstr ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 
-#: ../plugins/itip-formatter/itip-view.c:478
+#: ../plugins/itip-formatter/itip-view.c:482
 #, 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:482
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> through %s has cancelled the following assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> has cancelled the following assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 
-#: ../plugins/itip-formatter/itip-view.c:490
+#: ../plugins/itip-formatter/itip-view.c:494
 #, 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:494
+#: ../plugins/itip-formatter/itip-view.c:498
 #, 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:496
+#: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> has declined the following assigned task:"
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:537
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> through %s has published the following memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:536
+#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> has published the following memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> through %s wishes to add to an existing memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:543
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> wishes to add to an existing memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:550
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> through %s has cancelled the following shared memo:"
 
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../plugins/itip-formatter/itip-view.c:552
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> has cancelled the following shared memo:"
 
+#: ../plugins/itip-formatter/itip-view.c:676
+msgid "All day:"
+msgstr "All day:"
+
+#: ../plugins/itip-formatter/itip-view.c:686
+msgid "Start day:"
+msgstr "Start day:"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:1041
+msgid "Start time:"
+msgstr "Start time:"
+
+#: ../plugins/itip-formatter/itip-view.c:698
+msgid "End day:"
+msgstr "End day:"
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1052
+msgid "End time:"
+msgstr "End time:"
+
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:823
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Open Calendar"
 msgstr "_Open Calendar"
 
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:839
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:847
+#: ../plugins/itip-formatter/itip-view.c:864
+#: ../plugins/itip-formatter/itip-view.c:869
 msgid "_Decline"
 msgstr "_Decline"
 
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:863
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:866
+#: ../plugins/itip-formatter/itip-view.c:871
 msgid "_Accept"
 msgstr "_Accept"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Decline all"
 msgstr "_Decline all"
 
-#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Tentative all"
 msgstr "_Tentative all"
 
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:865
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Tentative"
 msgstr "_Tentative"
 
-#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Accept all"
 msgstr "_Accept all"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Send Information"
 msgstr "_Send Information"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Update Attendee Status"
 msgstr "_Update Attendee Status"
 
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Update"
 msgstr "_Update"
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:1033
-msgid "Start time:"
-msgstr "Start time:"
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:1044
-msgid "End time:"
-msgstr "End time:"
-
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1064
-#: ../plugins/itip-formatter/itip-view.c:1118
+#: ../plugins/itip-formatter/itip-view.c:1072
+#: ../plugins/itip-formatter/itip-view.c:1126
 msgid "Comment:"
 msgstr "Comment:"
 
-#: ../plugins/itip-formatter/itip-view.c:1103
+#: ../plugins/itip-formatter/itip-view.c:1111
 msgid "Send _reply to sender"
 msgstr "Send _reply to sender"
 
-#: ../plugins/itip-formatter/itip-view.c:1133
+#: ../plugins/itip-formatter/itip-view.c:1141
 msgid "Send _updates to attendees"
 msgstr "Send _updates to attendees"
 
-#: ../plugins/itip-formatter/itip-view.c:1142
+#: ../plugins/itip-formatter/itip-view.c:1150
 msgid "_Apply to all instances"
 msgstr "_Apply to all instances"
 
-#: ../plugins/itip-formatter/itip-view.c:1151
+#: ../plugins/itip-formatter/itip-view.c:1159
 msgid "Show time as _free"
 msgstr "Show time as _free"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Preserve my reminder"
 msgstr "_Preserve my reminder"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1160
+#: ../plugins/itip-formatter/itip-view.c:1168
 msgid "_Inherit reminder"
 msgstr "_Inherit reminder"
 
-#: ../plugins/itip-formatter/itip-view.c:1914
+#: ../plugins/itip-formatter/itip-view.c:1911
+msgid "_Tasks:"
+msgstr "_Tasks:"
+
+#: ../plugins/itip-formatter/itip-view.c:1913
 msgid "_Memos:"
 msgstr "_Memos:"
 
@@ -18945,9 +18086,8 @@ msgid "Play sound when new messages arrive."
 msgstr "Play sound when new messages arrive."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-#, fuzzy
 msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr "Play themed sound when new messages arrive, if not in beep mode."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
@@ -18966,9 +18106,8 @@ msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "Sound file to be played when new messages arrive, if not in beep mode."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
-#, fuzzy
 msgid "Use sound theme"
-msgstr "Use underline"
+msgstr "Use sound theme"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether play sound or beep when new messages arrive."
@@ -18986,16 +18125,16 @@ msgstr "Whether the icon should blink or not."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Whether to notify new messages in Inbox folder only."
 
-#: ../plugins/mail-notification/mail-notification.c:292
+#: ../plugins/mail-notification/mail-notification.c:344
 msgid "Evolution's Mail Notification"
 msgstr "Evolution's Mail Notification"
 
-#: ../plugins/mail-notification/mail-notification.c:313
+#: ../plugins/mail-notification/mail-notification.c:366
 msgid "Mail Notification Properties"
 msgstr "Mail Notification Properties"
 
-#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:422
+#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:495
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19010,57 +18149,67 @@ msgstr[1] ""
 "You have received %d new messages\n"
 "in %s."
 
-#: ../plugins/mail-notification/mail-notification.c:427
+#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:506
+#, c-format
+msgid "From: %s"
+msgstr "From: %s"
+
+#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:518
+#, c-format
+msgid "Subject: %s"
+msgstr "Subject: %s"
+
+#: ../plugins/mail-notification/mail-notification.c:527
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "You have received %d new message."
 msgstr[1] "You have received %d new messages."
 
-#: ../plugins/mail-notification/mail-notification.c:444
-#: ../plugins/mail-notification/mail-notification.c:449
+#: ../plugins/mail-notification/mail-notification.c:545
+#: ../plugins/mail-notification/mail-notification.c:550
 msgid "New email"
 msgstr "New e-mail"
 
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:604
 msgid "Show icon in _notification area"
 msgstr "Show icon in _notification area"
 
-#: ../plugins/mail-notification/mail-notification.c:534
+#: ../plugins/mail-notification/mail-notification.c:632
 msgid "B_link icon in notification area"
 msgstr "B_link icon in notification area"
 
-#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:642
 msgid "Popup _message together with the icon"
 msgstr "Popup _message together with the icon"
 
-#: ../plugins/mail-notification/mail-notification.c:723
+#: ../plugins/mail-notification/mail-notification.c:827
 msgid "_Play sound when new messages arrive"
 msgstr "_Play sound when new messages arrive"
 
-#: ../plugins/mail-notification/mail-notification.c:752
+#: ../plugins/mail-notification/mail-notification.c:856
 msgid "_Beep"
 msgstr "_Beep"
 
-#: ../plugins/mail-notification/mail-notification.c:765
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:869
 msgid "Use sound _theme"
-msgstr "Use underline"
+msgstr "Use sound _theme"
 
-#: ../plugins/mail-notification/mail-notification.c:784
-#, fuzzy
+#: ../plugins/mail-notification/mail-notification.c:888
 msgid "Play _file:"
-msgstr "Play _sound file"
+msgstr "Play _file:"
 
-#: ../plugins/mail-notification/mail-notification.c:795
+#: ../plugins/mail-notification/mail-notification.c:899
 msgid "Select sound file"
 msgstr "Select sound file"
 
-#: ../plugins/mail-notification/mail-notification.c:853
+#: ../plugins/mail-notification/mail-notification.c:957
 msgid "Notify new messages for _Inbox only"
 msgstr "Notify new messages for _Inbox only"
 
-#: ../plugins/mail-notification/mail-notification.c:862
+#: ../plugins/mail-notification/mail-notification.c:966
 msgid "Generate a _D-Bus message"
 msgstr "Generate a _D-Bus message"
 
@@ -19072,7 +18221,13 @@ msgstr "Mail Notification"
 msgid "Notifies you when new mail messages arrive."
 msgstr "Notifies you when new mail messages arrive."
 
-#: ../plugins/mail-to-task/mail-to-task.c:394
+#. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
+#: ../plugins/mail-to-task/mail-to-task.c:166
+#, c-format
+msgid "Created from a mail by %s"
+msgstr "Created from a mail by %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -19081,7 +18236,7 @@ msgstr ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:397
+#: ../plugins/mail-to-task/mail-to-task.c:499
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -19090,7 +18245,7 @@ msgstr ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:400
+#: ../plugins/mail-to-task/mail-to-task.c:502
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -19099,7 +18254,7 @@ msgstr ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:417
+#: ../plugins/mail-to-task/mail-to-task.c:519
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -19107,7 +18262,7 @@ msgstr ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:420
+#: ../plugins/mail-to-task/mail-to-task.c:522
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -19115,7 +18270,7 @@ msgstr ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:423
+#: ../plugins/mail-to-task/mail-to-task.c:525
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -19123,7 +18278,7 @@ msgstr ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:441
+#: ../plugins/mail-to-task/mail-to-task.c:543
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -19137,7 +18292,7 @@ msgstr[1] ""
 "Selected calendar contains events for the given mails already. Would you "
 "like to create new events anyway?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:447
+#: ../plugins/mail-to-task/mail-to-task.c:549
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -19151,7 +18306,7 @@ msgstr[1] ""
 "Selected task list contains tasks for the given mails already. Would you "
 "like to create new tasks anyway?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:453
+#: ../plugins/mail-to-task/mail-to-task.c:555
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -19165,25 +18320,25 @@ msgstr[1] ""
 "Selected memo list contains memos for the given mails already. Would you "
 "like to create new memos anyway?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:512
+#: ../plugins/mail-to-task/mail-to-task.c:614
 msgid "[No Summary]"
 msgstr "[No Summary]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:523
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "Invalid object returned from a server"
 msgstr "Invalid object returned from a server"
 
-#: ../plugins/mail-to-task/mail-to-task.c:594
+#: ../plugins/mail-to-task/mail-to-task.c:696
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "An error occurred during processing: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:623
+#: ../plugins/mail-to-task/mail-to-task.c:725
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Cannot open calendar. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:630
+#: ../plugins/mail-to-task/mail-to-task.c:732
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -19191,7 +18346,7 @@ msgstr ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:633
+#: ../plugins/mail-to-task/mail-to-task.c:735
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19199,7 +18354,7 @@ msgstr ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:636
+#: ../plugins/mail-to-task/mail-to-task.c:738
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -19207,40 +18362,40 @@ msgstr ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:843
+#: ../plugins/mail-to-task/mail-to-task.c:941
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Cannot get source list. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:962
+#: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create an _Event"
 msgstr "Create an _Event"
 
-#: ../plugins/mail-to-task/mail-to-task.c:964
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create a new event from the selected message"
 msgstr "Create a new event from the selected message"
 
-#: ../plugins/mail-to-task/mail-to-task.c:969
+#: ../plugins/mail-to-task/mail-to-task.c:1067
 msgid "Create a Mem_o"
 msgstr "Create a Mem_o"
 
-#: ../plugins/mail-to-task/mail-to-task.c:971
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 msgid "Create a new memo from the selected message"
 msgstr "Create a new memo from the selected message"
 
-#: ../plugins/mail-to-task/mail-to-task.c:976
+#: ../plugins/mail-to-task/mail-to-task.c:1074
 msgid "Create a _Task"
 msgstr "Create a _Task"
 
-#: ../plugins/mail-to-task/mail-to-task.c:978
+#: ../plugins/mail-to-task/mail-to-task.c:1076
 msgid "Create a new task from the selected message"
 msgstr "Create a new task from the selected message"
 
-#: ../plugins/mail-to-task/mail-to-task.c:986
+#: ../plugins/mail-to-task/mail-to-task.c:1084
 msgid "Create a _Meeting"
 msgstr "Create a _Meeting"
 
-#: ../plugins/mail-to-task/mail-to-task.c:988
+#: ../plugins/mail-to-task/mail-to-task.c:1086
 msgid "Create a new meeting from the selected message"
 msgstr "Create a new meeting from the selected message"
 
@@ -19248,56 +18403,55 @@ msgstr "Create a new meeting from the selected message"
 msgid "Convert a mail message to a task."
 msgstr "Convert a mail message to a task."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:276
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
 msgid "Get List _Archive"
 msgstr "Get List _Archive"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:278
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
 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/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
 msgid "Get List _Usage Information"
 msgstr "Get List _Usage Information"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
 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/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
 msgid "Contact List _Owner"
 msgstr "Contact List _Owner"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
 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/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
 msgid "_Post Message to List"
 msgstr "_Post Message to List"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
 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/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
 msgid "_Subscribe to List"
 msgstr "_Subscribe to List"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Subscribe to the mailing list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
 msgid "_Unsubscribe from List"
 msgstr "_Unsubscribe from List"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
-#, fuzzy
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
 msgid "Unsubscribe from the mailing list this message belongs to"
-msgstr "Unsubscribe to the mailing list this message belongs to"
+msgstr "Unsubscribe from the mailing list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
 msgid "Mailing _List"
 msgstr "Mailing _List"
 
@@ -19389,11 +18543,11 @@ msgstr "_Edit message"
 msgid "_Send message"
 msgstr "_Send message"
 
-#: ../plugins/mark-all-read/mark-all-read.c:43
+#: ../plugins/mark-all-read/mark-all-read.c:42
 msgid "Also mark messages in subfolders?"
 msgstr "Also mark messages in subfolders?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:45
+#: ../plugins/mark-all-read/mark-all-read.c:44
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -19401,15 +18555,15 @@ msgstr ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:172
+#: ../plugins/mark-all-read/mark-all-read.c:168
 msgid "In Current Folder and _Subfolders"
 msgstr "In Current Folder and _Subfolders"
 
-#: ../plugins/mark-all-read/mark-all-read.c:186
+#: ../plugins/mark-all-read/mark-all-read.c:182
 msgid "In Current _Folder Only"
 msgstr "In Current _Folder Only"
 
-#: ../plugins/mark-all-read/mark-all-read.c:297
+#: ../plugins/mark-all-read/mark-all-read.c:402
 msgid "Mark Me_ssages as Read"
 msgstr "Mark Me_ssages as Read"
 
@@ -19434,10 +18588,6 @@ msgstr "Plugin Manager"
 msgid "Author(s)"
 msgstr "Author(s)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:146
-msgid "Configuration"
-msgstr "Configuration"
-
 #: ../plugins/plugin-manager/plugin-manager.c:259
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Note: Some changes will not take effect until restart"
@@ -19472,19 +18622,43 @@ msgstr "Prefer Plain Text"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "View mail messages as plain text, even if they contain HTML content."
 
-#: ../plugins/prefer-plain/prefer-plain.c:189
+#: ../plugins/prefer-plain/prefer-plain.c:201
 msgid "Show HTML if present"
 msgstr "Show HTML if present"
 
-#: ../plugins/prefer-plain/prefer-plain.c:190
-msgid "Prefer PLAIN"
-msgstr "Prefer PLAIN"
+#: ../plugins/prefer-plain/prefer-plain.c:201
+msgid "Let Evolution choose the best part to show."
+msgstr "Let Evolution choose the best part to show."
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
-msgid "Only ever show PLAIN"
-msgstr "Only ever show PLAIN"
+#: ../plugins/prefer-plain/prefer-plain.c:202
+msgid "Show plain text if present"
+msgstr "Show plain text if present"
 
-#: ../plugins/prefer-plain/prefer-plain.c:234
+#: ../plugins/prefer-plain/prefer-plain.c:202
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+
+#: ../plugins/prefer-plain/prefer-plain.c:203
+msgid "Only ever show plain text"
+msgstr "Only ever show plain text"
+
+#: ../plugins/prefer-plain/prefer-plain.c:203
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+
+#: ../plugins/prefer-plain/prefer-plain.c:250
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr "Show s_uppressed HTML parts as attachments"
+
+#: ../plugins/prefer-plain/prefer-plain.c:270
 msgid "HTML _Mode"
 msgstr "HTML _Mode"
 
@@ -19508,35 +18682,37 @@ msgstr "Outlook PST import"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook personal folders (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:298
+#: ../plugins/pst-import/pst-importer.c:299
 msgid "_Mail"
 msgstr "_Mail"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:316
+#: ../plugins/pst-import/pst-importer.c:317
 msgid "_Address Book"
 msgstr "_Address Book"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:323
+#: ../plugins/pst-import/pst-importer.c:324
 msgid "A_ppointments"
 msgstr "A_ppointments"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:329 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tasks"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:335
+#: ../plugins/pst-import/pst-importer.c:336
 msgid "_Journal entries"
 msgstr "_Journal entries"
 
-#: ../plugins/pst-import/pst-importer.c:350
+#: ../plugins/pst-import/pst-importer.c:351
 msgid "Importing Outlook data"
 msgstr "Importing Outlook data"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#: ../plugins/publish-calendar/publish-calendar.c:146
+#: ../plugins/publish-calendar/publish-calendar.c:153
 msgid "Calendar Publishing"
 msgstr "Calendar Publishing"
 
@@ -19548,141 +18724,139 @@ msgstr "Locations"
 msgid "Publish calendars to the web."
 msgstr "Publish calendars to the web."
 
-#: ../plugins/publish-calendar/publish-calendar.c:94
-#: ../plugins/publish-calendar/publish-calendar.c:336
+#: ../plugins/publish-calendar/publish-calendar.c:208
+#: ../plugins/publish-calendar/publish-calendar.c:449
 #, c-format
 msgid "Could not open %s:"
 msgstr "Could not open %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:96
+#: ../plugins/publish-calendar/publish-calendar.c:210
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "Could not open %s: Unknown error"
 
-#: ../plugins/publish-calendar/publish-calendar.c:116
+#: ../plugins/publish-calendar/publish-calendar.c:230
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "There was an error while publishing to %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:118
+#: ../plugins/publish-calendar/publish-calendar.c:232
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Publishing to %s finished successfully"
 
-#: ../plugins/publish-calendar/publish-calendar.c:163
+#: ../plugins/publish-calendar/publish-calendar.c:276
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Mount of %s failed:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:623
+#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "E_nable"
+msgstr "E_nable"
+
+#: ../plugins/publish-calendar/publish-calendar.c:739
 msgid "Are you sure you want to remove this location?"
 msgstr "Are you sure you want to remove this location?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:937
+#. To Translators: This is shown to a user when creation of a new thread,
+#. where the publishing should be done, fails. Basically, this shouldn't
+#. ever happen, and if so, then something is really wrong.
+#: ../plugins/publish-calendar/publish-calendar.c:1051
 msgid "Could not create publish thread."
 msgstr "Could not create publish thread."
 
-#: ../plugins/publish-calendar/publish-calendar.c:944
+#: ../plugins/publish-calendar/publish-calendar.c:1059
 msgid "_Publish Calendar Information"
 msgstr "_Publish Calendar Information"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:2
-msgid "<span weight=\"bold\">Location</span>"
-msgstr "<span weight=\"bold\">Location</span>"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Custom Location"
+msgstr "Custom Location"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:4
-msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">Sources</span>"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+msgid "Daily"
+msgstr "Daily"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:6
-msgid ""
-"Daily\n"
-"Weekly\n"
-"Manual (via Actions menu)"
-msgstr ""
-"Daily\n"
-"Weekly\n"
-"Manual (via Actions menu)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+msgid "FTP (with login)"
+msgstr "FTP (with login)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "E_nable"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+msgid "Manual (via Actions menu)"
+msgstr "Manual (via Actions menu)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "P_ort:"
 msgstr "P_ort:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Public FTP"
+msgstr "Public FTP"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
 msgstr "Publishing Location"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Publishing _Frequency:"
 msgstr "Publishing _Frequency:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:13
-msgid ""
-"Secure FTP (SSH)\n"
-"Public FTP\n"
-"FTP (with login)\n"
-"Windows share\n"
-"WebDAV (HTTP)\n"
-"Secure WebDAV (HTTPS)\n"
-"Custom Location"
-msgstr ""
-"Secure FTP (SSH)\n"
-"Public FTP\n"
-"FTP (with login)\n"
-"Windows share\n"
-"WebDAV (HTTP)\n"
-"Secure WebDAV (HTTPS)\n"
-"Custom Location"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Secure FTP (SSH)"
+msgstr "Secure FTP (SSH)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "Secure WebDAV (HTTPS)"
+msgstr "Secure WebDAV (HTTPS)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "Service _type:"
 msgstr "Service _type:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+msgid "Sources"
+msgstr "Sources"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr "Time _duration:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Weekly"
+msgstr "Weekly"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+msgid "Windows share"
+msgstr "Windows share"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_File:"
 msgstr "_File:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_Publish as:"
 msgstr "_Publish as:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "_Remember password"
 msgstr "_Remember password"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
 msgstr "_Username:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:29
-msgid ""
-"days\n"
-"weeks\n"
-"months"
-msgstr ""
-"days\n"
-"weeks\n"
-"months"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:32
-msgid ""
-"iCal\n"
-"Free/Busy"
-msgstr ""
-"iCal\n"
-"Free/Busy"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "iCal"
+msgstr "iCal"
 
 #: ../plugins/publish-calendar/publish-format-fb.c:69
 #: ../plugins/publish-calendar/publish-format-ical.c:82
@@ -19690,11 +18864,11 @@ msgstr ""
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "Could not publish calendar: Calendar backend no longer exists"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:481
+#: ../plugins/publish-calendar/url-editor-dialog.c:474
 msgid "New Location"
 msgstr "New Location"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:483
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "Edit Location"
 msgstr "Edit Location"
 
@@ -19729,16 +18903,16 @@ msgstr "Wait for SpamAssassin child process interrupted, terminatingâ?¦"
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Pipe to SpamAssassin failed, error code: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
 #, c-format
-msgid "SpamAssassin is not available."
-msgstr "SpamAssassin is not available."
+msgid "SpamAssassin is not available. Please install it first."
+msgstr "SpamAssassin is not available. Please install it first."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "This will make SpamAssassin more reliable, but slower"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
 msgid "I_nclude remote tests"
 msgstr "I_nclude remote tests"
 
@@ -19758,78 +18932,82 @@ msgstr "SpamAssassin Options"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:159
+#: ../plugins/save-calendar/csv-format.c:161
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:355
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:357
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Description List"
 msgstr "Description List"
 
-#: ../plugins/save-calendar/csv-format.c:358
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Categories List"
 msgstr "Categories List"
 
-#: ../plugins/save-calendar/csv-format.c:359
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Comment List"
 msgstr "Comment List"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Contact List"
 msgstr "Contact List"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Start"
 msgstr "Start"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "End"
 msgstr "End"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "percent Done"
 msgstr "percent Done"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Attendees List"
 msgstr "Attendees List"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Modified"
 msgstr "Modified"
 
-#: ../plugins/save-calendar/csv-format.c:522
+#: ../plugins/save-calendar/csv-format.c:530
 msgid "A_dvanced options for the CSV format"
 msgstr "A_dvanced options for the CSV format"
 
-#: ../plugins/save-calendar/csv-format.c:529
+#: ../plugins/save-calendar/csv-format.c:537
 msgid "Prepend a _header"
 msgstr "Prepend a _header"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:546
 msgid "_Value delimiter:"
 msgstr "_Value delimiter:"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:553
 msgid "_Record delimiter:"
 msgstr "_Record delimiter:"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:560
 msgid "_Encapsulate values with:"
 msgstr "_Encapsulate values with:"
 
-#: ../plugins/save-calendar/csv-format.c:574
+#: ../plugins/save-calendar/csv-format.c:582
 msgid "Comma separated value format (.csv)"
 msgstr "Comma separated value format (.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:162
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar format (.ics)"
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "Save Selected"
@@ -19843,11 +19021,11 @@ msgstr "Save a calendar or task list to disk."
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:149
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:371
+#: ../plugins/save-calendar/rdf-format.c:369
 msgid "RDF format (.rdf)"
 msgstr "RDF format (.rdf)"
 
@@ -19859,20 +19037,17 @@ msgstr "_Format:"
 msgid "Select destination file"
 msgstr "Select destination file"
 
-#: ../plugins/save-calendar/save-calendar.c:323
-#, fuzzy
+#: ../plugins/save-calendar/save-calendar.c:325
 msgid "Save the selected calendar to disk"
-msgstr "Save the selected messages as a text file"
+msgstr "Save the selected calendar to disk"
 
-#: ../plugins/save-calendar/save-calendar.c:358
-#, fuzzy
+#: ../plugins/save-calendar/save-calendar.c:356
 msgid "Save the selected memo list to disk"
-msgstr "Save the selected messages as a text file"
+msgstr "Save the selected memo list to disk"
 
-#: ../plugins/save-calendar/save-calendar.c:393
-#, fuzzy
+#: ../plugins/save-calendar/save-calendar.c:387
 msgid "Save the selected task list to disk"
-msgstr "Save a calendar or task list to disk."
+msgstr "Save the selected task list to disk"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
@@ -19903,12 +19078,12 @@ msgstr ""
 "Please click the \"Forward\" button to continue. "
 
 #: ../plugins/startup-wizard/startup-wizard.c:135
-#: ../shell/e-shell-importer.c:129
+#: ../widgets/misc/e-import-assistant.c:385
 msgid "Please select the information that you would like to import:"
 msgstr "Please select the information that you would like to import:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:150
-#: ../shell/e-shell-importer.c:396
+#: ../widgets/misc/e-import-assistant.c:542
 #, c-format
 msgid "From %s:"
 msgstr "From %s:"
@@ -19917,14 +19092,11 @@ msgstr "From %s:"
 msgid "Importing files"
 msgstr "Importing files"
 
-#: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:519
-#, c-format
+#: ../plugins/startup-wizard/startup-wizard.c:230
 msgid "Importing data."
 msgstr "Importing data."
 
-#: ../plugins/startup-wizard/startup-wizard.c:237
-#: ../shell/e-shell-importer.c:538
+#: ../plugins/startup-wizard/startup-wizard.c:232
 msgid "Please wait"
 msgstr "Please wait"
 
@@ -19957,16 +19129,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Drafts-based template plugin"
 
-#: ../plugins/templates/templates.c:634
-#, fuzzy
+#: ../plugins/templates/templates.c:617
 msgid "No Title"
-msgstr "No title"
+msgstr "No Title"
 
-#: ../plugins/templates/templates.c:705
+#: ../plugins/templates/templates.c:688
 msgid "Save as _Template"
 msgstr "Save as _Template"
 
-#: ../plugins/templates/templates.c:707
+#: ../plugins/templates/templates.c:690
 msgid "Save as Template"
 msgstr "Save as Template"
 
@@ -20022,11 +19193,11 @@ msgstr "WebDAV contacts"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Avoid IfMatch (needed on Apache < 2.2.8)"
 
@@ -20047,14 +19218,12 @@ msgid "Default sidebar width"
 msgstr "Default sidebar width"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
-#, fuzzy
 msgid "Default window X coordinate"
-msgstr "Default window state"
+msgstr "Default window X coordinate"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:6
-#, fuzzy
 msgid "Default window Y coordinate"
-msgstr "Default window state"
+msgstr "Default window Y coordinate"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window height"
@@ -20184,7 +19353,7 @@ msgstr "Sidebar is visible"
 msgid "Skip development warning dialog"
 msgstr "Skip development warning dialogue"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:327
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:322
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
@@ -20201,14 +19370,12 @@ msgstr ""
 "(for example \"2.6.0\")."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:36
-#, fuzzy
 msgid "The default X coordinate for the main window."
-msgstr "The default width for the main window, in pixels."
+msgstr "The default X coordinate for the main window."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:37
-#, fuzzy
 msgid "The default Y coordinate for the main window."
-msgstr "The default width for the main window, in pixels."
+msgstr "The default Y coordinate for the main window."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default height for the main window, in pixels."
@@ -20343,223 +19510,142 @@ msgstr "Window button style"
 msgid "Window buttons are visible"
 msgstr "Window buttons are visible"
 
+#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+msgid "Searches"
+msgstr "Searches"
+
+#: ../shell/e-shell-content.c:619
+msgid "Save Search"
+msgstr "Save Search"
+
+#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-content.c:867
-#, fuzzy
+#: ../shell/e-shell-searchbar.c:883
 msgid "Sho_w:"
-msgstr "Sho_w: "
+msgstr "Sho_w:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-content.c:892
-#, fuzzy
+#: ../shell/e-shell-searchbar.c:910
 msgid "Sear_ch:"
-msgstr "Sear_ch: "
+msgstr "Sear_ch:"
 
-#. Scope Combo Widgets
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-content.c:934
-#, fuzzy
+#: ../shell/e-shell-searchbar.c:970
 msgid "i_n"
-msgstr " i_n "
-
-#: ../shell/e-shell-content.c:1357
-msgid "Advanced Search"
-msgstr "Advanced Search"
-
-#: ../shell/e-shell-content.c:1414 ../shell/e-shell-content.c:1415
-msgid "Searches"
-msgstr "Searches"
+msgstr "i_n"
 
-#: ../shell/e-shell-content.c:1460
-msgid "Save Search"
-msgstr "Save Search"
-
-#: ../shell/e-shell-importer.c:119
-msgid "Choose the type of importer to run:"
-msgstr "Choose the type of importer to run:"
-
-#: ../shell/e-shell-importer.c:122
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
-msgstr ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
-
-#: ../shell/e-shell-importer.c:126
-msgid "Choose the destination for this import"
-msgstr "Choose the destination for this import"
-
-#: ../shell/e-shell-importer.c:132
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
-"settings found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-msgstr ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
-"settings found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-
-#: ../shell/e-shell-importer.c:263
-msgid "F_ilename:"
-msgstr "F_ilename:"
-
-#: ../shell/e-shell-importer.c:268
-msgid "Select a file"
-msgstr "Select a file"
-
-#: ../shell/e-shell-importer.c:277
-msgid "File _type:"
-msgstr "File _type:"
-
-#: ../shell/e-shell-importer.c:329
-msgid "Import data and settings from _older programs"
-msgstr "Import data and settings from _older programs"
-
-#: ../shell/e-shell-importer.c:332
-msgid "Import a _single file"
-msgstr "Import a _single file"
-
-#: ../shell/e-shell-importer.c:692 ../shell/e-shell-importer.c:706
-msgid "Evolution Import Assistant"
-msgstr "Evolution Import Assistant"
-
-#: ../shell/e-shell-importer.c:701
-#, fuzzy
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing "
-"external files into Evolution."
-msgstr ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of\n"
-"importing external files into Evolution."
-
-#: ../shell/e-shell-importer.c:720
-msgid "Importer Type"
-msgstr "Importer Type"
-
-#: ../shell/e-shell-importer.c:733
-msgid "Select Information to Import"
-msgstr "Select Information to Import"
-
-#: ../shell/e-shell-importer.c:745
-msgid "Select a File"
-msgstr "Select a File"
-
-#: ../shell/e-shell-importer.c:754
-msgid "Import Location"
-msgstr "Import Location"
-
-#: ../shell/e-shell-importer.c:760
-#, fuzzy
-msgid "Click \"Apply\" to begin importing the file into Evolution."
-msgstr "Click \"Import\" to begin importing the file into Evolution. "
-
-#: ../shell/e-shell-importer.c:764
-msgid "Import File"
-msgstr "Import File"
-
-#: ../shell/e-shell-migrate.c:242 ../shell/e-shell-migrate.c:243
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: ../shell/e-shell-switcher.c:446
-#, fuzzy
+#: ../shell/e-shell-switcher.c:448
 msgid "Toolbar Style"
-msgstr "Tool_bar Style"
+msgstr "Toolbar Style"
 
-#: ../shell/e-shell-switcher.c:447
+#: ../shell/e-shell-switcher.c:449
 msgid "The switcher's toolbar style"
-msgstr ""
+msgstr "The switcher's toolbar style"
 
-#: ../shell/e-shell-switcher.c:463
-#, fuzzy
+#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
 msgid "Toolbar Visible"
-msgstr "Toolbar is visible"
+msgstr "Toolbar Visible"
 
-#: ../shell/e-shell-switcher.c:464
-#, fuzzy
+#: ../shell/e-shell-switcher.c:466
 msgid "Whether the switcher is visible"
-msgstr "Whether the sidebar should be visible."
+msgstr "Whether the switcher is visible"
 
-#: ../shell/e-shell-view.c:485
-#, fuzzy
+#: ../shell/e-shell-utils.c:220
+msgid "vCard (.vcf)"
+msgstr "vCard (.vcf)"
+
+#: ../shell/e-shell-utils.c:222
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
+
+#: ../shell/e-shell-utils.c:243
+msgid "All Files (*)"
+msgstr "All Files (*)"
+
+#: ../shell/e-shell-view.c:604
 msgid "Switcher Action"
-msgstr "Switch to %s"
+msgstr "Switcher Action"
 
-#: ../shell/e-shell-view.c:486
+#: ../shell/e-shell-view.c:605
 msgid "The switcher action for this shell view"
-msgstr ""
+msgstr "The switcher action for this shell view"
 
-#: ../shell/e-shell-view.c:501
-#, fuzzy
+#: ../shell/e-shell-view.c:620
 msgid "Page Number"
-msgstr "Serial Number"
+msgstr "Page Number"
 
-#: ../shell/e-shell-view.c:502
+#: ../shell/e-shell-view.c:621
 msgid "The notebook page number of the shell view"
-msgstr ""
+msgstr "The notebook page number of the shell view"
 
-#: ../shell/e-shell-view.c:520
-msgid "The title of the shell view"
-msgstr ""
+#: ../shell/e-shell-view.c:637
+msgid "Search Rule"
+msgstr "Search Rule"
+
+#: ../shell/e-shell-view.c:638
+msgid "Criteria for the current search results"
+msgstr "Criteria for the current search results"
 
-#: ../shell/e-shell-view.c:535
+#: ../shell/e-shell-view.c:653
 msgid "The EShellBackend for this shell view"
-msgstr ""
+msgstr "EShellBackend"
 
-#: ../shell/e-shell-view.c:550
+#: ../shell/e-shell-view.c:668
 msgid "Shell Content Widget"
-msgstr ""
+msgstr "Shell Content Widget"
 
-#: ../shell/e-shell-view.c:551
+#: ../shell/e-shell-view.c:669
 msgid "The content widget appears in a shell window's right pane"
-msgstr ""
+msgstr "The content widget appears in a shell window's right pane"
 
-#: ../shell/e-shell-view.c:567
-#, fuzzy
+#: ../shell/e-shell-view.c:685
 msgid "Shell Sidebar Widget"
-msgstr "Default sidebar width"
+msgstr "Shell Sidebar Widget"
 
-#: ../shell/e-shell-view.c:568
+#: ../shell/e-shell-view.c:686
 msgid "The sidebar widget appears in a shell window's left pane"
-msgstr ""
+msgstr "The sidebar widget appears in a shell window's left pane"
 
-#: ../shell/e-shell-view.c:583
+#: ../shell/e-shell-view.c:701
 msgid "Shell Taskbar Widget"
-msgstr ""
+msgstr "Shell Taskbar Widget"
 
-#: ../shell/e-shell-view.c:584
+#: ../shell/e-shell-view.c:702
 msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr ""
+msgstr "The taskbar widget appears at the bottom of a shell window"
 
-#: ../shell/e-shell-view.c:599
-#, fuzzy
+#: ../shell/e-shell-view.c:717
 msgid "Shell Window"
-msgstr "New _Window"
+msgstr "Shell Window"
 
-#: ../shell/e-shell-view.c:600
+#: ../shell/e-shell-view.c:718
 msgid "The window to which the shell view belongs"
-msgstr ""
+msgstr "The window to which the shell view belongs"
 
-#: ../shell/e-shell-view.c:615
-#, fuzzy
+#: ../shell/e-shell-view.c:734
+msgid "The key file holding widget state data"
+msgstr "The key file holding widget state data"
+
+#: ../shell/e-shell-view.c:749
+msgid "The title of the shell view"
+msgstr "The title of the shell view"
+
+#: ../shell/e-shell-view.c:763
 msgid "Current View ID"
-msgstr "_Current View"
+msgstr "Current View ID"
 
-#: ../shell/e-shell-view.c:616
-#, fuzzy
+#: ../shell/e-shell-view.c:764
 msgid "The current GAL view ID"
-msgstr "the current time"
+msgstr "The current GAL view ID"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
@@ -20576,389 +19662,404 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Evolution Website"
 
-#: ../shell/e-shell-window-actions.c:1252
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1223
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy is not installed."
 
-#: ../shell/e-shell-window-actions.c:1254
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1225
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy could not be run."
 
-#: ../shell/e-shell-window-actions.c:1356
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1327
 msgid "GNOME Pilot is not installed."
-msgstr "Bug Buddy is not installed."
+msgstr "GNOME Pilot is not installed."
 
-#: ../shell/e-shell-window-actions.c:1358
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1329
 msgid "GNOME Pilot could not be run."
-msgstr "Bug Buddy could not be run."
+msgstr "GNOME Pilot could not be run."
 
-#: ../shell/e-shell-window-actions.c:1452
+#: ../shell/e-shell-window-actions.c:1423
 msgid "Show information about Evolution"
 msgstr "Show information about Evolution"
 
-#: ../shell/e-shell-window-actions.c:1457
+#: ../shell/e-shell-window-actions.c:1428
 msgid "_Close Window"
 msgstr "_Close Window"
 
-#: ../shell/e-shell-window-actions.c:1464
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1435
 msgid "_Contents"
-msgstr "A_ppointments"
+msgstr "_Contents"
 
-#: ../shell/e-shell-window-actions.c:1466
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1437
 msgid "Open the Evolution User Guide"
-msgstr "The Evolution Groupware Suite"
+msgstr "Open the Evolution User Guide"
 
-#: ../shell/e-shell-window-actions.c:1471
+#: ../shell/e-shell-window-actions.c:1463
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ../shell/e-shell-window-actions.c:1473
+#: ../shell/e-shell-window-actions.c:1465
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Open the Frequently Asked Questions webpage"
 
-#: ../shell/e-shell-window-actions.c:1478
+#: ../shell/e-shell-window-actions.c:1470
 msgid "_Forget Passwords"
 msgstr "_Forget Passwords"
 
-#: ../shell/e-shell-window-actions.c:1480
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1472
 msgid "Forget all remembered passwords"
-msgstr "Are you sure you want to forget all remembered passwords?"
+msgstr "Forget all remembered passwords"
 
-#: ../shell/e-shell-window-actions.c:1485
+#: ../shell/e-shell-window-actions.c:1477
 msgid "I_mport..."
 msgstr "I_mportâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1487
+#: ../shell/e-shell-window-actions.c:1479
 msgid "Import data from other programs"
 msgstr "Import data from other programs"
 
-#: ../shell/e-shell-window-actions.c:1492
+#: ../shell/e-shell-window-actions.c:1484
 msgid "New _Window"
 msgstr "New _Window"
 
-#: ../shell/e-shell-window-actions.c:1494
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1486
 msgid "Create a new window displaying this view"
-msgstr "Create a new window displaying this folder"
+msgstr "Create a new window displaying this view"
 
-#: ../shell/e-shell-window-actions.c:1501
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1500
 msgid "Configure Evolution"
-msgstr "Configuration"
+msgstr "Configure Evolution"
 
-#: ../shell/e-shell-window-actions.c:1506
+#: ../shell/e-shell-window-actions.c:1505
 msgid "_Quick Reference"
 msgstr "_Quick Reference"
 
-#: ../shell/e-shell-window-actions.c:1508
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1507
 msgid "Show Evolution's shortcut keys"
-msgstr "Change Evolution's settings"
+msgstr "Show Evolution's shortcut keys"
 
-#: ../shell/e-shell-window-actions.c:1515
+#: ../shell/e-shell-window-actions.c:1514
 msgid "Exit the program"
 msgstr "Exit the program"
 
-#: ../shell/e-shell-window-actions.c:1520
+#: ../shell/e-shell-window-actions.c:1519
 msgid "_Advanced Search..."
 msgstr "_Advanced Searchâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1522
+#: ../shell/e-shell-window-actions.c:1521
 msgid "Construct a more advanced search"
-msgstr ""
+msgstr "Construct a more advanced search"
 
-#: ../shell/e-shell-window-actions.c:1529
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1528
 msgid "Clear the current search parameters"
-msgstr "Clear the search"
+msgstr "Clear the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:1534
+#: ../shell/e-shell-window-actions.c:1533
 msgid "_Edit Saved Searches..."
 msgstr "_Edit Saved Searchesâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1536
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1535
 msgid "Manage your saved searches"
-msgstr "Manage your e-mail, contacts and schedule"
+msgstr "Manage your saved searches"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1542
 msgid "Click here to change the search type"
 msgstr "Click here to change the search type"
 
-#: ../shell/e-shell-window-actions.c:1548
+#: ../shell/e-shell-window-actions.c:1547
 msgid "_Find Now"
 msgstr "_Find Now"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1550
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1549
 msgid "Execute the current search parameters"
-msgstr "Cancel the current mail operation"
+msgstr "Execute the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:1555
+#: ../shell/e-shell-window-actions.c:1554
 msgid "_Save Search..."
 msgstr "_Save Searchâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1557
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1556
 msgid "Save the current search parameters"
-msgstr "Save the current file"
+msgstr "Save the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:1562
+#: ../shell/e-shell-window-actions.c:1568
 msgid "Send / _Receive"
 msgstr "Send / _Receive"
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1570
 msgid "Send queued items and retrieve new items"
 msgstr "Send queued items and retrieve new items"
 
-#: ../shell/e-shell-window-actions.c:1569
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1575
 msgid "Submit _Bug Report..."
-msgstr "Submit _Bug Report"
+msgstr "Submit _Bug Reportâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1571
+#: ../shell/e-shell-window-actions.c:1577
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Submit a bug report using Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1576
-msgid "_Synchronization Options..."
-msgstr "_Synchronisation Optionsâ?¦"
+#: ../shell/e-shell-window-actions.c:1582
+msgid "GNOME Pilot _Synchronization..."
+msgstr "GNOME Pilot _Synchronisation..."
 
-#: ../shell/e-shell-window-actions.c:1578
-msgid "Set up Pilot configuration"
-msgstr "Set up Pilot configuration"
+#: ../shell/e-shell-window-actions.c:1584
+msgid "Set up GNOME Pilot configuration"
+msgstr "Set up GNOME Pilot configuration"
 
-#: ../shell/e-shell-window-actions.c:1583
+#: ../shell/e-shell-window-actions.c:1589
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: ../shell/e-shell-window-actions.c:1585
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1591
 msgid "Put Evolution into offline mode"
-msgstr "Start in offline mode"
+msgstr "Put Evolution into offline mode"
 
-#: ../shell/e-shell-window-actions.c:1590
+#: ../shell/e-shell-window-actions.c:1596
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: ../shell/e-shell-window-actions.c:1592
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1598
 msgid "Put Evolution into online mode"
-msgstr "Start in online mode"
+msgstr "Put Evolution into online mode"
 
-#: ../shell/e-shell-window-actions.c:1620
+#: ../shell/e-shell-window-actions.c:1626
 msgid "Lay_out"
 msgstr "Lay_out"
 
-#: ../shell/e-shell-window-actions.c:1627
+#: ../shell/e-shell-window-actions.c:1633
 msgid "_New"
 msgstr "_New"
 
-#: ../shell/e-shell-window-actions.c:1634
+#: ../shell/e-shell-window-actions.c:1640
 msgid "_Search"
 msgstr "_Search"
 
-#: ../shell/e-shell-window-actions.c:1641
+#: ../shell/e-shell-window-actions.c:1647
 msgid "_Switcher Appearance"
 msgstr "_Switcher Appearance"
 
-#: ../shell/e-shell-window-actions.c:1655
+#: ../shell/e-shell-window-actions.c:1661
 msgid "_Window"
 msgstr "_Window"
 
-#: ../shell/e-shell-window-actions.c:1665
+#: ../shell/e-shell-window-actions.c:1690
 msgid "Show Side _Bar"
 msgstr "Show Side _Bar"
 
-#: ../shell/e-shell-window-actions.c:1667
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1692
 msgid "Show the side bar"
-msgstr "Show Side _Bar"
+msgstr "Show the side bar"
+
+#: ../shell/e-shell-window-actions.c:1698
+msgid "Show _Buttons"
+msgstr "Show _Buttons"
 
-#: ../shell/e-shell-window-actions.c:1673
+#: ../shell/e-shell-window-actions.c:1700
+msgid "Show the switcher buttons"
+msgstr "Show the switcher buttons"
+
+#: ../shell/e-shell-window-actions.c:1706
 msgid "Show _Status Bar"
 msgstr "Show _Status Bar"
 
-#: ../shell/e-shell-window-actions.c:1675
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1708
 msgid "Show the status bar"
-msgstr "Show _Status Bar"
+msgstr "Show the status bar"
 
-#: ../shell/e-shell-window-actions.c:1681
-#, fuzzy
-msgid "Show _Buttons"
-msgstr "Show Animations"
-
-#: ../shell/e-shell-window-actions.c:1683
-#, fuzzy
-msgid "Show the switcher buttons"
-msgstr "Show the second time zone"
-
-#: ../shell/e-shell-window-actions.c:1689
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1714
 msgid "Show _Tool Bar"
-msgstr "Show _Toolbar"
+msgstr "Show _Tool Bar"
 
-#: ../shell/e-shell-window-actions.c:1691
-#, fuzzy
-msgid "Show the toolbar"
-msgstr "Show _Toolbar"
+#: ../shell/e-shell-window-actions.c:1716
+msgid "Show the tool bar"
+msgstr "Show the tool bar"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1738
 msgid "_Icons Only"
 msgstr "_Icons Only"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1740
 msgid "Display window buttons with icons only"
 msgstr "Display window buttons with icons only"
 
-#: ../shell/e-shell-window-actions.c:1720
+#: ../shell/e-shell-window-actions.c:1745
 msgid "_Text Only"
 msgstr "_Text Only"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1747
 msgid "Display window buttons with text only"
 msgstr "Display window buttons with text only"
 
-#: ../shell/e-shell-window-actions.c:1727
+#: ../shell/e-shell-window-actions.c:1752
 msgid "Icons _and Text"
 msgstr "Icons _and Text"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1754
 msgid "Display window buttons with icons and text"
 msgstr "Display window buttons with icons and text"
 
-#: ../shell/e-shell-window-actions.c:1734
+#: ../shell/e-shell-window-actions.c:1759
 msgid "Tool_bar Style"
 msgstr "Tool_bar Style"
 
-#: ../shell/e-shell-window-actions.c:1736
+#: ../shell/e-shell-window-actions.c:1761
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Display window buttons using the desktop toolbar setting"
 
-#: ../shell/e-shell-window-actions.c:1744
+#: ../shell/e-shell-window-actions.c:1769
 msgid "Define Views..."
 msgstr "Define Viewsâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1746
+#: ../shell/e-shell-window-actions.c:1771
 msgid "Create or edit views"
 msgstr "Create or edit views"
 
-#: ../shell/e-shell-window-actions.c:1751
+#: ../shell/e-shell-window-actions.c:1776
 msgid "Save Custom View..."
 msgstr "Save Custom Viewâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1753
+#: ../shell/e-shell-window-actions.c:1778
 msgid "Save current custom view"
 msgstr "Save current custom view"
 
-#: ../shell/e-shell-window-actions.c:1760
+#: ../shell/e-shell-window-actions.c:1785
 msgid "C_urrent View"
 msgstr "C_urrent View"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1795
 msgid "Custom View"
 msgstr "Custom View"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1797
 msgid "Current view is a customized view"
 msgstr "Current view is a customised view"
 
-#: ../shell/e-shell-window-actions.c:1782
-#, fuzzy
+#: ../shell/e-shell-window-actions.c:1807
 msgid "Change the page settings for your current printer"
-msgstr "Set up the page settings for your current printer"
+msgstr "Change the page settings for your current printer"
 
-#: ../shell/e-shell-window-actions.c:2054
+#: ../shell/e-shell-window-actions.c:2127
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"
 
-#: ../shell/e-shell-window-actions.c:2257
+#: ../shell/e-shell-window-actions.c:2337
 msgid "Execute these search parameters"
-msgstr ""
-
-#: ../shell/e-shell-window-private.c:252
-msgid "New"
-msgstr "New"
+msgstr "Execute these search parameters"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:569
+#: ../shell/e-shell-window-private.c:555
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s â?? Evolution"
 
-#: ../shell/e-shell-window.c:292
+#: ../shell/e-shell-window.c:366
+msgid "New"
+msgstr "New"
+
+#: ../shell/e-shell-window.c:616
 msgid "Active Shell View"
-msgstr ""
+msgstr "Active Shell View"
 
-#: ../shell/e-shell-window.c:293
-#, fuzzy
+#: ../shell/e-shell-window.c:617
 msgid "Name of the active shell view"
-msgstr "Name of new view:"
+msgstr "Name of the active shell view"
 
-#: ../shell/e-shell-window.c:307
-#, fuzzy
+#: ../shell/e-shell-window.c:632
+msgid "The shell window's EFocusTracker"
+msgstr "The shell window's EFocusTracker"
+
+#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:772
+msgid "Geometry"
+msgstr "Geometry"
+
+#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:773
+msgid "Initial window geometry string"
+msgstr "Initial window geometry string"
+
+#: ../shell/e-shell-window.c:662
 msgid "Safe Mode"
-msgstr "_Caret Mode"
+msgstr "Safe Mode"
 
-#: ../shell/e-shell-window.c:308
-#, fuzzy
+#: ../shell/e-shell-window.c:663
 msgid "Whether the shell window is in safe mode"
-msgstr "Whether the plugin is enabled"
+msgstr "Whether the shell window is in safe mode"
 
-#: ../shell/e-shell-window.c:339
-#, fuzzy
+#: ../shell/e-shell-window.c:694
+msgid "Sidebar Visible"
+msgstr "Sidebar is visible"
+
+#: ../shell/e-shell-window.c:695
+msgid "Whether the shell window's side bar is visible"
+msgstr "Whether the shell window's side bar is visible"
+
+#: ../shell/e-shell-window.c:709
+msgid "Switcher Visible"
+msgstr "Switcher Visible"
+
+#: ../shell/e-shell-window.c:710
+msgid "Whether the shell window's switcher buttons are visible"
+msgstr "Whether the shell window's switcher buttons are visible"
+
+#: ../shell/e-shell-window.c:725
+msgid "Taskbar Visible"
+msgstr "Taskbar Visible"
+
+#: ../shell/e-shell-window.c:726
+msgid "Whether the shell window's task bar is visible"
+msgstr "Whether the shell window's task bar is visible"
+
+#: ../shell/e-shell-window.c:741
+msgid "Whether the shell window's tool bar is visible"
+msgstr "Whether the shell window's tool bar is visible"
+
+#: ../shell/e-shell-window.c:755
 msgid "UI Manager"
-msgstr "Manager"
+msgstr "UI Manager"
 
-#: ../shell/e-shell-window.c:340
+#: ../shell/e-shell-window.c:756
 msgid "The shell window's GtkUIManager"
-msgstr ""
+msgstr "The shell window's GtkUIManager"
 
-#: ../shell/e-shell.c:207
-#, fuzzy
+#: ../shell/e-shell.c:213
 msgid "Preparing to go offline..."
-msgstr "Preparing account '%s' for offline"
+msgstr "Preparing to go offline..."
 
-#: ../shell/e-shell.c:261
-#, fuzzy
+#: ../shell/e-shell.c:267
 msgid "Preparing to go online..."
-msgstr "Preparing account '%s' for offline"
+msgstr "Preparing to go online..."
 
-#: ../shell/e-shell.c:324
+#: ../shell/e-shell.c:339
 msgid "Preparing to quit..."
-msgstr ""
+msgstr "Preparing to quitâ?¦"
 
-#: ../shell/e-shell.c:688
-#, fuzzy
+#: ../shell/e-shell.c:788
+msgid "Module Directory"
+msgstr "Module Directory"
+
+#: ../shell/e-shell.c:789
+msgid "The directory from which to load EModules"
+msgstr "The directory from which to load EModules"
+
+#: ../shell/e-shell.c:804
 msgid "Network Available"
-msgstr "No store available"
+msgstr "Network Available"
 
-#: ../shell/e-shell.c:689
-#, fuzzy
+#: ../shell/e-shell.c:805
 msgid "Whether the network is available"
-msgstr "Whether the plugin is enabled"
+msgstr "Whether the network is available"
 
-#: ../shell/e-shell.c:704 ../widgets/misc/e-online-button.c:130
+#: ../shell/e-shell.c:820 ../widgets/misc/e-online-button.c:130
 msgid "Online"
 msgstr "Online"
 
-#: ../shell/e-shell.c:705
-#, fuzzy
+#: ../shell/e-shell.c:821
 msgid "Whether the shell is online"
-msgstr "Whether the plugin is enabled"
+msgstr "Whether the shell is online"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:176
+#: ../shell/main.c:167
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20993,7 +20094,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: ../shell/main.c:200
+#: ../shell/main.c:191
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -21001,43 +20102,55 @@ msgstr ""
 "Thanks\n"
 "The Evolution Team\n"
 
-#: ../shell/main.c:207
+#: ../shell/main.c:198
 msgid "Do not tell me again"
 msgstr "Do not tell me again"
 
-#: ../shell/main.c:325
+#: ../shell/main.c:318
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution activating the specified component"
 
-#: ../shell/main.c:329
+#: ../shell/main.c:320
+msgid "Apply the given geometry to the main window"
+msgstr "Apply the given geometry to the main window"
+
+#: ../shell/main.c:324
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: ../shell/main.c:332
-msgid "Forcibly shut down all Evolution components"
-msgstr "Forcibly shut down all Evolution components"
+#: ../shell/main.c:327
+msgid "Forcibly shut down Evolution"
+msgstr "Forcibly shut down Evolution"
 
-#: ../shell/main.c:336
+#: ../shell/main.c:331
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forcibly re-migrate from Evolution 1.4"
 
-#: ../shell/main.c:339
+#: ../shell/main.c:334
 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:341
+#: ../shell/main.c:336
 msgid "Disable loading of any plugins."
 msgstr "Disable loading of any plugins."
 
-#: ../shell/main.c:343
+#: ../shell/main.c:338
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Disable preview pane of Mail, Contacts and Tasks."
 
-#: ../shell/main.c:494
+#: ../shell/main.c:342
+msgid "Import URIs or file names given as rest of arguments."
+msgstr "Import URIs or file names given as rest of arguments."
+
+#: ../shell/main.c:344
+msgid "Request a running Evolution process to quit"
+msgstr "Request a running Evolution process to quit"
+
+#: ../shell/main.c:498
 msgid "- The Evolution PIM and Email Client"
 msgstr "- The Evolution PIM and E-mail Client"
 
-#: ../shell/main.c:518
+#: ../shell/main.c:524
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21119,9 +20232,8 @@ msgstr ""
 "evolution&quot; at your convenience.\n"
 
 #: ../shell/shell.error.xml.h:18
-#, fuzzy
 msgid "Upgrade from previous version failed:"
-msgstr "Upgrade from previous version failed: {0}"
+msgstr "Upgrade from previous version failed:"
 
 #: ../shell/shell.error.xml.h:19
 msgid ""
@@ -21150,107 +20262,99 @@ msgid "_Remind Me Later"
 msgstr "_Remind Me Later"
 
 #: ../shell/shell.error.xml.h:25
-#, fuzzy
 msgid ""
 "{0}\n"
 "\n"
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
 msgstr ""
-"{1}\n"
+"{0}\n"
 "\n"
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
 
 #: ../shell/test/e-test-shell-backend.c:60
-#, fuzzy
 msgctxt "New"
 msgid "_Test Item"
-msgstr "_Test"
+msgstr "_Test Item"
 
 #: ../shell/test/e-test-shell-backend.c:62
 msgid "Create a new test item"
 msgstr "Create a new test item"
 
 #: ../shell/test/e-test-shell-backend.c:70
-#, fuzzy
 msgctxt "New"
 msgid "Test _Source"
-msgstr "Resource"
+msgstr "Test _Source"
 
 #: ../shell/test/e-test-shell-backend.c:72
-#, fuzzy
 msgid "Create a new test source"
-msgstr "Create a new test item"
+msgstr "Create a new test source"
 
 #: ../smclient/eggdesktopfile.c:165
 #, c-format
 msgid "File is not a valid .desktop file"
-msgstr ""
+msgstr "File is not a valid .desktop file"
 
 #: ../smclient/eggdesktopfile.c:188
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
-msgstr ""
+msgstr "Unrecognised desktop file Version '%s'"
 
 #: ../smclient/eggdesktopfile.c:958
-#, fuzzy, c-format
+#, c-format
 msgid "Starting %s"
-msgstr "Settings"
+msgstr "Starting %s"
 
 #: ../smclient/eggdesktopfile.c:1100
 #, c-format
 msgid "Application does not accept documents on command line"
-msgstr ""
+msgstr "Application does not accept documents on command line"
 
 #: ../smclient/eggdesktopfile.c:1168
 #, c-format
 msgid "Unrecognized launch option: %d"
-msgstr ""
+msgstr "Unrecognised launch option: %d"
 
 #: ../smclient/eggdesktopfile.c:1373
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
+msgstr "Can't pass document URIs to a 'Type=Link' desktop entry"
 
 #: ../smclient/eggdesktopfile.c:1394
-#, fuzzy, c-format
+#, c-format
 msgid "Not a launchable item"
-msgstr "Editor not launchable"
+msgstr "Not a launchable item"
 
-#: ../smclient/eggsmclient.c:225
-#, fuzzy
+#: ../smclient/eggsmclient.c:227
 msgid "Disable connection to session manager"
-msgstr "_Direct connection to the Internet"
+msgstr "Disable connection to session manager"
 
-#: ../smclient/eggsmclient.c:228
-#, fuzzy
+#: ../smclient/eggsmclient.c:230
 msgid "Specify file containing saved configuration"
-msgstr "Set up Pilot configuration"
+msgstr "Specify file containing saved configuration"
 
-#: ../smclient/eggsmclient.c:228
+#: ../smclient/eggsmclient.c:230
 msgid "FILE"
-msgstr ""
+msgstr "FILE"
 
-#: ../smclient/eggsmclient.c:231
+#: ../smclient/eggsmclient.c:233
 msgid "Specify session management ID"
-msgstr ""
+msgstr "Specify session management ID"
 
-#: ../smclient/eggsmclient.c:231
-#, fuzzy
+#: ../smclient/eggsmclient.c:233
 msgid "ID"
-msgstr "UID"
+msgstr "ID"
 
-#: ../smclient/eggsmclient.c:252
+#: ../smclient/eggsmclient.c:254
 msgid "Session management options:"
-msgstr ""
+msgstr "Session management options:"
 
-#: ../smclient/eggsmclient.c:253
-#, fuzzy
+#: ../smclient/eggsmclient.c:255
 msgid "Show session management options"
-msgstr "Show image animations"
+msgstr "Show session management options"
 
-#: ../smime/gui/ca-trust-dialog.c:102
+#: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -21261,7 +20365,7 @@ msgstr ""
 "\n"
 "Edit trust settings:"
 
-#: ../smime/gui/cert-trust-dialog.c:150
+#: ../smime/gui/cert-trust-dialog.c:144
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -21271,7 +20375,7 @@ msgstr ""
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 
-#: ../smime/gui/cert-trust-dialog.c:154
+#: ../smime/gui/cert-trust-dialog.c:148
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -21281,59 +20385,59 @@ msgstr ""
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 
-#: ../smime/gui/certificate-manager.c:137
-#: ../smime/gui/certificate-manager.c:384
-#: ../smime/gui/certificate-manager.c:612
+#: ../smime/gui/certificate-manager.c:135
+#: ../smime/gui/certificate-manager.c:382
+#: ../smime/gui/certificate-manager.c:610
 msgid "Select a certificate to import..."
 msgstr "Select a certificate to importâ?¦"
 
-#: ../smime/gui/certificate-manager.c:146
+#: ../smime/gui/certificate-manager.c:144
 msgid "All PKCS12 files"
 msgstr "All PKCS12 files"
 
-#: ../smime/gui/certificate-manager.c:152
-#: ../smime/gui/certificate-manager.c:399
-#: ../smime/gui/certificate-manager.c:626
+#: ../smime/gui/certificate-manager.c:150
+#: ../smime/gui/certificate-manager.c:397
+#: ../smime/gui/certificate-manager.c:624
 msgid "All files"
 msgstr "All files"
 
-#: ../smime/gui/certificate-manager.c:276
-#: ../smime/gui/certificate-manager.c:489
-#: ../smime/gui/certificate-manager.c:714
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:487
+#: ../smime/gui/certificate-manager.c:712
 msgid "Certificate Name"
 msgstr "Certificate Name"
 
-#: ../smime/gui/certificate-manager.c:285
-#: ../smime/gui/certificate-manager.c:507
+#: ../smime/gui/certificate-manager.c:283
+#: ../smime/gui/certificate-manager.c:505
 msgid "Purposes"
 msgstr "Purposes"
 
-#: ../smime/gui/certificate-manager.c:294 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:552
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "Serial Number"
 
-#: ../smime/gui/certificate-manager.c:302
+#: ../smime/gui/certificate-manager.c:300
 msgid "Expires"
 msgstr "Expires"
 
-#: ../smime/gui/certificate-manager.c:393
+#: ../smime/gui/certificate-manager.c:391
 msgid "All email certificate files"
 msgstr "All e-mail certificate files"
 
-#: ../smime/gui/certificate-manager.c:498
+#: ../smime/gui/certificate-manager.c:496
 msgid "E-Mail Address"
 msgstr "E-Mail Address"
 
-#: ../smime/gui/certificate-manager.c:621
+#: ../smime/gui/certificate-manager.c:619
 msgid "All CA certificate files"
 msgstr "All CA certificate files"
 
-#: ../smime/gui/certificate-manager.c:1052
+#: ../smime/gui/certificate-manager.c:1050
 msgid "Certificates"
 msgstr "Certificates"
 
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-viewer.c:332
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Certificate Viewer: %s"
@@ -21353,7 +20457,7 @@ msgid "Enter new password"
 msgstr "Enter new password"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -21362,7 +20466,7 @@ msgstr ""
 "Issued to:\n"
 "  Subject: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:118
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -21371,59 +20475,27 @@ msgstr ""
 "Issued by:\n"
 "  Subject: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:170
+#: ../smime/gui/e-cert-selector.c:165
 msgid "Select certificate"
 msgstr "Select certificate"
 
-#: ../smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.ui.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Not Part of Certificate>"
 
-#: ../smime/gui/smime-ui.glade.h:2
-msgid "<b>Certificate Fields</b>"
-msgstr "<b>Certificate Fields</b>"
-
-#: ../smime/gui/smime-ui.glade.h:3
-msgid "<b>Certificate Hierarchy</b>"
-msgstr "<b>Certificate Hierarchy</b>"
-
-#: ../smime/gui/smime-ui.glade.h:4
-msgid "<b>Field Value</b>"
-msgstr "<b>Field Value</b>"
-
-#: ../smime/gui/smime-ui.glade.h:5
-msgid "<b>Fingerprints</b>"
-msgstr "<b>Fingerprints</b>"
-
-#: ../smime/gui/smime-ui.glade.h:6
-msgid "<b>Issued By</b>"
-msgstr "<b>Issued By</b>"
-
-#: ../smime/gui/smime-ui.glade.h:7
-msgid "<b>Issued To</b>"
-msgstr "<b>Issued To</b>"
-
-#: ../smime/gui/smime-ui.glade.h:8
-msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr "<b>This certificate has been verified for the following uses:</b>"
-
-#: ../smime/gui/smime-ui.glade.h:9
-msgid "<b>Validity</b>"
-msgstr "<b>Validity</b>"
-
-#: ../smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.ui.h:2
 msgid "Authorities"
 msgstr "Authorities"
 
-#: ../smime/gui/smime-ui.glade.h:11
+#: ../smime/gui/smime-ui.ui.h:3
 msgid "Backup"
 msgstr "Backup"
 
-#: ../smime/gui/smime-ui.glade.h:12
+#: ../smime/gui/smime-ui.ui.h:4
 msgid "Backup All"
 msgstr "Backup All"
 
-#: ../smime/gui/smime-ui.glade.h:13
+#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -21431,325 +20503,340 @@ msgstr ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
 msgid "Certificate"
 msgstr "Certificate"
 
-#: ../smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Authority Trust"
 msgstr "Certificate Authority Trust"
 
-#: ../smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.ui.h:8
+msgid "Certificate Fields"
+msgstr "Certificate Fields"
+
+#: ../smime/gui/smime-ui.ui.h:9
+msgid "Certificate Hierarchy"
+msgstr "Certificate Hierarchy"
+
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificate details"
 msgstr "Certificate details"
 
-#: ../smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Certificates Table"
 msgstr "Certificates Table"
 
-#: ../smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Common Name (CN)"
 msgstr "Common Name (CN)"
 
-#: ../smime/gui/smime-ui.glade.h:19
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Contact Certificates"
 msgstr "Contact Certificates"
 
-#: ../smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Do not trust the authenticity of this certificate"
 
-#: ../smime/gui/smime-ui.glade.h:22
-msgid "Dummy window only"
-msgstr "Dummy window only"
-
-#: ../smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Edit"
 msgstr "Edit"
 
-#: ../smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Certificate Trust Settings"
 msgstr "E-mail Certificate Trust Settings"
 
-#: ../smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Email Recipient Certificate"
 msgstr "E-mail Recipient Certificate"
 
-#: ../smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Email Signer Certificate"
 msgstr "E-mail Signer Certificate"
 
-#: ../smime/gui/smime-ui.glade.h:27
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Expires On"
 msgstr "Expires On"
 
-#: ../smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "Field Value"
+msgstr "Field Value"
+
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "Fingerprints"
+msgstr "Fingerprints"
+
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Import"
 msgstr "Import"
 
-#: ../smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.ui.h:25
+msgid "Issued By"
+msgstr "Issued By"
+
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "Issued On"
 msgstr "Issued On"
 
-#: ../smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.ui.h:27
+msgid "Issued To"
+msgstr "Issued To"
+
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "MD5 Fingerprint"
 msgstr "MD5 Fingerprint"
 
-#: ../smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "Organization (O)"
 msgstr "Organisation (O)"
 
-#: ../smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.ui.h:30
 msgid "Organizational Unit (OU)"
 msgstr "Organisational Unit (OU)"
 
-#: ../smime/gui/smime-ui.glade.h:34
+#: ../smime/gui/smime-ui.ui.h:31
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 Fingerprint"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
+#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
 msgid "SSL Client Certificate"
 msgstr "SSL Client Certificate"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
+#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
 msgid "SSL Server Certificate"
 msgstr "SSL Server Certificate"
 
-#: ../smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.ui.h:35
+msgid "This certificate has been verified for the following uses:"
+msgstr "This certificate has been verified for the following uses:"
+
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust the authenticity of this certificate"
 msgstr "Trust the authenticity of this certificate"
 
-#: ../smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.ui.h:37
 msgid "Trust this CA to identify email users."
 msgstr "Trust this CA to identify e-mail users."
 
-#: ../smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Trust this CA to identify software developers."
 msgstr "Trust this CA to identify software developers."
 
-#: ../smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "Trust this CA to identify web sites."
 msgstr "Trust this CA to identify websites."
 
-#: ../smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.ui.h:40
+msgid "Validity"
+msgstr "Validity"
+
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "View"
 msgstr "View"
 
-#: ../smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "You have certificates from these organizations that identify you:"
 msgstr "You have certificates from these organisations that identify you:"
 
-#: ../smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.ui.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "You have certificates on file that identify these certificate authorities:"
 
-#: ../smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "You have certificates on file that identify these people:"
 
-#: ../smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "Your Certificates"
 msgstr "Your Certificates"
 
-#: ../smime/gui/smime-ui.glade.h:47
+#: ../smime/gui/smime-ui.ui.h:46
 msgid "_Edit CA Trust"
 msgstr "_Edit CA Trust"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:652
+#: ../smime/lib/e-cert-db.c:711
 msgid "Certificate already exists"
 msgstr "Certificate already exists"
 
-#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:407
+#: ../smime/lib/e-cert.c:414
 msgid "Sign"
 msgstr "Sign"
 
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:415
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: ../smime/lib/e-cert.c:513
+#: ../smime/lib/e-cert.c:527
 msgid "Version"
 msgstr "Version"
 
-#: ../smime/lib/e-cert.c:528
+#: ../smime/lib/e-cert.c:542
 msgid "Version 1"
 msgstr "Version 1"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:545
 msgid "Version 2"
 msgstr "Version 2"
 
-#: ../smime/lib/e-cert.c:534
+#: ../smime/lib/e-cert.c:548
 msgid "Version 3"
 msgstr "Version 3"
 
-#: ../smime/lib/e-cert.c:616
+#: ../smime/lib/e-cert.c:630
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:619
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:622
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 With RSA Encryption"
 
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-cert.c:663
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA Encryption"
 
-#: ../smime/lib/e-cert.c:652
+#: ../smime/lib/e-cert.c:666
 msgid "Certificate Key Usage"
 msgstr "Certificate Key Usage"
 
-#: ../smime/lib/e-cert.c:655
+#: ../smime/lib/e-cert.c:669
 msgid "Netscape Certificate Type"
 msgstr "Netscape Certificate Type"
 
-#: ../smime/lib/e-cert.c:658
+#: ../smime/lib/e-cert.c:672
 msgid "Certificate Authority Key Identifier"
 msgstr "Certificate Authority Key Identifier"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:684
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Object Identifier (%s)"
 
-#: ../smime/lib/e-cert.c:720
+#: ../smime/lib/e-cert.c:735
 msgid "Algorithm Identifier"
 msgstr "Algorithm Identifier"
 
-#: ../smime/lib/e-cert.c:728
+#: ../smime/lib/e-cert.c:743
 msgid "Algorithm Parameters"
 msgstr "Algorithm Parameters"
 
-#: ../smime/lib/e-cert.c:750
+#: ../smime/lib/e-cert.c:765
 msgid "Subject Public Key Info"
 msgstr "Subject Public Key Info"
 
-#: ../smime/lib/e-cert.c:755
+#: ../smime/lib/e-cert.c:770
 msgid "Subject Public Key Algorithm"
 msgstr "Subject Public Key Algorithm"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:785
 msgid "Subject's Public Key"
 msgstr "Subject's Public Key"
 
-#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
 msgid "Error: Unable to process extension"
 msgstr "Error: Unable to process extension"
 
-#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
+#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
 msgid "Object Signer"
 msgstr "Object Signer"
 
-#: ../smime/lib/e-cert.c:816
+#: ../smime/lib/e-cert.c:831
 msgid "SSL Certificate Authority"
 msgstr "SSL Certificate Authority"
 
-#: ../smime/lib/e-cert.c:820
+#: ../smime/lib/e-cert.c:835
 msgid "Email Certificate Authority"
 msgstr "E-mail Certificate Authority"
 
-#: ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:863
 msgid "Signing"
 msgstr "Signing"
 
-#: ../smime/lib/e-cert.c:852
+#: ../smime/lib/e-cert.c:867
 msgid "Non-repudiation"
 msgstr "Non-repudiation"
 
-#: ../smime/lib/e-cert.c:856
+#: ../smime/lib/e-cert.c:871
 msgid "Key Encipherment"
 msgstr "Key Encipherment"
 
-#: ../smime/lib/e-cert.c:860
+#: ../smime/lib/e-cert.c:875
 msgid "Data Encipherment"
 msgstr "Data Encipherment"
 
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:879
 msgid "Key Agreement"
 msgstr "Key Agreement"
 
-#: ../smime/lib/e-cert.c:868
+#: ../smime/lib/e-cert.c:883
 msgid "Certificate Signer"
 msgstr "Certificate Signer"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:887
 msgid "CRL Signer"
 msgstr "CRL Signer"
 
-#: ../smime/lib/e-cert.c:920
+#: ../smime/lib/e-cert.c:935
 msgid "Critical"
 msgstr "Critical"
 
-#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
+#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
 msgid "Not Critical"
 msgstr "Not Critical"
 
-#: ../smime/lib/e-cert.c:946
+#: ../smime/lib/e-cert.c:961
 msgid "Extensions"
 msgstr "Extensions"
 
-#: ../smime/lib/e-cert.c:1017
+#: ../smime/lib/e-cert.c:1030
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
+#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
 msgid "Certificate Signature Algorithm"
 msgstr "Certificate Signature Algorithm"
 
-#: ../smime/lib/e-cert.c:1081
+#: ../smime/lib/e-cert.c:1094
 msgid "Issuer"
 msgstr "Issuer"
 
-#: ../smime/lib/e-cert.c:1135
+#: ../smime/lib/e-cert.c:1149
 msgid "Issuer Unique ID"
 msgstr "Issuer Unique ID"
 
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1168
 msgid "Subject Unique ID"
 msgstr "Subject Unique ID"
 
-#: ../smime/lib/e-cert.c:1197
+#: ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Value"
 msgstr "Certificate Signature Value"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:250
 msgid "PKCS12 File Password"
 msgstr "PKCS12 File Password"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:251
 msgid "Enter password for PKCS12 file:"
 msgstr "Enter password for PKCS12 file:"
 
-#: ../smime/lib/e-pkcs12.c:348
+#: ../smime/lib/e-pkcs12.c:353
 msgid "Imported Certificate"
 msgstr "Imported Certificate"
 
-#. This most likely means that KILL_PROCESS_CMD wasn't
-#. * found, so just bail completely.
-#.
-#: ../tools/killev.c:61
-#, c-format
-msgid "Could not execute '%s': %s\n"
-msgstr "Could not execute '%s': %s\n"
-
-#: ../tools/killev.c:76
-#, c-format
-msgid "Shutting down %s (%s)\n"
-msgstr "Shutting down %s (%s)\n"
-
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "By _Company"
@@ -21823,31 +20910,27 @@ msgid "With _Status"
 msgstr "With _Status"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-msgid "<b>Time Zones</b>"
-msgstr "<b>Time Zones</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "<b>_Selection</b>"
-msgstr "<b>_Selection</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid "Select a Time Zone"
 msgstr "Select a Time Zone"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+msgid "Time Zones"
+msgstr "Time Zones"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
 msgid "Timezone drop-down combination box"
 msgstr "Timezone drop-down combination box"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -21857,30 +20940,32 @@ msgstr ""
 "zone.\n"
 "Use the right mouse button to zoom out."
 
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "_Selection"
+
 #: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "Collection"
 
-#: ../widgets/menus/gal-define-views-dialog.c:356
-#: ../widgets/menus/gal-define-views.glade.h:4
+#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Define Views for %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:364
-#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:337
 msgid "Define Views"
 msgstr "Define Views"
 
-#: ../widgets/menus/gal-define-views.glade.h:2
+#: ../widgets/menus/gal-define-views.ui.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
 msgstr "Define Views for \"%s\""
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-scrolled.c:215
-#: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "Table"
 
@@ -21888,35 +20973,35 @@ msgstr "Table"
 msgid "Instance"
 msgstr "Instance"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "Save Current View"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
 msgstr "_Create new view"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
 msgid "_Replace existing view"
 msgstr "_Replace existing view"
 
-#: ../widgets/menus/gal-view-new-dialog.c:68
+#: ../widgets/menus/gal-view-new-dialog.c:67
 msgid "Factory"
 msgstr "Factory"
 
-#: ../widgets/menus/gal-view-new-dialog.c:103
+#: ../widgets/menus/gal-view-new-dialog.c:98
 msgid "Define New View"
 msgstr "Define New View"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.ui.h:1
 msgid "Name of new view:"
 msgstr "Name of new view:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.ui.h:2
 msgid "Type of View"
 msgstr "Type of View"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of view:"
 msgstr "Type of view:"
 
@@ -21925,46 +21010,20 @@ msgid "De_fault"
 msgstr "De_fault"
 
 #: ../widgets/misc/e-account-tree-view.c:224
-#, fuzzy
 msgid "Account Name"
-msgstr "Account name"
+msgstr "Account Name"
 
 #: ../widgets/misc/e-account-tree-view.c:255
 msgid "Protocol"
 msgstr "Protocol"
 
 #: ../widgets/misc/e-action-combo-box.c:388
-#, fuzzy
 msgid "Action"
-msgstr "_Actions"
+msgstr "Action"
 
 #: ../widgets/misc/e-action-combo-box.c:389
 msgid "A GtkRadioAction"
-msgstr ""
-
-#. Translators: This is a cancelled activity.
-#: ../widgets/misc/e-activity.c:224
-#, fuzzy, c-format
-msgid "%s (cancelled)"
-msgstr "Cancelled"
-
-#. Translators: This is a completed activity.
-#: ../widgets/misc/e-activity.c:227
-#, fuzzy, c-format
-msgid "%s (completed)"
-msgstr "%s (%d%% complete)"
-
-#. Translators: This is an activity whose percent
-#. * complete is unknown.
-#: ../widgets/misc/e-activity.c:231
-#, fuzzy, c-format
-msgid "%s..."
-msgstr "%s (â?¦)"
-
-#: ../widgets/misc/e-activity.c:236
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% complete)"
+msgstr "A GtkRadioAction"
 
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
@@ -21978,6 +21037,11 @@ msgstr "_Filename:"
 msgid "MIME Type:"
 msgstr "MIME Type:"
 
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:550
+msgid "_Suggest automatic display of attachment"
+msgstr "_Suggest automatic display of attachment"
+
 #: ../widgets/misc/e-attachment-handler-image.c:95
 msgid "Could not set as background"
 msgstr "Could not set as background"
@@ -22011,88 +21075,95 @@ msgid "Saving"
 msgstr "Saving"
 
 #: ../widgets/misc/e-attachment-paned.c:87
-msgid "Hide _Attachment Bar"
-msgstr "Hide _Attachment Bar"
+msgid "Hide Attachment _Bar"
+msgstr "Hide Attachment _Bar"
 
 #: ../widgets/misc/e-attachment-paned.c:89
-#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show Attachment _Bar"
+msgstr "Show Attachment _Bar"
+
+#: ../widgets/misc/e-attachment-paned.c:631
 msgid "Show _Attachment Bar"
 msgstr "Show _Attachment Bar"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "Add Attachment"
 
-#: ../widgets/misc/e-attachment-store.c:544
+#: ../widgets/misc/e-attachment-store.c:541
 msgid "A_ttach"
 msgstr "A_ttach"
 
-#: ../widgets/misc/e-attachment-store.c:607
+#: ../widgets/misc/e-attachment-store.c:604
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Save Attachment"
 msgstr[1] "Save Attachments"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:636
-#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
+#: ../widgets/misc/e-attachment-store.c:633
+#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2317
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:299
 msgid "S_ave All"
 msgstr "S_ave All"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:325
 msgid "A_dd Attachment..."
 msgstr "A_dd Attachmentâ?¦"
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:349
 msgid "_Hide"
 msgstr "_Hide"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:356
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: ../widgets/misc/e-attachment-view.c:643
+#: ../widgets/misc/e-attachment-view.c:638
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Open with \"%s\""
 
-#: ../widgets/misc/e-attachment-view.c:646
+#: ../widgets/misc/e-attachment-view.c:641
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Open this attachment in %s"
 
-#: ../widgets/misc/e-attachment.c:990
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../widgets/misc/e-attachment.c:1002
 msgid "Attached message"
 msgstr "Attached message"
 
-#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
+#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2619
 msgid "A load operation is already in progress"
 msgstr "A load operation is already in progress"
 
-#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2627
 msgid "A save operation is already in progress"
 msgstr "A save operation is already in progress"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1920
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Could not load '%s'"
 
-#: ../widgets/misc/e-attachment.c:1926
+#: ../widgets/misc/e-attachment.c:1923
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Could not load the attachment"
 
-#: ../widgets/misc/e-attachment.c:2190
+#: ../widgets/misc/e-attachment.c:2197
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Could not open '%s'"
 
-#: ../widgets/misc/e-attachment.c:2193
+#: ../widgets/misc/e-attachment.c:2200
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Could not open the attachment"
@@ -22101,18 +21172,23 @@ msgstr "Could not open the attachment"
 msgid "Attachment contents not loaded"
 msgstr "Attachment contents not loaded"
 
-#: ../widgets/misc/e-attachment.c:2712
+#: ../widgets/misc/e-attachment.c:2711
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Could not save '%s'"
 
-#: ../widgets/misc/e-attachment.c:2715
+#: ../widgets/misc/e-attachment.c:2714
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Could not save the attachment"
 
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
+#: ../widgets/misc/e-buffer-tagger.c:359
+msgid "Ctrl-click to open a link"
+msgstr "Ctrl-click to open a link"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1253
+#: ../widgets/misc/e-calendar-item.c:1249
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -22120,58 +21196,58 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "Month Calendar"
 
-#: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
-#: ../widgets/text/e-text.c:3633
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3387
+#: ../widgets/text/e-text.c:3388
 msgid "Fill color"
 msgstr "Fill colour"
 
-#: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:462
-#: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
-#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
-#: ../widgets/text/e-text.c:3647
+#: ../widgets/misc/e-canvas-background.c:474
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482 ../widgets/text/e-text.c:3394
+#: ../widgets/text/e-text.c:3395 ../widgets/text/e-text.c:3401
+#: ../widgets/text/e-text.c:3402
 msgid "GDK fill color"
 msgstr "GDK fill colour"
 
-#: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
-#: ../widgets/text/e-text.c:3654
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489 ../widgets/text/e-text.c:3408
+#: ../widgets/text/e-text.c:3409
 msgid "Fill stipple"
 msgstr "Fill stipple"
 
-#: ../widgets/misc/e-canvas-background.c:482
-#: ../widgets/misc/e-canvas-background.c:483
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:489
-#: ../widgets/misc/e-canvas-background.c:490
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:496
-#: ../widgets/misc/e-canvas-background.c:497
+#: ../widgets/misc/e-canvas-background.c:509
+#: ../widgets/misc/e-canvas-background.c:510
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:503
-#: ../widgets/misc/e-canvas-background.c:504
+#: ../widgets/misc/e-canvas-background.c:516
+#: ../widgets/misc/e-canvas-background.c:517
 msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-container.c:1009
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3062
+#: ../widgets/table/e-table-item.c:2872
 msgid "Minimum width"
 msgstr "Minimum width"
 
 #: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-container.c:1010
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3063
+#: ../widgets/table/e-table-item.c:2873
 msgid "Minimum Width"
 msgstr "Minimum Width"
 
@@ -22191,49 +21267,148 @@ msgstr "Enter the character set to use"
 msgid "Other..."
 msgstr "Otherâ?¦"
 
-#: ../widgets/misc/e-dateedit.c:408
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "Date and Time"
 
-#: ../widgets/misc/e-dateedit.c:428
+#: ../widgets/misc/e-dateedit.c:544
 msgid "Text entry to input date"
 msgstr "Text entry to input date"
 
-#: ../widgets/misc/e-dateedit.c:450
+#: ../widgets/misc/e-dateedit.c:566
 msgid "Click this button to show a calendar"
 msgstr "Click this button to show a calendar"
 
-#: ../widgets/misc/e-dateedit.c:492
+#: ../widgets/misc/e-dateedit.c:612
 msgid "Drop-down combination box to select time"
 msgstr "Drop-down combination box to select time"
 
-#: ../widgets/misc/e-dateedit.c:568
+#: ../widgets/misc/e-dateedit.c:684
 msgid "No_w"
 msgstr "No_w"
 
-#: ../widgets/misc/e-dateedit.c:574
+#: ../widgets/misc/e-dateedit.c:690
 msgid "_Today"
 msgstr "_Today"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:582
+#: ../widgets/misc/e-dateedit.c:698
 msgid "_None"
 msgstr "_None"
 
-#: ../widgets/misc/e-dateedit.c:1675
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1935
+msgctxt "date"
+msgid "None"
+msgstr "None"
+
+#: ../widgets/misc/e-dateedit.c:1830
 msgid "Invalid Date Value"
 msgstr "Invalid Date Value"
 
-#: ../widgets/misc/e-dateedit.c:1705
+#: ../widgets/misc/e-dateedit.c:1874
 msgid "Invalid Time Value"
 msgstr "Invalid Time Value"
 
-#: ../widgets/misc/e-map.c:605
+#: ../widgets/misc/e-import-assistant.c:238
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+
+#: ../widgets/misc/e-import-assistant.c:255
+msgid "F_ilename:"
+msgstr "F_ilename:"
+
+#: ../widgets/misc/e-import-assistant.c:265
+msgid "Select a file"
+msgstr "Select a file"
+
+#: ../widgets/misc/e-import-assistant.c:279
+#: ../widgets/misc/e-import-assistant.c:455
+msgid "File _type:"
+msgstr "File _type:"
+
+#: ../widgets/misc/e-import-assistant.c:322
+msgid "Choose the destination for this import"
+msgstr "Choose the destination for this import"
+
+#: ../widgets/misc/e-import-assistant.c:347
+msgid "Choose the type of importer to run:"
+msgstr "Choose the type of importer to run:"
+
+#: ../widgets/misc/e-import-assistant.c:355
+msgid "Import data and settings from _older programs"
+msgstr "Import data and settings from _older programs"
+
+#: ../widgets/misc/e-import-assistant.c:363
+msgid "Import a _single file"
+msgstr "Import a _single file"
+
+#: ../widgets/misc/e-import-assistant.c:439
+msgid "Select what type of file you want to import from the list."
+msgstr "Select what type of file you want to import from the list."
+
+#: ../widgets/misc/e-import-assistant.c:516
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+
+#: ../widgets/misc/e-import-assistant.c:1187
+#: ../widgets/misc/e-import-assistant.c:1214
+msgid "Evolution Import Assistant"
+msgstr "Evolution Import Assistant"
+
+#: ../widgets/misc/e-import-assistant.c:1196
+#: ../widgets/misc/e-import-assistant.c:1248
+msgid "Import Location"
+msgstr "Import Location"
+
+#: ../widgets/misc/e-import-assistant.c:1207
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+
+#: ../widgets/misc/e-import-assistant.c:1223
+msgid "Importer Type"
+msgstr "Importer Type"
+
+#: ../widgets/misc/e-import-assistant.c:1232
+msgid "Select Information to Import"
+msgstr "Select Information to Import"
+
+#: ../widgets/misc/e-import-assistant.c:1240
+msgid "Select a File"
+msgstr "Select a File"
+
+#: ../widgets/misc/e-import-assistant.c:1255
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "Click \"Apply\" to begin importing the file into Evolution."
+
+#: ../widgets/misc/e-import-assistant.c:1261
+#: ../widgets/misc/e-import-assistant.c:1271
+msgid "Import Data"
+msgstr "Import Data"
+
+#: ../widgets/misc/e-map.c:621
 msgid "World Map"
 msgstr "World Map"
 
-#: ../widgets/misc/e-map.c:607
+#: ../widgets/misc/e-map.c:623
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -22242,74 +21417,114 @@ msgstr ""
 "should instead select the timezone from the drop-down combination box below."
 
 #: ../widgets/misc/e-online-button.c:27
-#, fuzzy
 msgid "Evolution is currently online.  Click this button to work offline."
-msgstr ""
-"Evolution is currently online.\n"
-"Click on this button to work offline."
+msgstr "Evolution is currently online.  Click this button to work offline."
 
 #: ../widgets/misc/e-online-button.c:30
-#, fuzzy
 msgid "Evolution is currently offline.  Click this button to work online."
-msgstr ""
-"Evolution is currently offline.\n"
-"Click on this button to work online."
+msgstr "Evolution is currently offline.  Click this button to work online."
 
 #: ../widgets/misc/e-online-button.c:33
-#, fuzzy
 msgid "Evolution is currently offline because the network is unavailable."
-msgstr ""
-"Evolution is currently offline.\n"
-"Click on this button to work online."
+msgstr "Evolution is currently offline because the network is unavailable."
 
 #: ../widgets/misc/e-online-button.c:131
 msgid "The button state is online"
 msgstr "The button state is online"
 
-#: ../widgets/misc/e-paned.c:180
-#, fuzzy
+#: ../widgets/misc/e-paned.c:306
 msgid "Horizontal Position"
-msgstr "Horizontal pane position"
+msgstr "Horizontal Position"
 
-#: ../widgets/misc/e-paned.c:181
+#: ../widgets/misc/e-paned.c:307
 msgid "Pane position when oriented horizontally"
-msgstr ""
+msgstr "Pane position when orientated horizontally"
 
-#: ../widgets/misc/e-paned.c:192
-#, fuzzy
+#: ../widgets/misc/e-paned.c:318
 msgid "Vertical Position"
-msgstr "Vertical pane position"
+msgstr "Vertical Position"
 
-#: ../widgets/misc/e-paned.c:193
+#: ../widgets/misc/e-paned.c:319
 msgid "Pane position when oriented vertically"
-msgstr ""
+msgstr "Pane position when orientated vertically"
 
-#: ../widgets/misc/e-pilot-settings.c:99
+#: ../widgets/misc/e-paned.c:330
+msgid "Proportion"
+msgstr "Proportion"
+
+#: ../widgets/misc/e-paned.c:331
+msgid "Proportion of the 2nd pane size"
+msgstr "Proportion of the 2nd pane size"
+
+#: ../widgets/misc/e-paned.c:342
+msgid "Fixed Resize"
+msgstr "Fixed Resize"
+
+#: ../widgets/misc/e-paned.c:343
+msgid "Keep the 2nd pane fixed during resize"
+msgstr "Keep the 2nd pane fixed during resize"
+
+#: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "Sync with:"
 
-#: ../widgets/misc/e-pilot-settings.c:107
+#: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync Private Records:"
 msgstr "Sync Private Records:"
 
-#: ../widgets/misc/e-pilot-settings.c:116
+#: ../widgets/misc/e-pilot-settings.c:112
 msgid "Sync Categories:"
 msgstr "Sync Categories:"
 
-#: ../widgets/misc/e-popup-action.c:173
-#, fuzzy
-msgid "Source Action"
-msgstr "Source Account"
-
-#: ../widgets/misc/e-popup-action.c:174
-#, fuzzy
-msgid "The source action to proxy"
-msgstr "The orientation of the tray."
-
-#: ../widgets/misc/e-preferences-window.c:216
+#: ../widgets/misc/e-preferences-window.c:218
 msgid "Evolution Preferences"
 msgstr "Evolution Preferences"
 
+#: ../widgets/misc/e-search-bar.c:77
+#, c-format
+msgid "Matches: %d"
+msgstr "Matches: %d"
+
+#: ../widgets/misc/e-search-bar.c:554
+msgid "Close the find bar"
+msgstr "Close the find bar"
+
+#: ../widgets/misc/e-search-bar.c:562
+msgid "Fin_d:"
+msgstr "Fin_d:"
+
+#: ../widgets/misc/e-search-bar.c:574
+msgid "Clear the search"
+msgstr "Clear the search"
+
+#: ../widgets/misc/e-search-bar.c:597
+msgid "_Previous"
+msgstr "_Previous"
+
+#: ../widgets/misc/e-search-bar.c:603
+msgid "Find the previous occurrence of the phrase"
+msgstr "Find the previous occurrence of the phrase"
+
+#: ../widgets/misc/e-search-bar.c:613
+msgid "_Next"
+msgstr "_Next"
+
+#: ../widgets/misc/e-search-bar.c:619
+msgid "Find the next occurrence of the phrase"
+msgstr "Find the next occurrence of the phrase"
+
+#: ../widgets/misc/e-search-bar.c:629
+msgid "Mat_ch case"
+msgstr "Mat_ch case"
+
+#: ../widgets/misc/e-search-bar.c:657
+msgid "Reached bottom of page, continued from top"
+msgstr "Reached bottom of page, continued from top"
+
+#: ../widgets/misc/e-search-bar.c:679
+msgid "Reached top of page, continued from bottom"
+msgstr "Reached top of page, continued from bottom"
+
 #: ../widgets/misc/e-selection-model-array.c:593
 #: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
@@ -22320,264 +21535,233 @@ msgstr "Cursor Row"
 msgid "Cursor Column"
 msgstr "Cursor Column"
 
-#: ../widgets/misc/e-selection-model.c:208
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Sorter"
 msgstr "Sorter"
 
-#: ../widgets/misc/e-selection-model.c:215
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Selection Mode"
 msgstr "Selection Mode"
 
-#: ../widgets/misc/e-selection-model.c:223
+#: ../widgets/misc/e-selection-model.c:231
 msgid "Cursor Mode"
 msgstr "Cursor Mode"
 
-#: ../widgets/misc/e-send-options.c:519
+#: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "When de_leted:"
 
-#: ../widgets/misc/e-send-options.glade.h:1
-msgid "<b>Delivery Options</b>"
-msgstr "<b>Delivery Options</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:2
-msgid "<b>Replies</b>"
-msgstr "<b>Replies</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:3
-msgid "<b>Return Notification</b>"
-msgstr "<b>Return Notification</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:4
-msgid "<b>Status Tracking</b>"
-msgstr "<b>Status Tracking</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:5
+#: ../widgets/misc/e-send-options.ui.h:1
 msgid "A_uto-delete sent item"
 msgstr "A_uto-delete sent item"
 
-#: ../widgets/misc/e-send-options.glade.h:6
+#: ../widgets/misc/e-send-options.ui.h:3
 msgid "Creat_e a sent item to track information"
 msgstr "Creat_e a sent item to track information"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.ui.h:4
 msgid "Deli_vered and opened"
 msgstr "Deli_vered and opened"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.ui.h:5
+msgid "Delivery Options"
+msgstr "Delivery Options"
+
+#: ../widgets/misc/e-send-options.ui.h:6
+msgid "For Your Eyes Only"
+msgstr "For Your Eyes Only"
+
+#: ../widgets/misc/e-send-options.ui.h:7
 msgid "Gene_ral Options"
 msgstr "Gene_ral Options"
 
-#: ../widgets/misc/e-send-options.glade.h:9
-msgid ""
-"None\n"
-"Mail Receipt"
-msgstr ""
-"None\n"
-"Mail Receipt"
+#: ../widgets/misc/e-send-options.ui.h:10
+msgid "Mail Receipt"
+msgstr "Mail Receipt"
 
-#: ../widgets/misc/e-send-options.glade.h:11
-msgid ""
-"Normal\n"
-"Proprietary\n"
-"Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
-msgstr ""
-"Normal\n"
-"Proprietary\n"
-"Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
+#: ../widgets/misc/e-send-options.ui.h:14
+msgid "Proprietary"
+msgstr "Proprietary"
 
-#: ../widgets/misc/e-send-options.glade.h:17
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "R_eply requested"
 msgstr "R_eply requested"
 
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.ui.h:17
+msgid "Return Notification"
+msgstr "Return Notification"
+
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Sta_tus Tracking"
 msgstr "Sta_tus Tracking"
 
-#: ../widgets/misc/e-send-options.glade.h:20
-msgid ""
-"Undefined\n"
-"High\n"
-"Standard\n"
-"Low"
-msgstr ""
-"Undefined\n"
-"High\n"
-"Standard\n"
-"Low"
+#: ../widgets/misc/e-send-options.ui.h:21
+msgid "Standard"
+msgstr "Standard"
+
+#: ../widgets/misc/e-send-options.ui.h:22
+msgid "Status Tracking"
+msgstr "Status Tracking"
+
+#: ../widgets/misc/e-send-options.ui.h:23
+msgid "Top Secret"
+msgstr "Top Secret"
 
-#: ../widgets/misc/e-send-options.glade.h:24
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "When acce_pted:"
 msgstr "When acce_pted:"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "When co_mpleted:"
 msgstr "When co_mpleted:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "When decli_ned:"
 msgstr "When decli_ned:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "Wi_thin"
 msgstr "Wi_thin"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "_After:"
 msgstr "_After:"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "_All information"
 msgstr "_All information"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.ui.h:31
 msgid "_Classification:"
 msgstr "_Classification:"
 
-#. To translators: This means Delay the message delivery for some time
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Delay message delivery"
 msgstr "_Delay message delivery"
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delivered"
 msgstr "_Delivered"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Set expiration date"
 msgstr "_Set expiration date"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Until:"
 msgstr "_Until:"
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "_When convenient"
 
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.ui.h:38
 msgid "_When opened:"
 msgstr "_When opened:"
 
-#: ../widgets/misc/e-signature-editor.c:130
-#: ../widgets/misc/e-signature-editor.c:489
+#: ../widgets/misc/e-signature-editor.c:133
+#: ../widgets/misc/e-signature-editor.c:549
 #: ../widgets/misc/e-signature-manager.c:349
 #: ../widgets/misc/e-signature-script-dialog.c:218
 msgid "Unnamed"
 msgstr "Unnamed"
 
-#: ../widgets/misc/e-signature-editor.c:207
+#: ../widgets/misc/e-signature-editor.c:210
 msgid "_Save and Close"
 msgstr "_Save and Close"
 
-#: ../widgets/misc/e-signature-editor.c:361
+#: ../widgets/misc/e-signature-editor.c:389
 msgid "Edit Signature"
 msgstr "Edit Signature"
 
-#: ../widgets/misc/e-signature-editor.c:376
+#: ../widgets/misc/e-signature-editor.c:404
 msgid "_Signature Name:"
 msgstr "_Signature Name:"
 
 #: ../widgets/misc/e-signature-manager.c:294
-#, fuzzy
 msgid "Add Signature Script"
-msgstr "Add signature script"
+msgstr "Add Signature Script"
 
 #: ../widgets/misc/e-signature-manager.c:359
-#, fuzzy
 msgid "Edit Signature Script"
-msgstr "Edit Signature"
+msgstr "Edit Signature Script"
 
 #: ../widgets/misc/e-signature-manager.c:576
 msgid "Add _Script"
 msgstr "Add _Script"
 
 #: ../widgets/misc/e-signature-script-dialog.c:266
-#, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only."
 msgstr ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used for display purposes only."
+"signature. The name you specify will be used\n"
+"for display purposes only."
 
 #: ../widgets/misc/e-signature-script-dialog.c:311
-#, fuzzy
 msgid "S_cript:"
-msgstr "_Script:"
+msgstr "S_cript:"
 
 #: ../widgets/misc/e-signature-script-dialog.c:342
-#, fuzzy
 msgid "Script file must be executable."
-msgstr "The script file must exist and be executable."
+msgstr "Script file must be executable."
 
-#: ../widgets/misc/e-url-entry.c:103
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "Click here to go to URL"
 
-#: ../widgets/misc/e-web-view.c:305
-#, fuzzy
+#: ../widgets/misc/e-web-view.c:348
+msgid "_Copy Link Location"
+msgstr "_Copy Link Location"
+
+#: ../widgets/misc/e-web-view.c:350
 msgid "Copy the link to the clipboard"
-msgstr "Copy things to the clipboard."
+msgstr "Copy the link to the clipboard"
 
-#: ../widgets/misc/e-web-view.c:315
-#, fuzzy
-msgid "Open the link in a web browser"
+#: ../widgets/misc/e-web-view.c:358
+msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: ../widgets/misc/e-web-view.c:323
-#, fuzzy
-msgid "_Copy Email Address"
-msgstr "Copy _E-mail Address"
-
-#: ../widgets/misc/e-web-view.c:325
-#, fuzzy
-msgid "Copy the email address to the clipboard"
-msgstr "Copy things to the clipboard."
+#: ../widgets/misc/e-web-view.c:360
+msgid "Open the link in a web browser"
+msgstr "Open the link in a web browser"
 
-#: ../widgets/misc/e-web-view.c:332
-#, fuzzy
-msgid "Send a mail message to this address"
-msgstr "Convert a mail message to a task."
+#: ../widgets/misc/e-web-view.c:368
+msgid "_Copy Email Address"
+msgstr "_Copy E-mail Address"
 
-#: ../widgets/misc/e-web-view.c:574
-#, c-format
-msgid "Click to mail %s"
-msgstr "Click to mail %s"
+#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+msgid "Select all text and images"
+msgstr "Select all text and images"
 
-#: ../widgets/misc/e-web-view.c:576 ../widgets/misc/e-web-view.c:578
-#: ../widgets/misc/e-web-view.c:580
+#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
+#: ../widgets/misc/e-web-view.c:756
 #, c-format
 msgid "Click to call %s"
 msgstr "Click to call %s"
 
-#: ../widgets/misc/e-web-view.c:582
+#: ../widgets/misc/e-web-view.c:758
 msgid "Click to hide/unhide addresses"
 msgstr "Click to hide/unhide addresses"
 
-#: ../widgets/misc/e-web-view.c:584
+#: ../widgets/misc/e-web-view.c:760
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
 
-#: ../widgets/misc/ea-calendar-item.c:295
-#: ../widgets/misc/ea-calendar-item.c:301
+#: ../widgets/misc/ea-calendar-item.c:299
+#: ../widgets/misc/ea-calendar-item.c:308
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../widgets/misc/ea-calendar-item.c:303
+#: ../widgets/misc/ea-calendar-item.c:311
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Calendar: from %s to %s"
 
-#: ../widgets/misc/ea-calendar-item.c:338
+#: ../widgets/misc/ea-calendar-item.c:347
 msgid "evolution calendar item"
 msgstr "evolution calendar item"
 
@@ -22585,15 +21769,21 @@ msgstr "evolution calendar item"
 msgid "popup list"
 msgstr "popup list"
 
-#: ../widgets/table/e-cell-date-edit.c:296
+#: ../widgets/table/e-cell-date-edit.c:303
 msgid "Now"
 msgstr "Now"
 
+#. Translators: "None" as a label of a button to unset date in a date table cell
 #: ../widgets/table/e-cell-date-edit.c:320
+msgctxt "table-date"
+msgid "None"
+msgstr "None"
+
+#: ../widgets/table/e-cell-date-edit.c:328
 msgid "OK"
 msgstr "OK"
 
-#: ../widgets/table/e-cell-date-edit.c:846
+#: ../widgets/table/e-cell-date-edit.c:862
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "The time must be in the format: %s"
@@ -22602,160 +21792,156 @@ msgstr "The time must be in the format: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "The percent value must be between 0 and 100, inclusive"
 
-#: ../widgets/table/e-cell-pixbuf.c:360
+#: ../widgets/table/e-cell-pixbuf.c:357
 msgid "Selected Column"
 msgstr "Selected Column"
 
-#: ../widgets/table/e-cell-pixbuf.c:367
+#: ../widgets/table/e-cell-pixbuf.c:364
 msgid "Focused Column"
 msgstr "Focused Column"
 
-#: ../widgets/table/e-cell-pixbuf.c:374
+#: ../widgets/table/e-cell-pixbuf.c:371
 msgid "Unselected Column"
 msgstr "Unselected Column"
 
-#: ../widgets/table/e-cell-text.c:1788
+#: ../widgets/table/e-cell-text.c:1627
 msgid "Strikeout Column"
 msgstr "Strikeout Column"
 
-#: ../widgets/table/e-cell-text.c:1795
+#: ../widgets/table/e-cell-text.c:1634
 msgid "Underline Column"
 msgstr "Underline Column"
 
-#: ../widgets/table/e-cell-text.c:1802
+#: ../widgets/table/e-cell-text.c:1641
 msgid "Bold Column"
 msgstr "Bold Column"
 
-#: ../widgets/table/e-cell-text.c:1809
+#: ../widgets/table/e-cell-text.c:1648
 msgid "Color Column"
 msgstr "Colour Column"
 
-#: ../widgets/table/e-cell-text.c:1823
+#: ../widgets/table/e-cell-text.c:1662
 msgid "BG Color Column"
 msgstr "BG Colour Column"
 
-#: ../widgets/table/e-table-click-to-add.c:578
+#: ../widgets/table/e-table-click-to-add.c:586
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
 msgid "click to add"
 msgstr "click to add"
 
-#: ../widgets/table/e-table-config.c:152
+#: ../widgets/table/e-table-config.c:150
 msgid "State"
 msgstr "State"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(Ascending)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Descending)"
 msgstr "(Descending)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:388
 msgid "Not sorted"
 msgstr "Not sorted"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:429
 msgid "No grouping"
 msgstr "No grouping"
 
-#: ../widgets/table/e-table-config.c:642
-#: ../widgets/table/e-table-config.glade.h:11
+#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Show Fields"
 
-#: ../widgets/table/e-table-config.c:663
+#: ../widgets/table/e-table-config.c:658
 msgid "Available Fields"
 msgstr "Available Fields"
 
-#: ../widgets/table/e-table-config.glade.h:1
+#: ../widgets/table/e-table-config.ui.h:1
 msgid "A_vailable Fields:"
 msgstr "A_vailable Fields:"
 
-#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-config.ui.h:2
+#: ../widgets/table/e-table-header-item.c:1637
 msgid "Ascending"
 msgstr "Ascending"
 
-#: ../widgets/table/e-table-config.glade.h:3
+#: ../widgets/table/e-table-config.ui.h:3
 msgid "Clear All"
 msgstr "Clear All"
 
-#: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-config.ui.h:4
 msgid "Clear _All"
 msgstr "Clear _All"
 
-#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-config.ui.h:5
+#: ../widgets/table/e-table-header-item.c:1637
 msgid "Descending"
 msgstr "Descending"
 
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.ui.h:8
 msgid "Group Items By"
 msgstr "Group Items By"
 
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.ui.h:9
 msgid "Move _Down"
 msgstr "Move _Down"
 
-#: ../widgets/table/e-table-config.glade.h:10
+#: ../widgets/table/e-table-config.ui.h:10
 msgid "Move _Up"
 msgstr "Move _Up"
 
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.ui.h:12
 msgid "Show _field in View"
 msgstr "Show _field in View"
 
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.ui.h:13
 msgid "Show field i_n View"
 msgstr "Show field i_n View"
 
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.ui.h:14
 msgid "Show field in _View"
 msgstr "Show field in _View"
 
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../widgets/table/e-table-config.ui.h:15
 msgid "Sort"
 msgstr "Sort"
 
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.ui.h:16
 msgid "Sort Items By"
 msgstr "Sort Items By"
 
-#: ../widgets/table/e-table-config.glade.h:17
+#: ../widgets/table/e-table-config.ui.h:17
 msgid "Then By"
 msgstr "Then By"
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.ui.h:19
 msgid "_Fields Shown..."
 msgstr "_Fields Shownâ?¦"
 
-#: ../widgets/table/e-table-config.glade.h:20
+#: ../widgets/table/e-table-config.ui.h:20
 msgid "_Group By..."
 msgstr "_Group Byâ?¦"
 
-#: ../widgets/table/e-table-config.glade.h:22
+#: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "_Show field in View"
 
-#: ../widgets/table/e-table-config.glade.h:23
+#: ../widgets/table/e-table-config.ui.h:23
 msgid "_Show these fields in order:"
 msgstr "_Show these fields in order:"
 
-#: ../widgets/table/e-table-config.glade.h:24
+#: ../widgets/table/e-table-config.ui.h:24
 msgid "_Sort..."
 msgstr "_Sortâ?¦"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:114
-msgid "Add a column..."
-msgstr "Add a columnâ?¦"
-
-#: ../widgets/table/e-table-field-chooser.glade.h:1
-msgid "Field Chooser"
-msgstr "Field Chooser"
+msgid "Add a Column"
+msgstr "Add a Column"
 
-#: ../widgets/table/e-table-field-chooser.glade.h:2
+#: ../widgets/table/e-table-field-chooser.c:151
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -22763,202 +21949,205 @@ msgstr ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
 
-#: ../widgets/table/e-table-group-container.c:341
+#: ../widgets/table/e-table-group-container.c:342
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (%d item)"
 msgstr[1] "%s : %s (%d items)"
 
-#: ../widgets/table/e-table-group-container.c:347
+#: ../widgets/table/e-table-group-container.c:348
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d item)"
 msgstr[1] "%s (%d items)"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
+#: ../widgets/table/e-table-item.c:2830 ../widgets/table/e-table-item.c:2831
 msgid "Alternating Row Colors"
 msgstr "Alternating Row Colours"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
-#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
+#: ../widgets/table/e-table-item.c:2837 ../widgets/table/e-table-item.c:2838
+#: ../widgets/table/e-tree.c:3369 ../widgets/table/e-tree.c:3370
 msgid "Horizontal Draw Grid"
 msgstr "Horizontal Draw Grid"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
-#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
+#: ../widgets/table/e-table-item.c:2844 ../widgets/table/e-table-item.c:2845
+#: ../widgets/table/e-tree.c:3375 ../widgets/table/e-tree.c:3376
 msgid "Vertical Draw Grid"
 msgstr "Vertical Draw Grid"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:954
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
-#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
+#: ../widgets/table/e-table-item.c:2851 ../widgets/table/e-table-item.c:2852
+#: ../widgets/table/e-tree.c:3381 ../widgets/table/e-tree.c:3382
 msgid "Draw focus"
 msgstr "Draw focus"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
+#: ../widgets/table/e-table-item.c:2858 ../widgets/table/e-table-item.c:2859
 msgid "Cursor mode"
 msgstr "Cursor mode"
 
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:2823 ../widgets/table/e-table-item.c:2824
 msgid "Selection model"
 msgstr "Selection model"
 
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
-#: ../widgets/table/e-tree.c:3334
+#: ../widgets/table/e-table-item.c:2865 ../widgets/table/e-table-item.c:2866
+#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree.c:3364
 msgid "Length Threshold"
 msgstr "Length Threshold"
 
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-container.c:982
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
-#: ../widgets/table/e-tree.c:3366
+#: ../widgets/table/e-table-item.c:2899 ../widgets/table/e-table-item.c:2900
+#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3395
+#: ../widgets/table/e-tree.c:3396
 msgid "Uniform row height"
 msgstr "Uniform row height"
 
-#: ../widgets/table/e-table-group-container.c:980
-#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-group-container.c:989
 #: ../widgets/table/e-table-group-leaf.c:656
 #: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "Frozen"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Customize Current View"
 msgstr "Customise Current View"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1502
 msgid "Sort _Ascending"
 msgstr "Sort _Ascending"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1505
 msgid "Sort _Descending"
 msgstr "Sort _Descending"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1508
 msgid "_Unsort"
 msgstr "_Unsort"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1511
 msgid "Group By This _Field"
 msgstr "Group By This _Field"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1514
 msgid "Group By _Box"
 msgstr "Group By _Box"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1518
 msgid "Remove This _Column"
 msgstr "Remove This _Column"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1521
 msgid "Add a C_olumn..."
 msgstr "Add a C_olumnâ?¦"
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1525
 msgid "A_lignment"
 msgstr "A_lignment"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1528
 msgid "B_est Fit"
 msgstr "B_est Fit"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1531
 msgid "Format Column_s..."
 msgstr "Format Column_sâ?¦"
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1535
 msgid "Custo_mize Current View..."
 msgstr "Custo_mise Current Viewâ?¦"
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1594
 msgid "_Sort By"
 msgstr "_Sort By"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1612
 msgid "_Custom"
 msgstr "_Custom"
 
-#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
+#: ../widgets/table/e-table-item.c:2809 ../widgets/table/e-table-item.c:2810
 msgid "Table header"
 msgstr "Table header"
 
-#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
+#: ../widgets/table/e-table-item.c:2816 ../widgets/table/e-table-item.c:2817
 msgid "Table model"
 msgstr "Table model"
 
-#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
+#: ../widgets/table/e-table-item.c:2892 ../widgets/table/e-table-item.c:2893
 msgid "Cursor row"
 msgstr "Cursor row"
 
-#: ../widgets/table/e-table-sorter.c:172
+#: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "Sort Info"
 
-#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
-#: ../widgets/table/e-tree.c:3373
+#: ../widgets/table/e-table.c:3345 ../widgets/table/e-tree.c:3402
+#: ../widgets/table/e-tree.c:3403
 msgid "Always search"
 msgstr "Always search"
 
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3352
 msgid "Use click to add"
 msgstr "Use click to add"
 
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "Tree"
+#: ../widgets/table/e-table.c:3366
+msgid "Vertical Row Spacing"
+msgstr "Vertical Row Spacing"
 
-#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
+#: ../widgets/table/e-table.c:3367
+msgid "Vertical space between rows. It is added to top and to bottom of a row"
+msgstr "Vertical space between rows. It is added to top and to bottom of a row"
+
+#: ../widgets/table/e-tree.c:3388 ../widgets/table/e-tree.c:3389
 msgid "ETree table adapter"
-msgstr "ETree table adapter"
+msgstr "ETree table adaptor"
 
-#: ../widgets/table/e-tree.c:3379
+#: ../widgets/table/e-tree.c:3409
 msgid "Retro Look"
 msgstr "Retro Look"
 
-#: ../widgets/table/e-tree.c:3380
+#: ../widgets/table/e-tree.c:3410
 msgid "Draw lines and +/- expanders."
 msgstr "Draw lines and +/- expanders."
 
-#: ../widgets/table/e-tree.c:3386
+#: ../widgets/table/e-tree.c:3416
 msgid "Expander Size"
 msgstr "Expander Size"
 
-#: ../widgets/table/e-tree.c:3387
+#: ../widgets/table/e-tree.c:3417
 msgid "Size of the expander arrow"
 msgstr "Size of the expander arrow"
 
@@ -23004,7 +22193,7 @@ msgstr "collapse"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "collapses the row in the ETree containing this cell"
 
-#: ../widgets/table/gal-a11y-e-cell.c:120
+#: ../widgets/table/gal-a11y-e-cell.c:119
 msgid "Table Cell"
 msgstr "Table Cell"
 
@@ -23012,123 +22201,1637 @@ msgstr "Table Cell"
 msgid "click"
 msgstr "click"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:152
+#: ../widgets/table/gal-a11y-e-table-column-header.c:154
 msgid "sort"
 msgstr "sort"
 
-#: ../widgets/text/e-text.c:2719
+#: ../widgets/text/e-text.c:2474
 msgid "Select All"
 msgstr "Select All"
 
-#: ../widgets/text/e-text.c:2731
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "Input Methods"
 
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
+#: ../widgets/text/e-text.c:3303 ../widgets/text/e-text.c:3304
 msgid "Event Processor"
 msgstr "Event Processor"
 
-#: ../widgets/text/e-text.c:3555 ../widgets/text/e-text.c:3556
+#: ../widgets/text/e-text.c:3310 ../widgets/text/e-text.c:3311
 msgid "Text"
 msgstr "Text"
 
-#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3317 ../widgets/text/e-text.c:3318
 msgid "Bold"
 msgstr "Bold"
 
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3324 ../widgets/text/e-text.c:3325
 msgid "Strikeout"
 msgstr "Strikeout"
 
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3331 ../widgets/text/e-text.c:3332
 msgid "Anchor"
 msgstr "Anchor"
 
-#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
+#: ../widgets/text/e-text.c:3338 ../widgets/text/e-text.c:3339
 msgid "Justification"
 msgstr "Justification"
 
-#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
+#: ../widgets/text/e-text.c:3345 ../widgets/text/e-text.c:3346
 msgid "Clip Width"
 msgstr "Clip Width"
 
-#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
+#: ../widgets/text/e-text.c:3352 ../widgets/text/e-text.c:3353
 msgid "Clip Height"
 msgstr "Clip Height"
 
-#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
+#: ../widgets/text/e-text.c:3359 ../widgets/text/e-text.c:3360
 msgid "Clip"
 msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
+#: ../widgets/text/e-text.c:3366 ../widgets/text/e-text.c:3367
 msgid "Fill clip rectangle"
 msgstr "Fill clip rectangle"
 
-#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
+#: ../widgets/text/e-text.c:3373 ../widgets/text/e-text.c:3374
 msgid "X Offset"
 msgstr "X Offset"
 
-#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
+#: ../widgets/text/e-text.c:3380 ../widgets/text/e-text.c:3381
 msgid "Y Offset"
 msgstr "Y Offset"
 
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3415 ../widgets/text/e-text.c:3416
 msgid "Text width"
 msgstr "Text width"
 
-#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
+#: ../widgets/text/e-text.c:3422 ../widgets/text/e-text.c:3423
 msgid "Text height"
 msgstr "Text height"
 
-#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
+#: ../widgets/text/e-text.c:3436 ../widgets/text/e-text.c:3437
 msgid "Use ellipsis"
 msgstr "Use ellipsis"
 
-#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
+#: ../widgets/text/e-text.c:3443 ../widgets/text/e-text.c:3444
 msgid "Ellipsis"
 msgstr "Ellipsis"
 
-#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
+#: ../widgets/text/e-text.c:3450 ../widgets/text/e-text.c:3451
 msgid "Line wrap"
 msgstr "Line wrap"
 
-#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
+#: ../widgets/text/e-text.c:3457 ../widgets/text/e-text.c:3458
 msgid "Break characters"
 msgstr "Break characters"
 
-#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
+#: ../widgets/text/e-text.c:3464 ../widgets/text/e-text.c:3465
 msgid "Max lines"
 msgstr "Max lines"
 
-#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
+#: ../widgets/text/e-text.c:3485 ../widgets/text/e-text.c:3486
 msgid "Draw borders"
 msgstr "Draw borders"
 
-#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Allow newlines"
 msgstr "Allow newlines"
 
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Draw background"
 msgstr "Draw background"
 
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Draw button"
 msgstr "Draw button"
 
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3513 ../widgets/text/e-text.c:3514
 msgid "Cursor position"
 msgstr "Cursor position"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3523
 msgid "IM Context"
 msgstr "IM Context"
 
-#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
+#: ../widgets/text/e-text.c:3529 ../widgets/text/e-text.c:3530
 msgid "Handle Popup"
 msgstr "Handle Popup"
 
+#~ msgid "Loading appointments at %s"
+#~ msgstr "Loading appointments at %s"
+
+#~ msgid "Error loading address book."
+#~ msgstr "Error loading address book."
+
+#~ msgid "Server Version"
+#~ msgstr "Server Version"
+
+#~ msgid "<b>Email</b>"
+#~ msgstr "<b>E-mail</b>"
+
+#~ msgid "<b>Home</b>"
+#~ msgstr "<b>Home</b>"
+
+#~ msgid "<b>Job</b>"
+#~ msgstr "<b>Job</b>"
+
+#~ msgid "<b>Miscellaneous</b>"
+#~ msgstr "<b>Miscellaneous</b>"
+
+#~ msgid "<b>Notes</b>"
+#~ msgstr "<b>Notes</b>"
+
+#~ msgid "<b>Other</b>"
+#~ msgstr "<b>Other</b>"
+
+#~ msgid "<b>Telephone</b>"
+#~ msgstr "<b>Telephone</b>"
+
+#~ msgid "<b>Work</b>"
+#~ msgstr "<b>Work</b>"
+
+#~ msgid ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr."
+#~ msgstr ""
+#~ "\n"
+#~ "Mr.\n"
+#~ "Mrs.\n"
+#~ "Ms.\n"
+#~ "Miss\n"
+#~ "Dr."
+
+#~ msgid ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq."
+#~ msgstr ""
+#~ "\n"
+#~ "Sr.\n"
+#~ "Jr.\n"
+#~ "I\n"
+#~ "II\n"
+#~ "III\n"
+#~ "Esq."
+
+#~ msgid "<b>Members</b>"
+#~ msgstr "<b>Members</b>"
+
+#~ msgid ""
+#~ "%s already exists\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s already exists\n"
+#~ "Do you want to overwrite it?"
+
+#~ msgid "Overwrite"
+#~ msgstr "Overwrite"
+
+#~ msgid "contact"
+#~ msgid_plural "contacts"
+#~ msgstr[0] "contact"
+#~ msgstr[1] "contacts"
+
+#~ msgid "Save Appointment"
+#~ msgstr "Save Appointment"
+
+#~ msgid "Save Memo"
+#~ msgstr "Save Memo"
+
+#~ msgid "Save Task"
+#~ msgstr "Save Task"
+
+#~ msgid "<b>Alarm</b>"
+#~ msgstr "<b>Alarm</b>"
+
+#~ msgid "<b>Options</b>"
+#~ msgstr "<b>Options</b>"
+
+#~ msgid ""
+#~ "before\n"
+#~ "after"
+#~ msgstr ""
+#~ "before\n"
+#~ "after"
+
+#~ msgid ""
+#~ "minute(s)\n"
+#~ "hour(s)\n"
+#~ "day(s)"
+#~ msgstr ""
+#~ "minute(s)\n"
+#~ "hour(s)\n"
+#~ "day(s)"
+
+#~ msgid ""
+#~ "minutes\n"
+#~ "hours\n"
+#~ "days"
+#~ msgstr ""
+#~ "minutes\n"
+#~ "hours\n"
+#~ "days"
+
+#~ msgid ""
+#~ "start of appointment\n"
+#~ "end of appointment"
+#~ msgstr ""
+#~ "start of appointment\n"
+#~ "end of appointment"
+
+#~ msgid "Attach file(s)"
+#~ msgstr "Attach file(s)"
+
+#~ msgid ""
+#~ "60 minutes\n"
+#~ "30 minutes\n"
+#~ "15 minutes\n"
+#~ "10 minutes\n"
+#~ "05 minutes"
+#~ msgstr ""
+#~ "60 minutes\n"
+#~ "30 minutes\n"
+#~ "15 minutes\n"
+#~ "10 minutes\n"
+#~ "05 minutes"
+
+#~ msgid "<span weight=\"bold\">Alarms</span>"
+#~ msgstr "<span weight=\"bold\">Alarms</span>"
+
+#~ msgid "<span weight=\"bold\">Alerts</span>"
+#~ msgstr "<span weight=\"bold\">Alerts</span>"
+
+#~ msgid "<span weight=\"bold\">Date/Time Format</span>"
+#~ msgstr "<span weight=\"bold\">Date/Time Format</span>"
+
+#~ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+#~ msgstr "<span weight=\"bold\">Default Free/Busy Server</span>"
+
+#~ msgid "<span weight=\"bold\">General</span>"
+#~ msgstr "<span weight=\"bold\">General</span>"
+
+#~ msgid "<span weight=\"bold\">Task List</span>"
+#~ msgstr "<span weight=\"bold\">Task List</span>"
+
+#~ msgid "<span weight=\"bold\">Time</span>"
+#~ msgstr "<span weight=\"bold\">Time</span>"
+
+#~ msgid "<span weight=\"bold\">Work Week</span>"
+#~ msgstr "<span weight=\"bold\">Work Week</span>"
+
+#~ msgid ""
+#~ "Minutes\n"
+#~ "Hours\n"
+#~ "Days"
+#~ msgstr ""
+#~ "Minutes\n"
+#~ "Hours\n"
+#~ "Days"
+
+#~ msgid ""
+#~ "Monday\n"
+#~ "Tuesday\n"
+#~ "Wednesday\n"
+#~ "Thursday\n"
+#~ "Friday\n"
+#~ "Saturday\n"
+#~ "Sunday"
+#~ msgstr ""
+#~ "Monday\n"
+#~ "Tuesday\n"
+#~ "Wednesday\n"
+#~ "Thursday\n"
+#~ "Friday\n"
+#~ "Saturday\n"
+#~ "Sunday"
+
+#~ msgid ""
+#~ "15 minutes before appointment\n"
+#~ "1 hour before appointment\n"
+#~ "1 day before appointment"
+#~ msgstr ""
+#~ "15 minutes before appointment\n"
+#~ "1 hour before appointment\n"
+#~ "1 day before appointment"
+
+#~ msgid ""
+#~ "a\n"
+#~ "b"
+#~ msgstr ""
+#~ "a\n"
+#~ "b"
+
+#~ msgid "<b>Preview</b>"
+#~ msgstr "<b>Preview</b>"
+
+#~ msgid "<b>Recurrence</b>"
+#~ msgstr "<b>Recurrence</b>"
+
+#~ msgid ""
+#~ "day(s)\n"
+#~ "week(s)\n"
+#~ "month(s)\n"
+#~ "year(s)"
+#~ msgstr ""
+#~ "day(s)\n"
+#~ "week(s)\n"
+#~ "month(s)\n"
+#~ "year(s)"
+
+#~ msgid ""
+#~ "for\n"
+#~ "until\n"
+#~ "forever"
+#~ msgstr ""
+#~ "for\n"
+#~ "until\n"
+#~ "forever"
+
+#~ msgid "<span weight=\"bold\">Miscellaneous</span>"
+#~ msgstr "<span weight=\"bold\">Miscellaneous</span>"
+
+#~ msgid "<span weight=\"bold\">Status</span>"
+#~ msgstr "<span weight=\"bold\">Status</span>"
+
+#~ msgid ""
+#~ "High\n"
+#~ "Normal\n"
+#~ "Low\n"
+#~ "Undefined"
+#~ msgstr ""
+#~ "High\n"
+#~ "Normal\n"
+#~ "Low\n"
+#~ "Undefined"
+
+#~ msgid ""
+#~ "Not Started\n"
+#~ "In Progress\n"
+#~ "Completed\n"
+#~ "Canceled"
+#~ msgstr ""
+#~ "Not Started\n"
+#~ "In Progress\n"
+#~ "Completed\n"
+#~ "Cancelled"
+
+#~ msgid ""
+#~ "January\n"
+#~ "February\n"
+#~ "March\n"
+#~ "April\n"
+#~ "May\n"
+#~ "June\n"
+#~ "July\n"
+#~ "August\n"
+#~ "September\n"
+#~ "October\n"
+#~ "November\n"
+#~ "December"
+#~ msgstr ""
+#~ "January\n"
+#~ "February\n"
+#~ "March\n"
+#~ "April\n"
+#~ "May\n"
+#~ "June\n"
+#~ "July\n"
+#~ "August\n"
+#~ "September\n"
+#~ "October\n"
+#~ "November\n"
+#~ "December"
+
+#~ msgid "_Security"
+#~ msgstr "_Security"
+
+#, fuzzy
+#~ msgid "Show CC"
+#~ msgstr "Show"
+
+#, fuzzy
+#~ msgid "Show BCC"
+#~ msgstr "Show"
+
+#~ msgid "Directories can not be attached to Messages."
+#~ msgstr "Directories can not be attached to Messages."
+
+#~ msgid ""
+#~ "Send options available only for Novell GroupWise and Microsoft Exchange "
+#~ "accounts."
+#~ msgstr ""
+#~ "Send options available only for Novell GroupWise and Microsoft Exchange "
+#~ "accounts."
+
+#~ msgid "Send options not available."
+#~ msgstr "Send options not available."
+
+#~ msgid ""
+#~ "To attach the contents of this directory, either attach the files in this "
+#~ "directory individually, or create an archive of the directory and attach "
+#~ "it."
+#~ msgstr ""
+#~ "To attach the contents of this directory, either attach the files in this "
+#~ "directory individually, or create an archive of the directory and attach "
+#~ "it."
+
+#~ msgid "Unfinished messages found"
+#~ msgstr "Unfinished messages found"
+
+#~ msgid "Warning: Modified Message"
+#~ msgstr "Warning: Modified Message"
+
+#~ msgid "Evolution Information"
+#~ msgstr "Evolution Information"
+
+#~ msgid "Evolution Query"
+#~ msgstr "Evolution Query"
+
+#~ msgid "Overwrite file?"
+#~ msgstr "Overwrite file?"
+
+#~ msgid "Test"
+#~ msgstr "Test"
+
+#~ msgid "<b>_Filter Rules</b>"
+#~ msgstr "<b>_Filter Rules</b>"
+
+#~ msgid ""
+#~ "seconds\n"
+#~ "minutes\n"
+#~ "hours\n"
+#~ "days\n"
+#~ "weeks\n"
+#~ "months\n"
+#~ "years"
+#~ msgstr ""
+#~ "seconds\n"
+#~ "minutes\n"
+#~ "hours\n"
+#~ "days\n"
+#~ "weeks\n"
+#~ "months\n"
+#~ "years"
+
+#~ msgid "Rule name"
+#~ msgstr "Rule name"
+
+#~ msgid "Select _All Text"
+#~ msgstr "Select _All Text"
+
+#~ msgid "Rename the \"%s\" folder to:"
+#~ msgstr "Rename the \"%s\" folder to:"
+
+#~ msgid "Rename Folder"
+#~ msgstr "Rename Folder"
+
+#~ msgid "message"
+#~ msgstr "message"
+
+#~ msgid "Save Message..."
+#~ msgstr "Save Messageâ?¦"
+
+#~ msgid ""
+#~ "It disables/enables the repeated prompts to ask if offline sync is "
+#~ "required before going into offline mode."
+#~ msgstr ""
+#~ "It disables/enables the repeated prompts to ask if offline "
+#~ "synchronisation is required before going into offline mode."
+
+#~ msgid "Prompt to check if the user wants to go offline immediately"
+#~ msgstr "Prompt to check if the user wants to go offline immediately"
+
+#~ msgid "Show the \"Preview\" pane"
+#~ msgstr "Show the \"Preview\" pane"
+
+#~ msgid "Show the \"Preview\" pane."
+#~ msgstr "Show the \"Preview\" pane."
+
+#~ msgid "Thread the message list."
+#~ msgstr "Thread the message list."
+
+#~ msgid "Thread the message-list"
+#~ msgstr "Thread the message-list"
+
+#, fuzzy
+#~ msgid " Ch_eck for Supported Types"
+#~ msgstr " Ch_eck for Supported Types "
+
+#~ msgid "<b>Sig_natures</b>"
+#~ msgstr "<b>Sig_natures</b>"
+
+#~ msgid "<b>_Languages</b>"
+#~ msgstr "<b>_Languages</b>"
+
+#~ msgid "<span weight=\"bold\">Account Information</span>"
+#~ msgstr "<span weight=\"bold\">Account Information</span>"
+
+#~ msgid "<span weight=\"bold\">Authentication</span>"
+#~ msgstr "<span weight=\"bold\">Authentication</span>"
+
+#~ msgid "<span weight=\"bold\">Composing Messages</span>"
+#~ msgstr "<span weight=\"bold\">Composing Messages</span>"
+
+#~ msgid "<span weight=\"bold\">Configuration</span>"
+#~ msgstr "<span weight=\"bold\">Configuration</span>"
+
+#~ msgid "<span weight=\"bold\">Default Behavior</span>"
+#~ msgstr "<span weight=\"bold\">Default Behaviour</span>"
+
+#~ msgid "<span weight=\"bold\">Delete Mail</span>"
+#~ msgstr "<span weight=\"bold\">Delete Mail</span>"
+
+#~ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+#~ msgstr "<span weight=\"bold\">Displayed Message _Headers</span>"
+
+#~ msgid "<span weight=\"bold\">Labels</span>"
+#~ msgstr "<span weight=\"bold\">Labels</span>"
+
+#~ msgid "<span weight=\"bold\">Loading Images</span>"
+#~ msgstr "<span weight=\"bold\">Loading Images</span>"
+
+#~ msgid "<span weight=\"bold\">Message Display</span>"
+#~ msgstr "<span weight=\"bold\">Message Display</span>"
+
+#~ msgid "<span weight=\"bold\">Message Fonts</span>"
+#~ msgstr "<span weight=\"bold\">Message Fonts</span>"
+
+#~ msgid "<span weight=\"bold\">Message Receipts</span>"
+#~ msgstr "<span weight=\"bold\">Message Receipts</span>"
+
+#~ msgid "<span weight=\"bold\">Optional Information</span>"
+#~ msgstr "<span weight=\"bold\">Optional Information</span>"
+
+#~ msgid "<span weight=\"bold\">Options</span>"
+#~ msgstr "<span weight=\"bold\">Options</span>"
+
+#~ msgid "<span weight=\"bold\">Printed Fonts</span>"
+#~ msgstr "<span weight=\"bold\">Printed Fonts</span>"
+
+#~ msgid "<span weight=\"bold\">Proxy Settings</span>"
+#~ msgstr "<span weight=\"bold\">Proxy Settings</span>"
+
+#~ msgid "<span weight=\"bold\">Required Information</span>"
+#~ msgstr "<span weight=\"bold\">Required Information</span>"
+
+#~ msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+#~ msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+
+#~ msgid "<span weight=\"bold\">Security</span>"
+#~ msgstr "<span weight=\"bold\">Security</span>"
+
+#~ msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+#~ msgstr "<span weight=\"bold\">Sent and Draft Messages</span>"
+
+#~ msgid "<span weight=\"bold\">Server Configuration</span>"
+#~ msgstr "<span weight=\"bold\">Server Configuration</span>"
+
+#~ msgid "<span weight=\"bold\">_Authentication Type</span>"
+#~ msgstr "<span weight=\"bold\">_Authentication Type</span>"
+
+#~ msgid ""
+#~ "Attachment\n"
+#~ "Inline\n"
+#~ "Quoted"
+#~ msgstr ""
+#~ "Attachment\n"
+#~ "Inline\n"
+#~ "Quoted"
+
+#~ msgid ""
+#~ "Attachment\n"
+#~ "Inline (Outlook style)\n"
+#~ "Quoted\n"
+#~ "Do not quote"
+#~ msgstr ""
+#~ "Attachment\n"
+#~ "Inline (Outlook style)\n"
+#~ "Quoted\n"
+#~ "Do not quote"
+
+#~ msgid "Message Composer"
+#~ msgstr "Message Composer"
+
+#~ msgid "<b>Search Folder Sources</b>"
+#~ msgstr "<b>Search Folder Sources</b>"
+
+#~ msgid "<span weight=\"bold\">Digital Signature</span>"
+#~ msgstr "<span weight=\"bold\">Digital Signature</span>"
+
+#~ msgid "<span weight=\"bold\">Encryption</span>"
+#~ msgstr "<span weight=\"bold\">Encryption</span>"
+
+#~ msgid "Delete \"{0}\"?"
+#~ msgstr "Delete \"{0}\"?"
+
+#~ msgid "Delete account?"
+#~ msgstr "Delete account?"
+
+#~ msgid "Delete messages in Search Folder?"
+#~ msgstr "Delete messages in Search Folder?"
+
+#~ msgid "Discard changes?"
+#~ msgstr "Discard changes?"
+
+#~ msgid "Mark all messages as read"
+#~ msgstr "Mark all messages as read"
+
+#~ msgid "Querying server"
+#~ msgstr "Querying server"
+
+#~ msgid "Base"
+#~ msgstr "Base"
+
+#~ msgid "_Open"
+#~ msgstr "_Open"
+
+#~ msgid ""
+#~ "389\n"
+#~ "636\n"
+#~ "3268"
+#~ msgstr ""
+#~ "389\n"
+#~ "636\n"
+#~ "3268"
+
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>Authentication</b>"
+
+#~ msgid "<b>Downloading</b>"
+#~ msgstr "<b>Downloading</b>"
+
+#~ msgid "<b>Searching</b>"
+#~ msgstr "<b>Searching</b>"
+
+#~ msgid ""
+#~ "Anonymously\n"
+#~ "Using email address\n"
+#~ "Using distinguished name (DN)"
+#~ msgstr ""
+#~ "Anonymously\n"
+#~ "Using e-mail address\n"
+#~ "Using distinguished name (DN)"
+
+#~ msgid ""
+#~ "Evolution will use this email address to authenticate you with the server."
+#~ msgstr ""
+#~ "Evolution will use this e-mail address to authenticate you with the "
+#~ "server."
+
+#~ msgid ""
+#~ "One\n"
+#~ "Sub"
+#~ msgstr ""
+#~ "One\n"
+#~ "Sub"
+
+#~ msgid ""
+#~ "SSL encryption\n"
+#~ "TLS encryption\n"
+#~ "No encryption"
+#~ msgstr ""
+#~ "SSL encryption\n"
+#~ "TLS encryption\n"
+#~ "No encryption"
+
+#~ msgid ""
+#~ "The search base is the distinguished name (DN) of the entry where your "
+#~ "searches will begin. If you leave this blank, the search will begin at "
+#~ "the root of the directory tree."
+#~ msgstr ""
+#~ "The search base is the distinguished name (DN) of the entry where your "
+#~ "searches will begin. If you leave this blank, the search will begin at "
+#~ "the root of the directory tree."
+
+#~ msgid ""
+#~ "This is the full name of your LDAP server. For example, \"ldap.mycompany."
+#~ "com\"."
+#~ msgstr ""
+#~ "This is the full name of your LDAP server. For example, \"ldap.mycompany."
+#~ "com\"."
+
+#~ msgid ""
+#~ "This is the maximum number of entries to download. Setting this number to "
+#~ "be too large will slow down your address book."
+#~ msgstr ""
+#~ "This is the maximum number of entries to download. Setting this number to "
+#~ "be too large will slow down your address book."
+
+#~ msgid ""
+#~ "This is the name for this server that will appear in your Evolution "
+#~ "folder list. It is for display purposes only. "
+#~ msgstr ""
+#~ "This is the name for this server that will appear in your Evolution "
+#~ "folder list. It is for display purposes only. "
+
+#~ msgid "Save As..."
+#~ msgstr "Save Asâ?¦"
+
+#, fuzzy
+#~ msgid "Deleting selected memos..."
+#~ msgstr "Deleting selected objectsâ?¦"
+
+#~ msgid "Copy selected memo"
+#~ msgstr "Copy selected memo"
+
+#~ msgid "Cut selected memo"
+#~ msgstr "Cut selected memo"
+
+#, fuzzy
+#~ msgid "Deleting selected tasks..."
+#~ msgstr "Deleting selected objectsâ?¦"
+
+#~ msgid "Copy selected tasks"
+#~ msgstr "Copy selected tasks"
+
+#~ msgid "Cut selected tasks"
+#~ msgstr "Cut selected tasks"
+
+#~ msgid "Select _All Messages"
+#~ msgstr "Select _All Messages"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Open Other User's Folder"
+
+#~ msgid "_Account:"
+#~ msgstr "_Account:"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "_Folder Name:"
+
+#~ msgid "_User:"
+#~ msgstr "_User:"
+
+#~ msgid "Secure Password"
+#~ msgstr "Secure Password"
+
+#~ msgid ""
+#~ "This option will connect to the Exchange server using secure password "
+#~ "(NTLM) authentication."
+#~ msgstr ""
+#~ "This option will connect to the Exchange server using secure password "
+#~ "(NTLM) authentication."
+
+#~ msgid "Plaintext Password"
+#~ msgstr "Plaintext Password"
+
+#~ msgid ""
+#~ "This option will connect to the Exchange server using standard plaintext "
+#~ "password authentication."
+#~ msgstr ""
+#~ "This option will connect to the Exchange server using standard plaintext "
+#~ "password authentication."
+
+#~ msgid "Out Of Office"
+#~ msgstr "Out Of Office"
+
+#~ msgid ""
+#~ "The message specified below will be automatically sent to \n"
+#~ "each person who sends mail to you while you are out of the office."
+#~ msgstr ""
+#~ "The message specified below will be automatically sent to \n"
+#~ "each person who sends mail to you while you are out of the office."
+
+#~ msgid "I am out of the office"
+#~ msgstr "I am out of the office"
+
+#~ msgid "I am in the office"
+#~ msgstr "I am in the office"
+
+#~ msgid "Change the password for Exchange account"
+#~ msgstr "Change the password for Exchange account"
+
+#~ msgid "Change Password"
+#~ msgstr "Change Password"
+
+#~ msgid "Manage the delegate settings for Exchange account"
+#~ msgstr "Manage the delegate settings for Exchange account"
+
+#~ msgid "Delegation Assistant"
+#~ msgstr "Delegation Assistant"
+
+#~ msgid "Miscelleneous"
+#~ msgstr "Miscelleneous"
+
+#~ msgid "View the size of all Exchange folders"
+#~ msgstr "View the size of all Exchange folders"
+
+#~ msgid "Folders Size"
+#~ msgstr "Folders Size"
+
+#~ msgid "Exchange Settings"
+#~ msgstr "Exchange Settings"
+
+#~ msgid "_OWA URL:"
+#~ msgstr "_OWA URL:"
+
+#~ msgid "A_uthenticate"
+#~ msgstr "A_uthenticate"
+
+#~ msgid "Mailbox name is _different than user name"
+#~ msgstr "Mailbox name is _different than user name"
+
+#~ msgid "_Mailbox:"
+#~ msgstr "_Mailbox:"
+
+#~ msgid "%s KB"
+#~ msgstr "%s KB"
+
+#~ msgid "0 KB"
+#~ msgstr "0 KB"
+
+#~ msgid "Size:"
+#~ msgstr "Size:"
+
+#~ msgid ""
+#~ "Evolution is in offline mode. You cannot create or modify folders now.\n"
+#~ "Please switch to online mode for such operations."
+#~ msgstr ""
+#~ "Evolution is in offline mode. You cannot create or modify folders now.\n"
+#~ "Please switch to online mode for such operations."
+
+#~ msgid ""
+#~ "The current password does not match the existing password for your "
+#~ "account. Please enter the correct password"
+#~ msgstr ""
+#~ "The current password does not match the existing password for your "
+#~ "account. Please enter the correct password"
+
+#~ msgid "The two passwords do not match. Please re-enter the passwords."
+#~ msgstr "The two passwords do not match. Please re-enter the passwords."
+
+#~ msgid "Confirm Password:"
+#~ msgstr "Confirm Password:"
+
+#~ msgid "Current Password:"
+#~ msgstr "Current Password:"
+
+#~ msgid "New Password:"
+#~ msgstr "New Password:"
+
+#~ msgid "Your current password has expired. Please change your password now."
+#~ msgstr "Your current password has expired. Please change your password now."
+
+#~ msgid "Your password will expire in the next %d days"
+#~ msgstr "Your password will expire in the next %d days"
+
+#~ msgid "Custom"
+#~ msgstr "Custom"
+
+#~ msgid "Editor (read, create, edit)"
+#~ msgstr "Editor (read, create, edit)"
+
+#~ msgid "Author (read, create)"
+#~ msgstr "Author (read, create)"
+
+#~ msgid "Reviewer (read-only)"
+#~ msgstr "Reviewer (read-only)"
+
+#~ msgid "Delegate Permissions"
+#~ msgstr "Delegate Permissions"
+
+#~ msgid "Permissions for %s"
+#~ msgstr "Permissions for %s"
+
+#~ msgid ""
+#~ "This message was sent automatically by Evolution to inform you that you "
+#~ "have been designated as a delegate. You can now send messages on my "
+#~ "behalf."
+#~ msgstr ""
+#~ "This message was sent automatically by Evolution to inform you that you "
+#~ "have been designated as a delegate. You can now send messages on my "
+#~ "behalf."
+
+#~ msgid "You have been given the following permissions on my folders:"
+#~ msgstr "You have been given the following permissions on my folders:"
+
+#~ msgid "You are also permitted to see my private items."
+#~ msgstr "You are also permitted to see my private items."
+
+#~ msgid "However you are not permitted to see my private items."
+#~ msgstr "However you are not permitted to see my private items."
+
+#~ msgid "You have been designated as a delegate for %s"
+#~ msgstr "You have been designated as a delegate for %s"
+
+#~ msgid "Delegate To"
+#~ msgstr "Delegate To"
+
+#~ msgid "Remove the delegate %s?"
+#~ msgstr "Remove the delegate %s?"
+
+#~ msgid "Could not access Active Directory"
+#~ msgstr "Could not access Active Directory"
+
+#~ msgid "Could not find self in Active Directory"
+#~ msgstr "Could not find self in Active Directory"
+
+#~ msgid "Could not find delegate %s in Active Directory"
+#~ msgstr "Could not find delegate %s in Active Directory"
+
+#~ msgid "Could not remove delegate %s"
+#~ msgstr "Could not remove delegate %s"
+
+#~ msgid "Could not update list of delegates."
+#~ msgstr "Could not update list of delegates."
+
+#~ msgid "Could not add delegate %s"
+#~ msgstr "Could not add delegate %s"
+
+#~ msgid "Error reading delegates list."
+#~ msgstr "Error reading delegates list."
+
+#~ msgid "C_alendar:"
+#~ msgstr "C_alendar:"
+
+#~ msgid "Co_ntacts:"
+#~ msgstr "Co_ntacts:"
+
+#~ msgid "Delegates"
+#~ msgstr "Delegates"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Reviewer (read-only)\n"
+#~ "Author (read, create)\n"
+#~ "Editor (read, create, edit)"
+#~ msgstr ""
+#~ "None\n"
+#~ "Reviewer (read-only)\n"
+#~ "Author (read, create)\n"
+#~ "Editor (read, create, edit)"
+
+#~ msgid "Permissions for"
+#~ msgstr "Permissions for"
+
+#~ msgid ""
+#~ "These users will be able to send mail on your behalf\n"
+#~ "and access your folders with the permissions you give them."
+#~ msgstr ""
+#~ "These users will be able to send mail on your behalf\n"
+#~ "and access your folders with the permissions you give them."
+
+#~ msgid "_Delegate can see private items"
+#~ msgstr "_Delegate can see private items"
+
+#~ msgid "_Inbox:"
+#~ msgstr "_Inbox:"
+
+#~ msgid "_Summarize permissions"
+#~ msgstr "_Summarise permissions"
+
+#~ msgid "Permissions..."
+#~ msgstr "Permissionsâ?¦"
+
+#~ msgid "Folder Name"
+#~ msgstr "Folder Name"
+
+#~ msgid "Folder Size"
+#~ msgstr "Folder Size"
+
+#~ msgid "User"
+#~ msgstr "User"
+
+#~ msgid "Subscribe to Other User's Folder"
+#~ msgstr "Subscribe to Other User's Folder"
+
+#~ msgid "Exchange Folder Tree"
+#~ msgstr "Exchange Folder Tree"
+
+#~ msgid "Unsubscribe Folder..."
+#~ msgstr "Unsubscribe Folderâ?¦"
+
+#~ msgid "Really unsubscribe from folder \"%s\"?"
+#~ msgstr "Really unsubscribe from folder \"%s\"?"
+
+#~ msgid "Unsubscribe from \"%s\""
+#~ msgstr "Unsubscribe from \"%s\""
+
+#~ msgid ""
+#~ "<b>Currently, your status is \"Out of the Office\". </b>\n"
+#~ "\n"
+#~ "Would you like to change your status to \"In the Office\"? "
+#~ msgstr ""
+#~ "<b>Currently, your status is \"Out of the Office\". </b>\n"
+#~ "\n"
+#~ "Would you like to change your status to \"In the Office\"? "
+
+#~ msgid "<b>Out of Office Message:</b>"
+#~ msgstr "<b>Out of Office Message:</b>"
+
+#~ msgid "<b>Status:</b>"
+#~ msgstr "<b>Status:</b>"
+
+#~ msgid ""
+#~ "<small>The message specified below will be automatically sent to each "
+#~ "person who sends\n"
+#~ "mail to you while you are out of the office.</small>"
+#~ msgstr ""
+#~ "<small>The message specified below will be automatically sent to each "
+#~ "person who sends\n"
+#~ "mail to you while you are out of the office.</small>"
+
+#~ msgid "I am currently in the office"
+#~ msgstr "I am currently in the office"
+
+#~ msgid "I am currently out of the office"
+#~ msgstr "I am currently out of the office"
+
+#~ msgid "No, Don't Change Status"
+#~ msgstr "No, Don't Change Status"
+
+#~ msgid "Out of Office Assistant"
+#~ msgstr "Out of Office Assistant"
+
+#~ msgid "Yes, Change Status"
+#~ msgstr "Yes, Change Status"
+
+#~ msgid "Password Expiry Warning..."
+#~ msgstr "Password Expiry Warningâ?¦"
+
+#~ msgid "Your password will expire in 7 days..."
+#~ msgstr "Your password will expire in 7 daysâ?¦"
+
+#~ msgid "_Change Password"
+#~ msgstr "_Change Password"
+
+#~ msgid "(Permission denied.)"
+#~ msgstr "(Permission denied.)"
+
+#~ msgid "Add User:"
+#~ msgstr "Add User:"
+
+#~ msgid "<b>Permissions</b>"
+#~ msgstr "<b>Permissions</b>"
+
+#~ msgid "Cannot Delete"
+#~ msgstr "Cannot Delete"
+
+#~ msgid "Cannot Edit"
+#~ msgstr "Cannot Edit"
+
+#~ msgid "Create items"
+#~ msgstr "Create items"
+
+#~ msgid "Create subfolders"
+#~ msgstr "Create subfolders"
+
+#~ msgid "Delete Any Items"
+#~ msgstr "Delete Any Items"
+
+#~ msgid "Delete Own Items"
+#~ msgstr "Delete Own Items"
+
+#~ msgid "Edit Any Items"
+#~ msgstr "Edit Any Items"
+
+#~ msgid "Edit Own Items"
+#~ msgstr "Edit Own Items"
+
+#~ msgid "Folder contact"
+#~ msgstr "Folder contact"
+
+#~ msgid "Folder owner"
+#~ msgstr "Folder owner"
+
+#~ msgid "Folder visible"
+#~ msgstr "Folder visible"
+
+#~ msgid "Read items"
+#~ msgstr "Read items"
+
+#~ msgid "Role: "
+#~ msgstr "Role: "
+
+#~ msgid "<b>Message Settings</b>"
+#~ msgstr "<b>Message Settings</b>"
+
+#~ msgid "<b>Tracking Options</b>"
+#~ msgstr "<b>Tracking Options</b>"
+
+#~ msgid "Exchange - Send Options"
+#~ msgstr "Exchange â?? Send Options"
+
+#~ msgid "I_mportance: "
+#~ msgstr "I_mportance: "
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "High\n"
+#~ "Low"
+#~ msgstr ""
+#~ "Normal\n"
+#~ "High\n"
+#~ "Low"
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "Personal\n"
+#~ "Private\n"
+#~ "Confidential"
+#~ msgstr ""
+#~ "Normal\n"
+#~ "Personal\n"
+#~ "Private\n"
+#~ "Confidential"
+
+#~ msgid "Request a _delivery receipt for this message"
+#~ msgstr "Request a _delivery receipt for this message"
+
+#~ msgid "Request a _read receipt for this message"
+#~ msgstr "Request a _read receipt for this message"
+
+#~ msgid "Send as Delegate"
+#~ msgstr "Send as Delegate"
+
+#~ msgid "_Sensitivity: "
+#~ msgstr "_Sensitivity: "
+
+#~ msgid "_User"
+#~ msgstr "_User"
+
+#~ msgid "Select User"
+#~ msgstr "Select User"
+
+#~ msgid "Address Book..."
+#~ msgstr "Address Bookâ?¦"
+
+#~ msgid "Subscribe to Other User's Contacts"
+#~ msgstr "Subscribe to Other User's Contacts"
+
+#~ msgid "Subscribe to Other User's Calendar"
+#~ msgstr "Subscribe to Other User's Calendar"
+
+#~ msgid "Activates the Evolution-Exchange extension package."
+#~ msgstr "Activates the Evolution-Exchange extension package."
+
+#~ msgid "Exchange Operations"
+#~ msgstr "Exchange Operations"
+
+#~ msgid "Cannot access the \"Exchange settings\" tab in offline mode."
+#~ msgstr "Cannot access the \"Exchange settings\" tab in offline mode."
+
+#~ msgid "Cannot change password due to configuration problems."
+#~ msgstr "Cannot change password due to configuration problems."
+
+#~ msgid "Cannot display folders."
+#~ msgstr "Cannot display folders."
+
+#~ msgid ""
+#~ "Changes to options for Exchange account \"{0}\" will only take effect "
+#~ "after restarting Evolution."
+#~ msgstr ""
+#~ "Changes to options for Exchange account \"{0}\" will only take effect "
+#~ "after restarting Evolution."
+
+#~ msgid "Could not authenticate to server."
+#~ msgstr "Could not authenticate to server."
+
+#~ msgid "Could not change password."
+#~ msgstr "Could not change password."
+
+#~ msgid ""
+#~ "Could not configure Exchange account because \n"
+#~ "an unknown error occurred. Check the URL, \n"
+#~ "username, and password, and try again."
+#~ msgstr ""
+#~ "Could not configure Exchange account because \n"
+#~ "an unknown error occurred. Check the URL, \n"
+#~ "username, and password, and try again."
+
+#~ msgid "Could not connect to Exchange server."
+#~ msgstr "Could not connect to Exchange server."
+
+#~ msgid "Could not connect to server {0}."
+#~ msgstr "Could not connect to server {0}."
+
+#~ msgid "Could not determine folder permissions for delegates."
+#~ msgstr "Could not determine folder permissions for delegates."
+
+#~ msgid "Could not find Exchange Web Storage System."
+#~ msgstr "Could not find Exchange Web Storage System."
+
+#~ msgid "Could not locate server {0}."
+#~ msgstr "Could not locate server {0}."
+
+#~ msgid "Could not make {0} a delegate"
+#~ msgstr "Could not make {0} a delegate"
+
+#~ msgid "Could not read folder permissions"
+#~ msgstr "Could not read folder permissions"
+
+#~ msgid "Could not read folder permissions."
+#~ msgstr "Could not read folder permissions."
+
+#~ msgid "Could not read out-of-office state"
+#~ msgstr "Could not read out-of-office state"
+
+#~ msgid "Could not update folder permissions."
+#~ msgstr "Could not update folder permissions."
+
+#~ msgid "Could not update out-of-office state"
+#~ msgstr "Could not update out-of-office state"
+
+#~ msgid "Evolution requires a restart to load the subscribed user's mailbox"
+#~ msgstr "Evolution requires a restart to load the subscribed user's mailbox"
+
+#~ msgid "Exchange Account is offline."
+#~ msgstr "Exchange Account is offline."
+
+#~ msgid ""
+#~ "Exchange Connector requires access to certain\n"
+#~ "functionality on the Exchange Server that appears\n"
+#~ "to be disabled or blocked. (This is usually \n"
+#~ "unintentional.) Your Exchange Administrator will \n"
+#~ "need to enable this functionality in order for \n"
+#~ "you to be able to use Evolution Exchange Connector.\n"
+#~ "\n"
+#~ "For information to provide to your Exchange \n"
+#~ "administrator, please follow the link below:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "  "
+#~ msgstr ""
+#~ "Exchange Connector requires access to certain\n"
+#~ "functionality on the Exchange Server that appears\n"
+#~ "to be disabled or blocked. (This is usually \n"
+#~ "unintentional.) Your Exchange Administrator will \n"
+#~ "need to enable this functionality in order for \n"
+#~ "you to be able to use Evolution Exchange Connector.\n"
+#~ "\n"
+#~ "For information to provide to your Exchange \n"
+#~ "administrator, please follow the link below:\n"
+#~ "\n"
+#~ "{0}\n"
+#~ "  "
+
+#~ msgid "Folder already exists"
+#~ msgstr "Folder already exists"
+
+#~ msgid "Folder does not exist"
+#~ msgstr "Folder does not exist"
+
+#~ msgid "Folder offline"
+#~ msgstr "Folder offline"
+
+#~ msgid "Generic error"
+#~ msgstr "Generic error"
+
+#~ msgid "Global Catalog Server is not reachable"
+#~ msgstr "Global Catalogue Server is not reachable"
+
+#~ msgid ""
+#~ "If OWA is running on a different path, you must specify that in the "
+#~ "account configuration dialog."
+#~ msgstr ""
+#~ "If OWA is running on a different path, you must specify that in the "
+#~ "account configuration dialogue."
+
+#~ msgid "Mailbox for {0} is not on this server."
+#~ msgstr "Mailbox for {0} is not on this server."
+
+#~ msgid "Make sure the URL is correct and try again."
+#~ msgstr "Make sure the URL is correct and try again."
+
+#~ msgid "Make sure the server name is spelled correctly and try again."
+#~ msgstr "Make sure the server name is spelt correctly and try again."
+
+#~ msgid "Make sure the username and password are correct and try again."
+#~ msgstr "Make sure the username and password are correct and try again."
+
+#~ msgid "No Global Catalog server configured for this account."
+#~ msgstr "No Global Catalogue server configured for this account."
+
+#~ msgid "No mailbox for user {0} on {1}."
+#~ msgstr "No mailbox for user {0} on {1}."
+
+#~ msgid "No such user {0}"
+#~ msgstr "No such user {0}"
+
+#~ msgid "Password successfully changed."
+#~ msgstr "Password successfully changed."
+
+#~ msgid ""
+#~ "Please enter a Delegate's ID or deselect the Send as a Delegate option."
+#~ msgstr ""
+#~ "Please enter a Delegate's ID or deselect the Send as a Delegate option."
+
+#~ msgid "Please make sure the Global Catalog Server name is correct."
+#~ msgstr ""
+#~ "Please make sure the name of the Global Catalogue Server is correct."
+
+#~ msgid "Please restart Evolution for changes to take effect"
+#~ msgstr "Please restart Evolution for changes to take effect"
+
+#~ msgid "Please select a user."
+#~ msgstr "Please select a user."
+
+#~ msgid "Server rejected password because it is too weak."
+#~ msgstr "Server rejected password because it is too weak."
+
+#~ msgid "The Exchange account will be disabled when you quit Evolution"
+#~ msgstr "The Exchange account will be disabled when you quit Evolution"
+
+#~ msgid "The Exchange account will be removed when you quit Evolution"
+#~ msgstr "The Exchange account will be removed when you quit Evolution"
+
+#~ msgid "The Exchange server is not compatible with Exchange Connector."
+#~ msgstr "The Exchange server is not compatible with Exchange Connector."
+
+#~ msgid ""
+#~ "The server is running Exchange 5.5. Exchange Connector \n"
+#~ "supports Microsoft Exchange 2000 and 2003 only."
+#~ msgstr ""
+#~ "The server is running Exchange 5.5. Exchange Connector \n"
+#~ "supports Microsoft Exchange 2000 and 2003 only."
+
+#~ msgid ""
+#~ "This probably means that your server requires \n"
+#~ "you to specify the Windows domain name \n"
+#~ "as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
+#~ "\n"
+#~ "Or you might have just typed your password wrong."
+#~ msgstr ""
+#~ "This probably means that your server requires \n"
+#~ "you to specify the Windows domain name \n"
+#~ "as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
+#~ "\n"
+#~ "Or you might have just typed your password wrong."
+
+#~ msgid "Try again with a different password."
+#~ msgstr "Try again with a different password."
+
+#~ msgid "Unable to add user to access control list:"
+#~ msgstr "Unable to add user to access control list:"
+
+#~ msgid "Unable to edit delegates."
+#~ msgstr "Unable to edit delegates."
+
+#~ msgid "Unknown error looking up {0}"
+#~ msgstr "Unknown error looking up {0}"
+
+#~ msgid "Unknown type"
+#~ msgstr "Unknown type"
+
+#~ msgid "Unsupported operation"
+#~ msgstr "Unsupported operation"
+
+#~ msgid ""
+#~ "You are nearing your quota available for storing mail on this server."
+#~ msgstr ""
+#~ "You are nearing your quota available for storing mail on this server."
+
+#~ msgid ""
+#~ "You are permitted to send a message on behalf of only one delegator at a "
+#~ "time."
+#~ msgstr ""
+#~ "You are permitted to send a message on behalf of only one delegator at a "
+#~ "time."
+
+#~ msgid "You cannot make yourself your own delegate"
+#~ msgstr "You cannot make yourself your own delegate"
+
+#~ msgid "You have exceeded your quota for storing mail on this server."
+#~ msgstr "You have exceeded your quota for storing mail on this server."
+
+#~ msgid "You may only configure a single Exchange account."
+#~ msgstr "You may only configure a single Exchange account."
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. Try to clear up some space by deleting "
+#~ "some mail."
+#~ msgstr ""
+#~ "Your current usage is: {0} KB. Try to clear up some space by deleting "
+#~ "some mail."
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. You will not be able to either send or "
+#~ "receive mail now."
+#~ msgstr ""
+#~ "Your current usage is: {0} KB. You will not be able to either send or "
+#~ "receive mail now."
+
+#~ msgid ""
+#~ "Your current usage is: {0} KB. You will not be able to send mail until "
+#~ "you clear up some space by deleting some mail."
+#~ msgstr ""
+#~ "Your current usage is: {0} KB. You will not be able to send mail until "
+#~ "you clear up some space by deleting some mail."
+
+#~ msgid "Your password has expired."
+#~ msgstr "Your password has expired."
+
+#~ msgid "{0} cannot be added to an access control list"
+#~ msgstr "{0} cannot be added to an access control list"
+
+#~ msgid "{0} is already a delegate"
+#~ msgstr "{0} is already a delegate"
+
+#~ msgid "{0} is already in the list"
+#~ msgstr "{0} is already in the list"
+
+#~ msgid "Subscribe to Other User's Tasks"
+#~ msgstr "Subscribe to Other User's Tasks"
+
+#~ msgid "Check folder permissions"
+#~ msgstr "Check folder permissions"
+
+#~ msgid "PNG files"
+#~ msgstr "PNG files"
+
+#~ msgid "_Face"
+#~ msgstr "_Face"
+
+#~ msgid ""
+#~ "Attach a small picture of your face to outgoing messages.\n"
+#~ "\n"
+#~ "First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+#~ "encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+#~ "sent messages."
+#~ msgstr ""
+#~ "Attach a small picture of your face to outgoing messages.\n"
+#~ "\n"
+#~ "First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+#~ "encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+#~ "sent messages."
+
+#~ msgid "Add Novell GroupWise support to Evolution."
+#~ msgstr "Add Novell GroupWise support to Evolution."
+
+#~ msgid "GroupWise Account Setup"
+#~ msgstr "GroupWise Account Setup"
+
+#~ msgid "<b>Junk List:</b>"
+#~ msgstr "<b>Junk List:</b>"
+
+#~ msgid "<b>Name</b>"
+#~ msgstr "<b>Name</b>"
+
+#~ msgid "<b>Custom Headers</b>"
+#~ msgstr "<b>Custom Headers</b>"
+
+#~ msgid "<b>IMAP Headers</b>"
+#~ msgstr "<b>IMAP Headers</b>"
+
+#~ msgid "Hardware Abstraction Layer not loaded"
+#~ msgstr "Hardware Abstraction Layer not loaded"
+
+#~ msgid ""
+#~ "The \"hald\" service is required but not currently running. Please enable "
+#~ "the service and rerun this program, or contact your system administrator."
+#~ msgstr ""
+#~ "The \"hald\" service is required but not currently running. Please enable "
+#~ "the service and rerun this program, or contact your system administrator."
+
+#~ msgid ""
+#~ "Evolution could not find an iPod to synchronize with. Either the iPod is "
+#~ "not connected to the system or it is not powered on."
+#~ msgstr ""
+#~ "Evolution could not find an iPod to synchronise with. Either the iPod is "
+#~ "not connected to the system or it is not powered on."
+
+#~ msgid "Synchronize to iPod"
+#~ msgstr "Synchronise to iPod"
+
+#~ msgid "Synchronize your data with your Apple iPod."
+#~ msgstr "Synchronise your data with your Apple iPod."
+
+#~ msgid "Prefer PLAIN"
+#~ msgstr "Prefer PLAIN"
+
+#~ msgid "<span weight=\"bold\">Location</span>"
+#~ msgstr "<span weight=\"bold\">Location</span>"
+
+#~ msgid "<span weight=\"bold\">Sources</span>"
+#~ msgstr "<span weight=\"bold\">Sources</span>"
+
+#~ msgid ""
+#~ "Secure FTP (SSH)\n"
+#~ "Public FTP\n"
+#~ "FTP (with login)\n"
+#~ "Windows share\n"
+#~ "WebDAV (HTTP)\n"
+#~ "Secure WebDAV (HTTPS)\n"
+#~ "Custom Location"
+#~ msgstr ""
+#~ "Secure FTP (SSH)\n"
+#~ "Public FTP\n"
+#~ "FTP (with login)\n"
+#~ "Windows share\n"
+#~ "WebDAV (HTTP)\n"
+#~ "Secure WebDAV (HTTPS)\n"
+#~ "Custom Location"
+
+#~ msgid ""
+#~ "days\n"
+#~ "weeks\n"
+#~ "months"
+#~ msgstr ""
+#~ "days\n"
+#~ "weeks\n"
+#~ "months"
+
+#~ msgid ""
+#~ "iCal\n"
+#~ "Free/Busy"
+#~ msgstr ""
+#~ "iCal\n"
+#~ "Free/Busy"
+
+#~ msgid "Import File"
+#~ msgstr "Import File"
+
+#~ msgid "_Synchronization Options..."
+#~ msgstr "_Synchronisation Optionsâ?¦"
+
+#~ msgid "<b>Field Value</b>"
+#~ msgstr "<b>Field Value</b>"
+
+#~ msgid "<b>Fingerprints</b>"
+#~ msgstr "<b>Fingerprints</b>"
+
+#~ msgid "<b>Issued By</b>"
+#~ msgstr "<b>Issued By</b>"
+
+#~ msgid "<b>Issued To</b>"
+#~ msgstr "<b>Issued To</b>"
+
+#~ msgid "Dummy window only"
+#~ msgstr "Dummy window only"
+
+#~ msgid "Could not execute '%s': %s\n"
+#~ msgstr "Could not execute '%s': %s\n"
+
+#~ msgid "Shutting down %s (%s)\n"
+#~ msgstr "Shutting down %s (%s)\n"
+
+#~ msgid "<b>Time Zones</b>"
+#~ msgstr "<b>Time Zones</b>"
+
+#~ msgid "<b>_Selection</b>"
+#~ msgstr "<b>_Selection</b>"
+
+#~ msgid "Hide _Attachment Bar"
+#~ msgstr "Hide _Attachment Bar"
+
+#, fuzzy
+#~ msgid "Source Action"
+#~ msgstr "Source Account"
+
+#, fuzzy
+#~ msgid "The source action to proxy"
+#~ msgstr "The orientation of the tray."
+
+#~ msgid "<b>Replies</b>"
+#~ msgstr "<b>Replies</b>"
+
+#~ msgid "<b>Status Tracking</b>"
+#~ msgstr "<b>Status Tracking</b>"
+
+#~ msgid ""
+#~ "Normal\n"
+#~ "Proprietary\n"
+#~ "Confidential\n"
+#~ "Secret\n"
+#~ "Top Secret\n"
+#~ "For Your Eyes Only"
+#~ msgstr ""
+#~ "Normal\n"
+#~ "Proprietary\n"
+#~ "Confidential\n"
+#~ "Secret\n"
+#~ "Top Secret\n"
+#~ "For Your Eyes Only"
+
+#~ msgid ""
+#~ "Undefined\n"
+#~ "High\n"
+#~ "Standard\n"
+#~ "Low"
+#~ msgstr ""
+#~ "Undefined\n"
+#~ "High\n"
+#~ "Standard\n"
+#~ "Low"
+
+#~ msgid "Add a column..."
+#~ msgstr "Add a columnâ?¦"
+
+#~ msgid "Field Chooser"
+#~ msgstr "Field Chooser"
+
+#~ msgid "Tree"
+#~ msgstr "Tree"
+
 #~ msgid "search bar"
 #~ msgstr "search bar"
 
@@ -23217,9 +23920,6 @@ msgstr "Handle Popup"
 #~ msgid "Querying Address Book..."
 #~ msgstr "Querying Address Bookâ?¦"
 
-#~ msgid "Calendars"
-#~ msgstr "Calendars"
-
 #~ msgid "Configure your timezone, Calendar and Task List here "
 #~ msgstr "Configure your timezone, Calendar and Task List here "
 
@@ -23253,70 +23953,6 @@ msgstr "Handle Popup"
 #~ msgid "Evolution Calendar alarm notification service"
 #~ msgstr "Evolution Calendar alarm notification service"
 
-#~ msgid "minute"
-#~ msgid_plural "minutes"
-#~ msgstr[0] "minute"
-#~ msgstr[1] "minutes"
-
-#~ msgid "Start time"
-#~ msgstr "Start time"
-
-#~ msgid "Dismiss _All"
-#~ msgstr "Dismiss _All"
-
-#~ msgid "Snooze _time:"
-#~ msgstr "Snooze _time:"
-
-#~ msgid "_Dismiss"
-#~ msgstr "_Dismiss"
-
-#~ msgid "_Snooze"
-#~ msgstr "_Snooze"
-
-#~ msgid "location of appointment"
-#~ msgstr "location of appointment"
-
-#~ msgid "No summary available."
-#~ msgstr "No summary available."
-
-#~ msgid "No description available."
-#~ msgstr "No description available."
-
-#~ msgid "No location information available."
-#~ msgstr "No location information available."
-
-#~ msgid "You have %d alarms"
-#~ msgstr "You have %d alarms"
-
-#~ msgid ""
-#~ "Evolution does not support calendar reminders with\n"
-#~ "email notifications yet, but this reminder was\n"
-#~ "configured to send an email.  Evolution will display\n"
-#~ "a normal reminder dialog box instead."
-#~ msgstr ""
-#~ "Evolution does not support calendar reminders with\n"
-#~ "e-mail notifications yet, but this reminder was\n"
-#~ "configured to send an e-mail.  Evolution will display\n"
-#~ "a normal reminder dialogue box instead."
-
-#~ msgid ""
-#~ "An Evolution Calendar reminder is about to trigger. This reminder is "
-#~ "configured to run the following program:\n"
-#~ "\n"
-#~ "        %s\n"
-#~ "\n"
-#~ "Are you sure you want to run this program?"
-#~ msgstr ""
-#~ "An Evolution Calendar reminder is about to trigger. This reminder is "
-#~ "configured to run the following program:\n"
-#~ "\n"
-#~ "        %s\n"
-#~ "\n"
-#~ "Are you sure you want to run this program?"
-
-#~ msgid "Do not ask me about this program again."
-#~ msgstr "Do not ask me about this program again."
-
 #~ msgid "Could not initialize Bonobo"
 #~ msgstr "Could not initialise Bonobo"
 
@@ -23327,9 +23963,6 @@ msgstr "Handle Popup"
 #~ "Could not create the alarm notify service factory, maybe it's already "
 #~ "runningâ?¦"
 
-#~ msgid "invalid time"
-#~ msgstr "invalid time"
-
 #~ msgid ""
 #~ "Position of the vertical pane, between the task list and the task preview "
 #~ "pane, in pixels."
@@ -23370,9 +24003,6 @@ msgstr "Handle Popup"
 #~ msgid "New all day appointment"
 #~ msgstr "New all day appointment"
 
-#~ msgid "New calendar"
-#~ msgstr "New calendar"
-
 #~ msgid "Error while opening the calendar"
 #~ msgstr "Error while opening the calendar"
 
@@ -23382,9 +24012,6 @@ msgstr "Handle Popup"
 #~ msgid "Permission denied to open the calendar"
 #~ msgstr "Permission denied to open the calendar"
 
-#~ msgid "Unknown error"
-#~ msgstr "Unknown error"
-
 #~ msgid "_Add "
 #~ msgstr "_Add "
 
@@ -23427,9 +24054,6 @@ msgstr "Handle Popup"
 #~ msgid "Completing tasks..."
 #~ msgstr "Completing tasksâ?¦"
 
-#~ msgid "Expunging"
-#~ msgstr "Expunging"
-
 #~ msgid "_Custom View"
 #~ msgstr "_Custom View"
 
@@ -23445,9 +24069,6 @@ msgstr "Handle Popup"
 #~ msgid "Loading memos at %s"
 #~ msgstr "Loading memos at %s"
 
-#~ msgid "Purging"
-#~ msgstr "Purging"
-
 #~ msgid "Failed upgrading memos."
 #~ msgstr "Failed upgrading memos."
 
@@ -23489,9 +24110,6 @@ msgstr "Handle Popup"
 #~ msgid "Tas_k list"
 #~ msgstr "Tas_k list"
 
-#~ msgid "Hide"
-#~ msgstr "Hide"
-
 #~ msgid "Component"
 #~ msgstr "Component"
 
@@ -23546,12 +24164,6 @@ msgstr "Handle Popup"
 #~ msgid "Signature(s)"
 #~ msgstr "Signature(s)"
 
-#~ msgid "Account Search"
-#~ msgstr "Account Search"
-
-#~ msgid "All Account Search"
-#~ msgstr "All Account Search"
-
 #~ msgid "_Copy to Folder"
 #~ msgstr "_Copy to Folder"
 
@@ -23567,9 +24179,6 @@ msgstr "Handle Popup"
 #~ msgid "_Move..."
 #~ msgstr "_Moveâ?¦"
 
-#~ msgid "Re_fresh"
-#~ msgstr "Re_fresh"
-
 #~ msgid "_Unread Search Folder"
 #~ msgstr "_Unread Search Folder"
 
@@ -23609,9 +24218,6 @@ msgstr "Handle Popup"
 #~ msgid "_Fit to Width"
 #~ msgstr "_Fit to Width"
 
-#~ msgid "Show _Original Size"
-#~ msgstr "Show _Original Size"
-
 #~ msgid "Tag"
 #~ msgstr "Tag"
 
@@ -23908,9 +24514,6 @@ msgstr "Handle Popup"
 #~ msgid "Select all and only the messages that are not currently selected"
 #~ msgstr "Select all and only the messages that are not currently selected"
 
-#~ msgid "Cut selected messages to the clipboard"
-#~ msgstr "Cut selected messages to the clipboard"
-
 #~ msgid "Not Junk"
 #~ msgstr "Not Junk"
 
@@ -24016,45 +24619,21 @@ msgstr "Handle Popup"
 #~ msgid "activate"
 #~ msgstr "activate"
 
-#~ msgid "3268"
-#~ msgstr "3268"
-
-#~ msgid "389"
-#~ msgstr "389"
-
-#~ msgid "636"
-#~ msgstr "636"
-
 #~ msgid "<b>Type:</b>"
 #~ msgstr "<b>Type:</b>"
 
 #~ msgid "Add Address Book"
 #~ msgstr "Add Address Book"
 
-#~ msgid "Anonymously"
-#~ msgstr "Anonymously"
-
 #~ msgid "Basic"
 #~ msgstr "Basic"
 
-#~ msgid "Distinguished name"
-#~ msgstr "Distinguished name"
-
 #~ msgid "Email address"
 #~ msgstr "E-mail address"
 
 #~ msgid "Find Possible Search Bases"
 #~ msgstr "Find Possible Search Bases"
 
-#~ msgid "Search filter"
-#~ msgstr "Search filter"
-
-#~ msgid "Sub"
-#~ msgstr "Sub"
-
-#~ msgid "Using email address"
-#~ msgstr "Using e-mail address"
-
 #~ msgid "Whenever Possible"
 #~ msgstr "Whenever Possible"
 
@@ -24823,39 +25402,6 @@ msgstr "Handle Popup"
 #~ msgid "_ZIP Code:"
 #~ msgstr "Post _Code:"
 
-#~ msgid "Dr."
-#~ msgstr "Dr."
-
-#~ msgid "Esq."
-#~ msgstr "Esq."
-
-#~ msgid "I"
-#~ msgstr "I"
-
-#~ msgid "II"
-#~ msgstr "II"
-
-#~ msgid "III"
-#~ msgstr "III"
-
-#~ msgid "Jr."
-#~ msgstr "Jr."
-
-#~ msgid "Miss"
-#~ msgstr "Miss"
-
-#~ msgid "Mr."
-#~ msgstr "Mr."
-
-#~ msgid "Mrs."
-#~ msgstr "Mrs."
-
-#~ msgid "Ms."
-#~ msgstr "Ms."
-
-#~ msgid "Sr."
-#~ msgstr "Sr."
-
 #~ msgid "Add IM Account"
 #~ msgstr "Add IM Account"
 
@@ -24907,9 +25453,6 @@ msgstr "Handle Popup"
 #~ msgid "Immediately follow each other"
 #~ msgstr "Immediately follow each other"
 
-#~ msgid "Include:"
-#~ msgstr "Include:"
-
 #~ msgid "Landscape"
 #~ msgstr "Landscape"
 
@@ -24925,9 +25468,6 @@ msgstr "Handle Popup"
 #~ msgid "Number of columns:"
 #~ msgstr "Number of columns:"
 
-#~ msgid "Options"
-#~ msgstr "Options"
-
 #~ msgid "Orientation"
 #~ msgstr "Orientation"
 
@@ -24982,21 +25522,6 @@ msgstr "Handle Popup"
 #~ msgid "daylight savings time"
 #~ msgstr "daylight savings time"
 
-#~ msgid "after"
-#~ msgstr "after"
-
-#~ msgid "day(s)"
-#~ msgstr "day(s)"
-
-#~ msgid "end of appointment"
-#~ msgstr "end of appointment"
-
-#~ msgid "hour(s)"
-#~ msgstr "hour(s)"
-
-#~ msgid "minute(s)"
-#~ msgstr "minute(s)"
-
 #~ msgid "Adjust for daylight sa_ving time"
 #~ msgstr "Adjust for daylight sa_ving time"
 
@@ -25008,30 +25533,12 @@ msgstr "Handle Popup"
 #~ msgstr[0] "<b>%d</b> Attachment"
 #~ msgstr[1] "<b>%d</b> Attachments"
 
-#~ msgid "Hide Attachment _Bar"
-#~ msgstr "Hide Attachment _Bar"
-
-#~ msgid "Show Attachment _Bar"
-#~ msgstr "Show Attachment _Bar"
-
 #~ msgid "Show Attachments"
 #~ msgstr "Show Attachments"
 
 #~ msgid "Press space key to toggle attachment bar"
 #~ msgstr "Press space key to toggle attachment bar"
 
-#~ msgid "1 day before appointment"
-#~ msgstr "1 day before appointment"
-
-#~ msgid "1 hour before appointment"
-#~ msgstr "1 hour before appointment"
-
-#~ msgid "15 minutes before appointment"
-#~ msgstr "15 minutes before appointment"
-
-#~ msgid "for"
-#~ msgstr "for"
-
 #~ msgid "<b>Att_endees</b>"
 #~ msgstr "<b>Att_endees</b>"
 
@@ -25041,57 +25548,9 @@ msgstr "Handle Popup"
 #~ msgid "Co_ntacts..."
 #~ msgstr "Co_ntacts..."
 
-#~ msgid "forever"
-#~ msgstr "forever"
-
-#~ msgid "month(s)"
-#~ msgstr "month(s)"
-
-#~ msgid "week(s)"
-#~ msgstr "week(s)"
-
-#~ msgid "year(s)"
-#~ msgstr "year(s)"
-
 #~ msgid "_Save Selected"
 #~ msgstr "_Save Selected"
 
-#~ msgid "April"
-#~ msgstr "April"
-
-#~ msgid "August"
-#~ msgstr "August"
-
-#~ msgid "December"
-#~ msgstr "December"
-
-#~ msgid "February"
-#~ msgstr "February"
-
-#~ msgid "January"
-#~ msgstr "January"
-
-#~ msgid "July"
-#~ msgstr "July"
-
-#~ msgid "June"
-#~ msgstr "June"
-
-#~ msgid "March"
-#~ msgstr "March"
-
-#~ msgid "May"
-#~ msgstr "May"
-
-#~ msgid "November"
-#~ msgstr "November"
-
-#~ msgid "October"
-#~ msgstr "October"
-
-#~ msgid "September"
-#~ msgstr "September"
-
 #~ msgid "Could not open autosave file"
 #~ msgstr "Could not open autosave file"
 
@@ -25113,18 +25572,6 @@ msgstr "Handle Popup"
 #~ msgid "Toggles whether the To field is displayed"
 #~ msgstr "Toggles whether the To field is displayed"
 
-#~ msgid "ago"
-#~ msgstr "ago"
-
-#~ msgid "months"
-#~ msgstr "months"
-
-#~ msgid "the time you specify"
-#~ msgstr "the time you specify"
-
-#~ msgid "years"
-#~ msgstr "years"
-
 #~ msgid "Retrieving Message..."
 #~ msgstr "Retrieving Message..."
 
@@ -25207,24 +25654,9 @@ msgstr "Handle Popup"
 #~ msgid "Ch_eck for Supported Types "
 #~ msgstr "Ch_eck for Supported Types "
 
-#~ msgid "Do not quote"
-#~ msgstr "Do not quote"
-
-#~ msgid "Inline (Outlook style)"
-#~ msgstr "Inline (Outlook style)"
-
-#~ msgid "Quoted"
-#~ msgstr "Quoted"
-
 #~ msgid "S_OCKS Host:"
 #~ msgstr "S_OCKS Host:"
 
-#~ msgid "Select Drafts Folder"
-#~ msgstr "Select Drafts Folder"
-
-#~ msgid "Select Sent Folder"
-#~ msgstr "Select Sent Folder"
-
 #~ msgid "_Automatic proxy configuration URL:"
 #~ msgstr "_Automatic proxy configuration URL:"
 
@@ -25576,9 +26008,6 @@ msgstr "Handle Popup"
 #~ msgid "Key Customer"
 #~ msgstr "Key Customer"
 
-#~ msgid "Miscellaneous"
-#~ msgstr "Miscellaneous"
-
 #~ msgid "Next 7 days"
 #~ msgstr "Next 7 days"
 
@@ -25588,9 +26017,6 @@ msgstr "Handle Popup"
 #~ msgid "Strategies"
 #~ msgstr "Strategies"
 
-#~ msgid "Suppliers"
-#~ msgstr "Suppliers"
-
 #~ msgid "Time &amp; Expenses"
 #~ msgstr "Time &amp; Expenses"
 
@@ -25652,9 +26078,6 @@ msgstr "Handle Popup"
 #~ msgid "Upcoming Appointments"
 #~ msgstr "Upcoming Appointments"
 
-#~ msgid "_Save Message"
-#~ msgstr "_Save Message"
-
 #~ msgid "folder-display|%s (%u)"
 #~ msgstr "%s (%u)"
 
@@ -25747,9 +26170,6 @@ msgstr "Handle Popup"
 #~ msgid "Status Details"
 #~ msgstr "Status Details"
 
-#~ msgid "Time Zone"
-#~ msgstr "Time Zone"
-
 #~ msgid "%u byte"
 #~ msgid_plural "%u bytes"
 #~ msgstr[0] "%u byte"
@@ -25773,9 +26193,6 @@ msgstr "Handle Popup"
 #~ msgid "<b>Server Information</b>"
 #~ msgstr "<b>Server Information</b>"
 
-#~ msgid "Unknown reason"
-#~ msgstr "Unknown reason"
-
 #~ msgid "Open File"
 #~ msgstr "Open File"
 
@@ -25927,15 +26344,9 @@ msgstr "Handle Popup"
 #~ msgid "Insert email addresses from Address Book"
 #~ msgstr "Insert email addresses from Address Book"
 
-#~ msgid "Members"
-#~ msgstr "Members"
-
 #~ msgid "Remove an email address from the List"
 #~ msgstr "Remove an email address from the List"
 
-#~ msgid "_Select"
-#~ msgstr "_Select"
-
 #~ msgid ""
 #~ "The changed email or name of this contact already\n"
 #~ "exists in this folder.  Would you like to add it anyway?"
@@ -26016,9 +26427,6 @@ msgstr "Handle Popup"
 #~ msgid "Calendar Group"
 #~ msgstr "Calendar Group"
 
-#~ msgid "Calendar Location"
-#~ msgstr "Calendar Location"
-
 #~ msgid "Calendar Name"
 #~ msgstr "Calendar Name"
 
@@ -26056,15 +26464,9 @@ msgstr "Handle Popup"
 #~ msgid "Free/Busy Publishing Settings"
 #~ msgstr "Free/Busy Publishing Settings"
 
-#~ msgid "_Daily"
-#~ msgstr "_Daily"
-
 #~ msgid "_Manual"
 #~ msgstr "_Manual"
 
-#~ msgid "_Weekly"
-#~ msgstr "_Weekly"
-
 #~ msgid "Task sort"
 #~ msgstr "Task sort"
 
@@ -26374,9 +26776,6 @@ msgstr "Handle Popup"
 #~ msgid "Print envelope"
 #~ msgstr "Print envelope"
 
-#~ msgid "Print contacts"
-#~ msgstr "Print contacts"
-
 #~ msgid "Print contact"
 #~ msgstr "Print contact"
 
@@ -26551,24 +26950,6 @@ msgstr "Handle Popup"
 #~ msgid "Don't Remove"
 #~ msgstr "Don't Remove"
 
-#~ msgid "05 minutes"
-#~ msgstr "05 minutes"
-
-#~ msgid "10 minutes"
-#~ msgstr "10 minutes"
-
-#~ msgid "15 minutes"
-#~ msgstr "15 minutes"
-
-#~ msgid "30 minutes"
-#~ msgstr "30 minutes"
-
-#~ msgid "60 minutes"
-#~ msgstr "60 minutes"
-
-#~ msgid "<b>Default Free/Busy Server</b>"
-#~ msgstr "<b>Default Free/Busy Server</b>"
-
 #~ msgid "<b>General</b>"
 #~ msgstr "<b>General</b>"
 
@@ -26593,15 +26974,6 @@ msgstr "Handle Popup"
 #~ msgid "Color for tasks due today"
 #~ msgstr "Colour for tasks due today"
 
-#~ msgid "Days"
-#~ msgstr "Days"
-
-#~ msgid "Hours"
-#~ msgstr "Hours"
-
-#~ msgid "Minutes"
-#~ msgstr "Minutes"
-
 #~ msgid "_Add URL"
 #~ msgstr "_Add URL"
 
@@ -26623,9 +26995,6 @@ msgstr "Handle Popup"
 #~ msgid "<b>Basics</b>"
 #~ msgstr "<b>Basics</b>"
 
-#~ msgid "A_ll day event"
-#~ msgstr "A_ll day event"
-
 #~ msgid "Cale_ndar:"
 #~ msgstr "Cale_ndar:"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]