[evolution] Updated British English translation



commit e0d57675aab60874d9129473efec4e0d264e225c
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Wed Mar 16 18:00:18 2011 +0000

    Updated British English translation

 po/en_GB.po | 4951 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 2549 insertions(+), 2402 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 0a69b94..45ed57a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,16 +2,16 @@
 # 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 <bruce bcowan me uk>, 2009, 2010.
+# Bruce Cowan <bruce bcowan me uk>, 2009, 2010, 2011.
 # Philip Withnall <philip tecnocode co uk>, 2010.
-#: ../shell/main.c:579
+#: ../shell/main.c:615
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-01 21:29+0000\n"
-"PO-Revision-Date: 2010-09-11 18:02+0100\n"
-"Last-Translator: Philip Withnall <philip tecnocode co uk>\n"
+"POT-Creation-Date: 2011-03-16 17:56+0000\n"
+"PO-Revision-Date: 2011-03-16 17:59+0100\n"
+"Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
@@ -86,7 +86,7 @@ msgid "Delete address book '{0}'?"
 msgstr "Delete address book '{0}'?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:46
 msgid "Do _Not Delete"
 msgstr "Do _Not Delete"
 
@@ -214,7 +214,7 @@ msgid ""
 msgstr ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:603
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:610
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:9
 #: ../widgets/table/e-table-config.ui.h:18
@@ -238,8 +238,8 @@ msgid "_Use as it is"
 msgstr "_Use as it is"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2087
+#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../calendar/gui/e-calendar-view.c:2078
 msgid "Anniversary"
 msgstr "Anniversary"
 
@@ -249,8 +249,8 @@ msgstr "Anniversary"
 #. * 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:2086 ../capplet/anjal-settings-main.c:123
+#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:116
 #: ../shell/main.c:133
 msgid "Birthday"
 msgstr "Birthday"
@@ -271,23 +271,23 @@ msgid "Calendar:"
 msgstr "Calendar:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:934
+#: ../addressbook/importers/evolution-vcard-importer.c:950
 msgid "Contact"
 msgstr "Contact"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../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:2607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:623
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:643
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2654
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:298
+#: ../addressbook/gui/merging/eab-contact-merging.c:295
 #: ../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
+#: ../addressbook/gui/widgets/eab-contact-display.c:494
+#: ../addressbook/gui/widgets/eab-contact-display.c:502
+#: ../addressbook/gui/widgets/eab-contact-display.c:844
 #: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "E-mail"
@@ -301,8 +301,8 @@ msgid "Full _Name..."
 msgstr "Full _Nameâ?¦"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:70
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:68
 msgid "Home"
 msgstr "Home"
 
@@ -337,17 +337,17 @@ msgstr "Nic_kname:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:260
-#: ../plugins/groupwise-features/camel-gw-listener.c:423
-#: ../plugins/groupwise-features/camel-gw-listener.c:448
-#: ../plugins/groupwise-features/camel-gw-listener.c:563
+#: ../plugins/groupwise-features/camel-gw-listener.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:454
+#: ../plugins/groupwise-features/camel-gw-listener.c:570
 msgid "Notes"
 msgstr "Notes"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:71
-#: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1792
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:359
+#: ../calendar/gui/e-calendar-view.c:1783
 msgid "Other"
 msgstr "Other"
 
@@ -372,9 +372,9 @@ msgid "Web addresses"
 msgstr "Web addresses"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:69
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:67
+#: ../addressbook/gui/widgets/eab-contact-display.c:554
 msgid "Work"
 msgstr "Work"
 
@@ -399,7 +399,7 @@ msgid "_Blog:"
 msgstr "_Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:887
+#: ../calendar/gui/dialogs/event-page.c:881
 #: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../plugins/itip-formatter/itip-view.c:1922
 msgid "_Calendar:"
@@ -479,74 +479,74 @@ msgstr "_Where:"
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/Postal Code:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:539
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/widgets/eab-contact-display.c:519
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:544
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/widgets/eab-contact-display.c:521
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:522
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:543
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:520
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:518
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:517
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:546
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:523
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:381
 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:222
 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:236
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:602
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2602
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:638
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2649
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Contact Editor â?? %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3025
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3070
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3026
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
 msgid "_No image"
 msgstr "_No image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3299
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3352
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -554,43 +554,43 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3303
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3356
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3363
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3325
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3336
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3378
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3389
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' is empty"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3404
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:392
 msgid "Contact Quick-Add"
 msgstr "Contact Quick-Add"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:395
 msgid "_Edit Full"
 msgstr "_Edit Full"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:443
 msgid "_Full name"
 msgstr "_Full name"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
 msgid "E_mail"
 msgstr "E_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:465
 msgid "_Select Address Book"
 msgstr "_Select Address Book"
 
@@ -660,7 +660,7 @@ msgid "_Suffix:"
 msgstr "_Suffix:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:659
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:652
 msgid "Contact List Editor"
 msgstr "Contact List Editor"
 
@@ -677,7 +677,7 @@ msgid "_List name:"
 msgstr "_List name:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:159
 msgid "_Select..."
 msgstr "_Selectâ?¦"
 
@@ -685,24 +685,24 @@ msgstr "_Selectâ?¦"
 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:753
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:746
 msgid "Contact List Members"
 msgstr "Contact List Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:907
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1322
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1316
 msgid "_Members"
 msgstr "_Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1160
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1153
 msgid "Error adding list"
 msgstr "Error adding list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1174
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1167
 msgid "Error modifying list"
 msgstr "Error modifying list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1188
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1181
 msgid "Error removing list"
 msgstr "Error removing list"
 
@@ -710,16 +710,17 @@ msgstr "Error removing list"
 msgid "Changed Contact:"
 msgstr "Changed Contact:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
+#. Translators: Heading of the contact which has same name or email address in this folder already.
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
 msgid "Conflicting Contact:"
 msgstr "Conflicting Contact:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 #: ../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.ui.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
 msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
@@ -744,17 +745,17 @@ msgstr ""
 "in this folder.  Would you like to add it anyway?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:244
+#: ../addressbook/gui/merging/eab-contact-merging.c:241
 msgid "_Merge"
 msgstr "_Merge"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:169
-#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
+#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../calendar/gui/tasktypes.xml.h:7
 #, c-format
 msgid "Cancelled"
 msgstr "Cancelled"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:227
+#: ../addressbook/gui/merging/eab-contact-merging.c:224
 msgid "Merge Contact"
 msgstr "Merge Contact"
 
@@ -762,7 +763,7 @@ msgstr "Merge Contact"
 #: ../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:920
-#: ../modules/calendar/e-cal-shell-view-actions.c:1692
+#: ../modules/calendar/e-cal-shell-view-actions.c:1693
 #: ../modules/calendar/e-memo-shell-view-actions.c:774
 #: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Any field contains"
@@ -778,22 +779,22 @@ msgstr "E-mail begins with"
 msgid "Name contains"
 msgstr "Name contains"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:149
+#: ../addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "No contacts"
 msgstr "No contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:149
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contact"
 msgstr[1] "%d contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:327
+#: ../addressbook/gui/widgets/e-addressbook-model.c:342
 msgid "Error getting book view"
 msgstr "Error getting book view"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:740
+#: ../addressbook/gui/widgets/e-addressbook-model.c:756
 msgid "Search Interrupted"
 msgstr "Search Interrupted"
 
@@ -801,24 +802,24 @@ msgstr "Search Interrupted"
 msgid "Error modifying card"
 msgstr "Error modifying card"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:625
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Cut selected contacts to the clipboard"
 msgstr "Cut selected contacts to the clipboard"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:631
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copy selected contacts to the clipboard"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:637
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
 msgid "Paste contacts from the clipboard"
 msgstr "Paste contacts from the clipboard"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:643
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
 #: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Delete selected contacts"
 msgstr "Delete selected contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:649
+#: ../addressbook/gui/widgets/e-addressbook-view.c:648
 msgid "Select all visible contacts"
 msgstr "Select all visible contacts"
 
