[evolution] Update British English translation



commit b449c0af436eb055c742a76b428fe7fd5ef312d8
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Dec 1 21:29:27 2010 +0000

    Update British English translation

 po/en_GB.po | 9412 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 4836 insertions(+), 4576 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 9ef3747..0a69b94 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,14 +4,14 @@
 # Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
 # Bruce Cowan <bruce bcowan me uk>, 2009, 2010.
 # Philip Withnall <philip tecnocode co uk>, 2010.
-#: ../shell/main.c:533
+#: ../shell/main.c:579
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 18:00+0100\n"
+"POT-Creation-Date: 2010-12-01 21:29+0000\n"
 "PO-Revision-Date: 2010-09-11 18:02+0100\n"
-"Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
+"Last-Translator: Philip Withnall <philip tecnocode co 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:45
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:49
 msgid "Do _Not Delete"
 msgstr "Do _Not Delete"
 
@@ -207,38 +207,39 @@ msgstr ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#. Translators: {0} is replaced with an address book name which will not be available
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 
-#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:603
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../plugins/groupwise-features/properties.ui.h:9
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Add"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "_Discard"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Do not save"
 msgstr "_Do not save"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Resize"
 msgstr "_Resize"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:42
 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:2020
+#: ../calendar/gui/e-calendar-view.c:2087
 msgid "Anniversary"
 msgstr "Anniversary"
 
@@ -249,8 +250,8 @@ msgstr "Anniversary"
 #. * 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:2019 ../capplet/anjal-settings-main.c:117
-#: ../shell/main.c:122
+#: ../calendar/gui/e-calendar-view.c:2086 ../capplet/anjal-settings-main.c:123
+#: ../shell/main.c:133
 msgid "Birthday"
 msgstr "Birthday"
 
@@ -275,19 +276,19 @@ msgid "Contact"
 msgstr "Contact"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:589
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:604
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2583
+#: ../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
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:295
+#: ../addressbook/gui/merging/eab-contact-merging.c:298
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
+#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "E-mail"
 
@@ -300,7 +301,7 @@ msgid "Full _Name..."
 msgstr "Full _Nameâ?¦"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "Home"
@@ -335,7 +336,7 @@ msgid "Nic_kname:"
 msgstr "Nic_kname:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:250
+#: ../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
@@ -343,10 +344,10 @@ msgid "Notes"
 msgstr "Notes"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../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:1725
+#: ../calendar/gui/e-calendar-view.c:1792
 msgid "Other"
 msgstr "Other"
 
@@ -371,7 +372,7 @@ msgid "Web addresses"
 msgstr "Web addresses"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../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
 msgid "Work"
@@ -398,9 +399,9 @@ msgid "_Blog:"
 msgstr "_Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.c:887
 #: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/itip-formatter/itip-view.c:1921
+#: ../plugins/itip-formatter/itip-view.c:1922
 msgid "_Calendar:"
 msgstr "_Calendar:"
 
@@ -478,74 +479,74 @@ msgstr "_Where:"
 msgid "_Zip/Postal Code:"
 msgstr "_Zip/Postal Code:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
 #: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
 #: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:368
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
 msgid "Error modifying contact"
 msgstr "Error modifying contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:239
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:599
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:602
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2602
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Contact Editor â?? %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3001
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3025
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3002
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3026
 msgid "_No image"
 msgstr "_No image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3275
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3299
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -553,23 +554,23 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3303
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3310
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' has an invalid format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3325
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3336
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' is empty"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3326
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3350
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
@@ -659,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:657
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:659
 msgid "Contact List Editor"
 msgstr "Contact List Editor"
 
@@ -676,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:173
+#: ../mail/mail-config.ui.h:157
 msgid "_Select..."
 msgstr "_Selectâ?¦"
 
@@ -684,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:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Members"
 msgstr "Contact List Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:905
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1320
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:907
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1322
 msgid "_Members"
 msgstr "_Members"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1160
 msgid "Error adding list"
 msgstr "Error adding list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1174
 msgid "Error modifying list"
 msgstr "Error modifying list"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1188
 msgid "Error removing list"
 msgstr "Error removing list"
 
@@ -743,17 +744,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:241
+#: ../addressbook/gui/merging/eab-contact-merging.c:244
 msgid "_Merge"
 msgstr "_Merge"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/gui/merging/eab-contact-merging.c:169
 #: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
 #, c-format
 msgid "Cancelled"
 msgstr "Cancelled"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:224
+#: ../addressbook/gui/merging/eab-contact-merging.c:227
 msgid "Merge Contact"
 msgstr "Merge Contact"
 
@@ -761,9 +762,9 @@ 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:1687
-#: ../modules/calendar/e-memo-shell-view-actions.c:768
-#: ../modules/calendar/e-task-shell-view-actions.c:967
+#: ../modules/calendar/e-cal-shell-view-actions.c:1692
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Any field contains"
 msgstr "Any field contains"
 
@@ -777,22 +778,22 @@ msgstr "E-mail begins with"
 msgid "Name contains"
 msgstr "Name contains"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:143
+#: ../addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "No contacts"
 msgstr "No contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:147
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contact"
 msgstr[1] "%d contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-model.c:327
 msgid "Error getting book view"
 msgstr "Error getting book view"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:716
+#: ../addressbook/gui/widgets/e-addressbook-model.c:740
 msgid "Search Interrupted"
 msgstr "Search Interrupted"
 
@@ -800,24 +801,24 @@ msgstr "Search Interrupted"
 msgid "Error modifying card"
 msgstr "Error modifying card"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:626
+#: ../addressbook/gui/widgets/e-addressbook-view.c:625
 msgid "Cut selected contacts to the clipboard"
 msgstr "Cut selected contacts to the clipboard"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:632
+#: ../addressbook/gui/widgets/e-addressbook-view.c:631
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copy selected contacts to the clipboard"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:638
+#: ../addressbook/gui/widgets/e-addressbook-view.c:637
 msgid "Paste contacts from the clipboard"
 msgstr "Paste contacts from the clipboard"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../addressbook/gui/widgets/e-addressbook-view.c:643
 #: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Delete selected contacts"
 msgstr "Delete selected contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:650
+#: ../addressbook/gui/widgets/e-addressbook-view.c:649
 msgid "Select all visible contacts"
 msgstr "Select all visible contacts"
 
@@ -1031,7 +1032,7 @@ msgstr "Unit"
 msgid "Web Site"
 msgstr "Website"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1041,7 +1042,7 @@ msgstr ""
 "\n"
 "Searching for the Contactsâ?¦"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1055,7 +1056,7 @@ msgstr ""
 "\n"
 "or double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1069,7 +1070,7 @@ msgstr ""
 "\n"
 "Double-click here to create a new Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1079,7 +1080,7 @@ msgstr ""
 "\n"
 "Search for the Contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1089,16 +1090,16 @@ msgstr ""
 "\n"
 "There are no items to show in this view."
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Work Email"
 msgstr "Work E-mail"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:102
 msgid "Home Email"
 msgstr "Home E-mail"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:807
+#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:808
 msgid "Other Email"
 msgstr "Other E-mail"
 
@@ -1144,17 +1145,17 @@ msgid "Copy _Email Address"
 msgstr "Copy _E-mail Address"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:396
+#: ../widgets/misc/e-web-view.c:395
 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:401
+#: ../widgets/misc/e-web-view.c:400
 msgid "_Send New Message To..."
 msgstr "_Send New Message Toâ?¦"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:403
+#: ../widgets/misc/e-web-view.c:402
 msgid "Send a mail message to this address"
 msgstr "Send a mail message to this address"
 
@@ -1190,10 +1191,10 @@ msgid "Video Chat"
 msgstr "Video Chat"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../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:488
+#: ../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
@@ -1203,9 +1204,9 @@ msgid "Calendar"
 msgstr "Calendar"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:128
-#: ../calendar/gui/dialogs/event-editor.c:355
+#: ../calendar/gui/dialogs/event-editor.c:127
+#: ../calendar/gui/dialogs/event-editor.c:354
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Free/Busy"
@@ -1237,16 +1238,15 @@ msgstr "Web Log"
 #. 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:350
+#: ../capplet/settings/mail-capplet-shell.c:366
 #: ../modules/addressbook/e-book-shell-backend.c:116
-#: ../modules/addressbook/e-book-shell-migrate.c:138
-#: ../modules/calendar/e-cal-shell-backend.c:127
-#: ../modules/calendar/e-cal-shell-migrate.c:156
-#: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:112
-#: ../modules/calendar/e-task-shell-migrate.c:121
-#: ../plugins/email-custom-header/email-custom-header.c:320
+#: ../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-memo-shell-migrate.c:117
+#: ../modules/calendar/e-task-shell-backend.c:116
+#: ../modules/calendar/e-task-shell-migrate.c:126
 msgid "Personal"
 msgstr "Personal"
 
@@ -1263,7 +1263,7 @@ msgid "Blog"
 msgstr "Blog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1011
-#: ../widgets/misc/e-web-view.c:853
+#: ../widgets/misc/e-web-view.c:852
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
@@ -1278,7 +1278,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:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1287,7 +1287,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:92
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 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 +1295,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:101
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1303,11 +1303,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:109
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid "Detailed error message:"
 msgstr "Detailed error message:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:133
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1319,7 +1319,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:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 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 +1332,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:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 #, 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:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 #, 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:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 #, 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:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:202
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:242
 msgid "Select Address Book"
 msgstr "Select Address Book"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:286
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "list"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:441
 msgid "Move contact to"
 msgstr "Move contact to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Copy contact to"
 msgstr "Copy contact to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:430
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "Move contacts to"
 msgstr "Move contacts to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:448
 msgid "Copy contacts to"
 msgstr "Copy contacts to"
 
@@ -1383,7 +1383,7 @@ msgid "Card View"
 msgstr "Card View"
 
 #: ../addressbook/importers/evolution-csv-importer.c:720
-#: ../addressbook/importers/evolution-ldif-importer.c:516
+#: ../addressbook/importers/evolution-ldif-importer.c:518
 #: ../addressbook/importers/evolution-vcard-importer.c:264
 #: ../calendar/importers/icalendar-importer.c:325
 #: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
@@ -1414,11 +1414,11 @@ msgstr "Evolution CSV or Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV and Tab Importer"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:742
+#: ../addressbook/importers/evolution-ldif-importer.c:744
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:743
+#: ../addressbook/importers/evolution-ldif-importer.c:745
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF importer"
 
@@ -1451,31 +1451,31 @@ msgstr "Couldn't get list of address books"
 msgid "failed to open book"
 msgstr "failed to open book"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:45
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Specify the output file instead of standard output"
 msgstr "Specify the output file instead of standard output"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:46
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "List local address book folders"
 msgstr "List local address book folders"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "Show cards as vcard or csv file"
 msgstr "Show cards as vcard or csv file"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:70
 msgid "Export in asynchronous mode"
 msgstr "Export in asynchronous mode"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:73
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -1483,29 +1483,29 @@ msgstr ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:75
 msgid "NUMBER"
 msgstr "NUMBER"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:137
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Command line arguments error, please use --help option to see the usage."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:151
 msgid "Only support csv or vcard format."
 msgstr "Only support csv or vcard format."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:160
 msgid "In async mode, output must be file."
 msgstr "In async mode, output must be file."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:168
 msgid "In normal mode, there is no need for the size option."
 msgstr "In normal mode, there is no need for the size option."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:199
 msgid "Unhandled error"
 msgstr "Unhandled error"
 
@@ -1527,8 +1527,8 @@ 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:438
-#: ../plugins/publish-calendar/publish-calendar.c:328
+#: ../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"
@@ -1642,19 +1642,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Are you sure you want to delete this appointment?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:191
+#: ../calendar/gui/dialogs/delete-comp.c:187
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Are you sure you want to delete this meeting?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:197
+#: ../calendar/gui/dialogs/delete-comp.c:193
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Are you sure you want to delete this memo?"
 
 #: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:194
+#: ../calendar/gui/dialogs/delete-comp.c:190
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Are you sure you want to delete this task?"
@@ -1918,7 +1918,7 @@ 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:24
+#: ../composer/mail-composer.error.xml.h:28
 msgid "_Discard Changes"
 msgstr "_Discard Changes"
 
@@ -1931,7 +1931,7 @@ msgid "_Save Changes"
 msgstr "_Save Changes"
 
 #: ../calendar/calendar.error.xml.h:83
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:156
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Send"
@@ -1940,19 +1940,19 @@ msgstr "_Send"
 msgid "_Send Notice"
 msgstr "_Send Notice"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:286
 msgid "Start time"
 msgstr "Start time"
 
@@ -1969,8 +1969,7 @@ msgstr "Dismiss _All"
 #: ../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/e-itip-control.c:1175
-#: ../plugins/itip-formatter/itip-view.c:1043
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "Location:"
 msgstr "Location:"
 
@@ -1978,7 +1977,8 @@ msgstr "Location:"
 msgid "Snooze _time:"
 msgstr "Snooze _time:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:879
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "_Dismiss"
 
@@ -1988,9 +1988,9 @@ msgstr "_Snooze"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:427
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:335
+#: ../plugins/google-account-setup/google-contacts-source.c:375
 msgid "hours"
 msgstr "hours"
 
@@ -2001,9 +2001,9 @@ 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/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:426
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../plugins/google-account-setup/google-contacts-source.c:374
 msgid "minutes"
 msgstr "minutes"
 
@@ -2023,16 +2023,17 @@ msgstr "No location information available."
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1519
 #, c-format
-msgid "You have %d alarms"
-msgstr "You have %d alarms"
+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:1694
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Warning"
 msgstr "Warning"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2044,7 +2045,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:1733
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2061,7 +2062,7 @@ msgstr ""
 "\n"
 "Are you sure you want to run this program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1748
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1752
 msgid "Do not ask me about this program again."
 msgstr "Do not ask me about this program again."
 
@@ -2098,573 +2099,6 @@ msgid_plural "%d seconds"
 msgstr[0] "%d second"
 msgstr[1] "%d seconds"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "Alarm programs"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:11
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "Amount of time in seconds the error should be shown on the status bar."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
-msgid "Ask for confirmation when deleting items"
-msgstr "Ask for confirmation when deleting items"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "Background colour of tasks that are due today, in \"#rrggbb\" format."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "Background colour of tasks that are overdue, in \"#rrggbb\" format."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
-msgid "Calendars to run alarms for"
-msgstr "Calendars to run alarms for"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr ""
-"Colour to draw the Marcus Bains Line in the Time bar (empty for default)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
-msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "Colour to draw the Marcus Bains line in the Day View."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
-msgid "Compress weekends in month view"
-msgstr "Compress weekends in month view"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
-msgid "Confirm expunge"
-msgstr "Confirm expunge"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
-msgid "Count of default recurrence for a new event. -1 means forever."
-msgstr "Count of default recurrence for a new event. -1 means forever."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
-msgid "Days on which the start and end of work hours should be indicated."
-msgstr "Days on which the start and end of work hours should be indicated."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
-msgid "Default appointment reminder"
-msgstr "Default appointment reminder"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
-msgid "Default recurrence count"
-msgstr "Default recurrence count"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
-msgid "Default reminder units"
-msgstr "Default reminder units"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
-msgid "Default reminder value"
-msgstr "Default reminder value"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
-msgid "Directory for saving alarm audio files"
-msgstr "Directory for saving alarm audio files"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
-msgid "Event Gradient"
-msgstr "Event Gradient"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
-msgid "Event Transparency"
-msgstr "Event Transparency"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
-msgid "Free/busy server URLs"
-msgstr "Free/busy server URLs"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
-msgid "Free/busy template URL"
-msgstr "Free/busy template URL"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
-msgid "Gradient of the events in calendar views."
-msgstr "Gradient of the events in calendar views."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
-msgid "Hide completed tasks"
-msgstr "Hide completed tasks"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
-msgid "Hide task units"
-msgstr "Hide task units"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
-msgid "Hide task value"
-msgstr "Hide task value"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
-msgid "Horizontal pane position"
-msgstr "Horizontal pane position"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
-msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr "Hour the workday ends on, in twenty four hour format, 0 to 23."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
-msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr "Hour the workday starts on, in twenty four hour format, 0 to 23."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
-msgid "If \"true\", show the memo preview pane in the main window."
-msgstr "If \"true\", show the memo preview pane in the main window."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
-msgid "If \"true\", show the task preview pane in the main window."
-msgstr "If \"true\", show the task preview pane in the main window."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
-msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "Intervals shown in Day and Work Week views, in minutes."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
-msgid "Last alarm time"
-msgstr "Last alarm time"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:95
-msgid "Level beyond which the message should be logged."
-msgstr "Level beyond which the message should be logged."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
-msgid "List of recently used second time zones in a Day View."
-msgstr "List of recently used second time zones in a Day View."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
-msgid "List of server URLs for free/busy publishing."
-msgstr "List of server URLs for free/busy publishing."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
-msgid "Marcus Bains Line"
-msgstr "Marcus Bains Line"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
-msgid "Marcus Bains Line Color - Day View"
-msgstr "Marcus Bains Line Colour â?? Day View"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
-msgid "Marcus Bains Line Color - Time bar"
-msgstr "Marcus Bains Line Colour â?? Time bar"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
-msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
-msgstr ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
-msgid "Maximum number of recently used timezones to remember."
-msgstr "Maximum number of recently used timezones to remember."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
-msgid "Memo layout style"
-msgstr "Memo layout style"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
-msgid "Memo preview pane position (horizontal)"
-msgstr "Memo preview pane position (horizontal)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
-msgid "Memo preview pane position (vertical)"
-msgstr "Memo preview pane position (vertical)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
-msgid "Minute the workday ends on, 0 to 59."
-msgstr "Minute the workday ends on, 0 to 59."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
-msgid "Minute the workday starts on, 0 to 59."
-msgstr "Minute the workday starts on, 0 to 59."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
-msgid "Month view horizontal pane position"
-msgstr "Month view horizontal pane position"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
-msgid "Month view vertical pane position"
-msgstr "Month view vertical pane position"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
-msgid "Number of units for determining a default reminder."
-msgstr "Number of units for determining a default reminder."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
-msgid "Number of units for determining when to hide tasks."
-msgstr "Number of units for determining when to hide tasks."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
-msgid "Overdue tasks color"
-msgstr "Overdue tasks colour"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
-msgstr ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-msgid "Position of the memo preview pane when oriented vertically."
-msgstr "Position of the memo preview pane when oriented vertically."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-msgid "Position of the task preview pane when oriented horizontally."
-msgstr "Position of the task preview pane when oriented horizontally."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
-msgid "Position of the task preview pane when oriented vertically."
-msgstr "Position of the task preview pane when oriented vertically."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
-msgstr ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-msgid "Primary calendar"
-msgstr "Primary calendar"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-msgid "Primary memo list"
-msgstr "Primary memo list"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
-msgid "Primary task list"
-msgstr "Primary task list"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
-msgid "Programs that are allowed to be run by alarms."
-msgstr "Programs that are allowed to be run by alarms."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
-msgid "Recently used second time zones in a Day View"
-msgstr "Recently used second time zones in a Day View"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
-msgstr "Save directory for alarm audio"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
-msgid "Scroll Month View by a week"
-msgstr "Scroll Month View by a week"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "Show RSVP field in the event/task/meeting editor"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
-msgid "Show Role field in the event/task/meeting editor"
-msgstr "Show Role field in the event/task/meeting editor"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
-msgid "Show appointment end times in week and month views"
-msgstr "Show appointment end times in week and month views"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid "Show categories field in the event/meeting/task editor"
-msgstr "Show categories field in the event/meeting/task editor"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
-msgid "Show display alarms in notification tray"
-msgstr "Show display alarms in notification tray"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
-msgid "Show status field in the event/task/meeting editor"
-msgstr "Show status field in the event/task/meeting editor"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
-msgid "Show the memo preview pane"
-msgstr "Show the memo preview pane"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
-msgid "Show the task preview pane"
-msgstr "Show the task preview pane"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
-msgid "Show timezone field in the event/meeting editor"
-msgstr "Show timezone field in the event/meeting editor"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-msgid "Show type field in the event/task/meeting editor"
-msgstr "Show type field in the event/task/meeting editor"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
-msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
-msgstr "Show week numbers in Day View, Work Week View, and Date Navigator"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-msgstr ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid "Task layout style"
-msgstr "Task layout style"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
-msgid "Task preview pane position (horizontal)"
-msgstr "Task preview pane position (horizontal)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
-msgid "Task preview pane position (vertical)"
-msgstr "Task preview pane position (vertical)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
-msgid "Tasks due today color"
-msgstr "Tasks due today colour"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
-#, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
-msgstr ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
-msgstr ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
-msgid "The second timezone for a Day View"
-msgstr "The second timezone for a Day View"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr ""
-"This can have three possible values: 0 for errors, 1 for warnings, 2 for "
-"debug messages."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
-msgid "Time divisions"
-msgstr "Time divisions"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
-msgid "Time the last alarm ran, in time_t."
-msgstr "Time the last alarm ran, in time_t."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
-msgid "Timezone"
-msgstr "Timezone"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
-msgid ""
-"Transparency of the events in calendar views, a value between 0 "
-"(transparent) and 1 (opaque)."
-msgstr ""
-"Transparency of the events in calendar views, a value between 0 "
-"(transparent) and 1 (opaque)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
-msgid "Twenty four hour time format"
-msgstr "Twenty four hour time format"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
-msgid "URI of the highlighted (\"primary\") calendar"
-msgstr "URI of the highlighted (\"primary\") calendar"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
-msgid "URI of the highlighted (\"primary\") memo list"
-msgstr "URI of the highlighted (\"primary\") memo list"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
-msgid "URI of the highlighted (\"primary\") task list"
-msgstr "URI of the highlighted (\"primary\") task list"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
-msgid "Use system timezone"
-msgstr "Use system timezone"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr "Use the system timezone instead of the timezone selected in Evolution."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
-msgid "Vertical pane position"
-msgstr "Vertical pane position"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
-msgid "Week start"
-msgstr "Week start"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
-msgid "Whether or not to use the notification tray for display alarms."
-msgstr "Whether to use the notification tray for display alarms."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "Whether to ask for confirmation when deleting an appointment or task."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "Whether to ask for confirmation when expunging appointments and tasks."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-msgstr ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
-msgid "Whether to display the end time of events in the week and month views."
-msgstr "Whether to display the end time of events in the week and month views."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
-msgid "Whether to hide completed tasks in the tasks view."
-msgstr "Whether to hide completed tasks in the tasks view."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
-msgid "Whether to scroll a Month View by a week, not by a month."
-msgstr "Whether to scroll a Month View by a week, not by a month."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
-msgid "Whether to set a default reminder for appointments."
-msgstr "Whether to set a default reminder for appointments."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
-msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "Whether to show RSVP field in the event/task/meeting editor"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr "Whether to show categories field in the event/meeting editor"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
-msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "Whether to show role field in the event/task/meeting editor"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "Whether to show status field in the event/task/meeting editor"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
-msgstr ""
-"Whether to show times in twenty four hour format instead of using am/pm."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "Whether to show timezone field in the event/meeting editor"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
-msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "Whether to show type field in the event/task/meeting editor"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
-msgid "Whether to show week numbers in various places in the Calendar."
-msgstr "Whether to show week numbers in various places in the Calendar."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
-msgid "Work days"
-msgstr "Work days"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Workday end hour"
-msgstr "Workday end hour"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
-msgid "Workday end minute"
-msgstr "Workday end minute"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
-msgid "Workday start hour"
-msgstr "Workday start hour"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
-msgid "Workday start minute"
-msgstr "Workday start minute"
-
 #: ../calendar/gui/cal-editor-utils.c:105
 msgid "Invalid object"
 msgstr "Invalid object"
@@ -2710,17 +2144,15 @@ msgstr "Category"
 msgid "Classification"
 msgstr "Classification"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
-#: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:323
-#: ../widgets/misc/e-send-options.ui.h:2
+#: ../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/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 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
-#: ../plugins/plugin-manager/plugin-manager.c:60
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 #: ../widgets/misc/e-attachment-tree-view.c:524
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
@@ -2743,7 +2175,7 @@ msgstr "Exist"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../plugins/publish-calendar/publish-calendar.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
@@ -2754,21 +2186,21 @@ msgstr "Location"
 msgid "Organizer"
 msgstr "Organiser"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
+#: ../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/memotypes.xml.h:12
 msgid "Private"
 msgstr "Private"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
-#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
+#: ../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
 msgid "Public"
 msgstr "Public"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:322
-#: ../calendar/gui/dialogs/event-editor.c:343
+#: ../calendar/gui/dialogs/event-editor.c:321
+#: ../calendar/gui/dialogs/event-editor.c:342
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Recurrence"
@@ -2836,7 +2268,7 @@ msgid "Add Alarm"
 msgstr "Add Alarm"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
+#: ../calendar/gui/dialogs/event-editor.c:364
 msgid "Alarm"
 msgstr "Alarm"
 
@@ -2852,7 +2284,7 @@ msgstr "Custom alarm sound"
 msgid "Mes_sage:"
 msgstr "Mes_sage:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:72
 msgid "Options"
 msgstr "Options"
 
@@ -2898,9 +2330,9 @@ 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:425
+#: ../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:336
+#: ../plugins/google-account-setup/google-contacts-source.c:376
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "days"
 msgstr "days"
@@ -2935,375 +2367,86 @@ msgid "A_dd"
 msgstr "A_dd"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
 #: ../calendar/gui/dialogs/event-page.ui.h:1
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Alarms"
 msgstr "Alarms"
 
-#. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
-#: ../calendar/gui/e-day-view-time-item.c:797
-msgctxt "cal-second-zone"
-msgid "None"
-msgstr "None"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
-#: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:319
-msgid "Select..."
-msgstr "Selectâ?¦"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
-msgid "Selected Calendars for Alarms"
-msgstr "Selected Calendars for Alarms"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
-msgid "Ti_me and date:"
-msgstr "Ti_me and date:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
-msgid "_Date only:"
-msgstr "_Date only:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
-#, no-c-format
-msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr "%u and %d will be replaced by user and domain from the e-mail address."
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
-msgid "(Shown in a Day View)"
-msgstr "(Shown in a Day View)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
-msgid "05 minutes"
-msgstr "05 minutes"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
-msgid "10 minutes"
-msgstr "10 minutes"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
-msgid "15 minutes"
-msgstr "15 minutes"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
-msgid "30 minutes"
-msgstr "30 minutes"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
-msgid "60 minutes"
-msgstr "60 minutes"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
-msgid "Alerts"
-msgstr "Alerts"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:30
-#: ../modules/addressbook/autocompletion-config.c:156
-msgid "Date/Time Format"
-msgstr "Date/Time Format"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
-msgid "Day _ends:"
-msgstr "Day _ends:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
-msgid "Days"
-msgstr "Days"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
-msgid "Default Free/Busy Server"
-msgstr "Default Free/Busy Server"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
-msgid "Display"
-msgstr "Display"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
-msgid "Display alarms in _notification area only"
-msgstr "Display alarms in _notification area only"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:738
-msgid "Friday"
-msgstr "Friday"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
-#: ../modules/addressbook/addressbook-config.c:1005
-#: ../plugins/itip-formatter/itip-formatter.c:2678
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:21
-msgid "General"
-msgstr "General"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
-msgid "Hours"
-msgstr "Hours"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
-msgid "Minutes"
-msgstr "Minutes"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:734
-msgid "Monday"
-msgstr "Monday"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../mail/mail-config.ui.h:85
-msgid "Pick a color"
-msgstr "Pick a colour"
-
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
-msgid "S_un"
-msgstr "S_un"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:739
-msgid "Saturday"
-msgstr "Saturday"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
-msgid "Sc_roll Month View by a week"
-msgstr "Sc_roll Month View by a week"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
-msgid "Se_cond zone:"
-msgstr "Se_cond zone:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
-msgid "Select the calendars for alarm notification"
-msgstr "Select the calendars for alarm notification"
-
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
-msgid "Sh_ow a reminder"
-msgstr "Sh_ow a reminder"
-
-#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
-msgid "Show a _reminder"
-msgstr "Show a _reminder"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-msgid "Show week _numbers"
-msgstr "Show week _numbers"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:733
-msgid "Sunday"
-msgstr "Sunday"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
-msgid "T_asks due today:"
-msgstr "T_asks due today:"
-
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
-msgid "T_hu"
-msgstr "T_hu"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/calendar-setup.c:381
-msgid "Task List"
-msgstr "Task List"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
-msgid "Template:"
-msgstr "Template:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:737
-msgid "Thursday"
-msgstr "Thursday"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
-#: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:595
-msgid "Time"
-msgstr "Time"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/event-page.ui.h:9
-msgid "Time _zone:"
-msgstr "Time _zone:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
-msgid "Time format:"
-msgstr "Time format:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:735
-msgid "Tuesday"
-msgstr "Tuesday"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
-msgid "Use s_ystem time zone"
-msgstr "Use s_ystem time zone"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:736
-msgid "Wednesday"
-msgstr "Wednesday"
-
-#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
-msgid "Wee_k starts on:"
-msgstr "Wee_k starts on:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
-#: ../modules/calendar/e-cal-shell-view-actions.c:1639
-msgid "Work Week"
-msgstr "Work Week"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
-msgid "Work days:"
-msgstr "Work days:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
-msgid "_12 hour (AM/PM)"
-msgstr "_12 hour (AM/PM)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
-msgid "_24 hour"
-msgstr "_24 hour"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
-msgid "_Ask for confirmation when deleting items"
-msgstr "_Ask for confirmation when deleting items"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
-msgid "_Compress weekends in month view"
-msgstr "_Compress weekends in month view"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
-msgid "_Day begins:"
-msgstr "_Day begins:"
-
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
-msgid "_Fri"
-msgstr "_Fri"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
-msgid "_Hide completed tasks after"
-msgstr "_Hide completed tasks after"
-
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
-msgid "_Mon"
-msgstr "_Mon"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
-msgid "_Overdue tasks:"
-msgstr "_Overdue tasks:"
-
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
-msgid "_Sat"
-msgstr "_Sat"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
-msgid "_Show appointment end times in week and month view"
-msgstr "_Show appointment end times in week and month view"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
-msgid "_Time divisions:"
-msgstr "_Time divisions:"
-
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
-msgid "_Tue"
-msgstr "_Tue"
-
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
-msgid "_Wed"
-msgstr "_Wed"
-
-#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
-msgid "before every anniversary/birthday"
-msgstr "before every anniversary/birthday"
-
-#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
-msgid "before every appointment"
-msgstr "before every appointment"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:153
+#: ../calendar/gui/dialogs/calendar-setup.c:159
 msgid "Type:"
 msgstr "Type:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:510
+#: ../calendar/gui/dialogs/calendar-setup.c:175
+#: ../modules/addressbook/addressbook-config.c:513
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
+#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:150
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../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:286
+#: ../widgets/misc/e-signature-script-dialog.c:285
 msgid "_Name:"
 msgstr "_Name:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:276
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Cop_y calendar contents locally for offline operation"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:278
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Cop_y task list contents locally for offline operation"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:280
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Cop_y memo list contents locally for offline operation"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
+#: ../calendar/gui/dialogs/calendar-setup.c:352
 msgid "Colo_r:"
 msgstr "Colou_r:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:375
+#: ../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/calendar/e-calendar-preferences.ui.h:19
+#: ../plugins/itip-formatter/itip-formatter.c:2818
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "General"
+msgstr "General"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:387
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Task List"
+msgstr "Task List"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:398
 msgid "Memo List"
 msgstr "Memo List"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:483
 msgid "Calendar Properties"
 msgstr "Calendar Properties"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:483
 msgid "New Calendar"
 msgstr "New Calendar"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:539
 msgid "Task List Properties"
 msgstr "Task List Properties"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:539
 msgid "New Task List"
 msgstr "New Task List"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:595
 msgid "Memo List Properties"
 msgstr "Memo List Properties"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:595
 msgid "New Memo List"
 msgstr "New Memo List"
 
@@ -3356,237 +2499,237 @@ msgstr "%s  You have made no changes, update the editor?"
 msgid "Validation error: %s"
 msgstr "Validation error: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:246
+#: ../calendar/gui/dialogs/comp-editor.c:266
 msgid "Could not save attachments"
 msgstr "Could not save attachments"
 
-#: ../calendar/gui/dialogs/comp-editor.c:522
+#: ../calendar/gui/dialogs/comp-editor.c:542
 msgid "Could not update object"
 msgstr "Could not update object"
 
-#: ../calendar/gui/dialogs/comp-editor.c:637
+#: ../calendar/gui/dialogs/comp-editor.c:657
 msgid "Edit Appointment"
 msgstr "Edit Appointment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:644
+#: ../calendar/gui/dialogs/comp-editor.c:664
 #, c-format
 msgid "Meeting - %s"
 msgstr "Meeting â?? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:646
+#: ../calendar/gui/dialogs/comp-editor.c:666
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appointment â?? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:652
+#: ../calendar/gui/dialogs/comp-editor.c:672
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Assigned Task â?? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:654
+#: ../calendar/gui/dialogs/comp-editor.c:674
 #, c-format
 msgid "Task - %s"
 msgstr "Task â?? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:679
 #, c-format
 msgid "Memo - %s"
 msgstr "Memo â?? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:675
+#: ../calendar/gui/dialogs/comp-editor.c:695
 msgid "No Summary"
 msgstr "No Summary"
 
-#: ../calendar/gui/dialogs/comp-editor.c:786
+#: ../calendar/gui/dialogs/comp-editor.c:816
 msgid "Keep original item?"
 msgstr "Keep original item?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983
+#: ../calendar/gui/dialogs/comp-editor.c:1012
 msgid "Click here to close the current window"
 msgstr "Click here to close the current window"
 
-#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1454
+#: ../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:413 ../widgets/misc/e-web-view.c:1066
+#: ../widgets/misc/e-web-view.c:412 ../widgets/misc/e-web-view.c:1065
 msgid "Copy the selection"
 msgstr "Copy the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1461
+#: ../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:1060
+#: ../widgets/misc/e-web-view.c:1059
 msgid "Cut the selection"
 msgstr "Cut the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1004
-#: ../shell/e-shell-window-actions.c:1468
+#: ../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
 msgid "Delete the selection"
 msgstr "Delete the selection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1011
+#: ../calendar/gui/dialogs/comp-editor.c:1040
 msgid "Click here to view help available"
 msgstr "Click here to view help available"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1503
+#: ../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:1072
+#: ../widgets/misc/e-web-view.c:1071
 msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1039
+#: ../calendar/gui/dialogs/comp-editor.c:1068
 msgid "Click here to save the current window"
 msgstr "Click here to save the current window"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1573
+#: ../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
 msgid "Select all text"
 msgstr "Select all text"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1053
+#: ../calendar/gui/dialogs/comp-editor.c:1082
 msgid "_Classification"
 msgstr "_Classification"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:174
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1581
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1615
-#: ../widgets/misc/e-signature-editor.c:220
+#: ../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
 msgid "_File"
 msgstr "_File"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1074
-#: ../shell/e-shell-window-actions.c:1622
+#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../shell/e-shell-window-actions.c:1595
 msgid "_Help"
 msgstr "_Help"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1110
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../composer/e-composer-actions.c:315
+#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../composer/e-composer-actions.c:301
 msgid "_Options"
 msgstr "_Options"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:46
+#: ../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
 msgid "_View"
 msgstr "_View"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
-#: ../composer/e-composer-actions.c:243
+#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../composer/e-composer-actions.c:257
 msgid "_Attachment..."
 msgstr "_Attachmentâ?¦"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1107
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Click here to attach a file"
 msgstr "Click here to attach a file"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1144
 msgid "_Categories"
 msgstr "_Categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "Toggles whether to display categories"
 msgstr "Toggles whether to display categories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "Time _Zone"
 msgstr "Time _Zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1154
 msgid "Toggles whether the time zone is displayed"
 msgstr "Toggles whether the time zone is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1165
 msgid "Classify as public"
 msgstr "Classify as public"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1170
 msgid "_Private"
 msgstr "_Private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1172
 msgid "Classify as private"
 msgstr "Classify as private"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/comp-editor.c:1177
 msgid "_Confidential"
 msgstr "_Confidential"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1179
 msgid "Classify as confidential"
 msgstr "Classify as confidential"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158
+#: ../calendar/gui/dialogs/comp-editor.c:1187
 msgid "R_ole Field"
 msgstr "R_ole Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1189
 msgid "Toggles whether the Role field is displayed"
 msgstr "Toggles whether the Role field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1166
+#: ../calendar/gui/dialogs/comp-editor.c:1195
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1168
+#: ../calendar/gui/dialogs/comp-editor.c:1197
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Toggles whether the RSVP field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1174
+#: ../calendar/gui/dialogs/comp-editor.c:1203
 msgid "_Status Field"
 msgstr "_Status Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1205
 msgid "Toggles whether the Status field is displayed"
 msgstr "Toggles whether the Status field is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1211
 msgid "_Type Field"
 msgstr "_Type Field"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1184
+#: ../calendar/gui/dialogs/comp-editor.c:1213
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Toggles whether the Attendee Type is displayed"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1208
+#: ../calendar/gui/dialogs/comp-editor.c:1237
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "Recent _Documents"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1743
-#: ../composer/e-composer-actions.c:431
+#: ../calendar/gui/dialogs/comp-editor.c:1911
+#: ../composer/e-composer-actions.c:461
 msgid "Attach"
 msgstr "Attach"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2072
-#: ../calendar/gui/dialogs/comp-editor.c:2121
-#: ../calendar/gui/dialogs/comp-editor.c:3086
+#: ../calendar/gui/dialogs/comp-editor.c:2240
+#: ../calendar/gui/dialogs/comp-editor.c:2403
+#: ../calendar/gui/dialogs/comp-editor.c:3370
 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:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3334
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "attachment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3118
+#: ../calendar/gui/dialogs/comp-editor.c:3402
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
@@ -3602,11 +2745,11 @@ msgstr "Could not open destination"
 msgid "Destination is read only"
 msgstr "Destination is read only"
 
-#: ../calendar/gui/dialogs/delete-comp.c:214
+#: ../calendar/gui/dialogs/delete-comp.c:210
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Delete this item from all other recipient's mailboxes?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:217
+#: ../calendar/gui/dialogs/delete-comp.c:213
 msgid "_Retract comment"
 msgstr "_Retract comment"
 
@@ -3686,147 +2829,147 @@ msgstr "Delegate To:"
 msgid "Enter Delegate"
 msgstr "Enter Delegate"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:216
 msgid "_Alarms"
 msgstr "_Alarms"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:218
 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:227
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "Show Time as _Busy"
 msgstr "Show Time as _Busy"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to show time as busy"
 msgstr "Toggles whether to show time as busy"
 
-#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "_Recurrence"
 msgstr "_Recurrence"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Make this a recurring event"
 msgstr "Make this a recurring event"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:210
+#: ../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:247
-#: ../calendar/gui/dialogs/task-editor.c:129
+#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "Insert advanced send options"
 
-#: ../calendar/gui/dialogs/event-editor.c:255
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "All _Day Event"
 msgstr "All _Day Event"
 
-#: ../calendar/gui/dialogs/event-editor.c:257
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Toggles whether to have All Day Event"
 msgstr "Toggles whether to have All Day Event"
 
-#: ../calendar/gui/dialogs/event-editor.c:266
+#: ../calendar/gui/dialogs/event-editor.c:265
 msgid "_Free/Busy"
 msgstr "_Free/Busy"
 
-#: ../calendar/gui/dialogs/event-editor.c:268
+#: ../calendar/gui/dialogs/event-editor.c:267
 msgid "Query free / busy information for the attendees"
 msgstr "Query free / busy information for the attendees"
 
-#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2610
+#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3140
 msgid "Appointment"
 msgstr "Appointment"
 
-#: ../calendar/gui/dialogs/event-editor.c:385
+#: ../calendar/gui/dialogs/event-editor.c:388
 #: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "Attendees"
 
-#: ../calendar/gui/dialogs/event-editor.c:578
+#: ../calendar/gui/dialogs/event-editor.c:582
 msgid "Print this event"
 msgstr "Print this event"
 
-#: ../calendar/gui/dialogs/event-page.c:766
+#: ../calendar/gui/dialogs/event-page.c:771
 msgid "Event's start time is in the past"
 msgstr "Event's start time is in the past"
 
-#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:812
 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:811
+#: ../calendar/gui/dialogs/event-page.c:816
 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:823
-#: ../calendar/gui/dialogs/event-page.c:2775
+#: ../calendar/gui/dialogs/event-page.c:828
+#: ../calendar/gui/dialogs/event-page.c:2784
 msgid "This event has alarms"
 msgstr "This event has alarms"
 
-#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/event-page.c:895
 #: ../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:937
+#: ../calendar/gui/dialogs/event-page.c:942
 msgid "_Delegatees"
 msgstr "_Delegatees"
 
-#: ../calendar/gui/dialogs/event-page.c:939
+#: ../calendar/gui/dialogs/event-page.c:944
 msgid "Atte_ndees"
 msgstr "Atte_ndees"
 
-#: ../calendar/gui/dialogs/event-page.c:1154
+#: ../calendar/gui/dialogs/event-page.c:1159
 msgid "Event with no start date"
 msgstr "Event with no start date"
 
-#: ../calendar/gui/dialogs/event-page.c:1157
+#: ../calendar/gui/dialogs/event-page.c:1162
 msgid "Event with no end date"
 msgstr "Event with no end date"
 
-#: ../calendar/gui/dialogs/event-page.c:1328
-#: ../calendar/gui/dialogs/memo-page.c:686
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/event-page.c:1333
+#: ../calendar/gui/dialogs/memo-page.c:689
+#: ../calendar/gui/dialogs/task-page.c:909
 msgid "Start date is wrong"
 msgstr "Start date is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1338
+#: ../calendar/gui/dialogs/event-page.c:1343
 msgid "End date is wrong"
 msgstr "End date is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1361
+#: ../calendar/gui/dialogs/event-page.c:1366
 msgid "Start time is wrong"
 msgstr "Start time is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1368
+#: ../calendar/gui/dialogs/event-page.c:1373
 msgid "End time is wrong"
 msgstr "End time is wrong"
 
-#: ../calendar/gui/dialogs/event-page.c:1530
-#: ../calendar/gui/dialogs/memo-page.c:727
-#: ../calendar/gui/dialogs/task-page.c:967
+#: ../calendar/gui/dialogs/event-page.c:1537
+#: ../calendar/gui/dialogs/memo-page.c:730
+#: ../calendar/gui/dialogs/task-page.c:971
 msgid "The organizer selected no longer has an account."
 msgstr "The organiser selected no longer has an account."
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/memo-page.c:733
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/event-page.c:1543
+#: ../calendar/gui/dialogs/memo-page.c:736
+#: ../calendar/gui/dialogs/task-page.c:977
 msgid "An organizer is required."
 msgstr "An organiser is required."
 
-#: ../calendar/gui/dialogs/event-page.c:1561
-#: ../calendar/gui/dialogs/task-page.c:997
+#: ../calendar/gui/dialogs/event-page.c:1568
+#: ../calendar/gui/dialogs/task-page.c:1001
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: ../calendar/gui/dialogs/event-page.c:2649
+#: ../calendar/gui/dialogs/event-page.c:2658
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Unable to open the calendar '%s'."
@@ -3837,47 +2980,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:2693
-#: ../calendar/gui/dialogs/memo-page.c:946
-#: ../calendar/gui/dialogs/task-page.c:1787
+#: ../calendar/gui/dialogs/event-page.c:2702
+#: ../calendar/gui/dialogs/memo-page.c:949
+#: ../calendar/gui/dialogs/task-page.c:1791
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "You are acting on behalf of %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2994
+#: ../calendar/gui/dialogs/event-page.c:3013
 #, 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:3000
+#: ../calendar/gui/dialogs/event-page.c:3019
 #, 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:3006
+#: ../calendar/gui/dialogs/event-page.c:3025
 #, 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:3019
+#: ../calendar/gui/dialogs/event-page.c:3044
 msgid "Customize"
 msgstr "Customise"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3021
+#: ../calendar/gui/dialogs/event-page.c:3050
 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:578
+#: ../calendar/gui/e-meeting-time-sel.c:566
 msgid "Atte_ndees..."
 msgstr "Atte_ndeesâ?¦"
 
@@ -3889,6 +3032,11 @@ msgstr "Custom Alarm:"
 msgid "Event Description"
 msgstr "Event Description"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+msgid "Time _zone:"
+msgstr "Time _zone:"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "_Alarm"
 msgstr "_Alarm"
@@ -3901,7 +3049,7 @@ msgid "_Description:"
 msgstr "_Description:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:13
-#: ../plugins/calendar-weather/calendar-weather.c:358
+#: ../plugins/calendar-weather/calendar-weather.c:361
 msgid "_Location:"
 msgstr "_Location:"
 
@@ -3943,7 +3091,7 @@ msgctxt "eventpage"
 msgid "until"
 msgstr "until"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2614
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3144
 msgid "Memo"
 msgstr "Memo"
 
@@ -3951,27 +3099,27 @@ msgstr "Memo"
 msgid "Print this memo"
 msgstr "Print this memo"
 
-#: ../calendar/gui/dialogs/memo-page.c:338
+#: ../calendar/gui/dialogs/memo-page.c:341
 msgid "Memo's start date is in the past"
 msgstr "Memo's start date is in the past"
 
-#: ../calendar/gui/dialogs/memo-page.c:376
+#: ../calendar/gui/dialogs/memo-page.c:379
 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:380
+#: ../calendar/gui/dialogs/memo-page.c:383
 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:907
+#: ../calendar/gui/dialogs/memo-page.c:910
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Unable to open memos in '%s'."
 
-#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:270
-#: ../em-format/em-format.c:1040 ../mail/em-format-html.c:2289
-#: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
+#: ../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
 msgid "To"
 msgstr "To"
 
@@ -3990,7 +3138,7 @@ msgid "T_o:"
 msgstr "T_o:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.c:428
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Group:"
@@ -4031,21 +3179,21 @@ msgstr "This and Future Instances"
 msgid "All Instances"
 msgstr "All Instances"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:569
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "This appointment contains recurrences that Evolution cannot edit."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:901
 msgid "Recurrence date is invalid"
 msgstr "Recurrence date is invalid"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:941
 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:961
+#: ../calendar/gui/dialogs/recurrence-page.c:971
 msgid "on"
 msgstr "on"
 
@@ -4053,7 +3201,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:1018
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "first"
 msgstr "first"
 
@@ -4062,7 +3210,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:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1035
 msgid "second"
 msgstr "second"
 
@@ -4070,7 +3218,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:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1040
 msgid "third"
 msgstr "third"
 
@@ -4078,7 +3226,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:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 msgid "fourth"
 msgstr "fourth"
 
@@ -4086,7 +3234,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:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
 msgid "fifth"
 msgstr "fifth"
 
@@ -4094,13 +3242,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:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1055
 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:1068
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "Other Date"
 msgstr "Other Date"
 
@@ -4108,7 +3256,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:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 msgid "1st to 10th"
 msgstr "1st to 10th"
 
@@ -4116,7 +3264,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:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 msgid "11th to 20th"
 msgstr "11th to 20th"
 
@@ -4124,45 +3272,80 @@ 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:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
 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
+#. (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:1111
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 msgid "day"
 msgstr "day"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "Monday"
+msgstr "Monday"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1124
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
+msgid "Tuesday"
+msgstr "Tuesday"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1125
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+msgid "Wednesday"
+msgstr "Wednesday"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1126
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
+msgid "Thursday"
+msgstr "Thursday"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1127
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+msgid "Friday"
+msgstr "Friday"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
+msgid "Saturday"
+msgstr "Saturday"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1129
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
+msgid "Sunday"
+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:1240
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
 msgid "on the"
 msgstr "on the"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1412
+#: ../calendar/gui/dialogs/recurrence-page.c:1425
 msgid "occurrences"
 msgstr "occurrences"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2119
+#: ../calendar/gui/dialogs/recurrence-page.c:2132
 msgid "Add exception"
 msgstr "Add exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2160
+#: ../calendar/gui/dialogs/recurrence-page.c:2173
 msgid "Could not get a selection to modify."
 msgstr "Could not get a selection to modify."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2166
+#: ../calendar/gui/dialogs/recurrence-page.c:2179
 msgid "Modify exception"
 msgstr "Modify exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2223
 msgid "Could not get a selection to delete."
 msgstr "Could not get a selection to delete."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2337
+#: ../calendar/gui/dialogs/recurrence-page.c:2357
 msgid "Date/Time"
 msgstr "Date/Time"
 
@@ -4174,7 +3357,7 @@ msgstr "Every"
 msgid "Exceptions"
 msgstr "Exceptions"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:79
 msgid "Preview"
 msgstr "Preview"
 
@@ -4224,91 +3407,90 @@ msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "year(s)"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:193
 msgid "Send my alarms with this event"
 msgstr "Send my alarms with this event"
 
-#: ../calendar/gui/dialogs/send-comp.c:164
+#: ../calendar/gui/dialogs/send-comp.c:195
 msgid "Notify new attendees _only"
 msgstr "Notify new attendees _only"
 
-#: ../calendar/gui/dialogs/task-details-page.c:350
-#: ../calendar/gui/dialogs/task-details-page.c:372
+#: ../calendar/gui/dialogs/task-details-page.c:356
+#: ../calendar/gui/dialogs/task-details-page.c:378
 msgid "Completed date is wrong"
 msgstr "Completed date is wrong"
 
-#: ../calendar/gui/dialogs/task-details-page.c:483
+#: ../calendar/gui/dialogs/task-details-page.c:489
 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:295
-#: ../calendar/gui/e-cal-model-tasks.c:443
-#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
-#: ../calendar/gui/print.c:2697 ../mail/em-sync-stream.c:151
-#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#: ../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
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
 msgstr "Cancelled"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:441
-#: ../calendar/gui/e-cal-model-tasks.c:715
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
-#: ../calendar/gui/print.c:2694 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../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/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:314
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1183 ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../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
 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:289
-#: ../calendar/gui/e-cal-model-tasks.c:439
-#: ../calendar/gui/e-cal-model-tasks.c:713
-#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
-#: ../calendar/gui/print.c:2691
+#: ../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
 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:318
-#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1181 ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../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
 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:316
-#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1182
+#: ../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
 #: ../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:299
-#: ../calendar/gui/e-cal-model-tasks.c:437
-#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
-#: ../calendar/gui/print.c:2688 ../calendar/gui/tasktypes.xml.h:18
+#: ../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
 msgid "Not Started"
 msgstr "Not Started"
 
@@ -4324,7 +3506,7 @@ 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:1773
+#: ../calendar/gui/e-calendar-view.c:1840
 #: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4334,7 +3516,7 @@ msgstr "Status"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "Undefined"
@@ -4352,20 +3534,20 @@ msgstr "_Priority:"
 msgid "_Web Page:"
 msgstr "_Web Page:"
 
-#: ../calendar/gui/dialogs/task-editor.c:117
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "_Status Details"
 msgstr "_Status Details"
 
-#: ../calendar/gui/dialogs/task-editor.c:119
+#: ../calendar/gui/dialogs/task-editor.c:118
 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:127
+#: ../calendar/gui/dialogs/task-editor.c:126
 #: ../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:2612
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:3142
 #: ../widgets/misc/e-send-options.c:503
 msgid "Task"
 msgstr "Task"
@@ -4378,32 +3560,32 @@ msgstr "Task Details"
 msgid "Print this task"
 msgstr "Print this task"
 
-#: ../calendar/gui/dialogs/task-page.c:343
+#: ../calendar/gui/dialogs/task-page.c:345
 msgid "Task's start date is in the past"
 msgstr "Task's start date is in the past"
 
-#: ../calendar/gui/dialogs/task-page.c:344
+#: ../calendar/gui/dialogs/task-page.c:346
 msgid "Task's due date is in the past"
 msgstr "Task's due date is in the past"
 
-#: ../calendar/gui/dialogs/task-page.c:379
+#: ../calendar/gui/dialogs/task-page.c:381
 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:383
+#: ../calendar/gui/dialogs/task-page.c:385
 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:434
+#: ../calendar/gui/dialogs/task-page.c:436
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_ser:"
 
-#: ../calendar/gui/dialogs/task-page.c:880
+#: ../calendar/gui/dialogs/task-page.c:882
 msgid "Due date is wrong"
 msgstr "Due date is wrong"
 
-#: ../calendar/gui/dialogs/task-page.c:1744
+#: ../calendar/gui/dialogs/task-page.c:1748
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Unable to open tasks in '%s'."
@@ -4496,7 +3678,7 @@ msgstr "%s at %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:668
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:674
 msgid "Untitled"
 msgstr "Untitled"
 
@@ -4505,37 +3687,33 @@ msgid "Categories:"
 msgstr "Categories:"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Summary:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-component-preview.c:261
 msgid "Start Date:"
 msgstr "Start Date:"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:275
 msgid "Due Date:"
 msgstr "Due Date:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1189
-#: ../plugins/itip-formatter/itip-view.c:1074
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../plugins/itip-formatter/itip-view.c:1075
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Priority:"
 msgstr "Priority:"
 
-#: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:36
 msgid "Description:"
 msgstr "Description:"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
+#: ../calendar/gui/e-cal-component-preview.c:371
 msgid "Web Page:"
 msgstr "Web Page:"
 
@@ -4562,16 +3740,16 @@ msgid "Start Date"
 msgstr "Start Date"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:563
+#: ../calendar/gui/e-task-table.c:568
 msgid "Free"
 msgstr "Free"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:549 ../calendar/gui/e-task-table.c:569
 msgid "Busy"
 msgstr "Busy"
 
-#: ../calendar/gui/e-cal-model-tasks.c:659
+#: ../calendar/gui/e-cal-model-tasks.c:658
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4582,47 +3760,44 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:709
+#: ../calendar/gui/e-cal-model-tasks.c:708
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "None"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
+#: ../calendar/gui/e-meeting-store.c:996
 msgid "Yes"
 msgstr "Yes"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:181
+#: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "No"
 
-#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
-#: ../calendar/gui/e-itip-control.c:1349
-#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-cal-model.c:782 ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
+#: ../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
+#: ../modules/plugin-manager/evolution-plugin-manager.c:98
 #: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2345
-#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../plugins/itip-formatter/itip-formatter.c:2485
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../calendar/gui/e-cal-model.c:1271
+#: ../calendar/gui/e-cal-model.c:1526
 msgid "Recurring"
 msgstr "Recurring"
 
-#: ../calendar/gui/e-cal-model.c:1273
+#: ../calendar/gui/e-cal-model.c:1528
 msgid "Assigned"
 msgstr "Assigned"
 
-#: ../calendar/gui/e-cal-model.c:2175
+#: ../calendar/gui/e-cal-model.c:2608
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
@@ -4666,90 +3841,88 @@ msgstr "Start date"
 msgid "Type"
 msgstr "Type"
 
-#: ../calendar/gui/e-calendar-view.c:407
+#: ../calendar/gui/e-calendar-view.c:430
 msgid "Cut selected events to the clipboard"
 msgstr "Cut selected events to the clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:413
+#: ../calendar/gui/e-calendar-view.c:436
 msgid "Copy selected events to the clipboard"
 msgstr "Copy selected events to the clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:419
+#: ../calendar/gui/e-calendar-view.c:442
 msgid "Paste events from the clipboard"
 msgstr "Paste events from the clipboard"
 
-#: ../calendar/gui/e-calendar-view.c:425
+#: ../calendar/gui/e-calendar-view.c:448
 msgid "Delete selected events"
 msgstr "Delete selected events"
 
-#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
-#: ../calendar/gui/e-task-table.c:266
+#: ../calendar/gui/e-calendar-view.c:467 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
 
-#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:847
-#: ../calendar/gui/e-task-table.c:1070
+#: ../calendar/gui/e-calendar-view.c:661 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-task-table.c:1075
 msgid "Updating objects"
 msgstr "Updating objects"
 
-#: ../calendar/gui/e-calendar-view.c:1720
-#: ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-calendar-view.c:1787
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2333
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../plugins/itip-formatter/itip-formatter.c:2473
 msgid "Accepted"
 msgstr "Accepted"
 
-#: ../calendar/gui/e-calendar-view.c:1721
-#: ../calendar/gui/e-itip-control.c:1205
+#: ../calendar/gui/e-calendar-view.c:1788
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2339
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../plugins/itip-formatter/itip-formatter.c:2479
 msgid "Declined"
 msgstr "Declined"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1789
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
+#: ../calendar/gui/e-meeting-time-sel.c:548
 msgid "Tentative"
 msgstr "Tentative"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1790
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2342
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "Delegated"
 msgstr "Delegated"
 
-#: ../calendar/gui/e-calendar-view.c:1724
+#: ../calendar/gui/e-calendar-view.c:1791
 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:1868 ../calendar/gui/e-memo-table.c:530
-#: ../calendar/gui/e-task-table.c:745
+#: ../calendar/gui/e-calendar-view.c:1935 ../calendar/gui/e-memo-table.c:535
+#: ../calendar/gui/e-task-table.c:750
 #, 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:1872 ../calendar/gui/e-memo-table.c:535
-#: ../calendar/gui/e-task-table.c:748
+#: ../calendar/gui/e-calendar-view.c:1939 ../calendar/gui/e-memo-table.c:540
+#: ../calendar/gui/e-task-table.c:753
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organiser: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1888 ../calendar/gui/print.c:2646
+#: ../calendar/gui/e-calendar-view.c:1955 ../calendar/gui/print.c:3176
 #, c-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1919
+#: ../calendar/gui/e-calendar-view.c:1986
 #, c-format
 msgid "Time: %s %s"
 msgstr "Time: %s %s"
@@ -4777,23 +3950,38 @@ 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:759
+#: ../calendar/gui/e-day-view-time-item.c:761
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minute divisions"
 
-#: ../calendar/gui/e-day-view-time-item.c:780
+#: ../calendar/gui/e-day-view-time-item.c:782
 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
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.c:175
+#: ../modules/calendar/e-calendar-preferences.c:224
+msgctxt "cal-second-zone"
+msgid "None"
+msgstr "None"
+
+#: ../calendar/gui/e-day-view-time-item.c:826
+#: ../calendar/gui/e-timezone-entry.c:319
+#: ../modules/calendar/e-calendar-preferences.c:251
+msgid "Select..."
+msgstr "Selectâ?¦"
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %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-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
+#: ../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
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4803,10 +3991,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1895
-#: ../calendar/gui/e-week-view-main-item.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../modules/calendar/e-cal-shell-view-private.c:1014
+#: ../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
+#: ../modules/calendar/e-cal-shell-view-private.c:1005
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -4815,458 +4003,33 @@ 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:905 ../calendar/gui/e-day-view.c:1911
-#: ../calendar/gui/e-week-view-main-item.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
+#: ../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
+#: ../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:1077 ../calendar/gui/e-week-view.c:749
-#: ../calendar/gui/print.c:819
+#: ../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
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
-#: ../calendar/gui/print.c:821
+#: ../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
 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:2646
+#: ../calendar/gui/e-day-view.c:2609
 #, c-format
 msgid "Week %d"
 msgstr "Week %d"
 
-#: ../calendar/gui/e-itip-control.c:761
-msgid "Recurring:"
-msgstr "Recurring:"
-
-#: ../calendar/gui/e-itip-control.c:765
-msgid "Yes. (Complex Recurrence)"
-msgstr "Yes. (Complex Recurrence)"
-
-#: ../calendar/gui/e-itip-control.c:782
-#, c-format
-msgid "Every day"
-msgid_plural "Every %d days"
-msgstr[0] "Every day"
-msgstr[1] "Every %d days"
-
-#: ../calendar/gui/e-itip-control.c:795
-#, c-format
-msgid "Every week"
-msgid_plural "Every %d weeks"
-msgstr[0] "Every week"
-msgstr[1] "Every %d weeks"
-
-#: ../calendar/gui/e-itip-control.c:802
-#, c-format
-msgid "Every week on "
-msgid_plural "Every %d weeks on "
-msgstr[0] "Every week on "
-msgstr[1] "Every %d weeks on "
-
-#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
-msgid " and "
-msgstr " and "
-
-#: ../calendar/gui/e-itip-control.c:822
-#, c-format
-msgid "The %s day of "
-msgstr "The %s day of "
-
-#: ../calendar/gui/e-itip-control.c:838
-#, c-format
-msgid "The %s %s of "
-msgstr "The %s %s of "
-
-#: ../calendar/gui/e-itip-control.c:849
-#, c-format
-msgid "every month"
-msgid_plural "every %d months"
-msgstr[0] "every month"
-msgstr[1] "every %d months"
-
-#: ../calendar/gui/e-itip-control.c:861
-#, c-format
-msgid "Every year"
-msgid_plural "Every %d years"
-msgstr[0] "Every year"
-msgstr[1] "Every %d years"
-
-#: ../calendar/gui/e-itip-control.c:874
-#, c-format
-msgid "a total of %d time"
-msgid_plural "a total of %d times"
-msgstr[0] "a total of %d time"
-msgstr[1] "a total of %d times"
-
-#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
-msgid ", ending on "
-msgstr ", ending on "
-
-#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:906
-msgid "Starts"
-msgstr "Starts"
-
-#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:916
-msgid "Ends"
-msgstr "Ends"
-
-#: ../calendar/gui/e-itip-control.c:943
-#: ../plugins/save-calendar/csv-format.c:372
-msgid "Due"
-msgstr "Due"
-
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
-msgid "iCalendar Information"
-msgstr "iCalendar Information"
-
-#. Title
-#: ../calendar/gui/e-itip-control.c:1008
-msgid "iCalendar Error"
-msgstr "iCalendar Error"
-
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
-#: ../plugins/itip-formatter/itip-view.c:362
-#: ../plugins/itip-formatter/itip-view.c:363
-#: ../plugins/itip-formatter/itip-view.c:450
-#: ../plugins/itip-formatter/itip-view.c:451
-#: ../plugins/itip-formatter/itip-view.c:538
-msgid "An unknown person"
-msgstr "An unknown person"
-
-#: ../calendar/gui/e-itip-control.c:1145
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr ""
-"Please review the following information, and then select an action from the "
-"menu below."
-
-#. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1160
-#: ../plugins/itip-formatter/itip-formatter.c:2320
-msgctxt "cal-itip"
-msgid "None"
-msgstr "None"
-
-#: ../calendar/gui/e-itip-control.c:1200
-#: ../plugins/itip-formatter/itip-formatter.c:2336
-msgid "Tentatively Accepted"
-msgstr "Tentatively Accepted"
-
-#: ../calendar/gui/e-itip-control.c:1290
-msgid ""
-"The meeting has been canceled, however it could not be found in your "
-"calendars"
-msgstr ""
-"The meeting has been cancelled, however it could not be found in your "
-"calendars"
-
-#: ../calendar/gui/e-itip-control.c:1292
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
-msgstr ""
-"The task has been cancelled, however it could not be found in your task lists"
-
-#: ../calendar/gui/e-itip-control.c:1369
-#, c-format
-msgid "%s has published meeting information."
-msgstr "%s has published meeting information."
-
-#: ../calendar/gui/e-itip-control.c:1370
-msgid "Meeting Information"
-msgstr "Meeting Information"
-
-#: ../calendar/gui/e-itip-control.c:1376
-#, c-format
-msgid "%s requests the presence of %s at a meeting."
-msgstr "%s requests the presence of %s at a meeting."
-
-#: ../calendar/gui/e-itip-control.c:1378
-#, c-format
-msgid "%s requests your presence at a meeting."
-msgstr "%s requests your presence at a meeting."
-
-#: ../calendar/gui/e-itip-control.c:1379
-msgid "Meeting Proposal"
-msgstr "Meeting Proposal"
-
-#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1385
-#, c-format
-msgid "%s wishes to be added to an existing meeting."
-msgstr "%s wishes to be added to an existing meeting."
-
-#: ../calendar/gui/e-itip-control.c:1386
-msgid "Meeting Update"
-msgstr "Meeting Update"
-
-#: ../calendar/gui/e-itip-control.c:1390
-#, c-format
-msgid "%s wishes to receive the latest meeting information."
-msgstr "%s wishes to receive the latest meeting information."
-
-#: ../calendar/gui/e-itip-control.c:1391
-msgid "Meeting Update Request"
-msgstr "Meeting Update Request"
-
-#: ../calendar/gui/e-itip-control.c:1398
-#, c-format
-msgid "%s has replied to a meeting request."
-msgstr "%s has replied to a meeting request."
-
-#: ../calendar/gui/e-itip-control.c:1399
-msgid "Meeting Reply"
-msgstr "Meeting Reply"
-
-#: ../calendar/gui/e-itip-control.c:1406
-#, c-format
-msgid "%s has canceled a meeting."
-msgstr "%s has cancelled a meeting."
-
-#: ../calendar/gui/e-itip-control.c:1407
-msgid "Meeting Cancelation"
-msgstr "Meeting Cancellation"
-
-#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
-#: ../calendar/gui/e-itip-control.c:1534
-#, c-format
-msgid "%s has sent an unintelligible message."
-msgstr "%s has sent an unintelligible message."
-
-#: ../calendar/gui/e-itip-control.c:1418
-msgid "Bad Meeting Message"
-msgstr "Bad Meeting Message"
-
-#: ../calendar/gui/e-itip-control.c:1445
-#, c-format
-msgid "%s has published task information."
-msgstr "%s has published task information."
-
-#: ../calendar/gui/e-itip-control.c:1446
-msgid "Task Information"
-msgstr "Task Information"
-
-#: ../calendar/gui/e-itip-control.c:1453
-#, c-format
-msgid "%s requests %s to perform a task."
-msgstr "%s requests %s to perform a task."
-
-#: ../calendar/gui/e-itip-control.c:1455
-#, c-format
-msgid "%s requests you perform a task."
-msgstr "%s requests you perform a task."
-
-#: ../calendar/gui/e-itip-control.c:1456
-msgid "Task Proposal"
-msgstr "Task Proposal"
-
-#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1462
-#, c-format
-msgid "%s wishes to be added to an existing task."
-msgstr "%s wishes to be added to an existing task."
-
-#: ../calendar/gui/e-itip-control.c:1463
-msgid "Task Update"
-msgstr "Task Update"
-
-#: ../calendar/gui/e-itip-control.c:1467
-#, c-format
-msgid "%s wishes to receive the latest task information."
-msgstr "%s wishes to receive the latest task information."
-
-#: ../calendar/gui/e-itip-control.c:1468
-msgid "Task Update Request"
-msgstr "Task Update Request"
-
-#: ../calendar/gui/e-itip-control.c:1475
-#, c-format
-msgid "%s has replied to a task assignment."
-msgstr "%s has replied to a task assignment."
-
-#: ../calendar/gui/e-itip-control.c:1476
-msgid "Task Reply"
-msgstr "Task Reply"
-
-#: ../calendar/gui/e-itip-control.c:1483
-#, c-format
-msgid "%s has canceled a task."
-msgstr "%s has cancelled a task."
-
-#: ../calendar/gui/e-itip-control.c:1484
-msgid "Task Cancelation"
-msgstr "Task Cancellation"
-
-#: ../calendar/gui/e-itip-control.c:1495
-msgid "Bad Task Message"
-msgstr "Bad Task Message"
-
-#: ../calendar/gui/e-itip-control.c:1519
-#, c-format
-msgid "%s has published free/busy information."
-msgstr "%s has published free/busy information."
-
-#: ../calendar/gui/e-itip-control.c:1520
-msgid "Free/Busy Information"
-msgstr "Free/Busy Information"
-
-#: ../calendar/gui/e-itip-control.c:1524
-#, c-format
-msgid "%s requests your free/busy information."
-msgstr "%s requests your free/busy information."
-
-#: ../calendar/gui/e-itip-control.c:1525
-msgid "Free/Busy Request"
-msgstr "Free/Busy Request"
-
-#: ../calendar/gui/e-itip-control.c:1529
-#, c-format
-msgid "%s has replied to a free/busy request."
-msgstr "%s has replied to a free/busy request."
-
-#: ../calendar/gui/e-itip-control.c:1530
-msgid "Free/Busy Reply"
-msgstr "Free/Busy Reply"
-
-#: ../calendar/gui/e-itip-control.c:1535
-msgid "Bad Free/Busy Message"
-msgstr "Bad Free/Busy Message"
-
-#: ../calendar/gui/e-itip-control.c:1611
-msgid "The message does not appear to be properly formed"
-msgstr "The message does not appear to be properly formed"
-
-#: ../calendar/gui/e-itip-control.c:1670
-msgid "The message contains only unsupported requests."
-msgstr "The message contains only unsupported requests."
-
-#: ../calendar/gui/e-itip-control.c:1703
-msgid "The attachment does not contain a valid calendar message"
-msgstr "The attachment does not contain a valid calendar message"
-
-#: ../calendar/gui/e-itip-control.c:1741
-msgid "The attachment has no viewable calendar items"
-msgstr "The attachment has no viewable calendar items"
-
-#: ../calendar/gui/e-itip-control.c:1983
-msgid "Update complete\n"
-msgstr "Update complete\n"
-
-#: ../calendar/gui/e-itip-control.c:2017
-msgid "Object is invalid and cannot be updated\n"
-msgstr "Object is invalid and cannot be updated\n"
-
-#: ../calendar/gui/e-itip-control.c:2035
-msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "This response is not from a current attendee.  Add as an attendee?"
-
-#: ../calendar/gui/e-itip-control.c:2053
-msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "Attendee status could not be updated because of an invalid status!\n"
-
-#: ../calendar/gui/e-itip-control.c:2077
-msgid "Attendee status updated\n"
-msgstr "Attendee status updated\n"
-
-#: ../calendar/gui/e-itip-control.c:2084
-#: ../plugins/itip-formatter/itip-formatter.c:1421
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Attendee status can not be updated because the item no longer exists"
-
-#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
-msgid "Item sent!\n"
-msgstr "Item sent!\n"
-
-#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
-msgid "The item could not be sent!\n"
-msgstr "The item could not be sent!\n"
-
-#: ../calendar/gui/e-itip-control.c:2273
-msgid "Choose an action:"
-msgstr "Choose an action:"
-
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2302
-#: ../calendar/gui/e-meeting-list-view.c:582
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: ../calendar/gui/e-itip-control.c:2342
-msgid "Update"
-msgstr "Update"
-
-#: ../calendar/gui/e-itip-control.c:2366
-#: ../plugins/groupwise-features/gw-ui.c:331
-msgid "Accept"
-msgstr "Accept"
-
-#: ../calendar/gui/e-itip-control.c:2367
-msgid "Tentatively accept"
-msgstr "Tentatively accept"
-
-#: ../calendar/gui/e-itip-control.c:2368
-#: ../plugins/groupwise-features/gw-ui.c:345
-msgid "Decline"
-msgstr "Decline"
-
-#: ../calendar/gui/e-itip-control.c:2393
-msgid "Send Free/Busy Information"
-msgstr "Send Free/Busy Information"
-
-#: ../calendar/gui/e-itip-control.c:2417
-msgid "Update respondent status"
-msgstr "Update respondent status"
-
-#: ../calendar/gui/e-itip-control.c:2441
-msgid "Send Latest Information"
-msgstr "Send Latest Information"
-
-#: ../calendar/gui/e-itip-control.c:2465
-#: ../modules/mail/e-mail-shell-view-actions.c:1036
-#: ../widgets/misc/e-activity-proxy.c:300
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../calendar/gui/e-itip-control.ui.h:1
-msgid "--to--"
-msgstr "--to--"
-
-#: ../calendar/gui/e-itip-control.ui.h:2
-msgid "Calendar Message"
-msgstr "Calendar Message"
-
-#: ../calendar/gui/e-itip-control.ui.h:3
-msgid "Date:"
-msgstr "Date:"
-
-#: ../calendar/gui/e-itip-control.ui.h:5
-msgid "Loading Calendar"
-msgstr "Loading Calendar"
-
-#: ../calendar/gui/e-itip-control.ui.h:6
-msgid "Loading calendar..."
-msgstr "Loading calendarâ?¦"
-
-#: ../calendar/gui/e-itip-control.ui.h:7
-msgid "Organizer:"
-msgstr "Organiser:"
-
-#: ../calendar/gui/e-itip-control.ui.h:8
-msgid "Server Message:"
-msgstr "Server Message:"
-
 #: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Chair Persons"
@@ -5284,56 +4047,56 @@ msgid "Resources"
 msgstr "Resources"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../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
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
+#: ../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
 msgid "Group"
 msgstr "Group"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/print.c:970
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1071
 msgid "Resource"
 msgstr "Resource"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/print.c:971
+#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
+#: ../calendar/gui/print.c:1072
 msgid "Room"
 msgstr "Room"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/print.c:1086
 msgid "Chair"
 msgstr "Chair"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../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
 msgid "Required Participant"
 msgstr "Required Participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
-#: ../calendar/gui/print.c:987
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/print.c:1088
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/print.c:988
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/print.c:1089
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:1003
 msgid "Needs Action"
 msgstr "Needs Action"
 
@@ -5342,14 +4105,20 @@ msgstr "Needs Action"
 msgid "Attendee                          "
 msgstr "Attendee                          "
 
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:582
+#: ../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
 msgid "In Process"
 msgstr "In Process"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2376
+#: ../calendar/gui/e-meeting-time-sel-item.c:434
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -5357,74 +4126,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:462
-#: ../calendar/gui/e-meeting-time-sel.c:2407
+#: ../calendar/gui/e-meeting-time-sel-item.c:438
+#: ../calendar/gui/e-meeting-time-sel.c:2428
 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:466
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "Out of Office"
 msgstr "Out of Office"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "No Information"
 msgstr "No Information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:587
 msgid "O_ptions"
 msgstr "O_ptions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../calendar/gui/e-meeting-time-sel.c:605
 msgid "Show _only working hours"
 msgstr "Show _only working hours"
 
-#: ../calendar/gui/e-meeting-time-sel.c:628
+#: ../calendar/gui/e-meeting-time-sel.c:616
 msgid "Show _zoomed out"
 msgstr "Show _zoomed out"
 
-#: ../calendar/gui/e-meeting-time-sel.c:644
+#: ../calendar/gui/e-meeting-time-sel.c:632
 msgid "_Update free/busy"
 msgstr "_Update free/busy"
 
-#: ../calendar/gui/e-meeting-time-sel.c:659
+#: ../calendar/gui/e-meeting-time-sel.c:647
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:677
+#: ../calendar/gui/e-meeting-time-sel.c:665
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../calendar/gui/e-meeting-time-sel.c:680
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:710
+#: ../calendar/gui/e-meeting-time-sel.c:698
 msgid "_All people and resources"
 msgstr "_All people and resources"
 
-#: ../calendar/gui/e-meeting-time-sel.c:720
+#: ../calendar/gui/e-meeting-time-sel.c:708
 msgid "All _people and one resource"
 msgstr "All _people and one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:730
+#: ../calendar/gui/e-meeting-time-sel.c:718
 msgid "_Required people"
 msgstr "_Required people"
 
-#: ../calendar/gui/e-meeting-time-sel.c:739
+#: ../calendar/gui/e-meeting-time-sel.c:727
 msgid "Required people and _one resource"
 msgstr "Required people and _one resource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:785
+#: ../calendar/gui/e-meeting-time-sel.c:776
 msgid "_Start time:"
 msgstr "_Start time:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:822
+#: ../calendar/gui/e-meeting-time-sel.c:816
 msgid "_End time:"
 msgstr "_End time:"
 
@@ -5452,7 +4221,7 @@ msgstr "Language"
 msgid "Member"
 msgstr "Member"
 
-#: ../calendar/gui/e-memo-table.c:414
+#: ../calendar/gui/e-memo-table.c:419
 #: ../modules/calendar/e-cal-shell-content.c:473
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
@@ -5461,38 +4230,38 @@ msgstr "Member"
 msgid "Memos"
 msgstr "Memos"
 
-#: ../calendar/gui/e-memo-table.c:492 ../calendar/gui/e-task-table.c:709
+#: ../calendar/gui/e-memo-table.c:497 ../calendar/gui/e-task-table.c:714
 msgid "* No Summary *"
 msgstr "* No Summary *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:577 ../calendar/gui/e-task-table.c:789
+#: ../calendar/gui/e-memo-table.c:582 ../calendar/gui/e-task-table.c:794
 msgid "Start: "
 msgstr "Start: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:596 ../calendar/gui/e-task-table.c:807
+#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:812
 msgid "Due: "
 msgstr "Due: "
 
-#: ../calendar/gui/e-memo-table.c:712
+#: ../calendar/gui/e-memo-table.c:717
 msgid "Cut selected memos to the clipboard"
 msgstr "Cut selected memos to the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:718
+#: ../calendar/gui/e-memo-table.c:723
 msgid "Copy selected memos to the clipboard"
 msgstr "Copy selected memos to the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:724
+#: ../calendar/gui/e-memo-table.c:729
 msgid "Paste memos from the clipboard"
 msgstr "Paste memos from the clipboard"
 
-#: ../calendar/gui/e-memo-table.c:730
-#: ../modules/calendar/e-memo-shell-view-actions.c:566
+#: ../calendar/gui/e-memo-table.c:735
+#: ../modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Delete selected memos"
 msgstr "Delete selected memos"
 
-#: ../calendar/gui/e-memo-table.c:736
+#: ../calendar/gui/e-memo-table.c:741
 msgid "Select all visible memos"
 msgstr "Select all visible memos"
 
@@ -5504,18 +4273,18 @@ 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:539
+#: ../calendar/gui/e-task-table.c:544
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:631 ../calendar/gui/print.c:2072
+#: ../calendar/gui/e-task-table.c:636 ../calendar/gui/print.c:2140
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
 #: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:437
+#: ../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
@@ -5523,24 +4292,24 @@ msgstr "%d%%"
 msgid "Tasks"
 msgstr "Tasks"
 
-#: ../calendar/gui/e-task-table.c:935
+#: ../calendar/gui/e-task-table.c:940
 msgid "Cut selected tasks to the clipboard"
 msgstr "Cut selected tasks to the clipboard"
 
-#: ../calendar/gui/e-task-table.c:941
+#: ../calendar/gui/e-task-table.c:946
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copy selected tasks to the clipboard"
 
-#: ../calendar/gui/e-task-table.c:947
+#: ../calendar/gui/e-task-table.c:952
 msgid "Paste tasks from the clipboard"
 msgstr "Paste tasks from the clipboard"
 
-#: ../calendar/gui/e-task-table.c:953
-#: ../modules/calendar/e-task-shell-view-actions.c:690
+#: ../calendar/gui/e-task-table.c:958
+#: ../modules/calendar/e-task-shell-view-actions.c:696
 msgid "Delete selected tasks"
 msgstr "Delete selected tasks"
 
-#: ../calendar/gui/e-task-table.c:959
+#: ../calendar/gui/e-task-table.c:964
 msgid "Select all visible tasks"
 msgstr "Select all visible tasks"
 
@@ -5551,7 +4320,7 @@ 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:235 ../calendar/gui/print.c:1725
+#: ../calendar/gui/e-week-view-main-item.c:231 ../calendar/gui/print.c:1828
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -5584,23 +4353,23 @@ msgstr "calendar view event"
 msgid "Grab Focus"
 msgstr "Grab Focus"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New Appointment"
 msgstr "New Appointment"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New All Day Event"
 msgstr "New All Day Event"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "New Meeting"
 msgstr "New Meeting"
 
-#: ../calendar/gui/ea-cal-view.c:307
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Today"
 msgstr "Go to Today"
 
-#: ../calendar/gui/ea-cal-view.c:308
+#: ../calendar/gui/ea-cal-view.c:309
 msgid "Go to Date"
 msgstr "Go to Date"
 
@@ -5609,7 +4378,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:150 ../calendar/gui/ea-week-view.c:149
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5618,14 +4387,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:155 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:153
 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:162
+#: ../calendar/gui/ea-day-view.c:163
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Work Week View: %s. %s"
@@ -5633,47 +4402,47 @@ 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:168
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Day View: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:202
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for a work week"
 msgstr "calendar view for a work week"
 
-#: ../calendar/gui/ea-day-view.c:204
+#: ../calendar/gui/ea-day-view.c:205
 msgid "calendar view for one or more days"
 msgstr "calendar view for one or more days"
 
-#: ../calendar/gui/ea-gnome-calendar.c:48
-#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/gui/ea-gnome-calendar.c:49
+#: ../calendar/gui/ea-gnome-calendar.c:57
 #: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
-#: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1010
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../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:204
-#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../calendar/gui/ea-gnome-calendar.c:205
+#: ../calendar/gui/ea-gnome-calendar.c:210
+#: ../calendar/gui/ea-gnome-calendar.c:212
+#: ../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
-#: ../modules/calendar/e-cal-shell-view-private.c:1023
-#: ../modules/calendar/e-cal-shell-view-private.c:1026
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:228
-#: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../modules/calendar/e-cal-shell-view-private.c:1043
-#: ../modules/calendar/e-cal-shell-view-private.c:1054
-#: ../modules/calendar/e-cal-shell-view-private.c:1061
-#: ../modules/calendar/e-cal-shell-view-private.c:1064
+#: ../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
+#: ../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
+#: ../modules/calendar/e-cal-shell-view-private.c:1055
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -5685,25 +4454,25 @@ 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:157
+#: ../calendar/gui/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Month View: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Week View: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:195
+#: ../calendar/gui/ea-week-view.c:196
 msgid "calendar view for a month"
 msgstr "calendar view for a month"
 
-#: ../calendar/gui/ea-week-view.c:197
+#: ../calendar/gui/ea-week-view.c:198
 msgid "calendar view for one or more weeks"
 msgstr "calendar view for one or more weeks"
 
-#: ../calendar/gui/gnome-cal.c:2311
+#: ../calendar/gui/gnome-cal.c:2198
 msgid "Purging"
 msgstr "Purging"
 
@@ -5756,7 +4525,7 @@ msgid "Select Date"
 msgstr "Select Date"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "Select _Today"
 msgstr "Select _Today"
 
@@ -5764,32 +4533,32 @@ msgstr "Select _Today"
 msgid "September"
 msgstr "September"
 
-#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
-#: ../calendar/gui/itip-utils.c:551
+#: ../calendar/gui/itip-utils.c:407 ../calendar/gui/itip-utils.c:458
+#: ../calendar/gui/itip-utils.c:550
 msgid "An organizer must be set."
 msgstr "An organiser must be set."
 
-#: ../calendar/gui/itip-utils.c:451
+#: ../calendar/gui/itip-utils.c:450
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "Event information"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "Task information"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "Memo information"
 
-#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
+#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
-#: ../calendar/gui/itip-utils.c:644
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "Calendar information"
 
@@ -5797,7 +4566,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:678
+#: ../calendar/gui/itip-utils.c:677
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Accepted"
@@ -5806,7 +4575,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:685
+#: ../calendar/gui/itip-utils.c:684
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
@@ -5818,7 +4587,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:692 ../calendar/gui/itip-utils.c:740
+#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Declined"
@@ -5827,7 +4596,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:699
+#: ../calendar/gui/itip-utils.c:698
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegated"
@@ -5835,7 +4604,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:712
+#: ../calendar/gui/itip-utils.c:711
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Updated"
@@ -5843,7 +4612,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:719
+#: ../calendar/gui/itip-utils.c:718
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Cancel"
@@ -5851,7 +4620,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:726
+#: ../calendar/gui/itip-utils.c:725
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Refresh"
@@ -5859,7 +4628,7 @@ 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:733
+#: ../calendar/gui/itip-utils.c:732
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Counter-proposal"
@@ -5885,225 +4654,213 @@ msgstr "Unable to book a resource, error: "
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "1st"
 msgstr "1st"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "2nd"
 msgstr "2nd"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "3rd"
 msgstr "3rd"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "4th"
 msgstr "4th"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "5th"
 msgstr "5th"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "6th"
 msgstr "6th"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "7th"
 msgstr "7th"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "8th"
 msgstr "8th"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "9th"
 msgstr "9th"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "10th"
 msgstr "10th"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "11th"
 msgstr "11th"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "12th"
 msgstr "12th"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "13th"
 msgstr "13th"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "14th"
 msgstr "14th"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "15th"
 msgstr "15th"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "16th"
 msgstr "16th"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "17th"
 msgstr "17th"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "18th"
 msgstr "18th"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "19th"
 msgstr "19th"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "20th"
 msgstr "20th"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "21st"
 msgstr "21st"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "22nd"
 msgstr "22nd"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "23rd"
 msgstr "23rd"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "24th"
 msgstr "24th"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "25th"
 msgstr "25th"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "26th"
 msgstr "26th"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "27th"
 msgstr "27th"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "28th"
 msgstr "28th"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "29th"
 msgstr "29th"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "30th"
 msgstr "30th"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:548
 msgid "31st"
 msgstr "31st"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "Su"
 msgstr "Su"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "Mo"
 msgstr "Mo"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "Tu"
 msgstr "Tu"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "We"
 msgstr "We"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:606
 msgid "Th"
 msgstr "Th"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:606
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:606
 msgid "Sa"
 msgstr "Sa"
 
-#. Translators: This is part of "START to END" text,
-#. * where START and END are date/times.
-#: ../calendar/gui/print.c:2449
+#: ../calendar/gui/print.c:2969
 msgid " to "
 msgstr " to "
 
-#. Translators: This is part of "START to END
-#. * (Completed COMPLETED)", where COMPLETED is a
-#. * completed date/time.
-#: ../calendar/gui/print.c:2457
+#: ../calendar/gui/print.c:2979
 msgid " (Completed "
 msgstr " (Completed "
 
-#. Translators: This is part of "Completed COMPLETED",
-#. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:2461
+#: ../calendar/gui/print.c:2985
 msgid "Completed "
 msgstr "Completed "
 
-#. Translators: This is part of "START (Due DUE)",
-#. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:2469
+#: ../calendar/gui/print.c:2995
 msgid " (Due "
 msgstr " (Due "
 
-#. Translators: This is part of "Due DUE",
-#. * where DUE is a date/time due the event
-#. * should be finished.
-#: ../calendar/gui/print.c:2474
+#: ../calendar/gui/print.c:3002
 msgid "Due "
 msgstr "Due "
 
-#: ../calendar/gui/print.c:2637
+#: ../calendar/gui/print.c:3167
 #, c-format
 msgid "Summary: %s"
 msgstr "Summary: %s"
 
-#: ../calendar/gui/print.c:2661
+#: ../calendar/gui/print.c:3194
 msgid "Attendees: "
 msgstr "Attendees: "
 
-#: ../calendar/gui/print.c:2704
+#: ../calendar/gui/print.c:3237
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2719
+#: ../calendar/gui/print.c:3252
 #, c-format
 msgid "Priority: %s"
 msgstr "Priority: %s"
 
-#: ../calendar/gui/print.c:2737
+#: ../calendar/gui/print.c:3270
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Percent Complete: %i"
 
-#: ../calendar/gui/print.c:2748
+#: ../calendar/gui/print.c:3281
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2761
+#: ../calendar/gui/print.c:3294
 #, c-format
 msgid "Categories: %s"
 msgstr "Categories: %s"
 
-#: ../calendar/gui/print.c:2772
+#: ../calendar/gui/print.c:3305
 msgid "Contacts: "
 msgstr "Contacts: "
 
@@ -6130,7 +4887,7 @@ msgstr "Appointments and Meetings"
 
 #: ../calendar/importers/icalendar-importer.c:350
 #: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1835
+#: ../plugins/itip-formatter/itip-formatter.c:1958
 msgid "Opening calendar"
 msgstr "Opening calendar"
 
@@ -7860,28 +6617,20 @@ msgstr "Pacific/Yap"
 msgid "Save as..."
 msgstr "Save asâ?¦"
 
-#: ../composer/e-composer-actions.c:245
-#: ../widgets/misc/e-attachment-view.c:379
+#: ../composer/e-composer-actions.c:259
+#: ../widgets/misc/e-attachment-view.c:380
 msgid "Attach a file"
 msgstr "Attach a file"
 
-#: ../composer/e-composer-actions.c:250
-#: ../widgets/misc/e-signature-editor.c:206
+#: ../composer/e-composer-actions.c:264
+#: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "_Close"
 
-#: ../composer/e-composer-actions.c:252
+#: ../composer/e-composer-actions.c:266
 msgid "Close the current file"
 msgstr "Close the current file"
 
-#: ../composer/e-composer-actions.c:257
-msgid "_Print..."
-msgstr "_Printâ?¦"
-
-#: ../composer/e-composer-actions.c:264
-msgid "Print Pre_view"
-msgstr "Print Pre_view"
-
 #: ../composer/e-composer-actions.c:273
 msgid "Save the current file"
 msgstr "Save the current file"
@@ -7895,118 +6644,126 @@ msgid "Save the current file with a different name"
 msgstr "Save the current file with a different name"
 
 #: ../composer/e-composer-actions.c:285
+msgid "New _Message"
+msgstr "New _Message"
+
+#: ../composer/e-composer-actions.c:287
+msgid "Open New Message window"
+msgstr "Open New Message window"
+
+#: ../composer/e-composer-actions.c:294
+msgid "Character _Encoding"
+msgstr "Character _Encoding"
+
+#: ../composer/e-composer-actions.c:311
+msgid "_Print..."
+msgstr "_Printâ?¦"
+
+#: ../composer/e-composer-actions.c:318
+msgid "Print Pre_view"
+msgstr "Print Pre_view"
+
+#: ../composer/e-composer-actions.c:325
 msgid "Save as _Draft"
 msgstr "Save as _Draft"
 
-#: ../composer/e-composer-actions.c:287
+#: ../composer/e-composer-actions.c:327
 msgid "Save as draft"
 msgstr "Save as draft"
 
-#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:297
+#: ../composer/e-composer-actions.c:332 ../composer/e-composer-private.c:318
 msgid "S_end"
 msgstr "S_end"
 
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:334
 msgid "Send this message"
 msgstr "Send this message"
 
-#: ../composer/e-composer-actions.c:299
-msgid "New _Message"
-msgstr "New _Message"
-
-#: ../composer/e-composer-actions.c:301
-msgid "Open New Message window"
-msgstr "Open New Message window"
-
-#: ../composer/e-composer-actions.c:308
-msgid "Character _Encoding"
-msgstr "Character _Encoding"
-
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:342
 msgid "PGP _Encrypt"
 msgstr "PGP _Encrypt"
 
-#: ../composer/e-composer-actions.c:327
+#: ../composer/e-composer-actions.c:344
 msgid "Encrypt this message with PGP"
 msgstr "Encrypt this message with PGP"
 
-#: ../composer/e-composer-actions.c:333
+#: ../composer/e-composer-actions.c:350
 msgid "PGP _Sign"
 msgstr "PGP _Sign"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:352
 msgid "Sign this message with your PGP key"
 msgstr "Sign this message with your PGP key"
 
-#: ../composer/e-composer-actions.c:341
+#: ../composer/e-composer-actions.c:358
 msgid "_Prioritize Message"
 msgstr "_Prioritise Message"
 
-#: ../composer/e-composer-actions.c:343
+#: ../composer/e-composer-actions.c:360
 msgid "Set the message priority to high"
 msgstr "Set the message priority to high"
 
-#: ../composer/e-composer-actions.c:349
+#: ../composer/e-composer-actions.c:366
 msgid "Re_quest Read Receipt"
 msgstr "Re_quest Read Receipt"
 
-#: ../composer/e-composer-actions.c:351
+#: ../composer/e-composer-actions.c:368
 msgid "Get delivery notification when your message is read"
 msgstr "Get delivery notification when your message is read"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:374
 msgid "S/MIME En_crypt"
 msgstr "S/MIME En_crypt"
 
-#: ../composer/e-composer-actions.c:359
+#: ../composer/e-composer-actions.c:376
 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:365
+#: ../composer/e-composer-actions.c:382
 msgid "S/MIME Sig_n"
 msgstr "S/MIME Sig_n"
 
-#: ../composer/e-composer-actions.c:367
+#: ../composer/e-composer-actions.c:384
 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:373
+#: ../composer/e-composer-actions.c:390
 msgid "_Bcc Field"
 msgstr "_Bcc Field"
 
-#: ../composer/e-composer-actions.c:375
+#: ../composer/e-composer-actions.c:392
 msgid "Toggles whether the BCC field is displayed"
-msgstr "Toggles whether the BCC field is displayed"
+msgstr "Toggles whether the Bcc field is displayed"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:398
 msgid "_Cc Field"
 msgstr "_Cc Field"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:400
 msgid "Toggles whether the CC field is displayed"
-msgstr "Toggles whether the CC field is displayed"
+msgstr "Toggles whether the Cc field is displayed"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:406
 msgid "_Reply-To Field"
 msgstr "_Reply-To Field"
 
-#: ../composer/e-composer-actions.c:391
+#: ../composer/e-composer-actions.c:408
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Toggles whether the Reply-To field is displayed"
 
-#: ../composer/e-composer-actions.c:434
+#: ../composer/e-composer-actions.c:464
 msgid "Save Draft"
 msgstr "Save Draft"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the recipients of the message"
 msgstr "Enter the recipients of the message"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Enter the addresses that will receive a carbon copy of the message"
 
-#: ../composer/e-composer-header-table.c:46
+#: ../composer/e-composer-header-table.c:45
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8014,35 +6771,35 @@ 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:1005
+#: ../composer/e-composer-header-table.c:1006
 msgid "Fr_om:"
 msgstr "Fr_om:"
 
-#: ../composer/e-composer-header-table.c:1014
+#: ../composer/e-composer-header-table.c:1015
 msgid "_Reply-To:"
 msgstr "_Reply-To:"
 
-#: ../composer/e-composer-header-table.c:1018
+#: ../composer/e-composer-header-table.c:1019
 msgid "_To:"
 msgstr "_To:"
 
-#: ../composer/e-composer-header-table.c:1023
+#: ../composer/e-composer-header-table.c:1024
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:1028
+#: ../composer/e-composer-header-table.c:1029
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:1033
+#: ../composer/e-composer-header-table.c:1034
 msgid "_Post To:"
 msgstr "_Post To:"
 
-#: ../composer/e-composer-header-table.c:1037
+#: ../composer/e-composer-header-table.c:1038
 msgid "S_ubject:"
 msgstr "S_ubject:"
 
-#: ../composer/e-composer-header-table.c:1046
+#: ../composer/e-composer-header-table.c:1047
 msgid "Si_gnature:"
 msgstr "Si_gnature:"
 
@@ -8054,40 +6811,34 @@ msgstr "Click here for the address book"
 msgid "Click here to select folders to post to"
 msgstr "Click here to select folders to post to"
 
-#: ../composer/e-composer-private.c:215
+#: ../composer/e-composer-private.c:217
 msgid "Undo the last action"
 msgstr "Undo the last action"
 
-#: ../composer/e-composer-private.c:219
+#: ../composer/e-composer-private.c:221
 msgid "Redo the last undone action"
 msgstr "Redo the last undone action"
 
-#: ../composer/e-composer-private.c:223
+#: ../composer/e-composer-private.c:225
 msgid "Search for text"
 msgstr "Search for text"
 
-#: ../composer/e-composer-private.c:227
+#: ../composer/e-composer-private.c:229
 msgid "Search for and replace text"
 msgstr "Search for and replace text"
 
-#: ../composer/e-composer-private.c:317
+#: ../composer/e-composer-private.c:338
 msgid "Save draft"
 msgstr "Save draft"
 
-#. Check buttons
-#: ../composer/e-msg-composer.c:197
-#: ../plugins/attachment-reminder/attachment-reminder.c:117
-msgid "_Do not show this message again."
-msgstr "_Do not show this message again."
-
-#: ../composer/e-msg-composer.c:1030
+#: ../composer/e-msg-composer.c:784
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 
-#: ../composer/e-msg-composer.c:1042
+#: ../composer/e-msg-composer.c:793
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -8096,15 +6847,15 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 
-#: ../composer/e-msg-composer.c:1466 ../composer/e-msg-composer.c:1811
+#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2014
 msgid "Compose Message"
 msgstr "Compose Message"
 
-#: ../composer/e-msg-composer.c:3477
+#: ../composer/e-msg-composer.c:4082
 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:4085
+#: ../composer/e-msg-composer.c:4787
 msgid "Untitled Message"
 msgstr "Untitled Message"
 
@@ -8121,6 +6872,18 @@ msgid "All accounts have been removed."
 msgstr "All accounts have been removed."
 
 #: ../composer/mail-composer.error.xml.h:3
+msgid "An error occurred while saving to your Drafts folder."
+msgstr "An error occurred while saving to your Drafts folder."
+
+#: ../composer/mail-composer.error.xml.h:4
+msgid "An error occurred while saving to your Outbox folder."
+msgstr "An error occurred while saving to your Outbox folder."
+
+#: ../composer/mail-composer.error.xml.h:5
+msgid "An error occurred while sending. How do you want to proceed?"
+msgstr "An error occurred while sending. How do you want to proceed?"
+
+#: ../composer/mail-composer.error.xml.h:6
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
@@ -8128,16 +6891,26 @@ msgstr ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 
-#: ../composer/mail-composer.error.xml.h:4
+#: ../composer/mail-composer.error.xml.h:7
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 "Because &quot;{0}&quot;, you may need to select different mail options."
 
-#: ../composer/mail-composer.error.xml.h:5
+#: ../composer/mail-composer.error.xml.h:8
 msgid "Because &quot;{1}&quot;."
 msgstr "Because &quot;{1}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:6
+#: ../composer/mail-composer.error.xml.h:9
+msgid ""
+"Because you are working offline, the message will be saved to your local "
+"Outbox folder. When you are back online you can send the message by clicking "
+"the Send/Receive button in Evolution's toolbar."
+msgstr ""
+"Because you are working offline, the message will be saved to your local "
+"Outbox folder. When you are back online you can send the message by clicking "
+"the Send/Receive button in Evolution's toolbar."
+
+#: ../composer/mail-composer.error.xml.h:10
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -8147,39 +6920,35 @@ msgstr ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 
-#: ../composer/mail-composer.error.xml.h:7
-msgid "Could not create composer window."
-msgstr "Could not create composer window."
-
-#: ../composer/mail-composer.error.xml.h:8
+#: ../composer/mail-composer.error.xml.h:11
 msgid "Could not create message."
 msgstr "Could not create message."
 
-#: ../composer/mail-composer.error.xml.h:9
+#: ../composer/mail-composer.error.xml.h:12
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "Could not read signature file &quot;{0}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:10
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "Could not retrieve messages to attach from {0}."
 
-#: ../composer/mail-composer.error.xml.h:11
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "Could not save to autosave file &quot;{0}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:12
+#: ../composer/mail-composer.error.xml.h:15
 msgid "Do you want to recover unfinished messages?"
 msgstr "Do you want to recover unfinished messages?"
 
-#: ../composer/mail-composer.error.xml.h:13
+#: ../composer/mail-composer.error.xml.h:16
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "Download in progress. Do you want to send the mail?"
 
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:17
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Error saving to autosave because &quot;{1}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:18
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -8187,144 +6956,157 @@ msgstr ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:19
+msgid "Saving message to Outbox."
+msgstr "Saving message to Outbox."
+
+#: ../composer/mail-composer.error.xml.h:20
 msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "The file '{0}' is not a regular file and cannot be sent in a message."
 
-#: ../composer/mail-composer.error.xml.h:17
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:117
+msgid "The reported error was &quot;{0}&quot;."
+msgstr "The reported error was &quot;{0}&quot;."
+
+#: ../composer/mail-composer.error.xml.h:22
 msgid ""
-"Unable to activate the HTML editor control.\n"
-"\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
 msgstr ""
-"Unable to activate the HTML editor control.\n"
-"\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
 
-#: ../composer/mail-composer.error.xml.h:20
-msgid "Unable to activate the address selector control."
-msgstr "Unable to activate the address selector control."
+#: ../composer/mail-composer.error.xml.h:23
+msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgstr "The reported error was &quot;{0}&quot;. The message has not been sent."
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:24
 msgid "You cannot attach the file &quot;{0}&quot; to this message."
 msgstr "You cannot attach the file &quot;{0}&quot; to this message."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:25
 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:23
+#. Response codes were chosen somewhat arbitrarily.
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Continue Editing"
 msgstr "_Continue Editing"
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Do not Recover"
 msgstr "_Do not Recover"
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Recover"
 msgstr "_Recover"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Save Draft"
 msgstr "_Save Draft"
 
-#: ../capplet/anjal-settings-main.c:198
+#: ../composer/mail-composer.error.xml.h:32
+msgid "_Save to Outbox"
+msgstr "_Save to Outbox"
+
+#: ../composer/mail-composer.error.xml.h:34
+msgid "_Try Again"
+msgstr "_Try Again"
+
+#: ../capplet/anjal-settings-main.c:223
 msgid "Run Anjal in a window"
 msgstr "Run Anjal in a window"
 
-#: ../capplet/anjal-settings-main.c:199
+#: ../capplet/anjal-settings-main.c:224
 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:206
+#: ../capplet/anjal-settings-main.c:231
 msgid "ID of the socket to embed in"
 msgstr "ID of the socket to embed in"
 
-#: ../capplet/anjal-settings-main.c:207
+#: ../capplet/anjal-settings-main.c:232
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:220
+#: ../capplet/anjal-settings-main.c:245
 msgid "Anjal email client"
 msgstr "Anjal e-mail client"
 
-#: ../capplet/settings/mail-account-view.c:74
+#: ../capplet/settings/mail-account-view.c:73
 msgid "Please enter your full name."
 msgstr "Please enter your full name."
 
-#: ../capplet/settings/mail-account-view.c:75
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your email address."
 msgstr "Please enter your e-mail address."
 
-#: ../capplet/settings/mail-account-view.c:76
+#: ../capplet/settings/mail-account-view.c:75
 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:77
+#: ../capplet/settings/mail-account-view.c:76
 msgid "Please enter your password."
 msgstr "Please enter your password."
 
-#: ../capplet/settings/mail-account-view.c:256
+#: ../capplet/settings/mail-account-view.c:255
 #: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../capplet/settings/mail-account-view.c:360
-#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../capplet/settings/mail-account-view.c:359
+#: ../plugins/google-account-setup/google-contacts-source.c:56
 #: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:464
+#: ../capplet/settings/mail-account-view.c:463
 msgid "Personal details:"
 msgstr "Personal details:"
 
-#: ../capplet/settings/mail-account-view.c:471
+#: ../capplet/settings/mail-account-view.c:470
 msgid "Name:"
 msgstr "Name:"
 
-#: ../capplet/settings/mail-account-view.c:480
+#: ../capplet/settings/mail-account-view.c:479
 msgid "Email address:"
 msgstr "E-mail address:"
 
-#: ../capplet/settings/mail-account-view.c:490
+#: ../capplet/settings/mail-account-view.c:489
 msgid "Details:"
 msgstr "Details:"
 
-#: ../capplet/settings/mail-account-view.c:498
+#: ../capplet/settings/mail-account-view.c:497
 msgid "Receiving"
 msgstr "Receiving"
 
-#: ../capplet/settings/mail-account-view.c:505
+#: ../capplet/settings/mail-account-view.c:504
 msgid "Server type:"
 msgstr "Server type:"
 
-#: ../capplet/settings/mail-account-view.c:514
+#: ../capplet/settings/mail-account-view.c:513
 msgid "Server address:"
 msgstr "Server address:"
 
-#: ../capplet/settings/mail-account-view.c:523
+#: ../capplet/settings/mail-account-view.c:522
 msgid "Username:"
 msgstr "Username:"
 
-#: ../capplet/settings/mail-account-view.c:532
+#: ../capplet/settings/mail-account-view.c:531
 msgid "Use encryption:"
 msgstr "Use encryption:"
 
-#: ../capplet/settings/mail-account-view.c:537
-#: ../capplet/settings/mail-account-view.c:572
+#: ../capplet/settings/mail-account-view.c:536
+#: ../capplet/settings/mail-account-view.c:571
 msgid "never"
 msgstr "never"
 
-#: ../capplet/settings/mail-account-view.c:549
+#: ../capplet/settings/mail-account-view.c:548
 msgid "Sending"
 msgstr "Sending"
 
-#: ../capplet/settings/mail-account-view.c:591
+#: ../capplet/settings/mail-account-view.c:590
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -8335,7 +7117,7 @@ msgstr ""
 "settings. If we can't do it automatically you'll need your server details as "
 "well."
 
-#: ../capplet/settings/mail-account-view.c:593
+#: ../capplet/settings/mail-account-view.c:592
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -8345,11 +7127,11 @@ msgstr ""
 "enter them below. We've tried to make a start with the details you just "
 "entered but you may need to change them."
 
-#: ../capplet/settings/mail-account-view.c:595
+#: ../capplet/settings/mail-account-view.c:594
 msgid "You can specify more options to configure the account."
 msgstr "You can specify more options to configure the account."
 
-#: ../capplet/settings/mail-account-view.c:597
+#: ../capplet/settings/mail-account-view.c:596
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -8357,11 +7139,11 @@ msgstr ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
 
-#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:597
 msgid "You can specify your default settings for your account."
 msgstr "You can specify your default settings for your account."
 
-#: ../capplet/settings/mail-account-view.c:599
+#: ../capplet/settings/mail-account-view.c:598
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -8369,101 +7151,100 @@ msgstr ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
 
-#: ../capplet/settings/mail-account-view.c:614
-#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2222
-#: ../mail/mail-config.ui.h:62
+#: ../capplet/settings/mail-account-view.c:613
+#: ../mail/em-account-editor.c:2088 ../mail/em-account-editor.c:2209
 msgid "Identity"
 msgstr "Identity"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Next - Receiving mail"
 msgstr "Next â?? Receiving mail"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Receiving mail"
 msgstr "Receiving mail"
 
+#: ../capplet/settings/mail-account-view.c:614
 #: ../capplet/settings/mail-account-view.c:615
-#: ../capplet/settings/mail-account-view.c:616
 msgid "Next - Sending mail"
 msgstr "Next â?? Sending mail"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Back - Identity"
 msgstr "Back â?? Identity"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Next - Receiving options"
 msgstr "Next â?? Receiving options"
 
-#: ../capplet/settings/mail-account-view.c:616
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Receiving options"
 msgstr "Receiving options"
 
-#: ../capplet/settings/mail-account-view.c:616
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Back - Receiving mail"
 msgstr "Back â?? Receiving mail"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Sending mail"
 msgstr "Sending mail"
 
+#: ../capplet/settings/mail-account-view.c:617
 #: ../capplet/settings/mail-account-view.c:618
-#: ../capplet/settings/mail-account-view.c:619
 msgid "Next - Review account"
 msgstr "Next â?? Review account"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Next - Defaults"
 msgstr "Next â?? Defaults"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Back - Receiving options"
 msgstr "Back â?? Receiving options"
 
-#: ../capplet/settings/mail-account-view.c:619
-#: ../mail/em-account-editor.c:2988 ../mail/mail-config.ui.h:34
+#: ../capplet/settings/mail-account-view.c:618
+#: ../mail/em-account-editor.c:3028
 msgid "Defaults"
 msgstr "Defaults"
 
-#: ../capplet/settings/mail-account-view.c:619
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Sending mail"
 msgstr "Back â?? Sending mail"
 
-#: ../capplet/settings/mail-account-view.c:621
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Review account"
 msgstr "Review account"
 
-#: ../capplet/settings/mail-account-view.c:621
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Finish"
 msgstr "Finish"
 
-#: ../capplet/settings/mail-account-view.c:621
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Back - Sending"
 msgstr "Back â?? Sending"
 
-#: ../capplet/settings/mail-account-view.c:726
+#: ../capplet/settings/mail-account-view.c:725
 msgid "Setup Google contacts with Evolution"
 msgstr "Set up Google Contacts with Evolution"
 
-#: ../capplet/settings/mail-account-view.c:727
+#: ../capplet/settings/mail-account-view.c:726
 msgid "Setup Google calendar with Evolution"
 msgstr "Set up Google Calendar with Evolution"
 
-#: ../capplet/settings/mail-account-view.c:732
+#: ../capplet/settings/mail-account-view.c:731
 msgid "You may need to enable IMAP access."
 msgstr "You may need to enable IMAP access."
 
-#: ../capplet/settings/mail-account-view.c:740
+#: ../capplet/settings/mail-account-view.c:739
 msgid "Google account settings:"
 msgstr "Google account settings:"
 
-#: ../capplet/settings/mail-account-view.c:767
+#: ../capplet/settings/mail-account-view.c:766
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "Set up Yahoo! Calendar with Evolution"
 
-#: ../capplet/settings/mail-account-view.c:771
+#: ../capplet/settings/mail-account-view.c:770
 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 "
@@ -8473,63 +7254,63 @@ msgstr ""
 "calendar name, so please confirm and re-enter the calendar name if it is not "
 "correct."
 
-#: ../capplet/settings/mail-account-view.c:778
+#: ../capplet/settings/mail-account-view.c:777
 msgid "Yahoo account settings:"
 msgstr "Yahoo account settings:"
 
-#: ../capplet/settings/mail-account-view.c:792
+#: ../capplet/settings/mail-account-view.c:791
 msgid "Yahoo Calendar name:"
 msgstr "Yahoo! Calendar name:"
 
-#: ../capplet/settings/mail-account-view.c:1061
+#: ../capplet/settings/mail-account-view.c:1063
 msgid "Password:"
 msgstr "Password:"
 
-#: ../capplet/settings/mail-account-view.c:1129
-#: ../capplet/settings/mail-settings-view.c:267
+#: ../capplet/settings/mail-account-view.c:1132
+#: ../capplet/settings/mail-settings-view.c:266
 msgid "Close Tab"
 msgstr "Close Tab"
 
-#: ../capplet/settings/mail-account-view.c:1139
+#: ../capplet/settings/mail-account-view.c:1142
 msgid "Account Wizard"
 msgstr "Account Wizard"
 
-#: ../capplet/settings/mail-capplet-shell.c:208
+#: ../capplet/settings/mail-capplet-shell.c:212
 msgid "Evolution account assistant"
 msgstr "Evolution account assistant"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
-#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../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:207
-#: ../mail/message-list.c:1666
+#: ../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
-#: ../modules/addressbook/e-book-shell-migrate.c:130
-#: ../modules/calendar/e-cal-shell-backend.c:102
-#: ../modules/calendar/e-cal-shell-migrate.c:146
-#: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:92
-#: ../modules/calendar/e-task-shell-migrate.c:111
+#: ../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-memo-shell-migrate.c:106
+#: ../modules/calendar/e-task-shell-backend.c:96
+#: ../modules/calendar/e-task-shell-migrate.c:115
 msgid "On This Computer"
 msgstr "On This Computer"
 
-#: ../capplet/settings/mail-settings-view.c:146
+#: ../capplet/settings/mail-settings-view.c:145
 #, c-format
 msgid "Modify %s..."
 msgstr "Modify %sâ?¦"
 
-#: ../capplet/settings/mail-settings-view.c:148
+#: ../capplet/settings/mail-settings-view.c:147
 msgid "Add a new account"
 msgstr "Add a new account"
 
-#: ../capplet/settings/mail-settings-view.c:184
+#: ../capplet/settings/mail-settings-view.c:183
 msgid "Account management"
 msgstr "Account management"
 
-#: ../capplet/settings/mail-settings-view.c:277
+#: ../capplet/settings/mail-settings-view.c:276
 msgid "Settings"
 msgstr "Settings"
 
@@ -8541,7 +7322,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:845
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:959
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
@@ -8550,7 +7332,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution Mail and Calendar"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
 msgid "Groupware Suite"
 msgstr "Groupware Suite"
 
@@ -8567,41 +7349,39 @@ msgid "Email Settings"
 msgstr "E-mail Settings"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:228
+#: ../e-util/e-activity.c:226
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (cancelled)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:231
+#: ../e-util/e-activity.c:229
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (completed)"
 
-#. Translators: This is an activity whose percent
-#. * complete is unknown.
-#: ../e-util/e-activity.c:235
+#. Translators: This is an activity waiting to run.
+#: ../e-util/e-activity.c:232
 #, c-format
-msgid "%s..."
-msgstr "%sâ?¦"
+msgid "%s (waiting)"
+msgstr "%s (waiting)"
 
-#: ../e-util/e-activity.c:240
+#. Translators: This is a running activity which
+#. *              the user has requested to cancel.
+#: ../e-util/e-activity.c:236
 #, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% complete)"
-
-#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
-msgid "Evolution Error"
-msgstr "Evolution Error"
+msgid "%s (cancelling)"
+msgstr "%s (cancelling)"
 
-#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
-msgid "Evolution Warning"
-msgstr "Evolution Warning"
+#: ../e-util/e-activity.c:238
+#, c-format
+msgid "%s"
+msgstr "%s"
 
-#: ../e-util/e-alert.c:659
+#: ../e-util/e-activity.c:243
 #, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "Internal error, unknown error '%s' requested"
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% complete)"
 
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
@@ -8681,133 +7461,69 @@ msgid "Visual"
 msgstr "Visual"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../e-util/e-datetime-format.c:199
+#: ../modules/calendar/e-cal-shell-view-actions.c:1795
 #: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:308
+#: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "Today"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:210 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Tomorrow"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:212
 msgid "Yesterday"
 msgstr "Yesterday"
 
-#. Translators: %d is replaced with a number of days. It's always greater than 1
-#: ../e-util/e-datetime-format.c:211
+#. 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 "%d day from now"
-msgid_plural "%d days from now"
-msgstr[0] "%d day from now"
-msgstr[1] "%d days from now"
+msgid "Next %a"
+msgstr "Next %a"
 
-#. Translators: %d is replaced with a number of days. It's always greater than 1
-#: ../e-util/e-datetime-format.c:214
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d day ago"
-msgstr[1] "%d days ago"
-
-#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
-#: ../e-util/e-datetime-format.c:308
+#: ../e-util/e-datetime-format.c:293 ../e-util/e-datetime-format.c:303
+#: ../e-util/e-datetime-format.c:312
 msgid "Use locale default"
 msgstr "Use locale default"
 
-#: ../e-util/e-datetime-format.c:502
+#: ../e-util/e-datetime-format.c:508
 msgid "Format:"
 msgstr "Format:"
 
-#: ../e-util/e-file-utils.c:136
+#: ../e-util/e-file-utils.c:152
 msgid "(Unknown Filename)"
 msgstr "(Unknown Filename)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:140
+#: ../e-util/e-file-utils.c:156
 #, c-format
 msgid "Writing \"%s\""
 msgstr "Writing \"%s\""
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:145
+#: ../e-util/e-file-utils.c:161
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "Writing \"%s\" to %s"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:194
-msgid "Debug Logs"
-msgstr "Debug Logs"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:208
-msgid "Show _errors in the status bar for"
-msgstr "Show _errors in the status bar for"
-
-#. Translators: This is the second part of the sentence
-#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:226
-msgid "second(s)."
-msgstr "second(s)."
-
-#: ../e-util/e-non-intrusive-error-dialog.c:232
-msgid "Log Messages:"
-msgstr "Log Messages:"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:279
-msgid "Log Level"
-msgstr "Log Level"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2757
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "Messages"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1426
-#: ../shell/e-shell-window-actions.c:1433
-#: ../shell/e-shell-window-actions.c:1440
-msgid "Close this window"
-msgstr "Close this window"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:38
-msgid "Error"
-msgstr "Error"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:38
-msgid "Errors"
-msgstr "Errors"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:39
-msgid "Warnings and Errors"
-msgstr "Warnings and Errors"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:40
-msgid "Debug"
-msgstr "Debug"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:40
-msgid "Error, Warnings and Debug messages"
-msgstr "Error, Warnings and Debug messages"
-
-#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:377
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "weeks"
 
-#: ../e-util/e-print.c:161
+#: ../e-util/e-print.c:157
 msgid "An error occurred while printing"
 msgstr "An error occurred while printing"
 
-#: ../e-util/e-print.c:168
+#: ../e-util/e-print.c:164
 msgid "The printing system reported the following details about the error:"
 msgstr "The printing system reported the following details about the error:"
 
-#: ../e-util/e-print.c:174
+#: ../e-util/e-print.c:170
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
@@ -8837,15 +7553,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:140
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:155
 msgid "_Overwrite"
 msgstr "_Overwrite"
 
-#: ../e-util/e-util.c:146
+#: ../e-util/e-util.c:154
 msgid "Could not open the link."
 msgstr "Could not open the link."
 
-#: ../e-util/e-util.c:193
+#: ../e-util/e-util.c:201
 msgid "Could not display help for Evolution."
 msgstr "Could not display help for Evolution."
 
@@ -8858,152 +7574,156 @@ 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:270 ../em-format/em-format.c:1038
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:72
+#: ../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
 msgid "From"
 msgstr "From"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1039
-#: ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1051
+#: ../modules/mail/em-mailer-prefs.c:74
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1041
-#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
-#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:75
+#: ../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
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1042
-#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
-#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:76
+#: ../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
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:410 ../em-format/em-format.c:1043
-#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
-#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
+#: ../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
+#: ../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:421 ../mail/em-format-html.c:2472
-#: ../modules/mail/em-mailer-prefs.c:1120
+#: ../em-format/em-format-quote.c:437 ../mail/em-format-html.c:2584
+#: ../modules/mail/em-mailer-prefs.c:1117
 msgid "Mailer"
 msgstr "Mailer"
 
-#: ../em-format/em-format-quote.c:500 ../mail/em-composer-utils.c:1296
+#: ../em-format/em-format-quote.c:518 ../mail/em-composer-utils.c:1141
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: ../em-format/em-format.c:1044 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:527
-#: ../widgets/misc/e-dateedit.c:549
+#: ../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
 msgid "Date"
 msgstr "Date"
 
-#: ../em-format/em-format.c:1045 ../modules/mail/em-mailer-prefs.c:79
+#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:80
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: ../em-format/em-format.c:1046 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:81
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Face"
 
-#: ../em-format/em-format.c:1431
+#: ../em-format/em-format.c:1455
 #, c-format
 msgid "%s attachment"
 msgstr "%s attachment"
 
-#: ../em-format/em-format.c:1503
+#: ../em-format/em-format.c:1547
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Could not parse S/MIME message: Unknown error"
 
-#: ../em-format/em-format.c:1662 ../em-format/em-format.c:1846
+#: ../em-format/em-format.c:1729 ../em-format/em-format.c:1926
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Could not parse MIME message. Displaying as source."
 
-#: ../em-format/em-format.c:1672
+#: ../em-format/em-format.c:1739
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Unsupported encryption type for multipart/encrypted"
 
-#: ../em-format/em-format.c:1688
+#: ../em-format/em-format.c:1759
 msgid "Could not parse PGP/MIME message"
 msgstr "Could not parse PGP/MIME message"
 
-#: ../em-format/em-format.c:1689
+#: ../em-format/em-format.c:1760
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Could not parse PGP/MIME message: Unknown error"
 
-#: ../em-format/em-format.c:1871
+#: ../em-format/em-format.c:1951
 msgid "Unsupported signature format"
 msgstr "Unsupported signature format"
 
-#: ../em-format/em-format.c:1881 ../em-format/em-format.c:2041
+#: ../em-format/em-format.c:1964 ../em-format/em-format.c:2137
 msgid "Error verifying signature"
 msgstr "Error verifying signature"
 
-#: ../em-format/em-format.c:1882 ../em-format/em-format.c:2029
-#: ../em-format/em-format.c:2042
+#: ../em-format/em-format.c:1965 ../em-format/em-format.c:2124
+#: ../em-format/em-format.c:2138
 msgid "Unknown error verifying signature"
 msgstr "Unknown error verifying signature"
 
-#: ../em-format/em-format.c:2129
+#: ../em-format/em-format.c:2229
 msgid "Could not parse PGP message: "
 msgstr "Could not parse PGP message: "
 
-#: ../em-format/em-format.c:2135 ../plugins/caldav/caldav-browse-server.c:203
+#: ../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
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../filter/e-filter-datespec.c:74
+#. 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
 #, 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:74
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 second in the future"
 msgstr[1] "%d seconds in the future"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 minute ago"
 msgstr[1] "%d minutes ago"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:73
 #, 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:76
+#: ../filter/e-filter-datespec.c:74
 #, 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:76
+#: ../filter/e-filter-datespec.c:75
 #, 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:77
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -9024,56 +7744,56 @@ msgid_plural "%d weeks ago"
 msgstr[0] "1 week ago"
 msgstr[1] "%d weeks ago"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:79
 #, 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:79
+#: ../filter/e-filter-datespec.c:80
 #, 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:79
+#: ../filter/e-filter-datespec.c:81
 #, 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:80
+#: ../filter/e-filter-datespec.c:82
 #, 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:80
+#: ../filter/e-filter-datespec.c:83
 #, 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:122
+#: ../filter/e-filter-datespec.c:133
 msgid "<click here to select a date>"
 msgstr "<click here to select a date>"
 
-#: ../filter/e-filter-datespec.c:125 ../filter/e-filter-datespec.c:136
-#: ../filter/e-filter-datespec.c:147
+#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
+#: ../filter/e-filter-datespec.c:158
 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:132
+#: ../filter/e-filter-datespec.c:143
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:275
+#: ../filter/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "Select a time to compare against"
 
@@ -9081,62 +7801,62 @@ msgstr "Select a time to compare against"
 msgid "Choose a File"
 msgstr "Choose a File"
 
-#: ../filter/e-filter-rule.c:663
+#: ../filter/e-filter-rule.c:669
 msgid "R_ule name:"
 msgstr "R_ule name:"
 
-#: ../filter/e-filter-rule.c:693
+#: ../filter/e-filter-rule.c:699
 msgid "Find items that meet the following conditions"
 msgstr "Find items that meet the following conditions"
 
-#: ../filter/e-filter-rule.c:718
+#: ../filter/e-filter-rule.c:724
 msgid "If all conditions are met"
 msgstr "If all conditions are met"
 
-#: ../filter/e-filter-rule.c:719
+#: ../filter/e-filter-rule.c:725
 msgid "If any conditions are met"
 msgstr "If any conditions are met"
 
-#: ../filter/e-filter-rule.c:722
+#: ../filter/e-filter-rule.c:728
 msgid "_Find items:"
 msgstr "_Find items:"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:749
+#: ../filter/e-filter-rule.c:757
 msgid "None"
 msgstr "None"
 
-#: ../filter/e-filter-rule.c:750
+#: ../filter/e-filter-rule.c:758
 msgid "All related"
 msgstr "All related"
 
-#: ../filter/e-filter-rule.c:751 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Replies"
 
-#: ../filter/e-filter-rule.c:752
+#: ../filter/e-filter-rule.c:760
 msgid "Replies and parents"
 msgstr "Replies and parents"
 
-#: ../filter/e-filter-rule.c:753
+#: ../filter/e-filter-rule.c:761
 msgid "No reply or parent"
 msgstr "No reply or parent"
 
-#: ../filter/e-filter-rule.c:756
+#: ../filter/e-filter-rule.c:764
 msgid "I_nclude threads"
 msgstr "I_nclude threads"
 
-#: ../filter/e-filter-rule.c:779
+#: ../filter/e-filter-rule.c:789
 msgid "A_dd Condition"
 msgstr "A_dd Condition"
 
-#: ../filter/e-filter-rule.c:1128 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:304
+#: ../filter/e-filter-rule.c:1136 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:317
 msgid "Incoming"
 msgstr "Incoming"
 
-#: ../filter/e-filter-rule.c:1128 ../mail/em-utils.c:305
+#: ../filter/e-filter-rule.c:1136 ../mail/em-utils.c:318
 msgid "Outgoing"
 msgstr "Outgoing"
 
@@ -9168,7 +7888,7 @@ msgstr "Missing date."
 msgid "Missing file name."
 msgstr "Missing file name."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:83
 msgid "Missing name."
 msgstr "Missing name."
 
@@ -9224,7 +7944,7 @@ msgstr ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:193
 msgid "_Filter Rules"
 msgstr "_Filter Rules"
 
@@ -9245,7 +7965,7 @@ msgstr "in the future"
 msgid "months"
 msgstr "months"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
+#: ../filter/filter.ui.h:19
 msgid "seconds"
 msgstr "seconds"
 
@@ -9261,26 +7981,32 @@ msgstr "the time you specify"
 msgid "years"
 msgstr "years"
 
-#: ../mail/e-mail-attachment-bar.c:91 ../mail/e-mail-attachment-bar.c:96
-#: ../mail/em-format-html-display.c:1024 ../mail/mail-config.ui.h:15
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:129
-#: ../widgets/misc/e-attachment-paned.c:134
+#: ../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
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Attachment"
 msgstr[1] "Attachments"
 
-#: ../mail/e-mail-attachment-bar.c:611
-#: ../widgets/misc/e-attachment-paned.c:599
+#: ../mail/e-mail-attachment-bar.c:630
+#: ../widgets/misc/e-attachment-paned.c:621
 msgid "Icon View"
 msgstr "Icon View"
 
-#: ../mail/e-mail-attachment-bar.c:612
-#: ../widgets/misc/e-attachment-paned.c:600
+#: ../mail/e-mail-attachment-bar.c:632
+#: ../widgets/misc/e-attachment-paned.c:623
 msgid "List View"
 msgstr "List View"
 
-#: ../mail/e-mail-browser.c:265
+#: ../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
+msgid "Close this window"
+msgstr "Close this window"
+
+#: ../mail/e-mail-browser.c:289
 msgid "(No Subject)"
 msgstr "(No Subject)"
 
@@ -9300,6 +8026,11 @@ msgstr "_From This Address"
 msgid "Create Search _Folder"
 msgstr "Create Search _Folder"
 
+#: ../mail/e-mail-folder-utils.c:88
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "Saving message to folder '%s'"
+
 #: ../mail/e-mail-label-dialog.c:222
 msgid "_Label name:"
 msgstr "_Label name:"
@@ -9329,7 +8060,7 @@ msgid "_Later"
 msgstr "_Later"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:505
+#: ../modules/mail/e-mail-shell-view-actions.c:616
 msgid "Add Label"
 msgstr "Add Label"
 
@@ -9350,35 +8081,37 @@ msgid "Color"
 msgstr "Colour"
 
 #: ../mail/e-mail-label-tree-view.c:96
+#: ../modules/plugin-manager/evolution-plugin-manager.c:66
 #: ../plugins/caldav/caldav-browse-server.c:1163
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
 #: ../widgets/menus/gal-define-views-dialog.c:334
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 msgid "Name"
 msgstr "Name"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
-#: ../mail/em-folder-tree-model.c:696 ../mail/em-folder-tree.c:2761
-#: ../modules/mail/e-mail-shell-view-private.c:1062
+#: ../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
 msgid "Inbox"
 msgstr "Inbox"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:688
+#: ../mail/e-mail-local.c:36 ../mail/e-mail-migrate.c:1001
+#: ../mail/em-folder-tree-model.c:758
 msgid "Drafts"
 msgstr "Drafts"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:700
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:770
 msgid "Outbox"
 msgstr "Outbox"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:702
+#: ../mail/e-mail-local.c:38 ../mail/e-mail-migrate.c:994
+#: ../mail/em-folder-tree-model.c:772
 msgid "Sent"
 msgstr "Sent"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:691
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:761
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:578
+#: ../plugins/templates/templates.c:581
 msgid "Templates"
 msgstr "Templates"
 
@@ -9395,11 +8128,11 @@ msgstr "Migration"
 msgid "Migrating '%s':"
 msgstr "Migrating '%s':"
 
-#: ../mail/e-mail-migrate.c:649
+#: ../mail/e-mail-migrate.c:657
 msgid "Migrating Folders"
 msgstr "Migrating Folders"
 
-#: ../mail/e-mail-migrate.c:650
+#: ../mail/e-mail-migrate.c:658
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9411,50 +8144,70 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your foldersâ?¦"
 
-#: ../mail/e-mail-migrate.c:796
+#: ../mail/e-mail-migrate.c:1138
 #, 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:563
+#: ../mail/e-mail-notebook-view.c:565
 msgid "Please select a folder"
 msgstr "Please select a folder"
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:109
-#: ../modules/calendar/e-task-shell-view-actions.c:570
+#: ../mail/e-mail-reader-utils.c:111
+#: ../modules/calendar/e-task-shell-view-actions.c:576
 msgid "Do not ask me again"
 msgstr "Do not ask me again"
 
-#: ../mail/e-mail-reader.c:276 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:309 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copy to Folder"
 
-#: ../mail/e-mail-reader.c:276 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:309 ../mail/em-folder-utils.c:421
 msgid "C_opy"
 msgstr "C_opy"
 
-#: ../mail/e-mail-reader.c:689 ../mail/em-filter-i18n.h:51
+#. Translators: %s is replaced with a folder name
+#. %d with count of duplicate messages.
+#: ../mail/e-mail-reader.c:510
+#, 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 ""
+"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?"
+
+#: ../mail/e-mail-reader.c:969 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Move to Folder"
 
-#: ../mail/e-mail-reader.c:689 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:969 ../mail/em-folder-utils.c:421
 msgid "_Move"
 msgstr "_Move"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:954 ../mail/e-mail-reader.c:1070
-#: ../mail/e-mail-reader.c:1111
+#: ../mail/e-mail-reader.c:1248 ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1446
 msgid "_Do not ask me again."
 msgstr "_Do not ask me again."
 
-#: ../mail/e-mail-reader.c:1116
+#: ../mail/e-mail-reader.c:1451
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Always ignore Reply-To: for mailing lists."
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1558
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Save Message"
@@ -9466,597 +8219,707 @@ 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:1227
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/e-mail-reader.c:1579
+#: ../plugins/groupwise-features/notification.ui.h:1
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Message"
 msgstr[1] "Messages"
 
-#: ../mail/e-mail-reader.c:1492
+#: ../mail/e-mail-reader.c:1853
 msgid "A_dd Sender to Address Book"
 msgstr "A_dd Sender to Address Book"
 
-#: ../mail/e-mail-reader.c:1494
+#: ../mail/e-mail-reader.c:1855
 msgid "Add sender to address book"
 msgstr "Add sender to address book"
 
-#: ../mail/e-mail-reader.c:1499
+#: ../mail/e-mail-reader.c:1860
 msgid "Check for _Junk"
 msgstr "Check for _Junk"
 
-#: ../mail/e-mail-reader.c:1501
+#: ../mail/e-mail-reader.c:1862
 msgid "Filter the selected messages for junk status"
 msgstr "Filter the selected messages for junk status"
 
-#: ../mail/e-mail-reader.c:1506
+#: ../mail/e-mail-reader.c:1867
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folderâ?¦"
 
-#: ../mail/e-mail-reader.c:1508
+#: ../mail/e-mail-reader.c:1869
 msgid "Copy selected messages to another folder"
 msgstr "Copy selected messages to another folder"
 
-#: ../mail/e-mail-reader.c:1513
+#: ../mail/e-mail-reader.c:1874
 msgid "_Delete Message"
 msgstr "_Delete Message"
 
-#: ../mail/e-mail-reader.c:1515
+#: ../mail/e-mail-reader.c:1876
 msgid "Mark the selected messages for deletion"
 msgstr "Mark the selected messages for deletion"
 
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1881
 msgid "Filter on Mailing _List..."
 msgstr "Filter on Mailing _Listâ?¦"
 
-#: ../mail/e-mail-reader.c:1522
+#: ../mail/e-mail-reader.c:1883
 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:1527
+#: ../mail/e-mail-reader.c:1888
 msgid "Filter on _Recipients..."
 msgstr "Filter on _Recipientsâ?¦"
 
-#: ../mail/e-mail-reader.c:1529
+#: ../mail/e-mail-reader.c:1890
 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:1534
+#: ../mail/e-mail-reader.c:1895
 msgid "Filter on Se_nder..."
 msgstr "Filter on Se_nderâ?¦"
 
-#: ../mail/e-mail-reader.c:1536
+#: ../mail/e-mail-reader.c:1897
 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:1541
+#: ../mail/e-mail-reader.c:1902
 msgid "Filter on _Subject..."
 msgstr "Filter on _Subjectâ?¦"
 
-#: ../mail/e-mail-reader.c:1543
+#: ../mail/e-mail-reader.c:1904
 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:1548
+#: ../mail/e-mail-reader.c:1909
 msgid "A_pply Filters"
 msgstr "A_pply Filters"
 
-#: ../mail/e-mail-reader.c:1550
+#: ../mail/e-mail-reader.c:1911
 msgid "Apply filter rules to the selected messages"
 msgstr "Apply filter rules to the selected messages"
 
-#: ../mail/e-mail-reader.c:1555
+#: ../mail/e-mail-reader.c:1916
 msgid "_Find in Message..."
 msgstr "_Find in Messageâ?¦"
 
-#: ../mail/e-mail-reader.c:1557
+#: ../mail/e-mail-reader.c:1918
 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:1562
+#: ../mail/e-mail-reader.c:1923
 msgid "_Clear Flag"
 msgstr "_Clear Flag"
 
-#: ../mail/e-mail-reader.c:1564
+#: ../mail/e-mail-reader.c:1925
 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:1569
+#: ../mail/e-mail-reader.c:1930
 msgid "_Flag Completed"
 msgstr "_Flag Completed"
 
-#: ../mail/e-mail-reader.c:1571
+#: ../mail/e-mail-reader.c:1932
 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:1576
+#: ../mail/e-mail-reader.c:1937
 msgid "Follow _Up..."
 msgstr "Follow _Upâ?¦"
 
-#: ../mail/e-mail-reader.c:1578
+#: ../mail/e-mail-reader.c:1939
 msgid "Flag the selected messages for follow-up"
 msgstr "Flag the selected messages for follow-up"
 
-#: ../mail/e-mail-reader.c:1583
+#: ../mail/e-mail-reader.c:1944
 msgid "_Attached"
 msgstr "_Attached"
 
-#: ../mail/e-mail-reader.c:1585 ../mail/e-mail-reader.c:1592
+#: ../mail/e-mail-reader.c:1946 ../mail/e-mail-reader.c:1953
 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:1590
+#: ../mail/e-mail-reader.c:1951
 msgid "Forward As _Attached"
 msgstr "Forward As _Attached"
 
-#: ../mail/e-mail-reader.c:1597
+#: ../mail/e-mail-reader.c:1958
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ../mail/e-mail-reader.c:1599 ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1960 ../mail/e-mail-reader.c:1967
 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:1604
+#: ../mail/e-mail-reader.c:1965
 msgid "Forward As _Inline"
 msgstr "Forward As _Inline"
 
-#: ../mail/e-mail-reader.c:1611
+#: ../mail/e-mail-reader.c:1972
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ../mail/e-mail-reader.c:1613 ../mail/e-mail-reader.c:1620
+#: ../mail/e-mail-reader.c:1974 ../mail/e-mail-reader.c:1981
 msgid "Forward the selected message quoted like a reply"
 msgstr "Forward the selected message quoted like a reply"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1979
 msgid "Forward As _Quoted"
 msgstr "Forward As _Quoted"
 
-#: ../mail/e-mail-reader.c:1625
+#: ../mail/e-mail-reader.c:1986
 msgid "_Load Images"
 msgstr "_Load Images"
 
-#: ../mail/e-mail-reader.c:1627
+#: ../mail/e-mail-reader.c:1988
 msgid "Force images in HTML mail to be loaded"
 msgstr "Force images in HTML mail to be loaded"
 
-#: ../mail/e-mail-reader.c:1632
+#: ../mail/e-mail-reader.c:1993
 msgid "_Important"
 msgstr "_Important"
 
-#: ../mail/e-mail-reader.c:1634
+#: ../mail/e-mail-reader.c:1995
 msgid "Mark the selected messages as important"
 msgstr "Mark the selected messages as important"
 
-#: ../mail/e-mail-reader.c:1639
+#: ../mail/e-mail-reader.c:2000
 msgid "_Junk"
 msgstr "_Junk"
 
-#: ../mail/e-mail-reader.c:1641
+#: ../mail/e-mail-reader.c:2002
 msgid "Mark the selected messages as junk"
 msgstr "Mark the selected messages as junk"
 
-#: ../mail/e-mail-reader.c:1646
+#: ../mail/e-mail-reader.c:2007
 msgid "_Not Junk"
 msgstr "_Not Junk"
 
-#: ../mail/e-mail-reader.c:1648
+#: ../mail/e-mail-reader.c:2009
 msgid "Mark the selected messages as not being junk"
 msgstr "Mark the selected messages as not being junk"
 
-#: ../mail/e-mail-reader.c:1653
+#: ../mail/e-mail-reader.c:2014
 msgid "_Read"
 msgstr "_Read"
 
-#: ../mail/e-mail-reader.c:1655
+#: ../mail/e-mail-reader.c:2016
 msgid "Mark the selected messages as having been read"
 msgstr "Mark the selected messages as having been read"
 
-#: ../mail/e-mail-reader.c:1660
+#: ../mail/e-mail-reader.c:2021
 msgid "Uni_mportant"
 msgstr "Uni_mportant"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:2023
 msgid "Mark the selected messages as unimportant"
 msgstr "Mark the selected messages as unimportant"
 
-#: ../mail/e-mail-reader.c:1667
+#: ../mail/e-mail-reader.c:2028
 msgid "_Unread"
 msgstr "_Unread"
 
-#: ../mail/e-mail-reader.c:1669
+#: ../mail/e-mail-reader.c:2030
 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:1674
+#: ../mail/e-mail-reader.c:2035
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Messageâ?¦"
 
-#: ../mail/e-mail-reader.c:1676
+#: ../mail/e-mail-reader.c:2037
 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:1681
+#: ../mail/e-mail-reader.c:2042
 msgid "Compose _New Message"
 msgstr "Compose _New Message"
 
-#: ../mail/e-mail-reader.c:1683
+#: ../mail/e-mail-reader.c:2044
 msgid "Open a window for composing a mail message"
 msgstr "Open a window for composing a mail message"
 
-#: ../mail/e-mail-reader.c:1688
+#: ../mail/e-mail-reader.c:2049
 msgid "_Open in New Window"
 msgstr "_Open in New Window"
 
-#: ../mail/e-mail-reader.c:1690
+#: ../mail/e-mail-reader.c:2051
 msgid "Open the selected messages in a new window"
 msgstr "Open the selected messages in a new window"
 
-#: ../mail/e-mail-reader.c:1695
+#: ../mail/e-mail-reader.c:2056
 msgid "_Move to Folder..."
 msgstr "_Move to Folderâ?¦"
 
-#: ../mail/e-mail-reader.c:1697
+#: ../mail/e-mail-reader.c:2058
 msgid "Move selected messages to another folder"
 msgstr "Move selected messages to another folder"
 
-#: ../mail/e-mail-reader.c:1702
+#: ../mail/e-mail-reader.c:2063
 msgid "_Switch to Folder"
 msgstr "_Switch to Folder"
 
-#: ../mail/e-mail-reader.c:1704
+#: ../mail/e-mail-reader.c:2065
 msgid "Display the parent folder"
 msgstr "Display the parent folder"
 
-#: ../mail/e-mail-reader.c:1709
+#: ../mail/e-mail-reader.c:2070
 msgid "Switch to _next tab"
 msgstr "Switch to _next tab"
 
-#: ../mail/e-mail-reader.c:1711
+#: ../mail/e-mail-reader.c:2072
 msgid "Switch to the next tab"
 msgstr "Switch to the next tab"
 
-#: ../mail/e-mail-reader.c:1716
+#: ../mail/e-mail-reader.c:2077
 msgid "Switch to _previous tab"
 msgstr "Switch to _previous tab"
 
-#: ../mail/e-mail-reader.c:1718
+#: ../mail/e-mail-reader.c:2079
 msgid "Switch to the previous tab"
 msgstr "Switch to the previous tab"
 
-#: ../mail/e-mail-reader.c:1723
+#: ../mail/e-mail-reader.c:2084
 msgid "Cl_ose current tab"
 msgstr "Cl_ose current tab"
 
-#: ../mail/e-mail-reader.c:1725
+#: ../mail/e-mail-reader.c:2086
 msgid "Close current tab"
 msgstr "Close current tab"
 
-#: ../mail/e-mail-reader.c:1730
+#: ../mail/e-mail-reader.c:2091
 msgid "_Next Message"
 msgstr "_Next Message"
 
-#: ../mail/e-mail-reader.c:1732
+#: ../mail/e-mail-reader.c:2093
 msgid "Display the next message"
 msgstr "Display the next message"
 
-#: ../mail/e-mail-reader.c:1737
+#: ../mail/e-mail-reader.c:2098
 msgid "Next _Important Message"
 msgstr "Next _Important Message"
 
-#: ../mail/e-mail-reader.c:1739
+#: ../mail/e-mail-reader.c:2100
 msgid "Display the next important message"
 msgstr "Display the next important message"
 
-#: ../mail/e-mail-reader.c:1744
+#: ../mail/e-mail-reader.c:2105
 msgid "Next _Thread"
 msgstr "Next _Thread"
 
-#: ../mail/e-mail-reader.c:1746
+#: ../mail/e-mail-reader.c:2107
 msgid "Display the next thread"
 msgstr "Display the next thread"
 
-#: ../mail/e-mail-reader.c:1751
+#: ../mail/e-mail-reader.c:2112
 msgid "Next _Unread Message"
 msgstr "Next _Unread Message"
 
-#: ../mail/e-mail-reader.c:1753
+#: ../mail/e-mail-reader.c:2114
 msgid "Display the next unread message"
 msgstr "Display the next unread message"
 
-#: ../mail/e-mail-reader.c:1758
+#: ../mail/e-mail-reader.c:2119
 msgid "_Previous Message"
 msgstr "_Previous Message"
 
-#: ../mail/e-mail-reader.c:1760
+#: ../mail/e-mail-reader.c:2121
 msgid "Display the previous message"
 msgstr "Display the previous message"
 
-#: ../mail/e-mail-reader.c:1765
+#: ../mail/e-mail-reader.c:2126
 msgid "Pr_evious Important Message"
 msgstr "Pr_evious Important Message"
 
-#: ../mail/e-mail-reader.c:1767
+#: ../mail/e-mail-reader.c:2128
 msgid "Display the previous important message"
 msgstr "Display the previous important message"
 
-#: ../mail/e-mail-reader.c:1772
+#: ../mail/e-mail-reader.c:2133
+msgid "Previous T_hread"
+msgstr "Previous T_hread"
+
+#: ../mail/e-mail-reader.c:2135
+msgid "Display the previous thread"
+msgstr "Display the previous thread"
+
+#: ../mail/e-mail-reader.c:2140
 msgid "P_revious Unread Message"
 msgstr "P_revious Unread Message"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:2142
 msgid "Display the previous unread message"
 msgstr "Display the previous unread message"
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:2149
 msgid "Print this message"
 msgstr "Print this message"
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:2156
 msgid "Preview the message to be printed"
 msgstr "Preview the message to be printed"
 
-#: ../mail/e-mail-reader.c:1793
+#: ../mail/e-mail-reader.c:2161
 msgid "Re_direct"
 msgstr "Re_direct"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:2163
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirect (bounce) the selected message to someone"
 
-#: ../mail/e-mail-reader.c:1800 ../mail/mail.error.xml.h:91
-#: ../modules/calendar/e-cal-shell-view-actions.c:1459
-#: ../modules/mail/e-mail-attachment-handler.c:151
+#: ../mail/e-mail-reader.c:2168
+msgid "Remo_ve Attachments"
+msgstr "Remo_ve Attachments"
+
+#: ../mail/e-mail-reader.c:2170
+msgid "Remove attachments"
+msgstr "Remove attachments"
+
+#: ../mail/e-mail-reader.c:2175
+msgid "Remove Du_plicate Messages"
+msgstr "Remove Du_plicate Messages"
+
+#: ../mail/e-mail-reader.c:2177
+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
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:2184
 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:1807 ../mail/mail.error.xml.h:92
+#: ../mail/e-mail-reader.c:2189 ../mail/mail.error.xml.h:103
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:2191
 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:1814
-#: ../modules/mail/e-mail-attachment-handler.c:158
+#: ../mail/e-mail-reader.c:2196
+#: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:2198
 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:1821
+#: ../mail/e-mail-reader.c:2203
 msgid "_Save as mbox..."
 msgstr "_Save as mboxâ?¦"
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:2205
 msgid "Save selected messages as an mbox file"
 msgstr "Save selected messages as an mbox file"
 
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:2210
 msgid "Search Folder from Mailing _List..."
 msgstr "Search Folder from Mailing _Listâ?¦"
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:2212
 msgid "Create a search folder for this mailing list"
 msgstr "Create a search folder for this mailing list"
 
-#: ../mail/e-mail-reader.c:1835
+#: ../mail/e-mail-reader.c:2217
 msgid "Search Folder from Recipien_ts..."
 msgstr "Search Folder from Recipien_tsâ?¦"
 
-#: ../mail/e-mail-reader.c:1837
+#: ../mail/e-mail-reader.c:2219
 msgid "Create a search folder for these recipients"
 msgstr "Create a search folder for these recipients"
 
-#: ../mail/e-mail-reader.c:1842
+#: ../mail/e-mail-reader.c:2224
 msgid "Search Folder from Sen_der..."
 msgstr "Search Folder from Sen_derâ?¦"
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:2226
 msgid "Create a search folder for this sender"
 msgstr "Create a search folder for this sender"
 
-#: ../mail/e-mail-reader.c:1849
+#: ../mail/e-mail-reader.c:2231
 msgid "Search Folder from S_ubject..."
 msgstr "Search Folder from S_ubjectâ?¦"
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:2233
 msgid "Create a search folder for this subject"
 msgstr "Create a search folder for this subject"
 
-#: ../mail/e-mail-reader.c:1856
+#: ../mail/e-mail-reader.c:2238
 msgid "_Message Source"
 msgstr "_Message Source"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:2240
 msgid "Show the raw email source of the message"
 msgstr "Show the raw e-mail source of the message"
 
-#: ../mail/e-mail-reader.c:1870
+#: ../mail/e-mail-reader.c:2252
 msgid "_Undelete Message"
 msgstr "_Undelete Message"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:2254
 msgid "Undelete the selected messages"
 msgstr "Undelete the selected messages"
 
-#: ../mail/e-mail-reader.c:1877
+#: ../mail/e-mail-reader.c:2259
 msgid "_Normal Size"
 msgstr "_Normal Size"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:2261
 msgid "Reset the text to its original size"
 msgstr "Reset the text to its original size"
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:2266
 msgid "_Zoom In"
 msgstr "_Zoom In"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:2268
 msgid "Increase the text size"
 msgstr "Increase the text size"
 
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:2273
 msgid "Zoom _Out"
 msgstr "Zoom _Out"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:2275
 msgid "Decrease the text size"
 msgstr "Decrease the text size"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:2282
 msgid "Create R_ule"
 msgstr "Create R_ule"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:2289
 msgid "Ch_aracter Encoding"
 msgstr "Ch_aracter Encoding"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:2296
 msgid "F_orward As"
 msgstr "F_orward As"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:2303
 msgid "_Group Reply"
 msgstr "_Group Reply"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:2310
 msgid "_Go To"
 msgstr "_Go To"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:2317
 msgid "Mar_k As"
 msgstr "Mar_k As"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:2324
 msgid "_Message"
 msgstr "_Message"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2331
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:2356
 msgid "Mark for Follo_w Up..."
 msgstr "Mark for Follo_w Upâ?¦"
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:2364
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2368
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:2372
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: ../mail/e-mail-reader.c:1994
+#: ../mail/e-mail-reader.c:2376
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2380
 msgid "Mark as Uni_mportant"
 msgstr "Mark as Uni_mportant"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2384
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:2428
 msgid "_Caret Mode"
 msgstr "_Caret Mode"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2430
 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:2046
+#: ../mail/e-mail-reader.c:2436
 msgid "All Message _Headers"
 msgstr "All Message _Headers"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2438
 msgid "Show messages with all email headers"
 msgstr "Show messages with all e-mail headers"
 
-#: ../mail/e-mail-reader.c:2269
+#: ../mail/e-mail-reader.c:2670
 msgid "Unable to retrieve message"
 msgstr "Unable to retrieve message"
 
-#: ../mail/e-mail-reader.c:2329 ../mail/mail-ops.c:1891
+#: ../mail/e-mail-reader.c:2731 ../mail/mail-ops.c:2044
 #, 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:2893 ../mail/mail-config.ui.h:31
-#: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:537
-#: ../plugins/google-account-setup/google-source.c:659
-#: ../widgets/misc/e-account-tree-view.c:240
+#: ../mail/e-mail-reader.c:3344 ../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
 msgid "Default"
 msgstr "Default"
 
-#: ../mail/e-mail-reader.c:3041
-#: ../modules/mail/e-mail-attachment-handler.c:144
+#: ../mail/e-mail-reader.c:3524
+#: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "_Forward"
 
-#: ../mail/e-mail-reader.c:3042
+#: ../mail/e-mail-reader.c:3525
 msgid "Forward the selected message to someone"
 msgstr "Forward the selected message to someone"
 
-#: ../mail/e-mail-reader.c:3061
+#: ../mail/e-mail-reader.c:3544
 msgid "Group Reply"
 msgstr "Group Reply"
 
-#: ../mail/e-mail-reader.c:3062
+#: ../mail/e-mail-reader.c:3545
 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:3107 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:743
+#: ../mail/e-mail-reader.c:3590 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:744
 msgid "Delete"
 msgstr "Delete"
 
-#: ../mail/e-mail-reader.c:3140
-#: ../modules/calendar/e-cal-shell-view-actions.c:1305
+#: ../mail/e-mail-reader.c:3623
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
 #: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "Next"
 
-#: ../mail/e-mail-reader.c:3144
-#: ../modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../mail/e-mail-reader.c:3627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 #: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "Previous"
 
-#: ../mail/e-mail-reader.c:3154 ../mail/mail-dialogs.ui.h:19
+#: ../mail/e-mail-reader.c:3637 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Reply"
 
-#: ../mail/e-mail-reader.c:3722
+#: ../mail/e-mail-reader.c:4274
 #, c-format
 msgid "Folder '%s'"
 msgstr "Folder '%s'"
 
-#: ../mail/e-mail-tag-editor.c:292
+#: ../mail/e-mail-session.c:644
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "Enter Passphrase for %s"
+
+#: ../mail/e-mail-session.c:646
+msgid "Enter Passphrase"
+msgstr "Enter Passphrase"
+
+#: ../mail/e-mail-session.c:649
+#, c-format
+msgid "Enter Password for %s"
+msgstr "Enter Password for %s"
+
+#: ../mail/e-mail-session.c:651
+msgid "Enter Password"
+msgstr "Enter Password"
+
+#: ../mail/e-mail-session.c:696
+#, c-format
+msgid "User canceled operation."
+msgstr "User cancelled operation."
+
+#: ../mail/e-mail-session.c:864
+#, 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
+#, 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
+#, c-format
+msgid "Opening folder '%s'"
+msgstr "Opening folder '%s'"
+
+#: ../mail/e-mail-session.c:1278
+#, c-format
+msgid "Invalid folder: %s"
+msgstr "Invalid folder: %s"
+
+#: ../mail/e-mail-session-utils.c:477 ../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/mail-ops.c:622 ../mail/mail-ops.c:653
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+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
+#, 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/mail-ops.c:866
+msgid "Sending message"
+msgstr "Sending message"
+
+#: ../mail/e-mail-session-utils.c:832
+#, c-format
+msgid "Unsubscribing from folder '%s'"
+msgstr "Unsubscribing from folder '%s'"
+
+#: ../mail/e-mail-store-utils.c:39
+#, c-format
+msgid "Disconnecting from '%s'"
+msgstr "Disconnecting from '%s'"
+
+#: ../mail/e-mail-store-utils.c:130
+#, c-format
+msgid "Reconnecting to '%s'"
+msgstr "Reconnecting to '%s'"
+
+#: ../mail/e-mail-tag-editor.c:295
 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:512 ../mail/mail-config.ui.h:77
+#: ../mail/em-account-editor.c:565 ../mail/mail-config.ui.h:69
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "No encryption"
@@ -10064,7 +8927,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:516 ../mail/mail-config.ui.h:136
+#: ../mail/em-account-editor.c:569 ../mail/mail-config.ui.h:124
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS encryption"
@@ -10072,58 +8935,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:520 ../mail/mail-config.ui.h:105
+#: ../mail/em-account-editor.c:573 ../mail/mail-config.ui.h:91
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL encryption"
 
-#: ../mail/em-account-editor.c:607
-#, c-format
-msgid "%s License Agreement"
-msgstr "%s Licence Agreement"
-
-#: ../mail/em-account-editor.c:614
-#, c-format
-msgid ""
-"\n"
-"Please read carefully the license agreement\n"
-"for %s displayed below\n"
-"and tick the check box for accepting it\n"
-msgstr ""
-"\n"
-"Please read carefully the licence agreement\n"
-"for %s displayed below\n"
-"and tick the check box for accepting it\n"
-
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:901 ../widgets/misc/e-signature-combo-box.c:79
+#: ../mail/em-account-editor.c:841 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "None"
 
-#: ../mail/em-account-editor.c:985
+#: ../mail/em-account-editor.c:922
 msgid "Never"
 msgstr "Never"
 
-#: ../mail/em-account-editor.c:986
+#: ../mail/em-account-editor.c:923
 msgid "Always"
 msgstr "Always"
 
-#: ../mail/em-account-editor.c:987
+#: ../mail/em-account-editor.c:924
 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:1723 ../widgets/misc/e-account-tree-view.c:128
+#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:131
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "None"
 
-#: ../mail/em-account-editor.c:2098
+#: ../mail/em-account-editor.c:2085
 msgid "Mail Configuration"
 msgstr "Mail Configuration"
 
-#: ../mail/em-account-editor.c:2099
+#: ../mail/em-account-editor.c:2086
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10133,7 +8978,7 @@ msgstr ""
 "\n"
 "Click \"Forward\" to begin."
 
-#: ../mail/em-account-editor.c:2102
+#: ../mail/em-account-editor.c:2089
 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 "
@@ -10143,20 +8988,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:2104 ../mail/em-account-editor.c:2261
-#: ../mail/mail-config.ui.h:98
+#: ../mail/em-account-editor.c:2091 ../mail/em-account-editor.c:2253
 msgid "Receiving Email"
 msgstr "Receiving E-mail"
 
-#: ../mail/em-account-editor.c:2105
+#: ../mail/em-account-editor.c:2092
 msgid "Please configure the following account settings."
 msgstr "Please configure the following account settings."
 
-#: ../mail/em-account-editor.c:2107 ../mail/em-account-editor.c:2743
+#: ../mail/em-account-editor.c:2094 ../mail/em-account-editor.c:2743
 msgid "Sending Email"
 msgstr "Sending E-mail"
 
-#: ../mail/em-account-editor.c:2108
+#: ../mail/em-account-editor.c:2095
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10164,11 +9008,11 @@ 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:2110
+#: ../mail/em-account-editor.c:2097
 msgid "Account Management"
 msgstr "Account Management"
 
-#: ../mail/em-account-editor.c:2111
+#: ../mail/em-account-editor.c:2098
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10176,11 +9020,11 @@ msgstr ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
 
-#: ../mail/em-account-editor.c:2115
+#: ../mail/em-account-editor.c:2102
 msgid "Done"
 msgstr "Done"
 
-#: ../mail/em-account-editor.c:2116
+#: ../mail/em-account-editor.c:2103
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10202,64 +9046,64 @@ msgstr "Check for _new messages every"
 msgid "minu_tes"
 msgstr "minu_tes"
 
-#: ../mail/em-account-editor.c:2841
+#: ../mail/em-account-editor.c:2847
 msgid "Please select a folder from the current account."
 msgstr "Please select a folder from the current account."
 
-#: ../mail/em-account-editor.c:3111 ../mail/mail-config.ui.h:112
+#: ../mail/em-account-editor.c:3156 ../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:3156 ../mail/em-account-editor.c:3224
+#: ../mail/em-account-editor.c:3201 ../mail/em-account-editor.c:3269
 msgid "Receiving Options"
 msgstr "Receiving Options"
 
-#: ../mail/em-account-editor.c:3157 ../mail/em-account-editor.c:3225
+#: ../mail/em-account-editor.c:3202 ../mail/em-account-editor.c:3270
 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
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+
+#: ../mail/em-composer-utils.c:1146
+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:1729
+#: ../mail/em-composer-utils.c:1804
 #, 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:1777
+#: ../mail/em-composer-utils.c:1854
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Delivery Notification for: \"%s\""
 
-#: ../mail/em-composer-utils.c:2186
+#: ../mail/em-composer-utils.c:2272
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
-#. Note to translators: this is the attribution string used when quoting messages.
-#. * each ${Variable} gets replaced with a value. To see a full list of available
-#. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2233
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-
-#: ../mail/em-composer-utils.c:2377
-msgid "-----Original Message-----"
-msgstr "-----Original Message-----"
-
-#: ../mail/em-composer-utils.c:2589
+#: ../mail/em-composer-utils.c:2696
 msgid "Posting destination"
 msgstr "Posting destination"
 
-#: ../mail/em-composer-utils.c:2590
+#: ../mail/em-composer-utils.c:2697
 msgid "Choose folders to post the message to."
 msgstr "Choose folders to post the message to."
 
-#: ../mail/em-filter-folder-element.c:260
+#: ../mail/em-filter-folder-element.c:337
 msgid "Select Folder"
 msgstr "Select Folder"
 
@@ -10278,7 +9122,7 @@ msgstr "Assign Score"
 
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
-msgstr "BCC"
+msgstr "Bcc"
 
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
@@ -10286,7 +9130,7 @@ msgstr "Beep"
 
 #: ../mail/em-filter-i18n.h:8
 msgid "CC"
-msgstr "CC"
+msgstr "Cc"
 
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
@@ -10376,7 +9220,7 @@ msgstr "is not set"
 msgid "is set"
 msgstr "is set"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:60
 msgid "Junk"
 msgstr "Junk"
 
@@ -10425,7 +9269,7 @@ msgid "Play Sound"
 msgstr "Play Sound"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
 msgid "Read"
 msgstr "Read"
 
@@ -10506,16 +9350,16 @@ msgid "Unset Status"
 msgstr "Unset Status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:533
+#: ../mail/em-filter-rule.c:539
 msgid "Then"
 msgstr "Then"
 
-#: ../mail/em-filter-rule.c:564
+#: ../mail/em-filter-rule.c:570
 msgid "Add Ac_tion"
 msgstr "Add Ac_tion"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:126
+#: ../mail/em-folder-properties.c:124
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Unread messages:"
@@ -10523,36 +9367,35 @@ msgstr[1] "Unread messages:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:130
+#: ../mail/em-folder-properties.c:128
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total messages:"
 msgstr[1] "Total messages:"
 
-#: ../mail/em-folder-properties.c:148
+#: ../mail/em-folder-properties.c:146
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Quota usage (%s):"
 
-#: ../mail/em-folder-properties.c:150
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage"
 msgstr "Quota usage"
 
-#: ../mail/em-folder-properties.c:288
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../mail/em-folder-properties.c:290
 msgid "Folder Properties"
 msgstr "Folder Properties"
 
-#: ../mail/em-folder-selection-button.c:75
+#: ../mail/em-folder-selection-button.c:81
 msgid "<click here to select a folder>"
 msgstr "<click here to select a folder>"
 
-#: ../mail/em-folder-selector.c:264
+#: ../mail/em-folder-selector.c:262
 msgid "C_reate"
 msgstr "C_reate"
 
-#: ../mail/em-folder-selector.c:268
+#: ../mail/em-folder-selector.c:266
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
@@ -10560,7 +9403,7 @@ msgstr "Folder _name:"
 #: ../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:1067 ../mail/mail-vfolder.c:1132
+#: ../mail/mail-vfolder.c:1140 ../mail/mail-vfolder.c:1216
 msgid "Search Folders"
 msgstr "Search Folders"
 
@@ -10569,106 +9412,83 @@ msgstr "Search Folders"
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree-model.c:1113
+#: ../mail/em-folder-tree-model.c:836 ../mail/em-folder-tree-model.c:1113
 msgid "Loading..."
 msgstr "Loadingâ?¦"
 
-#: ../mail/em-folder-tree.c:184
+#: ../mail/em-folder-tree.c:201
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanning folders in \"%s\""
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:629
 msgid "Folder names cannot contain '/'"
 msgstr "Folder names cannot contain '/'"
 
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. The first "%s" will be
-#. * replaced by the folder's name and "%u" will be replaced
-#. * with the number of unread messages in the folder. The
-#. * second %s will be replaced with a "+" letter for collapsed
-#. * folders with unread messages in some subfolder too,
-#. * or with an empty string for other cases.
-#. *
-#. * Most languages should translate this as "%s (%u%s)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:1084
+#: ../mail/em-folder-tree.c:1191
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1318
+#: ../mail/em-folder-tree.c:1427
 msgid "Mail Folder Tree"
 msgstr "Mail Folder Tree"
 
-#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1788 ../mail/em-folder-utils.c:90
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
+#: ../mail/em-folder-tree.c:1792 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2164
+#: ../mail/em-folder-tree.c:1801 ../mail/message-list.c:2214
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2166
+#: ../mail/em-folder-tree.c:1805 ../mail/message-list.c:2216
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: ../mail/em-folder-tree.c:1650
+#: ../mail/em-folder-tree.c:1824
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:422
 msgid "Move Folder To"
 msgstr "Move Folder To"
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:422
 msgid "Copy Folder To"
 msgstr "Copy Folder To"
 
-#: ../mail/em-folder-utils.c:533
-#: ../plugins/groupwise-features/share-folder-common.c:136
+#: ../mail/em-folder-utils.c:571
+#: ../plugins/groupwise-features/share-folder-common.c:138
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Creating folder '%s'"
 
-#: ../mail/em-folder-utils.c:693
+#: ../mail/em-folder-utils.c:745
 msgid "Create Folder"
 msgstr "Create Folder"
 
-#: ../mail/em-folder-utils.c:694
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../mail/em-folder-utils.c:746
+#: ../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-folder-utils.c:714
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "Unsubscribing from folder \"%s\""
-
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
+#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1604
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: ../mail/em-format-html-display.c:90
+#: ../mail/em-format-html-display.c:88
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -10676,11 +9496,11 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
+#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1605
 msgid "Valid signature"
 msgstr "Valid signature"
 
-#: ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html-display.c:89
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -10688,11 +9508,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:92 ../mail/em-format-html.c:1578
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1606
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
-#: ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -10700,11 +9520,11 @@ msgstr ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 
-#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1607
 msgid "Valid signature, but cannot verify sender"
 msgstr "Valid signature, but cannot verify sender"
 
-#: ../mail/em-format-html-display.c:93
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10712,11 +9532,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:94 ../mail/em-format-html.c:1580
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1608
 msgid "Signature exists, but need public key"
 msgstr "Signature exists, but need public key"
 
-#: ../mail/em-format-html-display.c:94
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -10724,11 +9544,11 @@ msgstr ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
+#: ../mail/em-format-html-display.c:99 ../mail/em-format-html.c:1614
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
-#: ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html-display.c:99
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -10736,11 +9556,11 @@ msgstr ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
+#: ../mail/em-format-html-display.c:100 ../mail/em-format-html.c:1615
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
-#: ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html-display.c:100
 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 "
@@ -10750,11 +9570,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:103 ../mail/em-format-html.c:1588
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1616
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -10762,11 +9582,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:104 ../mail/em-format-html.c:1589
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1617
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -10776,15 +9596,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:235 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:238 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: ../mail/em-format-html-display.c:248
+#: ../mail/em-format-html-display.c:251
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: ../mail/em-format-html-display.c:497
+#: ../mail/em-format-html-display.c:506
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10792,28 +9612,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:725
+#: ../mail/em-format-html-display.c:749
 msgid "Completed on"
 msgstr "Completed on"
 
-#: ../mail/em-format-html-display.c:733
+#: ../mail/em-format-html-display.c:757
 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:737
+#: ../mail/em-format-html-display.c:761
 msgid "by"
 msgstr "by"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:978 ../mail/em-format-html-display.c:1025
 msgid "View _Unformatted"
 msgstr "View _Unformatted"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:980
 msgid "Hide _Unformatted"
 msgstr "Hide _Unformatted"
 
-#: ../mail/em-format-html-display.c:1016
+#: ../mail/em-format-html-display.c:1045
 msgid "O_pen With"
 msgstr "O_pen With"
 
@@ -10822,55 +9642,55 @@ msgstr "O_pen With"
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: ../mail/em-format-html.c:153
+#: ../mail/em-format-html.c:165
 msgid "Formatting message"
 msgstr "Formatting message"
 
-#: ../mail/em-format-html.c:352
+#: ../mail/em-format-html.c:364
 msgid "Formatting Message..."
 msgstr "Formatting Messageâ?¦"
 
-#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
+#: ../mail/em-format-html.c:1448 ../mail/em-format-html.c:1458
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "Retrieving '%s'"
 
-#: ../mail/em-format-html.c:1901
+#: ../mail/em-format-html.c:1979
 msgid "Unknown external-body part."
 msgstr "Unknown external-body part."
 
-#: ../mail/em-format-html.c:1909
+#: ../mail/em-format-html.c:1987
 msgid "Malformed external-body part."
 msgstr "Malformed external-body part."
 
-#: ../mail/em-format-html.c:1939
+#: ../mail/em-format-html.c:2017
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointer to FTP site (%s)"
 
-#: ../mail/em-format-html.c:1950
+#: ../mail/em-format-html.c:2028
 #, 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:1952
+#: ../mail/em-format-html.c:2030
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointer to local file (%s)"
 
-#: ../mail/em-format-html.c:1973
+#: ../mail/em-format-html.c:2051
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointer to remote data (%s)"
 
-#: ../mail/em-format-html.c:1984
+#: ../mail/em-format-html.c:2062
 #, 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:2647
+#: ../mail/em-format-html.c:2762
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "This message was sent by %s on behalf of %s"
@@ -10881,57 +9701,94 @@ msgstr "This message was sent by %s on behalf of %s"
 msgid "No HTML stream available"
 msgstr "No HTML stream available"
 
-#: ../mail/em-subscribe-editor.c:677
-msgid "This store does not support subscriptions, or they are not enabled."
-msgstr "This store does not support subscriptions, or they are not enabled."
+#: ../mail/em-subscription-editor.c:1107
+msgid "Folder Subscriptions"
+msgstr "Folder Subscriptions"
+
+#: ../mail/em-subscription-editor.c:1146
+msgid "_Account:"
+msgstr "_Account:"
+
+#: ../mail/em-subscription-editor.c:1161
+msgid "Clear Search"
+msgstr "Clear Search"
+
+#: ../mail/em-subscription-editor.c:1179
+msgid "Sho_w items that contain:"
+msgstr "Sho_w items that contain:"
+
+#: ../mail/em-subscription-editor.c:1218
+msgid "Subscribe to the selected folder"
+msgstr "Subscribe to the selected folder"
+
+#: ../mail/em-subscription-editor.c:1219
+msgid "Su_bscribe"
+msgstr "Su_bscribe"
+
+#: ../mail/em-subscription-editor.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
+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
+msgid "_Unsubscribe"
+msgstr "_Unsubscribe"
 
-#: ../mail/em-subscribe-editor.c:728
-msgid "Subscribed"
-msgstr "Subscribed"
+#: ../mail/em-subscription-editor.c:1242
+msgid "Collapse all folders"
+msgstr "Collapse all folders"
 
-#: ../mail/em-subscribe-editor.c:732
-msgid "Folder"
-msgstr "Folder"
+#: ../mail/em-subscription-editor.c:1243
+msgid "C_ollapse All"
+msgstr "C_ollapse All"
 
-#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:1120
-msgid "Please select a server."
-msgstr "Please select a server."
+#: ../mail/em-subscription-editor.c:1253
+msgid "Expand all folders"
+msgstr "Expand all folders"
 
-#: ../mail/em-subscribe-editor.c:1166
-msgid "No server has been selected"
-msgstr "No server has been selected"
+#: ../mail/em-subscription-editor.c:1254
+msgid "E_xpand All"
+msgstr "E_xpand All"
+
+#: ../mail/em-subscription-editor.c:1264
+msgid "Refresh the folder list"
+msgstr "Refresh the folder list"
+
+#: ../mail/em-subscription-editor.c:1276
+msgid "Stop the current operation"
+msgstr "Stop the current operation"
 
 #. Translators: This message is shown only for ten or more
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:106
+#: ../mail/em-utils.c:101
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 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:152
-#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+#: ../mail/em-utils.c:153
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "_Do not show this message again"
 
-#: ../mail/em-utils.c:314
+#: ../mail/em-utils.c:327
 msgid "Message Filters"
 msgstr "Message Filters"
 
-#: ../mail/em-utils.c:848
+#: ../mail/em-utils.c:883
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
 
-#: ../mail/em-vfolder-editor.c:126
+#: ../mail/em-vfolder-editor.c:108
 msgid "Search _Folders"
 msgstr "Search _Folders"
 
-#: ../mail/em-vfolder-rule.c:525
+#: ../mail/em-vfolder-rule.c:603
 msgid "Add Folder"
 msgstr "Add Folder"
 
@@ -10948,78 +9805,115 @@ msgid "\"Filter Editor\" window width"
 msgstr "\"Filter Editor\" window width"
 
 #: ../mail/evolution-mail.schemas.in.h:4
+msgid "\"Folder Subscriptions\" window height"
+msgstr "\"Folder Subscriptions\" window height"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "\"Folder Subscriptions\" window maximize state"
+msgstr "\"Folder Subscriptions\" window maximise state"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "\"Folder Subscriptions\" window width"
+msgstr "\"Folder Subscriptions\" window width"
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Search Folder Editor\" window height"
 msgstr "\"Search Folder Editor\" window height"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Search Folder Editor\" window maximize state"
 msgstr "\"Search Folder Editor\" window maximise state"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Search Folder Editor\" window width"
 msgstr "\"Search Folder Editor\" window width"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "\"Send and Receive Mail\" window height"
 msgstr "\"Send and Receive Mail\" window height"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "\"Send and Receive Mail\" window maximise state"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "\"Send and Receive Mail\" window width"
 msgstr "\"Send and Receive Mail\" window width"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Always request read receipt"
 msgstr "Always request read receipt"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "Amount of time in seconds the error should be shown on the status bar."
+
+#: ../mail/evolution-mail.schemas.in.h:15
+msgid ""
+"Asks whether to close the message window when the user forwards or replies "
+"to the message shown in the window"
+msgstr ""
+"Asks whether to close the message window when the user forwards or replies "
+"to the message shown in the window"
+
+#: ../mail/evolution-mail.schemas.in.h:16
+msgid "Attribute message."
+msgstr "Attribute message."
+
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Automatic emoticon recognition"
 msgstr "Automatic emoticon recognition"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Automatic link recognition"
 msgstr "Automatic link recognition"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Check for new messages in all active accounts"
+msgstr "Check for new messages in all active accounts"
+
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Check for new messages on start"
+msgstr "Check for new messages on start"
+
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Check incoming mail being junk"
 msgstr "Check incoming mail being junk"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Citation highlight color"
 msgstr "Citation highlight colour"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Citation highlight color."
 msgstr "Citation highlight colour."
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Composer Window default height"
 msgstr "Composer Window default height"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Composer Window default width"
 msgstr "Composer Window default width"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Composer load/attach directory"
 msgstr "Composer load/attach directory"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Compress display of addresses in TO/CC/BCC"
+msgstr "Compress display of addresses in To/Cc/Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
+"Compress display of addresses in To/Cc/Bcc to the number specified in "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11027,11 +9921,11 @@ msgstr ""
 "Controls how frequently local changes are synchronised with the remote mail "
 "server. The interval must be at least 30 seconds."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Custom headers to use while checking for junk."
 msgstr "Custom headers to use while checking for junk."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11039,63 +9933,55 @@ msgstr ""
 "Custom headers to use while checking for junk. The list elements are strings "
 "in the format \"headername=value\"."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default charset in which to compose messages"
 msgstr "Default charset in which to compose messages"
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default charset in which to compose messages."
 msgstr "Default charset in which to compose messages."
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default charset in which to display messages"
 msgstr "Default charset in which to display messages"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default charset in which to display messages."
 msgstr "Default charset in which to display messages."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default forward style"
 msgstr "Default forward style"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default height of the Composer Window."
 msgstr "Default height of the Composer Window."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default height of the mail browser window."
 msgstr "Default height of the mail browser window."
 
-#: ../mail/evolution-mail.schemas.in.h:32
-msgid "Default height of the subscribe dialog."
-msgstr "Default height of the subscribe dialogue."
-
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default maximized state of the mail browser window."
 msgstr "Default maximised state of the mail browser window."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Default reply style"
 msgstr "Default reply style"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Default value for thread expand state"
 msgstr "Default value for thread expand state"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Default width of the Composer Window."
 msgstr "Default width of the Composer Window."
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Default width of the mail browser window."
 msgstr "Default width of the mail browser window."
 
-#: ../mail/evolution-mail.schemas.in.h:38
-msgid "Default width of the subscribe dialog."
-msgstr "Default width of the subscribe dialogue."
-
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11103,11 +9989,11 @@ msgstr ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Determines whether to look up in address book for sender e-mail"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -11119,11 +10005,11 @@ msgstr ""
 "autocompletion. It can be slow, if remote address books (like LDAP) are "
 "marked for autocompletion."
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Determines whether to use custom headers to check for junk"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11133,7 +10019,7 @@ msgstr ""
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11141,47 +10027,47 @@ msgstr ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Directory for loading/attaching files to composer."
 msgstr "Directory for loading/attaching files to composer."
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Directory for saving mail component files."
 msgstr "Directory for saving mail component files."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Disable or enable ellipsizing of folder names in side bar"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Display only message texts not exceeding certain size"
 msgstr "Display only message texts not exceeding certain size"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Do not add signature delimiter"
 msgstr "Do not add signature delimiter"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Draw spelling error indicators on words as you type."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Empty Junk folders on exit"
 msgstr "Empty Junk folders on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty Trash folders on exit"
 msgstr "Empty Wastebasket folders on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Empty all Junk folders when exiting Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Empty all Wastebasket folders when exiting Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -11189,31 +10075,31 @@ msgstr ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Enable caret mode, so that you can see a cursor when reading mail."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable or disable magic space bar"
 msgstr "Enable or disable magic space bar"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Enable or disable the prompt whilst marking multiple messages."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable type ahead search feature"
 msgstr "Enable or disable type ahead search feature"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable search folders"
 msgstr "Enable search folders"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders on startup."
 msgstr "Enable search folders on startup."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -11221,7 +10107,7 @@ msgstr ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -11229,7 +10115,7 @@ msgstr ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
@@ -11237,23 +10123,23 @@ msgstr ""
 "Enable display only of message texts not exceeding size defined in "
 "'message_text_part_limit' key."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "Enable use of a similar message list view settings for all folders"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "Enable use of a similar message list view settings for all folders."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Enable/disable caret mode"
 msgstr "Enable/Disable caret mode"
 
-#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
+#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:44
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Encode file names in an Outlook/GMail way"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -11265,27 +10151,31 @@ msgstr ""
 "because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
 "standard."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Flush Outbox after filtering"
 msgstr "Flush Outbox after filtering"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "Forward message."
+msgstr "Forward message."
+
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Group Reply replies to list"
 msgstr "Group Reply replies to list"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Height of the message-list pane"
 msgstr "Height of the message-list pane"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane."
 msgstr "Height of the message-list pane."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Hides the per-folder preview and removes the selection"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -11293,7 +10183,7 @@ msgstr ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -11304,11 +10194,11 @@ msgstr ""
 "component viewer in GNOME's MIME type database may be used for displaying "
 "content."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Ignore list Reply-To:"
 msgstr "Ignore list Reply-To:"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
@@ -11316,7 +10206,15 @@ msgstr ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid ""
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window vertically."
+
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11324,7 +10222,7 @@ msgstr ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -11332,7 +10230,7 @@ msgstr ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11344,7 +10242,19 @@ msgstr ""
 "value is not used by Evolution since the \"Filter Editor\" window cannot be "
 "maximised. This key exists only as an implementation detail."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid ""
+"Initial maximize state of the \"Folder Subscriptions\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Folder Subscriptions\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"Initial maximise state of the \"Folder Subscriptions\" window. The value "
+"updates when the user maximises or unmaximises the window. Note, this "
+"particular value is not used by Evolution since the \"Folder Subscriptions\" "
+"window cannot be maximised. This key exists only as an implementation detail."
+
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11356,7 +10266,7 @@ msgstr ""
 "particular value is not used by Evolution since the \"Search Folder Editor\" "
 "window cannot be maximised. This key exists only as an implementation detail."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11370,7 +10280,7 @@ msgstr ""
 "\" window cannot be maximised. This key exists only as an implementation "
 "detail."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -11378,7 +10288,15 @@ msgstr ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
+
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11386,7 +10304,7 @@ msgstr ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -11394,7 +10312,7 @@ msgstr ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -11406,7 +10324,7 @@ msgstr ""
 "which you happened to receive the copy of the message to which you're "
 "replying."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -11416,7 +10334,7 @@ msgstr ""
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -11424,7 +10342,7 @@ msgstr ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -11432,7 +10350,7 @@ msgstr ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -11442,35 +10360,40 @@ msgstr ""
 "a private reply to a message which arrived via a mailing list, but the list "
 "sets a Reply-To: header which redirects your reply back to the list."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Last time Empty Junk was run"
 msgstr "Last time Empty Junk was run"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Last time Empty Trash was run"
 msgstr "Last time Empty Wastebasket was run"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Layout style"
 msgstr "Layout style"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:104
+#: ../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
 msgid "List of Labels and their associated colors"
 msgstr "List of Labels and their associated colours"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:106
 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:98
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of accepted licenses"
 msgstr "List of accepted licences"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of accounts"
 msgstr "List of accounts"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11478,15 +10401,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:101
+#: ../mail/evolution-mail.schemas.in.h:110
 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:102
+#: ../mail/evolution-mail.schemas.in.h:111
 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:103
+#: ../mail/evolution-mail.schemas.in.h:112
 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."
@@ -11494,15 +10417,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:104
+#: ../mail/evolution-mail.schemas.in.h:113
 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:105
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Load images for HTML messages over HTTP"
 msgstr "Load images for HTML messages over HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:115
 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 "
@@ -11512,121 +10435,133 @@ 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:107
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Log filter actions"
 msgstr "Log filter actions"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Log filter actions to the specified log file."
 msgstr "Log filter actions to the specified log file."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Logfile to log filter actions"
 msgstr "Logfile to log filter actions"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../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:111
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Mail browser height"
 msgstr "Mail browser height"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Mail browser maximized"
 msgstr "Mail browser maximised"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser width"
 msgstr "Mail browser width"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mark as Seen after specified timeout"
 msgstr "Mark as Seen after specified timeout"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../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:116
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark citations in the message \"Preview\""
 msgstr "Mark citations in the message \"Preview\""
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../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:118
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Message text limit for display"
 msgstr "Message text limit for display"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Message-display style (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Minimum days between emptying the junk on exit"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:130
 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:122
+#: ../mail/evolution-mail.schemas.in.h:131
 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:123
+#: ../mail/evolution-mail.schemas.in.h:132
 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:124
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "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:125
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Original message."
+msgstr "Original message."
+
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid ""
+"Possible values are: never - to never close browser window always - to "
+"always close browser window ask - (or any other value) will ask user"
+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
 msgid "Prompt on empty subject"
 msgstr "Prompt on empty subject"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:137
 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:127
+#: ../mail/evolution-mail.schemas.in.h:138
 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:128
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt when deleting messages in search folder"
 msgstr "Prompt when deleting messages in search folder"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Prompt when mailing list hijacks private replies"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt when replying privately to list messages"
 msgstr "Prompt when replying privately to list messages"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Prompt when replying to many recipients"
 msgstr "Prompt when replying to many recipients"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when user expunges"
 msgstr "Prompt when user expunges"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:145
 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:135
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11634,63 +10569,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:136
+#: ../mail/evolution-mail.schemas.in.h:147
 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:137
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Prompt when user tries to send unwanted HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt while marking multiple messages"
 msgstr "Prompt while marking multiple messages"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Put personalized signatures at the top of replies"
 msgstr "Put personalised signatures at the top of replies"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Put the cursor at the bottom of replies"
 msgstr "Put the cursor at the bottom of replies"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:152
 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:142
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Recognize links in text and replace them."
 msgstr "Recognise links in text and replace them."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Run junk test on incoming mail."
 msgstr "Run junk test on incoming mail."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Save directory"
 msgstr "Save directory"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:156
 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:146
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Send HTML mail by default"
 msgstr "Send HTML mail by default"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Send HTML mail by default."
 msgstr "Send HTML mail by default."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:159
 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:149
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Server synchronization interval"
 msgstr "Server synchronisation interval"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -11698,63 +10633,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:151
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Show \"Bcc\" field when sending a mail message"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Show \"Cc\" field when sending a mail message"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Show \"From\" field when posting to a newsgroup"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:165
 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:155
+#: ../mail/evolution-mail.schemas.in.h:166
 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:156
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show Animations"
 msgstr "Show Animations"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show all message headers"
 msgstr "Show all message headers"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show all the headers when viewing a messages."
 msgstr "Show all the headers when viewing a messages."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show animated images as animations."
 msgstr "Show animated images as animations."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:171
 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:161
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show deleted messages in the message-list"
 msgstr "Show deleted messages in the message-list"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show image animations"
 msgstr "Show image animations"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show original \"Date\" header value."
 msgstr "Show original \"Date\" header value."
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show photo of the sender"
 msgstr "Show photo of the sender"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11762,7 +10697,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:166
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11770,7 +10705,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:167
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11778,7 +10713,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:168
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11786,7 +10721,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:169
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11794,7 +10729,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:170
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -11802,7 +10737,7 @@ msgstr ""
 "Show the e-mail address of the sender in a separate column in the message "
 "list."
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:182
 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 "
@@ -11812,11 +10747,11 @@ msgstr ""
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:183
 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:173
+#: ../mail/evolution-mail.schemas.in.h:184
 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. "
@@ -11834,48 +10769,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:174
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Spell check inline"
 msgstr "Spell check inline"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Spell checking color"
 msgstr "Spell checking colour"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Spell checking languages"
 msgstr "Spell checking languages"
 
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid "Subscribe dialog default height"
-msgstr "Subscribe dialogue default height"
-
-#: ../mail/evolution-mail.schemas.in.h:178
-msgid "Subscribe dialog default width"
-msgstr "Subscribe dialogue default width"
-
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Terminal font"
 msgstr "Terminal font"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "The default plugin for Junk hook"
 msgstr "The default plugin for Junk hook"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:190
 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:182
+#: ../mail/evolution-mail.schemas.in.h:191
 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:183
+#: ../mail/evolution-mail.schemas.in.h:192
 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 "
@@ -11887,15 +10814,39 @@ msgstr ""
 "message list. \"1\" (Vertical View) places the preview pane next to the "
 "message list."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "The terminal font for mail display."
 msgstr "The terminal font for mail display."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:194
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows."
+msgstr ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows."
+
+#: ../mail/evolution-mail.schemas.in.h:195
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows."
+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
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author."
+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
 msgid "The variable width font for mail display."
 msgstr "The variable width font for mail display."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -11903,7 +10854,7 @@ msgstr ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:199
 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 "
@@ -11913,7 +10864,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:188
+#: ../mail/evolution-mail.schemas.in.h:200
 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 "
@@ -11923,7 +10874,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:189
+#: ../mail/evolution-mail.schemas.in.h:201
 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."
@@ -11931,7 +10882,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:190
+#: ../mail/evolution-mail.schemas.in.h:202
 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;"
@@ -11943,7 +10894,7 @@ msgstr ""
 "header enabled&gt; â?? set enabled if the header is to be displayed in the "
 "mail view."
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:203
 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 "
@@ -11953,11 +10904,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:192
+#: ../mail/evolution-mail.schemas.in.h:204
 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:193
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11965,7 +10916,7 @@ 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:194
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -11973,7 +10924,7 @@ msgstr ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:207
 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 "
@@ -11983,51 +10934,51 @@ msgstr ""
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid "Thread the message-list based on Subject"
 msgstr "Thread the message-list based on Subject"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "Timeout for marking message as seen"
 msgstr "Timeout for marking message as seen"
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "Timeout for marking message as seen."
 msgstr "Timeout for marking message as seen."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid "UID string of the default account."
 msgstr "UID string of the default account."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:212
 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:201
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Use SpamAssassin daemon and client"
 msgstr "Use SpamAssassin daemon and client"
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Use SpamAssassin daemon and client (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Use custom fonts"
 msgstr "Use custom fonts"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Use custom fonts for displaying mail."
 msgstr "Use custom fonts for displaying mail."
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "Use only local spam tests."
 msgstr "Use only local spam tests."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Use only the local spam tests (no DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:219
 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 "
@@ -12037,7 +10988,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:208
+#: ../mail/evolution-mail.schemas.in.h:220
 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 "
@@ -12047,20 +10998,39 @@ 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:209
+#: ../mail/evolution-mail.schemas.in.h:221
 msgid "Variable width font"
 msgstr "Variable width font"
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:222
 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:211
+#: ../mail/evolution-mail.schemas.in.h:223
+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 "
+"started. This option is used only together with 'send_recv_on_start' option."
+msgstr ""
+"Whether to check for new messages in all active accounts regardless of the "
+"account's \"Check for new messages every X minutes\" option when Evolution "
+"is started. This option is used only together with 'send_recv_on_start' "
+"option."
+
+#: ../mail/evolution-mail.schemas.in.h:224
+msgid ""
+"Whether check for new messages when Evolution is started. This includes also "
+"sending messages from Outbox."
+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
 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:212
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12068,11 +11038,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:213
+#: ../mail/evolution-mail.schemas.in.h:227
 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:214
+#: ../mail/evolution-mail.schemas.in.h:228
 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 "
@@ -12082,100 +11052,100 @@ 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:215
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Width of the message-list pane"
 msgstr "Width of the message-list pane"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid "Width of the message-list pane."
 msgstr "Width of the message-list pane."
 
-#: ../mail/importers/elm-importer.c:176
+#: ../mail/importers/elm-importer.c:178
 msgid "Importing Elm data"
 msgstr "Importing Elm data"
 
-#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
-#: ../modules/mail/e-mail-shell-view.c:964
+#: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
+#: ../modules/mail/e-mail-shell-view.c:1045
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
 msgstr "Mail"
 
-#: ../mail/importers/elm-importer.c:366
+#: ../mail/importers/elm-importer.c:380
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm importer"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:381
 msgid "Import mail from Elm."
 msgstr "Import mail from Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:116
-#: ../plugins/dbx-import/dbx-importer.c:226
+#: ../mail/importers/evolution-mbox-importer.c:127
+#: ../plugins/dbx-import/dbx-importer.c:227
 msgid "_Destination folder:"
 msgstr "_Destination folder:"
 
-#: ../mail/importers/evolution-mbox-importer.c:122
-#: ../plugins/dbx-import/dbx-importer.c:232
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../mail/importers/evolution-mbox-importer.c:133
+#: ../plugins/dbx-import/dbx-importer.c:233
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "Select folder"
 msgstr "Select folder"
 
-#: ../mail/importers/evolution-mbox-importer.c:122
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../mail/importers/evolution-mbox-importer.c:134
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "Select folder to import into"
 msgstr "Select folder to import into"
 
-#: ../mail/importers/evolution-mbox-importer.c:382
+#: ../mail/importers/evolution-mbox-importer.c:403
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Subject"
 
-#: ../mail/importers/evolution-mbox-importer.c:387
+#: ../mail/importers/evolution-mbox-importer.c:408
 msgctxt "mboxImp"
 msgid "From"
 msgstr "From"
 
-#: ../mail/importers/evolution-mbox-importer.c:431
-#: ../shell/e-shell-utils.c:251
+#: ../mail/importers/evolution-mbox-importer.c:452
+#: ../shell/e-shell-utils.c:253
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:432
+#: ../mail/importers/evolution-mbox-importer.c:453
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer Berkeley Mailbox format folders"
 
-#: ../mail/importers/mail-importer.c:64
+#: ../mail/importers/mail-importer.c:65
 msgid "Importing mailbox"
 msgstr "Importing mailbox"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:150
-#: ../plugins/dbx-import/dbx-importer.c:554
-#: ../plugins/pst-import/pst-importer.c:452
-#: ../plugins/pst-import/pst-importer.c:558
+#: ../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
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importing '%s'"
 
-#: ../mail/importers/mail-importer.c:295
+#: ../mail/importers/mail-importer.c:308
 #, c-format
 msgid "Scanning %s"
 msgstr "Scanning %s"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:223
 msgid "Importing Pine data"
 msgstr "Importing Pine data"
 
-#: ../mail/importers/pine-importer.c:405
-#: ../modules/addressbook/addressbook-config.c:1006
+#: ../mail/importers/pine-importer.c:420
+#: ../modules/addressbook/addressbook-config.c:1016
 msgid "Address Book"
 msgstr "Address Book"
 
-#: ../mail/importers/pine-importer.c:447
+#: ../mail/importers/pine-importer.c:462
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine importer"
 
-#: ../mail/importers/pine-importer.c:448
+#: ../mail/importers/pine-importer.c:463
 msgid "Import mail from Pine."
 msgstr "Import mail from Pine."
 
@@ -12199,7 +11169,7 @@ msgstr "Subject is %s"
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: ../mail/mail-autofilter.c:363
+#: ../mail/mail-autofilter.c:382
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
@@ -12208,7 +11178,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:451
+#: ../mail/mail-autofilter.c:480
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -12225,76 +11195,80 @@ msgstr[1] ""
 "%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 
-#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
-#: ../mail/mail-config.ui.h:2
-msgid "(Not Recommended)"
-msgstr "(Not Recommended)"
-
-#: ../mail/mail-config.ui.h:3
-msgid "(Note: Requires restart of the application)"
-msgstr "(Note: Requires restart of the application)"
-
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "Account Information"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
 msgstr "Add Ne_w Signatureâ?¦"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:3
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Al_ways sign outgoing messages when using this account"
 
-#: ../mail/mail-config.ui.h:8
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:5
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr "Allowing a _mailing list to redirect a private reply to the list"
+
+#: ../mail/mail-config.ui.h:6
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Also encrypt to sel_f when sending encrypted messages"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:7
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Alway_s carbon-copy (cc) to:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:8
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Always _blind carbon-copy (bcc) to:"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:9
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Always _trust keys in my keyring when encrypting"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:10
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Always encrypt to _myself when sending encrypted messages"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:11
 msgid "Always request rea_d receipt"
 msgstr "Always request rea_d receipt"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:12
 msgid "Apply the same _view settings to all folders"
 msgstr "Apply the same _view settings to all folders"
 
-#: ../mail/mail-config.ui.h:16
-#: ../modules/addressbook/addressbook-config.c:1013
+#: ../mail/mail-config.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1023
 msgid "Authentication"
 msgstr "Authentication"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "Automatically insert _emoticon images"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "C_haracter set:"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "Ch_eck for Supported Types"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "Check cu_stom headers for junk"
 
+#: ../mail/mail-config.ui.h:19
+msgid "Check for new _messages on start"
+msgstr "Check for new _messages on start"
+
+#: ../mail/mail-config.ui.h:20
+msgid "Check for new messa_ges in all active accounts"
+msgstr "Check for new messa_ges in all active accounts"
+
 #: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
 msgstr "Check incoming _messages for junk"
@@ -12304,33 +11278,40 @@ msgid "Check spelling while I _type"
 msgstr "Check spelling while I _type"
 
 #: ../mail/mail-config.ui.h:23
-msgid "Checks incoming mail messages to be Junk"
-msgstr "Checks incoming mail messages to be Junk"
-
-#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "Cle_ar"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "Clea_r"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "Colour for _misspelt words:"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "Composing Messages"
 
-#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:27
+#: ../modules/plugin-manager/evolution-plugin-manager.c:157
 msgid "Configuration"
 msgstr "Configuration"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "Confirm _when expunging a folder"
 
+#: ../mail/mail-config.ui.h:29
+msgid "Confirmations"
+msgstr "Confirmations"
+
+#: ../mail/mail-config.ui.h:30
+#: ../modules/addressbook/autocompletion-config.c:155
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
+msgid "Date/Time Format"
+msgstr "Date/Time Format"
+
 #: ../mail/mail-config.ui.h:32
 msgid "Default Behavior"
 msgstr "Default Behaviour"
@@ -12339,372 +11320,325 @@ msgstr "Default Behaviour"
 msgid "Default character e_ncoding:"
 msgstr "Default character e_ncoding:"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:34
 msgid "Delete Mail"
 msgstr "Delete Mail"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:35
 msgid "Delete junk messages on e_xit"
 msgstr "Delete junk messages on e_xit"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:37
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Digitally sign o_utgoing messages (by default)"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:38
 msgid "Displayed Message Headers"
 msgstr "Displayed Message Headers"
 
-#: ../mail/mail-config.ui.h:40
-msgid "Do not display messages when text si_ze exceeds"
-msgstr "Do not display messages when text si_ze exceeds"
-
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:39
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Do not mar_k messages as junk if sender is in my address book"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:40
 msgid "Do not quote"
 msgstr "Do not quote"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:41
 msgid "Drafts _Folder:"
 msgstr "Drafts _Folder:"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:42
 msgid "Email _Address:"
 msgstr "E-mail _Address:"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:43
 msgid "Empty trash folders on e_xit"
 msgstr "Empty wastebasket folders on e_xit"
 
-#: ../mail/mail-config.ui.h:46
-msgid "Enable Magic S_pacebar"
-msgstr "Enable Magic S_pacebar"
-
-#: ../mail/mail-config.ui.h:47
-msgid "Enable Sea_rch Folders"
-msgstr "Enable Sea_rch Folders"
-
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:45
 msgid "Encry_ption certificate:"
 msgstr "Encry_ption certificate:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:46
 msgid "Encrypt out_going messages (by default)"
 msgstr "Encrypt out_going messages (by default)"
 
-#: ../mail/mail-config.ui.h:51
-msgid "Fi_xed-width:"
-msgstr "Fi_xed-width:"
-
-#: ../mail/mail-config.ui.h:52
-msgid "Fix_ed width Font:"
-msgstr "Fix_ed width Font:"
+#: ../mail/mail-config.ui.h:47
+msgid "F_all back to threading messages by subject"
+msgstr "F_all back to threading messages by subject"
 
-#: ../mail/mail-config.ui.h:53
-msgid "Font Properties"
-msgstr "Font Properties"
+#: ../mail/mail-config.ui.h:48
+msgid "Fix_ed Width Font:"
+msgstr "Fix_ed Width Font:"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:49
 msgid "Format messages in _HTML"
 msgstr "Format messages in _HTML"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:50
 msgid "Full Nam_e:"
 msgstr "Full Nam_e:"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:52
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr "Group Reply goes only to mailing list, if possible"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:53
 msgid "HTML Messages"
 msgstr "HTML Messages"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:54
 msgid "H_TTP Proxy:"
 msgstr "H_TTP Proxy:"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:55
 msgid "Headers"
 msgstr "Headers"
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:56
 msgid "Highlight _quotations with"
 msgstr "Highlight _quotations with"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:57
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "Ignore Reply-To: for mailing lists"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:58
 msgid "Inline"
 msgstr "Inline"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:59
 msgid "Inline (Outlook style)"
 msgstr "Inline (Outlook style)"
 
-#: ../mail/mail-config.ui.h:67
-msgid "KB"
-msgstr "KB"
-
-#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:61 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Labels"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:62
 msgid "Languages Table"
 msgstr "Languages Table"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:63
 msgid "Loading Images"
 msgstr "Loading Images"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:64
 msgid "Mail Headers Table"
 msgstr "Mail Headers Table"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:65
 msgid "Mailbox location"
 msgstr "Mailbox location"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:66
 msgid "Message Display"
 msgstr "Message Display"
 
-#: ../mail/mail-config.ui.h:74
-msgid "Message Fonts"
-msgstr "Message Fonts"
-
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:67
 msgid "Message Receipts"
 msgstr "Message Receipts"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:68
 msgid "No _Proxy for:"
 msgstr "No _Proxy for:"
 
-#: ../mail/mail-config.ui.h:78
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
-msgstr ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
-
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:70
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "Option is ignored if a match for custom junk headers is found."
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:71
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Optional Information"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:73
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:74
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:75
 msgid "Pass_word:"
 msgstr "Pass_word:"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+msgid "Pick a color"
+msgstr "Pick a colour"
+
+#: ../mail/mail-config.ui.h:77
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.ui.h:87
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "Pr_ompt when sending messages with only Bcc recipients defined"
-
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:78
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:90
-msgid "Printed Fonts"
-msgstr "Printed Fonts"
-
-#: ../mail/mail-config.ui.h:91
-msgid "Prompt when mailing list redirects private reply back to list"
-msgstr "Prompt when mailing list redirects private reply back to list"
-
-#: ../mail/mail-config.ui.h:92
-msgid "Prompt when sending private replies to mailing _list messages"
-msgstr "Prompt when sending private replies to mailing _list messages"
-
-#: ../mail/mail-config.ui.h:93
-msgid "Prompt when sending replies to _many recipients"
-msgstr "Prompt when sending replies to _many recipients"
-
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:80
 msgid "Proxy Settings"
 msgstr "Proxy Settings"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:81
 msgid "Quoted"
 msgstr "Quoted"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:82
 msgid "Re_member password"
 msgstr "Re_member password"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:83
 msgid "Re_ply-To:"
 msgstr "Re_ply-To:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:84
 msgid "Remember _password"
 msgstr "Remember _password"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:85
+msgid "Replies and Forwards"
+msgstr "Replies and Forwards"
+
+#: ../mail/mail-config.ui.h:86
 msgid "Required Information"
 msgstr "Required Information"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:87
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:88
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:89
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:90
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:92
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL is not supported in this build of Evolution"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:93
 msgid "S_earch for sender photograph only in local address books"
 msgstr "S_earch for sender photograph only in local address books"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:94
 msgid "S_elect..."
 msgstr "S_electâ?¦"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:95
 msgid "S_end message receipts:"
 msgstr "S_end message receipts:"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:96
 msgid "S_tandard Font:"
 msgstr "S_tandard Font:"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:97
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:113
-msgid "Select Drafts Folder"
-msgstr "Select Drafts Folder"
-
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:99
 msgid "Select HTML fixed width font"
 msgstr "Select HTML fixed width font"
 
-#: ../mail/mail-config.ui.h:115
-msgid "Select HTML fixed width font for printing"
-msgstr "Select HTML fixed width font for printing"
-
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:100
 msgid "Select HTML variable width font"
 msgstr "Select HTML variable width font"
 
-#: ../mail/mail-config.ui.h:117
-msgid "Select HTML variable width font for printing"
-msgstr "Select HTML variable width font for printing"
-
-#: ../mail/mail-config.ui.h:118
-msgid "Select Junk Folder"
-msgstr "Select Junk Folder"
+#: ../mail/mail-config.ui.h:101
+msgid "Sender Photograph"
+msgstr "Sender Photograph"
 
-#: ../mail/mail-config.ui.h:119
-msgid "Select Sent Folder"
-msgstr "Select Sent Folder"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:103
+msgid "Sending a _private reply to a mailing list message"
+msgstr "Sending a _private reply to a mailing list message"
 
-#: ../mail/mail-config.ui.h:120
-msgid "Select Trash Folder"
-msgstr "Select Wastebasket Folder"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:105
+msgid "Sending a message with an _empty subject line"
+msgstr "Sending a message with an _empty subject line"
 
-#: ../mail/mail-config.ui.h:121
-msgid "Sender Photograph"
-msgstr "Sender Photograph"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:107
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "Sending a message with only _Bcc recipients defined"
 
-#: ../mail/mail-config.ui.h:122
-msgid "Sending Mail"
-msgstr "Sending Mail"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:109
+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:123
+#: ../mail/mail-config.ui.h:110
 msgid "Sent _Messages Folder:"
 msgstr "Sent _Messages Folder:"
 
-#: ../mail/mail-config.ui.h:124
-msgid "Sent and Draft Messages"
-msgstr "Sent and Draft Messages"
-
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:111
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver requires authentication"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:112
 msgid "Server Configuration"
 msgstr "Server Configuration"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:113
 msgid "Server _Type:"
 msgstr "Server _Type:"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:114
 msgid "Si_gning algorithm:"
 msgstr "Si_gning algorithm:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_natures"
 msgstr "Sig_natures"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:116
 msgid "Sig_ning certificate:"
 msgstr "Sig_ning certificate:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:117
 msgid "Signat_ure:"
 msgstr "Signat_ure:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:118
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:119
 msgid "Signing _algorithm:"
 msgstr "Signing _algorithm:"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:120
+msgid "Special Folders"
+msgstr "Special Folders"
+
+#: ../mail/mail-config.ui.h:121
 msgid "Spell Checking"
 msgstr "Spell Checking"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:122
 msgid "Start _typing at the bottom on replying"
 msgstr "Start _typing at the bottom on replying"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:123
+msgid "Start up"
+msgstr "Start up"
+
+#: ../mail/mail-config.ui.h:125
 msgid "T_ype:"
 msgstr "T_ype:"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:126
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12712,7 +11646,7 @@ msgstr ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:127
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12722,12 +11656,15 @@ msgstr ""
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 
-#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
-#: ../mail/mail-config.ui.h:143
-msgid "Top Posting Option"
-msgstr "Top Posting Option"
+#: ../mail/mail-config.ui.h:130
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
+msgstr ""
+"To help avoid e-mail accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12735,166 +11672,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:146
+#: ../mail/mail-config.ui.h:133
 msgid "Us_ername:"
 msgstr "Us_ername:"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:134
 msgid "Use Authe_ntication"
 msgstr "Use Authe_ntication"
 
-#: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
-#: ../plugins/google-account-setup/google-contacts-source.c:286
-#: ../plugins/google-account-setup/google-source.c:623
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
-msgid "User_name:"
+#: ../mail/mail-config.ui.h:135
+msgid "User _Name:"
 msgstr "User_name:"
 
-#: ../mail/mail-config.ui.h:149
-msgid "V_ariable-width:"
-msgstr "V_ariable-width:"
-
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:136
 msgid "_Add Signature"
 msgstr "_Add Signature"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:137
 msgid "_Always load images from the Internet"
 msgstr "_Always load images from the Internet"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:138
 msgid "_Authentication Type"
 msgstr "_Authentication Type"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:139
 msgid "_Default junk plugin:"
 msgstr "_Default junk plugin:"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:140
 msgid "_Direct connection to the Internet"
 msgstr "_Direct connection to the Internet"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:141
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Do not sign meeting requests (for Outlook compatibility)"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:142
 msgid "_Forward style:"
 msgstr "_Forward style:"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:143
 msgid "_Junk Folder:"
 msgstr "_Junk Folder:"
 
-#: ../mail/mail-config.ui.h:158
-msgid "_Keep Signature above the original message on replying"
-msgstr "_Keep Signature above the original message on replying"
+#: ../mail/mail-config.ui.h:144
+msgid "_Keep signature above the original message on replying"
+msgstr "_Keep signature above the original message on replying"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:145
 msgid "_Languages"
 msgstr "_Languages"
 
-#: ../mail/mail-config.ui.h:160
-msgid "_Load images in messages from contacts"
-msgstr "_Load images in messages from contacts"
+#: ../mail/mail-config.ui.h:146
+msgid "_Load images only in messages from contacts"
+msgstr "_Load images only in messages from contacts"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:147
 msgid "_Lookup in local address book only"
 msgstr "_Look up in local address book only"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:148
 msgid "_Make this my default account"
 msgstr "_Make this my default account"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:149
 msgid "_Manual proxy configuration:"
 msgstr "_Manual proxy configuration:"
 
-#: ../mail/mail-config.ui.h:164
-msgid "_Mark messages as read after"
-msgstr "_Mark messages as read after"
-
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:151
 msgid "_Never load images from the Internet"
 msgstr "_Never load images from the Internet"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:152
 msgid "_Path:"
 msgstr "_Path:"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:153
 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:169
-msgid "_Prompt when sending messages with an empty subject line"
-msgstr "_Prompt when sending messages with an empty subject line"
-
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:154
 msgid "_Reply style:"
 msgstr "_Reply style:"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:155
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:156
 msgid "_Secure HTTP Proxy:"
 msgstr "_Secure HTTP Proxy:"
 
-#: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:158 ../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:176
-msgid "_Show image animations"
-msgstr "_Show image animations"
+#: ../mail/mail-config.ui.h:160
+msgid "_Show animated images"
+msgstr "_Show animated images"
 
-#: ../mail/mail-config.ui.h:177
+#: ../mail/mail-config.ui.h:161
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Show the photograph of sender in the message preview"
 
-#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:179
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_Shrink To / Cc / Bcc headers to "
-
-#: ../mail/mail-config.ui.h:180
+#: ../mail/mail-config.ui.h:162
 msgid "_Trash Folder:"
 msgstr "Wastebaske_t Folder:"
 
-#: ../mail/mail-config.ui.h:181
+#: ../mail/mail-config.ui.h:163
 msgid "_Use Secure Connection:"
 msgstr "_Use Secure Connection:"
 
-#: ../mail/mail-config.ui.h:182
+#: ../mail/mail-config.ui.h:164
 msgid "_Use system defaults"
 msgstr "_Use system defaults"
 
-#: ../mail/mail-config.ui.h:183
+#: ../mail/mail-config.ui.h:165
 msgid "_Use the same fonts as other applications"
 msgstr "_Use the same fonts as other applications"
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:166 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:186
-msgid "addresses"
-msgstr "addresses"
-
-#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:167 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:188
+#: ../mail/mail-config.ui.h:168
 msgid "color"
 msgstr "colour"
 
-#: ../mail/mail-config.ui.h:189
+#: ../mail/mail-config.ui.h:169
 msgid "description"
 msgstr "description"
 
@@ -12919,78 +11831,58 @@ msgid "Co_mpleted"
 msgstr "Co_mpleted"
 
 #: ../mail/mail-dialogs.ui.h:6
-msgid "Collapse _all"
-msgstr "Collapse _all"
-
-#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Digital Signature"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Do Not Forward"
 msgstr "Do Not Forward"
 
-#: ../mail/mail-dialogs.ui.h:9
-msgid "E_xpand all"
-msgstr "E_xpand all"
-
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Encryption"
 msgstr "Encryption"
 
-#: ../mail/mail-dialogs.ui.h:11
-msgid "Folder Subscriptions"
-msgstr "Folder Subscriptions"
-
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Follow-Up"
 msgstr "Follow-Up"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:10
 msgid "For Your Information"
 msgstr "For Your Information"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Forward"
 msgstr "Forward"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:12
 msgid "License Agreement"
 msgstr "Licence Agreement"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:13
 msgid "No Response Necessary"
 msgstr "No Response Necessary"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Reply to All"
 msgstr "Reply to All"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Review"
 msgstr "Review"
 
-#: ../mail/mail-dialogs.ui.h:22
-msgid "S_erver:"
-msgstr "S_erver:"
-
-#: ../mail/mail-dialogs.ui.h:23
-msgid "S_how only items containing:"
-msgstr "S_how only items containing:"
-
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Search Folder Sources"
 msgstr "Search Folder Sources"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Security Information"
 msgstr "Security Information"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Specific folders"
 msgstr "Specific folders"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:22
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12998,218 +11890,173 @@ msgstr ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:24
 msgid "_Accept License"
 msgstr "_Accept Licence"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Due By:"
 msgstr "_Due By:"
 
-#: ../mail/mail-dialogs.ui.h:31
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Flag:"
 msgstr "_Flag:"
 
-#: ../mail/mail-dialogs.ui.h:32
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Tick this to accept the license agreement"
 msgstr "_Tick this to accept the licence agreement"
 
-#: ../mail/mail-folder-cache.c:783
+#: ../mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: ../mail/mail-ops.c:84
+#: ../mail/mail-ops.c:85
 msgid "Filtering Selected Messages"
 msgstr "Filtering Selected Messages"
 
-#: ../mail/mail-ops.c:245
+#: ../mail/mail-ops.c:226
 msgid "Fetching Mail"
 msgstr "Fetching Mail"
 
-#: ../mail/mail-ops.c:592
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Failed to apply outgoing filters: %s"
-
-#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-
-#: ../mail/mail-ops.c:654
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "Failed to append to local 'Sent' folder: %s"
-
-#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
-msgid "Sending message"
-msgstr "Sending message"
-
-#: ../mail/mail-ops.c:782
+#: ../mail/mail-ops.c:785
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
 
-#: ../mail/mail-ops.c:826
+#: ../mail/mail-ops.c:831
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Failed to send %d of %d messages"
 
-#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:783
+#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:788
 msgid "Canceled."
 msgstr "Cancelled."
 
-#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:785
+#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:790
 msgid "Complete."
 msgstr "Complete."
 
-#: ../mail/mail-ops.c:938
-#, c-format
-msgid "Saving message to folder '%s'"
-msgstr "Saving message to folder '%s'"
-
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:941
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Moving messages to '%s'"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:941
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copying messages to '%s'"
 
-#: ../mail/mail-ops.c:1127
+#: ../mail/mail-ops.c:1062
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Scanning folders in '%s'"
 
-#: ../mail/mail-ops.c:1235
+#: ../mail/mail-ops.c:1178
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
-#: ../mail/mail-ops.c:1276
-#, c-format
-msgid "Opening folder '%s'"
-msgstr "Opening folder '%s'"
-
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1295
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Retrieving quota information for folder '%s'"
 
-#: ../mail/mail-ops.c:1414
+#: ../mail/mail-ops.c:1370
 #, c-format
 msgid "Opening store '%s'"
 msgstr "Opening store '%s'"
 
-#: ../mail/mail-ops.c:1485
+#: ../mail/mail-ops.c:1446
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Removing folder '%s'"
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1585
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Storing folder '%s'"
 
-#: ../mail/mail-ops.c:1672
+#: ../mail/mail-ops.c:1654
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: ../mail/mail-ops.c:1673
+#: ../mail/mail-ops.c:1655
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Storing account '%s'"
 
-#: ../mail/mail-ops.c:1727
+#: ../mail/mail-ops.c:1713
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Refreshing folder '%s'"
 
-#: ../mail/mail-ops.c:1767
+#: ../mail/mail-ops.c:1877
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Expunging folder '%s'"
 
-#: ../mail/mail-ops.c:1812
+#: ../mail/mail-ops.c:1949
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Emptying wastebasket in '%s'"
 
-#: ../mail/mail-ops.c:1813
+#: ../mail/mail-ops.c:1950
 msgid "Local Folders"
 msgstr "Local Folders"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2123
 #, 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:2105
+#: ../mail/mail-ops.c:2216
 #, 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:2192
+#: ../mail/mail-ops.c:2312
 #, c-format
 msgid "Error saving messages to: %s:\n"
 msgstr "Error saving messages to: %s:\n"
 
-#: ../mail/mail-ops.c:2265
-msgid "Saving attachment"
-msgstr "Saving attachment"
-
-#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
+#: ../mail/mail-ops.c:2387
 #, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"Cannot create output file: %s:\n"
-" %s"
+msgid "Preparing account '%s' for offline"
+msgstr "Preparing account '%s' for offline"
 
-#: ../mail/mail-ops.c:2310
-msgid "Could not write data: "
-msgstr "Could not write data: "
+#: ../mail/mail-ops.c:2478
+msgid "Checking Service"
+msgstr "Checking Service"
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2558
 #, c-format
-msgid "Disconnecting from '%s'"
-msgstr "Disconnecting from '%s'"
+msgid "Disconnecting %s"
+msgstr "Disconnecting %s"
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2615
 #, c-format
-msgid "Reconnecting to '%s'"
-msgstr "Reconnecting to '%s'"
+msgid "Removing attachments"
+msgstr "Removing attachments"
 
-#: ../mail/mail-ops.c:2550
+#: ../mail/mail-ops.c:2662
 #, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "Preparing account '%s' for offline"
+msgid "File \"%s\" has been removed."
+msgstr "File \"%s\" has been removed."
 
-#: ../mail/mail-ops.c:2636
-msgid "Checking Service"
-msgstr "Checking Service"
-
-#: ../mail/mail-send-recv.c:188
+#: ../mail/mail-send-recv.c:190
 msgid "Canceling..."
 msgstr "Cancellingâ?¦"
 
-#: ../mail/mail-send-recv.c:440
+#: ../mail/mail-send-recv.c:435
 msgid "Send & Receive Mail"
 msgstr "Send & Receive Mail"
 
-#: ../mail/mail-send-recv.c:457
+#: ../mail/mail-send-recv.c:452
 msgid "Cancel _All"
 msgstr "Cancel _All"
 
@@ -13217,85 +12064,45 @@ msgstr "Cancel _All"
 msgid "Updating..."
 msgstr "Updatingâ?¦"
 
-#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:649
+#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:653
 msgid "Waiting..."
 msgstr "Waitingâ?¦"
 
-#: ../mail/mail-send-recv.c:896
+#: ../mail/mail-send-recv.c:903
 #, c-format
 msgid "Checking for new mail"
 msgstr "Checking for new mail"
 
-#: ../mail/mail-session.c:225
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Enter Passphrase for %s"
-
-#: ../mail/mail-session.c:227
-msgid "Enter Passphrase"
-msgstr "Enter Passphrase"
-
-#: ../mail/mail-session.c:230
-#, c-format
-msgid "Enter Password for %s"
-msgstr "Enter Password for %s"
-
-#: ../mail/mail-session.c:232
-msgid "Enter Password"
-msgstr "Enter Password"
-
-#: ../mail/mail-session.c:277
-#, c-format
-msgid "User canceled operation."
-msgstr "User cancelled operation."
-
-#: ../mail/mail-session.c:724
-#, 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/mail-session.c:733
-#, 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/mail-tools.c:128
+#: ../mail/mail-tools.c:69
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "Could not create spool directory '%s': %s"
 
-#: ../mail/mail-tools.c:161
+#: ../mail/mail-tools.c:102
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Trying to movemail a non-mbox source '%s'"
 
-#: ../mail/mail-tools.c:273
+#: ../mail/mail-tools.c:214
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Forwarded message â?? %s"
 
-#: ../mail/mail-tools.c:275
+#: ../mail/mail-tools.c:216
 msgid "Forwarded message"
 msgstr "Forwarded message"
 
-#: ../mail/mail-tools.c:318
-#, c-format
-msgid "Invalid folder: '%s'"
-msgstr "Invalid folder: '%s'"
-
-#: ../mail/mail-vfolder.c:85
+#: ../mail/mail-vfolder.c:86
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Setting up Search Folder: %s"
 
-#: ../mail/mail-vfolder.c:224
+#: ../mail/mail-vfolder.c:235
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Updating Search Folders for '%s:%s'"
 
-#: ../mail/mail-vfolder.c:231
+#: ../mail/mail-vfolder.c:242
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Updating Search Folders for '%s'"
@@ -13305,7 +12112,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:675
+#: ../mail/mail-vfolder.c:709
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -13316,18 +12123,19 @@ msgid_plural ""
 "%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
-"The Search Folder \"%s\" has been modified to account for the deleted folder\n"
+"The Search Folder \"%s\" has been modified to account for the deleted "
+"folder\n"
 "\"%s\"."
 msgstr[1] ""
 "The following Search Folders\n"
 "%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 
-#: ../mail/mail-vfolder.c:1185
+#: ../mail/mail-vfolder.c:1273
 msgid "Edit Search Folder"
 msgstr "Edit Search Folder"
 
-#: ../mail/mail-vfolder.c:1290
+#: ../mail/mail-vfolder.c:1380
 msgid "New Search Folder"
 msgstr "New Search Folder"
 
@@ -13431,7 +12239,7 @@ msgstr "Are you sure you want to send a message with invalid addresses?"
 
 #: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Are you sure you want to send a message with only BCC recipients?"
+msgstr "Are you sure you want to send a message with only Bcc recipients?"
 
 #: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
@@ -13530,26 +12338,46 @@ msgstr ""
 "passwords are case-sensitive; your caps lock might be on."
 
 #: ../mail/mail.error.xml.h:43
+msgid "Close message window."
+msgstr "Close message window."
+
+#: ../mail/mail.error.xml.h:44
 msgid "Could not save signature file."
 msgstr "Could not save signature file."
 
-#: ../mail/mail.error.xml.h:44
+#: ../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:46
+#: ../mail/mail.error.xml.h:50
 msgid "Do _Not Disable"
 msgstr "Do _Not Disable"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:51
 msgid "Do _Not Send"
 msgstr "Do _Not Send"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:52
 msgid "Do _Not Synchronize"
 msgstr "Do _Not Synchronise"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:53
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -13557,46 +12385,55 @@ msgstr ""
 "Do you want to locally synchronise the folders that are marked for offline "
 "usage?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:54
 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:51
+#: ../mail/mail.error.xml.h:55
 msgid "Do you wish to save your changes?"
 msgstr "Do you wish to save your changes?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:56
 msgid "Enter password."
 msgstr "Enter password."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:57
 msgid "Error loading filter definitions."
 msgstr "Error loading filter definitions."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:58
 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:58
+#: ../mail/mail.error.xml.h:62
 msgid "Error while {0}."
 msgstr "Error while {0}."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:63
+msgid "Failed to unsubscribe from folder."
+msgstr "Failed to unsubscribe from folder."
+
+#: ../mail/mail.error.xml.h:64
 msgid "File exists but cannot overwrite it."
 msgstr "File exists but cannot overwrite it."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:65
 msgid "File exists but is not a regular file."
 msgstr "File exists but is not a regular file."
 
-#: ../mail/mail.error.xml.h:61
+#. Translators: {0} is replaced with a folder name
+#: ../mail/mail.error.xml.h:67
+msgid "Folder '{0}' doesn't contain any duplicate message."
+msgstr "Folder '{0}' doesn't contain any duplicate messages."
+
+#: ../mail/mail.error.xml.h:68
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "If you continue, you will not be able to recover these messages."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:69
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -13604,17 +12441,17 @@ msgstr ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:70
 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:64
+#: ../mail/mail.error.xml.h:71
 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:65
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13622,11 +12459,11 @@ msgstr ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:74
 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:68
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13634,23 +12471,23 @@ msgstr ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:76
 msgid "Ignore"
 msgstr "Ignore"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:77
 msgid "Invalid authentication"
 msgstr "Invalid authentication"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:78
 msgid "Mail Deletion Failed"
 msgstr "Mail Deletion Failed"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:79
 msgid "Mail filters automatically updated."
 msgstr "Mail filters automatically updated."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:80
 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 "
@@ -13658,33 +12495,45 @@ msgid ""
 "recipient."
 msgstr ""
 "Many e-mail systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
+"Bcc recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or Cc: "
 "recipient."
 
-#: ../mail/mail.error.xml.h:74
+#: ../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."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:84
+msgid "N_ever"
+msgstr "N_ever"
+
+#: ../mail/mail.error.xml.h:85
+msgid "No duplicate messages found."
+msgstr "No duplicate messages found."
+
+#: ../mail/mail.error.xml.h:86
 msgid "No sources selected."
 msgstr "No sources selected."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:87
 msgid "Opening too many messages at once may take a long time."
 msgstr "Opening too many messages at once may take a long time."
 
 #  mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:88
 msgid "Please check your account settings and try again."
 msgstr "Please check your account settings and try again."
 
 #  mail:gw-accountsetup-error secondary
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:89
 msgid "Please enable the account or send using another account."
 msgstr "Please enable the account or send using another account."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -13692,7 +12541,7 @@ msgstr ""
 "Please enter a valid e-mail address in the To: field. You can search for e-"
 "mail addresses by clicking on the To: button next to the entry box."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13702,59 +12551,63 @@ msgstr ""
 "HTML e-mail:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:93
 msgid "Please provide an unique name to identify this signature."
 msgstr "Please provide an unique name to identify this signature."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:94
 msgid "Please wait."
 msgstr "Please wait."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:95
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problem migrating old mail folder \"{0}\"."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:96
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Querying server for a list of supported authentication mechanisms."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:97
 msgid "Read receipt requested."
 msgstr "Read receipt requested."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:98
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Really delete folder \"{0}\" and all of its subfolders?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:99
 msgid "Really delete folder \"{0}\"?"
 msgstr "Really delete folder \"{0}\"?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:100
+msgid "Remove duplicate messages?"
+msgstr "Remove duplicate messages?"
+
+#: ../mail/mail.error.xml.h:101
 msgid "Reply _Privately"
 msgstr "Reply _Privately"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:104
 msgid "Search Folders automatically updated."
 msgstr "Search Folders automatically updated."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:105
 msgid "Send private reply?"
 msgstr "Send private reply?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:106
 msgid "Send reply to all recipients?"
 msgstr "Send reply to all recipients?"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:107
 msgid "Signature Already Exists"
 msgstr "Signature Already Exists"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:108
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Synchronise folders locally for offline usage?"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13762,7 +12615,7 @@ msgstr ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13774,11 +12627,11 @@ msgstr ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
 "Many e-mail systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
+"Bcc recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or Cc: "
 "recipient. "
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13786,7 +12639,7 @@ msgstr ""
 "The following recipient was not recognised as a valid mail address:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13794,11 +12647,11 @@ msgstr ""
 "The following recipients were not recognised as valid mail addresses:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:118
 msgid "The script file must exist and be executable."
 msgstr "The script file must exist and be executable."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13806,7 +12659,7 @@ msgstr ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -13814,13 +12667,13 @@ msgstr ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "This message cannot be sent because you have not specified any recipients"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13828,11 +12681,11 @@ msgstr ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:124
 msgid "This signature has been changed, but has not been saved."
 msgstr "This signature has been changed, but has not been saved."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:125
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -13840,16 +12693,16 @@ msgstr ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:126
 msgid "This will mark all messages as read in the selected folder."
 msgstr "This will mark all messages as read in the selected folder."
 
 #  mail:gw-accountsetup-error primary
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:127
 msgid "Unable to connect to the GroupWise server."
 msgstr "Unable to connect to the GroupWise server."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:128
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13857,19 +12710,19 @@ msgstr ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:129
 msgid "Unable to read license file."
 msgstr "Unable to read licence file."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:130
 msgid "Use _Default"
 msgstr "Use _Default"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:131
 msgid "Use default drafts folder?"
 msgstr "Use default drafts folder?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13879,7 +12732,11 @@ msgstr ""
 "message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:134
+msgid "Would you like to close the message window?"
+msgstr "Would you like to close the message window?"
+
+#: ../mail/mail.error.xml.h:135
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -13889,7 +12746,7 @@ msgstr ""
 "but the list is trying to redirect your reply to go back to the list. Are "
 "you sure you want to proceed?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:136
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -13899,7 +12756,7 @@ msgstr ""
 "replying privately to the sender; not to the list. Are you sure you want to "
 "proceed?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:137
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -13907,31 +12764,31 @@ msgstr ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:138
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "You do not have sufficient permissions to delete this mail."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:139
 msgid "You have not filled in all of the required information."
 msgstr "You have not filled in all of the required information."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:140
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "You have unsent messages, do you wish to quit anyway?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:141
 msgid "You may not create two accounts with the same name."
 msgstr "You may not create two accounts with the same name."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:142
 msgid "You must name this Search Folder."
 msgstr "You must name this Search Folder."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:143
 msgid "You must specify a folder."
 msgstr "You must specify a folder."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13941,129 +12798,145 @@ msgstr ""
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:146
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:147
+msgid "_Always"
+msgstr "_Always"
+
+#: ../mail/mail.error.xml.h:148
 msgid "_Append"
 msgstr "_Append"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:149
 #: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:600
 msgid "_Disable"
 msgstr "_Disable"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:150
 msgid "_Discard changes"
 msgstr "_Discard changes"
 
-#: ../mail/mail.error.xml.h:137
-#: ../modules/mail/e-mail-shell-view-actions.c:887
+#: ../mail/mail.error.xml.h:151
+#: ../modules/mail/e-mail-shell-view-actions.c:1054
 msgid "_Empty Trash"
 msgstr "_Empty Wastebasket"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:152
 msgid "_Expunge"
 msgstr "_Expunge"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:153
+msgid "_No"
+msgstr "_No"
+
+#: ../mail/mail.error.xml.h:154
 msgid "_Open Messages"
 msgstr "_Open Messages"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:157
 msgid "_Send Receipt"
 msgstr "_Send Receipt"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:158
 msgid "_Synchronize"
 msgstr "_Synchronise"
 
-#: ../mail/message-list.c:1170
+#: ../mail/mail.error.xml.h:159
+msgid "_Yes"
+msgstr "_Yes"
+
+#: ../mail/message-list.c:1213
 msgid "Unseen"
 msgstr "Unseen"
 
-#: ../mail/message-list.c:1171
+#: ../mail/message-list.c:1214
 msgid "Seen"
 msgstr "Seen"
 
-#: ../mail/message-list.c:1172
+#: ../mail/message-list.c:1215
 msgid "Answered"
 msgstr "Answered"
 
-#: ../mail/message-list.c:1173
+#: ../mail/message-list.c:1216
 msgid "Forwarded"
 msgstr "Forwarded"
 
-#: ../mail/message-list.c:1174
+#: ../mail/message-list.c:1217
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: ../mail/message-list.c:1175
+#: ../mail/message-list.c:1218
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: ../mail/message-list.c:1179
+#: ../mail/message-list.c:1222
 msgid "Lowest"
 msgstr "Lowest"
 
-#: ../mail/message-list.c:1180
+#: ../mail/message-list.c:1223
 msgid "Lower"
 msgstr "Lower"
 
-#: ../mail/message-list.c:1184
+#: ../mail/message-list.c:1227
 msgid "Higher"
 msgstr "Higher"
 
-#: ../mail/message-list.c:1185
+#: ../mail/message-list.c:1228
 msgid "Highest"
 msgstr "Highest"
 
-#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1837 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1844 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: ../mail/message-list.c:1811
+#: ../mail/message-list.c:1853
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: ../mail/message-list.c:1823
+#: ../mail/message-list.c:1865
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1831
+#: ../mail/message-list.c:1873
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1833
+#: ../mail/message-list.c:1875
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2598
+#: ../mail/message-list.c:2642
 msgid "Select all visible messages"
 msgstr "Select all visible messages"
 
+#: ../mail/message-list.c:2800 ../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:4412 ../mail/message-list.c:4820
+#: ../mail/message-list.c:4468 ../mail/message-list.c:4892
 msgid "Generating message list"
 msgstr "Generating message list"
 
-#: ../mail/message-list.c:4643
+#: ../mail/message-list.c:4707
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
+"No message satisfies your search criteria. Either clear search with Search â?? "
+"Clear menu item or change it."
 
-#: ../mail/message-list.c:4645
+#: ../mail/message-list.c:4709
 msgid "There are no messages in this folder."
 msgstr "There are no messages in this folder."
 
@@ -14101,27 +12974,27 @@ msgid "Subject - Trimmed"
 msgstr "Subject â?? Trimmed"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1491
 msgid "Body contains"
 msgstr "Body contains"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1498
 msgid "Message contains"
 msgstr "Message contains"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
+#: ../modules/mail/e-mail-shell-view-actions.c:1505
 msgid "Recipients contain"
 msgstr "Recipients contain"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1512
 msgid "Sender contains"
 msgstr "Sender contains"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "Subject contains"
 msgstr "Subject contains"
 
@@ -14129,7 +13002,7 @@ msgstr "Subject contains"
 msgid "Subject or Addresses contains"
 msgstr "Subject or Addresses contains"
 
-#: ../modules/addressbook/addressbook-config.c:206
+#: ../modules/addressbook/addressbook-config.c:209
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -14137,7 +13010,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:208
+#: ../modules/addressbook/addressbook-config.c:211
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -14145,7 +13018,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:210
+#: ../modules/addressbook/addressbook-config.c:213
 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 "
@@ -14155,15 +13028,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:602
+#: ../modules/addressbook/addressbook-config.c:612
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "U_se in Birthday & Anniversaries calendar"
 
-#: ../modules/addressbook/addressbook-config.c:638
+#: ../modules/addressbook/addressbook-config.c:648
 msgid "Copy _book content locally for offline operation"
 msgstr "Copy _book content locally for offline operation"
 
-#: ../modules/addressbook/addressbook-config.c:746
+#: ../modules/addressbook/addressbook-config.c:756
 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 "
@@ -14173,7 +13046,7 @@ msgstr ""
 "list of standard ports has been provided. Ask your system administrator what "
 "port you should specify."
 
-#: ../modules/addressbook/addressbook-config.c:820
+#: ../modules/addressbook/addressbook-config.c:830
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -14183,7 +13056,7 @@ msgstr ""
 "setting this to \"E-mail Address\" requires anonymous access to your LDAP "
 "server."
 
-#: ../modules/addressbook/addressbook-config.c:895
+#: ../modules/addressbook/addressbook-config.c:905
 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 "
@@ -14195,29 +13068,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:1011
+#: ../modules/addressbook/addressbook-config.c:1021
 msgid "Server Information"
 msgstr "Server Information"
 
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1026
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Details"
 
-#: ../modules/addressbook/addressbook-config.c:1017
+#: ../modules/addressbook/addressbook-config.c:1027
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "Searching"
 
-#: ../modules/addressbook/addressbook-config.c:1019
+#: ../modules/addressbook/addressbook-config.c:1029
 msgid "Downloading"
 msgstr "Downloading"
 
-#: ../modules/addressbook/addressbook-config.c:1225
+#: ../modules/addressbook/addressbook-config.c:1235
 msgid "Address Book Properties"
 msgstr "Address Book Properties"
 
-#: ../modules/addressbook/addressbook-config.c:1227
+#: ../modules/addressbook/addressbook-config.c:1237
 msgid "New Address Book"
 msgstr "New Address Book"
 
@@ -14254,14 +13127,26 @@ msgid "Position of the contact preview pane when oriented vertically."
 msgstr "Position of the contact preview pane when oriented vertically."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Primary address book"
+msgstr "Primary address book"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Show autocompleted name with an address"
 msgstr "Show autocompleted name with an address"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 msgid "Show preview pane"
 msgstr "Show preview pane"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid ""
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view."
+msgstr ""
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -14273,7 +13158,7 @@ msgstr ""
 "contact list. \"1\" (Vertical View) places the preview pane next to the "
 "contact list."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -14281,15 +13166,15 @@ msgstr ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI for the folder last used in the select names dialogue"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "URI for the folder last used in the select names dialog."
 msgstr "URI for the folder last used in the select names dialogue."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
@@ -14297,27 +13182,27 @@ msgstr ""
 "Whether to force showing the e-mail address with the name of the "
 "autocompleted contact in the entry."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid "Whether to show the preview pane."
 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:162
-#: ../modules/mail/em-mailer-prefs.c:1141
+#: ../modules/addressbook/autocompletion-config.c:161
+#: ../modules/mail/em-mailer-prefs.c:1138
 msgid "_Table column:"
 msgstr "_Table column:"
 
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:164
 msgid "Autocompletion"
 msgstr "Autocompletion"
 
-#: ../modules/addressbook/autocompletion-config.c:168
+#: ../modules/addressbook/autocompletion-config.c:167
 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-migrate.c:148
+#: ../modules/addressbook/e-book-shell-migrate.c:153
 msgid "On LDAP Servers"
 msgstr "On LDAP Servers"
 
@@ -14354,8 +13239,8 @@ msgstr "Create a new address book"
 #. Create the contacts group
 #: ../modules/addressbook/e-book-shell-backend.c:316
 #: ../modules/addressbook/e-book-shell-view.c:401
-#: ../modules/calendar/e-cal-shell-backend.c:104
-#: ../modules/calendar/e-cal-shell-migrate.c:57
+#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-migrate.c:59
 msgid "Contacts"
 msgstr "Contacts"
 
@@ -14406,10 +13291,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:1354
-#: ../modules/calendar/e-memo-shell-view-actions.c:620
-#: ../modules/calendar/e-task-shell-view-actions.c:744
-#: ../modules/mail/e-mail-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../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
 msgid "_Rename..."
 msgstr "_Renameâ?¦"
 
@@ -14490,22 +13375,22 @@ 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:1496
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-cal-shell-view-actions.c:1501
+#: ../modules/calendar/e-task-shell-view-actions.c:808
 msgid "_Actions"
 msgstr "_Actions"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:808
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
-#: ../modules/calendar/e-task-shell-view-actions.c:809
-#: ../modules/mail/e-mail-shell-view-actions.c:1094
+#: ../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
 msgid "_Preview"
 msgstr "_Preview"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:817
-#: ../modules/calendar/e-cal-shell-view-actions.c:1513
-#: ../modules/calendar/e-memo-shell-view-actions.c:670
-#: ../modules/calendar/e-task-shell-view-actions.c:822
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-memo-shell-view-actions.c:676
+#: ../modules/calendar/e-task-shell-view-actions.c:828
 msgid "_Delete"
 msgstr "_Delete"
 
@@ -14528,9 +13413,9 @@ msgid "Show contact preview window"
 msgstr "Show contact preview window"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:879
-#: ../modules/calendar/e-memo-shell-view-actions.c:727
-#: ../modules/calendar/e-task-shell-view-actions.c:891
-#: ../modules/mail/e-mail-shell-view-actions.c:1188
+#: ../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
 msgid "_Classic View"
 msgstr "_Classic View"
 
@@ -14539,9 +13424,9 @@ msgid "Show contact preview below the contact list"
 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:734
-#: ../modules/calendar/e-task-shell-view-actions.c:898
-#: ../modules/mail/e-mail-shell-view-actions.c:1195
+#: ../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
 msgid "_Vertical View"
 msgstr "_Vertical View"
 
@@ -14550,25 +13435,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:1656
-#: ../modules/calendar/e-memo-shell-view-actions.c:744
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-cal-shell-view-actions.c:1661
+#: ../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:1670
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/calendar/e-cal-shell-view-actions.c:1675
+#: ../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:1680
-#: ../modules/calendar/e-memo-shell-view-actions.c:761
-#: ../modules/calendar/e-task-shell-view-actions.c:960
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
-#: ../shell/e-shell-content.c:467
+#: ../modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../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
 msgid "Advanced Search"
 msgstr "Advanced Search"
 
@@ -14725,6 +13610,791 @@ msgstr "_Use secure connection:"
 msgid "cards"
 msgstr "cards"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr "%u and %d will be replaced by user and domain from the e-mail address."
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
+msgid "(Shown in a Day View)"
+msgstr "(Shown in a Day View)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
+msgid "05 minutes"
+msgstr "05 minutes"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
+msgid "10 minutes"
+msgstr "10 minutes"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
+msgid "15 minutes"
+msgstr "15 minutes"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
+msgid "30 minutes"
+msgstr "30 minutes"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
+msgid "60 minutes"
+msgstr "60 minutes"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Alerts"
+msgstr "Alerts"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
+msgid "Day _ends:"
+msgstr "Day _ends:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Days"
+msgstr "Days"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
+msgid "Default Free/Busy Server"
+msgstr "Default Free/Busy Server"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+msgid "Display"
+msgstr "Display"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+msgid "Display alarms in _notification area only"
+msgstr "Display alarms in _notification area only"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
+msgid "Hours"
+msgstr "Hours"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
+msgid "Minutes"
+msgstr "Minutes"
+
+#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "S_un"
+msgstr "S_un"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
+msgid "Sc_roll Month View by a week"
+msgstr "Sc_roll Month View by a week"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Se_cond zone:"
+msgstr "Se_cond zone:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+msgid "Select the calendars for alarm notification"
+msgstr "Select the calendars for alarm notification"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Sh_ow a reminder"
+msgstr "Sh_ow a reminder"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
+msgid "Show a _reminder"
+msgstr "Show a _reminder"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Show r_ecurring events in italic in bottom left calendar"
+msgstr "Show r_ecurring events in italic in bottom left calendar"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
+msgid "Show week _numbers"
+msgstr "Show week _numbers"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "T_asks due today:"
+msgstr "T_asks due today:"
+
+#. Thursday
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
+msgid "T_hu"
+msgstr "T_hu"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
+msgid "Template:"
+msgstr "Template:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../widgets/misc/e-dateedit.c:606
+msgid "Time"
+msgstr "Time"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
+msgid "Time format:"
+msgstr "Time format:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "Use s_ystem time zone"
+msgstr "Use s_ystem time zone"
+
+#. A weekday like "Monday" follows
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
+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
+msgid "Work Week"
+msgstr "Work Week"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+msgid "Work days:"
+msgstr "Work days:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
+msgid "_12 hour (AM/PM)"
+msgstr "_12 hour (AM/PM)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "_24 hour"
+msgstr "_24 hour"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_Ask for confirmation when deleting items"
+msgstr "_Ask for confirmation when deleting items"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "_Compress weekends in month view"
+msgstr "_Compress weekends in month view"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
+msgid "_Day begins:"
+msgstr "_Day begins:"
+
+#. Friday
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
+msgid "_Fri"
+msgstr "_Fri"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
+msgid "_Hide completed tasks after"
+msgstr "_Hide completed tasks after"
+
+#. Monday
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
+msgid "_Mon"
+msgstr "_Mon"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+msgid "_Overdue tasks:"
+msgstr "_Overdue tasks:"
+
+#. Saturday
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
+msgid "_Sat"
+msgstr "_Sat"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
+msgid "_Show appointment end times in week and month view"
+msgstr "_Show appointment end times in week and month view"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
+msgid "_Time divisions:"
+msgstr "_Time divisions:"
+
+#. Tuesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:69
+msgid "_Tue"
+msgstr "_Tue"
+
+#. Wednesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:71
+msgid "_Wed"
+msgstr "_Wed"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
+msgid "before every anniversary/birthday"
+msgstr "before every anniversary/birthday"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
+msgid "before every appointment"
+msgstr "before every appointment"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
+msgid "Alarm programs"
+msgstr "Alarm programs"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+msgid "Ask for confirmation when deleting items"
+msgstr "Ask for confirmation when deleting items"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr "Background colour of tasks that are due today, in \"#rrggbb\" format."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr "Background colour of tasks that are overdue, in \"#rrggbb\" format."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+msgid "Birthday and anniversary reminder"
+msgstr "Birthday and anniversary reminder"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+msgid "Birthday and anniversary reminder units"
+msgstr "Birthday and anniversary reminder units"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+msgid "Birthday and anniversary reminder value"
+msgstr "Birthday and anniversary reminder value"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+msgid "Calendars to run alarms for"
+msgstr "Calendars to run alarms for"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr ""
+"Colour to draw the Marcus Bains Line in the Time bar (empty for default)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr "Colour to draw the Marcus Bains line in the Day View."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+msgid "Compress weekends in month view"
+msgstr "Compress weekends in month view"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+msgid "Confirm expunge"
+msgstr "Confirm expunge"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr "Days on which the start and end of work hours should be indicated."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+msgid "Default appointment reminder"
+msgstr "Default appointment reminder"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+msgid "Default reminder units"
+msgstr "Default reminder units"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Default reminder value"
+msgstr "Default reminder value"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
+msgid "Directory for saving alarm audio files"
+msgstr "Directory for saving alarm audio files"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+msgid "Free/busy server URLs"
+msgstr "Free/busy server URLs"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+msgid "Free/busy template URL"
+msgstr "Free/busy template URL"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+msgid "Hide completed tasks"
+msgstr "Hide completed tasks"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+msgid "Hide task units"
+msgstr "Hide task units"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+msgid "Hide task value"
+msgstr "Hide task value"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+msgid "Horizontal pane position"
+msgstr "Horizontal pane position"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr "Hour the workday ends on, in twenty four hour format, 0 to 23."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr "Hour the workday starts on, in twenty four hour format, 0 to 23."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr "If \"true\", show the memo preview pane in the main window."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr "If \"true\", show the task preview pane in the main window."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr "Intervals shown in Day and Work Week views, in minutes."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
+msgid "Last alarm time"
+msgstr "Last alarm time"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+msgid "List of recently used second time zones in a Day View."
+msgstr "List of recently used second time zones in a Day View."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+msgid "List of server URLs for free/busy publishing."
+msgstr "List of server URLs for free/busy publishing."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+msgid "Marcus Bains Line"
+msgstr "Marcus Bains Line"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+msgid "Marcus Bains Line Color - Day View"
+msgstr "Marcus Bains Line Colour â?? Day View"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+msgid "Marcus Bains Line Color - Time bar"
+msgstr "Marcus Bains Line Colour â?? Time bar"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+msgid "Maximum number of recently used timezones to remember."
+msgstr "Maximum number of recently used timezones to remember."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+msgid "Memo layout style"
+msgstr "Memo layout style"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+msgid "Memo preview pane position (horizontal)"
+msgstr "Memo preview pane position (horizontal)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+msgid "Memo preview pane position (vertical)"
+msgstr "Memo preview pane position (vertical)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "Minute the workday ends on, 0 to 59."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "Minute the workday starts on, 0 to 59."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+msgid "Month view horizontal pane position"
+msgstr "Month view horizontal pane position"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+msgid "Month view vertical pane position"
+msgstr "Month view vertical pane position"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+msgid "Number of units for determining a birthday or anniversary reminder."
+msgstr "Number of units for determining a birthday or anniversary reminder."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+msgid "Number of units for determining a default reminder."
+msgstr "Number of units for determining a default reminder."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+msgid "Number of units for determining when to hide tasks."
+msgstr "Number of units for determining when to hide tasks."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+msgid "Overdue tasks color"
+msgstr "Overdue tasks colour"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr "Position of the memo preview pane when oriented vertically."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr "Position of the task preview pane when oriented horizontally."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+msgid "Position of the task preview pane when oriented vertically."
+msgstr "Position of the task preview pane when oriented vertically."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+msgid "Primary calendar"
+msgstr "Primary calendar"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+msgid "Primary memo list"
+msgstr "Primary memo list"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Primary task list"
+msgstr "Primary task list"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+msgid "Programs that are allowed to be run by alarms."
+msgstr "Programs that are allowed to be run by alarms."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+msgid "Recently used second time zones in a Day View"
+msgstr "Recently used second time zones in a Day View"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Recurrent Events in Italic"
+msgstr "Recurrent Events in Italic"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
+msgid "Save directory for alarm audio"
+msgstr "Save directory for alarm audio"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
+msgid "Scroll Month View by a week"
+msgstr "Scroll Month View by a week"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "Show RSVP field in the event/task/meeting editor"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "Show Role field in the event/task/meeting editor"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
+msgid "Show appointment end times in week and month views"
+msgstr "Show appointment end times in week and month views"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
+msgid "Show categories field in the event/meeting/task editor"
+msgstr "Show categories field in the event/meeting/task editor"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
+msgid "Show days with recurrent events in italic font in bottom left calendar."
+msgstr ""
+"Show days with recurrent events in italic font in bottom left calendar."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
+msgid "Show display alarms in notification tray"
+msgstr "Show display alarms in notification tray"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
+msgid "Show status field in the event/task/meeting editor"
+msgstr "Show status field in the event/task/meeting editor"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
+msgid "Show the memo preview pane"
+msgstr "Show the memo preview pane"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
+msgid "Show the task preview pane"
+msgstr "Show the task preview pane"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
+msgid "Show timezone field in the event/meeting editor"
+msgstr "Show timezone field in the event/meeting editor"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
+msgid "Show type field in the event/task/meeting editor"
+msgstr "Show type field in the event/task/meeting editor"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "Show week numbers in Day View, Work Week View, and Date Navigator"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
+msgid "Task layout style"
+msgstr "Task layout style"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
+msgid "Task preview pane position (horizontal)"
+msgstr "Task preview pane position (horizontal)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
+msgid "Task preview pane position (vertical)"
+msgstr "Task preview pane position (vertical)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
+msgid "Tasks due today color"
+msgstr "Tasks due today colour"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
+msgstr ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
+msgid ""
+"The UID of the selected (or \"primary\") memo list in the sidebar of the "
+"\"Memos\" view."
+msgstr ""
+"The UID of the selected (or \"primary\") memo list in the sidebar of the "
+"\"Memos\" view."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+msgid ""
+"The UID of the selected (or \"primary\") task list in the sidebar of the "
+"\"Tasks\" view."
+msgstr ""
+"The UID of the selected (or \"primary\") task list in the sidebar of the "
+"\"Tasks\" view."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
+msgid "The second timezone for a Day View"
+msgstr "The second timezone for a Day View"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+"This can have three possible values: 0 for errors, 1 for warnings, 2 for "
+"debug messages."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
+msgid "Time divisions"
+msgstr "Time divisions"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
+msgid "Time the last alarm ran, in time_t."
+msgstr "Time the last alarm ran, in time_t."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+msgid "Timezone"
+msgstr "Timezone"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
+msgid "Twenty four hour time format"
+msgstr "Twenty four hour time format"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\"."
+msgstr ""
+"Units for a birthday or anniversary reminder: \"minutes\", \"hours\" or "
+"\"days\"."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
+msgid "Use system timezone"
+msgstr "Use system timezone"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "Use the system timezone instead of the timezone selected in Evolution."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
+msgid "Vertical pane position"
+msgstr "Vertical pane position"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
+msgid "Week start"
+msgstr "Week start"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
+msgid "Whether or not to use the notification tray for display alarms."
+msgstr "Whether to use the notification tray for display alarms."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr "Whether to ask for confirmation when deleting an appointment or task."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr "Whether to ask for confirmation when expunging appointments and tasks."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
+msgid "Whether to display the end time of events in the week and month views."
+msgstr "Whether to display the end time of events in the week and month views."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr "Whether to hide completed tasks in the tasks view."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "Whether to scroll a Month View by a week, not by a month."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
+msgid "Whether to set a default reminder for appointments."
+msgstr "Whether to set a default reminder for appointments."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
+msgid "Whether to set a reminder for birthdays and anniversaries."
+msgstr "Whether to set a reminder for birthdays and anniversaries."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "Whether to show RSVP field in the event/task/meeting editor"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "Whether to show categories field in the event/meeting editor"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr "Whether to show role field in the event/task/meeting editor"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr "Whether to show status field in the event/task/meeting editor"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
+msgstr ""
+"Whether to show times in twenty four hour format instead of using am/pm."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "Whether to show timezone field in the event/meeting editor"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr "Whether to show type field in the event/task/meeting editor"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "Whether to show week numbers in various places in the Calendar."
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
+msgid "Work days"
+msgstr "Work days"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
+msgid "Workday end hour"
+msgstr "Workday end hour"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+msgid "Workday end minute"
+msgstr "Workday end minute"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+msgid "Workday start hour"
+msgstr "Workday start hour"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
+msgid "Workday start minute"
+msgstr "Workday start minute"
+
 #: ../modules/calendar/e-cal-attachment-handler.c:259
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
@@ -14747,93 +14417,91 @@ msgid "I_mport to Tasks"
 msgstr "I_mport to Tasks"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:106
-#: ../modules/calendar/e-cal-shell-migrate.c:181
-#: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:94
-#: ../modules/calendar/e-task-shell-migrate.c:145
+#: ../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-memo-shell-migrate.c:149
+#: ../modules/calendar/e-task-shell-backend.c:98
+#: ../modules/calendar/e-task-shell-migrate.c:158
 msgid "On The Web"
 msgstr "On The Web"
 
-#: ../modules/calendar/e-cal-shell-backend.c:108
-#: ../plugins/calendar-weather/calendar-weather.c:117
+#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../plugins/calendar-weather/calendar-weather.c:120
 msgid "Weather"
 msgstr "Weather"
 
-#: ../modules/calendar/e-cal-shell-backend.c:193
-#: ../modules/calendar/e-cal-shell-migrate.c:60
+#: ../modules/calendar/e-cal-shell-backend.c:200
+#: ../modules/calendar/e-cal-shell-migrate.c:62
 msgid "Birthdays & Anniversaries"
 msgstr "Birthdays & Anniversaries"
 
-#: ../modules/calendar/e-cal-shell-backend.c:406
+#: ../modules/calendar/e-cal-shell-backend.c:425
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:408
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-backend.c:427
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:413
+#: ../modules/calendar/e-cal-shell-backend.c:432
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "All Day A_ppointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:415
+#: ../modules/calendar/e-cal-shell-backend.c:434
 msgid "Create a new all-day appointment"
 msgstr "Create a new all-day appointment"
 
-#: ../modules/calendar/e-cal-shell-backend.c:420
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgctxt "New"
 msgid "M_eeting"
 msgstr "M_eeting"
 
-#: ../modules/calendar/e-cal-shell-backend.c:422
+#: ../modules/calendar/e-cal-shell-backend.c:441
 msgid "Create a new meeting request"
 msgstr "Create a new meeting request"
 
-#: ../modules/calendar/e-cal-shell-backend.c:430
+#: ../modules/calendar/e-cal-shell-backend.c:449
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Cale_ndar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:432
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-backend.c:451
+#: ../modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:717
-#: ../plugins/itip-formatter/itip-formatter.c:2669
+#: ../modules/calendar/e-cal-shell-backend.c:754
+#: ../plugins/itip-formatter/itip-formatter.c:2809
 msgid "Calendar and Tasks"
 msgstr "Calendar and Tasks"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:171
-#: ../modules/calendar/e-memo-shell-sidebar.c:165
-#: ../modules/calendar/e-task-shell-sidebar.c:165
+#: ../modules/calendar/e-cal-shell-sidebar.c:170
 #, c-format
 msgid ""
-"Error on %s\n"
+"Error on %s: %s\n"
 "%s"
 msgstr ""
-"Error on %s\n"
+"Error on %s: %s\n"
 "%s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:239
+#: ../modules/calendar/e-cal-shell-sidebar.c:238
 msgid "Loading calendars"
 msgstr "Loading calendars"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:674
+#: ../modules/calendar/e-cal-shell-sidebar.c:662
 msgid "_New Calendar..."
 msgstr "_New Calendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:691
+#: ../modules/calendar/e-cal-shell-sidebar.c:679
 msgid "Calendar Selector"
 msgstr "Calendar Selector"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1032
+#: ../modules/calendar/e-cal-shell-sidebar.c:1022
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Opening calendar at %s"
@@ -14869,292 +14537,292 @@ msgstr "Moving Items"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1126
+#: ../modules/calendar/e-cal-shell-view-actions.c:1131
 msgid "event"
 msgstr "event"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1128
-#: ../modules/calendar/e-cal-shell-view-memopad.c:210
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:504
-#: ../modules/calendar/e-task-shell-view-actions.c:621
+#: ../modules/calendar/e-cal-shell-view-actions.c:1133
+#: ../modules/calendar/e-cal-shell-view-memopad.c:216
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:510
+#: ../modules/calendar/e-task-shell-view-actions.c:627
 msgid "Save as iCalendar"
 msgstr "Save as iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1284
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "_Copy..."
 msgstr "_Copyâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../modules/calendar/e-cal-shell-view-actions.c:1296
 msgid "D_elete Calendar"
 msgstr "D_elete Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
 msgid "Delete the selected calendar"
 msgstr "Delete the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
 msgid "Go Back"
 msgstr "Go Back"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Go Forward"
 msgstr "Go Forward"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Select today"
 msgstr "Select today"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1324
 msgid "Select _Date"
 msgstr "Select _Date"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Select a specific date"
 msgstr "Select a specific date"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../modules/calendar/e-cal-shell-view-actions.c:1331
 msgid "_New Calendar"
 msgstr "_New Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1340
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
+#: ../modules/calendar/e-task-shell-view-actions.c:799
 msgid "Purg_e"
 msgstr "Purg_e"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Purge old appointments and meetings"
 msgstr "Purge old appointments and meetings"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1347
-#: ../modules/calendar/e-memo-shell-view-actions.c:613
-#: ../modules/calendar/e-task-shell-view-actions.c:737
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../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:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
 msgid "Refresh the selected calendar"
 msgstr "Refresh the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Rename the selected calendar"
 msgstr "Rename the selected calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Show _Only This Calendar"
 msgstr "Show _Only This Calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1368
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "Cop_y to Calendar..."
 msgstr "Cop_y to Calendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "_Delegate Meeting..."
 msgstr "_Delegate Meetingâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 msgid "_Delete Appointment"
 msgstr "_Delete Appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete selected appointments"
 msgstr "Delete selected appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "Delete This _Occurrence"
 msgstr "Delete This _Occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 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:1401
 msgid "Delete All Occ_urrences"
 msgstr "Delete All Occ_urrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Delete all occurrences"
 msgstr "Delete all occurrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "New All Day _Event..."
 msgstr "New All Day _Eventâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
 msgid "Create a new all day event"
 msgstr "Create a new all-day event"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1410
-#: ../modules/calendar/e-cal-shell-view-memopad.c:244
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:578
-#: ../modules/calendar/e-task-shell-view-actions.c:702
+#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../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
+#: ../modules/calendar/e-task-shell-view-actions.c:708
 msgid "_Forward as iCalendar..."
 msgstr "_Forward as iCalendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-cal-shell-view-actions.c:1422
 msgid "New _Meeting..."
 msgstr "New _Meetingâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Create a new meeting"
 msgstr "Create a new meeting"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1424
+#: ../modules/calendar/e-cal-shell-view-actions.c:1429
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ve to Calendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1431
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
 msgid "New _Appointment..."
 msgstr "New _Appointmentâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1438
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
 msgid "Make this Occurrence _Movable"
 msgstr "Make this Occurrence _Movable"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1445
+#: ../modules/calendar/e-cal-shell-view-actions.c:1450
 msgid "_Open Appointment"
 msgstr "_Open Appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
 msgid "View the current appointment"
 msgstr "View the current appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1457
 msgid "_Reply"
 msgstr "_Reply"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1466
-#: ../modules/calendar/e-cal-shell-view-memopad.c:272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+#: ../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:1473
+#: ../modules/calendar/e-cal-shell-view-actions.c:1478
 msgid "_Schedule Meeting..."
 msgstr "_Schedule Meetingâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Converts an appointment to a meeting"
 msgstr "Converts an appointment to a meeting"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1480
+#: ../modules/calendar/e-cal-shell-view-actions.c:1485
 msgid "Conv_ert to Appointment..."
 msgstr "Conv_ert to Appointmentâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
 msgid "Converts a meeting to an appointment"
 msgstr "Converts a meeting to an appointment"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+#: ../modules/calendar/e-cal-shell-view-actions.c:1492
 msgid "Quit"
 msgstr "Quit"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../modules/calendar/e-cal-shell-view-actions.c:1616
 msgid "Day"
 msgstr "Day"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1613
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "Show one day"
 msgstr "Show one day"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-cal-shell-view-actions.c:1623
 msgid "List"
 msgstr "List"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1620
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Show as list"
 msgstr "Show as list"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-cal-shell-view-actions.c:1630
 msgid "Month"
 msgstr "Month"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Show one month"
 msgstr "Show one month"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Week"
 msgstr "Week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1634
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Show one week"
 msgstr "Show one week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
 msgid "Show one work week"
 msgstr "Show one work week"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1649
+#: ../modules/calendar/e-cal-shell-view-actions.c:1654
 msgid "Active Appointments"
 msgstr "Active Appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1663
+#: ../modules/calendar/e-cal-shell-view-actions.c:1668
 msgid "Next 7 Days' Appointments"
 msgstr "Next 7 Days' Appointments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1694
-#: ../modules/calendar/e-memo-shell-view-actions.c:775
-#: ../modules/calendar/e-task-shell-view-actions.c:974
+#: ../modules/calendar/e-cal-shell-view-actions.c:1699
+#: ../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:1701
-#: ../modules/calendar/e-memo-shell-view-actions.c:782
-#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/calendar/e-cal-shell-view-actions.c:1706
+#: ../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:1713
+#: ../modules/calendar/e-cal-shell-view-actions.c:1718
 msgid "Print this calendar"
 msgstr "Print this calendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-cal-shell-view-actions.c:1725
 msgid "Preview the calendar to be printed"
 msgstr "Preview the calendar to be printed"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1793
+#: ../modules/calendar/e-cal-shell-view-actions.c:1798
 msgid "Go To"
 msgstr "Go To"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:208
-#: ../modules/calendar/e-memo-shell-view-actions.c:502
+#: ../modules/calendar/e-cal-shell-view-memopad.c:214
+#: ../modules/calendar/e-memo-shell-view-actions.c:508
 msgid "memo"
 msgstr "memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:251
-#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:640
 msgid "New _Memo"
 msgstr "New _Memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:253
-#: ../modules/calendar/e-memo-shell-backend.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-backend.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Create a new memo"
 msgstr "Create a new memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:258
-#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
 msgid "_Open Memo"
 msgstr "_Open Memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:260
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-cal-shell-view-memopad.c:266
+#: ../modules/calendar/e-memo-shell-view-actions.c:649
 msgid "View the selected memo"
 msgstr "View the selected memo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:265
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:648
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "Open _Web Page"
 msgstr "Open _Web Page"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:284
-#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:290
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
 msgid "Print the selected memo"
 msgstr "Print the selected memo"
 
@@ -15162,101 +14830,123 @@ msgstr "Print the selected memo"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:619
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:281
+#: ../modules/calendar/e-task-shell-view-actions.c:625
 msgid "task"
 msgstr "task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:681
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:687
 msgid "_Assign Task"
 msgstr "_Assign Task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../modules/calendar/e-task-shell-view-actions.c:764
 msgid "_Mark as Complete"
 msgstr "_Mark as Complete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
+#: ../modules/calendar/e-task-shell-view-actions.c:766
 msgid "Mark selected tasks as complete"
 msgstr "Mark selected tasks as complete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
 msgid "_Mark as Incomplete"
 msgstr "_Mark as Incomplete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../modules/calendar/e-task-shell-view-actions.c:773
 msgid "Mark selected tasks as incomplete"
 msgstr "Mark selected tasks as incomplete"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:778
 msgid "New _Task"
 msgstr "New _Task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:280
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-backend.c:286
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:779
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 msgid "_Open Task"
 msgstr "_Open Task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
+#: ../modules/calendar/e-task-shell-view-actions.c:787
 msgid "View the selected task"
 msgstr "View the selected task"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:823
-#: ../modules/calendar/e-task-shell-view-actions.c:1022
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
+#: ../modules/calendar/e-memo-shell-view-actions.c:829
+#: ../modules/calendar/e-task-shell-view-actions.c:1028
 msgid "_Save as iCalendar..."
 msgstr "_Save as iCalendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:1007
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "Print the selected task"
 msgstr "Print the selected task"
 
-#: ../modules/calendar/e-memo-shell-backend.c:279
+#: ../modules/calendar/e-calendar-preferences.c:437
+msgid "Selected Calendars for Alarms"
+msgstr "Selected Calendars for Alarms"
+
+#: ../modules/calendar/e-calendar-preferences.c:836
+msgid "Ti_me and date:"
+msgstr "Ti_me and date:"
+
+#: ../modules/calendar/e-calendar-preferences.c:837
+msgid "_Date only:"
+msgstr "_Date only:"
+
+#: ../modules/calendar/e-memo-shell-backend.c:285
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Mem_o"
 
-#: ../modules/calendar/e-memo-shell-backend.c:286
+#: ../modules/calendar/e-memo-shell-backend.c:292
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Shared Memo"
 
-#: ../modules/calendar/e-memo-shell-backend.c:288
+#: ../modules/calendar/e-memo-shell-backend.c:294
 msgid "Create a new shared memo"
 msgstr "Create a new shared memo"
 
-#: ../modules/calendar/e-memo-shell-backend.c:296
+#: ../modules/calendar/e-memo-shell-backend.c:302
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Memo Li_st"
 
-#: ../modules/calendar/e-memo-shell-backend.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-memo-shell-backend.c:304
+#: ../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:233
+#: ../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
 msgid "Loading memos"
 msgstr "Loading memos"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:613
+#: ../modules/calendar/e-memo-shell-sidebar.c:601
 msgid "Memo List Selector"
 msgstr "Memo List Selector"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:918
+#: ../modules/calendar/e-memo-shell-sidebar.c:906
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Opening memos at %s"
@@ -15266,75 +14956,75 @@ msgstr "Opening memos at %s"
 msgid "Print Memos"
 msgstr "Print Memos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:564
+#: ../modules/calendar/e-memo-shell-view-actions.c:570
 msgid "_Delete Memo"
 msgstr "_Delete Memo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-memo-shell-view-actions.c:577
 msgid "_Find in Memo..."
 msgstr "_Find in Memoâ?¦"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:573
+#: ../modules/calendar/e-memo-shell-view-actions.c:579
 msgid "Search for text in the displayed memo"
 msgstr "Search for text in the displayed memo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
 msgid "D_elete Memo List"
 msgstr "D_elete Memo List"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:594
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Delete the selected memo list"
 msgstr "Delete the selected memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
 msgid "_New Memo List"
 msgstr "_New Memo List"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Refresh the selected memo list"
 msgstr "Refresh the selected memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:628
 msgid "Rename the selected memo list"
 msgstr "Rename the selected memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:627
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
 msgid "Show _Only This Memo List"
 msgstr "Show _Only This Memo List"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:706
+#: ../modules/calendar/e-memo-shell-view-actions.c:712
 msgid "Memo _Preview"
 msgstr "Memo _Preview"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:708
+#: ../modules/calendar/e-memo-shell-view-actions.c:714
 msgid "Show memo preview pane"
 msgstr "Show memo preview pane"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:729
+#: ../modules/calendar/e-memo-shell-view-actions.c:735
 msgid "Show memo preview below the memo list"
 msgstr "Show memo preview below the memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:736
+#: ../modules/calendar/e-memo-shell-view-actions.c:742
 msgid "Show memo preview alongside the memo list"
 msgstr "Show memo preview alongside the memo list"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:794
+#: ../modules/calendar/e-memo-shell-view-actions.c:800
 msgid "Print the list of memos"
 msgstr "Print the list of memos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:801
+#: ../modules/calendar/e-memo-shell-view-actions.c:807
 msgid "Preview the list of memos to be printed"
 msgstr "Preview the list of memos to be printed"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:416
+#: ../modules/calendar/e-memo-shell-view-private.c:420
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d memo"
 msgstr[1] "%d memos"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
-#: ../modules/calendar/e-task-shell-view-private.c:569
+#: ../modules/calendar/e-memo-shell-view-private.c:424
+#: ../modules/calendar/e-task-shell-view-private.c:575
 #, c-format
 msgid "%d selected"
 msgstr "%d selected"
@@ -15347,40 +15037,40 @@ msgstr "Delete Memos"
 msgid "Delete Memo"
 msgstr "Delete Memo"
 
-#: ../modules/calendar/e-task-shell-backend.c:278
+#: ../modules/calendar/e-task-shell-backend.c:284
 msgctxt "New"
 msgid "_Task"
 msgstr "_Task"
 
-#: ../modules/calendar/e-task-shell-backend.c:285
+#: ../modules/calendar/e-task-shell-backend.c:291
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Assigne_d Task"
 
-#: ../modules/calendar/e-task-shell-backend.c:287
+#: ../modules/calendar/e-task-shell-backend.c:293
 msgid "Create a new assigned task"
 msgstr "Create a new assigned task"
 
-#: ../modules/calendar/e-task-shell-backend.c:295
+#: ../modules/calendar/e-task-shell-backend.c:301
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Tas_k List"
 
-#: ../modules/calendar/e-task-shell-backend.c:297
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-backend.c:303
+#: ../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:233
+#: ../modules/calendar/e-task-shell-sidebar.c:232
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:613
+#: ../modules/calendar/e-task-shell-sidebar.c:601
 msgid "Task List Selector"
 msgstr "Task List Selector"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:918
+#: ../modules/calendar/e-task-shell-sidebar.c:906
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
@@ -15390,7 +15080,7 @@ msgstr "Opening tasks at %s"
 msgid "Print Tasks"
 msgstr "Print Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:563
+#: ../modules/calendar/e-task-shell-view-actions.c:569
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15402,145 +15092,145 @@ msgstr ""
 "\n"
 "Really erase these tasks?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:688
+#: ../modules/calendar/e-task-shell-view-actions.c:694
 msgid "_Delete Task"
 msgstr "_Delete Task"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:695
+#: ../modules/calendar/e-task-shell-view-actions.c:701
 msgid "_Find in Task..."
 msgstr "_Find in Taskâ?¦"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:697
+#: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "Search for text in the displayed task"
 msgstr "Search for text in the displayed task"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:715
 msgid "Copy..."
 msgstr "Copyâ?¦"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:722
 msgid "D_elete Task List"
 msgstr "D_elete Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:718
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "Delete the selected task list"
 msgstr "Delete the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:723
+#: ../modules/calendar/e-task-shell-view-actions.c:729
 msgid "_New Task List"
 msgstr "_New Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "Refresh the selected task list"
 msgstr "Refresh the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:752
 msgid "Rename the selected task list"
 msgstr "Rename the selected task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:757
 msgid "Show _Only This Task List"
 msgstr "Show _Only This Task List"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "Mar_k as Incomplete"
 msgstr "Mar_k as Incomplete"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "Delete completed tasks"
 msgstr "Delete completed tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:870
+#: ../modules/calendar/e-task-shell-view-actions.c:876
 msgid "Task _Preview"
 msgstr "Task _Preview"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:872
+#: ../modules/calendar/e-task-shell-view-actions.c:878
 msgid "Show task preview pane"
 msgstr "Show task preview pane"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:893
+#: ../modules/calendar/e-task-shell-view-actions.c:899
 msgid "Show task preview below the task list"
 msgstr "Show task preview below the task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:900
+#: ../modules/calendar/e-task-shell-view-actions.c:906
 msgid "Show task preview alongside the task list"
 msgstr "Show task preview alongside the task list"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:908
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 msgid "Active Tasks"
 msgstr "Active Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-task-shell-view-actions.c:928
 msgid "Completed Tasks"
 msgstr "Completed Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:929
+#: ../modules/calendar/e-task-shell-view-actions.c:935
 msgid "Next 7 Days' Tasks"
 msgstr "Next 7 Days' Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/calendar/e-task-shell-view-actions.c:942
 msgid "Overdue Tasks"
 msgstr "Overdue Tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:949
 msgid "Tasks with Attachments"
 msgstr "Tasks with Attachments"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:993
+#: ../modules/calendar/e-task-shell-view-actions.c:999
 msgid "Print the list of tasks"
 msgstr "Print the list of tasks"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1000
+#: ../modules/calendar/e-task-shell-view-actions.c:1006
 msgid "Preview the list of tasks to be printed"
 msgstr "Preview the list of tasks to be printed"
 
-#: ../modules/calendar/e-task-shell-view-private.c:463
+#: ../modules/calendar/e-task-shell-view-private.c:468
 msgid "Expunging"
 msgstr "Expunging"
 
-#: ../modules/calendar/e-task-shell-view-private.c:565
+#: ../modules/calendar/e-task-shell-view-private.c:571
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d task"
 msgstr[1] "%d tasks"
 
-#: ../modules/calendar/e-task-shell-view.c:351
+#: ../modules/calendar/e-task-shell-view.c:358
 msgid "Delete Tasks"
 msgstr "Delete Tasks"
 
-#: ../modules/calendar/e-task-shell-view.c:353
+#: ../modules/calendar/e-task-shell-view.c:360
 msgid "Delete Task"
 msgstr "Delete Task"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:345
+#: ../modules/mail/e-mail-attachment-handler.c:380
 #, 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:89
+#: ../modules/mail/e-mail-junk-hook.c:94
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "None"
 
-#: ../modules/mail/e-mail-shell-backend.c:171
+#: ../modules/mail/e-mail-shell-backend.c:170
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: ../modules/mail/e-mail-shell-backend.c:173
+#: ../modules/mail/e-mail-shell-backend.c:172
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: ../modules/mail/e-mail-shell-backend.c:181
+#: ../modules/mail/e-mail-shell-backend.c:180
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: ../modules/mail/e-mail-shell-backend.c:183
+#: ../modules/mail/e-mail-shell-backend.c:182
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
@@ -15560,419 +15250,450 @@ msgstr "Composer Preferences"
 msgid "Network Preferences"
 msgstr "Network Preferences"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:880
-#: ../modules/mail/e-mail-shell-view.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:1047
+#: ../modules/mail/e-mail-shell-view.c:954
 msgid "_Disable Account"
 msgstr "_Disable Account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:1049
 msgid "Disable this account"
 msgstr "Disable this account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:889
+#: ../modules/mail/e-mail-shell-view-actions.c:1056
 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:894
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
 msgid "C_reate Search Folder From Search..."
 msgstr "C_reate Search Folder From Searchâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:901
+#: ../modules/mail/e-mail-shell-view-actions.c:1068
 msgid "_Download Messages for Offline Usage"
 msgstr "_Download Messages for Offline Usage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:903
+#: ../modules/mail/e-mail-shell-view-actions.c:1070
 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:908
+#: ../modules/mail/e-mail-shell-view-actions.c:1075
 msgid "Fl_ush Outbox"
 msgstr "Fl_ush Outbox"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:915
+#: ../modules/mail/e-mail-shell-view-actions.c:1082
 msgid "_Copy Folder To..."
 msgstr "_Copy Folder Toâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:917
+#: ../modules/mail/e-mail-shell-view-actions.c:1084
 msgid "Copy the selected folder into another folder"
 msgstr "Copy the selected folder into another folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:924
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
 msgid "Permanently remove this folder"
 msgstr "Permanently remove this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:929
+#: ../modules/mail/e-mail-shell-view-actions.c:1096
 msgid "E_xpunge"
 msgstr "E_xpunge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:931
+#: ../modules/mail/e-mail-shell-view-actions.c:1098
 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:936
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_k All Messages as Read"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:938
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
 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:943
+#: ../modules/mail/e-mail-shell-view-actions.c:1110
 msgid "_Move Folder To..."
 msgstr "_Move Folder Toâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:1112
 msgid "Move the selected folder into another folder"
 msgstr "Move the selected folder into another folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:950
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
 msgid "_New..."
 msgstr "_Newâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:1119
 msgid "Create a new folder for storing mail"
 msgstr "Create a new folder for storing mail"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:959
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
 msgid "Change the properties of this folder"
 msgstr "Change the properties of this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
 msgid "Refresh the folder"
 msgstr "Refresh the folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:973
+#: ../modules/mail/e-mail-shell-view-actions.c:1140
 msgid "Change the name of this folder"
 msgstr "Change the name of this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "Select Message _Thread"
 msgstr "Select Message _Thread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
 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:985
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Select Message S_ubthread"
 msgstr "Select Message S_ubthread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:987
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
 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:992
-msgid "_Unsubscribe"
-msgstr "_Unsubscribe"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:994
-msgid "Unsubscribe from the selected folder"
-msgstr "Unsubscribe from the selected folder"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Empty _Trash"
 msgstr "Empty Was_tebasket"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1001
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
 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:1006
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "_New Label"
 msgstr "_New Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1015
+#: ../modules/mail/e-mail-shell-view-actions.c:1182
 msgid "N_one"
 msgstr "N_one"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
+msgid "_Manage Subscriptions"
+msgstr "_Manage Subscriptions"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
+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
+msgid "Send / _Receive"
+msgstr "Send / _Receive"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+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:1212
+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:1219
+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
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Cancel the current mail operation"
 msgstr "Cancel the current mail operation"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1043
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Collapse All _Threads"
 msgstr "Collapse All _Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1045
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Collapse all message threads"
 msgstr "Collapse all message threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1050
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "E_xpand All Threads"
 msgstr "E_xpand All Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1052
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "Expand all message threads"
 msgstr "Expand all message threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1057
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "_Message Filters"
 msgstr "_Message Filters"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1059
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
 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:1064
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Search F_olders"
 msgstr "Search F_olders"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Create or edit search folder definitions"
 msgstr "Create or edit search folder definitions"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "_Subscriptions..."
 msgstr "_Subscriptionsâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
-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:1080
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "F_older"
 msgstr "F_older"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 msgid "_Label"
 msgstr "_Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "_New Folder..."
 msgstr "_New Folderâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
+#: ../modules/mail/e-mail-shell-view-actions.c:1364
 msgid "Show Message _Preview"
 msgstr "Show Message _Preview"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
+#: ../modules/mail/e-mail-shell-view-actions.c:1366
 msgid "Show message preview pane"
 msgstr "Show message preview pane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1372
 msgid "Show _Deleted Messages"
 msgstr "Show _Deleted Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../modules/mail/e-mail-shell-view-actions.c:1374
 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:1167
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
 msgid "_Group By Threads"
 msgstr "_Group By Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1169
+#: ../modules/mail/e-mail-shell-view-actions.c:1382
 msgid "Threaded message list"
 msgstr "Threaded message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1190
+#: ../modules/mail/e-mail-shell-view-actions.c:1403
 msgid "Show message preview below the message list"
 msgstr "Show message preview below the message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1197
+#: ../modules/mail/e-mail-shell-view-actions.c:1410
 msgid "Show message preview alongside the message list"
 msgstr "Show message preview alongside the message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1418
 msgid "All Messages"
 msgstr "All Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1425
 msgid "Important Messages"
 msgstr "Important Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../modules/mail/e-mail-shell-view-actions.c:1432
 msgid "Last 5 Days' Messages"
 msgstr "Last 5 Days' Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "Messages Not Junk"
 msgstr "Messages Not Junk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1446
 msgid "Messages with Attachments"
 msgstr "Messages with Attachments"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
 msgid "No Label"
 msgstr "No Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1460
 msgid "Read Messages"
 msgstr "Read Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1467
 msgid "Recent Messages"
 msgstr "Recent Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "Unread Messages"
 msgstr "Unread Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1526
 msgid "Subject or Addresses contain"
 msgstr "Subject or Addresses contain"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../modules/mail/e-mail-shell-view-actions.c:1536
 msgid "All Accounts"
 msgstr "All Accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1543
 msgid "Current Account"
 msgstr "Current Account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1550
 msgid "Current Folder"
 msgstr "Current Folder"
 
-#: ../modules/mail/e-mail-shell-view-private.c:990
+#: ../modules/mail/e-mail-shell-view-private.c:1030
 #, 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:1001
+#: ../modules/mail/e-mail-shell-view-private.c:1041
 #, 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:1007
-#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, 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:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 #, 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:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1066
 #, 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:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #, 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:1044
+#: ../modules/mail/e-mail-shell-view-private.c:1084
 #, 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:1047
+#: ../modules/mail/e-mail-shell-view-private.c:1087
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: ../modules/mail/e-mail-shell-view.c:559
+#: ../modules/mail/e-mail-shell-view-private.c:1451
+msgid "Send / Receive"
+msgstr "Send / Receive"
+
+#: ../modules/mail/e-mail-shell-view.c:564
 msgid "All Account Search"
 msgstr "All Account Search"
 
-#: ../modules/mail/e-mail-shell-view.c:686
+#: ../modules/mail/e-mail-shell-view.c:747
 msgid "Account Search"
 msgstr "Account Search"
 
-#: ../modules/mail/e-mail-shell-view.c:881
+#: ../modules/mail/e-mail-shell-view.c:952
 msgid "Proxy _Logout"
 msgstr "Proxy _Logout"
 
-#: ../modules/mail/em-account-prefs.c:133
+#: ../modules/mail/em-account-prefs.c:219
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistant"
 
-#: ../modules/mail/em-account-prefs.c:182
+#: ../modules/mail/em-account-prefs.c:268
 msgid "Account Editor"
 msgstr "Account Editor"
 
-#: ../modules/mail/em-composer-prefs.c:505
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:211
+#: ../modules/mail/em-composer-prefs.c:495
+#: ../modules/plugin-manager/evolution-plugin-manager.c:357
+#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../modules/mail/em-composer-prefs.c:509
+#: ../modules/mail/em-composer-prefs.c:499
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Every time"
 msgstr "Every time"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per day"
 msgstr "Once per day"
 
-#: ../modules/mail/em-mailer-prefs.c:93
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per week"
 msgstr "Once per week"
 
-#: ../modules/mail/em-mailer-prefs.c:94
+#: ../modules/mail/em-mailer-prefs.c:95
 msgid "Once per month"
 msgstr "Once per month"
 
-#: ../modules/mail/em-mailer-prefs.c:201
+#: ../modules/mail/em-mailer-prefs.c:177
 msgid "Add Custom Junk Header"
 msgstr "Add Custom Junk Header"
 
-#: ../modules/mail/em-mailer-prefs.c:209
+#: ../modules/mail/em-mailer-prefs.c:185
 msgid "Header Name:"
 msgstr "Header Name:"
 
-#: ../modules/mail/em-mailer-prefs.c:210
+#: ../modules/mail/em-mailer-prefs.c:186
 msgid "Header Value Contains:"
 msgstr "Header Value Contains:"
 
-#: ../modules/mail/em-mailer-prefs.c:310
+#: ../modules/mail/em-mailer-prefs.c:286
 msgid "Header"
 msgstr "Header"
 
-#: ../modules/mail/em-mailer-prefs.c:314
+#: ../modules/mail/em-mailer-prefs.c:290
 msgid "Contains Value"
 msgstr "Contains Value"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:707 ../modules/mail/em-mailer-prefs.c:778
+#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:764
 #, 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:715 ../modules/mail/em-mailer-prefs.c:787
+#: ../modules/mail/em-mailer-prefs.c:701 ../modules/mail/em-mailer-prefs.c:773
 #, 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:751
+#: ../modules/mail/em-mailer-prefs.c:737
 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:1143
+#: ../modules/mail/em-mailer-prefs.c:1140
 msgid "_Date header:"
 msgstr "_Date header:"
 
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../modules/mail/em-mailer-prefs.c:1141
 msgid "Show _original header value"
 msgstr "Show _original header value"
 
@@ -15985,10 +15706,59 @@ 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:140
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "Do you want to make Evolution your default email client?"
 msgstr "Do you want to make Evolution your default e-mail client?"
 
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+msgid "Click 'Work Online' to return to online mode."
+msgstr "Click 'Work Online' to return to online mode."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
+msgid "Evolution is currently offline due to a network outage."
+msgstr "Evolution is currently offline due to a network outage."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
+msgid "Evolution is currently offline."
+msgstr "Evolution is currently offline."
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
+msgid ""
+"Evolution will return to online mode once a network connection is "
+"established."
+msgstr ""
+"Evolution will return to online mode once a network connection is "
+"established."
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+msgid "Author(s)"
+msgstr "Author(s)"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:251
+msgid "Plugin Manager"
+msgstr "Plugin Manager"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:267
+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
+msgid "Overview"
+msgstr "Overview"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:365
+#: ../modules/plugin-manager/evolution-plugin-manager.c:448
+msgid "Plugin"
+msgstr "Plugin"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+msgid "_Plugins"
+msgstr "_Plugins"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+msgid "Enable and disable plugins"
+msgstr "Enable and disable plugins"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hello Python"
@@ -16005,39 +15775,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:275
-#: ../widgets/misc/e-import-assistant.c:396
+#: ../modules/startup-wizard/evolution-startup-wizard.c:276
+#: ../widgets/misc/e-import-assistant.c:399
 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:307
-#: ../widgets/misc/e-import-assistant.c:552
+#: ../modules/startup-wizard/evolution-startup-wizard.c:308
+#: ../widgets/misc/e-import-assistant.c:555
 #, c-format
 msgid "From %s:"
 msgstr "From %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:318
-#: ../modules/startup-wizard/evolution-startup-wizard.c:415
+#: ../modules/startup-wizard/evolution-startup-wizard.c:319
+#: ../modules/startup-wizard/evolution-startup-wizard.c:416
 msgid "Importing Files"
 msgstr "Importing Files"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:393
+#: ../modules/startup-wizard/evolution-startup-wizard.c:394
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "Import cancelled. Click \"Forward\" to continue."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:411
+#: ../modules/startup-wizard/evolution-startup-wizard.c:412
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "Import complete. Click \"Forward\" to continue."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:471
+#: ../modules/startup-wizard/evolution-startup-wizard.c:482
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Setup Assistant"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+#: ../modules/startup-wizard/evolution-startup-wizard.c:488
 msgid "Welcome"
 msgstr "Welcome"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:482
+#: ../modules/startup-wizard/evolution-startup-wizard.c:493
 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"
@@ -16065,8 +15835,13 @@ msgstr ""
 "List of clues for the attachment reminder plugin to look for in a message "
 "body"
 
+#. Check buttons
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
+msgid "_Do not show this message again."
+msgstr "_Do not show this message again."
+
 #: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:410
+#: ../plugins/templates/templates.c:411
 msgid "Keywords"
 msgstr "Keywords"
 
@@ -16106,173 +15881,172 @@ msgstr "Inline Audio"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Play audio attachments directly in mail messages."
 
-#: ../plugins/backup-restore/backup-restore.c:160
-msgid "Select name of the Evolution backup file"
+#: ../plugins/backup-restore/backup-restore.c:183
+msgid "Select name of the Evolution back up file"
 msgstr "Select name of the Evolution backup file"
 
-#: ../plugins/backup-restore/backup-restore.c:191
-msgid "_Restart Evolution after backup"
+#: ../plugins/backup-restore/backup-restore.c:216
+msgid "_Restart Evolution after back up"
 msgstr "_Restart Evolution after backup"
 
-#: ../plugins/backup-restore/backup-restore.c:217
-msgid "Select name of the Evolution backup file to restore"
+#: ../plugins/backup-restore/backup-restore.c:242
+msgid "Select name of the Evolution back up file to restore"
 msgstr "Select name of the Evolution backup file to restore"
 
-#: ../plugins/backup-restore/backup-restore.c:230
+#: ../plugins/backup-restore/backup-restore.c:255
 msgid "_Restart Evolution after restore"
 msgstr "_Restart Evolution after restore"
 
-#: ../plugins/backup-restore/backup-restore.c:298
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
+"You can restore Evolution from your back up. 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 Mails, "
-"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
-"settings, mail filters etc."
+"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."
 
-#: ../plugins/backup-restore/backup-restore.c:305
-msgid "_Restore Evolution from the backup file"
+#: ../plugins/backup-restore/backup-restore.c:330
+msgid "_Restore Evolution from the back up file"
 msgstr "_Restore Evolution from the backup file"
 
-#: ../plugins/backup-restore/backup-restore.c:312
+#: ../plugins/backup-restore/backup-restore.c:337
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Please select an Evolution Archive to restore:"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:340
 msgid "Choose a file to restore"
 msgstr "Choose a file to restore"
 
-#: ../plugins/backup-restore/backup-restore.c:323
-msgid "Restore from backup"
+#: ../plugins/backup-restore/backup-restore.c:348
+msgid "Restore from back up"
 msgstr "Restore from backup"
 
-#: ../plugins/backup-restore/backup-restore.c:361
-msgid "_Backup Evolution Settings..."
-msgstr "_Back Up Evolution Settingsâ?¦"
+#: ../plugins/backup-restore/backup-restore.c:386
+msgid "_Back up Evolution Data..."
+msgstr "_Back up Evolution Dataâ?¦"
 
-#: ../plugins/backup-restore/backup-restore.c:363
-msgid "Backup Evolution data and settings to an archive file"
+#: ../plugins/backup-restore/backup-restore.c:388
+msgid "Back up Evolution data and settings to an archive file"
 msgstr "Back up Evolution data and settings to an archive file"
 
-#: ../plugins/backup-restore/backup-restore.c:368
-msgid "R_estore Evolution Settings..."
-msgstr "R_estore Evolution Settingsâ?¦"
+#: ../plugins/backup-restore/backup-restore.c:393
+msgid "R_estore Evolution Data..."
+msgstr "R_estore Evolution Dataâ?¦"
 
-#: ../plugins/backup-restore/backup-restore.c:370
+#: ../plugins/backup-restore/backup-restore.c:395
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Restore Evolution data and settings from an archive file"
 
-#: ../plugins/backup-restore/backup.c:63
-msgid "Backup Evolution directory"
+#: ../plugins/backup-restore/backup.c:79
+msgid "Back up Evolution directory"
 msgstr "Back up Evolution directory"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:81
 msgid "Restore Evolution directory"
 msgstr "Restore Evolution directory"
 
-#: ../plugins/backup-restore/backup.c:67
-msgid "Check Evolution Backup"
+#: ../plugins/backup-restore/backup.c:83
+msgid "Check Evolution Back up"
 msgstr "Check Evolution Backup"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:85
 msgid "Restart Evolution"
 msgstr "Restart Evolution"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:87
 msgid "With Graphical User Interface"
 msgstr "With Graphical User Interface"
 
-#: ../plugins/backup-restore/backup.c:189
-#: ../plugins/backup-restore/backup.c:251
+#: ../plugins/backup-restore/backup.c:289
+#: ../plugins/backup-restore/backup.c:399
 msgid "Shutting down Evolution"
 msgstr "Shutting down Evolution"
 
-#: ../plugins/backup-restore/backup.c:196
+#: ../plugins/backup-restore/backup.c:296
 msgid "Backing Evolution accounts and settings"
 msgstr "Backing up Evolution accounts and settings"
 
-#: ../plugins/backup-restore/backup.c:202
+#: ../plugins/backup-restore/backup.c:304
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Backing up Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 
-#: ../plugins/backup-restore/backup.c:213
-msgid "Backup complete"
+#: ../plugins/backup-restore/backup.c:317
+msgid "Back up complete"
 msgstr "Backup complete"
 
-#: ../plugins/backup-restore/backup.c:218
-#: ../plugins/backup-restore/backup.c:239
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:322
+#: ../plugins/backup-restore/backup.c:496
 msgid "Restarting Evolution"
 msgstr "Restarting Evolution"
 
-#: ../plugins/backup-restore/backup.c:255
+#: ../plugins/backup-restore/backup.c:403
 msgid "Back up current Evolution data"
 msgstr "Back up current Evolution data"
 
-#: ../plugins/backup-restore/backup.c:260
-msgid "Extracting files from backup"
+#: ../plugins/backup-restore/backup.c:409
+msgid "Extracting files from back up"
 msgstr "Extracting files from backup"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:466
 msgid "Loading Evolution settings"
 msgstr "Loading Evolution settings"
 
-#: ../plugins/backup-restore/backup.c:274
-msgid "Removing temporary backup files"
+#: ../plugins/backup-restore/backup.c:481
+msgid "Removing temporary back up files"
 msgstr "Removing temporary backup files"
 
-#: ../plugins/backup-restore/backup.c:281
+#: ../plugins/backup-restore/backup.c:491
 msgid "Ensuring local sources"
 msgstr "Ensuring local sources"
 
-#: ../plugins/backup-restore/backup.c:428
+#: ../plugins/backup-restore/backup.c:678
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Backing up to the folder %s"
 
-#: ../plugins/backup-restore/backup.c:433
+#: ../plugins/backup-restore/backup.c:683
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restoring from the folder %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:455
-msgid "Evolution Backup"
+#: ../plugins/backup-restore/backup.c:705
+msgid "Evolution Back up"
 msgstr "Evolution Backup"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:705
 msgid "Evolution Restore"
 msgstr "Evolution Restore"
 
-#: ../plugins/backup-restore/backup.c:496
+#: ../plugins/backup-restore/backup.c:746
 msgid "Backing up Evolution Data"
 msgstr "Backing up Evolution Data"
 
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:747
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Please wait while Evolution backs up your data."
 
-#: ../plugins/backup-restore/backup.c:499
+#: ../plugins/backup-restore/backup.c:749
 msgid "Restoring Evolution Data"
 msgstr "Restoring Evolution Data"
 
-#: ../plugins/backup-restore/backup.c:500
+#: ../plugins/backup-restore/backup.c:750
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Please wait while Evolution restores your data."
 
-#: ../plugins/backup-restore/backup.c:518
+#: ../plugins/backup-restore/backup.c:768
 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."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-msgid "Backup and Restore"
+msgid "Back up and Restore"
 msgstr "Backup and Restore"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore your Evolution data and settings."
+msgid "Back up and restore your Evolution data and settings."
 msgstr "Back up and restore your Evolution data and settings."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
@@ -16281,12 +16055,12 @@ msgstr "Are you sure you want to close Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
 msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
+"Are you sure you want to restore Evolution from the selected back up file?"
 msgstr ""
 "Are you sure you want to restore Evolution from the selected backup file?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Close and Backup Evolution"
+msgid "Close and Back up Evolution"
 msgstr "Close and Back Up Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
@@ -16298,11 +16072,11 @@ msgid "Insufficient Permissions"
 msgstr "Insufficient Permissions"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid "Invalid Evolution backup file"
+msgid "Invalid Evolution back up file"
 msgstr "Invalid Evolution backup file"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "Please select a valid backup file to restore."
+msgid "Please select a valid back up file to restore."
 msgstr "Please select a valid backup file to restore."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
@@ -16311,7 +16085,7 @@ msgstr "The selected folder is not writable."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid ""
-"To backup your data and settings, you must first close Evolution. Please "
+"To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
 msgstr ""
 "To back up your data and settings, you must first close Evolution. Please "
@@ -16321,8 +16095,8 @@ msgstr ""
 msgid ""
 "To restore your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding. This will delete "
-"all your current Evolution data and settings and restore them from your "
-"backup."
+"all your current Evolution data and settings and restore them from your back "
+"up."
 msgstr ""
 "To restore your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding. This will delete "
@@ -16379,33 +16153,33 @@ msgstr ""
 "reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter is not available. Please install it first."
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:167
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Error occurred while spawning %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter child process does not respond, killingâ?¦"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:198
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Wait for Bogofilter child process interrupted, terminatingâ?¦"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:221
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Pipe to Bogofilter failed, error code: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:406
 msgid "Convert message text to _Unicode"
 msgstr "Convert message text to _Unicode"
 
@@ -16531,20 +16305,27 @@ msgid "_URL:"
 msgstr "_URL:"
 
 #: ../plugins/caldav/caldav-source.c:223
-#: ../plugins/google-account-setup/google-contacts-source.c:308
+#: ../plugins/google-account-setup/google-contacts-source.c:348
 msgid "Use _SSL"
 msgstr "Use _SSL"
 
+#: ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:638
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
+msgid "User_name:"
+msgstr "User_name:"
+
 #: ../plugins/caldav/caldav-source.c:235
 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:191
+#: ../plugins/calendar-file/calendar-file.c:194
 #: ../plugins/calendar-http/calendar-http.c:119
-#: ../plugins/calendar-weather/calendar-weather.c:395
-#: ../plugins/google-account-setup/google-contacts-source.c:326
-#: ../plugins/google-account-setup/google-source.c:630
+#: ../plugins/calendar-weather/calendar-weather.c:398
+#: ../plugins/google-account-setup/google-contacts-source.c:366
+#: ../plugins/google-account-setup/google-source.c:645
 msgid "Re_fresh:"
 msgstr "Re_fresh:"
 
@@ -16556,31 +16337,31 @@ msgstr "Add CalDAV support to Evolution."
 msgid "CalDAV Support"
 msgstr "CalDAV Support"
 
-#: ../plugins/calendar-file/calendar-file.c:125
+#: ../plugins/calendar-file/calendar-file.c:128
 msgid "_Customize options"
 msgstr "_Customise options"
 
-#: ../plugins/calendar-file/calendar-file.c:144
+#: ../plugins/calendar-file/calendar-file.c:147
 msgid "File _name:"
 msgstr "File _name:"
 
-#: ../plugins/calendar-file/calendar-file.c:148
+#: ../plugins/calendar-file/calendar-file.c:151
 msgid "Choose calendar file"
 msgstr "Choose calendar file"
 
-#: ../plugins/calendar-file/calendar-file.c:196
+#: ../plugins/calendar-file/calendar-file.c:199
 msgid "On open"
 msgstr "On open"
 
-#: ../plugins/calendar-file/calendar-file.c:197
+#: ../plugins/calendar-file/calendar-file.c:200
 msgid "On file change"
 msgstr "On file change"
 
-#: ../plugins/calendar-file/calendar-file.c:198
+#: ../plugins/calendar-file/calendar-file.c:201
 msgid "Periodically"
 msgstr "Periodically"
 
-#: ../plugins/calendar-file/calendar-file.c:213
+#: ../plugins/calendar-file/calendar-file.c:216
 msgid "Force read _only"
 msgstr "Force read _only"
 
@@ -16608,62 +16389,62 @@ msgstr "Add web calendars to Evolution."
 msgid "Web Calendars"
 msgstr "Web Calendars"
 
-#: ../plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Fog"
 msgstr "Weather: Fog"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Cloudy"
 msgstr "Weather: Cloudy"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Cloudy Night"
 msgstr "Weather: Cloudy Night"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Overcast"
 msgstr "Weather: Overcast"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Showers"
 msgstr "Weather: Showers"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Snow"
 msgstr "Weather: Snow"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Sunny"
 msgstr "Weather: Sunny"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:70
 msgid "Weather: Clear Night"
 msgstr "Weather: Clear Night"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:71
 msgid "Weather: Thunderstorms"
 msgstr "Weather: Thunderstorms"
 
-#: ../plugins/calendar-weather/calendar-weather.c:222
+#: ../plugins/calendar-weather/calendar-weather.c:225
 msgid "Select a location"
 msgstr "Select a location"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:328
-#: ../plugins/calendar-weather/calendar-weather.c:373
+#: ../plugins/calendar-weather/calendar-weather.c:331
+#: ../plugins/calendar-weather/calendar-weather.c:376
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "None"
 
-#: ../plugins/calendar-weather/calendar-weather.c:448
+#: ../plugins/calendar-weather/calendar-weather.c:451
 msgid "_Units:"
 msgstr "_Units:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:455
+#: ../plugins/calendar-weather/calendar-weather.c:460
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metric (Celsius, cm, etc)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:456
+#: ../plugins/calendar-weather/calendar-weather.c:463
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperial (Fahrenheit, inches, etc)"
 
@@ -16692,11 +16473,11 @@ 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:232
+#: ../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:251
+#: ../plugins/dbx-import/dbx-importer.c:252
 msgid "Importing Outlook Express data"
 msgstr "Importing Outlook Express data"
 
@@ -16754,40 +16535,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:316
+#: ../plugins/email-custom-header/email-custom-header.c:319
+msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Security:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:321
+#: ../plugins/email-custom-header/email-custom-header.c:323
+msgctxt "email-custom-header-Security"
+msgid "Personal"
+msgstr "Personal"
+
+#: ../plugins/email-custom-header/email-custom-header.c:324
+msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Unclassified"
 
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:325
+msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Protected"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../plugins/email-custom-header/email-custom-header.c:326
+msgctxt "email-custom-header-Security"
+msgid "Confidential"
+msgstr "Confidential"
+
+#: ../plugins/email-custom-header/email-custom-header.c:327
+msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Secret"
 
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:328
+msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Top secret"
 
-#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
-#. indicating the header will not be added to a mail message
-#: ../plugins/email-custom-header/email-custom-header.c:379
+#: ../plugins/email-custom-header/email-custom-header.c:394
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "None"
 
-#: ../plugins/email-custom-header/email-custom-header.c:571
+#: ../plugins/email-custom-header/email-custom-header.c:586
 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:830
+#: ../plugins/email-custom-header/email-custom-header.c:845
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16795,12 +16588,12 @@ 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:884
+#: ../plugins/email-custom-header/email-custom-header.c:899
 msgid "Key"
 msgstr "Key"
 
-#: ../plugins/email-custom-header/email-custom-header.c:900
-#: ../plugins/templates/templates.c:416
+#: ../plugins/email-custom-header/email-custom-header.c:915
+#: ../plugins/templates/templates.c:417
 msgid "Values"
 msgstr "Values"
 
@@ -16822,7 +16615,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:126
+#: ../plugins/external-editor/external-editor.c:128
 msgid "Automatically launch when a new mail is edited"
 msgstr "Automatically launch when a new mail is edited"
 
@@ -16834,11 +16627,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:115
+#: ../plugins/external-editor/external-editor.c:117
 msgid "Command to be executed to launch the editor: "
 msgstr "Command to be executed to launch the editor: "
 
-#: ../plugins/external-editor/external-editor.c:116
+#: ../plugins/external-editor/external-editor.c:118
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16846,8 +16639,8 @@ msgstr ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
 
-#: ../plugins/external-editor/external-editor.c:382
 #: ../plugins/external-editor/external-editor.c:384
+#: ../plugins/external-editor/external-editor.c:386
 msgid "Compose in External Editor"
 msgstr "Compose in External Editor"
 
@@ -16955,17 +16748,17 @@ 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:274
+#: ../plugins/google-account-setup/google-contacts-source.c:314
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
 msgid "Server"
 msgstr "Server"
 
-#: ../plugins/google-account-setup/google-source.c:437
+#: ../plugins/google-account-setup/google-source.c:438
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "Enter password for user %s to access list of subscribed calendars."
 
-#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/google-account-setup/google-source.c:549
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16974,17 +16767,17 @@ msgstr ""
 "Cannot read data from Google server.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:548
+#: ../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:952
+#: ../plugins/mail-to-task/mail-to-task.c:955
 msgid "Unknown error."
 msgstr "Unknown error."
 
-#: ../plugins/google-account-setup/google-source.c:634
+#: ../plugins/google-account-setup/google-source.c:649
 msgid "Cal_endar:"
 msgstr "Cal_endar:"
 
-#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/google-account-setup/google-source.c:684
 msgid "Retrieve _List"
 msgstr "Retrieve _List"
 
@@ -17020,20 +16813,28 @@ msgstr "Track Message Statusâ?¦"
 msgid "Retract Mail"
 msgstr "Retract Mail"
 
+#: ../plugins/groupwise-features/gw-ui.c:331
+msgid "Accept"
+msgstr "Accept"
+
 #: ../plugins/groupwise-features/gw-ui.c:338
 msgid "Accept Tentatively"
 msgstr "Accept Tentatively"
 
+#: ../plugins/groupwise-features/gw-ui.c:345
+msgid "Decline"
+msgstr "Decline"
+
 #: ../plugins/groupwise-features/gw-ui.c:352
 msgid "Rese_nd Meeting..."
 msgstr "Rese_nd Meetingâ?¦"
 
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../plugins/groupwise-features/install-shared.c:178
+#: ../plugins/groupwise-features/share-folder-common.c:353
 msgid "Create folder"
 msgstr "Create folder"
 
-#: ../plugins/groupwise-features/install-shared.c:217
+#: ../plugins/groupwise-features/install-shared.c:230
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17058,11 +16859,11 @@ msgstr ""
 "Click 'Apply' to install the shared folder\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:229
+#: ../plugins/groupwise-features/install-shared.c:242
 msgid "Install the shared folder"
 msgstr "Install the shared folder"
 
-#: ../plugins/groupwise-features/install-shared.c:233
+#: ../plugins/groupwise-features/install-shared.c:246
 msgid "Shared Folder Installation"
 msgstr "Shared Folder Installation"
 
@@ -17092,7 +16893,7 @@ msgid "_Junk List"
 msgstr "_Junk List"
 
 #: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../plugins/groupwise-features/properties.ui.h:12
 #: ../widgets/table/e-table-config.ui.h:21
 msgid "_Remove"
 msgstr "_Remove"
@@ -17117,6 +16918,11 @@ msgstr "Message retracted successfully"
 msgid "Insert Send options"
 msgstr "Insert Send options"
 
+#: ../plugins/groupwise-features/notification.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:6
+msgid "The participants will receive the following notification.\n"
+msgstr "The participants will receive the following notification.\n"
+
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
 msgstr "Add Send Options to GroupWise messages"
@@ -17177,7 +16983,7 @@ msgstr "You have already given proxy permissions to this user."
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
-msgstr "You have to specify a valid user name to give proxy rights."
+msgstr "You have to specify a valid username to give proxy rights."
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
@@ -17185,7 +16991,7 @@ msgstr "You cannot share this folder with the specified user &quot;{0}&quot;"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
 msgid "You have to specify a user name which you want to add to the list"
-msgstr "You have to specify a user name which you want to add to the list"
+msgstr "You have to specify a username which you want to add to the list"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
 msgid "Do you want to resend the meeting?"
@@ -17237,30 +17043,22 @@ msgstr "C_ustomise notification message"
 msgid "Con_tacts..."
 msgstr "Con_tactsâ?¦"
 
-#: ../plugins/groupwise-features/properties.ui.h:5
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Shared Folder Notification"
 msgstr "Shared Folder Notification"
 
-#: ../plugins/groupwise-features/properties.ui.h:7
-msgid "The participants will receive the following notification.\n"
-msgstr "The participants will receive the following notification.\n"
-
-#: ../plugins/groupwise-features/properties.ui.h:9
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "Users:"
 msgstr "Users:"
 
-#: ../plugins/groupwise-features/properties.ui.h:12
+#: ../plugins/groupwise-features/properties.ui.h:11
 msgid "_Not Shared"
 msgstr "_Not Shared"
 
-#: ../plugins/groupwise-features/properties.ui.h:14
+#: ../plugins/groupwise-features/properties.ui.h:13
 msgid "_Shared With..."
 msgstr "_Shared Withâ?¦"
 
-#: ../plugins/groupwise-features/properties.ui.h:15
-msgid "_Sharing"
-msgstr "_Sharing"
-
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "Access Rights"
@@ -17306,7 +17104,7 @@ msgid "Proxy"
 msgstr "Proxy"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:230
+#: ../widgets/misc/e-account-tree-view.c:243
 msgid "Account Name"
 msgstr "Account Name"
 
@@ -17316,108 +17114,108 @@ msgstr "Proxy Login"
 
 #: ../plugins/groupwise-features/proxy-login.c:208
 #: ../plugins/groupwise-features/proxy-login.c:251
-#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/proxy.c:494
 #: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sEnter password for %s (user %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:689
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "The Proxy tab will be available only when the account is online."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:704
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "The Proxy tab will be available only when the account is enabled."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:700
+#: ../plugins/groupwise-features/proxy.c:709
 msgctxt "GW"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../plugins/groupwise-features/proxy.c:926
-#: ../plugins/groupwise-features/share-folder.c:691
+#: ../plugins/groupwise-features/proxy.c:935
+#: ../plugins/groupwise-features/share-folder.c:692
 msgid "Add User"
 msgstr "Add User"
 
-#: ../plugins/groupwise-features/send-options.c:212
+#: ../plugins/groupwise-features/send-options.c:214
 msgid "Advanced send options"
 msgstr "Advanced send options"
 
-#: ../plugins/groupwise-features/share-folder-common.c:309
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../plugins/groupwise-features/share-folder-common.c:316
+#: ../plugins/groupwise-features/share-folder.c:727
 msgid "Users"
 msgstr "Users"
 
-#: ../plugins/groupwise-features/share-folder-common.c:310
+#: ../plugins/groupwise-features/share-folder-common.c:317
 msgid "Enter the users and set permissions"
 msgstr "Enter the users and set permissions"
 
-#: ../plugins/groupwise-features/share-folder-common.c:410
+#: ../plugins/groupwise-features/share-folder-common.c:418
 msgid "Sharing"
 msgstr "Sharing"
 
-#: ../plugins/groupwise-features/share-folder.c:529
+#: ../plugins/groupwise-features/share-folder.c:530
 msgid "Custom Notification"
 msgstr "Custom Notification"
 
-#: ../plugins/groupwise-features/share-folder.c:731
+#: ../plugins/groupwise-features/share-folder.c:732
 msgid "Add   "
 msgstr "Add   "
 
-#: ../plugins/groupwise-features/share-folder.c:737
+#: ../plugins/groupwise-features/share-folder.c:738
 msgid "Modify"
 msgstr "Modify"
 
-#: ../plugins/groupwise-features/status-track.c:123
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "Message Status"
 msgstr "Message Status"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:139
 msgid "Subject:"
 msgstr "Subject:"
 
-#: ../plugins/groupwise-features/status-track.c:151
+#: ../plugins/groupwise-features/status-track.c:153
 msgid "From:"
 msgstr "From:"
 
-#: ../plugins/groupwise-features/status-track.c:166
+#: ../plugins/groupwise-features/status-track.c:168
 msgid "Creation date:"
 msgstr "Creation date:"
 
-#: ../plugins/groupwise-features/status-track.c:206
+#: ../plugins/groupwise-features/status-track.c:208
 msgid "Recipient: "
 msgstr "Recipient: "
 
-#: ../plugins/groupwise-features/status-track.c:213
+#: ../plugins/groupwise-features/status-track.c:215
 msgid "Delivered: "
 msgstr "Delivered: "
 
-#: ../plugins/groupwise-features/status-track.c:219
+#: ../plugins/groupwise-features/status-track.c:221
 msgid "Opened: "
 msgstr "Opened: "
 
-#: ../plugins/groupwise-features/status-track.c:224
+#: ../plugins/groupwise-features/status-track.c:226
 msgid "Accepted: "
 msgstr "Accepted: "
 
-#: ../plugins/groupwise-features/status-track.c:229
+#: ../plugins/groupwise-features/status-track.c:231
 msgid "Deleted: "
 msgstr "Deleted: "
 
-#: ../plugins/groupwise-features/status-track.c:234
+#: ../plugins/groupwise-features/status-track.c:236
 msgid "Declined: "
 msgstr "Declined: "
 
-#: ../plugins/groupwise-features/status-track.c:239
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Completed: "
 msgstr "Completed: "
 
-#: ../plugins/groupwise-features/status-track.c:244
+#: ../plugins/groupwise-features/status-track.c:246
 msgid "Undelivered: "
 msgstr "Undelivered: "
 
@@ -17429,12 +17227,12 @@ msgstr "Inline Image"
 msgid "View image attachments directly in mail messages."
 msgstr "View image attachments directly in mail messages."
 
-#: ../plugins/imap-features/imap-headers.c:330
+#: ../plugins/imap-features/imap-headers.c:329
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Custom Headers"
 
-#: ../plugins/imap-features/imap-headers.c:343
+#: ../plugins/imap-features/imap-headers.c:342
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP Headers"
@@ -17488,135 +17286,139 @@ msgstr "IMAP Features"
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Failed to load the calendar '%s' (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:649
+#: ../plugins/itip-formatter/itip-formatter.c:654
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "An appointment in the calendar '%s' conflicts with this meeting"
 
-#: ../plugins/itip-formatter/itip-formatter.c:685
+#: ../plugins/itip-formatter/itip-formatter.c:690
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Found the appointment in the calendar '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:784
+#: ../plugins/itip-formatter/itip-formatter.c:789
 msgid "Unable to find any calendars"
 msgstr "Unable to find any calendars"
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:796
 msgid "Unable to find this meeting in any calendar"
 msgstr "Unable to find this meeting in any calendar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:800
 msgid "Unable to find this task in any task list"
 msgstr "Unable to find this task in any task list"
 
-#: ../plugins/itip-formatter/itip-formatter.c:799
+#: ../plugins/itip-formatter/itip-formatter.c:804
 msgid "Unable to find this memo in any memo list"
 msgstr "Unable to find this memo in any memo list"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:880
 msgid "Opening the calendar. Please wait.."
 msgstr "Opening the calendar. Please wait.."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:883
 msgid "Searching for an existing version of this appointment"
 msgstr "Searching for an existing version of this appointment"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1166
 msgid "Unable to parse item"
 msgstr "Unable to parse item"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1255
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Unable to send item to calendar '%s'.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1267
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sent to calendar '%s' as accepted"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1271
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sent to calendar '%s' as tentative"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1276
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sent to calendar '%s' as declined"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Sent to calendar '%s' as cancelled"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organiser has removed the delegate %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1382
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Sent a cancellation notice to the delegate"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1384
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Could not send the cancellation notice to the delegate"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1495
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Attendee status could not be updated because the status is invalid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1524
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Unable to update attendee. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1528
 msgid "Attendee status updated"
 msgstr "Attendee status updated"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1532
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "Attendee status can not be updated because the item no longer exists"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1554
 msgid "Meeting information sent"
 msgstr "Meeting information sent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1557
 msgid "Task information sent"
 msgstr "Task information sent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1560
 msgid "Memo information sent"
 msgstr "Memo information sent"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1569
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Unable to send meeting information, the meeting does not exist"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1572
 msgid "Unable to send task information, the task does not exist"
 msgstr "Unable to send task information, the task does not exist"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1575
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Unable to send memo information, the memo does not exist"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Save Calendar"
 msgstr "Save Calendar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1586
-#: ../plugins/itip-formatter/itip-formatter.c:1597
+#: ../plugins/itip-formatter/itip-formatter.c:1703
+#: ../plugins/itip-formatter/itip-formatter.c:1714
 msgid "The calendar attached is not valid"
 msgstr "The calendar attached is not valid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1704
+#: ../plugins/itip-formatter/itip-formatter.c:1715
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17624,15 +17426,15 @@ msgstr ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1638
-#: ../plugins/itip-formatter/itip-formatter.c:1666
-#: ../plugins/itip-formatter/itip-formatter.c:1775
+#: ../plugins/itip-formatter/itip-formatter.c:1755
+#: ../plugins/itip-formatter/itip-formatter.c:1783
+#: ../plugins/itip-formatter/itip-formatter.c:1892
 msgid "The item in the calendar is not valid"
 msgstr "The item in the calendar is not valid"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1776
+#: ../plugins/itip-formatter/itip-formatter.c:1756
+#: ../plugins/itip-formatter/itip-formatter.c:1784
+#: ../plugins/itip-formatter/itip-formatter.c:1893
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17640,11 +17442,11 @@ msgstr ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1680
+#: ../plugins/itip-formatter/itip-formatter.c:1797
 msgid "The calendar attached contains multiple items"
 msgstr "The calendar attached contains multiple items"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1798
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17652,31 +17454,40 @@ msgstr ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2454
+#: ../plugins/itip-formatter/itip-formatter.c:2460
+msgctxt "cal-itip"
+msgid "None"
+msgstr "None"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2476
+msgid "Tentatively Accepted"
+msgstr "Tentatively Accepted"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2594
 msgid "This meeting recurs"
 msgstr "This meeting recurs"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2457
+#: ../plugins/itip-formatter/itip-formatter.c:2597
 msgid "This task recurs"
 msgstr "This task recurs"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2600
 msgid "This memo recurs"
 msgstr "This memo recurs"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2694
+#: ../plugins/itip-formatter/itip-formatter.c:2834
 msgid "_Delete message after acting"
 msgstr "_Delete message after acting"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2704
-#: ../plugins/itip-formatter/itip-formatter.c:2737
+#: ../plugins/itip-formatter/itip-formatter.c:2844
+#: ../plugins/itip-formatter/itip-formatter.c:2877
 msgid "Conflict Search"
 msgstr "Conflict Search"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2719
+#: ../plugins/itip-formatter/itip-formatter.c:2859
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Select the calendars to search for meeting conflicts"
 
@@ -17812,6 +17623,14 @@ msgstr "%A, %e %B, %Y %l:%M %p"
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %e %B, %Y %l:%M:%S %p"
 
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
+msgid "An unknown person"
+msgstr "An unknown person"
+
 #: ../plugins/itip-formatter/itip-view.c:367
 #: ../plugins/itip-formatter/itip-view.c:455
 #: ../plugins/itip-formatter/itip-view.c:542
@@ -18046,7 +17865,7 @@ msgstr "Start day:"
 
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1053
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Start time:"
 msgstr "Start time:"
 
@@ -18056,7 +17875,7 @@ msgstr "End day:"
 
 #. End time
 #: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1065
 msgid "End time:"
 msgstr "End time:"
 
@@ -18115,41 +17934,41 @@ msgid "_Update"
 msgstr "_Update"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1084
-#: ../plugins/itip-formatter/itip-view.c:1138
+#: ../plugins/itip-formatter/itip-view.c:1085
+#: ../plugins/itip-formatter/itip-view.c:1139
 msgid "Comment:"
 msgstr "Comment:"
 
-#: ../plugins/itip-formatter/itip-view.c:1123
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "Send _reply to sender"
 msgstr "Send _reply to sender"
 
-#: ../plugins/itip-formatter/itip-view.c:1153
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "Send _updates to attendees"
 msgstr "Send _updates to attendees"
 
-#: ../plugins/itip-formatter/itip-view.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1163
 msgid "_Apply to all instances"
 msgstr "_Apply to all instances"
 
-#: ../plugins/itip-formatter/itip-view.c:1171
+#: ../plugins/itip-formatter/itip-view.c:1172
 msgid "Show time as _free"
 msgstr "Show time as _free"
 
-#: ../plugins/itip-formatter/itip-view.c:1174
+#: ../plugins/itip-formatter/itip-view.c:1175
 msgid "_Preserve my reminder"
 msgstr "_Preserve my reminder"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1180
+#: ../plugins/itip-formatter/itip-view.c:1181
 msgid "_Inherit reminder"
 msgstr "_Inherit reminder"
 
-#: ../plugins/itip-formatter/itip-view.c:1923
+#: ../plugins/itip-formatter/itip-view.c:1924
 msgid "_Tasks:"
 msgstr "_Tasks:"
 
-#: ../plugins/itip-formatter/itip-view.c:1925
+#: ../plugins/itip-formatter/itip-view.c:1926
 msgid "_Memos:"
 msgstr "_Memos:"
 
@@ -18244,15 +18063,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:352
-msgid "Evolution's Mail Notification"
-msgstr "Evolution's Mail Notification"
-
-#: ../plugins/mail-notification/mail-notification.c:374
-msgid "Mail Notification Properties"
-msgstr "Mail Notification Properties"
-
-#: ../plugins/mail-notification/mail-notification.c:507
+#: ../plugins/mail-notification/mail-notification.c:390
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18269,63 +18080,64 @@ msgstr[1] ""
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:519
+#: ../plugins/mail-notification/mail-notification.c:402
 #, 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:532
+#: ../plugins/mail-notification/mail-notification.c:415
 #, c-format
 msgid "Subject: %s"
 msgstr "Subject: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:542
+#: ../plugins/mail-notification/mail-notification.c:425
 #, 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:559
-#: ../plugins/mail-notification/mail-notification.c:566
+#: ../plugins/mail-notification/mail-notification.c:438
+#: ../plugins/mail-notification/mail-notification.c:446
+#: ../plugins/mail-notification/mail-notification.c:449
 msgid "New email"
 msgstr "New e-mail"
 
-#: ../plugins/mail-notification/mail-notification.c:627
+#: ../plugins/mail-notification/mail-notification.c:498
 msgid "Show icon in _notification area"
 msgstr "Show icon in _notification area"
 
-#: ../plugins/mail-notification/mail-notification.c:656
+#: ../plugins/mail-notification/mail-notification.c:528
 msgid "Popup _message together with the icon"
 msgstr "Popup _message together with the icon"
 
-#: ../plugins/mail-notification/mail-notification.c:843
+#: ../plugins/mail-notification/mail-notification.c:715
 msgid "_Play sound when new messages arrive"
 msgstr "_Play sound when new messages arrive"
 
-#: ../plugins/mail-notification/mail-notification.c:872
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "_Beep"
 msgstr "_Beep"
 
-#: ../plugins/mail-notification/mail-notification.c:885
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "Use sound _theme"
 msgstr "Use sound _theme"
 
-#: ../plugins/mail-notification/mail-notification.c:904
+#: ../plugins/mail-notification/mail-notification.c:777
 msgid "Play _file:"
 msgstr "Play _file:"
 
-#: ../plugins/mail-notification/mail-notification.c:915
+#: ../plugins/mail-notification/mail-notification.c:788
 msgid "Select sound file"
 msgstr "Select sound file"
 
-#: ../plugins/mail-notification/mail-notification.c:973
+#: ../plugins/mail-notification/mail-notification.c:846
 msgid "Notify new messages for _Inbox only"
 msgstr "Notify new messages for _Inbox only"
 
-#: ../plugins/mail-notification/mail-notification.c:982
+#: ../plugins/mail-notification/mail-notification.c:855
 msgid "Generate a _D-Bus message"
 msgstr "Generate a _D-Bus message"
 
@@ -18338,7 +18150,7 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Notifies you when new mail messages arrive."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:158
+#: ../plugins/mail-to-task/mail-to-task.c:157
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Created from a mail by %s"
@@ -18496,40 +18308,40 @@ msgstr ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 
-#: ../plugins/mail-to-task/mail-to-task.c:952
+#: ../plugins/mail-to-task/mail-to-task.c:955
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Cannot get source list. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1071
+#: ../plugins/mail-to-task/mail-to-task.c:1074
 msgid "Create an _Event"
 msgstr "Create an _Event"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1073
+#: ../plugins/mail-to-task/mail-to-task.c:1076
 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:1078
+#: ../plugins/mail-to-task/mail-to-task.c:1081
 msgid "Create a Mem_o"
 msgstr "Create a Mem_o"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1080
+#: ../plugins/mail-to-task/mail-to-task.c:1083
 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:1085
+#: ../plugins/mail-to-task/mail-to-task.c:1088
 msgid "Create a _Task"
 msgstr "Create a _Task"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1087
+#: ../plugins/mail-to-task/mail-to-task.c:1090
 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:1095
+#: ../plugins/mail-to-task/mail-to-task.c:1098
 msgid "Create a _Meeting"
 msgstr "Create a _Meeting"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1097
+#: ../plugins/mail-to-task/mail-to-task.c:1100
 msgid "Create a new meeting from the selected message"
 msgstr "Create a new meeting from the selected message"
 
@@ -18537,55 +18349,55 @@ msgstr "Create a new meeting from the selected message"
 msgid "Convert a mail message to a task."
 msgstr "Convert a mail message to a task."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:294
 msgid "Get List _Archive"
 msgstr "Get List _Archive"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:296
 msgid "Get an archive of the list this message belongs to"
 msgstr "Get an archive of the list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:301
 msgid "Get List _Usage Information"
 msgstr "Get List _Usage Information"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:303
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Get information about the usage of the list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:308
 msgid "Contact List _Owner"
 msgstr "Contact List _Owner"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:310
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Contact the owner of the mailing list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:315
 msgid "_Post Message to List"
 msgstr "_Post Message to List"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:317
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Post a message to the mailing list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:319
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:322
 msgid "_Subscribe to List"
 msgstr "_Subscribe to List"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:324
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Subscribe to the mailing list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:326
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:329
 msgid "_Unsubscribe from List"
 msgstr "_Unsubscribe from List"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:328
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:331
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Unsubscribe from the mailing list this message belongs to"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:335
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:338
 msgid "Mailing _List"
 msgstr "Mailing _List"
 
@@ -18697,7 +18509,7 @@ msgstr "In Current Folder and _Subfolders"
 msgid "In Current _Folder Only"
 msgstr "In Current _Folder Only"
 
-#: ../plugins/mark-all-read/mark-all-read.c:439
+#: ../plugins/mark-all-read/mark-all-read.c:447
 msgid "Mark Me_ssages as Read"
 msgstr "Mark Me_ssages as Read"
 
@@ -18709,40 +18521,6 @@ msgstr "Mark All Read"
 msgid "Mark all messages in a folder as read."
 msgstr "Mark all messages in a folder as read."
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "Manage your Evolution plugins."
-msgstr "Manage your Evolution plugins."
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:244
-msgid "Plugin Manager"
-msgstr "Plugin Manager"
-
-#: ../plugins/plugin-manager/plugin-manager.c:59
-msgid "Author(s)"
-msgstr "Author(s)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:259
-msgid "Note: Some changes will not take effect until restart"
-msgstr "Note: Some changes will not take effect until restart"
-
-#: ../plugins/plugin-manager/plugin-manager.c:285
-msgid "Overview"
-msgstr "Overview"
-
-#: ../plugins/plugin-manager/plugin-manager.c:356
-#: ../plugins/plugin-manager/plugin-manager.c:418
-msgid "Plugin"
-msgstr "Plugin"
-
-#: ../plugins/plugin-manager/plugin-manager.c:430
-msgid "_Plugins"
-msgstr "_Plugins"
-
-#: ../plugins/plugin-manager/plugin-manager.c:432
-msgid "Enable and disable plugins"
-msgstr "Enable and disable plugins"
-
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
@@ -18756,19 +18534,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:198
+#: ../plugins/prefer-plain/prefer-plain.c:225
 msgid "Show HTML if present"
 msgstr "Show HTML if present"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:225
 msgid "Let Evolution choose the best part to show."
 msgstr "Let Evolution choose the best part to show."
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:226
 msgid "Show plain text if present"
 msgstr "Show plain text if present"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:226
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -18776,11 +18554,11 @@ msgstr ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:227
 msgid "Only ever show plain text"
 msgstr "Only ever show plain text"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:227
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -18788,11 +18566,11 @@ msgstr ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 
-#: ../plugins/prefer-plain/prefer-plain.c:247
+#: ../plugins/prefer-plain/prefer-plain.c:274
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Show s_uppressed HTML parts as attachments"
 
-#: ../plugins/prefer-plain/prefer-plain.c:267
+#: ../plugins/prefer-plain/prefer-plain.c:294
 msgid "HTML _Mode"
 msgstr "HTML _Mode"
 
@@ -18816,41 +18594,42 @@ msgstr "Outlook PST import"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook personal folders (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:295
+#: ../plugins/pst-import/pst-importer.c:311
 msgid "_Mail"
 msgstr "_Mail"
 
-#: ../plugins/pst-import/pst-importer.c:307
+#: ../plugins/pst-import/pst-importer.c:323
 msgid "Destination folder:"
 msgstr "Destination folder:"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:313
+#: ../plugins/pst-import/pst-importer.c:329
 msgid "_Address Book"
 msgstr "_Address Book"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:320
+#: ../plugins/pst-import/pst-importer.c:336
 msgid "A_ppointments"
 msgstr "A_ppointments"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:342 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Tasks"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:348
 msgid "_Journal entries"
 msgstr "_Journal entries"
 
-#: ../plugins/pst-import/pst-importer.c:347
+#: ../plugins/pst-import/pst-importer.c:363
 msgid "Importing Outlook data"
 msgstr "Importing Outlook data"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 #: ../plugins/publish-calendar/publish-calendar.c:146
-#: ../plugins/publish-calendar/publish-calendar.c:153
+#: ../plugins/publish-calendar/publish-calendar.c:154
+#: ../plugins/publish-calendar/publish-calendar.c:156
 msgid "Calendar Publishing"
 msgstr "Calendar Publishing"
 
@@ -18862,49 +18641,49 @@ msgstr "Locations"
 msgid "Publish calendars to the web."
 msgstr "Publish calendars to the web."
 
-#: ../plugins/publish-calendar/publish-calendar.c:208
-#: ../plugins/publish-calendar/publish-calendar.c:449
+#: ../plugins/publish-calendar/publish-calendar.c:212
+#: ../plugins/publish-calendar/publish-calendar.c:453
 #, c-format
 msgid "Could not open %s:"
 msgstr "Could not open %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:210
+#: ../plugins/publish-calendar/publish-calendar.c:214
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "Could not open %s: Unknown error"
 
-#: ../plugins/publish-calendar/publish-calendar.c:230
+#: ../plugins/publish-calendar/publish-calendar.c:234
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "There was an error while publishing to %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:232
+#: ../plugins/publish-calendar/publish-calendar.c:236
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Publishing to %s finished successfully"
 
-#: ../plugins/publish-calendar/publish-calendar.c:276
+#: ../plugins/publish-calendar/publish-calendar.c:280
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Mount of %s failed:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:600
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "E_nable"
 
-#: ../plugins/publish-calendar/publish-calendar.c:739
+#: ../plugins/publish-calendar/publish-calendar.c:743
 msgid "Are you sure you want to remove this location?"
 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:1051
+#: ../plugins/publish-calendar/publish-calendar.c:1055
 msgid "Could not create publish thread."
 msgstr "Could not create publish thread."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1059
+#: ../plugins/publish-calendar/publish-calendar.c:1063
 msgid "_Publish Calendar Information"
 msgstr "_Publish Calendar Information"
 
@@ -19002,55 +18781,55 @@ 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:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
 msgstr "New Location"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "Edit Location"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin not found, code: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Failed to create pipe: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Error after fork: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassin child process does not respond; killingâ?¦"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Wait for SpamAssassin child process interrupted; terminatingâ?¦"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Pipe to SpamAssassin failed, error code: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
 #, c-format
 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:927
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:940
 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:935
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:948
 msgid "I_nclude remote tests"
 msgstr "I_nclude remote tests"
 
@@ -19102,6 +18881,10 @@ msgstr "Start"
 msgid "End"
 msgstr "End"
 
+#: ../plugins/save-calendar/csv-format.c:372
+msgid "Due"
+msgstr "Due"
+
 #: ../plugins/save-calendar/csv-format.c:373
 msgid "percent Done"
 msgstr "percent Done"
@@ -19187,23 +18970,6 @@ msgstr "Save the selected memo list to disk"
 msgid "Save the selected task list to disk"
 msgstr "Save the selected task list to disk"
 
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Sort mail message threads by subject."
-msgstr "Sort mail message threads by subject."
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
-msgid "Subject Threading"
-msgstr "Subject Threading"
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
-msgid "Thread messages by subject"
-msgstr "Thread messages by subject"
-
-#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:63
-msgid "F_all back to threading messages by subject"
-msgstr "F_all back to threading messages by subject"
-
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
@@ -19216,15 +18982,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Drafts-based template plugin"
 
-#: ../plugins/templates/templates.c:621
+#: ../plugins/templates/templates.c:626
 msgid "No Title"
 msgstr "No Title"
 
-#: ../plugins/templates/templates.c:715
+#: ../plugins/templates/templates.c:736
 msgid "Save as _Template"
 msgstr "Save as _Template"
 
-#: ../plugins/templates/templates.c:717
+#: ../plugins/templates/templates.c:738
 msgid "Save as Template"
 msgstr "Save as Template"
 
@@ -19244,27 +19010,27 @@ msgstr "Inline vCards"
 msgid "Show vCards directly in mail messages."
 msgstr "Show vCards directly in mail messages."
 
-#: ../plugins/vcard-inline/vcard-inline.c:181
-#: ../plugins/vcard-inline/vcard-inline.c:266
+#: ../plugins/vcard-inline/vcard-inline.c:182
+#: ../plugins/vcard-inline/vcard-inline.c:267
 msgid "Show Full vCard"
 msgstr "Show Full vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:184
+#: ../plugins/vcard-inline/vcard-inline.c:185
 msgid "Show Compact vCard"
 msgstr "Show Compact vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:246
 msgid "There is one other contact."
 msgstr "There is one other contact."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:255
 #, 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:275
+#: ../plugins/vcard-inline/vcard-inline.c:276
 msgid "Save in Address Book"
 msgstr "Save in Address Book"
 
@@ -19448,7 +19214,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:331
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:342
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
@@ -19605,11 +19371,11 @@ msgstr "Window button style"
 msgid "Window buttons are visible"
 msgstr "Window buttons are visible"
 
-#: ../shell/e-shell-content.c:528 ../shell/e-shell-content.c:529
+#: ../shell/e-shell-content.c:671 ../shell/e-shell-content.c:672
 msgid "Searches"
 msgstr "Searches"
 
-#: ../shell/e-shell-content.c:571
+#: ../shell/e-shell-content.c:714
 msgid "Save Search"
 msgstr "Save Search"
 
@@ -19617,38 +19383,42 @@ 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:929
+#: ../shell/e-shell-searchbar.c:938
 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:960
+#: ../shell/e-shell-searchbar.c:971
 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:1021
+#: ../shell/e-shell-searchbar.c:1034
 msgid "i_n"
 msgstr "i_n"
 
-#: ../shell/e-shell-utils.c:253
+#: ../shell/e-shell-utils.c:255
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:255
+#: ../shell/e-shell-utils.c:257
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:276
+#: ../shell/e-shell-utils.c:278
 msgid "All Files (*)"
 msgstr "All Files (*)"
 
+#: ../shell/e-shell-view.c:297
+msgid "Saving user interface state"
+msgstr "Saving user interface state"
+
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:645
+#: ../shell/e-shell-window-actions.c:643
 msgid "translator-credits"
 msgstr ""
 "Gareth Owen <gowen72 yahoo com>\n"
@@ -19656,305 +19426,297 @@ msgstr ""
 "Philip Withnall <philip tecnocode co uk>\n"
 "Bruce Cowan <bruce bcowan me uk>"
 
-#: ../shell/e-shell-window-actions.c:656
+#: ../shell/e-shell-window-actions.c:654
 msgid "Evolution Website"
 msgstr "Evolution Website"
 
-#: ../shell/e-shell-window-actions.c:1236
+#: ../shell/e-shell-window-actions.c:1216
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy is not installed."
 
-#: ../shell/e-shell-window-actions.c:1238
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy could not be run."
 
-#: ../shell/e-shell-window-actions.c:1419
+#: ../shell/e-shell-window-actions.c:1399
 msgid "Show information about Evolution"
 msgstr "Show information about Evolution"
 
-#: ../shell/e-shell-window-actions.c:1424
-#: ../shell/e-shell-window-actions.c:1438
+#: ../shell/e-shell-window-actions.c:1404
+#: ../shell/e-shell-window-actions.c:1418
 msgid "_Close Window"
 msgstr "_Close Window"
 
-#: ../shell/e-shell-window-actions.c:1445
+#: ../shell/e-shell-window-actions.c:1425
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../shell/e-shell-window-actions.c:1447
+#: ../shell/e-shell-window-actions.c:1427
 msgid "Open the Evolution User Guide"
 msgstr "Open the Evolution User Guide"
 
-#: ../shell/e-shell-window-actions.c:1473
+#: ../shell/e-shell-window-actions.c:1453
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ../shell/e-shell-window-actions.c:1475
+#: ../shell/e-shell-window-actions.c:1455
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Open the Frequently Asked Questions webpage"
 
-#: ../shell/e-shell-window-actions.c:1480
+#: ../shell/e-shell-window-actions.c:1460
 msgid "_Forget Passwords"
 msgstr "_Forget Passwords"
 
-#: ../shell/e-shell-window-actions.c:1482
+#: ../shell/e-shell-window-actions.c:1462
 msgid "Forget all remembered passwords"
 msgstr "Forget all remembered passwords"
 
-#: ../shell/e-shell-window-actions.c:1487
+#: ../shell/e-shell-window-actions.c:1467
 msgid "I_mport..."
 msgstr "I_mportâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1489
+#: ../shell/e-shell-window-actions.c:1469
 msgid "Import data from other programs"
 msgstr "Import data from other programs"
 
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1474
 msgid "New _Window"
 msgstr "New _Window"
 
-#: ../shell/e-shell-window-actions.c:1496
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Create a new window displaying this view"
 msgstr "Create a new window displaying this view"
 
-#: ../shell/e-shell-window-actions.c:1510
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Configure Evolution"
 msgstr "Configure Evolution"
 
-#: ../shell/e-shell-window-actions.c:1515
+#: ../shell/e-shell-window-actions.c:1495
 msgid "_Quick Reference"
 msgstr "_Quick Reference"
 
-#: ../shell/e-shell-window-actions.c:1517
+#: ../shell/e-shell-window-actions.c:1497
 msgid "Show Evolution's shortcut keys"
 msgstr "Show Evolution's shortcut keys"
 
-#: ../shell/e-shell-window-actions.c:1524
+#: ../shell/e-shell-window-actions.c:1504
 msgid "Exit the program"
 msgstr "Exit the program"
 
-#: ../shell/e-shell-window-actions.c:1529
+#: ../shell/e-shell-window-actions.c:1509
 msgid "_Advanced Search..."
 msgstr "_Advanced Searchâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1531
+#: ../shell/e-shell-window-actions.c:1511
 msgid "Construct a more advanced search"
 msgstr "Construct a more advanced search"
 
-#: ../shell/e-shell-window-actions.c:1538
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Clear the current search parameters"
 msgstr "Clear the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1523
 msgid "_Edit Saved Searches..."
 msgstr "_Edit Saved Searchesâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1545
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Manage your saved searches"
 msgstr "Manage your saved searches"
 
-#: ../shell/e-shell-window-actions.c:1552
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Click here to change the search type"
 msgstr "Click here to change the search type"
 
-#: ../shell/e-shell-window-actions.c:1557
+#: ../shell/e-shell-window-actions.c:1537
 msgid "_Find Now"
 msgstr "_Find Now"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1559
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Execute the current search parameters"
 msgstr "Execute the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Save Search..."
 msgstr "_Save Searchâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1566
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Save the current search parameters"
 msgstr "Save the current search parameters"
 
-#: ../shell/e-shell-window-actions.c:1578
-msgid "Send / _Receive"
-msgstr "Send / _Receive"
-
-#: ../shell/e-shell-window-actions.c:1580
-msgid "Send queued items and retrieve new items"
-msgstr "Send queued items and retrieve new items"
-
-#: ../shell/e-shell-window-actions.c:1585
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Submit _Bug Report..."
 msgstr "Submit _Bug Reportâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1587
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Submit a bug report using Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1592
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: ../shell/e-shell-window-actions.c:1594
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Put Evolution into offline mode"
 msgstr "Put Evolution into offline mode"
 
-#: ../shell/e-shell-window-actions.c:1599
+#: ../shell/e-shell-window-actions.c:1572
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: ../shell/e-shell-window-actions.c:1601
+#: ../shell/e-shell-window-actions.c:1574
 msgid "Put Evolution into online mode"
 msgstr "Put Evolution into online mode"
 
-#: ../shell/e-shell-window-actions.c:1629
+#: ../shell/e-shell-window-actions.c:1602
 msgid "Lay_out"
 msgstr "Lay_out"
 
-#: ../shell/e-shell-window-actions.c:1636
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_New"
 msgstr "_New"
 
-#: ../shell/e-shell-window-actions.c:1643
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Search"
 msgstr "_Search"
 
-#: ../shell/e-shell-window-actions.c:1650
+#: ../shell/e-shell-window-actions.c:1623
 msgid "_Switcher Appearance"
 msgstr "_Switcher Appearance"
 
-#: ../shell/e-shell-window-actions.c:1664
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Window"
 msgstr "_Window"
 
-#: ../shell/e-shell-window-actions.c:1693
+#: ../shell/e-shell-window-actions.c:1666
 msgid "Show Side _Bar"
 msgstr "Show Side _Bar"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1668
 msgid "Show the side bar"
 msgstr "Show the side bar"
 
-#: ../shell/e-shell-window-actions.c:1701
+#: ../shell/e-shell-window-actions.c:1674
 msgid "Show _Buttons"
 msgstr "Show _Buttons"
 
-#: ../shell/e-shell-window-actions.c:1703
+#: ../shell/e-shell-window-actions.c:1676
 msgid "Show the switcher buttons"
 msgstr "Show the switcher buttons"
 
-#: ../shell/e-shell-window-actions.c:1709
+#: ../shell/e-shell-window-actions.c:1682
 msgid "Show _Status Bar"
 msgstr "Show _Status Bar"
 
-#: ../shell/e-shell-window-actions.c:1711
+#: ../shell/e-shell-window-actions.c:1684
 msgid "Show the status bar"
 msgstr "Show the status bar"
 
-#: ../shell/e-shell-window-actions.c:1717
+#: ../shell/e-shell-window-actions.c:1690
 msgid "Show _Tool Bar"
 msgstr "Show _Tool Bar"
 
-#: ../shell/e-shell-window-actions.c:1719
+#: ../shell/e-shell-window-actions.c:1692
 msgid "Show the tool bar"
 msgstr "Show the tool bar"
 
-#: ../shell/e-shell-window-actions.c:1741
+#: ../shell/e-shell-window-actions.c:1714
 msgid "_Icons Only"
 msgstr "_Icons Only"
 
-#: ../shell/e-shell-window-actions.c:1743
+#: ../shell/e-shell-window-actions.c:1716
 msgid "Display window buttons with icons only"
 msgstr "Display window buttons with icons only"
 
-#: ../shell/e-shell-window-actions.c:1748
+#: ../shell/e-shell-window-actions.c:1721
 msgid "_Text Only"
 msgstr "_Text Only"
 
-#: ../shell/e-shell-window-actions.c:1750
+#: ../shell/e-shell-window-actions.c:1723
 msgid "Display window buttons with text only"
 msgstr "Display window buttons with text only"
 
-#: ../shell/e-shell-window-actions.c:1755
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Icons _and Text"
 msgstr "Icons _and Text"
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1730
 msgid "Display window buttons with icons and text"
 msgstr "Display window buttons with icons and text"
 
-#: ../shell/e-shell-window-actions.c:1762
+#: ../shell/e-shell-window-actions.c:1735
 msgid "Tool_bar Style"
 msgstr "Tool_bar Style"
 
-#: ../shell/e-shell-window-actions.c:1764
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Display window buttons using the desktop toolbar setting"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1745
 msgid "Define Views..."
 msgstr "Define Viewsâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1774
+#: ../shell/e-shell-window-actions.c:1747
 msgid "Create or edit views"
 msgstr "Create or edit views"
 
-#: ../shell/e-shell-window-actions.c:1779
+#: ../shell/e-shell-window-actions.c:1752
 msgid "Save Custom View..."
 msgstr "Save Custom Viewâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1781
+#: ../shell/e-shell-window-actions.c:1754
 msgid "Save current custom view"
 msgstr "Save current custom view"
 
-#: ../shell/e-shell-window-actions.c:1788
+#: ../shell/e-shell-window-actions.c:1761
 msgid "C_urrent View"
 msgstr "C_urrent View"
 
-#: ../shell/e-shell-window-actions.c:1798
+#: ../shell/e-shell-window-actions.c:1771
 msgid "Custom View"
 msgstr "Custom View"
 
-#: ../shell/e-shell-window-actions.c:1800
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Current view is a customized view"
 msgstr "Current view is a customised view"
 
-#: ../shell/e-shell-window-actions.c:1810
+#: ../shell/e-shell-window-actions.c:1783
 msgid "Change the page settings for your current printer"
 msgstr "Change the page settings for your current printer"
 
-#: ../shell/e-shell-window-actions.c:2183
+#: ../shell/e-shell-window-actions.c:2168
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"
 
-#: ../shell/e-shell-window-actions.c:2396
+#: ../shell/e-shell-window-actions.c:2381
 msgid "Execute these search parameters"
 msgstr "Execute these search parameters"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:576
+#: ../shell/e-shell-window-private.c:584
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s â?? Evolution"
 
-#: ../shell/e-shell-window.c:419
+#: ../shell/e-shell-window.c:431
 msgid "New"
 msgstr "New"
 
-#: ../shell/e-shell.c:244
+#: ../shell/e-shell.c:247
 msgid "Preparing to go offline..."
 msgstr "Preparing to go offlineâ?¦"
 
-#: ../shell/e-shell.c:294
+#: ../shell/e-shell.c:300
 msgid "Preparing to go online..."
 msgstr "Preparing to go onlineâ?¦"
 
-#: ../shell/e-shell.c:353
+#: ../shell/e-shell.c:362
 msgid "Preparing to quit..."
 msgstr "Preparing to quitâ?¦"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:180
+#: ../shell/main.c:191
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19989,7 +19751,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: ../shell/main.c:204
+#: ../shell/main.c:215
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19997,62 +19759,75 @@ msgstr ""
 "Thanks\n"
 "The Evolution Team\n"
 
-#: ../shell/main.c:211
+#: ../shell/main.c:222
 msgid "Do not tell me again"
 msgstr "Do not tell me again"
 
-#: ../shell/main.c:327
+#: ../shell/main.c:338
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution activating the specified component"
 
-#: ../shell/main.c:329
+#: ../shell/main.c:340
 msgid "Apply the given geometry to the main window"
 msgstr "Apply the given geometry to the main window"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:344
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: ../shell/main.c:335
+#: ../shell/main.c:346
+msgid "Ignore network availability"
+msgstr "Ignore network availability"
+
+#: ../shell/main.c:348
 msgid "Start in \"express\" mode"
 msgstr "Start in \"express\" mode"
 
-#: ../shell/main.c:338
+#: ../shell/main.c:351
 msgid "Forcibly shut down Evolution"
 msgstr "Forcibly shut down Evolution"
 
-#: ../shell/main.c:341
+#: ../shell/main.c:354
 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:343
+#: ../shell/main.c:356
 msgid "Disable loading of any plugins."
 msgstr "Disable loading of any plugins."
 
-#: ../shell/main.c:345
+#: ../shell/main.c:358
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Disable preview pane of Mail, Contacts and Tasks."
 
-#: ../shell/main.c:349
+#: ../shell/main.c:362
 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:351
+#: ../shell/main.c:364
 msgid "Request a running Evolution process to quit"
 msgstr "Request a running Evolution process to quit"
 
-#: ../shell/main.c:475 ../shell/main.c:483
+#: ../shell/main.c:517 ../shell/main.c:525
 msgid "- The Evolution PIM and Email Client"
 msgstr "- The Evolution PIM and E-mail Client"
 
-#: ../shell/main.c:545
+#: ../shell/main.c:591
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
-"  Use %s --help for more information.\n"
+"  Run '%s --help' for more information.\n"
 msgstr ""
 "%s: --online and --offline cannot be used together.\n"
-"  Use %s --help for more information.\n"
+"  Run '%s --help' for more information.\n"
+
+#: ../shell/main.c:597
+#, c-format
+msgid ""
+"%s: --force-online and --offline cannot be used together.\n"
+"  Run '%s --help' for more information.\n"
+msgstr ""
+"%s: --force-online and --offline cannot be used together.\n"
+"  Run '%s --help' for more information.\n"
 
 #: ../shell/shell.error.xml.h:1
 msgid "Are you sure you want to forget all remembered passwords?"
@@ -20138,27 +19913,27 @@ msgstr "File is not a valid .desktop file"
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Unrecognised desktop file Version '%s'"
 
-#: ../smclient/eggdesktopfile.c:958
+#: ../smclient/eggdesktopfile.c:957
 #, c-format
 msgid "Starting %s"
 msgstr "Starting %s"
 
-#: ../smclient/eggdesktopfile.c:1100
+#: ../smclient/eggdesktopfile.c:1098
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr "Application does not accept documents on command line"
 
-#: ../smclient/eggdesktopfile.c:1168
+#: ../smclient/eggdesktopfile.c:1166
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Unrecognised launch option: %d"
 
-#: ../smclient/eggdesktopfile.c:1373
+#: ../smclient/eggdesktopfile.c:1365
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr "Can't pass document URIs to a 'Type=Link' desktop entry"
 
-#: ../smclient/eggdesktopfile.c:1394
+#: ../smclient/eggdesktopfile.c:1386
 #, c-format
 msgid "Not a launchable item"
 msgstr "Not a launchable item"
@@ -20320,7 +20095,7 @@ msgstr ""
 "Issued by:\n"
 "  Subject: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:169
 msgid "Select certificate"
 msgstr "Select certificate"
 
@@ -20843,11 +20618,11 @@ msgstr "Type of View"
 msgid "Type of view:"
 msgstr "Type of view:"
 
-#: ../widgets/misc/e-account-manager.c:351
+#: ../widgets/misc/e-account-manager.c:355
 msgid "De_fault"
 msgstr "De_fault"
 
-#: ../widgets/misc/e-account-tree-view.c:261
+#: ../widgets/misc/e-account-tree-view.c:274
 msgid "Protocol"
 msgstr "Protocol"
 
@@ -20864,7 +20639,7 @@ msgid "MIME Type:"
 msgstr "MIME Type:"
 
 #: ../widgets/misc/e-attachment-dialog.c:375
-#: ../widgets/misc/e-attachment-store.c:525
+#: ../widgets/misc/e-attachment-store.c:530
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggest automatic display of attachment"
 
@@ -20900,65 +20675,65 @@ msgstr "Loading"
 msgid "Saving"
 msgstr "Saving"
 
-#: ../widgets/misc/e-attachment-paned.c:98
+#: ../widgets/misc/e-attachment-paned.c:100
 msgid "Hide Attachment _Bar"
 msgstr "Hide Attachment _Bar"
 
-#: ../widgets/misc/e-attachment-paned.c:100
-#: ../widgets/misc/e-attachment-paned.c:631
+#: ../widgets/misc/e-attachment-paned.c:102
+#: ../widgets/misc/e-attachment-paned.c:637
 msgid "Show Attachment _Bar"
 msgstr "Show Attachment _Bar"
 
-#: ../widgets/misc/e-attachment-store.c:513
+#: ../widgets/misc/e-attachment-store.c:518
 msgid "Add Attachment"
 msgstr "Add Attachment"
 
-#: ../widgets/misc/e-attachment-store.c:516
+#: ../widgets/misc/e-attachment-store.c:521
 msgid "A_ttach"
 msgstr "A_ttach"
 
-#: ../widgets/misc/e-attachment-store.c:579
+#: ../widgets/misc/e-attachment-store.c:584
 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:608
-#: ../widgets/misc/e-attachment.c:1785 ../widgets/misc/e-attachment.c:2327
+#: ../widgets/misc/e-attachment-store.c:613
+#: ../widgets/misc/e-attachment.c:1786 ../widgets/misc/e-attachment.c:2328
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:351
+#: ../widgets/misc/e-attachment-view.c:352
 msgid "S_ave All"
 msgstr "S_ave All"
 
-#: ../widgets/misc/e-attachment-view.c:377
+#: ../widgets/misc/e-attachment-view.c:378
 msgid "A_dd Attachment..."
 msgstr "A_dd Attachmentâ?¦"
 
-#: ../widgets/misc/e-attachment-view.c:401
+#: ../widgets/misc/e-attachment-view.c:402
 msgid "_Hide"
 msgstr "_Hide"
 
-#: ../widgets/misc/e-attachment-view.c:408
+#: ../widgets/misc/e-attachment-view.c:409
 msgid "Hid_e All"
 msgstr "Hid_e All"
 
-#: ../widgets/misc/e-attachment-view.c:415
+#: ../widgets/misc/e-attachment-view.c:416
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: ../widgets/misc/e-attachment-view.c:422
+#: ../widgets/misc/e-attachment-view.c:423
 msgid "Vie_w All Inline"
 msgstr "Vie_w All Inline"
 
-#: ../widgets/misc/e-attachment-view.c:739
+#: ../widgets/misc/e-attachment-view.c:740
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Open with \"%s\""
 
-#: ../widgets/misc/e-attachment-view.c:742
+#: ../widgets/misc/e-attachment-view.c:743
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Open this attachment in %s"
@@ -20971,55 +20746,55 @@ msgstr "Open this attachment in %s"
 msgid "Attached message"
 msgstr "Attached message"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2630
 msgid "A load operation is already in progress"
 msgstr "A load operation is already in progress"
 
-#: ../widgets/misc/e-attachment.c:1836 ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:1837 ../widgets/misc/e-attachment.c:2638
 msgid "A save operation is already in progress"
 msgstr "A save operation is already in progress"
 
-#: ../widgets/misc/e-attachment.c:1928
+#: ../widgets/misc/e-attachment.c:1929
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Could not load '%s'"
 
-#: ../widgets/misc/e-attachment.c:1931
+#: ../widgets/misc/e-attachment.c:1932
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Could not load the attachment"
 
-#: ../widgets/misc/e-attachment.c:2207
+#: ../widgets/misc/e-attachment.c:2208
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Could not open '%s'"
 
-#: ../widgets/misc/e-attachment.c:2210
+#: ../widgets/misc/e-attachment.c:2211
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Could not open the attachment"
 
-#: ../widgets/misc/e-attachment.c:2645
+#: ../widgets/misc/e-attachment.c:2646
 msgid "Attachment contents not loaded"
 msgstr "Attachment contents not loaded"
 
-#: ../widgets/misc/e-attachment.c:2721
+#: ../widgets/misc/e-attachment.c:2722
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Could not save '%s'"
 
-#: ../widgets/misc/e-attachment.c:2724
+#: ../widgets/misc/e-attachment.c:2725
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Could not save the attachment"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:359
+#: ../widgets/misc/e-buffer-tagger.c:362
 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:1258
+#: ../widgets/misc/e-calendar-item.c:1259
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21039,52 +20814,52 @@ msgstr "Enter the character set to use"
 msgid "Other..."
 msgstr "Otherâ?¦"
 
-#: ../widgets/misc/e-dateedit.c:505
+#: ../widgets/misc/e-dateedit.c:507
 msgid "Date and Time"
 msgstr "Date and Time"
 
-#: ../widgets/misc/e-dateedit.c:526
+#: ../widgets/misc/e-dateedit.c:528
 msgid "Text entry to input date"
 msgstr "Text entry to input date"
 
-#: ../widgets/misc/e-dateedit.c:548
+#: ../widgets/misc/e-dateedit.c:550
 msgid "Click this button to show a calendar"
 msgstr "Click this button to show a calendar"
 
-#: ../widgets/misc/e-dateedit.c:594
+#: ../widgets/misc/e-dateedit.c:605
 msgid "Drop-down combination box to select time"
 msgstr "Drop-down combination box to select time"
 
-#: ../widgets/misc/e-dateedit.c:666
+#: ../widgets/misc/e-dateedit.c:677
 msgid "No_w"
 msgstr "No_w"
 
-#: ../widgets/misc/e-dateedit.c:672
+#: ../widgets/misc/e-dateedit.c:683
 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:680
+#: ../widgets/misc/e-dateedit.c:691
 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:1685 ../widgets/misc/e-dateedit.c:1917
+#: ../widgets/misc/e-dateedit.c:1698 ../widgets/misc/e-dateedit.c:1930
 msgctxt "date"
 msgid "None"
 msgstr "None"
 
-#: ../widgets/misc/e-dateedit.c:1812
+#: ../widgets/misc/e-dateedit.c:1825
 msgid "Invalid Date Value"
 msgstr "Invalid Date Value"
 
-#: ../widgets/misc/e-dateedit.c:1856
+#: ../widgets/misc/e-dateedit.c:1869
 msgid "Invalid Time Value"
 msgstr "Invalid Time Value"
 
-#: ../widgets/misc/e-import-assistant.c:249
+#: ../widgets/misc/e-import-assistant.c:252
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -21092,37 +20867,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:266
+#: ../widgets/misc/e-import-assistant.c:269
 msgid "F_ilename:"
 msgstr "F_ilename:"
 
-#: ../widgets/misc/e-import-assistant.c:276
+#: ../widgets/misc/e-import-assistant.c:279
 msgid "Select a file"
 msgstr "Select a file"
 
-#: ../widgets/misc/e-import-assistant.c:290
-#: ../widgets/misc/e-import-assistant.c:465
+#: ../widgets/misc/e-import-assistant.c:293
+#: ../widgets/misc/e-import-assistant.c:468
 msgid "File _type:"
 msgstr "File _type:"
 
-#: ../widgets/misc/e-import-assistant.c:333
-#: ../widgets/misc/e-import-assistant.c:916
+#: ../widgets/misc/e-import-assistant.c:336
+#: ../widgets/misc/e-import-assistant.c:912
 msgid "Choose the destination for this import"
 msgstr "Choose the destination for this import"
 
-#: ../widgets/misc/e-import-assistant.c:358
+#: ../widgets/misc/e-import-assistant.c:361
 msgid "Choose the type of importer to run:"
 msgstr "Choose the type of importer to run:"
 
-#: ../widgets/misc/e-import-assistant.c:366
+#: ../widgets/misc/e-import-assistant.c:369
 msgid "Import data and settings from _older programs"
 msgstr "Import data and settings from _older programs"
 
-#: ../widgets/misc/e-import-assistant.c:374
+#: ../widgets/misc/e-import-assistant.c:377
 msgid "Import a _single file"
 msgstr "Import a _single file"
 
-#: ../widgets/misc/e-import-assistant.c:526
+#: ../widgets/misc/e-import-assistant.c:529
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21133,37 +20908,37 @@ msgstr ""
 "like to try again, please click the \"Back\" button."
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:773
+#: ../widgets/misc/e-import-assistant.c:769
 msgid "_Cancel Import"
 msgstr "_Cancel Import"
 
-#: ../widgets/misc/e-import-assistant.c:915
+#: ../widgets/misc/e-import-assistant.c:911
 msgid "Preview data to be imported"
 msgstr "Preview data to be imported"
 
-#: ../widgets/misc/e-import-assistant.c:921
-#: ../widgets/misc/e-import-assistant.c:934
-#: ../widgets/misc/e-import-assistant.c:1284
-#: ../widgets/misc/e-import-assistant.c:1350
-#: ../widgets/misc/e-import-assistant.c:1359
+#: ../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
 msgid "Import Data"
 msgstr "Import Data"
 
-#: ../widgets/misc/e-import-assistant.c:929
+#: ../widgets/misc/e-import-assistant.c:925
 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:1274
-#: ../widgets/misc/e-import-assistant.c:1308
+#: ../widgets/misc/e-import-assistant.c:1270
+#: ../widgets/misc/e-import-assistant.c:1304
 msgid "Evolution Import Assistant"
 msgstr "Evolution Import Assistant"
 
-#: ../widgets/misc/e-import-assistant.c:1291
-#: ../widgets/misc/e-import-assistant.c:1338
+#: ../widgets/misc/e-import-assistant.c:1287
+#: ../widgets/misc/e-import-assistant.c:1334
 msgid "Import Location"
 msgstr "Import Location"
 
-#: ../widgets/misc/e-import-assistant.c:1302
+#: ../widgets/misc/e-import-assistant.c:1298
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21173,27 +20948,27 @@ msgstr ""
 "With this assistant you will be guided through the process of importing "
 "external files into Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1316
+#: ../widgets/misc/e-import-assistant.c:1312
 msgid "Importer Type"
 msgstr "Importer Type"
 
-#: ../widgets/misc/e-import-assistant.c:1324
+#: ../widgets/misc/e-import-assistant.c:1320
 msgid "Select Information to Import"
 msgstr "Select Information to Import"
 
-#: ../widgets/misc/e-import-assistant.c:1331
+#: ../widgets/misc/e-import-assistant.c:1327
 msgid "Select a File"
 msgstr "Select a File"
 
-#: ../widgets/misc/e-import-assistant.c:1345
+#: ../widgets/misc/e-import-assistant.c:1341
 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:557
+#: ../widgets/misc/e-map.c:752
 msgid "World Map"
 msgstr "World Map"
 
-#: ../widgets/misc/e-map.c:559
+#: ../widgets/misc/e-map.c:754
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21213,52 +20988,52 @@ msgstr "Evolution is currently offline.  Click this button to work online."
 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:278
+#: ../widgets/misc/e-preferences-window.c:281
 msgid "Evolution Preferences"
 msgstr "Evolution Preferences"
 
-#: ../widgets/misc/e-search-bar.c:81
+#: ../widgets/misc/e-search-bar.c:82
 #, c-format
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: ../widgets/misc/e-search-bar.c:557
+#: ../widgets/misc/e-search-bar.c:560
 msgid "Close the find bar"
 msgstr "Close the find bar"
 
-#: ../widgets/misc/e-search-bar.c:565
+#: ../widgets/misc/e-search-bar.c:568
 msgid "Fin_d:"
 msgstr "Fin_d:"
 
-#: ../widgets/misc/e-search-bar.c:577
+#: ../widgets/misc/e-search-bar.c:580
 msgid "Clear the search"
 msgstr "Clear the search"
 
-#: ../widgets/misc/e-search-bar.c:600
+#: ../widgets/misc/e-search-bar.c:604
 msgid "_Previous"
 msgstr "_Previous"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:610
 msgid "Find the previous occurrence of the phrase"
 msgstr "Find the previous occurrence of the phrase"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:623
 msgid "_Next"
 msgstr "_Next"
 
-#: ../widgets/misc/e-search-bar.c:622
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Find the next occurrence of the phrase"
 msgstr "Find the next occurrence of the phrase"
 
-#: ../widgets/misc/e-search-bar.c:632
+#: ../widgets/misc/e-search-bar.c:642
 msgid "Mat_ch case"
 msgstr "Mat_ch case"
 
-#: ../widgets/misc/e-search-bar.c:660
+#: ../widgets/misc/e-search-bar.c:670
 msgid "Reached bottom of page, continued from top"
 msgstr "Reached bottom of page, continued from top"
 
-#: ../widgets/misc/e-search-bar.c:682
+#: ../widgets/misc/e-search-bar.c:692
 msgid "Reached top of page, continued from bottom"
 msgstr "Reached top of page, continued from bottom"
 
@@ -21331,6 +21106,10 @@ msgstr "R_eply requested"
 msgid "Return Notification"
 msgstr "Return Notification"
 
+#: ../widgets/misc/e-send-options.ui.h:21
+msgid "Secret"
+msgstr "Secret"
+
 #: ../widgets/misc/e-send-options.ui.h:23
 msgid "Sta_tus Tracking"
 msgstr "Sta_tus Tracking"
@@ -21393,38 +21172,38 @@ msgctxt "send-options"
 msgid "None"
 msgstr "None"
 
-#: ../widgets/misc/e-signature-editor.c:136
-#: ../widgets/misc/e-signature-editor.c:524
-#: ../widgets/misc/e-signature-manager.c:353
-#: ../widgets/misc/e-signature-script-dialog.c:220
+#: ../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
 msgid "Unnamed"
 msgstr "Unnamed"
 
-#: ../widgets/misc/e-signature-editor.c:213
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_Save and Close"
 msgstr "_Save and Close"
 
-#: ../widgets/misc/e-signature-editor.c:391
+#: ../widgets/misc/e-signature-editor.c:430
 msgid "Edit Signature"
 msgstr "Edit Signature"
 
-#: ../widgets/misc/e-signature-editor.c:406
+#: ../widgets/misc/e-signature-editor.c:445
 msgid "_Signature Name:"
 msgstr "_Signature Name:"
 
-#: ../widgets/misc/e-signature-manager.c:298
+#: ../widgets/misc/e-signature-manager.c:300
 msgid "Add Signature Script"
 msgstr "Add Signature Script"
 
-#: ../widgets/misc/e-signature-manager.c:363
+#: ../widgets/misc/e-signature-manager.c:365
 msgid "Edit Signature Script"
 msgstr "Edit Signature Script"
 
-#: ../widgets/misc/e-signature-manager.c:579
+#: ../widgets/misc/e-signature-manager.c:583
 msgid "Add _Script"
 msgstr "Add _Script"
 
-#: ../widgets/misc/e-signature-script-dialog.c:270
+#: ../widgets/misc/e-signature-script-dialog.c:269
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -21434,11 +21213,11 @@ msgstr ""
 "signature. The name you specify will be used\n"
 "for display purposes only."
 
-#: ../widgets/misc/e-signature-script-dialog.c:315
+#: ../widgets/misc/e-signature-script-dialog.c:314
 msgid "S_cript:"
 msgstr "S_cript:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:346
+#: ../widgets/misc/e-signature-script-dialog.c:345
 msgid "Script file must be executable."
 msgstr "Script file must be executable."
 
@@ -21446,41 +21225,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:374
+#: ../widgets/misc/e-web-view.c:373
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: ../widgets/misc/e-web-view.c:376
+#: ../widgets/misc/e-web-view.c:375
 msgid "Copy the link to the clipboard"
 msgstr "Copy the link to the clipboard"
 
-#: ../widgets/misc/e-web-view.c:384
+#: ../widgets/misc/e-web-view.c:383
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: ../widgets/misc/e-web-view.c:386
+#: ../widgets/misc/e-web-view.c:385
 msgid "Open the link in a web browser"
 msgstr "Open the link in a web browser"
 
-#: ../widgets/misc/e-web-view.c:394
+#: ../widgets/misc/e-web-view.c:393
 msgid "_Copy Email Address"
 msgstr "_Copy E-mail Address"
 
-#: ../widgets/misc/e-web-view.c:423 ../widgets/misc/e-web-view.c:1078
+#: ../widgets/misc/e-web-view.c:422 ../widgets/misc/e-web-view.c:1077
 msgid "Select all text and images"
 msgstr "Select all text and images"
 
-#: ../widgets/misc/e-web-view.c:855 ../widgets/misc/e-web-view.c:857
-#: ../widgets/misc/e-web-view.c:859
+#: ../widgets/misc/e-web-view.c:854 ../widgets/misc/e-web-view.c:856
+#: ../widgets/misc/e-web-view.c:858
 #, c-format
 msgid "Click to call %s"
 msgstr "Click to call %s"
 
-#: ../widgets/misc/e-web-view.c:861
+#: ../widgets/misc/e-web-view.c:860
 msgid "Click to hide/unhide addresses"
 msgstr "Click to hide/unhide addresses"
 
-#: ../widgets/misc/e-web-view.c:863
+#: ../widgets/misc/e-web-view.c:862
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
@@ -21499,25 +21278,25 @@ msgstr "Calendar: from %s to %s"
 msgid "evolution calendar item"
 msgstr "evolution calendar item"
 
-#: ../widgets/table/e-cell-combo.c:174
+#: ../widgets/table/e-cell-combo.c:177
 msgid "popup list"
 msgstr "popup list"
 
-#: ../widgets/table/e-cell-date-edit.c:300
+#: ../widgets/table/e-cell-date-edit.c:303
 msgid "Now"
 msgstr "Now"
 
 #. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:317
+#: ../widgets/table/e-cell-date-edit.c:320
 msgctxt "table-date"
 msgid "None"
 msgstr "None"
 
-#: ../widgets/table/e-cell-date-edit.c:325
+#: ../widgets/table/e-cell-date-edit.c:328
 msgid "OK"
 msgstr "OK"
 
-#: ../widgets/table/e-cell-date-edit.c:869
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "The time must be in the format: %s"
@@ -21532,28 +21311,28 @@ msgstr "The percent value must be between 0 and 100, inclusive"
 msgid "click to add"
 msgstr "click to add"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(Ascending)"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(Descending)"
 
-#: ../widgets/table/e-table-config.c:388
+#: ../widgets/table/e-table-config.c:392
 msgid "Not sorted"
 msgstr "Not sorted"
 
-#: ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:433
 msgid "No grouping"
 msgstr "No grouping"
 
-#: ../widgets/table/e-table-config.c:647
+#: ../widgets/table/e-table-config.c:654
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Show Fields"
 
-#: ../widgets/table/e-table-config.c:667
+#: ../widgets/table/e-table-config.c:674
 msgid "Available Fields"
 msgstr "Available Fields"
 
@@ -21562,7 +21341,7 @@ msgid "A_vailable Fields:"
 msgstr "A_vailable Fields:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1668
 msgid "Ascending"
 msgstr "Ascending"
 
@@ -21575,7 +21354,7 @@ msgid "Clear _All"
 msgstr "Clear _All"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1668
 msgid "Descending"
 msgstr "Descending"
 
@@ -21654,7 +21433,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:351
+#: ../widgets/table/e-table-group-container.c:354
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -21667,80 +21446,75 @@ 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:363
+#: ../widgets/table/e-table-group-container.c:366
 #, 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:1546
+#: ../widgets/table/e-table-header-item.c:1512
 msgid "Customize Current View"
 msgstr "Customise Current View"
 
-#: ../widgets/table/e-table-header-item.c:1567
+#: ../widgets/table/e-table-header-item.c:1533
 msgid "Sort _Ascending"
 msgstr "Sort _Ascending"
 
-#: ../widgets/table/e-table-header-item.c:1570
+#: ../widgets/table/e-table-header-item.c:1536
 msgid "Sort _Descending"
 msgstr "Sort _Descending"
 
-#: ../widgets/table/e-table-header-item.c:1573
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Unsort"
 msgstr "_Unsort"
 
-#: ../widgets/table/e-table-header-item.c:1576
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "Group By This _Field"
 msgstr "Group By This _Field"
 
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1545
 msgid "Group By _Box"
 msgstr "Group By _Box"
 
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1549
 msgid "Remove This _Column"
 msgstr "Remove This _Column"
 
-#: ../widgets/table/e-table-header-item.c:1586
+#: ../widgets/table/e-table-header-item.c:1552
 msgid "Add a C_olumn..."
 msgstr "Add a C_olumnâ?¦"
 
-#: ../widgets/table/e-table-header-item.c:1590
+#: ../widgets/table/e-table-header-item.c:1556
 msgid "A_lignment"
 msgstr "A_lignment"
 
-#: ../widgets/table/e-table-header-item.c:1593
+#: ../widgets/table/e-table-header-item.c:1559
 msgid "B_est Fit"
 msgstr "B_est Fit"
 
-#: ../widgets/table/e-table-header-item.c:1596
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Format Column_s..."
 msgstr "Format Column_sâ?¦"
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1566
 msgid "Custo_mize Current View..."
 msgstr "Custo_mise Current Viewâ?¦"
 
-#: ../widgets/table/e-table-header-item.c:1659
+#: ../widgets/table/e-table-header-item.c:1625
 msgid "_Sort By"
 msgstr "_Sort By"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1677
+#: ../widgets/table/e-table-header-item.c:1643
 msgid "_Custom"
 msgstr "_Custom"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:123
+#: ../widgets/table/gal-a11y-e-cell-popup.c:126
 msgid "popup a child"
 msgstr "pop up a child"
 
-#. Translators: description of an "edit" action
-#: ../widgets/table/gal-a11y-e-cell-text.c:618
-msgid "begin editing this cell"
-msgstr "begin editing this cell"
-
 #. Translators: description of a "toggle" action
 #: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
@@ -21768,14 +21542,542 @@ msgstr "click"
 msgid "sort"
 msgstr "sort"
 
-#: ../widgets/text/e-text.c:2536
+#: ../widgets/text/e-text.c:2289
 msgid "Select All"
 msgstr "Select All"
 
-#: ../widgets/text/e-text.c:2548
+#: ../widgets/text/e-text.c:2301
 msgid "Input Methods"
 msgstr "Input Methods"
 
+#~ msgid "Count of default recurrence for a new event. -1 means forever."
+#~ msgstr "Count of default recurrence for a new event. -1 means forever."
+
+#~ msgid "Default recurrence count"
+#~ msgstr "Default recurrence count"
+
+#~ msgid "Event Gradient"
+#~ msgstr "Event Gradient"
+
+#~ msgid "Event Transparency"
+#~ msgstr "Event Transparency"
+
+#~ msgid "Gradient of the events in calendar views."
+#~ msgstr "Gradient of the events in calendar views."
+
+#~ msgid ""
+#~ "Transparency of the events in calendar views, a value between 0 "
+#~ "(transparent) and 1 (opaque)."
+#~ msgstr ""
+#~ "Transparency of the events in calendar views, a value between 0 "
+#~ "(transparent) and 1 (opaque)."
+
+#~ msgid "URI of the highlighted (\"primary\") calendar"
+#~ msgstr "URI of the highlighted (\"primary\") calendar"
+
+#~ msgid "URI of the highlighted (\"primary\") memo list"
+#~ msgstr "URI of the highlighted (\"primary\") memo list"
+
+#~ msgid "URI of the highlighted (\"primary\") task list"
+#~ msgstr "URI of the highlighted (\"primary\") task list"
+
+#~ msgid "Recurring:"
+#~ msgstr "Recurring:"
+
+#~ msgid "Yes. (Complex Recurrence)"
+#~ msgstr "Yes. (Complex Recurrence)"
+
+#~ msgid "Every day"
+#~ msgid_plural "Every %d days"
+#~ msgstr[0] "Every day"
+#~ msgstr[1] "Every %d days"
+
+#~ msgid "Every week"
+#~ msgid_plural "Every %d weeks"
+#~ msgstr[0] "Every week"
+#~ msgstr[1] "Every %d weeks"
+
+#~ msgid "Every week on "
+#~ msgid_plural "Every %d weeks on "
+#~ msgstr[0] "Every week on "
+#~ msgstr[1] "Every %d weeks on "
+
+#~ msgid " and "
+#~ msgstr " and "
+
+#~ msgid "The %s day of "
+#~ msgstr "The %s day of "
+
+#~ msgid "The %s %s of "
+#~ msgstr "The %s %s of "
+
+#~ msgid "every month"
+#~ msgid_plural "every %d months"
+#~ msgstr[0] "every month"
+#~ msgstr[1] "every %d months"
+
+#~ msgid "Every year"
+#~ msgid_plural "Every %d years"
+#~ msgstr[0] "Every year"
+#~ msgstr[1] "Every %d years"
+
+#~ msgid "a total of %d time"
+#~ msgid_plural "a total of %d times"
+#~ msgstr[0] "a total of %d time"
+#~ msgstr[1] "a total of %d times"
+
+#~ msgid ", ending on "
+#~ msgstr ", ending on "
+
+#~ msgid "Starts"
+#~ msgstr "Starts"
+
+#~ msgid "Ends"
+#~ msgstr "Ends"
+
+#~ msgid "iCalendar Information"
+#~ msgstr "iCalendar Information"
+
+#~ msgid "iCalendar Error"
+#~ msgstr "iCalendar Error"
+
+#~ msgid ""
+#~ "Please review the following information, and then select an action from "
+#~ "the menu below."
+#~ msgstr ""
+#~ "Please review the following information, and then select an action from "
+#~ "the menu below."
+
+#~ msgid ""
+#~ "The meeting has been canceled, however it could not be found in your "
+#~ "calendars"
+#~ msgstr ""
+#~ "The meeting has been cancelled, however it could not be found in your "
+#~ "calendars"
+
+#~ msgid ""
+#~ "The task has been canceled, however it could not be found in your task "
+#~ "lists"
+#~ msgstr ""
+#~ "The task has been cancelled, however it could not be found in your task "
+#~ "lists"
+
+#~ msgid "%s has published meeting information."
+#~ msgstr "%s has published meeting information."
+
+#~ msgid "Meeting Information"
+#~ msgstr "Meeting Information"
+
+#~ msgid "%s requests the presence of %s at a meeting."
+#~ msgstr "%s requests the presence of %s at a meeting."
+
+#~ msgid "%s requests your presence at a meeting."
+#~ msgstr "%s requests your presence at a meeting."
+
+#~ msgid "Meeting Proposal"
+#~ msgstr "Meeting Proposal"
+
+#~ msgid "%s wishes to be added to an existing meeting."
+#~ msgstr "%s wishes to be added to an existing meeting."
+
+#~ msgid "Meeting Update"
+#~ msgstr "Meeting Update"
+
+#~ msgid "%s wishes to receive the latest meeting information."
+#~ msgstr "%s wishes to receive the latest meeting information."
+
+#~ msgid "Meeting Update Request"
+#~ msgstr "Meeting Update Request"
+
+#~ msgid "%s has replied to a meeting request."
+#~ msgstr "%s has replied to a meeting request."
+
+#~ msgid "Meeting Reply"
+#~ msgstr "Meeting Reply"
+
+#~ msgid "%s has canceled a meeting."
+#~ msgstr "%s has cancelled a meeting."
+
+#~ msgid "Meeting Cancelation"
+#~ msgstr "Meeting Cancellation"
+
+#~ msgid "%s has sent an unintelligible message."
+#~ msgstr "%s has sent an unintelligible message."
+
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Bad Meeting Message"
+
+#~ msgid "%s has published task information."
+#~ msgstr "%s has published task information."
+
+#~ msgid "Task Information"
+#~ msgstr "Task Information"
+
+#~ msgid "%s requests %s to perform a task."
+#~ msgstr "%s requests %s to perform a task."
+
+#~ msgid "%s requests you perform a task."
+#~ msgstr "%s requests you perform a task."
+
+#~ msgid "Task Proposal"
+#~ msgstr "Task Proposal"
+
+#~ msgid "%s wishes to be added to an existing task."
+#~ msgstr "%s wishes to be added to an existing task."
+
+#~ msgid "Task Update"
+#~ msgstr "Task Update"
+
+#~ msgid "%s wishes to receive the latest task information."
+#~ msgstr "%s wishes to receive the latest task information."
+
+#~ msgid "Task Update Request"
+#~ msgstr "Task Update Request"
+
+#~ msgid "%s has replied to a task assignment."
+#~ msgstr "%s has replied to a task assignment."
+
+#~ msgid "Task Reply"
+#~ msgstr "Task Reply"
+
+#~ msgid "%s has canceled a task."
+#~ msgstr "%s has cancelled a task."
+
+#~ msgid "Task Cancelation"
+#~ msgstr "Task Cancellation"
+
+#~ msgid "Bad Task Message"
+#~ msgstr "Bad Task Message"
+
+#~ msgid "%s has published free/busy information."
+#~ msgstr "%s has published free/busy information."
+
+#~ msgid "Free/Busy Information"
+#~ msgstr "Free/Busy Information"
+
+#~ msgid "%s requests your free/busy information."
+#~ msgstr "%s requests your free/busy information."
+
+#~ msgid "Free/Busy Request"
+#~ msgstr "Free/Busy Request"
+
+#~ msgid "%s has replied to a free/busy request."
+#~ msgstr "%s has replied to a free/busy request."
+
+#~ msgid "Free/Busy Reply"
+#~ msgstr "Free/Busy Reply"
+
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Bad Free/Busy Message"
+
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "The message does not appear to be properly formed"
+
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "The message contains only unsupported requests."
+
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "The attachment has no viewable calendar items"
+
+#~ msgid "Update complete\n"
+#~ msgstr "Update complete\n"
+
+#~ msgid "Object is invalid and cannot be updated\n"
+#~ msgstr "Object is invalid and cannot be updated\n"
+
+#~ msgid "This response is not from a current attendee.  Add as an attendee?"
+#~ msgstr "This response is not from a current attendee.  Add as an attendee?"
+
+#~ msgid "Attendee status could not be updated because of an invalid status!\n"
+#~ msgstr ""
+#~ "Attendee status could not be updated because of an invalid status!\n"
+
+#~ msgid "Attendee status updated\n"
+#~ msgstr "Attendee status updated\n"
+
+#~ msgid "Item sent!\n"
+#~ msgstr "Item sent!\n"
+
+#~ msgid "The item could not be sent!\n"
+#~ msgstr "The item could not be sent!\n"
+
+#~ msgid "Choose an action:"
+#~ msgstr "Choose an action:"
+
+#~ msgid "Update"
+#~ msgstr "Update"
+
+#~ msgid "Tentatively accept"
+#~ msgstr "Tentatively accept"
+
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "Send Free/Busy Information"
+
+#~ msgid "Update respondent status"
+#~ msgstr "Update respondent status"
+
+#~ msgid "Send Latest Information"
+#~ msgstr "Send Latest Information"
+
+#~ msgid "--to--"
+#~ msgstr "--to--"
+
+#~ msgid "Calendar Message"
+#~ msgstr "Calendar Message"
+
+#~ msgid "Date:"
+#~ msgstr "Date:"
+
+#~ msgid "Loading Calendar"
+#~ msgstr "Loading Calendar"
+
+#~ msgid "Loading calendar..."
+#~ msgstr "Loading calendarâ?¦"
+
+#~ msgid "Organizer:"
+#~ msgstr "Organiser:"
+
+#~ msgid "Server Message:"
+#~ msgstr "Server Message:"
+
+#~ msgid "Could not create composer window."
+#~ msgstr "Could not create composer window."
+
+#~ msgid ""
+#~ "Unable to activate the HTML editor control.\n"
+#~ "\n"
+#~ "Please make sure that you have the correct version of gtkhtml and "
+#~ "libgtkhtml installed."
+#~ msgstr ""
+#~ "Unable to activate the HTML editor control.\n"
+#~ "\n"
+#~ "Please make sure that you have the correct version of gtkhtml and "
+#~ "libgtkhtml installed."
+
+#~ msgid "Unable to activate the address selector control."
+#~ msgstr "Unable to activate the address selector control."
+
+#~ msgid "%s..."
+#~ msgstr "%sâ?¦"
+
+#~ msgid "Evolution Error"
+#~ msgstr "Evolution Error"
+
+#~ msgid "Evolution Warning"
+#~ msgstr "Evolution Warning"
+
+#~ msgid "Internal error, unknown error '%s' requested"
+#~ msgstr "Internal error, unknown error '%s' requested"
+
+#~ msgid "%d day from now"
+#~ msgid_plural "%d days from now"
+#~ msgstr[0] "%d day from now"
+#~ msgstr[1] "%d days from now"
+
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%d day ago"
+#~ msgstr[1] "%d days ago"
+
+#~ msgid "Debug Logs"
+#~ msgstr "Debug Logs"
+
+#~ msgid "Show _errors in the status bar for"
+#~ msgstr "Show _errors in the status bar for"
+
+#~ msgid "second(s)."
+#~ msgstr "second(s)."
+
+#~ msgid "Log Messages:"
+#~ msgstr "Log Messages:"
+
+#~ msgid "Log Level"
+#~ msgstr "Log Level"
+
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#~ msgid "Errors"
+#~ msgstr "Errors"
+
+#~ msgid "Warnings and Errors"
+#~ msgstr "Warnings and Errors"
+
+#~ msgid "Debug"
+#~ msgstr "Debug"
+
+#~ msgid "Error, Warnings and Debug messages"
+#~ msgstr "Error, Warnings and Debug messages"
+
+#~ msgid "%s License Agreement"
+#~ msgstr "%s Licence Agreement"
+
+#~ msgid ""
+#~ "\n"
+#~ "Please read carefully the license agreement\n"
+#~ "for %s displayed below\n"
+#~ "and tick the check box for accepting it\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Please read carefully the licence agreement\n"
+#~ "for %s displayed below\n"
+#~ "and tick the check box for accepting it\n"
+
+#~ msgid "This store does not support subscriptions, or they are not enabled."
+#~ msgstr "This store does not support subscriptions, or they are not enabled."
+
+#~ msgid "Subscribed"
+#~ msgstr "Subscribed"
+
+#~ msgid "Folder"
+#~ msgstr "Folder"
+
+#~ msgid "Please select a server."
+#~ msgstr "Please select a server."
+
+#~ msgid "No server has been selected"
+#~ msgstr "No server has been selected"
+
+#~ msgid "Default height of the subscribe dialog."
+#~ msgstr "Default height of the subscribe dialogue."
+
+#~ msgid "Default width of the subscribe dialog."
+#~ msgstr "Default width of the subscribe dialogue."
+
+#~ msgid "Subscribe dialog default height"
+#~ msgstr "Subscribe dialogue default height"
+
+#~ msgid "Subscribe dialog default width"
+#~ msgstr "Subscribe dialogue default width"
+
+#~ msgid "(Not Recommended)"
+#~ msgstr "(Not Recommended)"
+
+#~ msgid "(Note: Requires restart of the application)"
+#~ msgstr "(Note: Requires restart of the application)"
+
+#~ msgid "Checks incoming mail messages to be Junk"
+#~ msgstr "Checks incoming mail messages to be Junk"
+
+#~ msgid "Do not display messages when text si_ze exceeds"
+#~ msgstr "Do not display messages when text si_ze exceeds"
+
+#~ msgid "Enable Magic S_pacebar"
+#~ msgstr "Enable Magic S_pacebar"
+
+#~ msgid "Enable Sea_rch Folders"
+#~ msgstr "Enable Sea_rch Folders"
+
+#~ msgid "Fi_xed-width:"
+#~ msgstr "Fi_xed-width:"
+
+#~ msgid "Font Properties"
+#~ msgstr "Font Properties"
+
+#~ msgid "KB"
+#~ msgstr "KB"
+
+#~ msgid "Message Fonts"
+#~ msgstr "Message Fonts"
+
+#~ msgid ""
+#~ "Note: you will not be prompted for a password until you connect for the "
+#~ "first time"
+#~ msgstr ""
+#~ "Note: you will not be prompted for a password until you connect for the "
+#~ "first time"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "Printed Fonts"
+
+#~ msgid "Prompt when sending replies to _many recipients"
+#~ msgstr "Prompt when sending replies to _many recipients"
+
+#~ msgid "Select Drafts Folder"
+#~ msgstr "Select Drafts Folder"
+
+#~ msgid "Select HTML fixed width font for printing"
+#~ msgstr "Select HTML fixed width font for printing"
+
+#~ msgid "Select HTML variable width font for printing"
+#~ msgstr "Select HTML variable width font for printing"
+
+#~ msgid "Select Junk Folder"
+#~ msgstr "Select Junk Folder"
+
+#~ msgid "Select Sent Folder"
+#~ msgstr "Select Sent Folder"
+
+#~ msgid "Select Trash Folder"
+#~ msgstr "Select Wastebasket Folder"
+
+#~ msgid "Sending Mail"
+#~ msgstr "Sending Mail"
+
+#~ msgid "Sent and Draft Messages"
+#~ msgstr "Sent and Draft Messages"
+
+#~ msgid "Top Posting Option"
+#~ msgstr "Top Posting Option"
+
+#~ msgid "V_ariable-width:"
+#~ msgstr "V_ariable-width:"
+
+#~ msgid "_Mark messages as read after"
+#~ msgstr "_Mark messages as read after"
+
+#~ msgid "_Show image animations"
+#~ msgstr "_Show image animations"
+
+#~ msgid "_Shrink To / Cc / Bcc headers to "
+#~ msgstr "_Shrink To / Cc / Bcc headers to "
+
+#~ msgid "addresses"
+#~ msgstr "addresses"
+
+#~ msgid "S_erver:"
+#~ msgstr "S_erver:"
+
+#~ msgid ""
+#~ "Cannot create output file: %s:\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Cannot create output file: %s:\n"
+#~ " %s"
+
+#~ msgid "Could not write data: "
+#~ msgstr "Could not write data: "
+
+#~ msgid "_Backup Evolution Settings..."
+#~ msgstr "_Back Up Evolution Settingsâ?¦"
+
+#~ msgid "R_estore Evolution Settings..."
+#~ msgstr "R_estore Evolution Settingsâ?¦"
+
+#~ msgid "_Sharing"
+#~ msgstr "_Sharing"
+
+#~ msgid "Evolution's Mail Notification"
+#~ msgstr "Evolution's Mail Notification"
+
+#~ msgid "Mail Notification Properties"
+#~ msgstr "Mail Notification Properties"
+
+#~ msgid "Manage your Evolution plugins."
+#~ msgstr "Manage your Evolution plugins."
+
+#~ msgid "Sort mail message threads by subject."
+#~ msgstr "Sort mail message threads by subject."
+
+#~ msgid "Subject Threading"
+#~ msgstr "Subject Threading"
+
+#~ msgid "Thread messages by subject"
+#~ msgstr "Thread messages by subject"
+
+#~ msgid "begin editing this cell"
+#~ msgstr "begin editing this cell"
+
 #~ msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
 #~ msgstr "<span size=\"large\" weight=\"bold\">Details:</span>"
 
@@ -22334,9 +22636,6 @@ msgstr "Input Methods"
 #~ msgid "Source List"
 #~ msgstr "Source List"
 
-#~ msgid "The registry of address books"
-#~ msgstr "The registry of address books"
-
 #~ msgid "Current View"
 #~ msgstr "Current View"
 
@@ -22508,9 +22807,6 @@ msgstr "Input Methods"
 #~ msgid "Temporarily hide all messages that have already been read"
 #~ msgstr "Temporarily hide all messages that have already been read"
 
-#~ msgid "Hide S_elected Messages"
-#~ msgstr "Hide S_elected Messages"
-
 #~ msgid "Temporarily hide the selected messages"
 #~ msgstr "Temporarily hide the selected messages"
 
@@ -22670,9 +22966,6 @@ msgstr "Input Methods"
 #~ msgid "Network Available"
 #~ msgstr "Network Available"
 
-#~ msgid "Whether the network is available"
-#~ msgstr "Whether the network is available"
-
 #~ msgid "Online"
 #~ msgstr "Online"
 
@@ -23347,9 +23640,6 @@ msgstr "Input Methods"
 #~ "directory individually, or create an archive of the directory and attach "
 #~ "it."
 
-#~ msgid "Unfinished messages found"
-#~ msgstr "Unfinished messages found"
-
 #~ msgid "Warning: Modified Message"
 #~ msgstr "Warning: Modified Message"
 
@@ -23649,9 +23939,6 @@ msgstr "Input Methods"
 #~ msgid "Open Other User's Folder"
 #~ msgstr "Open Other User's Folder"
 
-#~ msgid "_Account:"
-#~ msgstr "_Account:"
-
 #~ msgid "_Folder Name:"
 #~ msgstr "_Folder Name:"
 
@@ -23813,9 +24100,6 @@ msgstr "Input Methods"
 #~ msgid "Delegate To"
 #~ msgstr "Delegate To"
 
-#~ msgid "Remove the delegate %s?"
-#~ msgstr "Remove the delegate %s?"
-
 #~ msgid "Could not access Active Directory"
 #~ msgstr "Could not access Active Directory"
 
@@ -23897,9 +24181,6 @@ msgstr "Input Methods"
 #~ msgid "Unsubscribe Folder..."
 #~ msgstr "Unsubscribe Folderâ?¦"
 
-#~ msgid "Really unsubscribe from folder \"%s\"?"
-#~ msgstr "Really unsubscribe from folder \"%s\"?"
-
 #~ msgid "Unsubscribe from \"%s\""
 #~ msgstr "Unsubscribe from \"%s\""
 
@@ -25222,9 +25503,6 @@ msgstr "Input Methods"
 #~ msgid "Prefere_nces"
 #~ msgstr "Prefere_nces"
 
-#~ msgid "Send / Receive"
-#~ msgstr "Send / Receive"
-
 #~ msgid "Submit Bug Report"
 #~ msgstr "Submit Bug Report"
 
@@ -26238,9 +26516,6 @@ msgstr "Input Methods"
 #~ msgid "by %B %d, %Y, %l:%M %p"
 #~ msgstr "by %d %B, %Y, %l:%M %p"
 
-#~ msgid "Save attachment as"
-#~ msgstr "Save attachment as"
-
 #~ msgid "Select folder to save all attachments"
 #~ msgstr "Select folder to save all attachments"
 
@@ -26677,9 +26952,6 @@ msgstr "Input Methods"
 #~ msgid "VIP"
 #~ msgstr "VIP"
 
-#~ msgid "Waiting"
-#~ msgstr "Waiting"
-
 #~ msgid "Next 7 Days"
 #~ msgstr "Next 7 Days"
 
@@ -26853,9 +27125,6 @@ msgstr "Input Methods"
 #~ msgid "Do not quote original message"
 #~ msgstr "Do not quote original message"
 
-#~ msgid "Quote original message"
-#~ msgstr "Quote original message"
-
 #~ msgid "Enter a name for this signature."
 #~ msgstr "Enter a name for this signature."
 
@@ -26866,9 +27135,6 @@ msgstr "Input Methods"
 #~ "Are you sure you want to permanently remove all the deleted messages in "
 #~ "folder &quot;{0}&quot;?"
 
-#~ msgid "Delete &quot;{0}&quot;?"
-#~ msgstr "Delete &quot;{0}&quot;?"
-
 #~ msgid "Delete messages in Search Folder &quot;{0}&quot;?"
 #~ msgstr "Delete messages in Search Folder &quot;{0}&quot;?"
 
@@ -26959,9 +27225,6 @@ msgstr "Input Methods"
 #~ msgid "Remove folder from your list of subscribed folders"
 #~ msgstr "Remove folder from your list of subscribed folders"
 
-#~ msgid "Subscribe"
-#~ msgstr "Subscribe"
-
 #~ msgid "Unsubscribe"
 #~ msgstr "Unsubscribe"
 
@@ -27739,9 +28002,6 @@ msgstr "Input Methods"
 #~ msgid "T_erminal Font:"
 #~ msgstr "T_erminal Font:"
 
-#~ msgid "_Show animated images"
-#~ msgstr "_Show animated images"
-
 #~ msgid "_Subscribe"
 #~ msgstr "_Subscribe"
 



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