@@ -848,25 +849,32 @@ msgstr "Are you sure you want to delete this contact?"
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Are you sure you want to delete this contact (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
+#. Translators: This is shown for > 5 contacts.
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
 #, 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 ""
+msgid_plural ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr[0] ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr[1] ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1482
 msgid "_Don't Display"
 msgstr "_Don't Display"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1483
 msgid "Display _All Contacts"
 msgstr "Display _All Contacts"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Assistant"
 msgstr "Assistant"
 
@@ -903,7 +911,7 @@ msgid "Categories"
 msgstr "Categories"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Company"
 msgstr "Company"
 
@@ -952,22 +960,22 @@ msgid "Journal"
 msgstr "Journal"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Manager"
 msgstr "Manager"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
+#: ../addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
+#: ../addressbook/gui/widgets/eab-contact-display.c:509
 msgid "Nickname"
 msgstr "Nickname"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Note"
 msgstr "Note"
 
@@ -996,13 +1004,13 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:569
+#: ../calendar/gui/e-meeting-list-view.c:571
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Role"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:584
+#: ../addressbook/gui/widgets/eab-contact-display.c:575
 msgid "Spouse"
 msgstr "Spouse"
 
@@ -1032,7 +1040,7 @@ msgstr "Unit"
 msgid "Web Site"
 msgstr "Website"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1042,7 +1050,7 @@ msgstr ""
 "\n"
 "Searching for the Contactsâ?¦"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1056,7 +1064,7 @@ msgstr ""
 "\n"
 "or double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:192
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1070,7 +1078,7 @@ msgstr ""
 "\n"
 "Double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1080,7 +1088,7 @@ msgstr ""
 "\n"
 "Search for the Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:198
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1090,16 +1098,16 @@ msgstr ""
 "\n"
 "There are no items to show in this view."
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:98
 msgid "Work Email"
 msgstr "Work E-mail"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Home Email"
 msgstr "Home E-mail"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
-#: ../addressbook/gui/widgets/e-minicard.c:808
+#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:805
 msgid "Other Email"
 msgstr "Other E-mail"
 
@@ -1140,96 +1148,86 @@ msgstr "Contact: "
 msgid "evolution minicard"
 msgstr "evolution minicard"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
 msgid "Copy _Email Address"
 msgstr "Copy _E-mail Address"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:395
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
+#: ../widgets/misc/e-web-view.c:397
 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:400
+#: ../addressbook/gui/widgets/eab-contact-display.c:179
+#: ../widgets/misc/e-web-view.c:402
 msgid "_Send New Message To..."
 msgstr "_Send New Message Toâ?¦"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../widgets/misc/e-web-view.c:404
 msgid "Send a mail message to this address"
 msgstr "Send a mail message to this address"
 
-#: ../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:278
-#: ../addressbook/gui/widgets/eab-contact-display.c:289
-msgid "map"
-msgstr "map"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:415
-#: ../addressbook/gui/widgets/eab-contact-display.c:778
+#: ../addressbook/gui/widgets/eab-contact-display.c:424
+#: ../addressbook/gui/widgets/eab-contact-display.c:811
 msgid "List Members"
 msgstr "List Members"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "Department"
 msgstr "Department"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Profession"
 msgstr "Profession"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "Position"
 msgstr "Position"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../addressbook/gui/widgets/eab-contact-display.c:547
 #: ../calendar/gui/dialogs/calendar-setup.c:376
 #: ../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:497
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/groupwise-features/camel-gw-listener.c:427
+#: ../plugins/groupwise-features/camel-gw-listener.c:452
+#: ../plugins/groupwise-features/camel-gw-listener.c:568
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:499
+#: ../widgets/misc/e-send-options.c:519
 msgid "Calendar"
 msgstr "Calendar"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:563
-#: ../calendar/gui/dialogs/event-editor.c:127
-#: ../calendar/gui/dialogs/event-editor.c:354
+#: ../addressbook/gui/widgets/eab-contact-display.c:548
+#: ../calendar/gui/dialogs/event-editor.c:123
+#: ../calendar/gui/dialogs/event-editor.c:350
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Free/Busy"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:549
+#: ../addressbook/gui/widgets/eab-contact-display.c:570
 msgid "Phone"
 msgstr "Phone"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:565
+#: ../addressbook/gui/widgets/eab-contact-display.c:550
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:551
+#: ../addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Address"
 msgstr "Address"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 msgid "Home Page"
 msgstr "Home Page"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:568
 msgid "Web Log"
 msgstr "Web Log"
 
@@ -1237,38 +1235,38 @@ msgstr "Web Log"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:366
-#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../capplet/settings/mail-capplet-shell.c:361
+#: ../modules/addressbook/e-book-shell-backend.c:112
 #: ../modules/addressbook/e-book-shell-migrate.c:143
-#: ../modules/calendar/e-cal-shell-backend.c:132
-#: ../modules/calendar/e-cal-shell-migrate.c:159
-#: ../modules/calendar/e-memo-shell-backend.c:116
+#: ../modules/calendar/e-cal-shell-backend.c:128
+#: ../modules/calendar/e-cal-shell-migrate.c:161
+#: ../modules/calendar/e-memo-shell-backend.c:112
 #: ../modules/calendar/e-memo-shell-migrate.c:117
-#: ../modules/calendar/e-task-shell-backend.c:116
-#: ../modules/calendar/e-task-shell-migrate.c:126
+#: ../modules/calendar/e-task-shell-backend.c:112
+#: ../modules/calendar/e-task-shell-migrate.c:128
 msgid "Personal"
 msgstr "Personal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:796
+#: ../addressbook/gui/widgets/eab-contact-display.c:829
 msgid "Job Title"
 msgstr "Job Title"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:833
+#: ../addressbook/gui/widgets/eab-contact-display.c:866
 msgid "Home page"
 msgstr "Home page"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:842
+#: ../addressbook/gui/widgets/eab-contact-display.c:875
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1011
-#: ../widgets/misc/e-web-view.c:852
+#: ../addressbook/gui/widgets/eab-contact-display.c:1055
+#: ../widgets/misc/e-web-view.c:858
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:77
 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 "
@@ -1278,7 +1276,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:98
+#: ../addressbook/gui/widgets/eab-gui-util.c:104
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1287,7 +1285,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:111
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
 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."
@@ -1295,7 +1293,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:120
+#: ../addressbook/gui/widgets/eab-gui-util.c:126
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1303,11 +1301,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:128
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid "Detailed error message:"
 msgstr "Detailed error message:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:152
+#: ../addressbook/gui/widgets/eab-gui-util.c:164
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1319,7 +1317,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:159
+#: ../addressbook/gui/widgets/eab-gui-util.c:171
 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"
@@ -1332,49 +1330,49 @@ msgstr ""
 "preferences for this address book."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:167
+#: ../addressbook/gui/widgets/eab-gui-util.c:179
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "The backend for this address book was unable to parse this query. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "The backend for this address book refused to perform this query. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:189
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "This query did not complete successfully. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:202
+#: ../addressbook/gui/widgets/eab-gui-util.c:214
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:242
+#: ../addressbook/gui/widgets/eab-gui-util.c:254
 msgid "Select Address Book"
 msgstr "Select Address Book"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:305
+#: ../addressbook/gui/widgets/eab-gui-util.c:317
 msgid "list"
 msgstr "list"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:441
+#: ../addressbook/gui/widgets/eab-gui-util.c:455
 msgid "Move contact to"
 msgstr "Move contact to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:443
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Copy contact to"
 msgstr "Copy contact to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:446
+#: ../addressbook/gui/widgets/eab-gui-util.c:460
 msgid "Move contacts to"
 msgstr "Move contacts to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:448
+#: ../addressbook/gui/widgets/eab-gui-util.c:462
 msgid "Copy contacts to"
 msgstr "Copy contacts to"
 
@@ -1382,57 +1380,57 @@ msgstr "Copy contacts to"
 msgid "Card View"
 msgstr "Card View"
 
-#: ../addressbook/importers/evolution-csv-importer.c:720
-#: ../addressbook/importers/evolution-ldif-importer.c:518
-#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../addressbook/importers/evolution-csv-importer.c:721
+#: ../addressbook/importers/evolution-ldif-importer.c:519
+#: ../addressbook/importers/evolution-vcard-importer.c:278
 #: ../calendar/importers/icalendar-importer.c:325
 #: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importingâ?¦"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1008
+#: ../addressbook/importers/evolution-csv-importer.c:1016
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1009
+#: ../addressbook/importers/evolution-csv-importer.c:1017
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1017
+#: ../addressbook/importers/evolution-csv-importer.c:1025
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1018
+#: ../addressbook/importers/evolution-csv-importer.c:1026
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1026
+#: ../addressbook/importers/evolution-csv-importer.c:1034
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV or Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1027
+#: ../addressbook/importers/evolution-csv-importer.c:1035
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:744
+#: ../addressbook/importers/evolution-ldif-importer.c:753
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:745
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF importer"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:623
+#: ../addressbook/importers/evolution-vcard-importer.c:639
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:624
+#: ../addressbook/importers/evolution-vcard-importer.c:640
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard Importer"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:746
+#: ../addressbook/printing/e-contact-print.c:741
 #, c-format
 msgid "Page %d"
 msgstr "Page %d"
@@ -1509,30 +1507,6 @@ msgstr "In normal mode, there is no need for the size option."
 msgid "Unhandled error"
 msgstr "Unhandled error"
 
-#: ../addressbook/util/addressbook.c:103
-msgid "Accessing LDAP Server anonymously"
-msgstr "Accessing LDAP Server anonymously"
-
-#: ../addressbook/util/addressbook.c:215
-#: ../plugins/groupwise-features/camel-gw-listener.c:526
-msgid "Failed to authenticate.\n"
-msgstr "Failed to authenticate.\n"
-
-#: ../addressbook/util/addressbook.c:222
-#: ../plugins/groupwise-features/camel-gw-listener.c:506
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Enter password for %s (user %s)"
-
-#: ../addressbook/util/addressbook.c:230
-#: ../calendar/common/authentication.c:53
-#: ../plugins/caldav/caldav-browse-server.c:813
-#: ../plugins/google-account-setup/google-source.c:439
-#: ../plugins/publish-calendar/publish-calendar.c:332
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "Enter password"
-
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
@@ -1733,7 +1707,13 @@ msgstr "Error loading memo list"
 msgid "Error loading task list"
 msgstr "Error loading task list"
 
-#: ../calendar/calendar.error.xml.h:44
+#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
+#. {1} is replaced with a calendar/task/memo list name, where the error happened
+#: ../calendar/calendar.error.xml.h:46
+msgid "Error on {0}: {1}"
+msgstr "Error on {0}: {1}"
+
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -1741,7 +1721,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:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -1749,7 +1729,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:46
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -1757,7 +1737,7 @@ 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:47
+#: ../calendar/calendar.error.xml.h:50
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -1765,7 +1745,7 @@ msgstr ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -1773,7 +1753,7 @@ msgstr ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -1781,7 +1761,7 @@ msgstr ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -1789,94 +1769,94 @@ msgstr ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../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:52
+#: ../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:53
+#: ../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:54
+#: ../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:55
+#: ../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:56
+#: ../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:57
+#: ../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:58
+#: ../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:59
+#: ../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:60
+#: ../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:61
+#: ../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:62
+#: ../calendar/calendar.error.xml.h:65
 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:63
+#: ../calendar/calendar.error.xml.h:66
 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:64
+#: ../calendar/calendar.error.xml.h:67
 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:65
+#: ../calendar/calendar.error.xml.h:68
 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:66
+#: ../calendar/calendar.error.xml.h:69
 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:67
+#: ../calendar/calendar.error.xml.h:70
 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:68
+#: ../calendar/calendar.error.xml.h:71
 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:69
+#: ../calendar/calendar.error.xml.h:72
 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:70
+#: ../calendar/calendar.error.xml.h:73
 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:71
+#: ../calendar/calendar.error.xml.h:74
 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:72
+#: ../calendar/calendar.error.xml.h:75
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -1886,73 +1866,95 @@ msgstr ""
 "problems using Evolution. For best results, the server should be upgraded to "
 "a supported version."
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:76
 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:74
+#: ../calendar/calendar.error.xml.h:77
 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:75
+#: ../calendar/calendar.error.xml.h:78
 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:76
+#: ../calendar/calendar.error.xml.h:79
 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:77
+#: ../calendar/calendar.error.xml.h:80
 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:78
+#: ../calendar/calendar.error.xml.h:81
 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:79
+#: ../calendar/calendar.error.xml.h:82
 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:80
-#: ../composer/mail-composer.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "_Discard Changes"
 
-#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:271
+#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:313
 msgid "_Save"
 msgstr "_Save"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:85
 msgid "_Save Changes"
 msgstr "_Save Changes"
 
-#: ../calendar/calendar.error.xml.h:83
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:156
+#: ../calendar/calendar.error.xml.h:86
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:158
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Send"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Send Notice"
 msgstr "_Send Notice"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
+#: ../calendar/common/authentication.c:53
+#: ../calendar/gui/e-meeting-store.c:1776
+#: ../plugins/caldav/caldav-browse-server.c:921
+#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/publish-calendar/publish-calendar.c:332
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "Enter password"
+
+#: ../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:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:114
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:286
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:126
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+msgid "days"
+msgid_plural "days"
+msgstr[0] "days"
+msgstr[1] "days"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
 msgid "Start time"
 msgstr "Start time"
 
@@ -1967,8 +1969,8 @@ msgstr "Dismiss _All"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1632
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1642
 #: ../plugins/itip-formatter/itip-view.c:1044
 msgid "Location:"
 msgstr "Location:"
@@ -1977,7 +1979,7 @@ msgstr "Location:"
 msgid "Snooze _time:"
 msgstr "Snooze _time:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:879
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:896
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "_Dismiss"
@@ -1986,54 +1988,54 @@ msgstr "_Dismiss"
 msgid "_Snooze"
 msgstr "_Snooze"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:427
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:375
+#: ../plugins/google-account-setup/google-contacts-source.c:376
 msgid "hours"
 msgstr "hours"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
 msgstr "location of appointment"
 
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:426
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:374
+#: ../plugins/google-account-setup/google-contacts-source.c:375
 msgid "minutes"
 msgstr "minutes"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1486
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1613
 msgid "No summary available."
 msgstr "No summary available."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1495
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
 msgid "No description available."
 msgstr "No description available."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1505
 msgid "No location information available."
 msgstr "No location information available."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1549
 #, c-format
 msgid "You have %d alarm"
 msgid_plural "You have %d alarms"
 msgstr[0] "You have %d alarm"
 msgstr[1] "You have %d alarms"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1774
 msgid "Warning"
 msgstr "Warning"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1745
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2045,7 +2047,7 @@ msgstr ""
 "configured to send an e-mail.  Evolution will display\n"
 "a normal reminder dialogue box instead."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2062,7 +2064,7 @@ msgstr ""
 "\n"
 "Are you sure you want to run this program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1752
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1795
 msgid "Do not ask me about this program again."
 msgstr "Do not ask me about this program again."
 
@@ -2071,7 +2073,7 @@ 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/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:393
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -2080,7 +2082,7 @@ 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/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:399
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -2091,7 +2093,7 @@ 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/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:405
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -2144,8 +2146,8 @@ msgstr "Category"
 msgid "Classification"
 msgstr "Classification"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:780 ../calendar/gui/e-task-table.c:495
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:494
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Confidential"
@@ -2153,7 +2155,7 @@ msgstr "Confidential"
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/misc/e-attachment-tree-view.c:524
+#: ../widgets/misc/e-attachment-tree-view.c:522
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "Description"
@@ -2186,21 +2188,21 @@ msgstr "Location"
 msgid "Organizer"
 msgstr "Organiser"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
-#: ../calendar/gui/e-cal-model.c:778 ../calendar/gui/e-task-table.c:494
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:770 ../calendar/gui/e-task-table.c:493
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Private"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
-#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-cal-model.c:776
-#: ../calendar/gui/e-task-table.c:493 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:240
+#: ../calendar/gui/e-cal-model.c:761 ../calendar/gui/e-cal-model.c:768
+#: ../calendar/gui/e-task-table.c:492 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Public"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:321
-#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../calendar/gui/dialogs/event-editor.c:317
+#: ../calendar/gui/dialogs/event-editor.c:338
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Recurrence"
@@ -2244,22 +2246,22 @@ msgid "Edit Alarm"
 msgstr "Edit Alarm"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:817
-#: ../calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/e-alarm-list.c:435
 msgid "Pop up an alert"
 msgstr "Pop up an alert"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:818
-#: ../calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/e-alarm-list.c:431
 msgid "Play a sound"
 msgstr "Play a sound"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:819
-#: ../calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/e-alarm-list.c:443
 msgid "Run a program"
 msgstr "Run a program"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:820
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/e-alarm-list.c:439
 msgid "Send an email"
 msgstr "Send an e-mail"
 
@@ -2268,7 +2270,7 @@ msgid "Add Alarm"
 msgstr "Add Alarm"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:364
+#: ../calendar/gui/dialogs/event-editor.c:360
 msgid "Alarm"
 msgstr "Alarm"
 
@@ -2328,15 +2330,6 @@ msgstr "before"
 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:428
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:376
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "days"
-msgstr "days"
-
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "end of appointment"
 msgstr "end of appointment"
@@ -2377,15 +2370,15 @@ msgid "Type:"
 msgstr "Type:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:175
-#: ../modules/addressbook/addressbook-config.c:513
+#: ../modules/addressbook/addressbook-config.c:509
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:150
+#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:152
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:285
+#: ../widgets/misc/e-signature-script-dialog.c:280
 msgid "_Name:"
 msgstr "_Name:"
 
@@ -2409,7 +2402,7 @@ msgstr "Colou_r:"
 #: ../calendar/gui/dialogs/calendar-setup.c:386
 #: ../calendar/gui/dialogs/calendar-setup.c:397
 #: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:51
-#: ../modules/addressbook/addressbook-config.c:1015
+#: ../modules/addressbook/addressbook-config.c:1010
 #: ../modules/calendar/e-calendar-preferences.ui.h:19
 #: ../plugins/itip-formatter/itip-formatter.c:2818
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
@@ -2494,242 +2487,242 @@ msgstr "%s  You have made changes. Forget those changes and update the editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  You have made no changes, update the editor?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:448
+#: ../calendar/gui/dialogs/comp-editor-page.c:445
 #, c-format
 msgid "Validation error: %s"
 msgstr "Validation error: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:266
+#: ../calendar/gui/dialogs/comp-editor.c:260
 msgid "Could not save attachments"
 msgstr "Could not save attachments"
 
-#: ../calendar/gui/dialogs/comp-editor.c:542
+#: ../calendar/gui/dialogs/comp-editor.c:535
 msgid "Could not update object"
 msgstr "Could not update object"
 
-#: ../calendar/gui/dialogs/comp-editor.c:657
+#: ../calendar/gui/dialogs/comp-editor.c:650
 msgid "Edit Appointment"
 msgstr "Edit Appointment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:664
+#: ../calendar/gui/dialogs/comp-editor.c:657
 #, c-format
 msgid "Meeting - %s"
 msgstr "Meeting â?? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:666
+#: ../calendar/gui/dialogs/comp-editor.c:659
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appointment â?? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:672
+#: ../calendar/gui/dialogs/comp-editor.c:665
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Assigned Task â?? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:674
+#: ../calendar/gui/dialogs/comp-editor.c:667
 #, c-format
 msgid "Task - %s"
 msgstr "Task â?? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:679
+#: ../calendar/gui/dialogs/comp-editor.c:672
 #, c-format
 msgid "Memo - %s"
 msgstr "Memo â?? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:695
+#: ../calendar/gui/dialogs/comp-editor.c:688
 msgid "No Summary"
 msgstr "No Summary"
 
-#: ../calendar/gui/dialogs/comp-editor.c:816
+#: ../calendar/gui/dialogs/comp-editor.c:809
 msgid "Keep original item?"
 msgstr "Keep original item?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1012
+#: ../calendar/gui/dialogs/comp-editor.c:1005
 msgid "Click here to close the current window"
 msgstr "Click here to close the current window"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1019 ../mail/e-mail-browser.c:139
-#: ../shell/e-shell-window-actions.c:1434
-#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:552
-#: ../widgets/misc/e-web-view.c:412 ../widgets/misc/e-web-view.c:1065
+#: ../calendar/gui/dialogs/comp-editor.c:1012 ../mail/e-mail-browser.c:132
+#: ../shell/e-shell-window-actions.c:1433
+#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:552
+#: ../widgets/misc/e-web-view.c:414 ../widgets/misc/e-web-view.c:1068
 msgid "Copy the selection"
 msgstr "Copy the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1026 ../mail/e-mail-browser.c:146
-#: ../shell/e-shell-window-actions.c:1441
-#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:547
-#: ../widgets/misc/e-web-view.c:1059
+#: ../calendar/gui/dialogs/comp-editor.c:1019 ../mail/e-mail-browser.c:139
+#: ../shell/e-shell-window-actions.c:1440
+#: ../widgets/misc/e-focus-tracker.c:107 ../widgets/misc/e-focus-tracker.c:547
+#: ../widgets/misc/e-web-view.c:1062
 msgid "Cut the selection"
 msgstr "Cut the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1033
-#: ../shell/e-shell-window-actions.c:1448
-#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:562
+#: ../calendar/gui/dialogs/comp-editor.c:1026
+#: ../shell/e-shell-window-actions.c:1447
+#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:562
 msgid "Delete the selection"
 msgstr "Delete the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1040
+#: ../calendar/gui/dialogs/comp-editor.c:1033
 msgid "Click here to view help available"
 msgstr "Click here to view help available"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1047 ../mail/e-mail-browser.c:153
-#: ../shell/e-shell-window-actions.c:1483
-#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:557
-#: ../widgets/misc/e-web-view.c:1071
+#: ../calendar/gui/dialogs/comp-editor.c:1040 ../mail/e-mail-browser.c:146
+#: ../shell/e-shell-window-actions.c:1482
+#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:557
+#: ../widgets/misc/e-web-view.c:1074
 msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1068
+#: ../calendar/gui/dialogs/comp-editor.c:1061
 msgid "Click here to save the current window"
 msgstr "Click here to save the current window"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1075 ../mail/e-mail-browser.c:160
-#: ../shell/e-shell-window-actions.c:1553
-#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:567
+#: ../calendar/gui/dialogs/comp-editor.c:1068 ../mail/e-mail-browser.c:153
+#: ../shell/e-shell-window-actions.c:1552
+#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:567
 msgid "Select all text"
 msgstr "Select all text"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1075
 msgid "_Classification"
 msgstr "_Classification"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/comp-editor.c:1082
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:174
+#: ../mail/e-mail-browser.c:167
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1581
+#: ../shell/e-shell-window-actions.c:1580
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1096 ../mail/e-mail-browser.c:167
-#: ../shell/e-shell-window-actions.c:1588
-#: ../widgets/misc/e-signature-editor.c:221
+#: ../calendar/gui/dialogs/comp-editor.c:1089 ../mail/e-mail-browser.c:160
+#: ../shell/e-shell-window-actions.c:1587
+#: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_File"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
-#: ../shell/e-shell-window-actions.c:1595
+#: ../calendar/gui/dialogs/comp-editor.c:1096
+#: ../shell/e-shell-window-actions.c:1594
 msgid "_Help"
 msgstr "_Help"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
-#: ../composer/e-composer-actions.c:301
+#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../composer/e-composer-actions.c:336
 msgid "_Options"
 msgstr "_Options"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1124 ../mail/e-mail-browser.c:181
-#: ../shell/e-shell-window-actions.c:1630 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1117 ../mail/e-mail-browser.c:174
+#: ../shell/e-shell-window-actions.c:1629 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_View"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134
-#: ../composer/e-composer-actions.c:257
+#: ../calendar/gui/dialogs/comp-editor.c:1127
+#: ../composer/e-composer-actions.c:285
 msgid "_Attachment..."
 msgstr "_Attachmentâ?¦"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "Click here to attach a file"
 msgstr "Click here to attach a file"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1144
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Categories"
 msgstr "_Categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1146
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether to display categories"
 msgstr "Toggles whether to display categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1152
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "Time _Zone"
 msgstr "Time _Zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1154
+#: ../calendar/gui/dialogs/comp-editor.c:1147
 msgid "Toggles whether the time zone is displayed"
 msgstr "Toggles whether the time zone is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../calendar/gui/dialogs/comp-editor.c:1156
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1165
+#: ../calendar/gui/dialogs/comp-editor.c:1158
 msgid "Classify as public"
 msgstr "Classify as public"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1170
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 msgid "_Private"
 msgstr "_Private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1172
+#: ../calendar/gui/dialogs/comp-editor.c:1165
 msgid "Classify as private"
 msgstr "Classify as private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1177
+#: ../calendar/gui/dialogs/comp-editor.c:1170
 msgid "_Confidential"
 msgstr "_Confidential"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1179
+#: ../calendar/gui/dialogs/comp-editor.c:1172
 msgid "Classify as confidential"
 msgstr "Classify as confidential"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1187
+#: ../calendar/gui/dialogs/comp-editor.c:1180
 msgid "R_ole Field"
 msgstr "R_ole Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1189
+#: ../calendar/gui/dialogs/comp-editor.c:1182
 msgid "Toggles whether the Role field is displayed"
 msgstr "Toggles whether the Role field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1195
+#: ../calendar/gui/dialogs/comp-editor.c:1188
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1197
+#: ../calendar/gui/dialogs/comp-editor.c:1190
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Toggles whether the RSVP field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1203
+#: ../calendar/gui/dialogs/comp-editor.c:1196
 msgid "_Status Field"
 msgstr "_Status Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1205
+#: ../calendar/gui/dialogs/comp-editor.c:1198
 msgid "Toggles whether the Status field is displayed"
 msgstr "Toggles whether the Status field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1211
+#: ../calendar/gui/dialogs/comp-editor.c:1204
 msgid "_Type Field"
 msgstr "_Type Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../calendar/gui/dialogs/comp-editor.c:1206
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Toggles whether the Attendee Type is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1237
-#: ../composer/e-composer-private.c:70
+#: ../calendar/gui/dialogs/comp-editor.c:1230
+#: ../composer/e-composer-private.c:73
 msgid "Recent _Documents"
 msgstr "Recent _Documents"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1911
-#: ../composer/e-composer-actions.c:461
+#: ../calendar/gui/dialogs/comp-editor.c:1936
+#: ../composer/e-composer-actions.c:504
 msgid "Attach"
 msgstr "Attach"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2240
-#: ../calendar/gui/dialogs/comp-editor.c:2403
-#: ../calendar/gui/dialogs/comp-editor.c:3370
+#: ../calendar/gui/dialogs/comp-editor.c:2269
+#: ../calendar/gui/dialogs/comp-editor.c:2432
+#: ../calendar/gui/dialogs/comp-editor.c:3407
 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:3334
+#: ../calendar/gui/dialogs/comp-editor.c:3371
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "attachment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3402
+#: ../calendar/gui/dialogs/comp-editor.c:3439
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
@@ -2829,63 +2822,63 @@ msgstr "Delegate To:"
 msgid "Enter Delegate"
 msgstr "Enter Delegate"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:212
 msgid "_Alarms"
 msgstr "_Alarms"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/event-editor.c:214
 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:226
+#: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
 msgstr "Show Time as _Busy"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:224
 msgid "Toggles whether to show time as busy"
 msgstr "Toggles whether to show time as busy"
 
-#: ../calendar/gui/dialogs/event-editor.c:237
+#: ../calendar/gui/dialogs/event-editor.c:233
 msgid "_Recurrence"
 msgstr "_Recurrence"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "Make this a recurring event"
 msgstr "Make this a recurring event"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:240
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "Send Options"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
-#: ../calendar/gui/dialogs/task-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:242
+#: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "Insert advanced send options"
 
-#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:250
 msgid "All _Day Event"
 msgstr "All _Day Event"
 
-#: ../calendar/gui/dialogs/event-editor.c:256
+#: ../calendar/gui/dialogs/event-editor.c:252
 msgid "Toggles whether to have All Day Event"
 msgstr "Toggles whether to have All Day Event"
 
-#: ../calendar/gui/dialogs/event-editor.c:265
+#: ../calendar/gui/dialogs/event-editor.c:261
 msgid "_Free/Busy"
 msgstr "_Free/Busy"
 
-#: ../calendar/gui/dialogs/event-editor.c:267
+#: ../calendar/gui/dialogs/event-editor.c:263
 msgid "Query free / busy information for the attendees"
 msgstr "Query free / busy information for the attendees"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3140
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3172
 msgid "Appointment"
 msgstr "Appointment"
 
-#: ../calendar/gui/dialogs/event-editor.c:388
+#: ../calendar/gui/dialogs/event-editor.c:384
 #: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
@@ -2895,81 +2888,81 @@ msgstr "Attendees"
 msgid "Print this event"
 msgstr "Print this event"
 
-#: ../calendar/gui/dialogs/event-page.c:771
+#: ../calendar/gui/dialogs/event-page.c:765
 msgid "Event's start time is in the past"
 msgstr "Event's start time is in the past"
 
-#: ../calendar/gui/dialogs/event-page.c:812
+#: ../calendar/gui/dialogs/event-page.c:806
 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:816
+#: ../calendar/gui/dialogs/event-page.c:810
 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:828
-#: ../calendar/gui/dialogs/event-page.c:2784
+#: ../calendar/gui/dialogs/event-page.c:822
+#: ../calendar/gui/dialogs/event-page.c:2780
 msgid "This event has alarms"
 msgstr "This event has alarms"
 
-#: ../calendar/gui/dialogs/event-page.c:895
+#: ../calendar/gui/dialogs/event-page.c:889
 #: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganiser:"
 
-#: ../calendar/gui/dialogs/event-page.c:942
+#: ../calendar/gui/dialogs/event-page.c:936
 msgid "_Delegatees"
 msgstr "_Delegatees"
 
-#: ../calendar/gui/dialogs/event-page.c:944
+#: ../calendar/gui/dialogs/event-page.c:938
 msgid "Atte_ndees"
 msgstr "Atte_ndees"
 
-#: ../calendar/gui/dialogs/event-page.c:1159
+#: ../calendar/gui/dialogs/event-page.c:1155
 msgid "Event with no start date"
 msgstr "Event with no start date"
 
-#: ../calendar/gui/dialogs/event-page.c:1162
+#: ../calendar/gui/dialogs/event-page.c:1158
 msgid "Event with no end date"
 msgstr "Event with no end date"
 
-#: ../calendar/gui/dialogs/event-page.c:1333
-#: ../calendar/gui/dialogs/memo-page.c:689
-#: ../calendar/gui/dialogs/task-page.c:909
+#: ../calendar/gui/dialogs/event-page.c:1329
+#: ../calendar/gui/dialogs/memo-page.c:671
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "Start date is wrong"
 msgstr "Start date is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1343
+#: ../calendar/gui/dialogs/event-page.c:1339
 msgid "End date is wrong"
 msgstr "End date is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1366
+#: ../calendar/gui/dialogs/event-page.c:1362
 msgid "Start time is wrong"
 msgstr "Start time is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1373
+#: ../calendar/gui/dialogs/event-page.c:1369
 msgid "End time is wrong"
 msgstr "End time is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1537
-#: ../calendar/gui/dialogs/memo-page.c:730
-#: ../calendar/gui/dialogs/task-page.c:971
+#: ../calendar/gui/dialogs/event-page.c:1533
+#: ../calendar/gui/dialogs/memo-page.c:712
+#: ../calendar/gui/dialogs/task-page.c:967
 msgid "The organizer selected no longer has an account."
 msgstr "The organiser selected no longer has an account."
 
-#: ../calendar/gui/dialogs/event-page.c:1543
-#: ../calendar/gui/dialogs/memo-page.c:736
-#: ../calendar/gui/dialogs/task-page.c:977
+#: ../calendar/gui/dialogs/event-page.c:1539
+#: ../calendar/gui/dialogs/memo-page.c:718
+#: ../calendar/gui/dialogs/task-page.c:973
 msgid "An organizer is required."
 msgstr "An organiser is required."
 
-#: ../calendar/gui/dialogs/event-page.c:1568
-#: ../calendar/gui/dialogs/task-page.c:1001
+#: ../calendar/gui/dialogs/event-page.c:1564
+#: ../calendar/gui/dialogs/task-page.c:997
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: ../calendar/gui/dialogs/event-page.c:2658
+#: ../calendar/gui/dialogs/event-page.c:2654
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Unable to open the calendar '%s'."
@@ -2980,47 +2973,47 @@ 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:2702
-#: ../calendar/gui/dialogs/memo-page.c:949
-#: ../calendar/gui/dialogs/task-page.c:1791
+#: ../calendar/gui/dialogs/event-page.c:2698
+#: ../calendar/gui/dialogs/memo-page.c:931
+#: ../calendar/gui/dialogs/task-page.c:1787
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "You are acting on behalf of %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3013
+#: ../calendar/gui/dialogs/event-page.c:3009
 #, 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:3019
+#: ../calendar/gui/dialogs/event-page.c:3015
 #, 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:3025
+#: ../calendar/gui/dialogs/event-page.c:3021
 #, 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:3044
+#: ../calendar/gui/dialogs/event-page.c:3040
 msgid "Customize"
 msgstr "Customise"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3050
+#: ../calendar/gui/dialogs/event-page.c:3046
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "None"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:566
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Atte_ndees..."
 msgstr "Atte_ndeesâ?¦"
 
@@ -3044,12 +3037,12 @@ msgstr "_Alarm"
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:349
+#: ../widgets/misc/e-attachment-dialog.c:343
 msgid "_Description:"
 msgstr "_Description:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:13
-#: ../plugins/calendar-weather/calendar-weather.c:361
+#: ../plugins/calendar-weather/calendar-weather.c:362
 msgid "_Location:"
 msgstr "_Location:"
 
@@ -3091,7 +3084,7 @@ msgctxt "eventpage"
 msgid "until"
 msgstr "until"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3144
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3176
 msgid "Memo"
 msgstr "Memo"
 
@@ -3099,27 +3092,27 @@ msgstr "Memo"
 msgid "Print this memo"
 msgstr "Print this memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:341
+#: ../calendar/gui/dialogs/memo-page.c:337
 msgid "Memo's start date is in the past"
 msgstr "Memo's start date is in the past"
 
-#: ../calendar/gui/dialogs/memo-page.c:379
+#: ../calendar/gui/dialogs/memo-page.c:375
 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:383
+#: ../calendar/gui/dialogs/memo-page.c:379
 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:910
+#: ../calendar/gui/dialogs/memo-page.c:892
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Unable to open memos in '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1081 ../em-format/em-format-quote.c:282
-#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2401
-#: ../mail/em-format-html.c:2460 ../mail/em-format-html.c:2484
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:75
+#: ../calendar/gui/dialogs/memo-page.c:1063 ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2396
+#: ../mail/em-format-html.c:2461 ../mail/em-format-html.c:2485
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "To"
 
@@ -3138,7 +3131,7 @@ msgid "T_o:"
 msgstr "T_o:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:428
+#: ../calendar/gui/dialogs/task-page.c:422
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Group:"
@@ -3179,21 +3172,21 @@ msgstr "This and Future Instances"
 msgid "All Instances"
 msgstr "All Instances"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:569
+#: ../calendar/gui/dialogs/recurrence-page.c:563
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "This appointment contains recurrences that Evolution cannot edit."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:901
+#: ../calendar/gui/dialogs/recurrence-page.c:895
 msgid "Recurrence date is invalid"
 msgstr "Recurrence date is invalid"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:941
+#: ../calendar/gui/dialogs/recurrence-page.c:935
 msgid "End time of the recurrence was before event's start"
 msgstr "End time of the recurrence was before event's start"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:971
+#: ../calendar/gui/dialogs/recurrence-page.c:965
 msgid "on"
 msgstr "on"
 
@@ -3201,7 +3194,7 @@ msgstr "on"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1023
 msgid "first"
 msgstr "first"
 
@@ -3210,7 +3203,7 @@ msgstr "first"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "second"
 msgstr "second"
 
@@ -3218,7 +3211,7 @@ msgstr "second"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "third"
 msgstr "third"
 
@@ -3226,7 +3219,7 @@ msgstr "third"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fourth"
 msgstr "fourth"
 
@@ -3234,7 +3227,7 @@ msgstr "fourth"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "fifth"
 msgstr "fifth"
 
@@ -3242,13 +3235,13 @@ msgstr "fifth"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1055
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 msgid "last"
 msgstr "last"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1079
+#: ../calendar/gui/dialogs/recurrence-page.c:1073
 msgid "Other Date"
 msgstr "Other Date"
 
@@ -3256,7 +3249,7 @@ msgstr "Other Date"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "1st to 10th"
 msgstr "1st to 10th"
 
@@ -3264,7 +3257,7 @@ msgstr "1st to 10th"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 msgid "11th to 20th"
 msgstr "11th to 20th"
 
@@ -3272,48 +3265,48 @@ msgstr "11th to 20th"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 msgid "21st to 31st"
 msgstr "21st to 31st"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 msgid "day"
 msgstr "day"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "Monday"
 msgstr "Monday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1124
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1125
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1126
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
 #: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Thursday"
 msgstr "Thursday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1127
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Friday"
 msgstr "Friday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 #: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "Saturday"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1129
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "Sunday"
@@ -3321,31 +3314,31 @@ msgstr "Sunday"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../calendar/gui/dialogs/recurrence-page.c:1245
 msgid "on the"
 msgstr "on the"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1425
+#: ../calendar/gui/dialogs/recurrence-page.c:1419
 msgid "occurrences"
 msgstr "occurrences"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2132
+#: ../calendar/gui/dialogs/recurrence-page.c:2123
 msgid "Add exception"
 msgstr "Add exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2173
+#: ../calendar/gui/dialogs/recurrence-page.c:2164
 msgid "Could not get a selection to modify."
 msgstr "Could not get a selection to modify."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2179
+#: ../calendar/gui/dialogs/recurrence-page.c:2170
 msgid "Modify exception"
 msgstr "Modify exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2223
+#: ../calendar/gui/dialogs/recurrence-page.c:2214
 msgid "Could not get a selection to delete."
 msgstr "Could not get a selection to delete."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2357
+#: ../calendar/gui/dialogs/recurrence-page.c:2348
 msgid "Date/Time"
 msgstr "Date/Time"
 
@@ -3407,30 +3400,30 @@ msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "year(s)"
 
-#: ../calendar/gui/dialogs/send-comp.c:193
+#: ../calendar/gui/dialogs/send-comp.c:192
 msgid "Send my alarms with this event"
 msgstr "Send my alarms with this event"
 
-#: ../calendar/gui/dialogs/send-comp.c:195
+#: ../calendar/gui/dialogs/send-comp.c:194
 msgid "Notify new attendees _only"
 msgstr "Notify new attendees _only"
 
-#: ../calendar/gui/dialogs/task-details-page.c:356
-#: ../calendar/gui/dialogs/task-details-page.c:378
+#: ../calendar/gui/dialogs/task-details-page.c:352
+#: ../calendar/gui/dialogs/task-details-page.c:374
 msgid "Completed date is wrong"
 msgstr "Completed date is wrong"
 
-#: ../calendar/gui/dialogs/task-details-page.c:489
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "Web Page"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:298
-#: ../calendar/gui/e-cal-model-tasks.c:442
-#: ../calendar/gui/e-cal-model-tasks.c:716 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:593
-#: ../calendar/gui/print.c:3230 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713 ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:596
+#: ../calendar/gui/print.c:3262 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3438,59 +3431,59 @@ msgstr "Cancelled"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:440
-#: ../calendar/gui/e-cal-model-tasks.c:714
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../calendar/gui/e-task-table.c:212 ../calendar/gui/e-task-table.c:227
-#: ../calendar/gui/e-task-table.c:592 ../calendar/gui/print.c:3227
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
+#: ../calendar/gui/e-task-table.c:595 ../calendar/gui/print.c:3259
 #: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "Completed"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-cal-component-preview.c:313
 #: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1226 ../widgets/misc/e-send-options.ui.h:13
+#: ../mail/message-list.c:1228 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "High"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:438
-#: ../calendar/gui/e-cal-model-tasks.c:712
-#: ../calendar/gui/e-cal-model-tasks.c:789 ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:591
-#: ../calendar/gui/print.c:3224
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-model-tasks.c:435
+#: ../calendar/gui/e-cal-model-tasks.c:709
+#: ../calendar/gui/e-cal-model-tasks.c:786 ../calendar/gui/e-task-table.c:206
+#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:594
+#: ../calendar/gui/print.c:3256
 msgid "In Progress"
 msgstr "In Progress"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-component-preview.c:317
 #: ../calendar/gui/e-task-table.c:518 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:14
+#: ../mail/message-list.c:1226 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "Low"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-cal-model.c:1524 ../calendar/gui/e-task-table.c:517
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1225
+#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-model.c:1521 ../calendar/gui/e-task-table.c:517
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1227
 #: ../widgets/misc/e-send-options.ui.h:16
 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:302
-#: ../calendar/gui/e-cal-model-tasks.c:436
-#: ../calendar/gui/e-cal-model-tasks.c:710 ../calendar/gui/e-task-table.c:208
-#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:590
-#: ../calendar/gui/print.c:3221 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:433
+#: ../calendar/gui/e-cal-model-tasks.c:707 ../calendar/gui/e-task-table.c:204
+#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:593
+#: ../calendar/gui/print.c:3253 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Not Started"
 
@@ -3506,8 +3499,8 @@ msgstr "Stat_us:"
 #. 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:1840
-#: ../calendar/gui/e-meeting-list-view.c:594
+#: ../calendar/gui/e-calendar-view.c:1831
+#: ../calendar/gui/e-meeting-list-view.c:596
 #: ../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
@@ -3534,21 +3527,21 @@ msgstr "_Priority:"
 msgid "_Web Page:"
 msgstr "_Web Page:"
 
-#: ../calendar/gui/dialogs/task-editor.c:116
+#: ../calendar/gui/dialogs/task-editor.c:112
 msgid "_Status Details"
 msgstr "_Status Details"
 
-#: ../calendar/gui/dialogs/task-editor.c:118
+#: ../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:126
+#: ../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:328 ../calendar/gui/print.c:3142
-#: ../widgets/misc/e-send-options.c:503
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:3174
+#: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "Task"
 
@@ -3560,32 +3553,32 @@ msgstr "Task Details"
 msgid "Print this task"
 msgstr "Print this task"
 
-#: ../calendar/gui/dialogs/task-page.c:345
+#: ../calendar/gui/dialogs/task-page.c:339
 msgid "Task's start date is in the past"
 msgstr "Task's start date is in the past"
 
-#: ../calendar/gui/dialogs/task-page.c:346
+#: ../calendar/gui/dialogs/task-page.c:340
 msgid "Task's due date is in the past"
 msgstr "Task's due date is in the past"
 
-#: ../calendar/gui/dialogs/task-page.c:381
+#: ../calendar/gui/dialogs/task-page.c:375
 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:385
+#: ../calendar/gui/dialogs/task-page.c:379
 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:436
+#: ../calendar/gui/dialogs/task-page.c:430
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_ser:"
 
-#: ../calendar/gui/dialogs/task-page.c:882
+#: ../calendar/gui/dialogs/task-page.c:878
 msgid "Due date is wrong"
 msgstr "Due date is wrong"
 
-#: ../calendar/gui/dialogs/task-page.c:1748
+#: ../calendar/gui/dialogs/task-page.c:1744
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Unable to open tasks in '%s'."
@@ -3603,7 +3596,7 @@ msgid "Time zone:"
 msgstr "Time zone:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:394
+#: ../calendar/gui/e-alarm-list.c:381
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3611,109 +3604,109 @@ msgstr[0] "%d day"
 msgstr[1] "%d days"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:400
+#: ../calendar/gui/e-alarm-list.c:387
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d week"
 msgstr[1] "%d weeks"
 
-#: ../calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:449
 msgid "Unknown action to be performed"
 msgstr "Unknown action to be performed"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:476
+#: ../calendar/gui/e-alarm-list.c:463
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s before the start of the appointment"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:481
+#: ../calendar/gui/e-alarm-list.c:468
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s after the start of the appointment"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:488
+#: ../calendar/gui/e-alarm-list.c:475
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s at the start of the appointment"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:499
+#: ../calendar/gui/e-alarm-list.c:486
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s before the end of the appointment"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:504
+#: ../calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s after the end of the appointment"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:511
+#: ../calendar/gui/e-alarm-list.c:498
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s at the end of the appointment"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:535
+#: ../calendar/gui/e-alarm-list.c:522
 #, c-format
 msgid "%s at %s"
 msgstr "%s at %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:543
+#: ../calendar/gui/e-alarm-list.c:530
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:674
+#: ../calendar/gui/e-cal-component-preview.c:188 ../filter/e-filter-rule.c:667
 msgid "Untitled"
 msgstr "Untitled"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:194
 msgid "Categories:"
 msgstr "Categories:"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Summary:"
 msgstr "Summary:"
 
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-component-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-component-preview.c:257
 msgid "Start Date:"
 msgstr "Start Date:"
 
-#: ../calendar/gui/e-cal-component-preview.c:275
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Due Date:"
 msgstr "Due Date:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-component-preview.c:284
 #: ../plugins/itip-formatter/itip-view.c:1075
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-preview.c:311
 msgid "Priority:"
 msgstr "Priority:"
 
-#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-cal-component-preview.c:336 ../mail/mail-config.ui.h:36
 msgid "Description:"
 msgstr "Description:"
 
-#: ../calendar/gui/e-cal-component-preview.c:371
+#: ../calendar/gui/e-cal-component-preview.c:367
 msgid "Web Page:"
 msgstr "Web Page:"
 
@@ -3740,16 +3733,16 @@ msgid "Start Date"
 msgstr "Start Date"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:568
+#: ../calendar/gui/e-task-table.c:570
 msgid "Free"
 msgstr "Free"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:549 ../calendar/gui/e-task-table.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:571
 msgid "Busy"
 msgstr "Busy"
 
-#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-cal-model-tasks.c:655
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3760,44 +3753,44 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:708
+#: ../calendar/gui/e-cal-model-tasks.c:705
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "None"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1527
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
-#: ../calendar/gui/e-meeting-store.c:996
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:1027
 msgid "Yes"
 msgstr "Yes"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1527
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:190
+#: ../calendar/gui/e-meeting-store.c:189
 msgid "No"
 msgstr "No"
 
-#: ../calendar/gui/e-cal-model.c:782 ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1073
-#: ../calendar/gui/print.c:1090 ../e-util/e-charset.c:52
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1092
+#: ../calendar/gui/print.c:1109 ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:98
 #: ../plugins/itip-formatter/itip-formatter.c:457
 #: ../plugins/itip-formatter/itip-formatter.c:2485
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../calendar/gui/e-cal-model.c:1526
+#: ../calendar/gui/e-cal-model.c:1523
 msgid "Recurring"
 msgstr "Recurring"
 
-#: ../calendar/gui/e-cal-model.c:1528
+#: ../calendar/gui/e-cal-model.c:1525
 msgid "Assigned"
 msgstr "Assigned"
 
-#: ../calendar/gui/e-cal-model.c:2608
+#: ../calendar/gui/e-cal-model.c:2643
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
@@ -3834,110 +3827,110 @@ msgid "Start date"
 msgstr "Start date"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:557
+#: ../calendar/gui/e-meeting-list-view.c:559
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:582
+#: ../widgets/misc/e-attachment-tree-view.c:580
 msgid "Type"
 msgstr "Type"
 
-#: ../calendar/gui/e-calendar-view.c:430
+#: ../calendar/gui/e-calendar-view.c:422
 msgid "Cut selected events to the clipboard"
 msgstr "Cut selected events to the clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:436
+#: ../calendar/gui/e-calendar-view.c:428
 msgid "Copy selected events to the clipboard"
 msgstr "Copy selected events to the clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:442
+#: ../calendar/gui/e-calendar-view.c:434
 msgid "Paste events from the clipboard"
 msgstr "Paste events from the clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:448
+#: ../calendar/gui/e-calendar-view.c:440
 msgid "Delete selected events"
 msgstr "Delete selected events"
 
-#: ../calendar/gui/e-calendar-view.c:467 ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:459 ../calendar/gui/e-memo-table.c:183
+#: ../calendar/gui/e-task-table.c:261
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
 
-#: ../calendar/gui/e-calendar-view.c:661 ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/e-task-table.c:1075
+#: ../calendar/gui/e-calendar-view.c:653 ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-task-table.c:1084
 msgid "Updating objects"
 msgstr "Updating objects"
 
-#: ../calendar/gui/e-calendar-view.c:1787
+#: ../calendar/gui/e-calendar-view.c:1778
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
 #: ../plugins/itip-formatter/itip-formatter.c:2473
 msgid "Accepted"
 msgstr "Accepted"
 
-#: ../calendar/gui/e-calendar-view.c:1788
+#: ../calendar/gui/e-calendar-view.c:1779
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 #: ../plugins/itip-formatter/itip-formatter.c:2479
 msgid "Declined"
 msgstr "Declined"
 
-#: ../calendar/gui/e-calendar-view.c:1789
+#: ../calendar/gui/e-calendar-view.c:1780
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../calendar/gui/e-meeting-time-sel.c:548
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "Tentative"
 msgstr "Tentative"
 
-#: ../calendar/gui/e-calendar-view.c:1790
+#: ../calendar/gui/e-calendar-view.c:1781
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
 #: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "Delegated"
 msgstr "Delegated"
 
-#: ../calendar/gui/e-calendar-view.c:1791
+#: ../calendar/gui/e-calendar-view.c:1782
 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:1935 ../calendar/gui/e-memo-table.c:535
-#: ../calendar/gui/e-task-table.c:750
+#: ../calendar/gui/e-calendar-view.c:1926 ../calendar/gui/e-memo-table.c:538
+#: ../calendar/gui/e-task-table.c:759
 #, 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:1939 ../calendar/gui/e-memo-table.c:540
-#: ../calendar/gui/e-task-table.c:753
+#: ../calendar/gui/e-calendar-view.c:1930 ../calendar/gui/e-memo-table.c:543
+#: ../calendar/gui/e-task-table.c:762
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organiser: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1955 ../calendar/gui/print.c:3176
+#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3208
 #, c-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1986
+#: ../calendar/gui/e-calendar-view.c:1977
 #, 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:160
+#: ../calendar/gui/e-cell-date-edit-text.c:156
 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:163
+#: ../calendar/gui/e-cell-date-edit-text.c:159
 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:171
+#: ../calendar/gui/e-cell-date-edit-text.c:167
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3950,17 +3943,17 @@ 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:761
+#: ../calendar/gui/e-day-view-time-item.c:745
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minute divisions"
 
-#: ../calendar/gui/e-day-view-time-item.c:782
+#: ../calendar/gui/e-day-view-time-item.c:766
 msgid "Show the second time zone"
 msgstr "Show the second time zone"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:799
+#: ../calendar/gui/e-day-view-time-item.c:783
 #: ../modules/calendar/e-calendar-preferences.ui.h:76
 #: ../modules/calendar/e-calendar-preferences.c:175
 #: ../modules/calendar/e-calendar-preferences.c:224
@@ -3968,8 +3961,8 @@ msgctxt "cal-second-zone"
 msgid "None"
 msgstr "None"
 
-#: ../calendar/gui/e-day-view-time-item.c:826
-#: ../calendar/gui/e-timezone-entry.c:319
+#: ../calendar/gui/e-day-view-time-item.c:810
+#: ../calendar/gui/e-timezone-entry.c:316
 #: ../modules/calendar/e-calendar-preferences.c:251
 msgid "Select..."
 msgstr "Selectâ?¦"
@@ -3980,8 +3973,8 @@ msgstr "Selectâ?¦"
 #. 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:877 ../calendar/gui/e-day-view.c:1802
-#: ../calendar/gui/e-week-view-main-item.c:214 ../calendar/gui/print.c:1847
+#: ../calendar/gui/e-day-view-top-item.c:841 ../calendar/gui/e-day-view.c:1793
+#: ../calendar/gui/e-week-view-main-item.c:208 ../calendar/gui/print.c:1866
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -3991,9 +3984,9 @@ 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:881 ../calendar/gui/e-day-view.c:1819
-#: ../calendar/gui/e-week-view-main-item.c:223
-#: ../calendar/gui/ea-gnome-calendar.c:203
+#: ../calendar/gui/e-day-view-top-item.c:845 ../calendar/gui/e-day-view.c:1810
+#: ../calendar/gui/e-week-view-main-item.c:217
+#: ../calendar/gui/ea-gnome-calendar.c:200
 #: ../modules/calendar/e-cal-shell-view-private.c:1005
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -4003,29 +3996,29 @@ 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:885 ../calendar/gui/e-day-view.c:1835
-#: ../calendar/gui/e-week-view-main-item.c:237
-#: ../calendar/gui/ea-gnome-calendar.c:233
+#: ../calendar/gui/e-day-view-top-item.c:849 ../calendar/gui/e-day-view.c:1826
+#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../calendar/gui/ea-gnome-calendar.c:230
 #: ../modules/calendar/e-cal-shell-view-private.c:1041
 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:1005 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:904 ../calendar/gui/print.c:920
-#: ../calendar/gui/print.c:2341 ../calendar/gui/print.c:2358
+#: ../calendar/gui/e-day-view.c:1002 ../calendar/gui/e-week-view.c:757
+#: ../calendar/gui/print.c:920 ../calendar/gui/print.c:939
+#: ../calendar/gui/print.c:2363 ../calendar/gui/print.c:2383
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1008 ../calendar/gui/e-week-view.c:763
-#: ../calendar/gui/print.c:906 ../calendar/gui/print.c:922
-#: ../calendar/gui/print.c:2343 ../calendar/gui/print.c:2360
+#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:925 ../calendar/gui/print.c:941
+#: ../calendar/gui/print.c:2368 ../calendar/gui/print.c:2385
 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:2609
+#: ../calendar/gui/e-day-view.c:2606
 #, c-format
 msgid "Week %d"
 msgstr "Week %d"
@@ -4047,78 +4040,88 @@ msgid "Resources"
 msgstr "Resources"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/e-meeting-store.c:990 ../calendar/gui/print.c:1069
+#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
+#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1088
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1070 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
+#: ../calendar/gui/print.c:1089 ../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:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1071
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/print.c:1090
 msgid "Resource"
 msgstr "Resource"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/print.c:1072
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1091
 msgid "Room"
 msgstr "Room"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/print.c:1086
+#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/print.c:1105
 msgid "Chair"
 msgstr "Chair"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/e-meeting-store.c:993 ../calendar/gui/print.c:1087
+#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:1024 ../calendar/gui/print.c:1106
 msgid "Required Participant"
 msgstr "Required Participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1088
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1107
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/print.c:1089
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/print.c:1108
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/e-meeting-store.c:1003
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:1034
 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:537
+#: ../calendar/gui/e-meeting-list-view.c:539
 msgid "Attendee                          "
 msgstr "Attendee                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:582
+#: ../calendar/gui/e-meeting-list-view.c:584
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
 msgid "In Process"
 msgstr "In Process"
 
+#: ../calendar/gui/e-meeting-store.c:1763
+#, c-format
+msgid "Enter password to access free/busy information on server %s as user %s"
+msgstr "Enter password to access free/busy information on server %s as user %s"
+
+#: ../calendar/gui/e-meeting-store.c:1772
+#, c-format
+msgid "Failure reason: %s"
+msgstr "Failure reason: %s"
+
 #. 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:434
-#: ../calendar/gui/e-meeting-time-sel.c:2397
+#: ../calendar/gui/e-meeting-time-sel-item.c:431
+#: ../calendar/gui/e-meeting-time-sel.c:2380
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -4126,74 +4129,74 @@ msgstr "%A, %d %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:438
-#: ../calendar/gui/e-meeting-time-sel.c:2428
+#: ../calendar/gui/e-meeting-time-sel-item.c:435
+#: ../calendar/gui/e-meeting-time-sel.c:2411
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel-item.c:439
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Out of Office"
 msgstr "Out of Office"
 
-#: ../calendar/gui/e-meeting-time-sel.c:551
+#: ../calendar/gui/e-meeting-time-sel.c:548
 msgid "No Information"
 msgstr "No Information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:587
+#: ../calendar/gui/e-meeting-time-sel.c:584
 msgid "O_ptions"
 msgstr "O_ptions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:605
+#: ../calendar/gui/e-meeting-time-sel.c:602
 msgid "Show _only working hours"
 msgstr "Show _only working hours"
 
-#: ../calendar/gui/e-meeting-time-sel.c:616
+#: ../calendar/gui/e-meeting-time-sel.c:613
 msgid "Show _zoomed out"
 msgstr "Show _zoomed out"
 
-#: ../calendar/gui/e-meeting-time-sel.c:632
+#: ../calendar/gui/e-meeting-time-sel.c:629
 msgid "_Update free/busy"
 msgstr "_Update free/busy"
 
-#: ../calendar/gui/e-meeting-time-sel.c:647
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:665
+#: ../calendar/gui/e-meeting-time-sel.c:662
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: ../calendar/gui/e-meeting-time-sel.c:680
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:698
+#: ../calendar/gui/e-meeting-time-sel.c:695
 msgid "_All people and resources"
 msgstr "_All people and resources"
 
-#: ../calendar/gui/e-meeting-time-sel.c:708
+#: ../calendar/gui/e-meeting-time-sel.c:705
 msgid "All _people and one resource"
 msgstr "All _people and one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:718
+#: ../calendar/gui/e-meeting-time-sel.c:715
 msgid "_Required people"
 msgstr "_Required people"
 
-#: ../calendar/gui/e-meeting-time-sel.c:727
+#: ../calendar/gui/e-meeting-time-sel.c:724
 msgid "Required people and _one resource"
 msgstr "Required people and _one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:776
+#: ../calendar/gui/e-meeting-time-sel.c:773
 msgid "_Start time:"
 msgstr "_Start time:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:816
+#: ../calendar/gui/e-meeting-time-sel.c:813
 msgid "_End time:"
 msgstr "_End time:"
 
@@ -4222,46 +4225,46 @@ msgid "Member"
 msgstr "Member"
 
 #: ../calendar/gui/e-memo-table.c:419
-#: ../modules/calendar/e-cal-shell-content.c:473
+#: ../modules/calendar/e-cal-shell-content.c:469
 #: ../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:431
+#: ../plugins/caldav/caldav-browse-server.c:438
 msgid "Memos"
 msgstr "Memos"
 
-#: ../calendar/gui/e-memo-table.c:497 ../calendar/gui/e-task-table.c:714
+#: ../calendar/gui/e-memo-table.c:500 ../calendar/gui/e-task-table.c:723
 msgid "* No Summary *"
 msgstr "* No Summary *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:582 ../calendar/gui/e-task-table.c:794
+#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:803
 msgid "Start: "
 msgstr "Start: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:812
+#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:821
 msgid "Due: "
 msgstr "Due: "
 
-#: ../calendar/gui/e-memo-table.c:717
+#: ../calendar/gui/e-memo-table.c:720
 msgid "Cut selected memos to the clipboard"
 msgstr "Cut selected memos to the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:723
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Copy selected memos to the clipboard"
 msgstr "Copy selected memos to the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:729
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Paste memos from the clipboard"
 msgstr "Paste memos from the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:735
+#: ../calendar/gui/e-memo-table.c:738
 #: ../modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Delete selected memos"
 msgstr "Delete selected memos"
 
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-memo-table.c:744
 msgid "Select all visible memos"
 msgstr "Select all visible memos"
 
@@ -4273,54 +4276,54 @@ msgstr "Click to add a memo"
 #. %d is the actual value, %% is replaced with a percent sign.
 #. Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:544
+#: ../calendar/gui/e-task-table.c:545
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:636 ../calendar/gui/print.c:2140
+#: ../calendar/gui/e-task-table.c:642 ../calendar/gui/print.c:2159
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
-#: ../modules/calendar/e-cal-shell-content.c:434
+#: ../modules/calendar/e-cal-shell-content.c:430
 #: ../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:444
-#: ../plugins/caldav/caldav-browse-server.c:429
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/caldav/caldav-browse-server.c:436
+#: ../plugins/groupwise-features/camel-gw-listener.c:428
+#: ../plugins/groupwise-features/camel-gw-listener.c:569
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "Tasks"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:949
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cut selected tasks to the clipboard"
 
-#: ../calendar/gui/e-task-table.c:946
+#: ../calendar/gui/e-task-table.c:955
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copy selected tasks to the clipboard"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:961
 msgid "Paste tasks from the clipboard"
 msgstr "Paste tasks from the clipboard"
 
-#: ../calendar/gui/e-task-table.c:958
+#: ../calendar/gui/e-task-table.c:967
 #: ../modules/calendar/e-task-shell-view-actions.c:696
 msgid "Delete selected tasks"
 msgstr "Delete selected tasks"
 
-#: ../calendar/gui/e-task-table.c:964
+#: ../calendar/gui/e-task-table.c:973
 msgid "Select all visible tasks"
 msgstr "Select all visible tasks"
 
-#: ../calendar/gui/e-timezone-entry.c:330
+#: ../calendar/gui/e-timezone-entry.c:327
 msgid "Select Timezone"
 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:231 ../calendar/gui/print.c:1828
+#: ../calendar/gui/e-week-view-main-item.c:225 ../calendar/gui/print.c:1847
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -4353,23 +4356,23 @@ msgstr "calendar view event"
 msgid "Grab Focus"
 msgstr "Grab Focus"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:302
 msgid "New Appointment"
 msgstr "New Appointment"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:303
 msgid "New All Day Event"
 msgstr "New All Day Event"
 
-#: ../calendar/gui/ea-cal-view.c:307
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New Meeting"
 msgstr "New Meeting"
 
-#: ../calendar/gui/ea-cal-view.c:308
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "Go to Today"
 msgstr "Go to Today"
 
-#: ../calendar/gui/ea-cal-view.c:309
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "Go to Date"
 msgstr "Go to Date"
 
@@ -4378,7 +4381,7 @@ msgstr "Go to Date"
 msgid "a table to view and select the current time range"
 msgstr "a table to view and select the current time range"
 
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:147
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -4387,14 +4390,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:156 ../calendar/gui/ea-week-view.c:153
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:150
 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:163
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Work Week View: %s. %s"
@@ -4402,43 +4405,43 @@ 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:169
+#: ../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:203
+#: ../calendar/gui/ea-day-view.c:200
 msgid "calendar view for a work week"
 msgstr "calendar view for a work week"
 
-#: ../calendar/gui/ea-day-view.c:205
+#: ../calendar/gui/ea-day-view.c:202
 msgid "calendar view for one or more days"
 msgstr "calendar view for one or more days"
 
-#: ../calendar/gui/ea-gnome-calendar.c:49
-#: ../calendar/gui/ea-gnome-calendar.c:57
+#: ../calendar/gui/ea-gnome-calendar.c:46
+#: ../calendar/gui/ea-gnome-calendar.c:54
 #: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
-#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../calendar/gui/ea-gnome-calendar.c:197
 #: ../modules/calendar/e-cal-shell-view-private.c:1001
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:205
-#: ../calendar/gui/ea-gnome-calendar.c:210
-#: ../calendar/gui/ea-gnome-calendar.c:212
+#: ../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:1008
 #: ../modules/calendar/e-cal-shell-view-private.c:1014
 #: ../modules/calendar/e-cal-shell-view-private.c:1017
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:229
-#: ../calendar/gui/ea-gnome-calendar.c:235
-#: ../calendar/gui/ea-gnome-calendar.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:243
+#: ../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:1034
 #: ../modules/calendar/e-cal-shell-view-private.c:1045
 #: ../modules/calendar/e-cal-shell-view-private.c:1052
@@ -4454,21 +4457,21 @@ msgstr "Jump button"
 msgid "Click here, you can find more events."
 msgstr "Click here, you can find more events."
 
-#: ../calendar/gui/ea-week-view.c:158
+#: ../calendar/gui/ea-week-view.c:155
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Month View: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:162
+#: ../calendar/gui/ea-week-view.c:159
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Week View: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:196
+#: ../calendar/gui/ea-week-view.c:193
 msgid "calendar view for a month"
 msgstr "calendar view for a month"
 
-#: ../calendar/gui/ea-week-view.c:198
+#: ../calendar/gui/ea-week-view.c:195
 msgid "calendar view for one or more weeks"
 msgstr "calendar view for one or more weeks"
 
@@ -4525,7 +4528,7 @@ msgid "Select Date"
 msgstr "Select Date"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1317
+#: ../modules/calendar/e-cal-shell-view-actions.c:1318
 msgid "Select _Today"
 msgstr "Select _Today"
 
@@ -4533,32 +4536,32 @@ msgstr "Select _Today"
 msgid "September"
 msgstr "September"
 
-#: ../calendar/gui/itip-utils.c:407 ../calendar/gui/itip-utils.c:458
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:422 ../calendar/gui/itip-utils.c:477
+#: ../calendar/gui/itip-utils.c:573
 msgid "An organizer must be set."
 msgstr "An organiser must be set."
 
-#: ../calendar/gui/itip-utils.c:450
+#: ../calendar/gui/itip-utils.c:469
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:811
 msgid "Event information"
 msgstr "Event information"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:785
+#: ../calendar/gui/itip-utils.c:660 ../calendar/gui/itip-utils.c:814
 msgid "Task information"
 msgstr "Task information"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:817
 msgid "Memo information"
 msgstr "Memo information"
 
-#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:806
+#: ../calendar/gui/itip-utils.c:666 ../calendar/gui/itip-utils.c:835
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
-#: ../calendar/gui/itip-utils.c:643
+#: ../calendar/gui/itip-utils.c:669
 msgid "Calendar information"
 msgstr "Calendar information"
 
@@ -4566,7 +4569,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:677
+#: ../calendar/gui/itip-utils.c:706
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Accepted"
@@ -4575,7 +4578,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:684
+#: ../calendar/gui/itip-utils.c:713
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
@@ -4587,7 +4590,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:691 ../calendar/gui/itip-utils.c:739
+#: ../calendar/gui/itip-utils.c:720 ../calendar/gui/itip-utils.c:768
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Declined"
@@ -4596,7 +4599,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:698
+#: ../calendar/gui/itip-utils.c:727
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegated"
@@ -4604,7 +4607,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:711
+#: ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Updated"
@@ -4612,7 +4615,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:718
+#: ../calendar/gui/itip-utils.c:747
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancel"
@@ -4620,7 +4623,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:725
+#: ../calendar/gui/itip-utils.c:754
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Refresh"
@@ -4628,239 +4631,239 @@ 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:732
+#: ../calendar/gui/itip-utils.c:761
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Counter-proposal"
 
-#: ../calendar/gui/itip-utils.c:803
+#: ../calendar/gui/itip-utils.c:832
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Free/Busy information (%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:840
 msgid "iCalendar information"
 msgstr "iCalendar information"
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:865
 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:833
+#: ../calendar/gui/itip-utils.c:869
 msgid "Unable to book a resource, error: "
 msgstr "Unable to book a resource, error: "
 
-#: ../calendar/gui/itip-utils.c:986
+#: ../calendar/gui/itip-utils.c:1032
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:549
 msgid "1st"
 msgstr "1st"
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:549
 msgid "2nd"
 msgstr "2nd"
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:549
 msgid "3rd"
 msgstr "3rd"
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:549
 msgid "4th"
 msgstr "4th"
 
-#: ../calendar/gui/print.c:542
+#: ../calendar/gui/print.c:549
 msgid "5th"
 msgstr "5th"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:550
 msgid "6th"
 msgstr "6th"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:550
 msgid "7th"
 msgstr "7th"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:550
 msgid "8th"
 msgstr "8th"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:550
 msgid "9th"
 msgstr "9th"
 
-#: ../calendar/gui/print.c:543
+#: ../calendar/gui/print.c:550
 msgid "10th"
 msgstr "10th"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:551
 msgid "11th"
 msgstr "11th"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:551
 msgid "12th"
 msgstr "12th"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:551
 msgid "13th"
 msgstr "13th"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:551
 msgid "14th"
 msgstr "14th"
 
-#: ../calendar/gui/print.c:544
+#: ../calendar/gui/print.c:551
 msgid "15th"
 msgstr "15th"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:552
 msgid "16th"
 msgstr "16th"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:552
 msgid "17th"
 msgstr "17th"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:552
 msgid "18th"
 msgstr "18th"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:552
 msgid "19th"
 msgstr "19th"
 
-#: ../calendar/gui/print.c:545
+#: ../calendar/gui/print.c:552
 msgid "20th"
 msgstr "20th"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:553
 msgid "21st"
 msgstr "21st"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:553
 msgid "22nd"
 msgstr "22nd"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:553
 msgid "23rd"
 msgstr "23rd"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:553
 msgid "24th"
 msgstr "24th"
 
-#: ../calendar/gui/print.c:546
+#: ../calendar/gui/print.c:553
 msgid "25th"
 msgstr "25th"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:554
 msgid "26th"
 msgstr "26th"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:554
 msgid "27th"
 msgstr "27th"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:554
 msgid "28th"
 msgstr "28th"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:554
 msgid "29th"
 msgstr "29th"
 
-#: ../calendar/gui/print.c:547
+#: ../calendar/gui/print.c:554
 msgid "30th"
 msgstr "30th"
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:555
 msgid "31st"
 msgstr "31st"
 
-#: ../calendar/gui/print.c:605
+#: ../calendar/gui/print.c:612
 msgid "Su"
 msgstr "Su"
 
-#: ../calendar/gui/print.c:605
+#: ../calendar/gui/print.c:612
 msgid "Mo"
 msgstr "Mo"
 
-#: ../calendar/gui/print.c:605
+#: ../calendar/gui/print.c:612
 msgid "Tu"
 msgstr "Tu"
 
-#: ../calendar/gui/print.c:605
+#: ../calendar/gui/print.c:612
 msgid "We"
 msgstr "We"
 
-#: ../calendar/gui/print.c:606
+#: ../calendar/gui/print.c:613
 msgid "Th"
 msgstr "Th"
 
-#: ../calendar/gui/print.c:606
+#: ../calendar/gui/print.c:613
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:606
+#: ../calendar/gui/print.c:613
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2969
+#: ../calendar/gui/print.c:3001
 msgid " to "
 msgstr " to "
 
-#: ../calendar/gui/print.c:2979
+#: ../calendar/gui/print.c:3011
 msgid " (Completed "
 msgstr " (Completed "
 
-#: ../calendar/gui/print.c:2985
+#: ../calendar/gui/print.c:3017
 msgid "Completed "
 msgstr "Completed "
 
-#: ../calendar/gui/print.c:2995
+#: ../calendar/gui/print.c:3027
 msgid " (Due "
 msgstr " (Due "
 
-#: ../calendar/gui/print.c:3002
+#: ../calendar/gui/print.c:3034
 msgid "Due "
 msgstr "Due "
 
-#: ../calendar/gui/print.c:3167
+#: ../calendar/gui/print.c:3199
 #, c-format
 msgid "Summary: %s"
 msgstr "Summary: %s"
 
-#: ../calendar/gui/print.c:3194
+#: ../calendar/gui/print.c:3226
 msgid "Attendees: "
 msgstr "Attendees: "
 
-#: ../calendar/gui/print.c:3237
+#: ../calendar/gui/print.c:3269
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:3252
+#: ../calendar/gui/print.c:3284
 #, c-format
 msgid "Priority: %s"
 msgstr "Priority: %s"
 
-#: ../calendar/gui/print.c:3270
+#: ../calendar/gui/print.c:3302
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percent Complete: %i"
 
-#: ../calendar/gui/print.c:3281
+#: ../calendar/gui/print.c:3313
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3294
+#: ../calendar/gui/print.c:3326
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: ../calendar/gui/print.c:3305
+#: ../calendar/gui/print.c:3337
 msgid "Contacts: "
 msgstr "Contacts: "
 
@@ -6613,157 +6616,169 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: ../composer/e-composer-actions.c:163
+#: ../composer/e-composer-actions.c:204
 msgid "Save as..."
 msgstr "Save asâ?¦"
 
-#: ../composer/e-composer-actions.c:259
-#: ../widgets/misc/e-attachment-view.c:380
+#: ../composer/e-composer-actions.c:287
+#: ../widgets/misc/e-attachment-view.c:377
 msgid "Attach a file"
 msgstr "Attach a file"
 
-#: ../composer/e-composer-actions.c:264
-#: ../widgets/misc/e-signature-editor.c:207
+#: ../composer/e-composer-actions.c:292
+#: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "_Close"
 
-#: ../composer/e-composer-actions.c:266
+#: ../composer/e-composer-actions.c:294
 msgid "Close the current file"
 msgstr "Close the current file"
 
-#: ../composer/e-composer-actions.c:273
-msgid "Save the current file"
-msgstr "Save the current file"
+#: ../composer/e-composer-actions.c:299
+msgid "New _Message"
+msgstr "New _Message"
 
-#: ../composer/e-composer-actions.c:278
-msgid "Save _As..."
-msgstr "Save _Asâ?¦"
+#: ../composer/e-composer-actions.c:301
+msgid "Open New Message window"
+msgstr "Open New Message window"
 
-#: ../composer/e-composer-actions.c:280
-msgid "Save the current file with a different name"
-msgstr "Save the current file with a different name"
+#: ../composer/e-composer-actions.c:308 ../shell/e-shell-window-actions.c:1489
+msgid "Configure Evolution"
+msgstr "Configure Evolution"
 
-#: ../composer/e-composer-actions.c:285
-msgid "New _Message"
-msgstr "New _Message"
+#: ../composer/e-composer-actions.c:315
+msgid "Save the current file"
+msgstr "Save the current file"
 
-#: ../composer/e-composer-actions.c:287
-msgid "Open New Message window"
-msgstr "Open New Message window"
+#: ../composer/e-composer-actions.c:320
+msgid "Save _As..."
+msgstr "Save _Asâ?¦"
 
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:322
+msgid "Save the current file with a different name"
+msgstr "Save the current file with a different name"
+
+#: ../composer/e-composer-actions.c:329
 msgid "Character _Encoding"
 msgstr "Character _Encoding"
 
-#: ../composer/e-composer-actions.c:311
+#: ../composer/e-composer-actions.c:346
 msgid "_Print..."
 msgstr "_Printâ?¦"
 
-#: ../composer/e-composer-actions.c:318
+#: ../composer/e-composer-actions.c:353
 msgid "Print Pre_view"
 msgstr "Print Pre_view"
 
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:360
 msgid "Save as _Draft"
 msgstr "Save as _Draft"
 
-#: ../composer/e-composer-actions.c:327
+#: ../composer/e-composer-actions.c:362
 msgid "Save as draft"
 msgstr "Save as draft"
 
-#: ../composer/e-composer-actions.c:332 ../composer/e-composer-private.c:318
+#: ../composer/e-composer-actions.c:367 ../composer/e-composer-private.c:347
 msgid "S_end"
 msgstr "S_end"
 
-#: ../composer/e-composer-actions.c:334
+#: ../composer/e-composer-actions.c:369
 msgid "Send this message"
 msgstr "Send this message"
 
-#: ../composer/e-composer-actions.c:342
+#: ../composer/e-composer-actions.c:377
 msgid "PGP _Encrypt"
 msgstr "PGP _Encrypt"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:379
 msgid "Encrypt this message with PGP"
 msgstr "Encrypt this message with PGP"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:385
 msgid "PGP _Sign"
 msgstr "PGP _Sign"
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:387
 msgid "Sign this message with your PGP key"
 msgstr "Sign this message with your PGP key"
 
-#: ../composer/e-composer-actions.c:358
+#: ../composer/e-composer-actions.c:393
+msgid "_Picture Gallery"
+msgstr "_Picture Gallery"
+
+#: ../composer/e-composer-actions.c:395
+msgid "Show a collection of pictures that you can drag to your message"
+msgstr "Show a collection of pictures that you can drag to your message"
+
+#: ../composer/e-composer-actions.c:401
 msgid "_Prioritize Message"
 msgstr "_Prioritise Message"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:403
 msgid "Set the message priority to high"
 msgstr "Set the message priority to high"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:409
 msgid "Re_quest Read Receipt"
 msgstr "Re_quest Read Receipt"
 
-#: ../composer/e-composer-actions.c:368
+#: ../composer/e-composer-actions.c:411
 msgid "Get delivery notification when your message is read"
 msgstr "Get delivery notification when your message is read"
 
-#: ../composer/e-composer-actions.c:374
+#: ../composer/e-composer-actions.c:417
 msgid "S/MIME En_crypt"
 msgstr "S/MIME En_crypt"
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:419
 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:382
+#: ../composer/e-composer-actions.c:425
 msgid "S/MIME Sig_n"
 msgstr "S/MIME Sig_n"
 
-#: ../composer/e-composer-actions.c:384
+#: ../composer/e-composer-actions.c:427
 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:390
+#: ../composer/e-composer-actions.c:433
 msgid "_Bcc Field"
 msgstr "_Bcc Field"
 
-#: ../composer/e-composer-actions.c:392
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Toggles whether the Bcc field is displayed"
 
-#: ../composer/e-composer-actions.c:398
+#: ../composer/e-composer-actions.c:441
 msgid "_Cc Field"
 msgstr "_Cc Field"
 
-#: ../composer/e-composer-actions.c:400
+#: ../composer/e-composer-actions.c:443
 msgid "Toggles whether the CC field is displayed"
 msgstr "Toggles whether the Cc field is displayed"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:449
 msgid "_Reply-To Field"
 msgstr "_Reply-To Field"
 
-#: ../composer/e-composer-actions.c:408
+#: ../composer/e-composer-actions.c:451
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Toggles whether the Reply-To field is displayed"
 
-#: ../composer/e-composer-actions.c:464
+#: ../composer/e-composer-actions.c:510
 msgid "Save Draft"
 msgstr "Save Draft"
 
-#: ../composer/e-composer-header-table.c:40
+#: ../composer/e-composer-header-table.c:36
 msgid "Enter the recipients of the message"
 msgstr "Enter the recipients of the message"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:38
 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:45
+#: ../composer/e-composer-header-table.c:41
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6771,63 +6786,63 @@ 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:1006
+#: ../composer/e-composer-header-table.c:1004
 msgid "Fr_om:"
 msgstr "Fr_om:"
 
-#: ../composer/e-composer-header-table.c:1015
+#: ../composer/e-composer-header-table.c:1013
 msgid "_Reply-To:"
 msgstr "_Reply-To:"
 
-#: ../composer/e-composer-header-table.c:1019
+#: ../composer/e-composer-header-table.c:1017
 msgid "_To:"
 msgstr "_To:"
 
-#: ../composer/e-composer-header-table.c:1024
+#: ../composer/e-composer-header-table.c:1022
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:1029
+#: ../composer/e-composer-header-table.c:1027
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:1032
 msgid "_Post To:"
 msgstr "_Post To:"
 
-#: ../composer/e-composer-header-table.c:1038
+#: ../composer/e-composer-header-table.c:1036
 msgid "S_ubject:"
 msgstr "S_ubject:"
 
-#: ../composer/e-composer-header-table.c:1047
+#: ../composer/e-composer-header-table.c:1045
 msgid "Si_gnature:"
 msgstr "Si_gnature:"
 
-#: ../composer/e-composer-name-header.c:141
+#: ../composer/e-composer-name-header.c:137
 msgid "Click here for the address book"
 msgstr "Click here for the address book"
 
-#: ../composer/e-composer-post-header.c:131
+#: ../composer/e-composer-post-header.c:127
 msgid "Click here to select folders to post to"
 msgstr "Click here to select folders to post to"
 
-#: ../composer/e-composer-private.c:217
+#: ../composer/e-composer-private.c:245
 msgid "Undo the last action"
 msgstr "Undo the last action"
 
-#: ../composer/e-composer-private.c:221
+#: ../composer/e-composer-private.c:249
 msgid "Redo the last undone action"
 msgstr "Redo the last undone action"
 
-#: ../composer/e-composer-private.c:225
+#: ../composer/e-composer-private.c:253
 msgid "Search for text"
 msgstr "Search for text"
 
-#: ../composer/e-composer-private.c:229
+#: ../composer/e-composer-private.c:257
 msgid "Search for and replace text"
 msgstr "Search for and replace text"
 
-#: ../composer/e-composer-private.c:338
+#: ../composer/e-composer-private.c:367
 msgid "Save draft"
 msgstr "Save draft"
 
@@ -6847,15 +6862,15 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 
-#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2014
+#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2058
 msgid "Compose Message"
 msgstr "Compose Message"
 
-#: ../composer/e-msg-composer.c:4082
+#: ../composer/e-msg-composer.c:4116
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "The composer contains a non-text message body, which cannot be edited."
 
-#: ../composer/e-msg-composer.c:4787
+#: ../composer/e-msg-composer.c:4821
 msgid "Untitled Message"
 msgstr "Untitled Message"
 
@@ -6988,75 +7003,80 @@ msgstr "You cannot attach the file &quot;{0}&quot; to this message."
 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:26
+msgid "Your message was sent, but an error occurred during post-processing."
+msgstr "Your message was sent, but an error occurred during post-processing."
+
 #. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:28
 msgid "_Continue Editing"
 msgstr "_Continue Editing"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Do not Recover"
 msgstr "_Do not Recover"
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Recover"
 msgstr "_Recover"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Save Draft"
 msgstr "_Save Draft"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:33
 msgid "_Save to Outbox"
 msgstr "_Save to Outbox"
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../composer/mail-composer.error.xml.h:35
 msgid "_Try Again"
 msgstr "_Try Again"
 
-#: ../capplet/anjal-settings-main.c:223
+#: ../capplet/anjal-settings-main.c:216
 msgid "Run Anjal in a window"
 msgstr "Run Anjal in a window"
 
-#: ../capplet/anjal-settings-main.c:224
+#: ../capplet/anjal-settings-main.c:217
 msgid "Make Anjal the default email client"
 msgstr "Make Anjal the default e-mail client"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:231
+#: ../capplet/anjal-settings-main.c:224
 msgid "ID of the socket to embed in"
 msgstr "ID of the socket to embed in"
 
-#: ../capplet/anjal-settings-main.c:232
+#: ../capplet/anjal-settings-main.c:225
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:245
+#: ../capplet/anjal-settings-main.c:238
 msgid "Anjal email client"
 msgstr "Anjal e-mail client"
 
-#: ../capplet/settings/mail-account-view.c:73
+#: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
 msgstr "Please enter your full name."
 
-#: ../capplet/settings/mail-account-view.c:74
+#: ../capplet/settings/mail-account-view.c:78
 msgid "Please enter your email address."
 msgstr "Please enter your e-mail address."
 
-#: ../capplet/settings/mail-account-view.c:75
+#: ../capplet/settings/mail-account-view.c:79
 msgid "The email address you have entered is invalid."
 msgstr "The e-mail address you have entered is invalid."
 
-#: ../capplet/settings/mail-account-view.c:76
+#: ../capplet/settings/mail-account-view.c:80
 msgid "Please enter your password."
 msgstr "Please enter your password."
 
-#: ../capplet/settings/mail-account-view.c:255
+#: ../capplet/settings/mail-account-view.c:259
 #: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../capplet/settings/mail-account-view.c:359
-#: ../plugins/google-account-setup/google-contacts-source.c:56
+#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:413
+#: ../plugins/google-account-setup/google-contacts-source.c:53
 #: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "Google"
@@ -7152,7 +7172,7 @@ msgstr ""
 "your mail."
 
 #: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2088 ../mail/em-account-editor.c:2209
+#: ../mail/em-account-editor.c:2090 ../mail/em-account-editor.c:2211
 msgid "Identity"
 msgstr "Identity"
 
@@ -7204,7 +7224,7 @@ msgid "Back - Receiving options"
 msgstr "Back â?? Receiving options"
 
 #: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3028
+#: ../mail/em-account-editor.c:3042
 msgid "Defaults"
 msgstr "Defaults"
 
@@ -7224,27 +7244,27 @@ msgstr "Finish"
 msgid "Back - Sending"
 msgstr "Back â?? Sending"
 
-#: ../capplet/settings/mail-account-view.c:725
+#: ../capplet/settings/mail-account-view.c:740
 msgid "Setup Google contacts with Evolution"
 msgstr "Set up Google Contacts with Evolution"
 
-#: ../capplet/settings/mail-account-view.c:726
+#: ../capplet/settings/mail-account-view.c:741
 msgid "Setup Google calendar with Evolution"
 msgstr "Set up Google Calendar with Evolution"
 
-#: ../capplet/settings/mail-account-view.c:731
+#: ../capplet/settings/mail-account-view.c:746
 msgid "You may need to enable IMAP access."
 msgstr "You may need to enable IMAP access."
 
-#: ../capplet/settings/mail-account-view.c:739
+#: ../capplet/settings/mail-account-view.c:754
 msgid "Google account settings:"
 msgstr "Google account settings:"
 
-#: ../capplet/settings/mail-account-view.c:766
+#: ../capplet/settings/mail-account-view.c:780
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "Set up Yahoo! Calendar with Evolution"
 
-#: ../capplet/settings/mail-account-view.c:770
+#: ../capplet/settings/mail-account-view.c:784
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
@@ -7254,46 +7274,46 @@ msgstr ""
 "calendar name, so please confirm and re-enter the calendar name if it is not "
 "correct."
 
-#: ../capplet/settings/mail-account-view.c:777
+#: ../capplet/settings/mail-account-view.c:793
 msgid "Yahoo account settings:"
 msgstr "Yahoo account settings:"
 
-#: ../capplet/settings/mail-account-view.c:791
+#: ../capplet/settings/mail-account-view.c:807
 msgid "Yahoo Calendar name:"
 msgstr "Yahoo! Calendar name:"
 
-#: ../capplet/settings/mail-account-view.c:1063
+#: ../capplet/settings/mail-account-view.c:1079
 msgid "Password:"
 msgstr "Password:"
 
-#: ../capplet/settings/mail-account-view.c:1132
-#: ../capplet/settings/mail-settings-view.c:266
+#: ../capplet/settings/mail-account-view.c:1130
+#: ../capplet/settings/mail-settings-view.c:248
 msgid "Close Tab"
 msgstr "Close Tab"
 
-#: ../capplet/settings/mail-account-view.c:1142
+#: ../capplet/settings/mail-account-view.c:1140
 msgid "Account Wizard"
 msgstr "Account Wizard"
 
-#: ../capplet/settings/mail-capplet-shell.c:212
+#: ../capplet/settings/mail-capplet-shell.c:209
 msgid "Evolution account assistant"
 msgstr "Evolution account assistant"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:358 ../mail/e-mail-migrate.c:677
-#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:148
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
-#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:218
-#: ../mail/message-list.c:1709
-#: ../modules/addressbook/e-book-shell-backend.c:96
+#: ../capplet/settings/mail-capplet-shell.c:353 ../mail/e-mail-migrate.c:680
+#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:146
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:161
+#: ../mail/em-folder-tree-model.c:163 ../mail/mail-vfolder.c:218
+#: ../mail/message-list.c:1721
+#: ../modules/addressbook/e-book-shell-backend.c:92
 #: ../modules/addressbook/e-book-shell-migrate.c:135
-#: ../modules/calendar/e-cal-shell-backend.c:107
-#: ../modules/calendar/e-cal-shell-migrate.c:148
-#: ../modules/calendar/e-memo-shell-backend.c:96
+#: ../modules/calendar/e-cal-shell-backend.c:103
+#: ../modules/calendar/e-cal-shell-migrate.c:150
+#: ../modules/calendar/e-memo-shell-backend.c:92
 #: ../modules/calendar/e-memo-shell-migrate.c:106
-#: ../modules/calendar/e-task-shell-backend.c:96
-#: ../modules/calendar/e-task-shell-migrate.c:115
+#: ../modules/calendar/e-task-shell-backend.c:92
+#: ../modules/calendar/e-task-shell-migrate.c:117
 msgid "On This Computer"
 msgstr "On This Computer"
 
@@ -7310,7 +7330,7 @@ msgstr "Add a new account"
 msgid "Account management"
 msgstr "Account management"
 
-#: ../capplet/settings/mail-settings-view.c:276
+#: ../capplet/settings/mail-settings-view.c:258
 msgid "Settings"
 msgstr "Settings"
 
@@ -7322,8 +7342,8 @@ msgstr "Calendar event notifications"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution Alarm Notify"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:959
-#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:952
+#: ../modules/mailto-handler/evolution-mailto-handler.c:212
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
@@ -7349,36 +7369,36 @@ msgid "Email Settings"
 msgstr "E-mail Settings"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:226
+#: ../e-util/e-activity.c:223
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (cancelled)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:229
+#: ../e-util/e-activity.c:226
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (completed)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:232
+#: ../e-util/e-activity.c:229
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (waiting)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:236
+#: ../e-util/e-activity.c:233
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (cancelling)"
 
-#: ../e-util/e-activity.c:238
+#: ../e-util/e-activity.c:235
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:243
+#: ../e-util/e-activity.c:240
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
@@ -7461,34 +7481,84 @@ msgid "Visual"
 msgstr "Visual"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:199
-#: ../modules/calendar/e-cal-shell-view-actions.c:1795
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1796
 #: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:311
+#: ../widgets/table/e-cell-date-edit.c:308
 msgid "Today"
 msgstr "Today"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:210 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:207 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Tomorrow"
 
-#: ../e-util/e-datetime-format.c:212
+#: ../e-util/e-datetime-format.c:209
 msgid "Yesterday"
 msgstr "Yesterday"
 
-#. Translators: %a is a strftime modifier, the abbreviated week day name, for example "Next Tue"
-#: ../e-util/e-datetime-format.c:216
-#, c-format
-msgid "Next %a"
-msgstr "Next %a"
-
-#: ../e-util/e-datetime-format.c:293 ../e-util/e-datetime-format.c:303
-#: ../e-util/e-datetime-format.c:312
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:217
+msgctxt "DateFmt"
+msgid "Next Mon"
+msgstr "Next Mon"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:223
+msgctxt "DateFmt"
+msgid "Next Tue"
+msgstr "Next Tue"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:229
+msgctxt "DateFmt"
+msgid "Next Wed"
+msgstr "Next Wed"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:235
+msgctxt "DateFmt"
+msgid "Next Thu"
+msgstr "Next Thu"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:241
+msgctxt "DateFmt"
+msgid "Next Fri"
+msgstr "Next Fri"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:247
+msgctxt "DateFmt"
+msgid "Next Sat"
+msgstr "Next Sat"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:253
+msgctxt "DateFmt"
+msgid "Next Sun"
+msgstr "Next Sun"
+
+#: ../e-util/e-datetime-format.c:335 ../e-util/e-datetime-format.c:345
+#: ../e-util/e-datetime-format.c:354
 msgid "Use locale default"
 msgstr "Use locale default"
 
-#: ../e-util/e-datetime-format.c:508
+#: ../e-util/e-datetime-format.c:551
 msgid "Format:"
 msgstr "Format:"
 
@@ -7509,8 +7579,8 @@ msgstr "Writing \"%s\""
 msgid "Writing \"%s\" to %s"
 msgstr "Writing \"%s\" to %s"
 
-#: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:378
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "weeks"
@@ -7553,15 +7623,15 @@ msgstr "Do you wish to overwrite it?"
 msgid "File exists \"{0}\"."
 msgstr "File exists \"{0}\"."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:155
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:157
 msgid "_Overwrite"
 msgstr "_Overwrite"
 
-#: ../e-util/e-util.c:154
+#: ../e-util/e-util.c:146
 msgid "Could not open the link."
 msgstr "Could not open the link."
 
-#: ../e-util/e-util.c:201
+#: ../e-util/e-util.c:193
 msgid "Could not display help for Evolution."
 msgstr "Could not display help for Evolution."
 
@@ -7574,58 +7644,58 @@ msgstr "GConf error: %s"
 msgid "All further errors shown only on terminal."
 msgstr "All further errors shown only on terminal."
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1050
-#: ../mail/e-mail-tag-editor.c:329 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1050
+#: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:70
 msgid "From"
 msgstr "From"
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1051
-#: ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1051
+#: ../modules/mail/em-mailer-prefs.c:71
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1053
-#: ../mail/em-format-html.c:2402 ../mail/em-format-html.c:2464
-#: ../mail/em-format-html.c:2487 ../modules/mail/em-mailer-prefs.c:76
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1053
+#: ../mail/em-format-html.c:2397 ../mail/em-format-html.c:2465
+#: ../mail/em-format-html.c:2488 ../modules/mail/em-mailer-prefs.c:73
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1054
-#: ../mail/em-format-html.c:2403 ../mail/em-format-html.c:2468
-#: ../mail/em-format-html.c:2490 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1054
+#: ../mail/em-format-html.c:2398 ../mail/em-format-html.c:2469
+#: ../mail/em-format-html.c:2491 ../modules/mail/em-mailer-prefs.c:74
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:426 ../em-format/em-format.c:1055
-#: ../mail/e-mail-tag-editor.c:334 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format-quote.c:427 ../em-format/em-format.c:1055
+#: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
 #: ../plugins/groupwise-features/notification.ui.h:2
 #: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "Subject"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:437 ../mail/em-format-html.c:2584
-#: ../modules/mail/em-mailer-prefs.c:1117
+#: ../em-format/em-format-quote.c:438 ../mail/em-format-html.c:2585
+#: ../modules/mail/em-mailer-prefs.c:1119
 msgid "Mailer"
 msgstr "Mailer"
 
-#: ../em-format/em-format-quote.c:518 ../mail/em-composer-utils.c:1141
+#: ../em-format/em-format-quote.c:519 ../mail/em-composer-utils.c:1179
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
 #: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:79 ../widgets/misc/e-dateedit.c:529
-#: ../widgets/misc/e-dateedit.c:551
+#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "Date"
 
-#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:77
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:78
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Face"
@@ -7635,165 +7705,165 @@ msgstr "Face"
 msgid "%s attachment"
 msgstr "%s attachment"
 
-#: ../em-format/em-format.c:1547
+#: ../em-format/em-format.c:1566
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Could not parse S/MIME message: Unknown error"
 
-#: ../em-format/em-format.c:1729 ../em-format/em-format.c:1926
+#: ../em-format/em-format.c:1748 ../em-format/em-format.c:1942
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Could not parse MIME message. Displaying as source."
 
-#: ../em-format/em-format.c:1739
+#: ../em-format/em-format.c:1758
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Unsupported encryption type for multipart/encrypted"
 
-#: ../em-format/em-format.c:1759
+#: ../em-format/em-format.c:1778
 msgid "Could not parse PGP/MIME message"
 msgstr "Could not parse PGP/MIME message"
 
-#: ../em-format/em-format.c:1760
+#: ../em-format/em-format.c:1779
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Could not parse PGP/MIME message: Unknown error"
 
-#: ../em-format/em-format.c:1951
+#: ../em-format/em-format.c:1967
 msgid "Unsupported signature format"
 msgstr "Unsupported signature format"
 
-#: ../em-format/em-format.c:1964 ../em-format/em-format.c:2137
+#: ../em-format/em-format.c:1980 ../em-format/em-format.c:2159
 msgid "Error verifying signature"
 msgstr "Error verifying signature"
 
-#: ../em-format/em-format.c:1965 ../em-format/em-format.c:2124
-#: ../em-format/em-format.c:2138
+#: ../em-format/em-format.c:1981 ../em-format/em-format.c:2146
+#: ../em-format/em-format.c:2160
 msgid "Unknown error verifying signature"
 msgstr "Unknown error verifying signature"
 
-#: ../em-format/em-format.c:2229
+#: ../em-format/em-format.c:2251
 msgid "Could not parse PGP message: "
 msgstr "Could not parse PGP message: "
 
-#: ../em-format/em-format.c:2235 ../mail/mail-ops.c:624
-#: ../plugins/caldav/caldav-browse-server.c:203
-#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../em-format/em-format.c:2257 ../mail/em-folder-tree.c:656
+#: ../mail/mail-ops.c:624 ../plugins/caldav/caldav-browse-server.c:210
+#: ../plugins/caldav/caldav-browse-server.c:1407 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
 msgstr "Unknown error"
 
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../filter/e-filter-datespec.c:70
+#: ../filter/e-filter-datespec.c:66
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 second ago"
 msgstr[1] "%d seconds ago"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:67
 #, 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/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:68
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minute ago"
 msgstr[1] "%d minutes ago"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:69
 #, 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/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 hour ago"
 msgstr[1] "%d hours ago"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:71
 #, 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/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 day ago"
 msgstr[1] "%d days ago"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:73
 #, 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/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 week ago"
 msgstr[1] "%d weeks ago"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../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/e-filter-datespec.c:80
+#: ../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/e-filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:77
 #, 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/e-filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 year ago"
 msgstr[1] "%d years ago"
 
-#: ../filter/e-filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:79
 #, 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/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:129
 msgid "<click here to select a date>"
 msgstr "<click here to select a date>"
 
-#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
-#: ../filter/e-filter-datespec.c:158
+#: ../filter/e-filter-datespec.c:132 ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:154
 msgid "now"
 msgstr "now"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:139
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:286
+#: ../filter/e-filter-datespec.c:282
 msgid "Select a time to compare against"
 msgstr "Select a time to compare against"
 
@@ -7801,70 +7871,70 @@ msgstr "Select a time to compare against"
 msgid "Choose a File"
 msgstr "Choose a File"
 
-#: ../filter/e-filter-rule.c:669
+#: ../filter/e-filter-rule.c:662
 msgid "R_ule name:"
 msgstr "R_ule name:"
 
-#: ../filter/e-filter-rule.c:699
+#: ../filter/e-filter-rule.c:692
 msgid "Find items that meet the following conditions"
 msgstr "Find items that meet the following conditions"
 
-#: ../filter/e-filter-rule.c:724
+#: ../filter/e-filter-rule.c:717
 msgid "If all conditions are met"
 msgstr "If all conditions are met"
 
-#: ../filter/e-filter-rule.c:725
+#: ../filter/e-filter-rule.c:718
 msgid "If any conditions are met"
 msgstr "If any conditions are met"
 
-#: ../filter/e-filter-rule.c:728
+#: ../filter/e-filter-rule.c:721
 msgid "_Find items:"
 msgstr "_Find items:"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:757
+#: ../filter/e-filter-rule.c:750
 msgid "None"
 msgstr "None"
 
-#: ../filter/e-filter-rule.c:758
+#: ../filter/e-filter-rule.c:751
 msgid "All related"
 msgstr "All related"
 
-#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:752 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Replies"
 
-#: ../filter/e-filter-rule.c:760
+#: ../filter/e-filter-rule.c:753
 msgid "Replies and parents"
 msgstr "Replies and parents"
 
-#: ../filter/e-filter-rule.c:761
+#: ../filter/e-filter-rule.c:754
 msgid "No reply or parent"
 msgstr "No reply or parent"
 
-#: ../filter/e-filter-rule.c:764
+#: ../filter/e-filter-rule.c:757
 msgid "I_nclude threads"
 msgstr "I_nclude threads"
 
-#: ../filter/e-filter-rule.c:789
+#: ../filter/e-filter-rule.c:782
 msgid "A_dd Condition"
 msgstr "A_dd Condition"
 
-#: ../filter/e-filter-rule.c:1136 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:317
+#: ../filter/e-filter-rule.c:1130 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:316
 msgid "Incoming"
 msgstr "Incoming"
 
-#: ../filter/e-filter-rule.c:1136 ../mail/em-utils.c:318
+#: ../filter/e-filter-rule.c:1130 ../mail/em-utils.c:317
 msgid "Outgoing"
 msgstr "Outgoing"
 
-#: ../filter/e-rule-editor.c:270
+#: ../filter/e-rule-editor.c:263
 msgid "Add Rule"
 msgstr "Add Rule"
 
-#: ../filter/e-rule-editor.c:359
+#: ../filter/e-rule-editor.c:349
 msgid "Edit Rule"
 msgstr "Edit Rule"
 
@@ -7981,48 +8051,48 @@ msgstr "the time you specify"
 msgid "years"
 msgstr "years"
 
-#: ../mail/e-mail-attachment-bar.c:93 ../mail/e-mail-attachment-bar.c:98
-#: ../mail/em-format-html-display.c:1053 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:131
-#: ../widgets/misc/e-attachment-paned.c:136
+#: ../mail/e-mail-attachment-bar.c:86 ../mail/e-mail-attachment-bar.c:91
+#: ../mail/em-format-html-display.c:1122 ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:124
+#: ../widgets/misc/e-attachment-paned.c:129
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Attachment"
 msgstr[1] "Attachments"
 
-#: ../mail/e-mail-attachment-bar.c:630
-#: ../widgets/misc/e-attachment-paned.c:621
+#: ../mail/e-mail-attachment-bar.c:604
+#: ../widgets/misc/e-attachment-paned.c:619
 msgid "Icon View"
 msgstr "Icon View"
 
-#: ../mail/e-mail-attachment-bar.c:632
-#: ../widgets/misc/e-attachment-paned.c:623
+#: ../mail/e-mail-attachment-bar.c:606
+#: ../widgets/misc/e-attachment-paned.c:621
 msgid "List View"
 msgstr "List View"
 
-#: ../mail/e-mail-browser.c:132 ../shell/e-shell-window-actions.c:1406
-#: ../shell/e-shell-window-actions.c:1413
-#: ../shell/e-shell-window-actions.c:1420
+#: ../mail/e-mail-browser.c:125 ../shell/e-shell-window-actions.c:1405
+#: ../shell/e-shell-window-actions.c:1412
+#: ../shell/e-shell-window-actions.c:1419
 msgid "Close this window"
 msgstr "Close this window"
 
-#: ../mail/e-mail-browser.c:289
+#: ../mail/e-mail-browser.c:282
 msgid "(No Subject)"
 msgstr "(No Subject)"
 
-#: ../mail/e-mail-display.c:66
+#: ../mail/e-mail-display.c:62
 msgid "_Add to Address Book..."
 msgstr "_Add to Address Bookâ?¦"
 
-#: ../mail/e-mail-display.c:73
+#: ../mail/e-mail-display.c:69
 msgid "_To This Address"
 msgstr "_To this Address"
 
-#: ../mail/e-mail-display.c:80
+#: ../mail/e-mail-display.c:76
 msgid "_From This Address"
 msgstr "_From This Address"
 
-#: ../mail/e-mail-display.c:89
+#: ../mail/e-mail-display.c:85
 msgid "Create Search _Folder"
 msgstr "Create Search _Folder"
 
@@ -8031,44 +8101,44 @@ msgstr "Create Search _Folder"
 msgid "Saving message to folder '%s'"
 msgstr "Saving message to folder '%s'"
 
-#: ../mail/e-mail-label-dialog.c:222
+#: ../mail/e-mail-label-dialog.c:219
 msgid "_Label name:"
 msgstr "_Label name:"
 
-#: ../mail/e-mail-label-list-store.c:41
+#: ../mail/e-mail-label-list-store.c:37
 msgid "I_mportant"
 msgstr "I_mportant"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:42
+#: ../mail/e-mail-label-list-store.c:38
 msgid "_Work"
 msgstr "_Work"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:43
+#: ../mail/e-mail-label-list-store.c:39
 msgid "_Personal"
 msgstr "_Personal"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:44
+#: ../mail/e-mail-label-list-store.c:40
 msgid "_To Do"
 msgstr "_To Do"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:45
+#: ../mail/e-mail-label-list-store.c:41
 msgid "_Later"
 msgstr "_Later"
 
-#: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:616
+#: ../mail/e-mail-label-manager.c:161
+#: ../modules/mail/e-mail-shell-view-actions.c:627
 msgid "Add Label"
 msgstr "Add Label"
 
-#: ../mail/e-mail-label-manager.c:216
+#: ../mail/e-mail-label-manager.c:212
 msgid "Edit Label"
 msgstr "Edit Label"
 
-#: ../mail/e-mail-label-manager.c:349
+#: ../mail/e-mail-label-manager.c:346
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -8076,13 +8146,13 @@ msgstr ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
 
-#: ../mail/e-mail-label-tree-view.c:86
+#: ../mail/e-mail-label-tree-view.c:84
 msgid "Color"
 msgstr "Colour"
 
-#: ../mail/e-mail-label-tree-view.c:96
+#: ../mail/e-mail-label-tree-view.c:94
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
-#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/caldav/caldav-browse-server.c:1296
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
 #: ../widgets/menus/gal-define-views-dialog.c:334
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
@@ -8090,26 +8160,29 @@ msgid "Name"
 msgstr "Name"
 
 #: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
-#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree.c:2986
-#: ../modules/mail/e-mail-shell-view-private.c:1102
+#: ../mail/em-folder-tree-model.c:738 ../mail/em-folder-tree.c:3138
+#: ../modules/mail/e-mail-shell-view-private.c:1118
+#: ../modules/mail/e-mail-shell-view-private.c:1129
 msgid "Inbox"
 msgstr "Inbox"
 
-#: ../mail/e-mail-local.c:36 ../mail/e-mail-migrate.c:1001
-#: ../mail/em-folder-tree-model.c:758
+#: ../mail/e-mail-local.c:36 ../mail/em-folder-tree-model.c:730
+#: ../modules/mail/e-mail-shell-view-private.c:1116
 msgid "Drafts"
 msgstr "Drafts"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:770
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:742
+#: ../modules/mail/e-mail-shell-view-private.c:1120
 msgid "Outbox"
 msgstr "Outbox"
 
-#: ../mail/e-mail-local.c:38 ../mail/e-mail-migrate.c:994
-#: ../mail/em-folder-tree-model.c:772
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:744
+#: ../modules/mail/e-mail-shell-view-private.c:1122
 msgid "Sent"
 msgstr "Sent"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:761
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:733
+#: ../modules/mail/e-mail-shell-view-private.c:1124
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:581
 msgid "Templates"
@@ -8128,11 +8201,11 @@ msgstr "Migration"
 msgid "Migrating '%s':"
 msgstr "Migrating '%s':"
 
-#: ../mail/e-mail-migrate.c:657
+#: ../mail/e-mail-migrate.c:660
 msgid "Migrating Folders"
 msgstr "Migrating Folders"
 
-#: ../mail/e-mail-migrate.c:658
+#: ../mail/e-mail-migrate.c:661
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -8144,12 +8217,12 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your foldersâ?¦"
 
-#: ../mail/e-mail-migrate.c:1138
+#: ../mail/e-mail-migrate.c:1126
 #, 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-notebook-view.c:565
+#: ../mail/e-mail-notebook-view.c:562
 msgid "Please select a folder"
 msgstr "Please select a folder"
 
@@ -8161,53 +8234,50 @@ msgstr "Please select a folder"
 msgid "Do not ask me again"
 msgstr "Do not ask me again"
 
-#: ../mail/e-mail-reader.c:309 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:306 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copy to Folder"
 
-#: ../mail/e-mail-reader.c:309 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:306 ../mail/em-folder-utils.c:421
 msgid "C_opy"
 msgstr "C_opy"
 
 #. Translators: %s is replaced with a folder name
 #. %d with count of duplicate messages.
-#: ../mail/e-mail-reader.c:510
+#: ../mail/e-mail-reader.c:523
 #, c-format
 msgid ""
 "Folder '%s' contains %d duplicate message. Are you sure you want to delete "
 "it?"
-msgstr ""
-"Folder '%s' contains %d duplicate message. Are you sure you want to delete "
-"it?"
-
-#: ../mail/e-mail-reader.c:511
-#, c-format
-msgid ""
+msgid_plural ""
 "Folder '%s' contains %d duplicate messages. Are you sure you want to delete "
 "them?"
-msgstr ""
+msgstr[0] ""
+"Folder '%s' contains %d duplicate message. Are you sure you want to delete "
+"it?"
+msgstr[1] ""
 "Folder '%s' contains %d duplicate messages. Are you sure you want to delete "
 "them?"
 
-#: ../mail/e-mail-reader.c:969 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:986 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Move to Folder"
 
-#: ../mail/e-mail-reader.c:969 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:986 ../mail/em-folder-utils.c:421
 msgid "_Move"
 msgstr "_Move"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:1248 ../mail/e-mail-reader.c:1404
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1265 ../mail/e-mail-reader.c:1423
+#: ../mail/e-mail-reader.c:1467
 msgid "_Do not ask me again."
 msgstr "_Do not ask me again."
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1472
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Always ignore Reply-To: for mailing lists."
 
-#: ../mail/e-mail-reader.c:1558
+#: ../mail/e-mail-reader.c:1581
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Save Message"
@@ -8219,7 +8289,7 @@ msgstr[1] "Save Messages"
 #. * 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:1579
+#: ../mail/e-mail-reader.c:1602
 #: ../plugins/groupwise-features/notification.ui.h:1
 #: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Message"
@@ -8227,658 +8297,658 @@ msgid_plural "Messages"
 msgstr[0] "Message"
 msgstr[1] "Messages"
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:1876
 msgid "A_dd Sender to Address Book"
 msgstr "A_dd Sender to Address Book"
 
-#: ../mail/e-mail-reader.c:1855
+#: ../mail/e-mail-reader.c:1878
 msgid "Add sender to address book"
 msgstr "Add sender to address book"
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:1883
 msgid "Check for _Junk"
 msgstr "Check for _Junk"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:1885
 msgid "Filter the selected messages for junk status"
 msgstr "Filter the selected messages for junk status"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1890
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folderâ?¦"
 
-#: ../mail/e-mail-reader.c:1869
+#: ../mail/e-mail-reader.c:1892
 msgid "Copy selected messages to another folder"
 msgstr "Copy selected messages to another folder"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:1897
 msgid "_Delete Message"
 msgstr "_Delete Message"
 
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1899
 msgid "Mark the selected messages for deletion"
 msgstr "Mark the selected messages for deletion"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1904
 msgid "Filter on Mailing _List..."
 msgstr "Filter on Mailing _Listâ?¦"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1906
 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:1888
+#: ../mail/e-mail-reader.c:1911
 msgid "Filter on _Recipients..."
 msgstr "Filter on _Recipientsâ?¦"
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1913
 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:1895
+#: ../mail/e-mail-reader.c:1918
 msgid "Filter on Se_nder..."
 msgstr "Filter on Se_nderâ?¦"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1920
 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:1902
+#: ../mail/e-mail-reader.c:1925
 msgid "Filter on _Subject..."
 msgstr "Filter on _Subjectâ?¦"
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1927
 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:1909
+#: ../mail/e-mail-reader.c:1932
 msgid "A_pply Filters"
 msgstr "A_pply Filters"
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:1934
 msgid "Apply filter rules to the selected messages"
 msgstr "Apply filter rules to the selected messages"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:1939
 msgid "_Find in Message..."
 msgstr "_Find in Messageâ?¦"
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:1941
 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:1923
+#: ../mail/e-mail-reader.c:1946
 msgid "_Clear Flag"
 msgstr "_Clear Flag"
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:1948
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Remove the follow-up flag from the selected messages"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1953
 msgid "_Flag Completed"
 msgstr "_Flag Completed"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:1955
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Set the follow-up flag to completed on the selected messages"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1960
 msgid "Follow _Up..."
 msgstr "Follow _Upâ?¦"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1962
 msgid "Flag the selected messages for follow-up"
 msgstr "Flag the selected messages for follow-up"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:1967
 msgid "_Attached"
 msgstr "_Attached"
 
-#: ../mail/e-mail-reader.c:1946 ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
 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:1951
+#: ../mail/e-mail-reader.c:1974
 msgid "Forward As _Attached"
 msgstr "Forward As _Attached"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1981
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ../mail/e-mail-reader.c:1960 ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
 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:1965
+#: ../mail/e-mail-reader.c:1988
 msgid "Forward As _Inline"
 msgstr "Forward As _Inline"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1995
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ../mail/e-mail-reader.c:1974 ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:1997 ../mail/e-mail-reader.c:2004
 msgid "Forward the selected message quoted like a reply"
 msgstr "Forward the selected message quoted like a reply"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:2002
 msgid "Forward As _Quoted"
 msgstr "Forward As _Quoted"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2009
 msgid "_Load Images"
 msgstr "_Load Images"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:2011
 msgid "Force images in HTML mail to be loaded"
 msgstr "Force images in HTML mail to be loaded"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2016
 msgid "_Important"
 msgstr "_Important"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2018
 msgid "Mark the selected messages as important"
 msgstr "Mark the selected messages as important"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2023
 msgid "_Junk"
 msgstr "_Junk"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2025
 msgid "Mark the selected messages as junk"
 msgstr "Mark the selected messages as junk"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2030
 msgid "_Not Junk"
 msgstr "_Not Junk"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2032
 msgid "Mark the selected messages as not being junk"
 msgstr "Mark the selected messages as not being junk"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2037
 msgid "_Read"
 msgstr "_Read"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2039
 msgid "Mark the selected messages as having been read"
 msgstr "Mark the selected messages as having been read"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2044
 msgid "Uni_mportant"
 msgstr "Uni_mportant"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2046
 msgid "Mark the selected messages as unimportant"
 msgstr "Mark the selected messages as unimportant"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2051
 msgid "_Unread"
 msgstr "_Unread"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2053
 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:2035
+#: ../mail/e-mail-reader.c:2058
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Messageâ?¦"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2060
 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:2042
+#: ../mail/e-mail-reader.c:2065
 msgid "Compose _New Message"
 msgstr "Compose _New Message"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2067
 msgid "Open a window for composing a mail message"
 msgstr "Open a window for composing a mail message"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2072
 msgid "_Open in New Window"
 msgstr "_Open in New Window"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2074
 msgid "Open the selected messages in a new window"
 msgstr "Open the selected messages in a new window"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2079
 msgid "_Move to Folder..."
 msgstr "_Move to Folderâ?¦"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2081
 msgid "Move selected messages to another folder"
 msgstr "Move selected messages to another folder"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2086
 msgid "_Switch to Folder"
 msgstr "_Switch to Folder"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2088
 msgid "Display the parent folder"
 msgstr "Display the parent folder"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2093
 msgid "Switch to _next tab"
 msgstr "Switch to _next tab"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2095
 msgid "Switch to the next tab"
 msgstr "Switch to the next tab"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2100
 msgid "Switch to _previous tab"
 msgstr "Switch to _previous tab"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2102
 msgid "Switch to the previous tab"
 msgstr "Switch to the previous tab"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2107
 msgid "Cl_ose current tab"
 msgstr "Cl_ose current tab"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2109
 msgid "Close current tab"
 msgstr "Close current tab"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2114
 msgid "_Next Message"
 msgstr "_Next Message"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2116
 msgid "Display the next message"
 msgstr "Display the next message"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2121
 msgid "Next _Important Message"
 msgstr "Next _Important Message"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2123
 msgid "Display the next important message"
 msgstr "Display the next important message"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2128
 msgid "Next _Thread"
 msgstr "Next _Thread"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2130
 msgid "Display the next thread"
 msgstr "Display the next thread"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2135
 msgid "Next _Unread Message"
 msgstr "Next _Unread Message"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2137
 msgid "Display the next unread message"
 msgstr "Display the next unread message"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2142
 msgid "_Previous Message"
 msgstr "_Previous Message"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2144
 msgid "Display the previous message"
 msgstr "Display the previous message"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2149
 msgid "Pr_evious Important Message"
 msgstr "Pr_evious Important Message"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2151
 msgid "Display the previous important message"
 msgstr "Display the previous important message"
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2156
 msgid "Previous T_hread"
 msgstr "Previous T_hread"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2158
 msgid "Display the previous thread"
 msgstr "Display the previous thread"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2163
 msgid "P_revious Unread Message"
 msgstr "P_revious Unread Message"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2165
 msgid "Display the previous unread message"
 msgstr "Display the previous unread message"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2172
 msgid "Print this message"
 msgstr "Print this message"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2179
 msgid "Preview the message to be printed"
 msgstr "Preview the message to be printed"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2184
 msgid "Re_direct"
 msgstr "Re_direct"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2186
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirect (bounce) the selected message to someone"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2191
 msgid "Remo_ve Attachments"
 msgstr "Remo_ve Attachments"
 
-#: ../mail/e-mail-reader.c:2170
+#: ../mail/e-mail-reader.c:2193
 msgid "Remove attachments"
 msgstr "Remove attachments"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2198
 msgid "Remove Du_plicate Messages"
 msgstr "Remove Du_plicate Messages"
 
-#: ../mail/e-mail-reader.c:2177
+#: ../mail/e-mail-reader.c:2200
 msgid "Checks selected messages for duplicates"
 msgstr "Checks selected messages for duplicates"
 
-#: ../mail/e-mail-reader.c:2182 ../mail/mail.error.xml.h:102
-#: ../modules/calendar/e-cal-shell-view-actions.c:1464
-#: ../modules/mail/e-mail-attachment-handler.c:177
+#: ../mail/e-mail-reader.c:2205 ../mail/mail.error.xml.h:102
+#: ../modules/calendar/e-cal-shell-view-actions.c:1465
+#: ../modules/mail/e-mail-attachment-handler.c:179
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2207
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Compose a reply to all the recipients of the selected message"
 
-#: ../mail/e-mail-reader.c:2189 ../mail/mail.error.xml.h:103
+#: ../mail/e-mail-reader.c:2212 ../mail/mail.error.xml.h:103
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2214
 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:2196
-#: ../modules/mail/e-mail-attachment-handler.c:184
+#: ../mail/e-mail-reader.c:2219
+#: ../modules/mail/e-mail-attachment-handler.c:186
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: ../mail/e-mail-reader.c:2198
+#: ../mail/e-mail-reader.c:2221
 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:2203
+#: ../mail/e-mail-reader.c:2226
 msgid "_Save as mbox..."
 msgstr "_Save as mboxâ?¦"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2228
 msgid "Save selected messages as an mbox file"
 msgstr "Save selected messages as an mbox file"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2233
 msgid "Search Folder from Mailing _List..."
 msgstr "Search Folder from Mailing _Listâ?¦"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2235
 msgid "Create a search folder for this mailing list"
 msgstr "Create a search folder for this mailing list"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2240
 msgid "Search Folder from Recipien_ts..."
 msgstr "Search Folder from Recipien_tsâ?¦"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2242
 msgid "Create a search folder for these recipients"
 msgstr "Create a search folder for these recipients"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2247
 msgid "Search Folder from Sen_der..."
 msgstr "Search Folder from Sen_derâ?¦"
 
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2249
 msgid "Create a search folder for this sender"
 msgstr "Create a search folder for this sender"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2254
 msgid "Search Folder from S_ubject..."
 msgstr "Search Folder from S_ubjectâ?¦"
 
-#: ../mail/e-mail-reader.c:2233
+#: ../mail/e-mail-reader.c:2256
 msgid "Create a search folder for this subject"
 msgstr "Create a search folder for this subject"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2261
 msgid "_Message Source"
 msgstr "_Message Source"
 
-#: ../mail/e-mail-reader.c:2240
+#: ../mail/e-mail-reader.c:2263
 msgid "Show the raw email source of the message"
 msgstr "Show the raw e-mail source of the message"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2275
 msgid "_Undelete Message"
 msgstr "_Undelete Message"
 
-#: ../mail/e-mail-reader.c:2254
+#: ../mail/e-mail-reader.c:2277
 msgid "Undelete the selected messages"
 msgstr "Undelete the selected messages"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2282
 msgid "_Normal Size"
 msgstr "_Normal Size"
 
-#: ../mail/e-mail-reader.c:2261
+#: ../mail/e-mail-reader.c:2284
 msgid "Reset the text to its original size"
 msgstr "Reset the text to its original size"
 
-#: ../mail/e-mail-reader.c:2266
+#: ../mail/e-mail-reader.c:2289
 msgid "_Zoom In"
 msgstr "_Zoom In"
 
-#: ../mail/e-mail-reader.c:2268
+#: ../mail/e-mail-reader.c:2291
 msgid "Increase the text size"
 msgstr "Increase the text size"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2296
 msgid "Zoom _Out"
 msgstr "Zoom _Out"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2298
 msgid "Decrease the text size"
 msgstr "Decrease the text size"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2305
 msgid "Create R_ule"
 msgstr "Create R_ule"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2312
 msgid "Ch_aracter Encoding"
 msgstr "Ch_aracter Encoding"
 
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2319
 msgid "F_orward As"
 msgstr "F_orward As"
 
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2326
 msgid "_Group Reply"
 msgstr "_Group Reply"
 
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2333
 msgid "_Go To"
 msgstr "_Go To"
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2340
 msgid "Mar_k As"
 msgstr "Mar_k As"
 
-#: ../mail/e-mail-reader.c:2324
+#: ../mail/e-mail-reader.c:2347
 msgid "_Message"
 msgstr "_Message"
 
-#: ../mail/e-mail-reader.c:2331
+#: ../mail/e-mail-reader.c:2354
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2379
 msgid "Mark for Follo_w Up..."
 msgstr "Mark for Follo_w Upâ?¦"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2387
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2391
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: ../mail/e-mail-reader.c:2372
+#: ../mail/e-mail-reader.c:2395
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: ../mail/e-mail-reader.c:2376
+#: ../mail/e-mail-reader.c:2399
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: ../mail/e-mail-reader.c:2380
+#: ../mail/e-mail-reader.c:2403
 msgid "Mark as Uni_mportant"
 msgstr "Mark as Uni_mportant"
 
-#: ../mail/e-mail-reader.c:2384
+#: ../mail/e-mail-reader.c:2407
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: ../mail/e-mail-reader.c:2428
+#: ../mail/e-mail-reader.c:2451
 msgid "_Caret Mode"
 msgstr "_Caret Mode"
 
-#: ../mail/e-mail-reader.c:2430
+#: ../mail/e-mail-reader.c:2453
 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:2436
+#: ../mail/e-mail-reader.c:2459
 msgid "All Message _Headers"
 msgstr "All Message _Headers"
 
-#: ../mail/e-mail-reader.c:2438
+#: ../mail/e-mail-reader.c:2461
 msgid "Show messages with all email headers"
 msgstr "Show messages with all e-mail headers"
 
-#: ../mail/e-mail-reader.c:2670
+#: ../mail/e-mail-reader.c:2699
 msgid "Unable to retrieve message"
 msgstr "Unable to retrieve message"
 
-#: ../mail/e-mail-reader.c:2731 ../mail/mail-ops.c:2044
+#: ../mail/e-mail-reader.c:2761 ../mail/mail-ops.c:2068
 #, 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:3344 ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-reader.c:3379 ../mail/mail-config.ui.h:31
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:538
 #: ../plugins/google-account-setup/google-source.c:674
-#: ../widgets/misc/e-account-tree-view.c:253
+#: ../widgets/misc/e-account-tree-view.c:249
 msgid "Default"
 msgstr "Default"
 
-#: ../mail/e-mail-reader.c:3524
-#: ../modules/mail/e-mail-attachment-handler.c:170
+#: ../mail/e-mail-reader.c:3550
+#: ../modules/mail/e-mail-attachment-handler.c:172
 msgid "_Forward"
 msgstr "_Forward"
 
-#: ../mail/e-mail-reader.c:3525
+#: ../mail/e-mail-reader.c:3551
 msgid "Forward the selected message to someone"
 msgstr "Forward the selected message to someone"
 
-#: ../mail/e-mail-reader.c:3544
+#: ../mail/e-mail-reader.c:3570
 msgid "Group Reply"
 msgstr "Group Reply"
 
-#: ../mail/e-mail-reader.c:3545
+#: ../mail/e-mail-reader.c:3571
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Reply to the mailing list, or to all recipients"
 
-#: ../mail/e-mail-reader.c:3590 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:744
+#: ../mail/e-mail-reader.c:3616 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:746
 msgid "Delete"
 msgstr "Delete"
 
-#: ../mail/e-mail-reader.c:3623
-#: ../modules/calendar/e-cal-shell-view-actions.c:1310
-#: ../widgets/misc/e-calendar.c:196
+#: ../mail/e-mail-reader.c:3649
+#: ../modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Next"
 
-#: ../mail/e-mail-reader.c:3627
-#: ../modules/calendar/e-cal-shell-view-actions.c:1303
-#: ../widgets/misc/e-calendar.c:172
+#: ../mail/e-mail-reader.c:3653
+#: ../modules/calendar/e-cal-shell-view-actions.c:1304
+#: ../widgets/misc/e-calendar.c:177
 msgid "Previous"
 msgstr "Previous"
 
-#: ../mail/e-mail-reader.c:3637 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3663 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Reply"
 
-#: ../mail/e-mail-reader.c:4274
+#: ../mail/e-mail-reader.c:4298
 #, c-format
 msgid "Folder '%s'"
 msgstr "Folder '%s'"
 
-#: ../mail/e-mail-session.c:644
+#: ../mail/e-mail-session.c:643
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Enter Passphrase for %s"
 
-#: ../mail/e-mail-session.c:646
+#: ../mail/e-mail-session.c:645
 msgid "Enter Passphrase"
 msgstr "Enter Passphrase"
 
-#: ../mail/e-mail-session.c:649
+#: ../mail/e-mail-session.c:648
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Enter Password for %s"
 
-#: ../mail/e-mail-session.c:651
+#: ../mail/e-mail-session.c:650
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../mail/e-mail-session.c:696
+#: ../mail/e-mail-session.c:701
 #, c-format
 msgid "User canceled operation."
 msgstr "User cancelled operation."
 
-#: ../mail/e-mail-session.c:864
+#: ../mail/e-mail-session.c:871
 #, c-format
 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/e-mail-session.c:873
+#: ../mail/e-mail-session.c:880
 #, c-format
 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/e-mail-session.c:1262 ../mail/mail-ops.c:1220
+#: ../mail/e-mail-session.c:1284 ../mail/mail-ops.c:1220
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Opening folder '%s'"
 
-#: ../mail/e-mail-session.c:1278
+#: ../mail/e-mail-session.c:1300
 #, c-format
 msgid "Invalid folder: %s"
 msgstr "Invalid folder: %s"
 
-#: ../mail/e-mail-session-utils.c:477 ../mail/mail-ops.c:605
+#: ../mail/e-mail-session-utils.c:490 ../mail/mail-ops.c:605
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Failed to apply outgoing filters: %s"
 
-#: ../mail/e-mail-session-utils.c:501 ../mail/e-mail-session-utils.c:535
+#: ../mail/e-mail-session-utils.c:514 ../mail/e-mail-session-utils.c:548
 #: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
 #, c-format
 msgid ""
@@ -8888,17 +8958,17 @@ msgstr ""
 "Failed to append to %s: %s\n"
 "Appending to local 'Sent' folder instead."
 
-#: ../mail/e-mail-session-utils.c:555 ../mail/mail-ops.c:673
+#: ../mail/e-mail-session-utils.c:568 ../mail/mail-ops.c:673
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Failed to append to local 'Sent' folder: %s"
 
-#: ../mail/e-mail-session-utils.c:761 ../mail/mail-ops.c:774
+#: ../mail/e-mail-session-utils.c:779 ../mail/mail-ops.c:774
 #: ../mail/mail-ops.c:866
 msgid "Sending message"
 msgstr "Sending message"
 
-#: ../mail/e-mail-session-utils.c:832
+#: ../mail/e-mail-session-utils.c:850
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "Unsubscribing from folder '%s'"
@@ -8913,13 +8983,13 @@ msgstr "Disconnecting from '%s'"
 msgid "Reconnecting to '%s'"
 msgstr "Reconnecting to '%s'"
 
-#: ../mail/e-mail-tag-editor.c:295
+#: ../mail/e-mail-tag-editor.c:291
 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:565 ../mail/mail-config.ui.h:69
+#: ../mail/em-account-editor.c:564 ../mail/mail-config.ui.h:69
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "No encryption"
@@ -8927,7 +8997,7 @@ 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:569 ../mail/mail-config.ui.h:124
+#: ../mail/em-account-editor.c:568 ../mail/mail-config.ui.h:126
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS encryption"
@@ -8935,40 +9005,40 @@ 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:573 ../mail/mail-config.ui.h:91
+#: ../mail/em-account-editor.c:572 ../mail/mail-config.ui.h:91
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL encryption"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:841 ../widgets/misc/e-signature-combo-box.c:79
+#: ../mail/em-account-editor.c:835 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "None"
 
-#: ../mail/em-account-editor.c:922
+#: ../mail/em-account-editor.c:916
 msgid "Never"
 msgstr "Never"
 
-#: ../mail/em-account-editor.c:923
+#: ../mail/em-account-editor.c:917
 msgid "Always"
 msgstr "Always"
 
-#: ../mail/em-account-editor.c:924
+#: ../mail/em-account-editor.c:918
 msgid "Ask for each message"
 msgstr "Ask for each message"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:131
+#: ../mail/em-account-editor.c:1700 ../widgets/misc/e-account-tree-view.c:127
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "None"
 
-#: ../mail/em-account-editor.c:2085
+#: ../mail/em-account-editor.c:2087
 msgid "Mail Configuration"
 msgstr "Mail Configuration"
 
-#: ../mail/em-account-editor.c:2086
+#: ../mail/em-account-editor.c:2088
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -8978,7 +9048,7 @@ msgstr ""
 "\n"
 "Click \"Forward\" to begin."
 
-#: ../mail/em-account-editor.c:2089
+#: ../mail/em-account-editor.c:2091
 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 "
@@ -8988,19 +9058,19 @@ msgstr ""
 "below do not need to be filled in, unless you wish to include this "
 "information in e-mails you send."
 
-#: ../mail/em-account-editor.c:2091 ../mail/em-account-editor.c:2253
+#: ../mail/em-account-editor.c:2093 ../mail/em-account-editor.c:2256
 msgid "Receiving Email"
 msgstr "Receiving E-mail"
 
-#: ../mail/em-account-editor.c:2092
+#: ../mail/em-account-editor.c:2094
 msgid "Please configure the following account settings."
 msgstr "Please configure the following account settings."
 
-#: ../mail/em-account-editor.c:2094 ../mail/em-account-editor.c:2743
+#: ../mail/em-account-editor.c:2096 ../mail/em-account-editor.c:2756
 msgid "Sending Email"
 msgstr "Sending E-mail"
 
-#: ../mail/em-account-editor.c:2095
+#: ../mail/em-account-editor.c:2097
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -9008,23 +9078,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:2097
-msgid "Account Management"
-msgstr "Account Management"
+#: ../mail/em-account-editor.c:2099 ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "Account Information"
 
-#: ../mail/em-account-editor.c:2098
+#: ../mail/em-account-editor.c:2100
 msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
+"Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
 msgstr ""
-"Please enter a descriptive name for this account in the space below.\n"
+"Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
 
-#: ../mail/em-account-editor.c:2102
+#: ../mail/em-account-editor.c:2104
 msgid "Done"
 msgstr "Done"
 
-#: ../mail/em-account-editor.c:2103
+#: ../mail/em-account-editor.c:2105
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9038,36 +9108,36 @@ msgstr ""
 "\n"
 "Click \"Apply\" to save your settings."
 
-#: ../mail/em-account-editor.c:2557
+#: ../mail/em-account-editor.c:2570
 msgid "Check for _new messages every"
 msgstr "Check for _new messages every"
 
-#: ../mail/em-account-editor.c:2565
+#: ../mail/em-account-editor.c:2578
 msgid "minu_tes"
 msgstr "minu_tes"
 
-#: ../mail/em-account-editor.c:2847
+#: ../mail/em-account-editor.c:2861
 msgid "Please select a folder from the current account."
 msgstr "Please select a folder from the current account."
 
-#: ../mail/em-account-editor.c:3156 ../mail/mail-config.ui.h:98
+#: ../mail/em-account-editor.c:3171 ../mail/mail-config.ui.h:98
 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:3201 ../mail/em-account-editor.c:3269
+#: ../mail/em-account-editor.c:3217 ../mail/em-account-editor.c:3285
 msgid "Receiving Options"
 msgstr "Receiving Options"
 
-#: ../mail/em-account-editor.c:3202 ../mail/em-account-editor.c:3270
+#: ../mail/em-account-editor.c:3218 ../mail/em-account-editor.c:3286
 msgid "Checking for New Messages"
 msgstr "Checking for New Messages"
 
 #. 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 mail/em-composer-utils.c:attribvars array
-#: ../mail/em-composer-utils.c:1136
+#: ../mail/em-composer-utils.c:1173
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9075,35 +9145,35 @@ msgstr ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 
-#: ../mail/em-composer-utils.c:1146
+#: ../mail/em-composer-utils.c:1184
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
-#. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1804
+#. Translators: First %s is an email address, second %s
+#. * is the subject of the email, third %s is the date.
+#: ../mail/em-composer-utils.c:1851
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Your message to %s about \"%s\" on %s has been read."
 
-#. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1854
+#: ../mail/em-composer-utils.c:1905
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Delivery Notification for: \"%s\""
 
-#: ../mail/em-composer-utils.c:2272
+#: ../mail/em-composer-utils.c:2356
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
-#: ../mail/em-composer-utils.c:2696
+#: ../mail/em-composer-utils.c:2787
 msgid "Posting destination"
 msgstr "Posting destination"
 
-#: ../mail/em-composer-utils.c:2697
+#: ../mail/em-composer-utils.c:2788
 msgid "Choose folders to post the message to."
 msgstr "Choose folders to post the message to."
 
-#: ../mail/em-filter-folder-element.c:337
+#: ../mail/em-filter-folder-element.c:339
 msgid "Select Folder"
 msgstr "Select Folder"
 
@@ -9350,11 +9420,11 @@ msgid "Unset Status"
 msgstr "Unset Status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:539
+#: ../mail/em-filter-rule.c:536
 msgid "Then"
 msgstr "Then"
 
-#: ../mail/em-filter-rule.c:570
+#: ../mail/em-filter-rule.c:567
 msgid "Add Ac_tion"
 msgstr "Add Ac_tion"
 
@@ -9387,75 +9457,75 @@ msgstr "Quota usage"
 msgid "Folder Properties"
 msgstr "Folder Properties"
 
-#: ../mail/em-folder-selection-button.c:81
+#: ../mail/em-folder-selection-button.c:77
 msgid "<click here to select a folder>"
 msgstr "<click here to select a folder>"
 
-#: ../mail/em-folder-selector.c:262
+#: ../mail/em-folder-selector.c:261
 msgid "C_reate"
 msgstr "C_reate"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:265
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
-#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
-#: ../mail/mail-vfolder.c:1140 ../mail/mail-vfolder.c:1216
+#: ../mail/em-folder-tree-model.c:147 ../mail/em-folder-tree-model.c:150
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
+#: ../mail/em-folder-tree-model.c:165 ../mail/em-folder-tree-model.c:167
+#: ../mail/mail-vfolder.c:1164 ../mail/mail-vfolder.c:1239
 msgid "Search Folders"
 msgstr "Search Folders"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
+#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:836 ../mail/em-folder-tree-model.c:1113
+#: ../mail/em-folder-tree-model.c:808 ../mail/em-folder-tree-model.c:1085
 msgid "Loading..."
 msgstr "Loadingâ?¦"
 
-#: ../mail/em-folder-tree.c:201
+#: ../mail/em-folder-tree.c:197
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanning folders in \"%s\""
 
-#: ../mail/em-folder-tree.c:629
+#: ../mail/em-folder-tree.c:625
 msgid "Folder names cannot contain '/'"
 msgstr "Folder names cannot contain '/'"
 
-#: ../mail/em-folder-tree.c:1191
+#: ../mail/em-folder-tree.c:1245
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1427
+#: ../mail/em-folder-tree.c:1482
 msgid "Mail Folder Tree"
 msgstr "Mail Folder Tree"
 
-#: ../mail/em-folder-tree.c:1788 ../mail/em-folder-utils.c:90
+#: ../mail/em-folder-tree.c:1938 ../mail/em-folder-utils.c:90
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: ../mail/em-folder-tree.c:1792 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1942 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: ../mail/em-folder-tree.c:1801 ../mail/message-list.c:2214
+#: ../mail/em-folder-tree.c:1951 ../mail/message-list.c:2243
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: ../mail/em-folder-tree.c:1805 ../mail/message-list.c:2216
+#: ../mail/em-folder-tree.c:1955 ../mail/message-list.c:2245
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: ../mail/em-folder-tree.c:1824
+#: ../mail/em-folder-tree.c:1974
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
@@ -9474,21 +9544,21 @@ msgstr "Copy Folder To"
 msgid "Creating folder '%s'"
 msgstr "Creating folder '%s'"
 
-#: ../mail/em-folder-utils.c:745
+#: ../mail/em-folder-utils.c:741
 msgid "Create Folder"
 msgstr "Create Folder"
 
-#: ../mail/em-folder-utils.c:746
+#: ../mail/em-folder-utils.c:742
 #: ../plugins/groupwise-features/install-shared.c:178
 #: ../plugins/groupwise-features/share-folder-common.c:353
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
-#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1604
+#: ../mail/em-format-html-display.c:84 ../mail/em-format-html.c:1601
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html-display.c:84
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -9496,11 +9566,11 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1605
+#: ../mail/em-format-html-display.c:85 ../mail/em-format-html.c:1602
 msgid "Valid signature"
 msgstr "Valid signature"
 
-#: ../mail/em-format-html-display.c:89
+#: ../mail/em-format-html-display.c:85
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -9508,11 +9578,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:90 ../mail/em-format-html.c:1606
+#: ../mail/em-format-html-display.c:86 ../mail/em-format-html.c:1603
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
-#: ../mail/em-format-html-display.c:90
+#: ../mail/em-format-html-display.c:86
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -9520,11 +9590,11 @@ msgstr ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1607
+#: ../mail/em-format-html-display.c:87 ../mail/em-format-html.c:1604
 msgid "Valid signature, but cannot verify sender"
 msgstr "Valid signature, but cannot verify sender"
 
-#: ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html-display.c:87
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -9532,11 +9602,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:92 ../mail/em-format-html.c:1608
+#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1605
 msgid "Signature exists, but need public key"
 msgstr "Signature exists, but need public key"
 
-#: ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html-display.c:88
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -9544,11 +9614,11 @@ msgstr ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 
-#: ../mail/em-format-html-display.c:99 ../mail/em-format-html.c:1614
+#: ../mail/em-format-html-display.c:95 ../mail/em-format-html.c:1611
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
-#: ../mail/em-format-html-display.c:99
+#: ../mail/em-format-html-display.c:95
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9556,11 +9626,11 @@ msgstr ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 
-#: ../mail/em-format-html-display.c:100 ../mail/em-format-html.c:1615
+#: ../mail/em-format-html-display.c:96 ../mail/em-format-html.c:1612
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
-#: ../mail/em-format-html-display.c:100
+#: ../mail/em-format-html-display.c:96
 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 "
@@ -9570,11 +9640,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:101 ../mail/em-format-html.c:1616
+#: ../mail/em-format-html-display.c:97 ../mail/em-format-html.c:1613
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html-display.c:97
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -9582,11 +9652,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:102 ../mail/em-format-html.c:1617
+#: ../mail/em-format-html-display.c:98 ../mail/em-format-html.c:1614
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
-#: ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html-display.c:98
 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 "
@@ -9596,15 +9666,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:238 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:236 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: ../mail/em-format-html-display.c:251
+#: ../mail/em-format-html-display.c:249
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: ../mail/em-format-html-display.c:506
+#: ../mail/em-format-html-display.c:538
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -9612,28 +9682,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:749
+#: ../mail/em-format-html-display.c:804
 msgid "Completed on"
 msgstr "Completed on"
 
-#: ../mail/em-format-html-display.c:757
+#: ../mail/em-format-html-display.c:812
 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:761
+#: ../mail/em-format-html-display.c:816
 msgid "by"
 msgstr "by"
 
-#: ../mail/em-format-html-display.c:978 ../mail/em-format-html-display.c:1025
+#: ../mail/em-format-html-display.c:1047 ../mail/em-format-html-display.c:1094
 msgid "View _Unformatted"
 msgstr "View _Unformatted"
 
-#: ../mail/em-format-html-display.c:980
+#: ../mail/em-format-html-display.c:1049
 msgid "Hide _Unformatted"
 msgstr "Hide _Unformatted"
 
-#: ../mail/em-format-html-display.c:1045
+#: ../mail/em-format-html-display.c:1114
 msgid "O_pen With"
 msgstr "O_pen With"
 
@@ -9642,55 +9712,55 @@ msgstr "O_pen With"
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:161
 msgid "Formatting message"
 msgstr "Formatting message"
 
-#: ../mail/em-format-html.c:364
+#: ../mail/em-format-html.c:360
 msgid "Formatting Message..."
 msgstr "Formatting Messageâ?¦"
 
-#: ../mail/em-format-html.c:1448 ../mail/em-format-html.c:1458
+#: ../mail/em-format-html.c:1445 ../mail/em-format-html.c:1455
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "Retrieving '%s'"
 
-#: ../mail/em-format-html.c:1979
+#: ../mail/em-format-html.c:1976
 msgid "Unknown external-body part."
 msgstr "Unknown external-body part."
 
-#: ../mail/em-format-html.c:1987
+#: ../mail/em-format-html.c:1984
 msgid "Malformed external-body part."
 msgstr "Malformed external-body part."
 
-#: ../mail/em-format-html.c:2017
+#: ../mail/em-format-html.c:2014
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointer to FTP site (%s)"
 
-#: ../mail/em-format-html.c:2028
+#: ../mail/em-format-html.c:2025
 #, 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:2030
+#: ../mail/em-format-html.c:2027
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointer to local file (%s)"
 
-#: ../mail/em-format-html.c:2051
+#: ../mail/em-format-html.c:2048
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointer to remote data (%s)"
 
-#: ../mail/em-format-html.c:2062
+#: ../mail/em-format-html.c:2059
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 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:2762
+#: ../mail/em-format-html.c:2763
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "This message was sent by %s on behalf of %s"
@@ -9701,61 +9771,61 @@ msgstr "This message was sent by %s on behalf of %s"
 msgid "No HTML stream available"
 msgstr "No HTML stream available"
 
-#: ../mail/em-subscription-editor.c:1107
+#: ../mail/em-subscription-editor.c:1105
 msgid "Folder Subscriptions"
 msgstr "Folder Subscriptions"
 
-#: ../mail/em-subscription-editor.c:1146
+#: ../mail/em-subscription-editor.c:1144
 msgid "_Account:"
 msgstr "_Account:"
 
-#: ../mail/em-subscription-editor.c:1161
+#: ../mail/em-subscription-editor.c:1159
 msgid "Clear Search"
 msgstr "Clear Search"
 
-#: ../mail/em-subscription-editor.c:1179
+#: ../mail/em-subscription-editor.c:1177
 msgid "Sho_w items that contain:"
 msgstr "Sho_w items that contain:"
 
-#: ../mail/em-subscription-editor.c:1218
+#: ../mail/em-subscription-editor.c:1216
 msgid "Subscribe to the selected folder"
 msgstr "Subscribe to the selected folder"
 
-#: ../mail/em-subscription-editor.c:1219
+#: ../mail/em-subscription-editor.c:1217
 msgid "Su_bscribe"
 msgstr "Su_bscribe"
 
-#: ../mail/em-subscription-editor.c:1230
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../mail/em-subscription-editor.c:1228
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "Unsubscribe from the selected folder"
 msgstr "Unsubscribe from the selected folder"
 
-#: ../mail/em-subscription-editor.c:1231
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../mail/em-subscription-editor.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1176
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
-#: ../mail/em-subscription-editor.c:1242
+#: ../mail/em-subscription-editor.c:1240
 msgid "Collapse all folders"
 msgstr "Collapse all folders"
 
-#: ../mail/em-subscription-editor.c:1243
+#: ../mail/em-subscription-editor.c:1241
 msgid "C_ollapse All"
 msgstr "C_ollapse All"
 
-#: ../mail/em-subscription-editor.c:1253
+#: ../mail/em-subscription-editor.c:1251
 msgid "Expand all folders"
 msgstr "Expand all folders"
 
-#: ../mail/em-subscription-editor.c:1254
+#: ../mail/em-subscription-editor.c:1252
 msgid "E_xpand All"
 msgstr "E_xpand All"
 
-#: ../mail/em-subscription-editor.c:1264
+#: ../mail/em-subscription-editor.c:1262
 msgid "Refresh the folder list"
 msgstr "Refresh the folder list"
 
-#: ../mail/em-subscription-editor.c:1276
+#: ../mail/em-subscription-editor.c:1274
 msgid "Stop the current operation"
 msgstr "Stop the current operation"
 
@@ -9771,15 +9841,15 @@ msgstr[0] "Are you sure you want to open %d message at once?"
 msgstr[1] "Are you sure you want to open %d messages at once?"
 
 #: ../mail/em-utils.c:153
-#: ../modules/mailto-handler/evolution-mailto-handler.c:154
+#: ../modules/mailto-handler/evolution-mailto-handler.c:151
 msgid "_Do not show this message again"
 msgstr "_Do not show this message again"
 
-#: ../mail/em-utils.c:327
+#: ../mail/em-utils.c:328
 msgid "Message Filters"
 msgstr "Message Filters"
 
-#: ../mail/em-utils.c:883
+#: ../mail/em-utils.c:904
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
@@ -9788,7 +9858,7 @@ msgstr "Messages from %s"
 msgid "Search _Folders"
 msgstr "Search _Folders"
 
-#: ../mail/em-vfolder-rule.c:603
+#: ../mail/em-vfolder-rule.c:610
 msgid "Add Folder"
 msgstr "Add Folder"
 
@@ -10361,39 +10431,47 @@ msgstr ""
 "sets a Reply-To: header which redirects your reply back to the list."
 
 #: ../mail/evolution-mail.schemas.in.h:101
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
+msgstr ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
+
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Last time Empty Junk was run"
 msgstr "Last time Empty Junk was run"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Last time Empty Trash was run"
 msgstr "Last time Empty Wastebasket was run"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Layout style"
 msgstr "Layout style"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "Level beyond which the message should be logged."
 msgstr "Level beyond which the message should be logged."
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "List of Labels and their associated colors"
 msgstr "List of Labels and their associated colours"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "List of MIME types to check for Bonobo component viewers"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of accepted licenses"
 msgstr "List of accepted licences"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accounts"
 msgstr "List of accounts"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -10401,15 +10479,15 @@ msgstr ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "List of custom headers and whether they are enabled."
 msgstr "List of custom headers and whether they are enabled."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of dictionary language codes used for spell checking."
 msgstr "List of dictionary language codes used for spell checking."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -10417,15 +10495,15 @@ msgstr ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "List of protocol names whose license has been accepted."
 msgstr "List of protocol names whose licence has been accepted."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Load images for HTML messages over HTTP"
 msgstr "Load images for HTML messages over HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -10435,83 +10513,87 @@ msgstr ""
 "Never load images off the net. \"1\" â?? Load images in messages from "
 "contacts. \"2\" â?? Always load images off the net."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Log filter actions"
 msgstr "Log filter actions"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions to the specified log file."
 msgstr "Log filter actions to the specified log file."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Logfile to log filter actions"
 msgstr "Logfile to log filter actions"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Logfile to log filter actions."
 msgstr "Logfile to log filter actions."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Mail browser height"
 msgstr "Mail browser height"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser maximized"
 msgstr "Mail browser maximised"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser width"
 msgstr "Mail browser width"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mark as Seen after specified timeout"
 msgstr "Mark as Seen after specified timeout"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout."
 msgstr "Mark as Seen after specified timeout."
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark citations in the message \"Preview\""
 msgstr "Mark citations in the message \"Preview\""
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Mark citations in the message \"Preview\"."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Message text limit for display"
 msgstr "Message text limit for display"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Minimum days between emptying the junk on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum number of days between emptying the wastebasket on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Minimum time between emptying the junk on exit, in days."
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimum time between emptying the wastebasket on exit, in days."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Number of addresses to display in To/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Original message."
 msgstr "Original message."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid "Path where picture gallery should search for its content"
+msgstr "Path where picture gallery should search for its content"
+
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid ""
 "Possible values are: never - to never close browser window always - to "
 "always close browser window ask - (or any other value) will ask user"
@@ -10519,49 +10601,53 @@ msgstr ""
 "Possible values are: never â?? to never close browser window; always â?? to "
 "always close browser window; ask â?? (or any other value) will ask user"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr "Prompt before sending to recipients not entered as mail addresses"
+
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt on empty subject"
 msgstr "Prompt on empty subject"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Prompt the user when he or she tries to expunge a folder."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Prompt the user when he or she tries to send a message without a Subject."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Prompt when deleting messages in search folder"
 msgstr "Prompt when deleting messages in search folder"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Prompt when mailing list hijacks private replies"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when replying privately to list messages"
 msgstr "Prompt when replying privately to list messages"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when replying to many recipients"
 msgstr "Prompt when replying to many recipients"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Prompt when user expunges"
 msgstr "Prompt when user expunges"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:148
 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:146
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -10569,63 +10655,63 @@ 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:147
+#: ../mail/evolution-mail.schemas.in.h:150
 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:148
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Prompt when user tries to send unwanted HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt while marking multiple messages"
 msgstr "Prompt while marking multiple messages"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Put personalized signatures at the top of replies"
 msgstr "Put personalised signatures at the top of replies"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put the cursor at the bottom of replies"
 msgstr "Put the cursor at the bottom of replies"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:155
 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:153
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize links in text and replace them."
 msgstr "Recognise links in text and replace them."
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Run junk test on incoming mail."
 msgstr "Run junk test on incoming mail."
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Save directory"
 msgstr "Save directory"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:159
 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:157
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Send HTML mail by default"
 msgstr "Send HTML mail by default"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default."
 msgstr "Send HTML mail by default."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:162
 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:160
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Server synchronization interval"
 msgstr "Server synchronisation interval"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -10633,63 +10719,63 @@ 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:162
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Show \"Bcc\" field when sending a mail message"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Show \"Cc\" field when sending a mail message"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Show \"From\" field when posting to a newsgroup"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Show \"Reply To\" field when posting to a newsgroup"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Show \"Reply To\" field when sending a mail message"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show Animations"
 msgstr "Show Animations"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show all message headers"
 msgstr "Show all message headers"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all the headers when viewing a messages."
 msgstr "Show all the headers when viewing a messages."
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show animated images as animations."
 msgstr "Show animated images as animations."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Show deleted messages (with a strike-through) in the message-list."
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages in the message-list"
 msgstr "Show deleted messages in the message-list"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show image animations"
 msgstr "Show image animations"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show original \"Date\" header value."
 msgstr "Show original \"Date\" header value."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show photo of the sender"
 msgstr "Show photo of the sender"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10697,7 +10783,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:177
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10705,7 +10791,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:178
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -10713,7 +10799,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:179
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -10721,7 +10807,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:180
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -10729,7 +10815,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:181
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -10737,7 +10823,7 @@ msgstr ""
 "Show the e-mail address of the sender in a separate column in the message "
 "list."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:185
 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 "
@@ -10747,11 +10833,11 @@ msgstr ""
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Show the photo of the sender in the message reading pane."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -10769,40 +10855,40 @@ msgstr ""
 "it will do that. It works by comparing the Reply-To: header with a List-"
 "Post: header, if there is one."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Spell check inline"
 msgstr "Spell check inline"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell checking color"
 msgstr "Spell checking colour"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking languages"
 msgstr "Spell checking languages"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Terminal font"
 msgstr "Terminal font"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "The default plugin for Junk hook"
 msgstr "The default plugin for Junk hook"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "The last time Empty Wastebasket was run, in days since January 1st, 1970 "
 "(Epoch)."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid ""
 "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 "
@@ -10814,11 +10900,11 @@ msgstr ""
 "message list. \"1\" (Vertical View) places the preview pane next to the "
 "message list."
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "The terminal font for mail display."
 msgstr "The terminal font for mail display."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
@@ -10826,7 +10912,7 @@ msgstr ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows."
@@ -10834,7 +10920,7 @@ msgstr ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author."
@@ -10842,11 +10928,11 @@ msgstr ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author."
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "The variable width font for mail display."
 msgstr "The variable width font for mail display."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -10854,7 +10940,7 @@ msgstr ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid ""
 "This decides the max size of the message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
@@ -10864,7 +10950,7 @@ msgstr ""
 "under Evolution, specified in terms of KB. The default is 4096 (4MB). This "
 "value is used only when the 'force_message_limit' key is activated."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -10874,7 +10960,7 @@ msgstr ""
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -10882,7 +10968,7 @@ msgstr ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -10894,7 +10980,7 @@ msgstr ""
 "header enabled&gt; â?? set enabled if the header is to be displayed in the "
 "mail view."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -10904,11 +10990,11 @@ msgstr ""
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid "This option would help in improving the speed of fetching."
 msgstr "This option would help in improving the speed of fetching."
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -10916,15 +11002,15 @@ msgstr ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a 'â?¦' is shown."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
+"collapsed state by default. Requires a restart to apply."
 msgstr ""
 "This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart."
+"collapsed state by default. Requires a restart to apply."
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -10934,51 +11020,61 @@ msgstr ""
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:211
+msgid ""
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder."
+msgstr ""
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder."
+
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid "Thread the message-list based on Subject"
 msgstr "Thread the message-list based on Subject"
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Timeout for marking message as seen"
 msgstr "Timeout for marking message as seen"
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Timeout for marking message as seen."
 msgstr "Timeout for marking message as seen."
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "UID string of the default account."
 msgstr "UID string of the default account."
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:216
 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:213
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "Use SpamAssassin daemon and client"
 msgstr "Use SpamAssassin daemon and client"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Use SpamAssassin daemon and client (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid "Use custom fonts"
 msgstr "Use custom fonts"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Use custom fonts for displaying mail."
 msgstr "Use custom fonts for displaying mail."
 
-#: ../mail/evolution-mail.schemas.in.h:217
+#: ../mail/evolution-mail.schemas.in.h:221
 msgid "Use only local spam tests."
 msgstr "Use only local spam tests."
 
-#: ../mail/evolution-mail.schemas.in.h:218
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Use only the local spam tests (no DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:219
+#: ../mail/evolution-mail.schemas.in.h:223
 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 "
@@ -10988,7 +11084,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:220
+#: ../mail/evolution-mail.schemas.in.h:224
 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 "
@@ -10998,15 +11094,15 @@ 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:221
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid "Variable width font"
 msgstr "Variable width font"
 
-#: ../mail/evolution-mail.schemas.in.h:222
+#: ../mail/evolution-mail.schemas.in.h:226
 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:223
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid ""
 "Whether check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -11017,7 +11113,7 @@ msgstr ""
 "is started. This option is used only together with 'send_recv_on_start' "
 "option."
 
-#: ../mail/evolution-mail.schemas.in.h:224
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid ""
 "Whether check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
@@ -11025,12 +11121,12 @@ msgstr ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from the Outbox."
 
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:229
 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:226
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11038,11 +11134,11 @@ msgstr ""
 "Whether 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:227
+#: ../mail/evolution-mail.schemas.in.h:231
 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:228
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -11052,11 +11148,11 @@ msgstr ""
 "only when a 'Forward to' filter action is used and approximately one minute "
 "after the last action invocation."
 
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:233
 msgid "Width of the message-list pane"
 msgstr "Width of the message-list pane"
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:234
 msgid "Width of the message-list pane."
 msgstr "Width of the message-list pane."
 
@@ -11065,9 +11161,9 @@ msgid "Importing Elm data"
 msgstr "Importing Elm data"
 
 #: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
-#: ../modules/mail/e-mail-shell-view.c:1045
+#: ../modules/mail/e-mail-shell-view.c:1044
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
-#: ../widgets/misc/e-send-options.c:500
+#: ../widgets/misc/e-send-options.c:511
 msgid "Mail"
 msgstr "Mail"
 
@@ -11080,18 +11176,19 @@ msgid "Import mail from Elm."
 msgstr "Import mail from Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:127
-#: ../plugins/dbx-import/dbx-importer.c:227
+#: ../plugins/dbx-import/dbx-importer.c:242
 msgid "_Destination folder:"
 msgstr "_Destination folder:"
 
 #: ../mail/importers/evolution-mbox-importer.c:133
-#: ../plugins/dbx-import/dbx-importer.c:233
-#: ../plugins/pst-import/pst-importer.c:316
+#: ../plugins/dbx-import/dbx-importer.c:252
+#: ../plugins/pst-import/pst-importer.c:318
 msgid "Select folder"
 msgstr "Select folder"
 
 #: ../mail/importers/evolution-mbox-importer.c:134
-#: ../plugins/pst-import/pst-importer.c:316
+#: ../plugins/dbx-import/dbx-importer.c:253
+#: ../plugins/pst-import/pst-importer.c:318
 msgid "Select folder to import into"
 msgstr "Select folder to import into"
 
@@ -11119,10 +11216,10 @@ msgid "Importing mailbox"
 msgstr "Importing mailbox"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:149
-#: ../plugins/dbx-import/dbx-importer.c:568
-#: ../plugins/pst-import/pst-importer.c:478
-#: ../plugins/pst-import/pst-importer.c:587
+#: ../mail/importers/mail-importer.c:150
+#: ../plugins/dbx-import/dbx-importer.c:593
+#: ../plugins/pst-import/pst-importer.c:480
+#: ../plugins/pst-import/pst-importer.c:589
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importing '%s'"
@@ -11137,7 +11234,7 @@ msgid "Importing Pine data"
 msgstr "Importing Pine data"
 
 #: ../mail/importers/pine-importer.c:420
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Address Book"
 msgstr "Address Book"
 
@@ -11149,27 +11246,27 @@ msgstr "Evolution Pine importer"
 msgid "Import mail from Pine."
 msgstr "Import mail from Pine."
 
-#: ../mail/mail-autofilter.c:70
+#: ../mail/mail-autofilter.c:72
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail to %s"
 
-#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
+#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:280
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail from %s"
 
-#: ../mail/mail-autofilter.c:256
+#: ../mail/mail-autofilter.c:264
 #, c-format
 msgid "Subject is %s"
 msgstr "Subject is %s"
 
-#: ../mail/mail-autofilter.c:291
+#: ../mail/mail-autofilter.c:303
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: ../mail/mail-autofilter.c:382
+#: ../mail/mail-autofilter.c:394
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
@@ -11178,7 +11275,7 @@ msgstr "Add Filter Rule"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:480
+#: ../mail/mail-autofilter.c:492
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -11195,10 +11292,6 @@ msgstr[1] ""
 "%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 
-#: ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "Account Information"
-
 #: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
 msgstr "Add Ne_w Signatureâ?¦"
@@ -11241,7 +11334,7 @@ msgid "Apply the same _view settings to all folders"
 msgstr "Apply the same _view settings to all folders"
 
 #: ../mail/mail-config.ui.h:14
-#: ../modules/addressbook/addressbook-config.c:1023
+#: ../modules/addressbook/addressbook-config.c:1018
 msgid "Authentication"
 msgstr "Authentication"
 
@@ -11565,80 +11658,85 @@ msgstr "Sending a _private reply to a mailing list message"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:105
+msgid "Sending a message with _recipients not entered as mail addresses"
+msgstr "Sending a message with _recipients not entered as mail addresses"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:107
 msgid "Sending a message with an _empty subject line"
 msgstr "Sending a message with an _empty subject line"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:109
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Sending a message with only _Bcc recipients defined"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:111
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Sending a reply to a large _number of recipients"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:112
 msgid "Sent _Messages Folder:"
 msgstr "Sent _Messages Folder:"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:113
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver requires authentication"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:114
 msgid "Server Configuration"
 msgstr "Server Configuration"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:115
 msgid "Server _Type:"
 msgstr "Server _Type:"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:116
 msgid "Si_gning algorithm:"
 msgstr "Si_gning algorithm:"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:117
 msgid "Sig_natures"
 msgstr "Sig_natures"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:118
 msgid "Sig_ning certificate:"
 msgstr "Sig_ning certificate:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:119
 msgid "Signat_ure:"
 msgstr "Signat_ure:"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:120
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:121
 msgid "Signing _algorithm:"
 msgstr "Signing _algorithm:"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:122
 msgid "Special Folders"
 msgstr "Special Folders"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:123
 msgid "Spell Checking"
 msgstr "Spell Checking"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:124
 msgid "Start _typing at the bottom on replying"
 msgstr "Start _typing at the bottom on replying"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:125
 msgid "Start up"
 msgstr "Start up"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:127
 msgid "T_ype:"
 msgstr "T_ype:"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:128
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -11646,7 +11744,7 @@ msgstr ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:129
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11656,7 +11754,7 @@ msgstr ""
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:132
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -11664,7 +11762,7 @@ msgstr ""
 "To help avoid e-mail accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -11672,141 +11770,141 @@ msgstr ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:135
 msgid "Us_ername:"
 msgstr "Us_ername:"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:136
 msgid "Use Authe_ntication"
 msgstr "Use Authe_ntication"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:137
 msgid "User _Name:"
 msgstr "User_name:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:138
 msgid "_Add Signature"
 msgstr "_Add Signature"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:139
 msgid "_Always load images from the Internet"
 msgstr "_Always load images from the Internet"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:140
 msgid "_Authentication Type"
 msgstr "_Authentication Type"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:141
 msgid "_Default junk plugin:"
 msgstr "_Default junk plugin:"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:142
 msgid "_Direct connection to the Internet"
 msgstr "_Direct connection to the Internet"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:143
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Do not sign meeting requests (for Outlook compatibility)"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:144
 msgid "_Forward style:"
 msgstr "_Forward style:"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:145
 msgid "_Junk Folder:"
 msgstr "_Junk Folder:"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:146
 msgid "_Keep signature above the original message on replying"
 msgstr "_Keep signature above the original message on replying"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:147
 msgid "_Languages"
 msgstr "_Languages"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:148
 msgid "_Load images only in messages from contacts"
 msgstr "_Load images only in messages from contacts"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:149
 msgid "_Lookup in local address book only"
 msgstr "_Look up in local address book only"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:150
 msgid "_Make this my default account"
 msgstr "_Make this my default account"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:151
 msgid "_Manual proxy configuration:"
 msgstr "_Manual proxy configuration:"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:153
 msgid "_Never load images from the Internet"
 msgstr "_Never load images from the Internet"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:154
 msgid "_Path:"
 msgstr "_Path:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:155
 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.ui.h:154
+#: ../mail/mail-config.ui.h:156
 msgid "_Reply style:"
 msgstr "_Reply style:"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:157
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:158
 msgid "_Secure HTTP Proxy:"
 msgstr "_Secure HTTP Proxy:"
 
-#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:160 ../modules/addressbook/ldap-config.ui.h:29
 #: ../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.ui.h:160
+#: ../mail/mail-config.ui.h:162
 msgid "_Show animated images"
 msgstr "_Show animated images"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:163
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Show the photograph of sender in the message preview"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:164
 msgid "_Trash Folder:"
 msgstr "Wastebaske_t Folder:"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:165
 msgid "_Use Secure Connection:"
 msgstr "_Use Secure Connection:"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:166
 msgid "_Use system defaults"
 msgstr "_Use system defaults"
 
-#: ../mail/mail-config.ui.h:165
+#: ../mail/mail-config.ui.h:167
 msgid "_Use the same fonts as other applications"
 msgstr "_Use the same fonts as other applications"
 
-#: ../mail/mail-config.ui.h:166 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:168 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:167 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:169 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:170
 msgid "color"
 msgstr "colour"
 
-#: ../mail/mail-config.ui.h:169
+#: ../mail/mail-config.ui.h:171
 msgid "description"
 msgstr "description"
 
@@ -11906,7 +12004,7 @@ msgstr "_Flag:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Tick this to accept the licence agreement"
 
-#: ../mail/mail-folder-cache.c:792
+#: ../mail/mail-folder-cache.c:789
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -11971,88 +12069,88 @@ msgstr "Opening store '%s'"
 msgid "Removing folder '%s'"
 msgstr "Removing folder '%s'"
 
-#: ../mail/mail-ops.c:1585
+#: ../mail/mail-ops.c:1609
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Storing folder '%s'"
 
-#: ../mail/mail-ops.c:1654
+#: ../mail/mail-ops.c:1678
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: ../mail/mail-ops.c:1655
+#: ../mail/mail-ops.c:1679
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Storing account '%s'"
 
-#: ../mail/mail-ops.c:1713
+#: ../mail/mail-ops.c:1737
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Refreshing folder '%s'"
 
-#: ../mail/mail-ops.c:1877
+#: ../mail/mail-ops.c:1901
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Expunging folder '%s'"
 
-#: ../mail/mail-ops.c:1949
+#: ../mail/mail-ops.c:1973
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Emptying wastebasket in '%s'"
 
-#: ../mail/mail-ops.c:1950
+#: ../mail/mail-ops.c:1974
 msgid "Local Folders"
 msgstr "Local Folders"
 
-#: ../mail/mail-ops.c:2123
+#: ../mail/mail-ops.c:2147
 #, 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:2216
+#: ../mail/mail-ops.c:2240
 #, 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:2312
+#: ../mail/mail-ops.c:2336
 #, c-format
 msgid "Error saving messages to: %s:\n"
 msgstr "Error saving messages to: %s:\n"
 
-#: ../mail/mail-ops.c:2387
+#: ../mail/mail-ops.c:2411
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparing account '%s' for offline"
 
-#: ../mail/mail-ops.c:2478
+#: ../mail/mail-ops.c:2502
 msgid "Checking Service"
 msgstr "Checking Service"
 
-#: ../mail/mail-ops.c:2558
+#: ../mail/mail-ops.c:2582
 #, c-format
 msgid "Disconnecting %s"
 msgstr "Disconnecting %s"
 
-#: ../mail/mail-ops.c:2615
+#: ../mail/mail-ops.c:2639
 #, c-format
 msgid "Removing attachments"
 msgstr "Removing attachments"
 
-#: ../mail/mail-ops.c:2662
+#: ../mail/mail-ops.c:2686
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "File \"%s\" has been removed."
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "Cancellingâ?¦"
 
-#: ../mail/mail-send-recv.c:435
+#: ../mail/mail-send-recv.c:436
 msgid "Send & Receive Mail"
 msgstr "Send & Receive Mail"
 
@@ -12112,7 +12210,7 @@ msgstr "Updating Search Folders for '%s'"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:709
+#: ../mail/mail-vfolder.c:718
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12131,11 +12229,11 @@ msgstr[1] ""
 "%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 
-#: ../mail/mail-vfolder.c:1273
+#: ../mail/mail-vfolder.c:1297
 msgid "Edit Search Folder"
 msgstr "Edit Search Folder"
 
-#: ../mail/mail-vfolder.c:1380
+#: ../mail/mail-vfolder.c:1408
 msgid "New Search Folder"
 msgstr "New Search Folder"
 
@@ -12346,38 +12444,22 @@ msgid "Could not save signature file."
 msgstr "Could not save signature file."
 
 #: ../mail/mail.error.xml.h:45
-msgid ""
-"Default local store has been changed from mbox to maildir format. Do you "
-"want to migrate now ?\n"
-"\n"
-"A mbox account will be created to preserve the old mbox folders. You can "
-"delete it after ensuring the data is safely migrated. Please make sure there "
-"is enough space if you choose to migrate."
-msgstr ""
-"The default local store has been changed from mbox to maildir format. Do you "
-"want to migrate now ?\n"
-"\n"
-"An mbox account will be created to preserve the old mbox folders. You can "
-"delete it after ensuring the data is safely migrated. Please make sure there "
-"is enough space if you choose to migrate."
-
-#: ../mail/mail.error.xml.h:48
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Delete messages in Search Folder \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:47
 msgid "Do _Not Disable"
 msgstr "Do _Not Disable"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:48
 msgid "Do _Not Send"
 msgstr "Do _Not Send"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:49
 msgid "Do _Not Synchronize"
 msgstr "Do _Not Synchronise"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -12385,55 +12467,77 @@ msgstr ""
 "Do you want to locally synchronise the folders that are marked for offline "
 "usage?"
 
-#: ../mail/mail.error.xml.h:54
+#: ../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:55
+#: ../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:56
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "Enter password."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "Error loading filter definitions."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:55
 msgid "Error while performing operation."
 msgstr "Error while performing operation."
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:59
 msgid "Error while {0}."
 msgstr "Error while {0}."
 
+#: ../mail/mail.error.xml.h:60
+msgid ""
+"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"mail must be migrated to the new format before Evolution can proceed. Do you "
+"want to migrate now?\n"
+"\n"
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
+msgstr ""
+"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"mail must be migrated to the new format before Evolution can proceed. Do you "
+"want to migrate now?\n"
+"\n"
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
+
 #: ../mail/mail.error.xml.h:63
+msgid "Evolution's local mail format has changed."
+msgstr "Evolution's local mail format has changed."
+
+#: ../mail/mail.error.xml.h:64
 msgid "Failed to unsubscribe from folder."
 msgstr "Failed to unsubscribe from folder."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
 msgid "File exists but cannot overwrite it."
 msgstr "File exists but cannot overwrite it."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "File exists but is not a regular file."
 msgstr "File exists but is not a regular file."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Folder '{0}' doesn't contain any duplicate messages."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 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:69
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -12441,17 +12545,17 @@ msgstr ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 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:71
+#: ../mail/mail.error.xml.h:72
 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:72
+#: ../mail/mail.error.xml.h:73
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12459,11 +12563,11 @@ msgstr ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 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:75
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -12471,23 +12575,23 @@ msgstr ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid "Ignore"
 msgstr "Ignore"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "Invalid authentication"
 msgstr "Invalid authentication"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid "Mail Deletion Failed"
 msgstr "Mail Deletion Failed"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid "Mail filters automatically updated."
 msgstr "Mail filters automatically updated."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 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 "
@@ -12499,10 +12603,6 @@ msgstr ""
 "your message anyway. To avoid this, you should add at least one To: or Cc: "
 "recipient."
 
-#: ../mail/mail.error.xml.h:81
-msgid "Migrate local mbox folders to maildir"
-msgstr "Migrate local mbox folders to maildir"
-
 #: ../mail/mail.error.xml.h:82
 msgid "Missing folder."
 msgstr "Missing folder."
@@ -12821,114 +12921,122 @@ msgid "_Discard changes"
 msgstr "_Discard changes"
 
 #: ../mail/mail.error.xml.h:151
-#: ../modules/mail/e-mail-shell-view-actions.c:1054
+#: ../modules/mail/e-mail-shell-view-actions.c:1071
 msgid "_Empty Trash"
 msgstr "_Empty Wastebasket"
 
 #: ../mail/mail.error.xml.h:152
+msgid "_Exit Evolution"
+msgstr "_Exit Evolution"
+
+#: ../mail/mail.error.xml.h:153
 msgid "_Expunge"
 msgstr "_Expunge"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:154
+msgid "_Migrate Now"
+msgstr "_Migrate Now"
+
+#: ../mail/mail.error.xml.h:155
 msgid "_No"
 msgstr "_No"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:156
 msgid "_Open Messages"
 msgstr "_Open Messages"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:159
 msgid "_Send Receipt"
 msgstr "_Send Receipt"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:160
 msgid "_Synchronize"
 msgstr "_Synchronise"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:161
 msgid "_Yes"
 msgstr "_Yes"
 
-#: ../mail/message-list.c:1213
+#: ../mail/message-list.c:1215
 msgid "Unseen"
 msgstr "Unseen"
 
-#: ../mail/message-list.c:1214
+#: ../mail/message-list.c:1216
 msgid "Seen"
 msgstr "Seen"
 
-#: ../mail/message-list.c:1215
+#: ../mail/message-list.c:1217
 msgid "Answered"
 msgstr "Answered"
 
-#: ../mail/message-list.c:1216
+#: ../mail/message-list.c:1218
 msgid "Forwarded"
 msgstr "Forwarded"
 
-#: ../mail/message-list.c:1217
+#: ../mail/message-list.c:1219
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: ../mail/message-list.c:1218
+#: ../mail/message-list.c:1220
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: ../mail/message-list.c:1222
+#: ../mail/message-list.c:1224
 msgid "Lowest"
 msgstr "Lowest"
 
-#: ../mail/message-list.c:1223
+#: ../mail/message-list.c:1225
 msgid "Lower"
 msgstr "Lower"
 
-#: ../mail/message-list.c:1227
+#: ../mail/message-list.c:1229
 msgid "Higher"
 msgstr "Higher"
 
-#: ../mail/message-list.c:1228
+#: ../mail/message-list.c:1230
 msgid "Highest"
 msgstr "Highest"
 
-#: ../mail/message-list.c:1837 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1849 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1844 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1856 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: ../mail/message-list.c:1853
+#: ../mail/message-list.c:1865
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: ../mail/message-list.c:1865
+#: ../mail/message-list.c:1877
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1873
+#: ../mail/message-list.c:1885
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1875
+#: ../mail/message-list.c:1887
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2642
+#: ../mail/message-list.c:2672
 msgid "Select all visible messages"
 msgstr "Select all visible messages"
 
-#: ../mail/message-list.c:2800 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2830 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Messages"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4468 ../mail/message-list.c:4892
+#: ../mail/message-list.c:4506 ../mail/message-list.c:4930
 msgid "Generating message list"
 msgstr "Generating message list"
 
-#: ../mail/message-list.c:4707
+#: ../mail/message-list.c:4745
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -12936,7 +13044,7 @@ msgstr ""
 "No message satisfies your search criteria. Either clear search with Search â?? "
 "Clear menu item or change it."
 
-#: ../mail/message-list.c:4709
+#: ../mail/message-list.c:4747
 msgid "There are no messages in this folder."
 msgstr "There are no messages in this folder."
 
@@ -12965,7 +13073,7 @@ msgid "Sent Messages"
 msgstr "Sent Messages"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:570
+#: ../widgets/misc/e-attachment-tree-view.c:568
 msgid "Size"
 msgstr "Size"
 
@@ -12974,27 +13082,27 @@ msgid "Subject - Trimmed"
 msgstr "Subject â?? Trimmed"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1508
 msgid "Body contains"
 msgstr "Body contains"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1498
+#: ../modules/mail/e-mail-shell-view-actions.c:1515
 msgid "Message contains"
 msgstr "Message contains"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1505
+#: ../modules/mail/e-mail-shell-view-actions.c:1522
 msgid "Recipients contain"
 msgstr "Recipients contain"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1529
 msgid "Sender contains"
 msgstr "Sender contains"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1536
 msgid "Subject contains"
 msgstr "Subject contains"
 
@@ -13002,7 +13110,7 @@ msgstr "Subject contains"
 msgid "Subject or Addresses contains"
 msgstr "Subject or Addresses contains"
 
-#: ../modules/addressbook/addressbook-config.c:209
+#: ../modules/addressbook/addressbook-config.c:205
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -13010,7 +13118,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:211
+#: ../modules/addressbook/addressbook-config.c:207
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -13018,7 +13126,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:213
+#: ../modules/addressbook/addressbook-config.c:209
 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 "
@@ -13028,15 +13136,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:612
+#: ../modules/addressbook/addressbook-config.c:608
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "U_se in Birthday & Anniversaries calendar"
 
-#: ../modules/addressbook/addressbook-config.c:648
+#: ../modules/addressbook/addressbook-config.c:644
 msgid "Copy _book content locally for offline operation"
 msgstr "Copy _book content locally for offline operation"
 
-#: ../modules/addressbook/addressbook-config.c:756
+#: ../modules/addressbook/addressbook-config.c:751
 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 "
@@ -13046,7 +13154,7 @@ msgstr ""
 "list of standard ports has been provided. Ask your system administrator what "
 "port you should specify."
 
-#: ../modules/addressbook/addressbook-config.c:830
+#: ../modules/addressbook/addressbook-config.c:825
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13056,7 +13164,7 @@ msgstr ""
 "setting this to \"E-mail Address\" requires anonymous access to your LDAP "
 "server."
 
-#: ../modules/addressbook/addressbook-config.c:905
+#: ../modules/addressbook/addressbook-config.c:900
 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 "
@@ -13068,29 +13176,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:1021
+#: ../modules/addressbook/addressbook-config.c:1016
 msgid "Server Information"
 msgstr "Server Information"
 
-#: ../modules/addressbook/addressbook-config.c:1026
+#: ../modules/addressbook/addressbook-config.c:1021
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Details"
 
-#: ../modules/addressbook/addressbook-config.c:1027
+#: ../modules/addressbook/addressbook-config.c:1022
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "Searching"
 
-#: ../modules/addressbook/addressbook-config.c:1029
+#: ../modules/addressbook/addressbook-config.c:1024
 msgid "Downloading"
 msgstr "Downloading"
 
-#: ../modules/addressbook/addressbook-config.c:1235
+#: ../modules/addressbook/addressbook-config.c:1230
 msgid "Address Book Properties"
 msgstr "Address Book Properties"
 
-#: ../modules/addressbook/addressbook-config.c:1237
+#: ../modules/addressbook/addressbook-config.c:1232
 msgid "New Address Book"
 msgstr "New Address Book"
 
@@ -13188,7 +13296,7 @@ msgstr "Whether to show the preview pane."
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:161
-#: ../modules/mail/em-mailer-prefs.c:1138
+#: ../modules/mail/em-mailer-prefs.c:1140
 msgid "_Table column:"
 msgstr "_Table column:"
 
@@ -13201,50 +13309,50 @@ msgid "Always _show address of the autocompleted contact"
 msgstr "Always _show address of the autocompleted contact"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../modules/addressbook/e-book-shell-backend.c:94
 #: ../modules/addressbook/e-book-shell-migrate.c:153
 msgid "On LDAP Servers"
 msgstr "On LDAP Servers"
 
-#: ../modules/addressbook/e-book-shell-backend.c:280
+#: ../modules/addressbook/e-book-shell-backend.c:276
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contact"
 
-#: ../modules/addressbook/e-book-shell-backend.c:282
+#: ../modules/addressbook/e-book-shell-backend.c:278
 #: ../modules/addressbook/e-book-shell-view-actions.c:773
 msgid "Create a new contact"
 msgstr "Create a new contact"
 
-#: ../modules/addressbook/e-book-shell-backend.c:287
+#: ../modules/addressbook/e-book-shell-backend.c:283
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Contact _List"
 
-#: ../modules/addressbook/e-book-shell-backend.c:289
+#: ../modules/addressbook/e-book-shell-backend.c:285
 #: ../modules/addressbook/e-book-shell-view-actions.c:780
 msgid "Create a new contact list"
 msgstr "Create a new contact list"
 
-#: ../modules/addressbook/e-book-shell-backend.c:297
+#: ../modules/addressbook/e-book-shell-backend.c:293
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Address _Book"
 
-#: ../modules/addressbook/e-book-shell-backend.c:299
+#: ../modules/addressbook/e-book-shell-backend.c:295
 #: ../modules/addressbook/e-book-shell-view-actions.c:703
 msgid "Create a new address book"
 msgstr "Create a new address book"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:316
+#: ../modules/addressbook/e-book-shell-backend.c:312
 #: ../modules/addressbook/e-book-shell-view.c:401
-#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-backend.c:105
 #: ../modules/calendar/e-cal-shell-migrate.c:59
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../modules/addressbook/e-book-shell-backend.c:325
+#: ../modules/addressbook/e-book-shell-backend.c:322
 msgid "Certificates"
 msgstr "Certificates"
 
@@ -13291,10 +13399,10 @@ msgid "Show properties of the selected address book"
 msgstr "Show properties of the selected address book"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:715
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-cal-shell-view-actions.c:1360
 #: ../modules/calendar/e-memo-shell-view-actions.c:626
 #: ../modules/calendar/e-task-shell-view-actions.c:750
-#: ../modules/mail/e-mail-shell-view-actions.c:1138
+#: ../modules/mail/e-mail-shell-view-actions.c:1155
 msgid "_Rename..."
 msgstr "_Renameâ?¦"
 
@@ -13375,7 +13483,7 @@ msgid "Send a message to the selected contacts"
 msgstr "Send a message to the selected contacts"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1501
+#: ../modules/calendar/e-cal-shell-view-actions.c:1502
 #: ../modules/calendar/e-task-shell-view-actions.c:808
 msgid "_Actions"
 msgstr "_Actions"
@@ -13383,12 +13491,12 @@ msgstr "_Actions"
 #: ../modules/addressbook/e-book-shell-view-actions.c:808
 #: ../modules/calendar/e-memo-shell-view-actions.c:663
 #: ../modules/calendar/e-task-shell-view-actions.c:815
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "_Preview"
 msgstr "_Preview"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:817
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 #: ../modules/calendar/e-memo-shell-view-actions.c:676
 #: ../modules/calendar/e-task-shell-view-actions.c:828
 msgid "_Delete"
@@ -13415,7 +13523,7 @@ msgstr "Show contact preview window"
 #: ../modules/addressbook/e-book-shell-view-actions.c:879
 #: ../modules/calendar/e-memo-shell-view-actions.c:733
 #: ../modules/calendar/e-task-shell-view-actions.c:897
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../modules/mail/e-mail-shell-view-actions.c:1418
 msgid "_Classic View"
 msgstr "_Classic View"
 
@@ -13426,7 +13534,7 @@ msgstr "Show contact preview below the contact list"
 #: ../modules/addressbook/e-book-shell-view-actions.c:886
 #: ../modules/calendar/e-memo-shell-view-actions.c:740
 #: ../modules/calendar/e-task-shell-view-actions.c:904
-#: ../modules/mail/e-mail-shell-view-actions.c:1408
+#: ../modules/mail/e-mail-shell-view-actions.c:1425
 msgid "_Vertical View"
 msgstr "_Vertical View"
 
@@ -13435,25 +13543,25 @@ msgid "Show contact preview alongside the contact list"
 msgstr "Show contact preview alongside the contact list"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:896
-#: ../modules/calendar/e-cal-shell-view-actions.c:1661
+#: ../modules/calendar/e-cal-shell-view-actions.c:1662
 #: ../modules/calendar/e-memo-shell-view-actions.c:750
 #: ../modules/calendar/e-task-shell-view-actions.c:921
 msgid "Any Category"
 msgstr "Any Category"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:903
-#: ../modules/calendar/e-cal-shell-view-actions.c:1675
+#: ../modules/calendar/e-cal-shell-view-actions.c:1676
 #: ../modules/calendar/e-memo-shell-view-actions.c:757
 #: ../modules/calendar/e-task-shell-view-actions.c:956
 msgid "Unmatched"
 msgstr "Unmatched"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
 #: ../modules/calendar/e-memo-shell-view-actions.c:767
 #: ../modules/calendar/e-task-shell-view-actions.c:966
-#: ../modules/mail/e-mail-shell-view-actions.c:1484
-#: ../shell/e-shell-content.c:610
+#: ../modules/mail/e-mail-shell-view-actions.c:1501
+#: ../shell/e-shell-content.c:634
 msgid "Advanced Search"
 msgstr "Advanced Search"
 
@@ -13720,7 +13828,7 @@ msgid "Template:"
 msgstr "Template:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
-#: ../widgets/misc/e-dateedit.c:606
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Time"
 
@@ -13738,7 +13846,7 @@ msgid "Wee_k starts on:"
 msgstr "Wee_k starts on:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1644
+#: ../modules/calendar/e-cal-shell-view-actions.c:1645
 msgid "Work Week"
 msgstr "Work Week"
 
@@ -14395,113 +14503,104 @@ msgstr "Workday start hour"
 msgid "Workday start minute"
 msgstr "Workday start minute"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../modules/calendar/e-cal-attachment-handler.c:267
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "I_mport"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:343
+#: ../modules/calendar/e-cal-attachment-handler.c:348
 msgid "Select a Calendar"
 msgstr "Select a Calendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:370
+#: ../modules/calendar/e-cal-attachment-handler.c:375
 msgid "Select a Task List"
 msgstr "Select a Task List"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:380
+#: ../modules/calendar/e-cal-attachment-handler.c:385
 msgid "I_mport to Calendar"
 msgstr "I_mport to Calendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:387
+#: ../modules/calendar/e-cal-attachment-handler.c:392
 msgid "I_mport to Tasks"
 msgstr "I_mport to Tasks"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:111
-#: ../modules/calendar/e-cal-shell-migrate.c:192
-#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-cal-shell-backend.c:107
+#: ../modules/calendar/e-cal-shell-migrate.c:194
+#: ../modules/calendar/e-memo-shell-backend.c:94
 #: ../modules/calendar/e-memo-shell-migrate.c:149
-#: ../modules/calendar/e-task-shell-backend.c:98
-#: ../modules/calendar/e-task-shell-migrate.c:158
+#: ../modules/calendar/e-task-shell-backend.c:94
+#: ../modules/calendar/e-task-shell-migrate.c:160
 msgid "On The Web"
 msgstr "On The Web"
 
-#: ../modules/calendar/e-cal-shell-backend.c:113
-#: ../plugins/calendar-weather/calendar-weather.c:120
+#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../plugins/calendar-weather/calendar-weather.c:121
 msgid "Weather"
 msgstr "Weather"
 
-#: ../modules/calendar/e-cal-shell-backend.c:200
+#: ../modules/calendar/e-cal-shell-backend.c:196
 #: ../modules/calendar/e-cal-shell-migrate.c:62
 msgid "Birthdays & Anniversaries"
 msgstr "Birthdays & Anniversaries"
 
-#: ../modules/calendar/e-cal-shell-backend.c:425
+#: ../modules/calendar/e-cal-shell-backend.c:421
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:427
-#: ../modules/calendar/e-cal-shell-view-actions.c:1438
+#: ../modules/calendar/e-cal-shell-backend.c:423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:432
+#: ../modules/calendar/e-cal-shell-backend.c:428
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "All Day A_ppointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:434
+#: ../modules/calendar/e-cal-shell-backend.c:430
 msgid "Create a new all-day appointment"
 msgstr "Create a new all-day appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:439
+#: ../modules/calendar/e-cal-shell-backend.c:435
 msgctxt "New"
 msgid "M_eeting"
 msgstr "M_eeting"
 
-#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-backend.c:437
 msgid "Create a new meeting request"
 msgstr "Create a new meeting request"
 
-#: ../modules/calendar/e-cal-shell-backend.c:449
+#: ../modules/calendar/e-cal-shell-backend.c:445
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:451
-#: ../modules/calendar/e-cal-shell-view-actions.c:1333
+#: ../modules/calendar/e-cal-shell-backend.c:447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:754
+#: ../modules/calendar/e-cal-shell-backend.c:750
 #: ../plugins/itip-formatter/itip-formatter.c:2809
 msgid "Calendar and Tasks"
 msgstr "Calendar and Tasks"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:170
-#, c-format
-msgid ""
-"Error on %s: %s\n"
-"%s"
-msgstr ""
-"Error on %s: %s\n"
-"%s"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:238
+#: ../modules/calendar/e-cal-shell-sidebar.c:221
 msgid "Loading calendars"
 msgstr "Loading calendars"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:662
+#: ../modules/calendar/e-cal-shell-sidebar.c:636
 msgid "_New Calendar..."
 msgstr "_New Calendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:679
+#: ../modules/calendar/e-cal-shell-sidebar.c:653
 msgid "Calendar Selector"
 msgstr "Calendar Selector"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1022
+#: ../modules/calendar/e-cal-shell-sidebar.c:998
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Opening calendar at %s"
@@ -14549,111 +14648,111 @@ msgstr "event"
 msgid "Save as iCalendar"
 msgstr "Save as iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1289
+#: ../modules/calendar/e-cal-shell-view-actions.c:1290
 #: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "_Copy..."
 msgstr "_Copyâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1296
+#: ../modules/calendar/e-cal-shell-view-actions.c:1297
 msgid "D_elete Calendar"
 msgstr "D_elete Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../modules/calendar/e-cal-shell-view-actions.c:1299
 msgid "Delete the selected calendar"
 msgstr "Delete the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1305
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
 msgid "Go Back"
 msgstr "Go Back"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 msgid "Go Forward"
 msgstr "Go Forward"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 msgid "Select today"
 msgstr "Select today"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1324
+#: ../modules/calendar/e-cal-shell-view-actions.c:1325
 msgid "Select _Date"
 msgstr "Select _Date"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "Select a specific date"
 msgstr "Select a specific date"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1331
+#: ../modules/calendar/e-cal-shell-view-actions.c:1332
 msgid "_New Calendar"
 msgstr "_New Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1345
+#: ../modules/calendar/e-cal-shell-view-actions.c:1346
 #: ../modules/calendar/e-task-shell-view-actions.c:799
 msgid "Purg_e"
 msgstr "Purg_e"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "Purge old appointments and meetings"
 msgstr "Purge old appointments and meetings"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../modules/calendar/e-cal-shell-view-actions.c:1353
 #: ../modules/calendar/e-memo-shell-view-actions.c:619
 #: ../modules/calendar/e-task-shell-view-actions.c:743
 msgid "Re_fresh"
 msgstr "Re_fresh"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "Refresh the selected calendar"
 msgstr "Refresh the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Rename the selected calendar"
 msgstr "Rename the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../modules/calendar/e-cal-shell-view-actions.c:1367
 msgid "Show _Only This Calendar"
 msgstr "Show _Only This Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1373
+#: ../modules/calendar/e-cal-shell-view-actions.c:1374
 msgid "Cop_y to Calendar..."
 msgstr "Cop_y to Calendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1381
 msgid "_Delegate Meeting..."
 msgstr "_Delegate Meetingâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../modules/calendar/e-cal-shell-view-actions.c:1388
 msgid "_Delete Appointment"
 msgstr "_Delete Appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "Delete selected appointments"
 msgstr "Delete selected appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-view-actions.c:1395
 msgid "Delete This _Occurrence"
 msgstr "Delete This _Occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "Delete this occurrence"
 msgstr "Delete this occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1401
+#: ../modules/calendar/e-cal-shell-view-actions.c:1402
 msgid "Delete All Occ_urrences"
 msgstr "Delete All Occ_urrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Delete all occurrences"
 msgstr "Delete all occurrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "New All Day _Event..."
 msgstr "New All Day _Eventâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "Create a new all day event"
 msgstr "Create a new all-day event"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-cal-shell-view-actions.c:1416
 #: ../modules/calendar/e-cal-shell-view-memopad.c:250
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:323
 #: ../modules/calendar/e-memo-shell-view-actions.c:584
@@ -14661,128 +14760,128 @@ msgstr "Create a new all-day event"
 msgid "_Forward as iCalendar..."
 msgstr "_Forward as iCalendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "New _Meeting..."
 msgstr "New _Meetingâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1424
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "Create a new meeting"
 msgstr "Create a new meeting"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1429
+#: ../modules/calendar/e-cal-shell-view-actions.c:1430
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ve to Calendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+#: ../modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "New _Appointment..."
 msgstr "New _Appointmentâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../modules/calendar/e-cal-shell-view-actions.c:1444
 msgid "Make this Occurrence _Movable"
 msgstr "Make this Occurrence _Movable"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1450
+#: ../modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "_Open Appointment"
 msgstr "_Open Appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
 msgid "View the current appointment"
 msgstr "View the current appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1457
+#: ../modules/calendar/e-cal-shell-view-actions.c:1458
 msgid "_Reply"
 msgstr "_Reply"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+#: ../modules/calendar/e-cal-shell-view-actions.c:1472
 #: ../modules/calendar/e-cal-shell-view-memopad.c:278
 msgid "Save as iCalendar..."
 msgstr "Save as iCalendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1478
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 msgid "_Schedule Meeting..."
 msgstr "_Schedule Meetingâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1480
+#: ../modules/calendar/e-cal-shell-view-actions.c:1481
 msgid "Converts an appointment to a meeting"
 msgstr "Converts an appointment to a meeting"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1485
+#: ../modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Conv_ert to Appointment..."
 msgstr "Conv_ert to Appointmentâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+#: ../modules/calendar/e-cal-shell-view-actions.c:1488
 msgid "Converts a meeting to an appointment"
 msgstr "Converts a meeting to an appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1492
+#: ../modules/calendar/e-cal-shell-view-actions.c:1493
 msgid "Quit"
 msgstr "Quit"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1616
+#: ../modules/calendar/e-cal-shell-view-actions.c:1617
 msgid "Day"
 msgstr "Day"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-cal-shell-view-actions.c:1619
 msgid "Show one day"
 msgstr "Show one day"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1623
+#: ../modules/calendar/e-cal-shell-view-actions.c:1624
 msgid "List"
 msgstr "List"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-cal-shell-view-actions.c:1626
 msgid "Show as list"
 msgstr "Show as list"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1630
+#: ../modules/calendar/e-cal-shell-view-actions.c:1631
 msgid "Month"
 msgstr "Month"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-cal-shell-view-actions.c:1633
 msgid "Show one month"
 msgstr "Show one month"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1637
+#: ../modules/calendar/e-cal-shell-view-actions.c:1638
 msgid "Week"
 msgstr "Week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1639
+#: ../modules/calendar/e-cal-shell-view-actions.c:1640
 msgid "Show one week"
 msgstr "Show one week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1646
+#: ../modules/calendar/e-cal-shell-view-actions.c:1647
 msgid "Show one work week"
 msgstr "Show one work week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1654
+#: ../modules/calendar/e-cal-shell-view-actions.c:1655
 msgid "Active Appointments"
 msgstr "Active Appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1668
+#: ../modules/calendar/e-cal-shell-view-actions.c:1669
 msgid "Next 7 Days' Appointments"
 msgstr "Next 7 Days' Appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1700
 #: ../modules/calendar/e-memo-shell-view-actions.c:781
 #: ../modules/calendar/e-task-shell-view-actions.c:980
 msgid "Description contains"
 msgstr "Description contains"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1706
+#: ../modules/calendar/e-cal-shell-view-actions.c:1707
 #: ../modules/calendar/e-memo-shell-view-actions.c:788
 #: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Summary contains"
 msgstr "Summary contains"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1718
+#: ../modules/calendar/e-cal-shell-view-actions.c:1719
 msgid "Print this calendar"
 msgstr "Print this calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1725
+#: ../modules/calendar/e-cal-shell-view-actions.c:1726
 msgid "Preview the calendar to be printed"
 msgstr "Preview the calendar to be printed"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1798
+#: ../modules/calendar/e-cal-shell-view-actions.c:1799
 msgid "Go To"
 msgstr "Go To"
 
@@ -14799,7 +14898,7 @@ msgid "New _Memo"
 msgstr "New _Memo"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-backend.c:287
+#: ../modules/calendar/e-memo-shell-backend.c:283
 #: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Create a new memo"
 msgstr "Create a new memo"
@@ -14865,7 +14964,7 @@ msgid "New _Task"
 msgstr "New _Task"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-backend.c:286
+#: ../modules/calendar/e-task-shell-backend.c:282
 #: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "Create a new task"
 msgstr "Create a new task"
@@ -14903,50 +15002,40 @@ msgstr "Ti_me and date:"
 msgid "_Date only:"
 msgstr "_Date only:"
 
-#: ../modules/calendar/e-memo-shell-backend.c:285
+#: ../modules/calendar/e-memo-shell-backend.c:281
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Mem_o"
 
-#: ../modules/calendar/e-memo-shell-backend.c:292
+#: ../modules/calendar/e-memo-shell-backend.c:288
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Shared Memo"
 
-#: ../modules/calendar/e-memo-shell-backend.c:294
+#: ../modules/calendar/e-memo-shell-backend.c:290
 msgid "Create a new shared memo"
 msgstr "Create a new shared memo"
 
-#: ../modules/calendar/e-memo-shell-backend.c:302
+#: ../modules/calendar/e-memo-shell-backend.c:298
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Memo Li_st"
 
-#: ../modules/calendar/e-memo-shell-backend.c:304
+#: ../modules/calendar/e-memo-shell-backend.c:300
 #: ../modules/calendar/e-memo-shell-view-actions.c:607
 msgid "Create a new memo list"
 msgstr "Create a new memo list"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:164
-#: ../modules/calendar/e-task-shell-sidebar.c:164
-#, c-format
-msgid ""
-"Error on %s\n"
-"%s"
-msgstr ""
-"Error on %s\n"
-"%s"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:232
+#: ../modules/calendar/e-memo-shell-sidebar.c:216
 msgid "Loading memos"
 msgstr "Loading memos"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:601
+#: ../modules/calendar/e-memo-shell-sidebar.c:578
 msgid "Memo List Selector"
 msgstr "Memo List Selector"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:906
+#: ../modules/calendar/e-memo-shell-sidebar.c:885
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Opening memos at %s"
@@ -15037,40 +15126,40 @@ msgstr "Delete Memos"
 msgid "Delete Memo"
 msgstr "Delete Memo"
 
-#: ../modules/calendar/e-task-shell-backend.c:284
+#: ../modules/calendar/e-task-shell-backend.c:280
 msgctxt "New"
 msgid "_Task"
 msgstr "_Task"
 
-#: ../modules/calendar/e-task-shell-backend.c:291
+#: ../modules/calendar/e-task-shell-backend.c:287
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Assigne_d Task"
 
-#: ../modules/calendar/e-task-shell-backend.c:293
+#: ../modules/calendar/e-task-shell-backend.c:289
 msgid "Create a new assigned task"
 msgstr "Create a new assigned task"
 
-#: ../modules/calendar/e-task-shell-backend.c:301
+#: ../modules/calendar/e-task-shell-backend.c:297
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Tas_k List"
 
-#: ../modules/calendar/e-task-shell-backend.c:303
+#: ../modules/calendar/e-task-shell-backend.c:299
 #: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Create a new task list"
 msgstr "Create a new task list"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:232
+#: ../modules/calendar/e-task-shell-sidebar.c:216
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:601
+#: ../modules/calendar/e-task-shell-sidebar.c:578
 msgid "Task List Selector"
 msgstr "Task List Selector"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:906
+#: ../modules/calendar/e-task-shell-sidebar.c:885
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
@@ -15204,496 +15293,500 @@ msgid "Delete Task"
 msgstr "Delete Task"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:380
+#: ../modules/mail/e-mail-attachment-handler.c:382
 #, c-format
 msgid "%d attached messages"
 msgstr "%d attached messages"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:94
+#: ../modules/mail/e-mail-junk-hook.c:90
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "None"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:183
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: ../modules/mail/e-mail-shell-backend.c:172
+#: ../modules/mail/e-mail-shell-backend.c:185
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:193
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: ../modules/mail/e-mail-shell-backend.c:182
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: ../modules/mail/e-mail-shell-backend.c:481
+#: ../modules/mail/e-mail-shell-backend.c:494
 msgid "Mail Accounts"
 msgstr "Mail Accounts"
 
-#: ../modules/mail/e-mail-shell-backend.c:489
+#: ../modules/mail/e-mail-shell-backend.c:502
 msgid "Mail Preferences"
 msgstr "Mail Preferences"
 
-#: ../modules/mail/e-mail-shell-backend.c:497
+#: ../modules/mail/e-mail-shell-backend.c:510
 msgid "Composer Preferences"
 msgstr "Composer Preferences"
 
-#: ../modules/mail/e-mail-shell-backend.c:505
+#: ../modules/mail/e-mail-shell-backend.c:518
 msgid "Network Preferences"
 msgstr "Network Preferences"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1047
-#: ../modules/mail/e-mail-shell-view.c:954
+#: ../modules/mail/e-mail-shell-view-actions.c:1064
+#: ../modules/mail/e-mail-shell-view.c:953
 msgid "_Disable Account"
 msgstr "_Disable Account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1049
+#: ../modules/mail/e-mail-shell-view-actions.c:1066
 msgid "Disable this account"
 msgstr "Disable this account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1056
+#: ../modules/mail/e-mail-shell-view-actions.c:1073
 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:1061
+#: ../modules/mail/e-mail-shell-view-actions.c:1078
 msgid "C_reate Search Folder From Search..."
 msgstr "C_reate Search Folder From Searchâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1068
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "_Download Messages for Offline Usage"
 msgstr "_Download Messages for Offline Usage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1070
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 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:1075
+#: ../modules/mail/e-mail-shell-view-actions.c:1092
 msgid "Fl_ush Outbox"
 msgstr "Fl_ush Outbox"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1082
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
 msgid "_Copy Folder To..."
 msgstr "_Copy Folder Toâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1084
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
 msgid "Copy the selected folder into another folder"
 msgstr "Copy the selected folder into another folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1091
+#: ../modules/mail/e-mail-shell-view-actions.c:1108
 msgid "Permanently remove this folder"
 msgstr "Permanently remove this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1096
+#: ../modules/mail/e-mail-shell-view-actions.c:1113
 msgid "E_xpunge"
 msgstr "E_xpunge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1098
+#: ../modules/mail/e-mail-shell-view-actions.c:1115
 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:1103
+#: ../modules/mail/e-mail-shell-view-actions.c:1120
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_k All Messages as Read"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1105
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 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:1110
+#: ../modules/mail/e-mail-shell-view-actions.c:1127
 msgid "_Move Folder To..."
 msgstr "_Move Folder Toâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1112
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "Move the selected folder into another folder"
 msgstr "Move the selected folder into another folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1117
+#: ../modules/mail/e-mail-shell-view-actions.c:1134
 msgid "_New..."
 msgstr "_Newâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1119
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
 msgid "Create a new folder for storing mail"
 msgstr "Create a new folder for storing mail"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1126
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "Change the properties of this folder"
 msgstr "Change the properties of this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1133
+#: ../modules/mail/e-mail-shell-view-actions.c:1150
 msgid "Refresh the folder"
 msgstr "Refresh the folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1140
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 msgid "Change the name of this folder"
 msgstr "Change the name of this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1162
 msgid "Select Message _Thread"
 msgstr "Select Message _Thread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 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:1152
+#: ../modules/mail/e-mail-shell-view-actions.c:1169
 msgid "Select Message S_ubthread"
 msgstr "Select Message S_ubthread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1154
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 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:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1183
 msgid "Empty _Trash"
 msgstr "Empty Was_tebasket"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1185
 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:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1190
 msgid "_New Label"
 msgstr "_New Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "N_one"
 msgstr "N_one"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
 msgid "_Manage Subscriptions"
 msgstr "_Manage Subscriptions"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
 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:1203
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
+#: ../modules/mail/e-mail-shell-view-actions.c:1241
 msgid "Send / _Receive"
 msgstr "Send / _Receive"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
 msgid "Send queued items and retrieve new items"
 msgstr "Send queued items and retrieve new items"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1210
-msgid "R_eceive all"
-msgstr "R_eceive all"
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
+msgid "R_eceive All"
+msgstr "R_eceive All"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "Receive new items from all accounts"
 msgstr "Receive new items from all accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
-msgid "_Send all"
-msgstr "_Send all"
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
+msgid "_Send All"
+msgstr "_Send All"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../modules/mail/e-mail-shell-view-actions.c:1236
 msgid "Send queued items in all accounts"
 msgstr "Send queued items in all accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
-#: ../widgets/misc/e-activity-proxy.c:314
+#: ../modules/mail/e-mail-shell-view-actions.c:1262
+#: ../widgets/misc/e-activity-proxy.c:306
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
 msgid "Cancel the current mail operation"
 msgstr "Cancel the current mail operation"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1252
+#: ../modules/mail/e-mail-shell-view-actions.c:1269
 msgid "Collapse All _Threads"
 msgstr "Collapse All _Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "Collapse all message threads"
 msgstr "Collapse all message threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1276
 msgid "E_xpand All Threads"
 msgstr "E_xpand All Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Expand all message threads"
 msgstr "Expand all message threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1283
 msgid "_Message Filters"
 msgstr "_Message Filters"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 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:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1290
 msgid "Search F_olders"
 msgstr "Search F_olders"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
 msgid "Create or edit search folder definitions"
 msgstr "Create or edit search folder definitions"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1297
 msgid "_Subscriptions..."
 msgstr "_Subscriptionsâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "F_older"
 msgstr "F_older"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "_Label"
 msgstr "_Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1353
 msgid "_New Folder..."
 msgstr "_New Folderâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1364
+#: ../modules/mail/e-mail-shell-view-actions.c:1381
 msgid "Show Message _Preview"
 msgstr "Show Message _Preview"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1366
+#: ../modules/mail/e-mail-shell-view-actions.c:1383
 msgid "Show message preview pane"
 msgstr "Show message preview pane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1372
+#: ../modules/mail/e-mail-shell-view-actions.c:1389
 msgid "Show _Deleted Messages"
 msgstr "Show _Deleted Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1374
+#: ../modules/mail/e-mail-shell-view-actions.c:1391
 msgid "Show deleted messages with a line through them"
 msgstr "Show deleted messages with a line through them"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1397
 msgid "_Group By Threads"
 msgstr "_Group By Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1382
+#: ../modules/mail/e-mail-shell-view-actions.c:1399
 msgid "Threaded message list"
 msgstr "Threaded message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1403
+#: ../modules/mail/e-mail-shell-view-actions.c:1420
 msgid "Show message preview below the message list"
 msgstr "Show message preview below the message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1410
+#: ../modules/mail/e-mail-shell-view-actions.c:1427
 msgid "Show message preview alongside the message list"
 msgstr "Show message preview alongside the message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1418
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
 msgid "All Messages"
 msgstr "All Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-shell-view-actions.c:1442
 msgid "Important Messages"
 msgstr "Important Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1432
+#: ../modules/mail/e-mail-shell-view-actions.c:1449
 msgid "Last 5 Days' Messages"
 msgstr "Last 5 Days' Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1439
+#: ../modules/mail/e-mail-shell-view-actions.c:1456
 msgid "Messages Not Junk"
 msgstr "Messages Not Junk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1446
+#: ../modules/mail/e-mail-shell-view-actions.c:1463
 msgid "Messages with Attachments"
 msgstr "Messages with Attachments"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#: ../modules/mail/e-mail-shell-view-actions.c:1470
 msgid "No Label"
 msgstr "No Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1460
+#: ../modules/mail/e-mail-shell-view-actions.c:1477
 msgid "Read Messages"
 msgstr "Read Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1467
+#: ../modules/mail/e-mail-shell-view-actions.c:1484
 msgid "Recent Messages"
 msgstr "Recent Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1474
+#: ../modules/mail/e-mail-shell-view-actions.c:1491
 msgid "Unread Messages"
 msgstr "Unread Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1526
+#: ../modules/mail/e-mail-shell-view-actions.c:1543
 msgid "Subject or Addresses contain"
 msgstr "Subject or Addresses contain"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1536
+#: ../modules/mail/e-mail-shell-view-actions.c:1553
 msgid "All Accounts"
 msgstr "All Accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1543
+#: ../modules/mail/e-mail-shell-view-actions.c:1560
 msgid "Current Account"
 msgstr "Current Account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1550
+#: ../modules/mail/e-mail-shell-view-actions.c:1567
 msgid "Current Folder"
 msgstr "Current Folder"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1030
+#: ../modules/mail/e-mail-shell-view-private.c:1049
 #, 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:1041
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 #, 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:1047
-#: ../modules/mail/e-mail-shell-view-private.c:1054
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1073
 #, 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:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1079
 #, 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:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1085
 #, 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:1072
+#: ../modules/mail/e-mail-shell-view-private.c:1091
 #, 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:1084
+#: ../modules/mail/e-mail-shell-view-private.c:1103
 #, 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:1087
+#: ../modules/mail/e-mail-shell-view-private.c:1106
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1451
+#: ../modules/mail/e-mail-shell-view-private.c:1126
+msgid "Trash"
+msgstr "Wastebasket"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1600
 msgid "Send / Receive"
 msgstr "Send / Receive"
 
-#: ../modules/mail/e-mail-shell-view.c:564
+#: ../modules/mail/e-mail-shell-view.c:563
 msgid "All Account Search"
 msgstr "All Account Search"
 
-#: ../modules/mail/e-mail-shell-view.c:747
+#: ../modules/mail/e-mail-shell-view.c:746
 msgid "Account Search"
 msgstr "Account Search"
 
-#: ../modules/mail/e-mail-shell-view.c:952
+#: ../modules/mail/e-mail-shell-view.c:951
 msgid "Proxy _Logout"
 msgstr "Proxy _Logout"
 
-#: ../modules/mail/em-account-prefs.c:219
+#: ../modules/mail/em-account-prefs.c:215
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistant"
 
-#: ../modules/mail/em-account-prefs.c:268
+#: ../modules/mail/em-account-prefs.c:264
 msgid "Account Editor"
 msgstr "Account Editor"
 
-#: ../modules/mail/em-composer-prefs.c:495
-#: ../modules/plugin-manager/evolution-plugin-manager.c:357
+#: ../modules/mail/em-composer-prefs.c:502
+#: ../modules/plugin-manager/evolution-plugin-manager.c:356
 #: ../plugins/publish-calendar/publish-calendar.c:831
-#: ../widgets/misc/e-account-tree-view.c:224
+#: ../widgets/misc/e-account-tree-view.c:220
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../modules/mail/em-composer-prefs.c:499
+#: ../modules/mail/em-composer-prefs.c:506
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:89
 msgid "Every time"
 msgstr "Every time"
 
-#: ../modules/mail/em-mailer-prefs.c:93
+#: ../modules/mail/em-mailer-prefs.c:90
 msgid "Once per day"
 msgstr "Once per day"
 
-#: ../modules/mail/em-mailer-prefs.c:94
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Once per week"
 msgstr "Once per week"
 
-#: ../modules/mail/em-mailer-prefs.c:95
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per month"
 msgstr "Once per month"
 
-#: ../modules/mail/em-mailer-prefs.c:177
+#: ../modules/mail/em-mailer-prefs.c:174
 msgid "Add Custom Junk Header"
 msgstr "Add Custom Junk Header"
 
-#: ../modules/mail/em-mailer-prefs.c:185
+#: ../modules/mail/em-mailer-prefs.c:182
 msgid "Header Name:"
 msgstr "Header Name:"
 
-#: ../modules/mail/em-mailer-prefs.c:186
+#: ../modules/mail/em-mailer-prefs.c:183
 msgid "Header Value Contains:"
 msgstr "Header Value Contains:"
 
-#: ../modules/mail/em-mailer-prefs.c:286
+#: ../modules/mail/em-mailer-prefs.c:283
 msgid "Header"
 msgstr "Header"
 
-#: ../modules/mail/em-mailer-prefs.c:290
+#: ../modules/mail/em-mailer-prefs.c:287
 msgid "Contains Value"
 msgstr "Contains Value"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:764
+#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:766
 #, 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:701 ../modules/mail/em-mailer-prefs.c:773
+#: ../modules/mail/em-mailer-prefs.c:701 ../modules/mail/em-mailer-prefs.c:775
 #, 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:737
+#: ../modules/mail/em-mailer-prefs.c:739
 msgid "No junk plugin available"
 msgstr "No junk plugin available"
 
 #. 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:1140
+#: ../modules/mail/em-mailer-prefs.c:1142
 msgid "_Date header:"
 msgstr "_Date header:"
 
-#: ../modules/mail/em-mailer-prefs.c:1141
+#: ../modules/mail/em-mailer-prefs.c:1143
 msgid "Show _original header value"
 msgstr "Show _original header value"
 
@@ -15706,7 +15799,7 @@ msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "Every time Evolution starts, check whether it is the default mailer."
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#: ../modules/mailto-handler/evolution-mailto-handler.c:143
 msgid "Do you want to make Evolution your default email client?"
 msgstr "Do you want to make Evolution your default e-mail client?"
 
@@ -15738,24 +15831,24 @@ msgstr "Author(s)"
 msgid "Plugin Manager"
 msgstr "Plugin Manager"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:267
+#: ../modules/plugin-manager/evolution-plugin-manager.c:266
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Note: Some changes will not take effect until restart"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:296
+#: ../modules/plugin-manager/evolution-plugin-manager.c:295
 msgid "Overview"
 msgstr "Overview"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:365
-#: ../modules/plugin-manager/evolution-plugin-manager.c:448
+#: ../modules/plugin-manager/evolution-plugin-manager.c:364
+#: ../modules/plugin-manager/evolution-plugin-manager.c:447
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+#: ../modules/plugin-manager/evolution-plugin-manager.c:485
 msgid "_Plugins"
 msgstr "_Plugins"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
 msgid "Enable and disable plugins"
 msgstr "Enable and disable plugins"
 
@@ -15775,39 +15868,39 @@ msgstr "Python Test Plugin"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "Test Plugin for Python EPlugin loader."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:276
-#: ../widgets/misc/e-import-assistant.c:399
+#: ../modules/startup-wizard/evolution-startup-wizard.c:277
+#: ../widgets/misc/e-import-assistant.c:392
 msgid "Please select the information that you would like to import:"
 msgstr "Please select the information that you would like to import:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:308
-#: ../widgets/misc/e-import-assistant.c:555
+#: ../modules/startup-wizard/evolution-startup-wizard.c:309
+#: ../widgets/misc/e-import-assistant.c:548
 #, c-format
 msgid "From %s:"
 msgstr "From %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:319
-#: ../modules/startup-wizard/evolution-startup-wizard.c:416
+#: ../modules/startup-wizard/evolution-startup-wizard.c:320
+#: ../modules/startup-wizard/evolution-startup-wizard.c:417
 msgid "Importing Files"
 msgstr "Importing Files"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:394
+#: ../modules/startup-wizard/evolution-startup-wizard.c:395
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "Import cancelled. Click \"Forward\" to continue."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:412
+#: ../modules/startup-wizard/evolution-startup-wizard.c:413
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "Import complete. Click \"Forward\" to continue."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:482
+#: ../modules/startup-wizard/evolution-startup-wizard.c:487
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Setup Assistant"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:488
+#: ../modules/startup-wizard/evolution-startup-wizard.c:493
 msgid "Welcome"
 msgstr "Welcome"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:493
+#: ../modules/startup-wizard/evolution-startup-wizard.c:498
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -15882,15 +15975,15 @@ msgid "Play audio attachments directly in mail messages."
 msgstr "Play audio attachments directly in mail messages."
 
 #: ../plugins/backup-restore/backup-restore.c:183
-msgid "Select name of the Evolution back up file"
+msgid "Select name of the Evolution backup file"
 msgstr "Select name of the Evolution backup file"
 
 #: ../plugins/backup-restore/backup-restore.c:216
-msgid "_Restart Evolution after back up"
+msgid "_Restart Evolution after backup"
 msgstr "_Restart Evolution after backup"
 
 #: ../plugins/backup-restore/backup-restore.c:242
-msgid "Select name of the Evolution back up file to restore"
+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:255
@@ -15899,16 +15992,16 @@ msgstr "_Restart Evolution after restore"
 
 #: ../plugins/backup-restore/backup-restore.c:323
 msgid ""
-"You can restore Evolution from your back up. It can restore all the Mails, "
+"You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 msgstr ""
-"You can restore Evolution from your backup. It can restore all the E-mails, "
-"Calendars, Tasks, Memos and Contacts. It also restores all your personal "
-"settings, mail filters, etc."
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 
 #: ../plugins/backup-restore/backup-restore.c:330
-msgid "_Restore Evolution from the back up file"
+msgid "_Restore Evolution from the backup file"
 msgstr "_Restore Evolution from the backup file"
 
 #: ../plugins/backup-restore/backup-restore.c:337
@@ -15920,7 +16013,7 @@ msgid "Choose a file to restore"
 msgstr "Choose a file to restore"
 
 #: ../plugins/backup-restore/backup-restore.c:348
-msgid "Restore from back up"
+msgid "Restore from backup"
 msgstr "Restore from backup"
 
 #: ../plugins/backup-restore/backup-restore.c:386
@@ -16020,23 +16113,23 @@ msgstr "Evolution Backup"
 msgid "Evolution Restore"
 msgstr "Evolution Restore"
 
-#: ../plugins/backup-restore/backup.c:746
+#: ../plugins/backup-restore/backup.c:743
 msgid "Backing up Evolution Data"
 msgstr "Backing up Evolution Data"
 
-#: ../plugins/backup-restore/backup.c:747
+#: ../plugins/backup-restore/backup.c:744
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Please wait while Evolution backs up your data."
 
-#: ../plugins/backup-restore/backup.c:749
+#: ../plugins/backup-restore/backup.c:746
 msgid "Restoring Evolution Data"
 msgstr "Restoring Evolution Data"
 
-#: ../plugins/backup-restore/backup.c:750
+#: ../plugins/backup-restore/backup.c:747
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Please wait while Evolution restores your data."
 
-#: ../plugins/backup-restore/backup.c:768
+#: ../plugins/backup-restore/backup.c:765
 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."
 
@@ -16207,15 +16300,15 @@ msgstr "Bogofilter Options"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Filter junk messages using Bogofilter."
 
-#: ../plugins/caldav/caldav-browse-server.c:197
+#: ../plugins/caldav/caldav-browse-server.c:204
 msgid "Authentication failed. Server requires correct login."
 msgstr "Authentication failed. Server requires correct login."
 
-#: ../plugins/caldav/caldav-browse-server.c:199
+#: ../plugins/caldav/caldav-browse-server.c:206
 msgid "Given URL cannot be found."
 msgstr "Given URL cannot be found."
 
-#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:210
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16224,107 +16317,117 @@ msgstr ""
 "Server returned unexpected data.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:333
-#: ../plugins/caldav/caldav-browse-server.c:584
+#: ../plugins/caldav/caldav-browse-server.c:340
+#: ../plugins/caldav/caldav-browse-server.c:664
 msgid "Failed to parse server response."
 msgstr "Failed to parse server response."
 
-#: ../plugins/caldav/caldav-browse-server.c:427
+#: ../plugins/caldav/caldav-browse-server.c:434
 msgid "Events"
 msgstr "Events"
 
-#: ../plugins/caldav/caldav-browse-server.c:449
+#: ../plugins/caldav/caldav-browse-server.c:456
 msgid "User's calendars"
 msgstr "User's calendars"
 
-#: ../plugins/caldav/caldav-browse-server.c:557
-#: ../plugins/caldav/caldav-browse-server.c:628
+#: ../plugins/caldav/caldav-browse-server.c:565
+#: ../plugins/caldav/caldav-browse-server.c:733
 msgid "Failed to get server URL."
 msgstr "Failed to get server URL."
 
-#: ../plugins/caldav/caldav-browse-server.c:626
-#: ../plugins/caldav/caldav-browse-server.c:667
-#: ../plugins/caldav/caldav-browse-server.c:1277
+#: ../plugins/caldav/caldav-browse-server.c:731
+#: ../plugins/caldav/caldav-browse-server.c:772
+#: ../plugins/caldav/caldav-browse-server.c:1431
 msgid "Searching for user's calendars..."
 msgstr "Searching for user's calendarsâ?¦"
 
-#: ../plugins/caldav/caldav-browse-server.c:665
+#: ../plugins/caldav/caldav-browse-server.c:770
 msgid "Could not find any user calendar."
 msgstr "Could not find any user calendar."
 
-#: ../plugins/caldav/caldav-browse-server.c:794
+#: ../plugins/caldav/caldav-browse-server.c:902
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "Previous attempt failed: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:796
+#: ../plugins/caldav/caldav-browse-server.c:904
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "Previous attempt failed with code %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:801
+#: ../plugins/caldav/caldav-browse-server.c:909
 #, c-format
 msgid "Enter password for user %s on server %s"
 msgstr "Enter password for user %s on server %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:860
+#: ../plugins/caldav/caldav-browse-server.c:968
 #, 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:1095
+#: ../plugins/caldav/caldav-browse-server.c:1214
 msgid "Searching folder content..."
 msgstr "Searching folder contentsâ?¦"
 
-#: ../plugins/caldav/caldav-browse-server.c:1138
+#: ../plugins/caldav/caldav-browse-server.c:1263
+#: ../plugins/caldav/caldav-source.c:256
+msgid "Server _handles meeting invitations"
+msgstr "Server _handles meeting invitations"
+
+#: ../plugins/caldav/caldav-browse-server.c:1270
 msgid "List of available calendars:"
 msgstr "List of available calendars:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1175
+#: ../plugins/caldav/caldav-browse-server.c:1308
 msgid "Supports"
 msgstr "Supports"
 
-#: ../plugins/caldav/caldav-browse-server.c:1254
+#: ../plugins/caldav/caldav-browse-server.c:1335
+#: ../plugins/caldav/caldav-source.c:254
+msgid "User e-_mail:"
+msgstr "User e-_mail:"
+
+#: ../plugins/caldav/caldav-browse-server.c:1407
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "Failed to create thread: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1362
+#: ../plugins/caldav/caldav-browse-server.c:1516
 #, 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:1368
+#: ../plugins/caldav/caldav-browse-server.c:1522
 msgid "Browse for a CalDAV calendar"
 msgstr "Browse for a CalDAV calendar"
 
-#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/caldav/caldav-source.c:235
 #: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:223
-#: ../plugins/google-account-setup/google-contacts-source.c:348
+#: ../plugins/caldav/caldav-source.c:242
+#: ../plugins/google-account-setup/google-contacts-source.c:349
 msgid "Use _SSL"
 msgstr "Use _SSL"
 
-#: ../plugins/caldav/caldav-source.c:225
-#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/caldav/caldav-source.c:244
+#: ../plugins/google-account-setup/google-contacts-source.c:327
 #: ../plugins/google-account-setup/google-source.c:638
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:268
 msgid "User_name:"
 msgstr "User_name:"
 
-#: ../plugins/caldav/caldav-source.c:235
+#: ../plugins/caldav/caldav-source.c:259
 msgid "Brows_e server for a calendar"
 msgstr "Brows_e server for a calendar"
 
-#: ../plugins/caldav/caldav-source.c:251
-#: ../plugins/calendar-file/calendar-file.c:194
+#: ../plugins/caldav/caldav-source.c:277
+#: ../plugins/calendar-file/calendar-file.c:191
 #: ../plugins/calendar-http/calendar-http.c:119
-#: ../plugins/calendar-weather/calendar-weather.c:398
-#: ../plugins/google-account-setup/google-contacts-source.c:366
+#: ../plugins/calendar-weather/calendar-weather.c:399
+#: ../plugins/google-account-setup/google-contacts-source.c:367
 #: ../plugins/google-account-setup/google-source.c:645
 msgid "Re_fresh:"
 msgstr "Re_fresh:"
@@ -16337,31 +16440,31 @@ msgstr "Add CalDAV support to Evolution."
 msgid "CalDAV Support"
 msgstr "CalDAV Support"
 
-#: ../plugins/calendar-file/calendar-file.c:128
+#: ../plugins/calendar-file/calendar-file.c:125
 msgid "_Customize options"
 msgstr "_Customise options"
 
-#: ../plugins/calendar-file/calendar-file.c:147
+#: ../plugins/calendar-file/calendar-file.c:144
 msgid "File _name:"
 msgstr "File _name:"
 
-#: ../plugins/calendar-file/calendar-file.c:151
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "Choose calendar file"
 msgstr "Choose calendar file"
 
-#: ../plugins/calendar-file/calendar-file.c:199
+#: ../plugins/calendar-file/calendar-file.c:196
 msgid "On open"
 msgstr "On open"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
 msgstr "On file change"
 
-#: ../plugins/calendar-file/calendar-file.c:201
+#: ../plugins/calendar-file/calendar-file.c:198
 msgid "Periodically"
 msgstr "Periodically"
 
-#: ../plugins/calendar-file/calendar-file.c:216
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "Force read _only"
 msgstr "Force read _only"
 
@@ -16389,62 +16492,62 @@ msgstr "Add web calendars to Evolution."
 msgid "Web Calendars"
 msgstr "Web Calendars"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Fog"
 msgstr "Weather: Fog"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Cloudy"
 msgstr "Weather: Cloudy"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Cloudy Night"
 msgstr "Weather: Cloudy Night"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Overcast"
 msgstr "Weather: Overcast"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Showers"
 msgstr "Weather: Showers"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Snow"
 msgstr "Weather: Snow"
 
-#: ../plugins/calendar-weather/calendar-weather.c:69
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Sunny"
 msgstr "Weather: Sunny"
 
-#: ../plugins/calendar-weather/calendar-weather.c:70
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Clear Night"
 msgstr "Weather: Clear Night"
 
-#: ../plugins/calendar-weather/calendar-weather.c:71
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Thunderstorms"
 msgstr "Weather: Thunderstorms"
 
-#: ../plugins/calendar-weather/calendar-weather.c:225
+#: ../plugins/calendar-weather/calendar-weather.c:226
 msgid "Select a location"
 msgstr "Select a location"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:331
-#: ../plugins/calendar-weather/calendar-weather.c:376
+#: ../plugins/calendar-weather/calendar-weather.c:332
+#: ../plugins/calendar-weather/calendar-weather.c:377
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "None"
 
-#: ../plugins/calendar-weather/calendar-weather.c:451
+#: ../plugins/calendar-weather/calendar-weather.c:452
 msgid "_Units:"
 msgstr "_Units:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:460
+#: ../plugins/calendar-weather/calendar-weather.c:461
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metric (Celsius, cm, etc)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:463
+#: ../plugins/calendar-weather/calendar-weather.c:464
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheit, inches, etc)"
 
@@ -16473,11 +16576,7 @@ msgstr "Add a map showing the location of contacts when possible."
 msgid "Map for contacts"
 msgstr "Map for contacts"
 
-#: ../plugins/dbx-import/dbx-importer.c:233
-msgid "Select folder to import OE folder into"
-msgstr "Select folder to import OE folder into"
-
-#: ../plugins/dbx-import/dbx-importer.c:252
+#: ../plugins/dbx-import/dbx-importer.c:273
 msgid "Importing Outlook Express data"
 msgstr "Importing Outlook Express data"
 
@@ -16535,52 +16634,52 @@ 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:319
+#: ../plugins/email-custom-header/email-custom-header.c:316
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Security:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../plugins/email-custom-header/email-custom-header.c:320
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Personal"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../plugins/email-custom-header/email-custom-header.c:321
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Unclassified"
 
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Protected"
 
-#: ../plugins/email-custom-header/email-custom-header.c:326
+#: ../plugins/email-custom-header/email-custom-header.c:323
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Confidential"
 
-#: ../plugins/email-custom-header/email-custom-header.c:327
+#: ../plugins/email-custom-header/email-custom-header.c:324
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Secret"
 
-#: ../plugins/email-custom-header/email-custom-header.c:328
+#: ../plugins/email-custom-header/email-custom-header.c:325
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Top secret"
 
-#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/email-custom-header/email-custom-header.c:382
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "None"
 
-#: ../plugins/email-custom-header/email-custom-header.c:586
+#: ../plugins/email-custom-header/email-custom-header.c:574
 msgid "_Custom Header"
 msgstr "_Custom Header"
 
 #. 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.c:845
+#: ../plugins/email-custom-header/email-custom-header.c:833
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16588,11 +16687,11 @@ 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:899
+#: ../plugins/email-custom-header/email-custom-header.c:887
 msgid "Key"
 msgstr "Key"
 
-#: ../plugins/email-custom-header/email-custom-header.c:915
+#: ../plugins/email-custom-header/email-custom-header.c:903
 #: ../plugins/templates/templates.c:417
 msgid "Values"
 msgstr "Values"
@@ -16615,7 +16714,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "Automatically launch editor when key is pressed in the mail composer"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:128
+#: ../plugins/external-editor/external-editor.c:125
 msgid "Automatically launch when a new mail is edited"
 msgstr "Automatically launch when a new mail is edited"
 
@@ -16627,11 +16726,11 @@ msgstr "Default External Editor"
 msgid "The default command that must be used as the editor."
 msgstr "The default command that must be used as the editor."
 
-#: ../plugins/external-editor/external-editor.c:117
+#: ../plugins/external-editor/external-editor.c:114
 msgid "Command to be executed to launch the editor: "
 msgstr "Command to be executed to launch the editor: "
 
-#: ../plugins/external-editor/external-editor.c:118
+#: ../plugins/external-editor/external-editor.c:115
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16639,8 +16738,8 @@ msgstr ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:384
-#: ../plugins/external-editor/external-editor.c:386
+#: ../plugins/external-editor/external-editor.c:381
+#: ../plugins/external-editor/external-editor.c:383
 msgid "Compose in External Editor"
 msgstr "Compose in External Editor"
 
@@ -16701,22 +16800,22 @@ msgstr ""
 "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)"
+msgid "Select a Face Picture"
+msgstr "Select a Face Picture"
 
 #: ../plugins/face/face.c:296
 msgid "Image files"
 msgstr "Image files"
 
-#: ../plugins/face/face.c:355
+#: ../plugins/face/face.c:352
 msgid "_Insert Face picture by default"
 msgstr "_Insert Face picture by default"
 
-#: ../plugins/face/face.c:366
+#: ../plugins/face/face.c:363
 msgid "Load new _Face picture"
 msgstr "Load new _Face picture"
 
-#: ../plugins/face/face.c:422
+#: ../plugins/face/face.c:420
 msgid "Include _Face"
 msgstr "Include _Face"
 
@@ -16748,8 +16847,8 @@ msgstr "The file cannot be read"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "The file you selected does not look like a valid PNG image. Error: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:314
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+#: ../plugins/google-account-setup/google-contacts-source.c:315
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:244
 msgid "Server"
 msgstr "Server"
 
@@ -16768,8 +16867,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:549
-#: ../plugins/mail-to-task/mail-to-task.c:736
-#: ../plugins/mail-to-task/mail-to-task.c:955
+#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:956
 msgid "Unknown error."
 msgstr "Unknown error."
 
@@ -16789,10 +16888,20 @@ msgstr "Add Google Calendars to Evolution."
 msgid "Google Calendars"
 msgstr "Google Calendars"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
+#: ../plugins/groupwise-features/camel-gw-listener.c:453
 msgid "Checklist"
 msgstr "Checklist"
 
+#. Translators: First %s is the server name, second %s is user name
+#: ../plugins/groupwise-features/camel-gw-listener.c:513
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Enter password for %s (user %s)"
+
+#: ../plugins/groupwise-features/camel-gw-listener.c:533
+msgid "Failed to authenticate.\n"
+msgstr "Failed to authenticate.\n"
+
 #: ../plugins/groupwise-features/gw-ui.c:112
 msgid "New _Shared Folder..."
 msgstr "New _Shared Folderâ?¦"
@@ -17104,7 +17213,7 @@ msgid "Proxy"
 msgstr "Proxy"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:243
+#: ../widgets/misc/e-account-tree-view.c:239
 msgid "Account Name"
 msgstr "Account Name"
 
@@ -17137,7 +17246,7 @@ msgid "Proxy"
 msgstr "Proxy"
 
 #: ../plugins/groupwise-features/proxy.c:935
-#: ../plugins/groupwise-features/share-folder.c:692
+#: ../plugins/groupwise-features/share-folder.c:694
 msgid "Add User"
 msgstr "Add User"
 
@@ -17146,7 +17255,7 @@ msgid "Advanced send options"
 msgstr "Advanced send options"
 
 #: ../plugins/groupwise-features/share-folder-common.c:316
-#: ../plugins/groupwise-features/share-folder.c:727
+#: ../plugins/groupwise-features/share-folder.c:729
 msgid "Users"
 msgstr "Users"
 
@@ -17158,15 +17267,15 @@ msgstr "Enter the users and set permissions"
 msgid "Sharing"
 msgstr "Sharing"
 
-#: ../plugins/groupwise-features/share-folder.c:530
+#: ../plugins/groupwise-features/share-folder.c:532
 msgid "Custom Notification"
 msgstr "Custom Notification"
 
-#: ../plugins/groupwise-features/share-folder.c:732
+#: ../plugins/groupwise-features/share-folder.c:734
 msgid "Add   "
 msgstr "Add   "
 
-#: ../plugins/groupwise-features/share-folder.c:738
+#: ../plugins/groupwise-features/share-folder.c:740
 msgid "Modify"
 msgstr "Modify"
 
@@ -18063,7 +18172,7 @@ msgstr "Whether show message over the icon when new messages arrive."
 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:390
+#: ../plugins/mail-notification/mail-notification.c:398
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18080,64 +18189,64 @@ msgstr[1] ""
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:402
+#: ../plugins/mail-notification/mail-notification.c:410
 #, c-format
 msgid "From: %s"
 msgstr "From: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:415
+#: ../plugins/mail-notification/mail-notification.c:423
 #, c-format
 msgid "Subject: %s"
 msgstr "Subject: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:425
+#: ../plugins/mail-notification/mail-notification.c:433
 #, 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:438
 #: ../plugins/mail-notification/mail-notification.c:446
-#: ../plugins/mail-notification/mail-notification.c:449
+#: ../plugins/mail-notification/mail-notification.c:454
+#: ../plugins/mail-notification/mail-notification.c:457
 msgid "New email"
 msgstr "New e-mail"
 
-#: ../plugins/mail-notification/mail-notification.c:498
+#: ../plugins/mail-notification/mail-notification.c:506
 msgid "Show icon in _notification area"
 msgstr "Show icon in _notification area"
 
-#: ../plugins/mail-notification/mail-notification.c:528
+#: ../plugins/mail-notification/mail-notification.c:536
 msgid "Popup _message together with the icon"
 msgstr "Popup _message together with the icon"
 
-#: ../plugins/mail-notification/mail-notification.c:715
+#: ../plugins/mail-notification/mail-notification.c:723
 msgid "_Play sound when new messages arrive"
 msgstr "_Play sound when new messages arrive"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:753
 msgid "_Beep"
 msgstr "_Beep"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:766
 msgid "Use sound _theme"
 msgstr "Use sound _theme"
 
-#: ../plugins/mail-notification/mail-notification.c:777
+#: ../plugins/mail-notification/mail-notification.c:785
 msgid "Play _file:"
 msgstr "Play _file:"
 
-#: ../plugins/mail-notification/mail-notification.c:788
+#: ../plugins/mail-notification/mail-notification.c:796
 msgid "Select sound file"
 msgstr "Select sound file"
 
-#: ../plugins/mail-notification/mail-notification.c:846
+#: ../plugins/mail-notification/mail-notification.c:854
 msgid "Notify new messages for _Inbox only"
 msgstr "Notify new messages for _Inbox only"
 
-#: ../plugins/mail-notification/mail-notification.c:855
+#: ../plugins/mail-notification/mail-notification.c:863
 msgid "Generate a _D-Bus message"
 msgstr "Generate a _D-Bus message"
 
@@ -18155,7 +18264,7 @@ msgstr "Notifies you when new mail messages arrive."
 msgid "Created from a mail by %s"
 msgstr "Created from a mail by %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:489
+#: ../plugins/mail-to-task/mail-to-task.c:490
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18164,7 +18273,7 @@ msgstr ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:492
+#: ../plugins/mail-to-task/mail-to-task.c:493
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18173,7 +18282,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:495
+#: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18185,7 +18294,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:515
+#: ../plugins/mail-to-task/mail-to-task.c:516
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18196,7 +18305,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:521
+#: ../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?"
@@ -18207,7 +18316,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:527
+#: ../plugins/mail-to-task/mail-to-task.c:528
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18218,7 +18327,7 @@ msgstr ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:549
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18235,7 +18344,7 @@ msgstr[1] ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:557
+#: ../plugins/mail-to-task/mail-to-task.c:558
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18252,7 +18361,7 @@ msgstr[1] ""
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:566
+#: ../plugins/mail-to-task/mail-to-task.c:567
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18266,25 +18375,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:625
+#: ../plugins/mail-to-task/mail-to-task.c:626
 msgid "[No Summary]"
 msgstr "[No Summary]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:636
+#: ../plugins/mail-to-task/mail-to-task.c:637
 msgid "Invalid object returned from a server"
 msgstr "Invalid object returned from a server"
 
-#: ../plugins/mail-to-task/mail-to-task.c:707
+#: ../plugins/mail-to-task/mail-to-task.c:708
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "An error occurred during processing: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:737
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Cannot open calendar. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:743
+#: ../plugins/mail-to-task/mail-to-task.c:744
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18292,7 +18401,7 @@ msgstr ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:746
+#: ../plugins/mail-to-task/mail-to-task.c:747
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18300,7 +18409,7 @@ msgstr ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:749
+#: ../plugins/mail-to-task/mail-to-task.c:750
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18308,40 +18417,40 @@ msgstr ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:955
+#: ../plugins/mail-to-task/mail-to-task.c:956
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Cannot get source list. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1075
 msgid "Create an _Event"
 msgstr "Create an _Event"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 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:1081
+#: ../plugins/mail-to-task/mail-to-task.c:1082
 msgid "Create a Mem_o"
 msgstr "Create a Mem_o"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1083
+#: ../plugins/mail-to-task/mail-to-task.c:1084
 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:1088
+#: ../plugins/mail-to-task/mail-to-task.c:1089
 msgid "Create a _Task"
 msgstr "Create a _Task"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1090
+#: ../plugins/mail-to-task/mail-to-task.c:1091
 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:1098
+#: ../plugins/mail-to-task/mail-to-task.c:1099
 msgid "Create a _Meeting"
 msgstr "Create a _Meeting"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1100
+#: ../plugins/mail-to-task/mail-to-task.c:1101
 msgid "Create a new meeting from the selected message"
 msgstr "Create a new meeting from the selected message"
 
@@ -18501,15 +18610,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:196
+#: ../plugins/mark-all-read/mark-all-read.c:193
 msgid "In Current Folder and _Subfolders"
 msgstr "In Current Folder and _Subfolders"
 
-#: ../plugins/mark-all-read/mark-all-read.c:210
+#: ../plugins/mark-all-read/mark-all-read.c:207
 msgid "In Current _Folder Only"
 msgstr "In Current _Folder Only"
 
-#: ../plugins/mark-all-read/mark-all-read.c:447
+#: ../plugins/mark-all-read/mark-all-read.c:444
 msgid "Mark Me_ssages as Read"
 msgstr "Mark Me_ssages as Read"
 
@@ -18534,19 +18643,19 @@ 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:225
+#: ../plugins/prefer-plain/prefer-plain.c:241
 msgid "Show HTML if present"
 msgstr "Show HTML if present"
 
-#: ../plugins/prefer-plain/prefer-plain.c:225
+#: ../plugins/prefer-plain/prefer-plain.c:241
 msgid "Let Evolution choose the best part to show."
 msgstr "Let Evolution choose the best part to show."
 
-#: ../plugins/prefer-plain/prefer-plain.c:226
+#: ../plugins/prefer-plain/prefer-plain.c:242
 msgid "Show plain text if present"
 msgstr "Show plain text if present"
 
-#: ../plugins/prefer-plain/prefer-plain.c:226
+#: ../plugins/prefer-plain/prefer-plain.c:242
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -18554,11 +18663,11 @@ msgstr ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 
-#: ../plugins/prefer-plain/prefer-plain.c:227
+#: ../plugins/prefer-plain/prefer-plain.c:243
 msgid "Only ever show plain text"
 msgstr "Only ever show plain text"
 
-#: ../plugins/prefer-plain/prefer-plain.c:227
+#: ../plugins/prefer-plain/prefer-plain.c:243
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -18566,11 +18675,11 @@ msgstr ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 
-#: ../plugins/prefer-plain/prefer-plain.c:274
+#: ../plugins/prefer-plain/prefer-plain.c:290
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Show s_uppressed HTML parts as attachments"
 
-#: ../plugins/prefer-plain/prefer-plain.c:294
+#: ../plugins/prefer-plain/prefer-plain.c:310
 msgid "HTML _Mode"
 msgstr "HTML _Mode"
 
@@ -18594,35 +18703,35 @@ msgstr "Outlook PST import"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook personal folders (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:311
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "_Mail"
 msgstr "_Mail"
 
-#: ../plugins/pst-import/pst-importer.c:323
+#: ../plugins/pst-import/pst-importer.c:325
 msgid "Destination folder:"
 msgstr "Destination folder:"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:329
+#: ../plugins/pst-import/pst-importer.c:331
 msgid "_Address Book"
 msgstr "_Address Book"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:338
 msgid "A_ppointments"
 msgstr "A_ppointments"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:342 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:344 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tasks"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:348
+#: ../plugins/pst-import/pst-importer.c:350
 msgid "_Journal entries"
 msgstr "_Journal entries"
 
-#: ../plugins/pst-import/pst-importer.c:363
+#: ../plugins/pst-import/pst-importer.c:365
 msgid "Importing Outlook data"
 msgstr "Importing Outlook data"
 
@@ -18679,11 +18788,11 @@ msgstr "Are you sure you want to remove this location?"
 #. 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:1055
+#: ../plugins/publish-calendar/publish-calendar.c:1057
 msgid "Could not create publish thread."
 msgstr "Could not create publish thread."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1063
+#: ../plugins/publish-calendar/publish-calendar.c:1065
 msgid "_Publish Calendar Information"
 msgstr "_Publish Calendar Information"
 
@@ -18781,11 +18890,11 @@ msgstr "iCal"
 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:484
 msgid "New Location"
 msgstr "New Location"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:483
+#: ../plugins/publish-calendar/url-editor-dialog.c:486
 msgid "Edit Location"
 msgstr "Edit Location"
 
@@ -18825,11 +18934,11 @@ msgstr "Pipe to SpamAssassin failed, error code: %d"
 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:940
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
 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:948
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:944
 msgid "I_nclude remote tests"
 msgstr "I_nclude remote tests"
 
@@ -18982,15 +19091,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Drafts-based template plugin"
 
-#: ../plugins/templates/templates.c:626
+#: ../plugins/templates/templates.c:635
 msgid "No Title"
 msgstr "No Title"
 
-#: ../plugins/templates/templates.c:736
+#: ../plugins/templates/templates.c:746
 msgid "Save as _Template"
 msgstr "Save as _Template"
 
-#: ../plugins/templates/templates.c:738
+#: ../plugins/templates/templates.c:748
 msgid "Save as Template"
 msgstr "Save as Template"
 
@@ -19010,27 +19119,27 @@ msgstr "Inline vCards"
 msgid "Show vCards directly in mail messages."
 msgstr "Show vCards directly in mail messages."
 
-#: ../plugins/vcard-inline/vcard-inline.c:182
-#: ../plugins/vcard-inline/vcard-inline.c:267
+#: ../plugins/vcard-inline/vcard-inline.c:198
+#: ../plugins/vcard-inline/vcard-inline.c:283
 msgid "Show Full vCard"
 msgstr "Show Full vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:185
+#: ../plugins/vcard-inline/vcard-inline.c:201
 msgid "Show Compact vCard"
 msgstr "Show Compact vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:246
+#: ../plugins/vcard-inline/vcard-inline.c:262
 msgid "There is one other contact."
 msgstr "There is one other contact."
 
-#: ../plugins/vcard-inline/vcard-inline.c:255
+#: ../plugins/vcard-inline/vcard-inline.c:271
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "There is %d other contact."
 msgstr[1] "There are %d other contacts."
 
-#: ../plugins/vcard-inline/vcard-inline.c:276
+#: ../plugins/vcard-inline/vcard-inline.c:292
 msgid "Save in Address Book"
 msgstr "Save in Address Book"
 
@@ -19046,11 +19155,11 @@ msgstr "WebDAV contacts"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:256
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:282
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Avoid IfMatch (needed on Apache < 2.2.8)"
 
@@ -19214,7 +19323,7 @@ msgstr "Sidebar is visible"
 msgid "Skip development warning dialog"
 msgstr "Skip development warning dialogue"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:342
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:371
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
@@ -19371,11 +19480,11 @@ msgstr "Window button style"
 msgid "Window buttons are visible"
 msgstr "Window buttons are visible"
 
-#: ../shell/e-shell-content.c:671 ../shell/e-shell-content.c:672
+#: ../shell/e-shell-content.c:695 ../shell/e-shell-content.c:696
 msgid "Searches"
 msgstr "Searches"
 
-#: ../shell/e-shell-content.c:714
+#: ../shell/e-shell-content.c:738
 msgid "Save Search"
 msgstr "Save Search"
 
@@ -19383,19 +19492,19 @@ msgstr "Save Search"
 #. * 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-searchbar.c:938
+#: ../shell/e-shell-searchbar.c:935
 msgid "Sho_w:"
 msgstr "Sho_w:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:971
+#: ../shell/e-shell-searchbar.c:968
 msgid "Sear_ch:"
 msgstr "Sear_ch:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1034
+#: ../shell/e-shell-searchbar.c:1031
 msgid "i_n"
 msgstr "i_n"
 
@@ -19411,7 +19520,7 @@ msgstr "iCalendar (.ics)"
 msgid "All Files (*)"
 msgstr "All Files (*)"
 
-#: ../shell/e-shell-view.c:297
+#: ../shell/e-shell-view.c:291
 msgid "Saving user interface state"
 msgstr "Saving user interface state"
 
@@ -19430,266 +19539,262 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Evolution Website"
 
-#: ../shell/e-shell-window-actions.c:1216
+#: ../shell/e-shell-window-actions.c:1215
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy is not installed."
 
-#: ../shell/e-shell-window-actions.c:1218
+#: ../shell/e-shell-window-actions.c:1217
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy could not be run."
 
-#: ../shell/e-shell-window-actions.c:1399
+#: ../shell/e-shell-window-actions.c:1398
 msgid "Show information about Evolution"
 msgstr "Show information about Evolution"
 
-#: ../shell/e-shell-window-actions.c:1404
-#: ../shell/e-shell-window-actions.c:1418
+#: ../shell/e-shell-window-actions.c:1403
+#: ../shell/e-shell-window-actions.c:1417
 msgid "_Close Window"
 msgstr "_Close Window"
 
-#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1424
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1426
 msgid "Open the Evolution User Guide"
 msgstr "Open the Evolution User Guide"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1452
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ../shell/e-shell-window-actions.c:1455
+#: ../shell/e-shell-window-actions.c:1454
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Open the Frequently Asked Questions webpage"
 
-#: ../shell/e-shell-window-actions.c:1460
+#: ../shell/e-shell-window-actions.c:1459
 msgid "_Forget Passwords"
 msgstr "_Forget Passwords"
 
-#: ../shell/e-shell-window-actions.c:1462
+#: ../shell/e-shell-window-actions.c:1461
 msgid "Forget all remembered passwords"
 msgstr "Forget all remembered passwords"
 
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:1466
 msgid "I_mport..."
 msgstr "I_mportâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1469
+#: ../shell/e-shell-window-actions.c:1468
 msgid "Import data from other programs"
 msgstr "Import data from other programs"
 
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1473
 msgid "New _Window"
 msgstr "New _Window"
 
-#: ../shell/e-shell-window-actions.c:1476
+#: ../shell/e-shell-window-actions.c:1475
 msgid "Create a new window displaying this view"
 msgstr "Create a new window displaying this view"
 
-#: ../shell/e-shell-window-actions.c:1490
-msgid "Configure Evolution"
-msgstr "Configure Evolution"
-
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1494
 msgid "_Quick Reference"
 msgstr "_Quick Reference"
 
-#: ../shell/e-shell-window-actions.c:1497
+#: ../shell/e-shell-window-actions.c:1496
 msgid "Show Evolution's shortcut keys"
 msgstr "Show Evolution's shortcut keys"
 
-#: ../shell/e-shell-window-actions.c:1504
+#: ../shell/e-shell-window-actions.c:1503
 msgid "Exit the program"
 msgstr "Exit the program"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1508
 msgid "_Advanced Search..."
 msgstr "_Advanced Searchâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1511
+#: ../shell/e-shell-window-actions.c:1510
 msgid "Construct a more advanced search"
 msgstr "Construct a more advanced search"
 
-#: ../shell/e-shell-window-actions.c:1518
+#: ../shell/e-shell-window-actions.c:1517
 msgid "Clear the current search parameters"
 msgstr "Clear the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1522
 msgid "_Edit Saved Searches..."
 msgstr "_Edit Saved Searchesâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1525
+#: ../shell/e-shell-window-actions.c:1524
 msgid "Manage your saved searches"
 msgstr "Manage your saved searches"
 
-#: ../shell/e-shell-window-actions.c:1532
+#: ../shell/e-shell-window-actions.c:1531
 msgid "Click here to change the search type"
 msgstr "Click here to change the search type"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1536
 msgid "_Find Now"
 msgstr "_Find Now"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1539
+#: ../shell/e-shell-window-actions.c:1538
 msgid "Execute the current search parameters"
 msgstr "Execute the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1543
 msgid "_Save Search..."
 msgstr "_Save Searchâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1546
+#: ../shell/e-shell-window-actions.c:1545
 msgid "Save the current search parameters"
 msgstr "Save the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1557
 msgid "Submit _Bug Report..."
 msgstr "Submit _Bug Reportâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1560
+#: ../shell/e-shell-window-actions.c:1559
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Submit a bug report using Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1564
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: ../shell/e-shell-window-actions.c:1567
+#: ../shell/e-shell-window-actions.c:1566
 msgid "Put Evolution into offline mode"
 msgstr "Put Evolution into offline mode"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1571
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: ../shell/e-shell-window-actions.c:1574
+#: ../shell/e-shell-window-actions.c:1573
 msgid "Put Evolution into online mode"
 msgstr "Put Evolution into online mode"
 
-#: ../shell/e-shell-window-actions.c:1602
+#: ../shell/e-shell-window-actions.c:1601
 msgid "Lay_out"
 msgstr "Lay_out"
 
-#: ../shell/e-shell-window-actions.c:1609
+#: ../shell/e-shell-window-actions.c:1608
 msgid "_New"
 msgstr "_New"
 
-#: ../shell/e-shell-window-actions.c:1616
+#: ../shell/e-shell-window-actions.c:1615
 msgid "_Search"
 msgstr "_Search"
 
-#: ../shell/e-shell-window-actions.c:1623
+#: ../shell/e-shell-window-actions.c:1622
 msgid "_Switcher Appearance"
 msgstr "_Switcher Appearance"
 
-#: ../shell/e-shell-window-actions.c:1637
+#: ../shell/e-shell-window-actions.c:1636
 msgid "_Window"
 msgstr "_Window"
 
-#: ../shell/e-shell-window-actions.c:1666
+#: ../shell/e-shell-window-actions.c:1665
 msgid "Show Side _Bar"
 msgstr "Show Side _Bar"
 
-#: ../shell/e-shell-window-actions.c:1668
+#: ../shell/e-shell-window-actions.c:1667
 msgid "Show the side bar"
 msgstr "Show the side bar"
 
-#: ../shell/e-shell-window-actions.c:1674
+#: ../shell/e-shell-window-actions.c:1673
 msgid "Show _Buttons"
 msgstr "Show _Buttons"
 
-#: ../shell/e-shell-window-actions.c:1676
+#: ../shell/e-shell-window-actions.c:1675
 msgid "Show the switcher buttons"
 msgstr "Show the switcher buttons"
 
-#: ../shell/e-shell-window-actions.c:1682
+#: ../shell/e-shell-window-actions.c:1681
 msgid "Show _Status Bar"
 msgstr "Show _Status Bar"
 
-#: ../shell/e-shell-window-actions.c:1684
+#: ../shell/e-shell-window-actions.c:1683
 msgid "Show the status bar"
 msgstr "Show the status bar"
 
-#: ../shell/e-shell-window-actions.c:1690
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show _Tool Bar"
 msgstr "Show _Tool Bar"
 
-#: ../shell/e-shell-window-actions.c:1692
+#: ../shell/e-shell-window-actions.c:1691
 msgid "Show the tool bar"
 msgstr "Show the tool bar"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1713
 msgid "_Icons Only"
 msgstr "_Icons Only"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1715
 msgid "Display window buttons with icons only"
 msgstr "Display window buttons with icons only"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1720
 msgid "_Text Only"
 msgstr "_Text Only"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1722
 msgid "Display window buttons with text only"
 msgstr "Display window buttons with text only"
 
-#: ../shell/e-shell-window-actions.c:1728
+#: ../shell/e-shell-window-actions.c:1727
 msgid "Icons _and Text"
 msgstr "Icons _and Text"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1729
 msgid "Display window buttons with icons and text"
 msgstr "Display window buttons with icons and text"
 
-#: ../shell/e-shell-window-actions.c:1735
+#: ../shell/e-shell-window-actions.c:1734
 msgid "Tool_bar Style"
 msgstr "Tool_bar Style"
 
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1736
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Display window buttons using the desktop toolbar setting"
 
-#: ../shell/e-shell-window-actions.c:1745
+#: ../shell/e-shell-window-actions.c:1744
 msgid "Define Views..."
 msgstr "Define Viewsâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1746
 msgid "Create or edit views"
 msgstr "Create or edit views"
 
-#: ../shell/e-shell-window-actions.c:1752
+#: ../shell/e-shell-window-actions.c:1751
 msgid "Save Custom View..."
 msgstr "Save Custom Viewâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1753
 msgid "Save current custom view"
 msgstr "Save current custom view"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1760
 msgid "C_urrent View"
 msgstr "C_urrent View"
 
-#: ../shell/e-shell-window-actions.c:1771
+#: ../shell/e-shell-window-actions.c:1770
 msgid "Custom View"
 msgstr "Custom View"
 
-#: ../shell/e-shell-window-actions.c:1773
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Current view is a customized view"
 msgstr "Current view is a customised view"
 
-#: ../shell/e-shell-window-actions.c:1783
+#: ../shell/e-shell-window-actions.c:1782
 msgid "Change the page settings for your current printer"
 msgstr "Change the page settings for your current printer"
 
-#: ../shell/e-shell-window-actions.c:2168
+#: ../shell/e-shell-window-actions.c:2167
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"
 
-#: ../shell/e-shell-window-actions.c:2381
+#: ../shell/e-shell-window-actions.c:2382
 msgid "Execute these search parameters"
 msgstr "Execute these search parameters"
 
@@ -19699,24 +19804,24 @@ msgstr "Execute these search parameters"
 msgid "%s - Evolution"
 msgstr "%s â?? Evolution"
 
-#: ../shell/e-shell-window.c:431
+#: ../shell/e-shell-window.c:438
 msgid "New"
 msgstr "New"
 
-#: ../shell/e-shell.c:247
+#: ../shell/e-shell.c:257
 msgid "Preparing to go offline..."
 msgstr "Preparing to go offlineâ?¦"
 
-#: ../shell/e-shell.c:300
+#: ../shell/e-shell.c:310
 msgid "Preparing to go online..."
 msgstr "Preparing to go onlineâ?¦"
 
-#: ../shell/e-shell.c:362
+#: ../shell/e-shell.c:372
 msgid "Preparing to quit..."
 msgstr "Preparing to quitâ?¦"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:191
+#: ../shell/main.c:188
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19751,7 +19856,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: ../shell/main.c:215
+#: ../shell/main.c:212
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19759,59 +19864,65 @@ msgstr ""
 "Thanks\n"
 "The Evolution Team\n"
 
-#: ../shell/main.c:222
+#: ../shell/main.c:219
 msgid "Do not tell me again"
 msgstr "Do not tell me again"
 
-#: ../shell/main.c:338
-msgid "Start Evolution activating the specified component"
-msgstr "Start Evolution activating the specified component"
+#. Translators: Do NOT translate the five component
+#. * names, they MUST remain in English!
+#: ../shell/main.c:365
+msgid ""
+"Start Evolution showing the specified component. Available options are "
+"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+msgstr ""
+"Start Evolution showing the specified component. Available options are "
+"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 
-#: ../shell/main.c:340
+#: ../shell/main.c:369
 msgid "Apply the given geometry to the main window"
 msgstr "Apply the given geometry to the main window"
 
-#: ../shell/main.c:344
+#: ../shell/main.c:373
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: ../shell/main.c:346
+#: ../shell/main.c:375
 msgid "Ignore network availability"
 msgstr "Ignore network availability"
 
-#: ../shell/main.c:348
+#: ../shell/main.c:377
 msgid "Start in \"express\" mode"
 msgstr "Start in \"express\" mode"
 
-#: ../shell/main.c:351
+#: ../shell/main.c:380
 msgid "Forcibly shut down Evolution"
 msgstr "Forcibly shut down Evolution"
 
-#: ../shell/main.c:354
+#: ../shell/main.c:383
 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:356
+#: ../shell/main.c:385
 msgid "Disable loading of any plugins."
 msgstr "Disable loading of any plugins."
 
-#: ../shell/main.c:358
+#: ../shell/main.c:387
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Disable preview pane of Mail, Contacts and Tasks."
 
-#: ../shell/main.c:362
+#: ../shell/main.c:391
 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:364
+#: ../shell/main.c:393
 msgid "Request a running Evolution process to quit"
 msgstr "Request a running Evolution process to quit"
 
-#: ../shell/main.c:517 ../shell/main.c:525
+#: ../shell/main.c:557 ../shell/main.c:565
 msgid "- The Evolution PIM and Email Client"
 msgstr "- The Evolution PIM and E-mail Client"
 
-#: ../shell/main.c:591
+#: ../shell/main.c:627
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19820,7 +19931,7 @@ msgstr ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 
-#: ../shell/main.c:597
+#: ../shell/main.c:633
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19885,21 +19996,21 @@ msgstr ""
 "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
+#: ../shell/test/e-test-shell-backend.c:56
 msgctxt "New"
 msgid "_Test Item"
 msgstr "_Test Item"
 
-#: ../shell/test/e-test-shell-backend.c:62
+#: ../shell/test/e-test-shell-backend.c:58
 msgid "Create a new test item"
 msgstr "Create a new test item"
 
-#: ../shell/test/e-test-shell-backend.c:70
+#: ../shell/test/e-test-shell-backend.c:66
 msgctxt "New"
 msgid "Test _Source"
 msgstr "Test _Source"
 
-#: ../shell/test/e-test-shell-backend.c:72
+#: ../shell/test/e-test-shell-backend.c:68
 msgid "Create a new test source"
 msgstr "Create a new test source"
 
@@ -19938,31 +20049,31 @@ msgstr "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgid "Not a launchable item"
 msgstr "Not a launchable item"
 
-#: ../smclient/eggsmclient.c:227
+#: ../smclient/eggsmclient.c:224
 msgid "Disable connection to session manager"
 msgstr "Disable connection to session manager"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:227
 msgid "Specify file containing saved configuration"
 msgstr "Specify file containing saved configuration"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:227
 msgid "FILE"
 msgstr "FILE"
 
-#: ../smclient/eggsmclient.c:233
+#: ../smclient/eggsmclient.c:230
 msgid "Specify session management ID"
 msgstr "Specify session management ID"
 
-#: ../smclient/eggsmclient.c:233
+#: ../smclient/eggsmclient.c:230
 msgid "ID"
 msgstr "ID"
 
-#: ../smclient/eggsmclient.c:254
+#: ../smclient/eggsmclient.c:251
 msgid "Session management options:"
 msgstr "Session management options:"
 
-#: ../smclient/eggsmclient.c:255
+#: ../smclient/eggsmclient.c:252
 msgid "Show session management options"
 msgstr "Show session management options"
 
@@ -20586,11 +20697,11 @@ msgstr "Define Views"
 msgid "Define Views for \"%s\""
 msgstr "Define Views for \"%s\""
 
-#: ../widgets/menus/gal-view-factory-etable.c:113
+#: ../widgets/menus/gal-view-factory-etable.c:109
 msgid "Table"
 msgstr "Table"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:273
 msgid "Save Current View"
 msgstr "Save Current View"
 
@@ -20618,36 +20729,36 @@ msgstr "Type of View"
 msgid "Type of view:"
 msgstr "Type of view:"
 
-#: ../widgets/misc/e-account-manager.c:355
+#: ../widgets/misc/e-account-manager.c:349
 msgid "De_fault"
 msgstr "De_fault"
 
-#: ../widgets/misc/e-account-tree-view.c:274
+#: ../widgets/misc/e-account-tree-view.c:270
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../widgets/misc/e-attachment-dialog.c:307
+#: ../widgets/misc/e-attachment-dialog.c:304
 msgid "Attachment Properties"
 msgstr "Attachment Properties"
 
-#: ../widgets/misc/e-attachment-dialog.c:332
+#: ../widgets/misc/e-attachment-dialog.c:326
 msgid "_Filename:"
 msgstr "_Filename:"
 
-#: ../widgets/misc/e-attachment-dialog.c:367
+#: ../widgets/misc/e-attachment-dialog.c:361
 msgid "MIME Type:"
 msgstr "MIME Type:"
 
-#: ../widgets/misc/e-attachment-dialog.c:375
-#: ../widgets/misc/e-attachment-store.c:530
+#: ../widgets/misc/e-attachment-dialog.c:369
+#: ../widgets/misc/e-attachment-store.c:556
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggest automatic display of attachment"
 
-#: ../widgets/misc/e-attachment-handler-image.c:100
+#: ../widgets/misc/e-attachment-handler-image.c:96
 msgid "Could not set as background"
 msgstr "Could not set as background"
 
-#: ../widgets/misc/e-attachment-handler-image.c:152
+#: ../widgets/misc/e-attachment-handler-image.c:148
 msgid "Set as _Background"
 msgstr "Set as _Background"
 
@@ -20665,75 +20776,75 @@ msgstr "_Send Toâ?¦"
 msgid "Send the selected attachments somewhere"
 msgstr "Send the selected attachments somewhere"
 
-#: ../widgets/misc/e-attachment-icon-view.c:506
-#: ../widgets/misc/e-attachment-tree-view.c:545
+#: ../widgets/misc/e-attachment-icon-view.c:158
+#: ../widgets/misc/e-attachment-tree-view.c:543
 msgid "Loading"
 msgstr "Loading"
 
-#: ../widgets/misc/e-attachment-icon-view.c:518
-#: ../widgets/misc/e-attachment-tree-view.c:557
+#: ../widgets/misc/e-attachment-icon-view.c:170
+#: ../widgets/misc/e-attachment-tree-view.c:555
 msgid "Saving"
 msgstr "Saving"
 
-#: ../widgets/misc/e-attachment-paned.c:100
+#: ../widgets/misc/e-attachment-paned.c:93
 msgid "Hide Attachment _Bar"
 msgstr "Hide Attachment _Bar"
 
-#: ../widgets/misc/e-attachment-paned.c:102
-#: ../widgets/misc/e-attachment-paned.c:637
+#: ../widgets/misc/e-attachment-paned.c:95
+#: ../widgets/misc/e-attachment-paned.c:635
 msgid "Show Attachment _Bar"
 msgstr "Show Attachment _Bar"
 
-#: ../widgets/misc/e-attachment-store.c:518
+#: ../widgets/misc/e-attachment-store.c:544
 msgid "Add Attachment"
 msgstr "Add Attachment"
 
-#: ../widgets/misc/e-attachment-store.c:521
+#: ../widgets/misc/e-attachment-store.c:547
 msgid "A_ttach"
 msgstr "A_ttach"
 
-#: ../widgets/misc/e-attachment-store.c:584
+#: ../widgets/misc/e-attachment-store.c:610
 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:613
-#: ../widgets/misc/e-attachment.c:1786 ../widgets/misc/e-attachment.c:2328
+#: ../widgets/misc/e-attachment-store.c:639
+#: ../widgets/misc/e-attachment.c:1806 ../widgets/misc/e-attachment.c:2348
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:352
+#: ../widgets/misc/e-attachment-view.c:349
 msgid "S_ave All"
 msgstr "S_ave All"
 
-#: ../widgets/misc/e-attachment-view.c:378
+#: ../widgets/misc/e-attachment-view.c:375
 msgid "A_dd Attachment..."
 msgstr "A_dd Attachmentâ?¦"
 
-#: ../widgets/misc/e-attachment-view.c:402
+#: ../widgets/misc/e-attachment-view.c:399
 msgid "_Hide"
 msgstr "_Hide"
 
-#: ../widgets/misc/e-attachment-view.c:409
+#: ../widgets/misc/e-attachment-view.c:406
 msgid "Hid_e All"
 msgstr "Hid_e All"
 
-#: ../widgets/misc/e-attachment-view.c:416
+#: ../widgets/misc/e-attachment-view.c:413
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: ../widgets/misc/e-attachment-view.c:423
+#: ../widgets/misc/e-attachment-view.c:420
 msgid "Vie_w All Inline"
 msgstr "Vie_w All Inline"
 
-#: ../widgets/misc/e-attachment-view.c:740
+#: ../widgets/misc/e-attachment-view.c:738
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Open with \"%s\""
 
-#: ../widgets/misc/e-attachment-view.c:743
+#: ../widgets/misc/e-attachment-view.c:741
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Open this attachment in %s"
@@ -20742,124 +20853,124 @@ msgstr "Open this attachment in %s"
 #. * 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:997
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "Attached message"
 
-#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2630
+#: ../widgets/misc/e-attachment.c:1849 ../widgets/misc/e-attachment.c:2650
 msgid "A load operation is already in progress"
 msgstr "A load operation is already in progress"
 
-#: ../widgets/misc/e-attachment.c:1837 ../widgets/misc/e-attachment.c:2638
+#: ../widgets/misc/e-attachment.c:1857 ../widgets/misc/e-attachment.c:2658
 msgid "A save operation is already in progress"
 msgstr "A save operation is already in progress"
 
-#: ../widgets/misc/e-attachment.c:1929
+#: ../widgets/misc/e-attachment.c:1949
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Could not load '%s'"
 
-#: ../widgets/misc/e-attachment.c:1932
+#: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Could not load the attachment"
 
-#: ../widgets/misc/e-attachment.c:2208
+#: ../widgets/misc/e-attachment.c:2228
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Could not open '%s'"
 
-#: ../widgets/misc/e-attachment.c:2211
+#: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Could not open the attachment"
 
-#: ../widgets/misc/e-attachment.c:2646
+#: ../widgets/misc/e-attachment.c:2666
 msgid "Attachment contents not loaded"
 msgstr "Attachment contents not loaded"
 
-#: ../widgets/misc/e-attachment.c:2722
+#: ../widgets/misc/e-attachment.c:2742
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Could not save '%s'"
 
-#: ../widgets/misc/e-attachment.c:2725
+#: ../widgets/misc/e-attachment.c:2745
 #, 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:362
+#: ../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:1259
+#: ../widgets/misc/e-calendar-item.c:1229
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:220
+#: ../widgets/misc/e-calendar.c:225
 msgid "Month Calendar"
 msgstr "Month Calendar"
 
-#: ../widgets/misc/e-charset-combo-box.c:96
+#: ../widgets/misc/e-charset-combo-box.c:92
 msgid "Character Encoding"
 msgstr "Character Encoding"
 
-#: ../widgets/misc/e-charset-combo-box.c:122
+#: ../widgets/misc/e-charset-combo-box.c:115
 msgid "Enter the character set to use"
 msgstr "Enter the character set to use"
 
-#: ../widgets/misc/e-charset-combo-box.c:341
+#: ../widgets/misc/e-charset-combo-box.c:335
 msgid "Other..."
 msgstr "Otherâ?¦"
 
-#: ../widgets/misc/e-dateedit.c:507
+#: ../widgets/misc/e-dateedit.c:501
 msgid "Date and Time"
 msgstr "Date and Time"
 
-#: ../widgets/misc/e-dateedit.c:528
+#: ../widgets/misc/e-dateedit.c:522
 msgid "Text entry to input date"
 msgstr "Text entry to input date"
 
-#: ../widgets/misc/e-dateedit.c:550
+#: ../widgets/misc/e-dateedit.c:544
 msgid "Click this button to show a calendar"
 msgstr "Click this button to show a calendar"
 
-#: ../widgets/misc/e-dateedit.c:605
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Drop-down combination box to select time"
 
-#: ../widgets/misc/e-dateedit.c:677
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "No_w"
 
-#: ../widgets/misc/e-dateedit.c:683
+#: ../widgets/misc/e-dateedit.c:669
 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:691
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_None"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1698 ../widgets/misc/e-dateedit.c:1930
+#: ../widgets/misc/e-dateedit.c:1686 ../widgets/misc/e-dateedit.c:1918
 msgctxt "date"
 msgid "None"
 msgstr "None"
 
-#: ../widgets/misc/e-dateedit.c:1825
+#: ../widgets/misc/e-dateedit.c:1813
 msgid "Invalid Date Value"
 msgstr "Invalid Date Value"
 
-#: ../widgets/misc/e-dateedit.c:1869
+#: ../widgets/misc/e-dateedit.c:1857
 msgid "Invalid Time Value"
 msgstr "Invalid Time Value"
 
-#: ../widgets/misc/e-import-assistant.c:252
+#: ../widgets/misc/e-import-assistant.c:245
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -20867,37 +20978,37 @@ 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:269
+#: ../widgets/misc/e-import-assistant.c:262
 msgid "F_ilename:"
 msgstr "F_ilename:"
 
-#: ../widgets/misc/e-import-assistant.c:279
+#: ../widgets/misc/e-import-assistant.c:272
 msgid "Select a file"
 msgstr "Select a file"
 
-#: ../widgets/misc/e-import-assistant.c:293
-#: ../widgets/misc/e-import-assistant.c:468
+#: ../widgets/misc/e-import-assistant.c:286
+#: ../widgets/misc/e-import-assistant.c:461
 msgid "File _type:"
 msgstr "File _type:"
 
-#: ../widgets/misc/e-import-assistant.c:336
-#: ../widgets/misc/e-import-assistant.c:912
+#: ../widgets/misc/e-import-assistant.c:329
+#: ../widgets/misc/e-import-assistant.c:905
 msgid "Choose the destination for this import"
 msgstr "Choose the destination for this import"
 
-#: ../widgets/misc/e-import-assistant.c:361
+#: ../widgets/misc/e-import-assistant.c:354
 msgid "Choose the type of importer to run:"
 msgstr "Choose the type of importer to run:"
 
-#: ../widgets/misc/e-import-assistant.c:369
+#: ../widgets/misc/e-import-assistant.c:362
 msgid "Import data and settings from _older programs"
 msgstr "Import data and settings from _older programs"
 
-#: ../widgets/misc/e-import-assistant.c:377
+#: ../widgets/misc/e-import-assistant.c:370
 msgid "Import a _single file"
 msgstr "Import a _single file"
 
-#: ../widgets/misc/e-import-assistant.c:529
+#: ../widgets/misc/e-import-assistant.c:522
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -20908,37 +21019,37 @@ msgstr ""
 "like to try again, please click the \"Back\" button."
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:769
+#: ../widgets/misc/e-import-assistant.c:762
 msgid "_Cancel Import"
 msgstr "_Cancel Import"
 
-#: ../widgets/misc/e-import-assistant.c:911
+#: ../widgets/misc/e-import-assistant.c:904
 msgid "Preview data to be imported"
 msgstr "Preview data to be imported"
 
-#: ../widgets/misc/e-import-assistant.c:917
-#: ../widgets/misc/e-import-assistant.c:930
-#: ../widgets/misc/e-import-assistant.c:1280
-#: ../widgets/misc/e-import-assistant.c:1346
-#: ../widgets/misc/e-import-assistant.c:1355
+#: ../widgets/misc/e-import-assistant.c:910
+#: ../widgets/misc/e-import-assistant.c:923
+#: ../widgets/misc/e-import-assistant.c:1270
+#: ../widgets/misc/e-import-assistant.c:1336
+#: ../widgets/misc/e-import-assistant.c:1345
 msgid "Import Data"
 msgstr "Import Data"
 
-#: ../widgets/misc/e-import-assistant.c:925
+#: ../widgets/misc/e-import-assistant.c:918
 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:1270
-#: ../widgets/misc/e-import-assistant.c:1304
+#: ../widgets/misc/e-import-assistant.c:1260
+#: ../widgets/misc/e-import-assistant.c:1294
 msgid "Evolution Import Assistant"
 msgstr "Evolution Import Assistant"
 
-#: ../widgets/misc/e-import-assistant.c:1287
-#: ../widgets/misc/e-import-assistant.c:1334
+#: ../widgets/misc/e-import-assistant.c:1277
+#: ../widgets/misc/e-import-assistant.c:1324
 msgid "Import Location"
 msgstr "Import Location"
 
-#: ../widgets/misc/e-import-assistant.c:1298
+#: ../widgets/misc/e-import-assistant.c:1288
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -20948,27 +21059,27 @@ msgstr ""
 "With this assistant you will be guided through the process of importing "
 "external files into Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1312
+#: ../widgets/misc/e-import-assistant.c:1302
 msgid "Importer Type"
 msgstr "Importer Type"
 
-#: ../widgets/misc/e-import-assistant.c:1320
+#: ../widgets/misc/e-import-assistant.c:1310
 msgid "Select Information to Import"
 msgstr "Select Information to Import"
 
-#: ../widgets/misc/e-import-assistant.c:1327
+#: ../widgets/misc/e-import-assistant.c:1317
 msgid "Select a File"
 msgstr "Select a File"
 
-#: ../widgets/misc/e-import-assistant.c:1341
+#: ../widgets/misc/e-import-assistant.c:1331
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Click \"Apply\" to begin importing the file into Evolution."
 
-#: ../widgets/misc/e-map.c:752
+#: ../widgets/misc/e-map.c:866
 msgid "World Map"
 msgstr "World Map"
 
-#: ../widgets/misc/e-map.c:754
+#: ../widgets/misc/e-map.c:869
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -20976,68 +21087,68 @@ msgstr ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
 
-#: ../widgets/misc/e-online-button.c:27
+#: ../widgets/misc/e-online-button.c:23
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr "Evolution is currently online.  Click this button to work offline."
 
-#: ../widgets/misc/e-online-button.c:30
+#: ../widgets/misc/e-online-button.c:26
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr "Evolution is currently offline.  Click this button to work online."
 
-#: ../widgets/misc/e-online-button.c:33
+#: ../widgets/misc/e-online-button.c:29
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution is currently offline because the network is unavailable."
 
-#: ../widgets/misc/e-preferences-window.c:281
+#: ../widgets/misc/e-preferences-window.c:275
 msgid "Evolution Preferences"
 msgstr "Evolution Preferences"
 
-#: ../widgets/misc/e-search-bar.c:82
+#: ../widgets/misc/e-search-bar.c:75
 #, c-format
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: ../widgets/misc/e-search-bar.c:560
+#: ../widgets/misc/e-search-bar.c:557
 msgid "Close the find bar"
 msgstr "Close the find bar"
 
-#: ../widgets/misc/e-search-bar.c:568
+#: ../widgets/misc/e-search-bar.c:565
 msgid "Fin_d:"
 msgstr "Fin_d:"
 
-#: ../widgets/misc/e-search-bar.c:580
+#: ../widgets/misc/e-search-bar.c:577
 msgid "Clear the search"
 msgstr "Clear the search"
 
-#: ../widgets/misc/e-search-bar.c:604
+#: ../widgets/misc/e-search-bar.c:601
 msgid "_Previous"
 msgstr "_Previous"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:607
 msgid "Find the previous occurrence of the phrase"
 msgstr "Find the previous occurrence of the phrase"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:620
 msgid "_Next"
 msgstr "_Next"
 
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:626
 msgid "Find the next occurrence of the phrase"
 msgstr "Find the next occurrence of the phrase"
 
-#: ../widgets/misc/e-search-bar.c:642
+#: ../widgets/misc/e-search-bar.c:639
 msgid "Mat_ch case"
 msgstr "Mat_ch case"
 
-#: ../widgets/misc/e-search-bar.c:670
+#: ../widgets/misc/e-search-bar.c:667
 msgid "Reached bottom of page, continued from top"
 msgstr "Reached bottom of page, continued from top"
 
-#: ../widgets/misc/e-search-bar.c:692
+#: ../widgets/misc/e-search-bar.c:689
 msgid "Reached top of page, continued from bottom"
 msgstr "Reached top of page, continued from bottom"
 
-#: ../widgets/misc/e-send-options.c:516
+#: ../widgets/misc/e-send-options.c:543
 msgid "When de_leted:"
 msgstr "When de_leted:"
 
@@ -21172,38 +21283,38 @@ msgctxt "send-options"
 msgid "None"
 msgstr "None"
 
-#: ../widgets/misc/e-signature-editor.c:138
-#: ../widgets/misc/e-signature-editor.c:563
-#: ../widgets/misc/e-signature-manager.c:355
-#: ../widgets/misc/e-signature-script-dialog.c:219
+#: ../widgets/misc/e-signature-editor.c:134
+#: ../widgets/misc/e-signature-editor.c:560
+#: ../widgets/misc/e-signature-manager.c:348
+#: ../widgets/misc/e-signature-script-dialog.c:215
 msgid "Unnamed"
 msgstr "Unnamed"
 
-#: ../widgets/misc/e-signature-editor.c:214
+#: ../widgets/misc/e-signature-editor.c:210
 msgid "_Save and Close"
 msgstr "_Save and Close"
 
-#: ../widgets/misc/e-signature-editor.c:430
+#: ../widgets/misc/e-signature-editor.c:427
 msgid "Edit Signature"
 msgstr "Edit Signature"
 
-#: ../widgets/misc/e-signature-editor.c:445
+#: ../widgets/misc/e-signature-editor.c:442
 msgid "_Signature Name:"
 msgstr "_Signature Name:"
 
-#: ../widgets/misc/e-signature-manager.c:300
+#: ../widgets/misc/e-signature-manager.c:293
 msgid "Add Signature Script"
 msgstr "Add Signature Script"
 
-#: ../widgets/misc/e-signature-manager.c:365
+#: ../widgets/misc/e-signature-manager.c:358
 msgid "Edit Signature Script"
 msgstr "Edit Signature Script"
 
-#: ../widgets/misc/e-signature-manager.c:583
+#: ../widgets/misc/e-signature-manager.c:577
 msgid "Add _Script"
 msgstr "Add _Script"
 
-#: ../widgets/misc/e-signature-script-dialog.c:269
+#: ../widgets/misc/e-signature-script-dialog.c:264
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -21213,11 +21324,11 @@ msgstr ""
 "signature. The name you specify will be used\n"
 "for display purposes only."
 
-#: ../widgets/misc/e-signature-script-dialog.c:314
+#: ../widgets/misc/e-signature-script-dialog.c:309
 msgid "S_cript:"
 msgstr "S_cript:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:345
+#: ../widgets/misc/e-signature-script-dialog.c:340
 msgid "Script file must be executable."
 msgstr "Script file must be executable."
 
@@ -21225,41 +21336,41 @@ msgstr "Script file must be executable."
 msgid "Click here to go to URL"
 msgstr "Click here to go to URL"
 
-#: ../widgets/misc/e-web-view.c:373
+#: ../widgets/misc/e-web-view.c:375
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:377
 msgid "Copy the link to the clipboard"
 msgstr "Copy the link to the clipboard"
 
-#: ../widgets/misc/e-web-view.c:383
+#: ../widgets/misc/e-web-view.c:385
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: ../widgets/misc/e-web-view.c:385
+#: ../widgets/misc/e-web-view.c:387
 msgid "Open the link in a web browser"
 msgstr "Open the link in a web browser"
 
-#: ../widgets/misc/e-web-view.c:393
+#: ../widgets/misc/e-web-view.c:395
 msgid "_Copy Email Address"
 msgstr "_Copy E-mail Address"
 
-#: ../widgets/misc/e-web-view.c:422 ../widgets/misc/e-web-view.c:1077
+#: ../widgets/misc/e-web-view.c:424 ../widgets/misc/e-web-view.c:1080
 msgid "Select all text and images"
 msgstr "Select all text and images"
 
-#: ../widgets/misc/e-web-view.c:854 ../widgets/misc/e-web-view.c:856
-#: ../widgets/misc/e-web-view.c:858
+#: ../widgets/misc/e-web-view.c:860 ../widgets/misc/e-web-view.c:862
+#: ../widgets/misc/e-web-view.c:864
 #, c-format
 msgid "Click to call %s"
 msgstr "Click to call %s"
 
-#: ../widgets/misc/e-web-view.c:860
+#: ../widgets/misc/e-web-view.c:866
 msgid "Click to hide/unhide addresses"
 msgstr "Click to hide/unhide addresses"
 
-#: ../widgets/misc/e-web-view.c:862
+#: ../widgets/misc/e-web-view.c:868
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
@@ -21278,25 +21389,25 @@ msgstr "Calendar: from %s to %s"
 msgid "evolution calendar item"
 msgstr "evolution calendar item"
 
-#: ../widgets/table/e-cell-combo.c:177
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "popup list"
 
-#: ../widgets/table/e-cell-date-edit.c:303
+#: ../widgets/table/e-cell-date-edit.c:300
 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
+#: ../widgets/table/e-cell-date-edit.c:317
 msgctxt "table-date"
 msgid "None"
 msgstr "None"
 
-#: ../widgets/table/e-cell-date-edit.c:328
+#: ../widgets/table/e-cell-date-edit.c:325
 msgid "OK"
 msgstr "OK"
 
-#: ../widgets/table/e-cell-date-edit.c:872
+#: ../widgets/table/e-cell-date-edit.c:869
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "The time must be in the format: %s"
@@ -21305,7 +21416,7 @@ 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-table-click-to-add.c:595
+#: ../widgets/table/e-table-click-to-add.c:592
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
@@ -21341,7 +21452,7 @@ msgid "A_vailable Fields:"
 msgstr "A_vailable Fields:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1668
+#: ../widgets/table/e-table-header-item.c:1660
 msgid "Ascending"
 msgstr "Ascending"
 
@@ -21354,7 +21465,7 @@ msgid "Clear _All"
 msgstr "Clear _All"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1668
+#: ../widgets/table/e-table-header-item.c:1660
 msgid "Descending"
 msgstr "Descending"
 
@@ -21433,7 +21544,7 @@ msgstr ""
 #. Finally the %d is replaced with count of items in this group.
 #. Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:354
+#: ../widgets/table/e-table-group-container.c:351
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -21446,72 +21557,72 @@ msgstr[1] "%s: %s (%d items)"
 #. The %d is replaced with count of items in this group.
 #. Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:366
+#: ../widgets/table/e-table-group-container.c:363
 #, 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-header-item.c:1512
+#: ../widgets/table/e-table-header-item.c:1504
 msgid "Customize Current View"
 msgstr "Customise Current View"
 
-#: ../widgets/table/e-table-header-item.c:1533
+#: ../widgets/table/e-table-header-item.c:1525
 msgid "Sort _Ascending"
 msgstr "Sort _Ascending"
 
-#: ../widgets/table/e-table-header-item.c:1536
+#: ../widgets/table/e-table-header-item.c:1528
 msgid "Sort _Descending"
 msgstr "Sort _Descending"
 
-#: ../widgets/table/e-table-header-item.c:1539
+#: ../widgets/table/e-table-header-item.c:1531
 msgid "_Unsort"
 msgstr "_Unsort"
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1534
 msgid "Group By This _Field"
 msgstr "Group By This _Field"
 
-#: ../widgets/table/e-table-header-item.c:1545
+#: ../widgets/table/e-table-header-item.c:1537
 msgid "Group By _Box"
 msgstr "Group By _Box"
 
-#: ../widgets/table/e-table-header-item.c:1549
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Remove This _Column"
 msgstr "Remove This _Column"
 
-#: ../widgets/table/e-table-header-item.c:1552
+#: ../widgets/table/e-table-header-item.c:1544
 msgid "Add a C_olumn..."
 msgstr "Add a C_olumnâ?¦"
 
-#: ../widgets/table/e-table-header-item.c:1556
+#: ../widgets/table/e-table-header-item.c:1548
 msgid "A_lignment"
 msgstr "A_lignment"
 
-#: ../widgets/table/e-table-header-item.c:1559
+#: ../widgets/table/e-table-header-item.c:1551
 msgid "B_est Fit"
 msgstr "B_est Fit"
 
-#: ../widgets/table/e-table-header-item.c:1562
+#: ../widgets/table/e-table-header-item.c:1554
 msgid "Format Column_s..."
 msgstr "Format Column_sâ?¦"
 
-#: ../widgets/table/e-table-header-item.c:1566
+#: ../widgets/table/e-table-header-item.c:1558
 msgid "Custo_mize Current View..."
 msgstr "Custo_mise Current Viewâ?¦"
 
-#: ../widgets/table/e-table-header-item.c:1625
+#: ../widgets/table/e-table-header-item.c:1617
 msgid "_Sort By"
 msgstr "_Sort By"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1635
 msgid "_Custom"
 msgstr "_Custom"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:126
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "pop up a child"
 
@@ -21542,14 +21653,59 @@ msgstr "click"
 msgid "sort"
 msgstr "sort"
 
-#: ../widgets/text/e-text.c:2289
+#: ../widgets/text/e-text.c:2283
 msgid "Select All"
 msgstr "Select All"
 
-#: ../widgets/text/e-text.c:2301
+#: ../widgets/text/e-text.c:2295
 msgid "Input Methods"
 msgstr "Input Methods"
 
+#~ msgid "(map)"
+#~ msgstr "(map)"
+
+#~ msgid "map"
+#~ msgstr "map"
+
+#~ msgid "Accessing LDAP Server anonymously"
+#~ msgstr "Accessing LDAP Server anonymously"
+
+#~ msgid ""
+#~ "Folder '%s' contains %d duplicate messages. Are you sure you want to "
+#~ "delete them?"
+#~ msgstr ""
+#~ "Folder '%s' contains %d duplicate messages. Are you sure you want to "
+#~ "delete them?"
+
+#~ msgid "Account Management"
+#~ msgstr "Account Management"
+
+#~ msgid "Migrate local mbox folders to maildir"
+#~ msgstr "Migrate local mbox folders to maildir"
+
+#~ msgid ""
+#~ "Error on %s: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Error on %s: %s\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error on %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Error on %s\n"
+#~ "%s"
+
+#~ msgid "Select folder to import OE folder into"
+#~ msgstr "Select folder to import OE folder into"
+
+#~ 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)"
+
+#~ msgid "Start Evolution activating the specified component"
+#~ msgstr "Start Evolution activating the specified component"
+
 #~ msgid "Count of default recurrence for a new event. -1 means forever."
 #~ msgstr "Count of default recurrence for a new event. -1 means forever."
 
@@ -22420,9 +22576,6 @@ msgstr "Input Methods"
 #~ msgid "Field Name"
 #~ msgstr "Field Name"
 
-#~ msgid "Text Model"
-#~ msgstr "Text Model"
-
 #~ msgid "Max field name length"
 #~ msgstr "Max field name length"
 
@@ -22441,9 +22594,6 @@ msgstr "Input Methods"
 #~ msgid "Calendar repository is offline."
 #~ msgstr "Calendar repository is offline."
 
-#~ msgid "Error on '{0}'"
-#~ msgstr "Error on '{0}'"
-
 #~ msgid "No response from the server."
 #~ msgstr "No response from the server."
 
@@ -27789,9 +27939,6 @@ msgstr "Input Methods"
 #~ "server are behind a firewall at work, then Evolution doesn't need to use "
 #~ "SSL/TLS because your connection is already secure."
 
-#~ msgid "E-_mail:"
-#~ msgstr "E-_mail:"
-
 #~ msgid "Advanced..."
 #~ msgstr "Advanced..."
 



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