[evolution] Update British English translation



commit aedbbd9cd6c68be6be02f216a65b834679923c56
Author: David King <amigadave amigadave com>
Date:   Sun Sep 4 13:43:13 2016 +0200

    Update British English translation

 po/en_GB.po | 1953 ++++++++++++++++-------------------------------------------
 1 files changed, 535 insertions(+), 1418 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 49dc8a6..55b11a1 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -12,9 +12,9 @@ msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-08-15 07:31+0000\n"
-"PO-Revision-Date: 2016-08-30 00:29+0100\n"
-"Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
+"POT-Creation-Date: 2016-09-02 20:32+0000\n"
+"PO-Revision-Date: 2016-09-04 13:42+0200\n"
+"Last-Translator: David King <amigadave amigadave com>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
@@ -116,7 +116,6 @@ msgid "Category editor not available."
 msgstr "Category editor not available."
 
 #: ../addressbook/addressbook.error.xml.h:18
-#| msgid "Unable to open address book"
 msgid "Unable to open address book '{0}'"
 msgstr "Unable to open address book '{0}'"
 
@@ -125,7 +124,6 @@ msgid "Unable to perform search."
 msgstr "Unable to perform search."
 
 #: ../addressbook/addressbook.error.xml.h:20
-#| msgid "Delete address book '{0}'?"
 msgid "Failed to refresh address book '{0}'"
 msgstr "Failed to refresh address book '{0}'"
 
@@ -326,7 +324,6 @@ msgid "Telephone"
 msgstr "Telephone"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
-#| msgid "Address"
 msgid "SIP Address"
 msgstr "SIP Address"
 
@@ -345,7 +342,7 @@ msgstr "_Home Page:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 #: ../calendar/gui/e-comp-editor-event.c:729
-#: ../modules/itip-formatter/itip-view.c:2099
+#: ../modules/itip-formatter/itip-view.c:2033
 msgid "_Calendar:"
 msgstr "_Calendar:"
 
@@ -514,7 +511,6 @@ msgid "Notes"
 msgstr "Notes"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
-#| msgid "_Add "
 msgid "Add _PGP"
 msgstr "Add _PGP"
 
@@ -551,10 +547,10 @@ msgstr "_Load X.509"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3507
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
 #: ../addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/e-comp-editor.c:2106
+#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/e-comp-editor.c:2107
 #: ../composer/e-composer-actions.c:230 ../composer/e-composer-actions.c:347
-#: ../e-util/e-attachment-store.c:809
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3846
+#: ../e-util/e-attachment-store.c:831
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3863
 #: ../e-util/gal-view-instance-save-as-dialog.c:270
 #: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:137
 #: ../smime/gui/certificate-manager.c:668
@@ -568,7 +564,7 @@ msgid "Certificates"
 msgstr "Certificates"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
-#: ../calendar/gui/e-comp-editor.c:2003 ../calendar/gui/e-comp-editor.c:2075
+#: ../calendar/gui/e-comp-editor.c:2004 ../calendar/gui/e-comp-editor.c:2076
 #: ../e-util/e-preferences-window.c:382 ../e-util/e-send-options.ui.h:41
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
 #: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:955
@@ -598,12 +594,12 @@ msgstr "Options"
 #: ../calendar/gui/e-cal-dialogs.c:689
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:303
 #: ../composer/e-composer-actions.c:229 ../e-util/e-activity-bar.c:359
-#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:664
-#: ../e-util/e-attachment-store.c:808 ../e-util/e-attachment-view.c:303
+#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:666
+#: ../e-util/e-attachment-store.c:830 ../e-util/e-attachment-view.c:303
 #: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
 #: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
 #: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
-#: ../e-util/e-html-editor-actions.c:299 ../e-util/e-html-editor-actions.c:390
+#: ../e-util/e-html-editor-actions.c:323 ../e-util/e-html-editor-actions.c:414
 #: ../e-util/e-image-chooser-dialog.c:171
 #: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
 #: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
@@ -611,7 +607,7 @@ msgstr "Options"
 #: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
 #: ../e-util/e-source-selector-dialog.c:372 ../e-util/e-table-config.c:548
 #: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3845
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3862
 #: ../e-util/gal-view-instance-save-as-dialog.c:269
 #: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
 #: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
@@ -631,82 +627,70 @@ msgstr "Options"
 #: ../smime/gui/certificate-manager.c:968
 #: ../smime/gui/certificate-manager.c:1350 ../smime/gui/e-cert-selector.c:237
 #: ../smime/gui/smime-ui.ui.h:23
-#| msgid "Cancel"
 msgid "_Cancel"
 msgstr "_Cancel"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
-#| msgid "Telephone"
 msgid "Show Telephone"
 msgstr "Show Telephone"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
-#| msgid "_To This Address"
 msgid "Show SIP Address"
 msgstr "Show SIP Address"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
-#| msgid "Instant Messaging"
 msgid "Show Instant Messaging"
 msgstr "Show Instant Messaging"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
-#| msgid "Web Addresses"
 msgid "Show Web Addresses"
 msgstr "Show Web Addresses"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:66
-#| msgid "Show the second time zone"
 msgid "Show Job section"
 msgstr "Show Job section"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:67
-#| msgid "Miscellaneous"
 msgid "Show Miscellaneous"
 msgstr "Show Miscellaneous"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:68
-#| msgid "Mailing Address"
 msgid "Show Home Mailing Address"
 msgstr "Show Home Mailing Address"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:69
-#| msgid "Mailing Address"
 msgid "Show Work Mailing Address"
 msgstr "Show Work Mailing Address"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:70
-#| msgid "Mailing Address"
 msgid "Show Other Mailing Address"
 msgstr "Show Other Mailing Address"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:71
-#| msgid "Show %s"
 msgid "Show Notes"
 msgstr "Show Notes"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:72
-#| msgid "Certificates"
 msgid "Show Certificates"
 msgstr "Show Certificates"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../calendar/gui/e-comp-editor.c:2038 ../e-util/e-html-editor-actions.c:875
+#: ../calendar/gui/e-comp-editor.c:2039 ../e-util/e-html-editor-actions.c:899
 msgid "_Undo"
 msgstr "_Undo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/e-comp-editor.c:2040 ../e-util/e-focus-tracker.c:122
+#: ../calendar/gui/e-comp-editor.c:2041 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "Undo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../calendar/gui/e-comp-editor.c:2045 ../e-util/e-html-editor-actions.c:861
+#: ../calendar/gui/e-comp-editor.c:2046 ../e-util/e-html-editor-actions.c:885
 msgid "_Redo"
 msgstr "_Redo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/e-comp-editor.c:2047 ../e-util/e-focus-tracker.c:138
+#: ../calendar/gui/e-comp-editor.c:2048 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "Redo"
 
@@ -730,7 +714,6 @@ msgid "Contact Editor - %s"
 msgstr "Contact Editor — %s"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3240
-#| msgid "Certificates"
 msgid "X.509 certificates"
 msgstr "X.509 certificates"
 
@@ -745,19 +728,17 @@ msgid "All files"
 msgstr "All files"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
-#| msgid "OpenPGP _Key ID:"
 msgid "Open PGP key"
 msgstr "Open PGP key"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
-#| msgid "Select certificate"
 msgid "Open X.509 certificate"
 msgstr "Open X.509 certificate"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3274
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:4322
-#: ../e-util/e-attachment-store.c:662 ../e-util/e-category-editor.c:146
-#: ../e-util/e-html-editor-actions.c:300 ../e-util/e-html-editor-actions.c:391
+#: ../e-util/e-attachment-store.c:664 ../e-util/e-category-editor.c:146
+#: ../e-util/e-html-editor-actions.c:324 ../e-util/e-html-editor-actions.c:415
 #: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298
 #: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:969
 msgid "_Open"
@@ -765,13 +746,11 @@ msgstr "_Open"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3291
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3522
-#| msgid "Cannot attach file %s: not a regular file"
 msgid "Chosen file is not a local file."
 msgstr "Chosen file is not a local file."
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3304
 #, c-format
-#| msgid "Failed to import certificate"
 msgid "Failed to load certificate: %s"
 msgstr "Failed to load certificate: %s"
 
@@ -790,13 +769,11 @@ msgid "Save PGP key"
 msgstr "Save PGP key"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
-#| msgid "Select certificate"
 msgid "Save X.509 certificate"
 msgstr "Save X.509 certificate"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3534
 #, c-format
-#| msgid "Failed to import certificate"
 msgid "Failed to save certificate: %s"
 msgstr "Failed to save certificate: %s"
 
@@ -849,7 +826,7 @@ msgstr "Invalid contact."
 #: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
 #: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
 #: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
-#: ../e-util/e-html-editor-link-dialog.c:258 ../e-util/e-passwords.c:471
+#: ../e-util/e-html-editor-link-dialog.c:257 ../e-util/e-passwords.c:471
 #: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
 #: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:792
 #: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
@@ -864,7 +841,6 @@ msgstr "Invalid contact."
 #: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
 #: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1351
 #: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
-#| msgid "OK"
 msgid "_OK"
 msgstr "_OK"
 
@@ -1002,19 +978,16 @@ msgstr "_Top"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
 #: ../e-util/e-source-selector.c:3471 ../e-util/filter.ui.h:20
-#| msgid "_Update"
 msgid "_Up"
 msgstr "_Up"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
 #: ../e-util/e-source-selector.c:3472 ../e-util/filter.ui.h:21
-#| msgid "Move _Down"
 msgid "_Down"
 msgstr "_Down"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
 #: ../e-util/filter.ui.h:22
-#| msgid "Bottom:"
 msgid "_Bottom"
 msgstr "_Bottom"
 
@@ -1084,7 +1057,7 @@ msgid "Send a mail message to this address"
 msgstr "Send a mail message to this address"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view.c:1289
+#: ../e-util/e-web-view.c:1279
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
@@ -1094,7 +1067,6 @@ msgid "Open map"
 msgstr "Open map"
 
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:437
-#| msgid "VIP"
 msgid "SIP"
 msgstr "SIP"
 
@@ -1274,9 +1246,6 @@ msgid "Duplicate Contact Detected"
 msgstr "Duplicate Contact Detected"
 
 #: ../addressbook/gui/widgets/eab-contact-merging.c:771
-#| msgid ""
-#| "The name or email of this contact already exists in this folder. Would "
-#| "you like to save the changes anyway?"
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
@@ -1285,9 +1254,6 @@ msgstr ""
 "in this folder. Would you like to save the changes anyway?"
 
 #: ../addressbook/gui/widgets/eab-contact-merging.c:774
-#| msgid ""
-#| "The name or email address of this contact already exists\n"
-#| "in this folder.  Would you like to add it anyway?"
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
@@ -1308,7 +1274,6 @@ msgid "Conflicting Contact:"
 msgstr "Conflicting Contact:"
 
 #: ../addressbook/gui/widgets/eab-contact-merging.c:832
-#| msgid "Contact: "
 msgid "Old Contact:"
 msgstr "Old Contact:"
 
@@ -1494,13 +1459,13 @@ msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Are you sure you want to delete this contact (%s)?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1366
-#: ../calendar/gui/e-comp-editor.c:1996 ../e-util/e-focus-tracker.c:785
+#: ../calendar/gui/e-comp-editor.c:1997 ../e-util/e-focus-tracker.c:785
 #: ../e-util/evolution-source-viewer.c:805 ../mail/e-mail-account-manager.c:736
 #: ../modules/addressbook/e-book-shell-view-actions.c:1089
 #: ../modules/calendar/e-cal-shell-view-actions.c:1479
 #: ../modules/calendar/e-memo-shell-view-actions.c:678
 #: ../modules/calendar/e-task-shell-view-actions.c:832
-#: ../modules/mail/e-mail-shell-view-actions.c:1737
+#: ../modules/mail/e-mail-shell-view-actions.c:1752
 #: ../shell/e-shell-window-actions.c:813
 #: ../smime/gui/certificate-manager.c:1674 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
@@ -1694,7 +1659,6 @@ msgstr "Contacts Map"
 
 #. Zoom-in button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:412
-#| msgid "_Zoom In"
 msgid "Zoom _In"
 msgstr "Zoom _In"
 
@@ -1706,10 +1670,9 @@ msgstr "Zoom _Out"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:1834
+#: ../e-util/e-html-editor-actions.c:1858
 #: ../e-util/e-html-editor-find-dialog.c:252
 #: ../shell/e-shell-window-actions.c:890
-#| msgid "_Find Now"
 msgid "_Find"
 msgstr "_Find"
 
@@ -1781,7 +1744,6 @@ msgid "Importing..."
 msgstr "Importing…"
 
 #: ../addressbook/importers/evolution-csv-importer.c:929
-#| msgid "Can not open file"
 msgid "Can't open .csv file"
 msgstr "Can't open .csv file"
 
@@ -1810,7 +1772,6 @@ msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolution Contacts CSV and Tab Importer"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:719
-#| msgid "Can not open file"
 msgid "Can't open .ldif file"
 msgstr "Can't open .ldif file"
 
@@ -1838,97 +1799,81 @@ msgid "Page %d"
 msgstr "Page %d"
 
 #: ../addressbook/util/eab-book-util.c:36
-#| msgid "Work Email"
 msgctxt "addressbook-label"
 msgid "Work Email"
 msgstr "Work E-mail"
 
 #: ../addressbook/util/eab-book-util.c:37
-#| msgid "Home Email"
 msgctxt "addressbook-label"
 msgid "Home Email"
 msgstr "Home E-mail"
 
 #: ../addressbook/util/eab-book-util.c:38
-#| msgid "Other Email"
 msgctxt "addressbook-label"
 msgid "Other Email"
 msgstr "Other E-mail"
 
 #: ../addressbook/util/eab-book-util.c:44
-#| msgid "Work"
 msgctxt "addressbook-label"
 msgid "Work SIP"
 msgstr "Work SIP"
 
 #: ../addressbook/util/eab-book-util.c:45
-#| msgid "Home Page"
 msgctxt "addressbook-label"
 msgid "Home SIP"
 msgstr "Home SIP"
 
 #: ../addressbook/util/eab-book-util.c:46
-#| msgid "Other"
 msgctxt "addressbook-label"
 msgid "Other SIP"
 msgstr "Other SIP"
 
 #: ../addressbook/util/eab-book-util.c:74
-#| msgid "AIM"
 msgctxt "addressbook-label"
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/util/eab-book-util.c:75
-#| msgid "Jabber"
 msgctxt "addressbook-label"
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/util/eab-book-util.c:76
-#| msgid "Yahoo"
 msgctxt "addressbook-label"
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/util/eab-book-util.c:77
-#| msgid "Gadu-Gadu"
 msgctxt "addressbook-label"
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/util/eab-book-util.c:78
-#| msgid "MSN"
 msgctxt "addressbook-label"
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/util/eab-book-util.c:79
-#| msgid "ICQ"
 msgctxt "addressbook-label"
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/util/eab-book-util.c:80
-#| msgid "GroupWise"
 msgctxt "addressbook-label"
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/util/eab-book-util.c:81
-#| msgid "Skype"
 msgctxt "addressbook-label"
 msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/util/eab-book-util.c:82
-#| msgid "Twitter"
 msgctxt "addressbook-label"
 msgid "Twitter"
 msgstr "Twitter"
 
 #: ../addressbook/util/eab-book-util.c:83
-#| msgid "Google"
 msgctxt "addressbook-label"
 msgid "Google Talk"
 msgstr "Google Talk"
@@ -1938,7 +1883,6 @@ msgstr "Google Talk"
 #. * this generic label is used instead of one of the predefined labels.
 #.
 #: ../addressbook/util/eab-book-util.c:126
-#| msgid "Email"
 msgctxt "addressbook-label"
 msgid "Email"
 msgstr "E-mail"
@@ -1949,7 +1893,6 @@ msgstr "E-mail"
 #. * SIP=Session Initiation Protocol, used for voice over IP
 #.
 #: ../addressbook/util/eab-book-util.c:173
-#| msgid "VIP"
 msgctxt "addressbook-label"
 msgid "SIP"
 msgstr "SIP"
@@ -1960,7 +1903,6 @@ msgstr "SIP"
 #. * IM=Instant Messaging
 #.
 #: ../addressbook/util/eab-book-util.c:216
-#| msgid "AIM"
 msgctxt "addressbook-label"
 msgid "IM"
 msgstr "IM"
@@ -1970,7 +1912,6 @@ msgstr "IM"
 #. * this generic label is used instead of one of the predefined labels.
 #.
 #: ../addressbook/util/eab-book-util.c:271
-#| msgid "Phone"
 msgctxt "addressbook-label"
 msgid "Phone"
 msgstr "Phone"
@@ -2013,7 +1954,7 @@ msgstr "_Snooze"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
 #: ../calendar/gui/e-comp-editor-page-general.c:1365
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:2241
-#: ../calendar/gui/e-comp-editor.c:2061 ../e-util/e-html-editor-actions.c:884
+#: ../calendar/gui/e-comp-editor.c:2062 ../e-util/e-html-editor-actions.c:908
 #: ../e-util/e-mail-signature-manager.c:358 ../e-util/filter.ui.h:17
 #: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:173
 #: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:63
@@ -2037,8 +1978,8 @@ msgstr "_Dismiss"
 #: ../calendar/alarm-notify/alarm-queue.c:1914
 #: ../calendar/alarm-notify/alarm-queue.c:1924
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
-#: ../modules/itip-formatter/itip-view.c:1724
-#: ../modules/itip-formatter/itip-view.c:1835
+#: ../modules/itip-formatter/itip-view.c:1666
+#: ../modules/itip-formatter/itip-view.c:1777
 msgid "Location:"
 msgstr "Location:"
 
@@ -2426,14 +2367,10 @@ msgstr ""
 "lists up to date."
 
 #: ../calendar/calendar.error.xml.h:52
-#| msgid "Would you like to send this task to participants?"
 msgid "Would you like to send this memo to participants?"
 msgstr "Would you like to send this memo to participants?"
 
 #: ../calendar/calendar.error.xml.h:53
-#| msgid ""
-#| "Email invitations will be sent to all participants and allow them to "
-#| "accept this task."
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this memo."
@@ -2442,14 +2379,10 @@ msgstr ""
 "this memo."
 
 #: ../calendar/calendar.error.xml.h:54
-#| msgid "Would you like to send updated meeting information to participants?"
 msgid "Would you like to send updated memo information to participants?"
 msgstr "Would you like to send updated memo information to participants?"
 
 #: ../calendar/calendar.error.xml.h:55
-#| msgid ""
-#| "Sending updated information allows other participants to keep their task "
-#| "lists up to date."
 msgid ""
 "Sending updated information allows other participants to keep their memo "
 "lists up to date."
@@ -2602,252 +2535,210 @@ msgstr "The memo list is not marked for offline usage."
 
 #. Translators: {0} is the name of the calendar/memo list/task list.
 #: ../calendar/calendar.error.xml.h:91
-#| msgid "Failed to load part '%s'"
 msgid "Failed to add timezone to '{0}'"
 msgstr "Failed to add timezone to '{0}'"
 
 #. The {0} is a calendar/memo list/task list name, which is useless here
 #: ../calendar/calendar.error.xml.h:93
-#| msgid "Could not save attachments"
 msgid "Failed to save attachments"
 msgstr "Failed to save attachments"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:95
-#| msgid "Failed to open client '%s': %s"
 msgid "Failed to open calendar '{0}'"
 msgstr "Failed to open calendar '{0}'"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:97
-#| msgid "Delete memo list '{0}'?"
 msgid "Failed to open memo list '{0}'"
 msgstr "Failed to open memo list '{0}'"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:99
-#| msgid "Delete task list '{0}'?"
 msgid "Failed to open task list '{0}'"
 msgstr "Failed to open task list '{0}'"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:101
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to create an event in the calendar '{0}'"
 msgstr "Failed to create an event in the calendar '{0}'"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:103
-#| msgid "Delete remote memo list '{0}'?"
 msgid "Failed to create a memo in the memo list '{0}'"
 msgstr "Failed to create a memo in the memo list '{0}'"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:105
-#| msgid "Delete remote task list '{0}'?"
 msgid "Failed to create a task in the task list '{0}'"
 msgstr "Failed to create a task in the task list '{0}'"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:107
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to modify an event in the calendar '{0}'"
 msgstr "Failed to modify an event in the calendar '{0}'"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:109
-#| msgid "Delete remote memo list '{0}'?"
 msgid "Failed to modify a memo in the memo list '{0}'"
 msgstr "Failed to modify a memo in the memo list '{0}'"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:111
-#| msgid "Unable to find this task in any task list"
 msgid "Failed to modify a task in the task list '{0}'"
 msgstr "Failed to modify a task in the task list '{0}'"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:113
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to delete an event in the calendar '{0}'"
 msgstr "Failed to delete an event in the calendar '{0}'"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:115
-#| msgid "Delete remote memo list '{0}'?"
 msgid "Failed to delete a memo in the memo list '{0}'"
 msgstr "Failed to delete a memo in the memo list '{0}'"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:117
-#| msgid "Unable to find this task in any task list"
 msgid "Failed to delete a task in the task list '{0}'"
 msgstr "Failed to delete a task in the task list '{0}'"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:119
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to update an event in the calendar '{0}'"
 msgstr "Failed to update an event in the calendar '{0}'"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:121
-#| msgid "Delete remote memo list '{0}'?"
 msgid "Failed to update a memo in the memo list '{0}'"
 msgstr "Failed to update a memo in the memo list '{0}'"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:123
-#| msgid "Unable to find this task in any task list"
 msgid "Failed to update a task in the task list '{0}'"
 msgstr "Failed to update a task in the task list '{0}'"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:125
-#| msgid "Failed to load the calendar '%s' (%s)"
 msgid "Failed to send an event to the calendar '{0}'"
 msgstr "Failed to send an event to the calendar '{0}'"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:127
-#| msgid "Delete remote memo list '{0}'?"
 msgid "Failed to send a memo to the memo list '{0}'"
 msgstr "Failed to send a memo to the memo list '{0}'"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:129
-#| msgid "Delete remote task list '{0}'?"
 msgid "Failed to send a task to the task list '{0}'"
 msgstr "Failed to send a task to the task list '{0}'"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:131
-#| msgid "Error loading calendar '{0}'"
 msgid "Error creating view for the calendar '{0}'"
 msgstr "Error creating view for the calendar '{0}'"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:133
-#| msgid "Error loading task list '{0}'"
 msgid "Error creating view for the task list '{0}'"
 msgstr "Error creating view for the task list '{0}'"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:135
-#| msgid "Error loading memo list '{0}'"
 msgid "Error creating view for the memo list '{0}'"
 msgstr "Error creating view for the memo list '{0}'"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:137
-#| msgid "Failed to load the calendar '%s' (%s)"
 msgid "Failed to copy an event into the calendar '{0}'"
 msgstr "Failed to copy an event into the calendar '{0}'"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:139
-#| msgid "Unable to find this task in any task list"
 msgid "Failed to copy a task into the task list '{0}'"
 msgstr "Failed to copy a task into the task list '{0}'"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:141
-#| msgid "Delete remote memo list '{0}'?"
 msgid "Failed to copy a memo into the memo list '{0}'"
 msgstr "Failed to copy a memo into the memo list '{0}'"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:143
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Failed to move an event into the calendar '{0}'"
 msgstr "Failed to move an event into the calendar '{0}'"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:145
-#| msgid "Delete remote task list '{0}'?"
 msgid "Failed to move a task into the task list '{0}'"
 msgstr "Failed to move a task into the task list '{0}'"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:147
-#| msgid "Delete remote memo list '{0}'?"
 msgid "Failed to move a memo into the memo list '{0}'"
 msgstr "Failed to move a memo into the memo list '{0}'"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:149
-#| msgid "Failed to load the calendar '%s' (%s)"
 msgid "Failed to get an event from the calendar '{0}'"
 msgstr "Failed to get an event from the calendar '{0}'"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:151
-#| msgid "Delete remote task list '{0}'?"
 msgid "Failed to get a task from the task list '{0}'"
 msgstr "Failed to get a task from the task list '{0}'"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:153
-#| msgid "Delete remote memo list '{0}'?"
 msgid "Failed to get a memo from the memo list '{0}'"
 msgstr "Failed to get a memo from the memo list '{0}'"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:155
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Copying an event into the calendar '{0}'"
 msgstr "Copying an event into the calendar '{0}'"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:157
-#| msgid "Error loading task list '{0}'"
 msgid "Copying a task into the task list '{0}'"
 msgstr "Copying a task into the task list '{0}'"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:159
-#| msgid "Delete remote memo list '{0}'?"
 msgid "Copying a memo into the memo list '{0}'"
 msgstr "Copying a memo into the memo list '{0}'"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:161
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Moving an event into the calendar '{0}'"
 msgstr "Moving an event into the calendar '{0}'"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:163
-#| msgid "Error loading task list '{0}'"
 msgid "Moving a task into the task list '{0}'"
 msgstr "Moving a task into the task list '{0}'"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:165
-#| msgid "Delete remote memo list '{0}'?"
 msgid "Moving a memo into the memo list '{0}'"
 msgstr "Moving a memo into the memo list '{0}'"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:167
-#| msgid "Delete remote calendar '{0}'?"
 msgid "Failed to refresh calendar '{0}'"
 msgstr "Failed to refresh calendar '{0}'"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:169
-#| msgid "Delete remote task list '{0}'?"
 msgid "Failed to refresh task list '{0}'"
 msgstr "Failed to refresh task list '{0}'"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:171
-#| msgid "Delete remote memo list '{0}'?"
 msgid "Failed to refresh memo list '{0}'"
 msgstr "Failed to refresh memo list '{0}'"
 
 #: ../calendar/calendar.error.xml.h:172
-#| msgid "Make this Occurrence _Movable"
 msgid "Failed to make an occurrence movable"
 msgstr "Failed to make an occurrence movable"
 
@@ -3096,7 +2987,6 @@ msgstr[1] "%d weeks"
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:421
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1829
-#| msgid "Play a sound"
 msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "Play a sound"
@@ -3104,7 +2994,6 @@ msgstr "Play a sound"
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:425
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1827
-#| msgid "Pop up an alert"
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "Pop up an alert"
@@ -3112,7 +3001,6 @@ msgstr "Pop up an alert"
 #. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:429
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1833
-#| msgid "Send an email"
 msgctxt "cal-reminders"
 msgid "Send an email"
 msgstr "Send an e-mail"
@@ -3120,27 +3008,23 @@ msgstr "Send an e-mail"
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-alarm-list.c:433
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1831
-#| msgid "Run a program"
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "Run a program"
 
 #: ../calendar/gui/e-alarm-list.c:439
-#| msgid "Unknown action to be performed"
 msgctxt "cal-reminders"
 msgid "Unknown action to be performed"
 msgstr "Unknown action to be performed"
 
 #: ../calendar/gui/e-alarm-list.c:454
 #, c-format
-#| msgid "%s %s before the start of the appointment"
 msgctxt "cal-reminders"
 msgid "%s %s before the start"
 msgstr "%s %s before the start"
 
 #: ../calendar/gui/e-alarm-list.c:460
 #, c-format
-#| msgid "%s %s after the start of the appointment"
 msgctxt "cal-reminders"
 msgid "%s %s after the start"
 msgstr "%s %s after the start"
@@ -3149,21 +3033,18 @@ msgstr "%s %s after the start"
 #. * "Play a sound"
 #: ../calendar/gui/e-alarm-list.c:467
 #, c-format
-#| msgid "%s attachment"
 msgctxt "cal-reminders"
 msgid "%s at the start"
 msgstr "%s at the start"
 
 #: ../calendar/gui/e-alarm-list.c:479
 #, c-format
-#| msgid "%s %s before the end of the appointment"
 msgctxt "cal-reminders"
 msgid "%s %s before the end"
 msgstr "%s %s before the end"
 
 #: ../calendar/gui/e-alarm-list.c:485
 #, c-format
-#| msgid "%s %s after the end of the appointment"
 msgctxt "cal-reminders"
 msgid "%s %s after the end"
 msgstr "%s %s after the end"
@@ -3172,7 +3053,6 @@ msgstr "%s %s after the end"
 #. * "Play a sound"
 #: ../calendar/gui/e-alarm-list.c:492
 #, c-format
-#| msgid "%s attachment"
 msgctxt "cal-reminders"
 msgid "%s at the end"
 msgstr "%s at the end"
@@ -3181,7 +3061,6 @@ msgstr "%s at the end"
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
 #: ../calendar/gui/e-alarm-list.c:516
 #, c-format
-#| msgid "%s at %s"
 msgctxt "cal-reminders"
 msgid "%s at %s"
 msgstr "%s at %s"
@@ -3190,7 +3069,6 @@ msgstr "%s at %s"
 #. * "Play a sound". "Trigger types" are absolute or relative dates
 #: ../calendar/gui/e-alarm-list.c:524
 #, c-format
-#| msgid "%s for an unknown trigger type"
 msgctxt "cal-reminders"
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
@@ -3213,8 +3091,8 @@ msgstr "calendar view for a month"
 msgid "calendar view for one or more weeks"
 msgstr "calendar view for one or more weeks"
 
-#: ../calendar/gui/e-cal-component-preview.c:214 ../e-util/e-filter-rule.c:768
-#: ../mail/e-mail-config-page.c:125
+#: ../calendar/gui/e-cal-component-preview.c:214 ../e-util/e-filter-rule.c:772
+#: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "Untitled"
 
@@ -3239,8 +3117,8 @@ msgid "Due Date:"
 msgstr "Due Date:"
 
 #: ../calendar/gui/e-cal-component-preview.c:298
-#: ../modules/itip-formatter/itip-view.c:1727
-#: ../modules/itip-formatter/itip-view.c:1844
+#: ../modules/itip-formatter/itip-view.c:1669
+#: ../modules/itip-formatter/itip-view.c:1786
 msgid "Status:"
 msgstr "Status:"
 
@@ -3305,19 +3183,16 @@ msgstr "Web Page:"
 
 #: ../calendar/gui/e-cal-data-model.c:1633
 #, c-format
-#| msgid "Creating folder '%s'"
 msgid "Creating view for calendar '%s'"
 msgstr "Creating view for calendar '%s'"
 
 #: ../calendar/gui/e-cal-data-model.c:1637
 #, c-format
-#| msgid "Opening task list '%s'"
 msgid "Creating view for task list '%s'"
 msgstr "Creating view for task list '%s'"
 
 #: ../calendar/gui/e-cal-data-model.c:1641
 #, c-format
-#| msgid "Opening memo list '%s'"
 msgid "Creating view for memo list '%s'"
 msgstr "Creating view for memo list '%s'"
 
@@ -3327,19 +3202,16 @@ msgstr "Destination is read only"
 
 #: ../calendar/gui/e-cal-dialogs.c:294
 #, c-format
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Copying events to the calendar '%s'"
 msgstr "Copying events to the calendar '%s'"
 
 #: ../calendar/gui/e-cal-dialogs.c:300
 #, c-format
-#| msgid "Opening memo list '%s'"
 msgid "Copying memos to the memo list '%s'"
 msgstr "Copying memos to the memo list '%s'"
 
 #: ../calendar/gui/e-cal-dialogs.c:306
 #, c-format
-#| msgid "Opening task list '%s'"
 msgid "Copying tasks to the task list '%s'"
 msgstr "Copying tasks to the task list '%s'"
 
@@ -3473,17 +3345,14 @@ msgid "Pasted text doesn't contain valid iCalendar data"
 msgstr "Pasted text doesn't contain valid iCalendar data"
 
 #: ../calendar/gui/e-calendar-view.c:863 ../calendar/gui/e-cal-ops.c:1554
-#| msgid "Default Calendar Client"
 msgid "Default calendar not found"
 msgstr "Default calendar not found"
 
 #: ../calendar/gui/e-calendar-view.c:868 ../calendar/gui/e-cal-ops.c:1557
-#| msgid "Default Memo Client"
 msgid "Default memo list not found"
 msgstr "Default memo list not found"
 
 #: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-cal-ops.c:1560
-#| msgid "Default Task Client"
 msgid "Default task list not found"
 msgstr "Default task list not found"
 
@@ -3492,7 +3361,6 @@ msgid "No suitable component found"
 msgstr "No suitable component found"
 
 #: ../calendar/gui/e-calendar-view.c:1032
-#| msgid "Loading Calendar"
 msgid "Pasting iCalendar data"
 msgstr "Pasting iCalendar data"
 
@@ -3601,8 +3469,8 @@ msgstr "Source"
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
 #: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1249
 #: ../calendar/gui/print.c:1266 ../e-util/e-charset.c:51
-#: ../modules/itip-formatter/itip-view.c:3425
-#: ../modules/itip-formatter/itip-view.c:5999
+#: ../modules/itip-formatter/itip-view.c:3318
+#: ../modules/itip-formatter/itip-view.c:5915
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Unknown"
@@ -3616,19 +3484,16 @@ msgstr "Source with UID '%s' not found"
 
 #: ../calendar/gui/e-cal-model.c:1507 ../calendar/gui/e-cal-ops.c:187
 #: ../calendar/gui/e-cal-ops.c:1368
-#| msgid "Create an _Event"
 msgid "Creating an event"
 msgstr "Creating an event"
 
 #: ../calendar/gui/e-cal-model.c:1511 ../calendar/gui/e-cal-ops.c:191
 #: ../calendar/gui/e-cal-ops.c:1372
-#| msgid "Create a Mem_o"
 msgid "Creating a memo"
 msgstr "Creating a memo"
 
 #: ../calendar/gui/e-cal-model.c:1515 ../calendar/gui/e-cal-ops.c:195
 #: ../calendar/gui/e-cal-ops.c:1376
-#| msgid "Create a _Task"
 msgid "Creating a task"
 msgstr "Creating a task"
 
@@ -3655,13 +3520,13 @@ msgstr "No"
 
 #: ../calendar/gui/e-cal-model.c:3820 ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:5987
+#: ../modules/itip-formatter/itip-view.c:5903
 msgid "Accepted"
 msgstr "Accepted"
 
 #: ../calendar/gui/e-cal-model.c:3821 ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:5993
+#: ../modules/itip-formatter/itip-view.c:5909
 msgid "Declined"
 msgstr "Declined"
 
@@ -3673,7 +3538,7 @@ msgstr "Tentative"
 
 #: ../calendar/gui/e-cal-model.c:3823 ../calendar/gui/e-meeting-list-view.c:224
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:5996
+#: ../modules/itip-formatter/itip-view.c:5912
 msgid "Delegated"
 msgstr "Delegated"
 
@@ -3722,33 +3587,27 @@ msgid "Modifying an event"
 msgstr "Modifying an event"
 
 #: ../calendar/gui/e-cal-ops.c:310
-#| msgid "Loading memos"
 msgid "Modifying a memo"
 msgstr "Modifying a memo"
 
 #: ../calendar/gui/e-cal-ops.c:314
-#| msgid "Loading tasks"
 msgid "Modifying a task"
 msgstr "Modifying a task"
 
 #: ../calendar/gui/e-cal-ops.c:413
-#| msgid "Removing attachments"
 msgid "Removing an event"
 msgstr "Removing an event"
 
 #: ../calendar/gui/e-cal-ops.c:417
-#| msgid "Removing attachments"
 msgid "Removing a memo"
 msgstr "Removing a memo"
 
 #: ../calendar/gui/e-cal-ops.c:421
-#| msgid "Removing attachments"
 msgid "Removing a task"
 msgstr "Removing a task"
 
 #: ../calendar/gui/e-cal-ops.c:512
 #, c-format
-#| msgid "Meeting information sent"
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
 msgstr[0] "Deleting an event"
@@ -3756,7 +3615,6 @@ msgstr[1] "Deleting %d events"
 
 #: ../calendar/gui/e-cal-ops.c:516
 #, c-format
-#| msgid "Delete Memo"
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
 msgstr[0] "Deleting a memo"
@@ -3764,7 +3622,6 @@ msgstr[1] "Deleting %d memos"
 
 #: ../calendar/gui/e-cal-ops.c:520
 #, c-format
-#| msgid "Meetings and Tasks"
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] "Deleting a task"
@@ -3772,7 +3629,6 @@ msgstr[1] "Deleting %d tasks"
 
 #: ../calendar/gui/e-cal-ops.c:723
 #, c-format
-#| msgid "Print this event"
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
 msgstr[0] "Pasting an event"
@@ -3780,7 +3636,6 @@ msgstr[1] "Pasting %d events"
 
 #: ../calendar/gui/e-cal-ops.c:738
 #, c-format
-#| msgid "Loading memos"
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
 msgstr[0] "Pasting a memo"
@@ -3788,30 +3643,25 @@ msgstr[1] "Pasting %d memos"
 
 #: ../calendar/gui/e-cal-ops.c:753
 #, c-format
-#| msgid "Loading tasks"
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
 msgstr[0] "Pasting a task"
 msgstr[1] "Pasting %d tasks"
 
 #: ../calendar/gui/e-cal-ops.c:852
-#| msgid "Updating objects"
 msgid "Updating an event"
 msgstr "Updating an event"
 
 #: ../calendar/gui/e-cal-ops.c:856
-#| msgid "Updating query"
 msgid "Updating a memo"
 msgstr "Updating a memo"
 
 #: ../calendar/gui/e-cal-ops.c:860
-#| msgid "Updating objects"
 msgid "Updating a task"
 msgstr "Updating a task"
 
 #: ../calendar/gui/e-cal-ops.c:968
 #, c-format
-#| msgid "Unable to open the calendar '%s': %s"
 msgid "Getting events to purge in the calendar '%s'"
 msgstr "Getting events to purge in the calendar '%s'"
 
@@ -3827,39 +3677,32 @@ msgstr "Getting tasks to purge in the task list '%s'"
 
 #: ../calendar/gui/e-cal-ops.c:1002
 #, c-format
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Purging events in the calendar '%s'"
 msgstr "Purging events in the calendar '%s'"
 
 #: ../calendar/gui/e-cal-ops.c:1006
 #, c-format
-#| msgid "Opening memo list '%s'"
 msgid "Purging memos in the memo list '%s'"
 msgstr "Purging memos in the memo list '%s'"
 
 #: ../calendar/gui/e-cal-ops.c:1010
 #, c-format
-#| msgid "Opening task list '%s'"
 msgid "Purging tasks in the task list '%s'"
 msgstr "Purging tasks in the task list '%s'"
 
 #: ../calendar/gui/e-cal-ops.c:1110
-#| msgid "Purging"
 msgid "Purging events"
 msgstr "Purging events"
 
 #: ../calendar/gui/e-cal-ops.c:1114
-#| msgid "Print Memos"
 msgid "Purging memos"
 msgstr "Purging memos"
 
 #: ../calendar/gui/e-cal-ops.c:1118
-#| msgid "Print Tasks"
 msgid "Purging tasks"
 msgstr "Purging tasks"
 
 #: ../calendar/gui/e-cal-ops.c:1220
-#| msgid "Hide completed tasks"
 msgid "Expunging completed tasks"
 msgstr "Expunging completed tasks"
 
@@ -3872,7 +3715,6 @@ msgstr[1] "Moving %d events"
 
 #: ../calendar/gui/e-cal-ops.c:2052
 #, c-format
-#| msgid "Copying Items"
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] "Copying an event"
@@ -3880,7 +3722,6 @@ msgstr[1] "Copying %d events"
 
 #: ../calendar/gui/e-cal-ops.c:2058
 #, c-format
-#| msgid "Moving Items"
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "Moving a memo"
@@ -3888,7 +3729,6 @@ msgstr[1] "Moving %d memos"
 
 #: ../calendar/gui/e-cal-ops.c:2059
 #, c-format
-#| msgid "Copying Items"
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "Copying a memo"
@@ -3896,7 +3736,6 @@ msgstr[1] "Copying %d memos"
 
 #: ../calendar/gui/e-cal-ops.c:2065
 #, c-format
-#| msgid "Moving Items"
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "Moving a task"
@@ -3904,7 +3743,6 @@ msgstr[1] "Moving %d tasks"
 
 #: ../calendar/gui/e-cal-ops.c:2066
 #, c-format
-#| msgid "Copying Items"
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
 msgstr[0] "Copying a task"
@@ -3930,12 +3768,10 @@ msgstr ""
 "%s"
 
 #: ../calendar/gui/e-comp-editor-event.c:101
-#| msgid "Event's start time is in the past"
 msgid "Event's time is in the past"
 msgstr "Event's time is in the past"
 
 #: ../calendar/gui/e-comp-editor-event.c:202
-#| msgid "Event cannot be edited, because the selected calendar is read only"
 msgid ""
 "Event cannot be edited, because the selected calendar could not be opened"
 msgstr ""
@@ -3951,19 +3787,17 @@ msgstr "Event cannot be fully edited, because you are not the organiser"
 
 #: ../calendar/gui/e-comp-editor-event.c:438
 #: ../calendar/gui/e-comp-editor-task.c:348
-#| msgid "File is not a valid .desktop file"
 msgid "Start date is not a valid date"
 msgstr "Start date is not a valid date"
 
 #: ../calendar/gui/e-comp-editor-event.c:440
-#| msgid "File is not a valid .desktop file"
 msgid "Start time is not a valid time"
 msgstr "Start time is not a valid time"
 
 #: ../calendar/gui/e-comp-editor-event.c:444
 #: ../calendar/gui/e-comp-editor-event.c:460
 #: ../calendar/gui/e-comp-editor-page-attachments.c:201
-#: ../calendar/gui/e-comp-editor.c:339 ../mail/e-mail-display.c:2008
+#: ../calendar/gui/e-comp-editor.c:340 ../mail/e-mail-display.c:2021
 #: ../mail/e-mail-reader-utils.c:648 ../mail/mail-send-recv.c:489
 #: ../mail/mail-send-recv.c:1289 ../plugins/face/face.c:176
 #: ../shell/e-shell.c:992 ../shell/e-shell.c:1014
@@ -3972,12 +3806,10 @@ msgid "Unknown error"
 msgstr "Unknown error"
 
 #: ../calendar/gui/e-comp-editor-event.c:454
-#| msgid "File is not a valid .desktop file"
 msgid "End date is not a valid date"
 msgstr "End date is not a valid date"
 
 #: ../calendar/gui/e-comp-editor-event.c:456
-#| msgid "File is not a valid .desktop file"
 msgid "End time is not a valid time"
 msgstr "End time is not a valid time"
 
@@ -4042,19 +3874,16 @@ msgid "Classify as confidential"
 msgstr "Classify as confidential"
 
 #: ../calendar/gui/e-comp-editor-event.c:740
-#| msgid "_Start time:"
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "_Start time:"
 
 #: ../calendar/gui/e-comp-editor-event.c:745
-#| msgid "_End time:"
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "_End time:"
 
 #: ../calendar/gui/e-comp-editor-event.c:755
-#| msgid "All Day Event"
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "All da_y event"
@@ -4062,20 +3891,17 @@ msgstr "All da_y event"
 #: ../calendar/gui/e-comp-editor-event.c:808
 #: ../calendar/gui/e-comp-editor-memo.c:192
 #: ../calendar/gui/e-comp-editor-task.c:529
-#| msgid "General"
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "General"
 
 #: ../calendar/gui/e-comp-editor-event.c:811
 #: ../calendar/gui/e-comp-editor-task.c:535
-#| msgid "Reminders"
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Reminders"
 
 #: ../calendar/gui/e-comp-editor-event.c:814
-#| msgid "Recurrence"
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Recurrence"
@@ -4083,13 +3909,11 @@ msgstr "Recurrence"
 #: ../calendar/gui/e-comp-editor-event.c:817
 #: ../calendar/gui/e-comp-editor-memo.c:195
 #: ../calendar/gui/e-comp-editor-task.c:538
-#| msgid "Attachments"
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Attachments"
 
 #: ../calendar/gui/e-comp-editor-event.c:827
-#| msgid "Scheduling"
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr "Schedule"
@@ -4105,7 +3929,6 @@ msgid "Appointment - %s"
 msgstr "Appointment - %s"
 
 #: ../calendar/gui/e-comp-editor-memo.c:68
-#| msgid "Memo cannot be edited, because the selected memo list is read only"
 msgid ""
 "Memo cannot be edited, because the selected memo list could not be opened"
 msgstr ""
@@ -4126,14 +3949,12 @@ msgstr "_List:"
 
 #: ../calendar/gui/e-comp-editor-memo.c:175
 #: ../calendar/gui/e-comp-editor-task.c:475
-#| msgid "Sta_rt date:"
 msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "Sta_rt date:"
 
 #: ../calendar/gui/e-comp-editor-memo.c:223
 #, c-format
-#| msgid "Assigned Task - %s"
 msgid "Assigned Memo - %s"
 msgstr "Assigned Memo - %s"
 
@@ -4154,21 +3975,18 @@ msgstr[0] "Attachment"
 msgstr[1] "Attachments"
 
 #: ../calendar/gui/e-comp-editor-page-attachments.c:196
-#: ../e-util/e-attachment.c:2401
+#: ../e-util/e-attachment.c:2424
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Could not load '%s'"
 
 #: ../calendar/gui/e-comp-editor-page-attachments.c:198
-#: ../e-util/e-attachment.c:2404
+#: ../e-util/e-attachment.c:2427
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Could not load the attachment"
 
 #: ../calendar/gui/e-comp-editor-page-attachments.c:403
-#| msgid ""
-#| "Some attachments are being downloaded. Saving the task would result in "
-#| "the loss of these attachments."
 msgid ""
 "Some attachments are still being downloaded. Please wait until the download "
 "is finished."
@@ -4198,12 +4016,10 @@ msgid "Attach a file"
 msgstr "Attach a file"
 
 #: ../calendar/gui/e-comp-editor-page-attachments.c:617
-#| msgid "Attachments"
 msgid "_Attachments"
 msgstr "_Attachments"
 
 #: ../calendar/gui/e-comp-editor-page-attachments.c:619
-#| msgid "Show Attachments"
 msgid "Show attachments"
 msgstr "Show attachments"
 
@@ -4219,8 +4035,6 @@ msgstr "List View"
 
 #: ../calendar/gui/e-comp-editor-page-general.c:313
 #, c-format
-#| msgid "Cannot find matching event in the next %d year"
-#| msgid_plural "Cannot find matching event in the next %d years"
 msgid "Cannot find attendee '%s' in the list of attendees"
 msgstr "Cannot find attendee '%s' in the list of attendees"
 
@@ -4230,19 +4044,16 @@ msgid "Not enough rights to delete attendee '%s'"
 msgstr "Not enough rights to delete attendee '%s'"
 
 #: ../calendar/gui/e-comp-editor-page-general.c:350
-#| msgid "Failed to delete contact"
 msgid "Failed to delete selected attendee"
 msgid_plural "Failed to delete selected attendees"
 msgstr[0] "Failed to delete selected attendee"
 msgstr[1] "Failed to delete selected attendees"
 
 #: ../calendar/gui/e-comp-editor-page-general.c:583
-#| msgid "Attendees"
 msgid "A_ttendees"
 msgstr "A_ttendees"
 
 #: ../calendar/gui/e-comp-editor-page-general.c:585
-#| msgid "Toggles whether the Attendee Type is displayed"
 msgid "Toggles whether the Attendees are displayed"
 msgstr "Toggles whether the Attendees are displayed"
 
@@ -4292,7 +4103,6 @@ msgid "Or_ganizer:"
 msgstr "Or_ganiser:"
 
 #: ../calendar/gui/e-comp-editor-page-general.c:1288
-#| msgid "Atte_ndees..."
 msgctxt "ECompEditor"
 msgid "Atte_ndees..."
 msgstr "Atte_ndees..."
@@ -4316,7 +4126,6 @@ msgstr "on"
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:571
-#| msgid "first"
 msgctxt "ECompEditorPageRecur"
 msgid "first"
 msgstr "first"
@@ -4327,7 +4136,6 @@ msgstr "first"
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:577
-#| msgid "second"
 msgctxt "ECompEditorPageRecur"
 msgid "second"
 msgstr "second"
@@ -4337,7 +4145,6 @@ msgstr "second"
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:582
-#| msgid "third"
 msgctxt "ECompEditorPageRecur"
 msgid "third"
 msgstr "third"
@@ -4347,7 +4154,6 @@ msgstr "third"
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:587
-#| msgid "fourth"
 msgctxt "ECompEditorPageRecur"
 msgid "fourth"
 msgstr "fourth"
@@ -4357,7 +4163,6 @@ msgstr "fourth"
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:592
-#| msgid "fifth"
 msgctxt "ECompEditorPageRecur"
 msgid "fifth"
 msgstr "fifth"
@@ -4367,7 +4172,6 @@ msgstr "fifth"
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:597
-#| msgid "last"
 msgctxt "ECompEditorPageRecur"
 msgid "last"
 msgstr "last"
@@ -4375,7 +4179,6 @@ 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/e-comp-editor-page-recurrence.c:624
-#| msgid "Other Date"
 msgctxt "ECompEditorPageRecur"
 msgid "Other Date"
 msgstr "Other Date"
@@ -4385,7 +4188,6 @@ msgstr "Other Date"
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:630
-#| msgid "1st to 10th"
 msgctxt "ECompEditorPageRecur"
 msgid "1st to 10th"
 msgstr "1st to 10th"
@@ -4395,7 +4197,6 @@ msgstr "1st to 10th"
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:636
-#| msgid "11th to 20th"
 msgctxt "ECompEditorPageRecur"
 msgid "11th to 20th"
 msgstr "11th to 20th"
@@ -4405,7 +4206,6 @@ msgstr "11th to 20th"
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:642
-#| msgid "21st to 31st"
 msgctxt "ECompEditorPageRecur"
 msgid "21st to 31st"
 msgstr "21st to 31st"
@@ -4414,50 +4214,41 @@ msgstr "21st to 31st"
 #. * (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/e-comp-editor-page-recurrence.c:668
-#| msgid "day"
-#| msgid_plural "days"
 msgctxt "ECompEditorPageRecur"
 msgid "day"
 msgstr "day"
 
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:669
-#| msgid "Monday"
 msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "Monday"
 
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:670
-#| msgid "Tuesday"
 msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "Tuesday"
 
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:671
-#| msgid "Wednesday"
 msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "Wednesday"
 
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:672
-#| msgid "Thursday"
 msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "Thursday"
 
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:673
-#| msgid "Friday"
 msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "Friday"
 
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:674
-#| msgid "Saturday"
 msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "Saturday"
 
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:675
-#| msgid "Sunday"
 msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
 msgstr "Sunday"
@@ -4466,13 +4257,11 @@ msgstr "Sunday"
 #. * (dropdown menu options are in [square brackets])."
 #.
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:804
-#| msgid "on the"
 msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "on the"
 
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:994
-#| msgid "occurrences"
 msgctxt "ECompEditorPageRecur"
 msgid "occurrences"
 msgstr "occurrences"
@@ -4480,110 +4269,88 @@ msgstr "occurrences"
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:1487
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:2017
-#| msgid "This appointment rec_urs"
 msgctxt "ECompEditorPageRecur"
 msgid "This appointment rec_urs"
 msgstr "This appointment rec_urs"
 
 #. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:1492
-#| msgid "This task recurs"
 msgctxt "ECompEditorPageRecur"
 msgid "This task rec_urs"
 msgstr "This task rec_urs"
 
 #. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:1497
-#| msgid "This memo recurs"
 msgctxt "ECompEditorPageRecur"
 msgid "This memo rec_urs"
 msgstr "This memo rec_urs"
 
 #. Translators: Entire string is for example:     'This component 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:1502
-#| msgid "This appointment rec_urs"
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "This component rec_urs"
 
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:1863
-#| msgid "Recurrence date is invalid"
 msgid "Recurrence exception date is invalid"
 msgstr "Recurrence exception date is invalid"
 
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:1911
-#| msgid "End time of the recurrence was before event's start"
 msgid "End time of the recurrence is before the start"
 msgstr "End time of the recurrence is before the start"
 
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:1954
-#| msgid "Recurrence"
 msgid "R_ecurrence"
 msgstr "R_ecurrence"
 
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:1956
-#| msgid "It has recurrences."
 msgid "Set or unset recurrence"
 msgstr "Set or unset recurrence"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:2057
-#| msgid "Every"
 msgctxt "ECompEditorPageRecur"
 msgid "Every"
 msgstr "Every"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:2092
-#| msgid "day(s)"
 msgctxt "ECompEditorPageRecur"
 msgid "day(s)"
 msgstr "day(s)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:2094
-#| msgctxt "recurrpage"
-#| msgid "week(s)"
 msgctxt "ECompEditorPageRecur"
 msgid "week(s)"
 msgstr "week(s)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:2096
-#| msgctxt "recurrpage"
-#| msgid "month(s)"
 msgctxt "ECompEditorPageRecur"
 msgid "month(s)"
 msgstr "month(s)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:2098
-#| msgctxt "recurrpage"
-#| msgid "year(s)"
 msgctxt "ECompEditorPageRecur"
 msgid "year(s)"
 msgstr "year(s)"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:2127
-#| msgctxt "eventpage"
-#| msgid "for"
 msgctxt "ECompEditorPageRecur"
 msgid "for"
 msgstr "for"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:2129
-#| msgctxt "eventpage"
-#| msgid "until"
 msgctxt "ECompEditorPageRecur"
 msgid "until"
 msgstr "until"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:2131
-#| msgctxt "recurrpage"
-#| msgid "forever"
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "forever"
@@ -4605,7 +4372,6 @@ msgstr "A_dd"
 #: ../calendar/gui/e-comp-editor-page-recurrence.c:2249
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1787
 #: ../mail/mail-config.ui.h:64
-#| msgid "Remove"
 msgid "Re_move"
 msgstr "Re_move"
 
@@ -4614,7 +4380,6 @@ msgid "Preview"
 msgstr "Preview"
 
 #: ../calendar/gui/e-comp-editor-page-reminders.c:41
-#| msgid "Send To:"
 msgid "Send To"
 msgstr "Send To"
 
@@ -4623,7 +4388,6 @@ msgid "_Reminders"
 msgstr "_Reminders"
 
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1558
-#| msgid "Set or unset reminders for this event"
 msgid "Set or unset reminders"
 msgstr "Set or unset reminders"
 
@@ -4638,8 +4402,6 @@ msgstr "_Reminder"
 
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1673
 #, c-format
-#| msgid "%d day ago"
-#| msgid_plural "%d days ago"
 msgid "%d day before"
 msgid_plural "%d days before"
 msgstr[0] "%d day before"
@@ -4647,8 +4409,6 @@ msgstr[1] "%d days before"
 
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1680
 #, c-format
-#| msgid "%d hour before appointment"
-#| msgid_plural "%d hours before appointment"
 msgid "%d hour before"
 msgid_plural "%d hours before"
 msgstr[0] "%d hour before"
@@ -4656,8 +4416,6 @@ msgstr[1] "%d hours before"
 
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1687
 #, c-format
-#| msgid "%d minute before appointment"
-#| msgid_plural "%d minutes before appointment"
 msgid "%d minute before"
 msgid_plural "%d minutes before"
 msgstr[0] "%d minute before"
@@ -4671,112 +4429,95 @@ msgstr "None"
 
 #. Translators: Predefined reminder's description
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1697
-#| msgid "15 minutes"
 msgctxt "cal-reminders"
 msgid "15 minutes before"
 msgstr "15 minutes before"
 
 #. Translators: Predefined reminder's description
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1699
-#| msgid "1 hour ago"
-#| msgid_plural "%d hours ago"
 msgctxt "cal-reminders"
 msgid "1 hour before"
 msgstr "1 hour before"
 
 #. Translators: Predefined reminder's description
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1701
-#| msgid "is before"
 msgctxt "cal-reminders"
 msgid "1 day before"
 msgstr "1 day before"
 
 #. Translators: "Custom" for "Custom reminder set"
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1713
-#| msgid "Custom"
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "Custom"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1864
-#| msgid "minute(s)"
 msgctxt "cal-reminders"
 msgid "minute(s)"
 msgstr "minute(s)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1866
-#| msgid "hour(s)"
 msgctxt "cal-reminders"
 msgid "hour(s)"
 msgstr "hour(s)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1868
-#| msgid "day(s)"
 msgctxt "cal-reminders"
 msgid "day(s)"
 msgstr "day(s)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1885
-#| msgid "before"
 msgctxt "cal-reminders"
 msgid "before"
 msgstr "before"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1887
-#| msgid "after"
 msgctxt "cal-reminders"
 msgid "after"
 msgstr "after"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1903
-#| msgid "Start"
 msgctxt "cal-reminders"
 msgid "start"
 msgstr "start"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1905
-#| msgid "Send"
 msgctxt "cal-reminders"
 msgid "end"
 msgstr "end"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1928
-#| msgid "_Repeat the reminder"
 msgid "Re_peat the reminder"
 msgstr "Re_peat the reminder"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1953
-#| msgid "extra times every"
 msgctxt "cal-reminders"
 msgid "extra times every"
 msgstr "extra times every"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1990
-#| msgid "minutes"
 msgctxt "cal-reminders"
 msgid "minutes"
 msgstr "minutes"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1992
-#| msgid "hours"
 msgctxt "cal-reminders"
 msgid "hours"
 msgstr "hours"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
 #: ../calendar/gui/e-comp-editor-page-reminders.c:1994
-#| msgid "days"
 msgctxt "cal-reminders"
 msgid "days"
 msgstr "days"
@@ -4784,19 +4525,16 @@ msgstr "days"
 #. page_reminders->priv->custom_email_entry is initialized on demand
 #: ../calendar/gui/e-comp-editor-page-reminders.c:2035
 #: ../calendar/gui/e-comp-editor-page-reminders.c:2192
-#| msgid "Custom _message"
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "Custom _message"
 
 #: ../calendar/gui/e-comp-editor-page-reminders.c:2079
-#| msgid "Custom reminder sound"
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "Custom reminder _sound"
 
 #: ../calendar/gui/e-comp-editor-page-reminders.c:2090
-#| msgid "Select sound file"
 msgid "Select a sound file"
 msgstr "Select a sound file"
 
@@ -4809,12 +4547,10 @@ msgid "_Arguments:"
 msgstr "_Arguments:"
 
 #: ../calendar/gui/e-comp-editor-page-reminders.c:2175
-#| msgid "Send To:"
 msgid "_Send To:"
 msgstr "_Send To:"
 
 #: ../calendar/gui/e-comp-editor-page-schedule.c:427
-#| msgid "Scheduling"
 msgid "_Schedule"
 msgstr "_Schedule"
 
@@ -4823,145 +4559,121 @@ msgid "Query free / busy information for the attendees"
 msgstr "Query free / busy information for the attendees"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:81
-#| msgid "_Summary:"
 msgctxt "ECompEditor"
 msgid "_Summary:"
 msgstr "_Summary:"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:325
-#| msgid "_Location:"
 msgctxt "ECompEditor"
 msgid "_Location:"
 msgstr "_Location:"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:458
-#| msgid "_Categories..."
 msgctxt "ECompEditor"
 msgid "_Categories..."
 msgstr "_Categories..."
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:555
-#| msgid "_Description:"
 msgctxt "ECompEditor"
 msgid "_Description:"
 msgstr "_Description:"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:686
-#| msgid "_Web Page:"
 msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "_Web page:"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1057
-#| msgid "D_ue date:"
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "D_ue date:"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1117
-#| msgid "_Date completed:"
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "Date _completed:"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1133
-#| msgid "Public"
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "Public"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1134
-#| msgid "Private"
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "Private"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1135
-#| msgid "Confidential"
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "Confidential"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1151
-#| msgid "_Classification:"
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "C_lassification:"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1170
-#| msgid "Not Started"
 msgctxt "ECompEditor"
 msgid "Not Started"
 msgstr "Not Started"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1171
-#| msgid "In Progress"
 msgctxt "ECompEditor"
 msgid "In Progress"
 msgstr "In Progress"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1172
-#| msgid "Completed"
 msgctxt "ECompEditor"
 msgid "Completed"
 msgstr "Completed"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1173
-#| msgid "Cancelled"
 msgctxt "ECompEditor"
 msgid "Cancelled"
 msgstr "Cancelled"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1182
-#| msgid "Status:"
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_Status:"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1212
-#| msgid "Undefined"
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "Undefined"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1213
-#| msgid "High"
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "High"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1214
-#| msgid "Normal"
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1215
-#| msgid "Low"
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "Low"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1224
-#| msgid "Priority:"
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "Priorit_y:"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1278
-#| msgid "P_ercent complete:"
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "Percent complete:"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1359
-#| msgid "Time _zone:"
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "Time _zone:"
 
 #: ../calendar/gui/e-comp-editor-property-parts.c:1484
-#| msgid "Show Time as _Busy"
 msgctxt "ECompEditor"
 msgid "Show time as _busy"
 msgstr "Show time as _busy"
@@ -4975,7 +4687,6 @@ msgid "Task's due date is in the past"
 msgstr "Task's due date is in the past"
 
 #: ../calendar/gui/e-comp-editor-task.c:308
-#| msgid "Task cannot be edited, because the selected task list is read only"
 msgid ""
 "Task cannot be edited, because the selected task list could not be opened"
 msgstr ""
@@ -4990,18 +4701,14 @@ 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/e-comp-editor-task.c:359
-#| msgid "File is not a valid .desktop file"
 msgid "Due date is not a valid date"
 msgstr "Due date is not a valid date"
 
 #: ../calendar/gui/e-comp-editor-task.c:370
-#| msgid "Completed date is wrong"
 msgid "Completed date is not a valid date"
 msgstr "Completed date is not a valid date"
 
 #: ../calendar/gui/e-comp-editor-task.c:381
-#| msgid "1 minute in the future"
-#| msgid_plural "%d minutes in the future"
 msgid "Completed date cannot be in the future"
 msgstr "Completed date cannot be in the future"
 
@@ -5015,27 +4722,25 @@ msgstr "Assigned Task - %s"
 msgid "Task - %s"
 msgstr "Task — %s"
 
-#: ../calendar/gui/e-comp-editor.c:254
+#: ../calendar/gui/e-comp-editor.c:255
 #: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:127
 msgid "attachment"
 msgstr "attachment"
 
-#: ../calendar/gui/e-comp-editor.c:609
-#| msgid "Send _updates to attendees"
+#: ../calendar/gui/e-comp-editor.c:610
 msgid "Sending notifications to attendees..."
 msgstr "Sending notifications to attendees..."
 
-#: ../calendar/gui/e-comp-editor.c:994
-#| msgid "_Save Changes"
+#: ../calendar/gui/e-comp-editor.c:995
 msgid "Saving changes..."
 msgstr "Saving changes..."
 
-#: ../calendar/gui/e-comp-editor.c:1250
+#: ../calendar/gui/e-comp-editor.c:1251
 msgid "No Summary"
 msgstr "No Summary"
 
 #. == Button box ==
-#: ../calendar/gui/e-comp-editor.c:1975 ../composer/e-composer-actions.c:326
+#: ../calendar/gui/e-comp-editor.c:1976 ../composer/e-composer-actions.c:326
 #: ../e-util/e-html-editor-dialog.c:196 ../e-util/e-mail-signature-editor.c:308
 #: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:391
 #: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:129
@@ -5047,127 +4752,125 @@ msgstr "No Summary"
 msgid "_Close"
 msgstr "_Close"
 
-#: ../calendar/gui/e-comp-editor.c:1977
+#: ../calendar/gui/e-comp-editor.c:1978
 msgid "Close the current window"
 msgstr "Close the current window"
 
 #. copy menu item
-#: ../calendar/gui/e-comp-editor.c:1982 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:840 ../e-util/e-text.c:2109
+#: ../calendar/gui/e-comp-editor.c:1983 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:864 ../e-util/e-text.c:2109
 #: ../e-util/e-web-view.c:398 ../mail/e-mail-browser.c:136
 #: ../mail/mail.error.xml.h:146 ../shell/e-shell-window-actions.c:799
 msgid "_Copy"
 msgstr "_Copy"
 
-#: ../calendar/gui/e-comp-editor.c:1984 ../e-util/e-focus-tracker.c:175
+#: ../calendar/gui/e-comp-editor.c:1985 ../e-util/e-focus-tracker.c:175
 #: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
 #: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:400
-#: ../e-util/e-web-view.c:1824 ../mail/e-mail-browser.c:138
+#: ../e-util/e-web-view.c:1811 ../mail/e-mail-browser.c:138
 #: ../shell/e-shell-window-actions.c:801
 msgid "Copy the selection"
 msgstr "Copy the selection"
 
 #. cut menu item
-#: ../calendar/gui/e-comp-editor.c:1989 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:847 ../e-util/e-text.c:2095
+#: ../calendar/gui/e-comp-editor.c:1990 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:871 ../e-util/e-text.c:2095
 #: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:806
 msgid "Cu_t"
 msgstr "Cu_t"
 
-#: ../calendar/gui/e-comp-editor.c:1991 ../e-util/e-focus-tracker.c:168
+#: ../calendar/gui/e-comp-editor.c:1992 ../e-util/e-focus-tracker.c:168
 #: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
-#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1814
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1801
 #: ../mail/e-mail-browser.c:145 ../shell/e-shell-window-actions.c:808
 msgid "Cut the selection"
 msgstr "Cut the selection"
 
-#: ../calendar/gui/e-comp-editor.c:1998 ../e-util/e-focus-tracker.c:189
+#: ../calendar/gui/e-comp-editor.c:1999 ../e-util/e-focus-tracker.c:189
 #: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
 #: ../shell/e-shell-window-actions.c:815
 msgid "Delete the selection"
 msgstr "Delete the selection"
 
-#: ../calendar/gui/e-comp-editor.c:2005
+#: ../calendar/gui/e-comp-editor.c:2006
 msgid "View help"
 msgstr "View help"
 
 #. paste menu item
-#: ../calendar/gui/e-comp-editor.c:2010 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:854 ../e-util/e-text.c:2121
+#: ../calendar/gui/e-comp-editor.c:2011 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:878 ../e-util/e-text.c:2121
 #: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:834
-#| msgid "Paste"
 msgid "_Paste"
 msgstr "_Paste"
 
-#: ../calendar/gui/e-comp-editor.c:2012 ../e-util/e-focus-tracker.c:182
+#: ../calendar/gui/e-comp-editor.c:2013 ../e-util/e-focus-tracker.c:182
 #: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
-#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1834
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1821
 #: ../mail/e-mail-browser.c:152 ../shell/e-shell-window-actions.c:836
 msgid "Paste the clipboard"
 msgstr "Paste the clipboard"
 
-#: ../calendar/gui/e-comp-editor.c:2017 ../composer/e-composer-actions.c:380
+#: ../calendar/gui/e-comp-editor.c:2018 ../composer/e-composer-actions.c:380
 #: ../mail/e-mail-reader.c:2326
 #: ../modules/addressbook/e-book-shell-view-actions.c:1231
 #: ../modules/addressbook/e-book-shell-view-actions.c:1245
 msgid "_Print..."
 msgstr "_Print…"
 
-#: ../calendar/gui/e-comp-editor.c:2024 ../mail/e-mail-reader.c:2333
+#: ../calendar/gui/e-comp-editor.c:2025 ../mail/e-mail-reader.c:2333
 #: ../modules/addressbook/e-book-shell-view-actions.c:1238
 #: ../modules/calendar/e-cal-shell-view-actions.c:1695
 #: ../modules/calendar/e-memo-shell-view-actions.c:815
 #: ../modules/calendar/e-task-shell-view-actions.c:1016
-#| msgid "Preview"
 msgid "Pre_view..."
 msgstr "Pre_view..."
 
-#: ../calendar/gui/e-comp-editor.c:2031 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:868 ../e-util/e-web-view.c:408
+#: ../calendar/gui/e-comp-editor.c:2032 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:892 ../e-util/e-web-view.c:408
 #: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:911
 msgid "Select _All"
 msgstr "Select _All"
 
-#: ../calendar/gui/e-comp-editor.c:2033 ../e-util/e-focus-tracker.c:196
+#: ../calendar/gui/e-comp-editor.c:2034 ../e-util/e-focus-tracker.c:196
 #: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
 #: ../mail/e-mail-browser.c:159 ../shell/e-shell-window-actions.c:913
 msgid "Select all text"
 msgstr "Select all text"
 
-#: ../calendar/gui/e-comp-editor.c:2054
+#: ../calendar/gui/e-comp-editor.c:2055
 msgid "_Classification"
 msgstr "_Classification"
 
-#: ../calendar/gui/e-comp-editor.c:2068 ../e-util/e-html-editor-actions.c:891
+#: ../calendar/gui/e-comp-editor.c:2069 ../e-util/e-html-editor-actions.c:915
 #: ../e-util/e-mail-signature-editor.c:322 ../mail/e-mail-browser.c:166
 #: ../mail/e-mail-notes.c:945 ../shell/e-shell-window-actions.c:948
 msgid "_File"
 msgstr "_File"
 
-#: ../calendar/gui/e-comp-editor.c:2082 ../e-util/e-html-editor-actions.c:912
+#: ../calendar/gui/e-comp-editor.c:2083 ../e-util/e-html-editor-actions.c:936
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ../calendar/gui/e-comp-editor.c:2089 ../composer/e-composer-actions.c:370
+#: ../calendar/gui/e-comp-editor.c:2090 ../composer/e-composer-actions.c:370
 msgid "_Options"
 msgstr "_Options"
 
-#: ../calendar/gui/e-comp-editor.c:2096 ../e-util/e-html-editor-actions.c:933
+#: ../calendar/gui/e-comp-editor.c:2097 ../e-util/e-html-editor-actions.c:957
 #: ../mail/e-mail-browser.c:180 ../shell/e-shell-window-actions.c:991
 #: ../smime/gui/certificate-manager.c:1664 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_View"
 
-#: ../calendar/gui/e-comp-editor.c:2108
+#: ../calendar/gui/e-comp-editor.c:2109
 msgid "Save current changes"
 msgstr "Save current changes"
 
-#: ../calendar/gui/e-comp-editor.c:2113 ../e-util/e-mail-signature-editor.c:317
+#: ../calendar/gui/e-comp-editor.c:2114 ../e-util/e-mail-signature-editor.c:317
 #: ../mail/e-mail-notes.c:940
 msgid "Save and Close"
 msgstr "Save and Close"
 
-#: ../calendar/gui/e-comp-editor.c:2115
+#: ../calendar/gui/e-comp-editor.c:2116
 msgid "Save current changes and close editor"
 msgstr "Save current changes and close editor"
 
@@ -5696,7 +5399,6 @@ msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Unable to book a resource, the new event collides with some other."
 
 #: ../calendar/gui/itip-utils.c:1161
-#| msgid "Unable to book a resource, error: %s"
 msgid "Unable to book a resource, error: "
 msgstr "Unable to book a resource, error: "
 
@@ -5705,17 +5407,14 @@ msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
 #: ../calendar/gui/itip-utils.c:1986
-#| msgid "Sending message"
 msgid "Sending an event"
 msgstr "Sending an event"
 
 #: ../calendar/gui/itip-utils.c:1990
-#| msgid "Sending mail"
 msgid "Sending a memo"
 msgstr "Sending a memo"
 
 #: ../calendar/gui/itip-utils.c:1994
-#| msgid "Sending mail"
 msgid "Sending a task"
 msgstr "Sending a task"
 
@@ -5994,12 +5693,10 @@ msgid "New Task List"
 msgstr "New Task List"
 
 #: ../calendar/importers/icalendar-importer.c:353
-#| msgid "Create a new calendar"
 msgid "Cre_ate new calendar"
 msgstr "Cre_ate new calendar"
 
 #: ../calendar/importers/icalendar-importer.c:357
-#| msgid "Create a new task list"
 msgid "Cre_ate new task list"
 msgstr "Cre_ate new task list"
 
@@ -6033,7 +5730,6 @@ msgid "Calendar Events"
 msgstr "Calendar Events"
 
 #: ../calendar/importers/icalendar-importer.c:1152
-#| msgid "New Calendar"
 msgid "GNOME Calendar"
 msgstr "GNOME Calendar"
 
@@ -7075,7 +6771,6 @@ msgid "Asia/Kashgar"
 msgstr "Asia/Kashgar"
 
 #: ../calendar/zones.h:242
-#| msgid "Asia/Katmandu"
 msgid "Asia/Kathmandu"
 msgstr "Asia/Kathmandu"
 
@@ -7749,7 +7444,6 @@ msgstr "Open New Message window"
 
 #: ../composer/e-composer-actions.c:340 ../shell/e-shell.c:1217
 #: ../shell/e-shell-window-actions.c:848
-#| msgid "Prefere_nces"
 msgid "_Preferences"
 msgstr "_Preferences"
 
@@ -7866,12 +7560,10 @@ msgid "Toggles whether the CC field is displayed"
 msgstr "Toggles whether the Cc field is displayed"
 
 #: ../composer/e-composer-actions.c:531
-#| msgid "_From Field"
 msgid "_From Override Field"
 msgstr "_From Override Field"
 
 #: ../composer/e-composer-actions.c:533
-#| msgid "Toggles whether the Role field is displayed"
 msgid ""
 "Toggles whether the From override field to change name or email address is "
 "displayed"
@@ -7976,12 +7668,12 @@ msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 
-#: ../composer/e-msg-composer.c:1621 ../composer/e-msg-composer.c:2409
+#: ../composer/e-msg-composer.c:1621 ../composer/e-msg-composer.c:2403
 #: ../data/evolution.desktop.in.in.h:7
 msgid "Compose Message"
 msgstr "Compose Message"
 
-#: ../composer/e-msg-composer.c:4731
+#: ../composer/e-msg-composer.c:4728
 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."
 
@@ -8057,9 +7749,6 @@ msgid "_Save Draft"
 msgstr "_Save Draft"
 
 #: ../composer/mail-composer.error.xml.h:17
-#| msgid ""
-#| "Are you sure you want to discard the message, titled '{0}', you are "
-#| "composing?"
 msgid "Are you sure you want to discard the message you are composing?"
 msgstr "Are you sure you want to discard the message you are composing?"
 
@@ -8129,10 +7818,6 @@ msgid "Saving message to Outbox."
 msgstr "Saving message to Outbox."
 
 #: ../composer/mail-composer.error.xml.h:33
-#| 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."
 msgid ""
 "The message will be saved to your local Outbox folder, because the "
 "destination service is currently unavailable. You can send the message by "
@@ -8143,8 +7828,6 @@ msgstr ""
 "clicking the Send/Receive button in Evolution's toolbar."
 
 #: ../composer/mail-composer.error.xml.h:34
-#| 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?"
 msgid "Are you sure you want to send the message?"
 msgstr "Are you sure you want to send the message?"
 
@@ -8157,7 +7840,6 @@ msgstr ""
 "sending the message, if it was done by an accident, or send the message."
 
 #: ../composer/mail-composer.error.xml.h:37
-#| msgid "Are you sure you want to delete this memo?"
 msgid "Are you sure you want to change the composer mode?"
 msgstr "Are you sure you want to change the composer mode?"
 
@@ -8170,17 +7852,14 @@ msgstr ""
 "want to continue?"
 
 #: ../composer/mail-composer.error.xml.h:39
-#| msgid "Address formatting"
 msgid "_Don't lose formatting"
 msgstr "_Don't lose formatting"
 
 #: ../composer/mail-composer.error.xml.h:40
-#| msgid "Address formatting"
 msgid "Lose _formatting"
 msgstr "Lose _formatting"
 
 #: ../composer/mail-composer.error.xml.h:41
-#| msgid "An error occurred while saving to your Drafts folder."
 msgid "An error occurred while saving to your Templates folder."
 msgstr "An error occurred while saving to your Templates folder."
 
@@ -8193,7 +7872,7 @@ msgid "Calendar event notifications"
 msgstr "Calendar event notifications"
 
 #: ../data/evolution.desktop.in.in.h:1 ../evolution.appdata.xml.in.h:1
-#: ../mail/e-mail-browser.c:1096
+#: ../mail/e-mail-browser.c:1101
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
@@ -8212,12 +7891,10 @@ msgid "Manage your email, contacts and schedule"
 msgstr "Manage your e-mail, contacts and schedule"
 
 #: ../data/evolution.desktop.in.in.h:5
-#| msgid "mail;calendar;contact;addressbook;task;"
 msgid "email;calendar;contact;addressbook;task;"
 msgstr "email;calendar;contact;addressbook;task;"
 
 #: ../data/evolution.desktop.in.in.h:6
-#| msgid "New _Window"
 msgid "New Window"
 msgstr "New Window"
 
@@ -8344,57 +8021,46 @@ msgid "true"
 msgstr "true"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
-#| msgid "Whether to show timezone field in the event/meeting editor"
 msgid "Whether to show phone numbers in the editor"
 msgstr "Whether to show phone numbers in the editor"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
-#| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show SIP addresses in the editor"
 msgstr "Whether to show SIP addresses in the editor"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
-#| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show IM addresses in the editor"
 msgstr "Whether to show IM addresses in the editor"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
-#| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show mailing Home addresses in the editor"
 msgstr "Whether to show mailing Home addresses in the editor"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
-#| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show mailing addresses Work in the editor"
 msgstr "Whether to show mailing addresses Work in the editor"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
-#| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show mailing addresses Other in the editor"
 msgstr "Whether to show mailing addresses Other in the editor"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
-#| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show Web Addresses in the editor"
 msgstr "Whether to show Web Addresses in the editor"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
-#| msgid "Whether to show timezone field in the event/meeting editor"
 msgid "Whether to show job information in the editor"
 msgstr "Whether to show job information in the editor"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
-#| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show Miscellaneous information in the editor"
 msgstr "Whether to show Miscellaneous information in the editor"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
-#| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show notes in the editor"
 msgstr "Whether to show notes in the editor"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:32
-#| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show Certificates tab in the editor"
 msgstr "Whether to show Certificates tab in the editor"
 
@@ -8525,12 +8191,10 @@ msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minute the workday starts on, 0 to 59."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-#| msgid "Workday start hour"
 msgid "Workday start time for Monday"
 msgstr "Workday start time for Monday"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
-#| msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgid ""
 "Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, "
 "or -1 to use day-start-hour and day-start-minute"
@@ -8539,12 +8203,10 @@ msgstr ""
 "or -1 to use day-start-hour and day-start-minute"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
-#| msgid "Workday end hour"
 msgid "Workday end time for Monday"
 msgstr "Workday end time for Monday"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
-#| msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
 msgid ""
 "Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
 "-1 to use day-end-hour and day-end-minute"
@@ -8553,12 +8215,10 @@ msgstr ""
 "-1 to use day-end-hour and day-end-minute"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
-#| msgid "Workday start minute"
 msgid "Workday start time for Tuesday"
 msgstr "Workday start time for Tuesday"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
-#| msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
 msgid ""
 "Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
 "-1 to use day-start-hour and day-start-minute"
@@ -8567,57 +8227,46 @@ msgstr ""
 "-1 to use day-start-hour and day-start-minute"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
-#| msgid "Workday end minute"
 msgid "Workday end time for Tuesday"
 msgstr "Workday end time for Tuesday"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
-#| msgid "Workday start minute"
 msgid "Workday start time for Wednesday"
 msgstr "Workday start time for Wednesday"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
-#| msgid "Workday end minute"
 msgid "Workday end time for Wednesday"
 msgstr "Workday end time for Wednesday"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
-#| msgid "Workday start hour"
 msgid "Workday start time for Thursday"
 msgstr "Workday start time for Thursday"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
-#| msgid "Workday end hour"
 msgid "Workday end time for Thursday"
 msgstr "Workday end time for Thursday"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
-#| msgid "Workday start hour"
 msgid "Workday start time for Friday"
 msgstr "Workday start time for Friday"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
-#| msgid "Workday end hour"
 msgid "Workday end time for Friday"
 msgstr "Workday end time for Friday"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
-#| msgid "Workday start hour"
 msgid "Workday start time for Saturday"
 msgstr "Workday start time for Saturday"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
-#| msgid "Workday end hour"
 msgid "Workday end time for Saturday"
 msgstr "Workday end time for Saturday"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
-#| msgid "Workday start hour"
 msgid "Workday start time for Sunday"
 msgstr "Workday start time for Sunday"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
-#| msgid "Workday end hour"
 msgid "Workday end time for Sunday"
 msgstr "Workday end time for Sunday"
 
@@ -8670,7 +8319,6 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 msgstr "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
-#| msgid "Default reminder value"
 msgid "Default reminder snooze interval, in minutes"
 msgstr "Default reminder snooze interval, in minutes"
 
@@ -8957,13 +8605,10 @@ 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"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
-#| msgid "Show appointment end times in week and month views"
 msgid "Show appointment icons in the month view"
 msgstr "Show appointment icons in the month view"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
-#| msgid ""
-#| "Whether to display the end time of events in the week and month views"
 msgid "Whether to show icons of events in the month view"
 msgstr "Whether to show icons of events in the month view"
 
@@ -9045,7 +8690,6 @@ msgid "Position of the task preview pane when oriented vertically"
 msgstr "Position of the task preview pane when oriented vertically"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
-#| msgid "Hide completed tasks"
 msgid "Show reminders for completed tasks"
 msgstr "Show reminders for completed tasks"
 
@@ -9169,7 +8813,6 @@ msgid "Create events, memos and tasks as Private by default"
 msgstr "Create events, memos and tasks as Private by default"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
-#| msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
 msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 msgstr "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 
@@ -9267,12 +8910,10 @@ msgid "Default charset in which to compose messages"
 msgstr "Default charset in which to compose messages"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-#| msgid "Default charset in which to compose messages."
 msgid "Default charset in which to compose messages. Uses UTF-8, if not set."
 msgstr "Default charset in which to compose messages. Uses UTF-8, if not set."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
-#| msgid "_Show the photograph of sender in the message preview"
 msgid "Name of the editor to prefer in the message composer"
 msgstr "Name of the editor to prefer in the message composer"
 
@@ -9319,7 +8960,6 @@ msgid "Automatic emoticon recognition"
 msgstr "Automatic emoticon recognition"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
-#| msgid "Recognize emoticons in text and replace them with images."
 msgid ""
 "Recognize emoticons in text and replace them with images or Unicode "
 "characters."
@@ -9450,14 +9090,10 @@ msgstr ""
 "the View menu when a mail account is chosen."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-#| msgid "Show \"From\" field when sending a mail message"
 msgid "Show \"From\" override field when sending a mail message"
 msgstr "Show \"From\" override field when sending a mail message"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-#| msgid ""
-#| "Show the \"From\" field when sending a mail message. This is controlled "
-#| "from the View menu when a mail account is chosen."
 msgid ""
 "Show the \"From\" override field when sending a mail message. This is "
 "controlled from the View menu when a mail account is chosen."
@@ -9530,7 +9166,6 @@ msgstr ""
 "standard."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
-#| msgid "Saving message to Outbox."
 msgid "Send messages through Outbox folder"
 msgstr "Send messages through Outbox folder"
 
@@ -9743,7 +9378,6 @@ msgid "Default charset in which to display messages."
 msgstr "Default charset in which to display messages."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-#| msgid "Load images for HTML messages over HTTP"
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Automatically load images for HTML messages over HTTP"
 
@@ -9778,7 +9412,6 @@ msgid "Show all the headers when viewing a messages."
 msgstr "Show all the headers when viewing a messages."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
-#| msgid "Show all the headers when viewing a messages."
 msgid "List of headers to show when viewing a message."
 msgstr "List of headers to show when viewing a message."
 
@@ -9801,7 +9434,6 @@ msgid "Show the photo of the sender in the message reading pane."
 msgstr "Show the photo of the sender in the message reading pane."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
-#| msgid "Show photo of the sender"
 msgid "Search gravatar.com for photo of the sender"
 msgstr "Search gravatar.com for photo of the sender"
 
@@ -9818,7 +9450,6 @@ msgid "Mark as Seen after specified timeout."
 msgstr "Mark as Seen after specified timeout."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
-#| msgid "Mark as Seen after specified timeout"
 msgid "Mark as Seen always after specified timeout"
 msgstr "Mark as Seen always after specified timeout"
 
@@ -9839,7 +9470,6 @@ msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Timeout in milliseconds for marking messages as seen."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
-#| msgid "Show Attachment _Bar"
 msgid "Show Attachment Bar"
 msgstr "Show Attachment Bar"
 
@@ -9872,12 +9502,10 @@ msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Show deleted messages (with a strike-through) in the message-list."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
-#| msgid "Show deleted messages in the message-list"
 msgid "Show junk messages in the message-list"
 msgstr "Show junk messages in the message-list"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
-#| msgid "Show deleted messages (with a strike-through) in the message-list."
 msgid "Show junk messages (with a red strike-through) in the message-list."
 msgstr "Show junk messages (with a red strike-through) in the message-list."
 
@@ -10032,10 +9660,6 @@ msgid "Whether sort thread children always ascending"
 msgstr "Whether sort thread children always ascending"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
-#| 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 restart."
 msgid ""
 "This setting specifies whether the thread children should be sorted always "
 "ascending, rather than using the same sort order as in the thread root level."
@@ -10102,8 +9726,6 @@ msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr "Prompt on send when using key accelerator (Ctrl+Enter)"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
-#| msgid ""
-#| "Prompt the user when he or she tries to send a message without a Subject."
 msgid ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
@@ -10282,9 +9904,6 @@ msgstr ""
 "formatting"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
-#| msgid ""
-#| "It disables/enables the repeated prompts to warn that you are trying to "
-#| "send a message to recipients not entered as mail addresses"
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
 "composer mode and the content needs to lose its formatting."
@@ -10293,7 +9912,6 @@ msgstr ""
 "composer mode and the content needs to lose its formatting."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
-#| msgid "Prompt when replying to many recipients"
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "Prompt when sending to many To and CC recipients"
 
@@ -10549,7 +10167,6 @@ msgstr ""
 "server. The interval must be at least 30 seconds."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
-#| msgid "Confirm _when expunging a folder"
 msgid "Allow expunge in virtual folders"
 msgstr "Allow expunge in virtual folders"
 
@@ -10579,7 +10196,6 @@ msgstr ""
 "resulting HTML formatted message."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
-#| msgid "Whether to show local folders (On This Computer) in a folder tree."
 msgid "An Archive folder for On This Computer folders."
 msgstr "An Archive folder for On This Computer folders."
 
@@ -10592,7 +10208,6 @@ msgstr ""
 "Computer folder."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
-#| msgid "Default forward style"
 msgid "(Deprecated) Default forward style"
 msgstr "(Deprecated) Default forward style"
 
@@ -10605,7 +10220,6 @@ msgstr ""
 "\"forward-style-name\" instead."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
-#| msgid "Default reply style"
 msgid "(Deprecated) Default reply style"
 msgstr "(Deprecated) Default reply style"
 
@@ -10618,7 +10232,6 @@ msgstr ""
 "\"reply-style-name\" instead."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
-#| msgid "List of custom headers and whether they are enabled."
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(Deprecated) List of custom headers and whether they are enabled."
 
@@ -10631,7 +10244,6 @@ msgstr ""
 "\"show-headers\" instead."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
-#| msgid "Load images for HTML messages over HTTP"
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(Deprecated) Load images for HTML messages over HTTP"
 
@@ -10644,9 +10256,6 @@ msgstr ""
 "\"image-loading-policy\" instead."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
-#| msgid ""
-#| "Asks whether to close the message window when the user forwards or "
-#| "replies to the message shown in the window"
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -10886,10 +10495,6 @@ msgid "Mode to use when displaying mails"
 msgstr "Mode to use when displaying mails"
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
-#| msgid ""
-#| "The mode to use for displaying mails. \"normal\" makes Evolution choose "
-#| "the best part to show, \"prefer_plain\" makes it use the text part, if "
-#| "present, and \"only_plain\" forces Evolution to only show plain text"
 msgid ""
 "The mode to use for displaying mails. \"normal\" makes Evolution choose the "
 "best part to show, \"prefer_plain\" makes it use the text part, if present, "
@@ -10955,38 +10560,58 @@ msgstr "Initial file chooser folder"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Initial folder for GtkFileChooser dialogues."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:320
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
+msgid "Compression format used by autoar"
+msgstr "Compression format used by autoar"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
+msgid ""
+"Compression format used when compressing attached directories with autoar."
+msgstr ""
+"Compression format used when compressing attached directories with autoar."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
+msgid "Compression filter used by autoar"
+msgstr "Compression filter used by autoar"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
+msgid ""
+"Compression filter used when compressing attached directories with autoar."
+msgstr ""
+"Compression filter used when compressing attached directories with autoar."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11 ../shell/main.c:320
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Whether Evolution will start up in offline mode instead of online mode."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
 msgid "Offline folder paths"
 msgstr "Offline folder paths"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage."
 msgstr ""
 "List of paths for the folders to be synchronised to disk for offline usage."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
 msgid "Enable express mode"
 msgstr "Enable express mode"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
 msgid "Flag that enables a much simplified user interface."
 msgstr "Flag that enables a much simplified user interface."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
 msgid "List of button names to hide in the window switcher"
 msgstr "List of button names to hide in the window switcher"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
 msgid ""
 "Valid values are 'mail', 'addressbook', 'calendar', 'tasks' and 'memos'. "
 "Change of this requires restart of the application."
@@ -10994,19 +10619,19 @@ msgstr ""
 "Valid values are 'mail', 'addressbook', 'calendar', 'tasks' and 'memos'. "
 "Change of this requires restart of the application."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
 msgid "Window buttons are visible"
 msgstr "Window buttons are visible"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
 msgid "Whether the window buttons should be visible."
 msgstr "Whether the window buttons should be visible."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
 msgid "Window button style"
 msgstr "Window button style"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -11016,39 +10641,39 @@ msgstr ""
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
 msgid "Toolbar is visible"
 msgstr "Toolbar is visible"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Whether the toolbar should be visible."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
 msgid "Sidebar is visible"
 msgstr "Sidebar is visible"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
 msgid "Whether the sidebar should be visible."
 msgstr "Whether the sidebar should be visible."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
 msgid "Statusbar is visible"
 msgstr "Statusbar is visible"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:28
 msgid "Whether the status bar should be visible."
 msgstr "Whether the status bar should be visible."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:29
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ID or alias of the component to be shown by default at start-up."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:30
 msgid "Default sidebar width"
 msgstr "Default sidebar width"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:31
 msgid "The default width for the sidebar, in pixels."
 msgstr "The default width for the sidebar, in pixels."
 
@@ -11180,7 +10805,7 @@ msgstr "Format part as HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:123
 #: ../em-format/e-mail-formatter-text-plain.c:198
-#: ../e-util/e-html-editor-actions.c:1276
+#: ../e-util/e-html-editor-actions.c:1300
 msgid "Plain Text"
 msgstr "Plain Text"
 
@@ -11238,9 +10863,6 @@ msgstr ""
 "cannot be verified."
 
 #: ../em-format/e-mail-formatter-secure-button.c:50
-#| msgid ""
-#| "This message is signed with a signature, but there is no corresponding "
-#| "public key."
 msgid "This message is signed, but the public key is not in your keyring"
 msgstr "This message is signed, but the public key is not in your keyring"
 
@@ -11339,7 +10961,6 @@ msgid "GPG signed"
 msgstr "GPG signed"
 
 #: ../em-format/e-mail-formatter-utils.c:572
-#| msgid "GPG encrpyted"
 msgid "GPG encrypted"
 msgstr "GPG encrypted"
 
@@ -11348,7 +10969,6 @@ msgid "S/MIME signed"
 msgstr "S/MIME signed"
 
 #: ../em-format/e-mail-formatter-utils.c:584
-#| msgid "S/MIME encrpyted"
 msgid "S/MIME encrypted"
 msgstr "S/MIME encrypted"
 
@@ -11511,18 +11131,16 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
 #: ../e-util/e-activity-proxy.c:352
-#: ../modules/mail/e-mail-shell-view-actions.c:1908
+#: ../modules/mail/e-mail-shell-view-actions.c:1923
 msgid "Cancel"
 msgstr "Cancel"
 
 #. Translators: Escape is a keyboard binding.
 #: ../e-util/e-alert-bar.c:124
-#| msgid "Close this message"
 msgid "Close this message (Escape)"
 msgstr "Close this message (Escape)"
 
 #: ../e-util/e-alert-sink.c:246
-#| msgid "Failed to create thread: %s"
 msgid "Failed to create a thread: "
 msgstr "Failed to create a thread: "
 
@@ -11530,49 +11148,48 @@ msgstr "Failed to create a thread: "
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:1141
+#: ../e-util/e-attachment.c:1140
 msgid "Attached message"
 msgstr "Attached message"
 
-#: ../e-util/e-attachment.c:2043 ../e-util/e-attachment.c:3029
-#| msgid "Import cancelled."
+#: ../e-util/e-attachment.c:2042 ../e-util/e-attachment.c:3098
 msgid "Operation was cancelled"
 msgstr "Operation was cancelled"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment.c:2203 ../e-util/e-attachment.c:2891
-#: ../e-util/e-attachment.c:3262 ../e-util/e-attachment-store.c:864
+#: ../e-util/e-attachment.c:2226 ../e-util/e-attachment.c:2945
+#: ../e-util/e-attachment.c:3388 ../e-util/e-attachment-store.c:884
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../e-util/e-attachment.c:2284 ../e-util/e-attachment.c:3322
+#: ../e-util/e-attachment.c:2307 ../e-util/e-attachment.c:3448
 msgid "A load operation is already in progress"
 msgstr "A load operation is already in progress"
 
-#: ../e-util/e-attachment.c:2292 ../e-util/e-attachment.c:3330
+#: ../e-util/e-attachment.c:2315 ../e-util/e-attachment.c:3456
 msgid "A save operation is already in progress"
 msgstr "A save operation is already in progress"
 
-#: ../e-util/e-attachment.c:2689
+#: ../e-util/e-attachment.c:2712
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Could not open '%s'"
 
-#: ../e-util/e-attachment.c:2692
+#: ../e-util/e-attachment.c:2715
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Could not open the attachment"
 
-#: ../e-util/e-attachment.c:3339
+#: ../e-util/e-attachment.c:3465
 msgid "Attachment contents not loaded"
 msgstr "Attachment contents not loaded"
 
-#: ../e-util/e-attachment.c:3430
+#: ../e-util/e-attachment.c:3556
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Could not save '%s'"
 
-#: ../e-util/e-attachment.c:3433
+#: ../e-util/e-attachment.c:3559
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Could not save the attachment"
@@ -11586,8 +11203,8 @@ msgid "F_ilename:"
 msgstr "F_ilename:"
 
 #: ../e-util/e-attachment-dialog.c:356
-#: ../e-util/e-html-editor-image-dialog.c:511
-#: ../e-util/e-html-editor-link-dialog.c:244
+#: ../e-util/e-html-editor-image-dialog.c:510
+#: ../e-util/e-html-editor-link-dialog.c:243
 msgid "_Description:"
 msgstr "_Description:"
 
@@ -11595,7 +11212,7 @@ msgstr "_Description:"
 msgid "MIME Type:"
 msgstr "MIME Type:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:694
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:696
 msgid "_Suggest automatic display of attachment"
 msgstr "_Suggest automatic display of attachment"
 
@@ -11625,34 +11242,33 @@ msgstr "Hide Attachment _Bar"
 msgid "Show Attachment _Bar"
 msgstr "Show Attachment _Bar"
 
-#: ../e-util/e-attachment-store.c:659
+#: ../e-util/e-attachment-store.c:661
 msgid "Add Attachment"
 msgstr "Add Attachment"
 
-#: ../e-util/e-attachment-store.c:666 ../e-util/e-attachment-store.c:668
+#: ../e-util/e-attachment-store.c:668 ../e-util/e-attachment-store.c:670
 msgid "A_ttach"
 msgstr "A_ttach"
 
-#: ../e-util/e-attachment-store.c:706
+#: ../e-util/e-attachment-store.c:717
 msgid "Archive selected directories using this format:"
 msgstr "Archive selected directories using this format:"
 
-#: ../e-util/e-attachment-store.c:799
+#: ../e-util/e-attachment-store.c:821
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Save Attachment"
 msgstr[1] "Save Attachments"
 
-#: ../e-util/e-attachment-store.c:826
-#| msgid "Could not load the attachment"
+#: ../e-util/e-attachment-store.c:848
 msgid "Do _not extract files from the attachment"
 msgstr "Do _not extract files from the attachment"
 
-#: ../e-util/e-attachment-store.c:831
+#: ../e-util/e-attachment-store.c:853
 msgid "Save extracted files _only"
 msgstr "Save extracted files _only"
 
-#: ../e-util/e-attachment-store.c:836
+#: ../e-util/e-attachment-store.c:858
 msgid "Save extracted files and the original _archive"
 msgstr "Save extracted files and the original _archive"
 
@@ -11665,7 +11281,6 @@ msgid "S_ave All"
 msgstr "S_ave All"
 
 #: ../e-util/e-attachment-view.c:324
-#| msgid "Save As..."
 msgid "Sa_ve As"
 msgstr "Sa_ve As"
 
@@ -11673,7 +11288,6 @@ msgstr "Sa_ve As"
 #: ../plugins/save-calendar/save-calendar.c:349
 #: ../plugins/save-calendar/save-calendar.c:380
 #: ../plugins/save-calendar/save-calendar.c:411
-#| msgid "Save _As..."
 msgid "Save _As"
 msgstr "Save _As"
 
@@ -11686,8 +11300,8 @@ msgstr "A_dd Attachment…"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1278
 #: ../modules/calendar/e-memo-shell-view-actions.c:607
 #: ../modules/calendar/e-task-shell-view-actions.c:733
-#: ../modules/mail/e-mail-shell-view-actions.c:1702
-#: ../modules/mail/e-mail-shell-view-actions.c:1773
+#: ../modules/mail/e-mail-shell-view-actions.c:1717
+#: ../modules/mail/e-mail-shell-view-actions.c:1788
 msgid "_Properties"
 msgstr "_Properties"
 
@@ -11793,19 +11407,16 @@ msgid "_Available Categories:"
 msgstr "_Available Categories:"
 
 #: ../e-util/e-categories-editor.c:274
-#| msgid "_New"
 msgctxt "category"
 msgid "_New"
 msgstr "_New"
 
 #: ../e-util/e-categories-editor.c:278
-#| msgid "_Edit"
 msgctxt "category"
 msgid "_Edit"
 msgstr "_Edit"
 
 #: ../e-util/e-categories-editor.c:282
-#| msgid "_Delete"
 msgctxt "category"
 msgid "_Delete"
 msgstr "_Delete"
@@ -11983,7 +11594,6 @@ msgid "Cannot create a client object from extension name '%s'"
 msgstr "Cannot create a client object from extension name '%s'"
 
 #: ../e-util/e-color-chooser-widget.c:124
-#| msgid "Use custom fonts"
 msgid "Choose custom color"
 msgstr "Choose custom colour"
 
@@ -12016,18 +11626,14 @@ msgid "purple #2"
 msgstr "purple #2"
 
 #: ../e-util/e-color-combo.c:88
-#| msgid "Every day"
-#| msgid_plural "Every %d days"
 msgid "very dark gray"
 msgstr "very dark gray"
 
 #: ../e-util/e-color-combo.c:90
-#| msgid "Mark as _Unread"
 msgid "dark red"
 msgstr "dark red"
 
 #: ../e-util/e-color-combo.c:91
-#| msgid "range"
 msgid "red-orange"
 msgstr "red-orange"
 
@@ -12056,12 +11662,10 @@ msgid "dark grey"
 msgstr "dark grey"
 
 #: ../e-util/e-color-combo.c:99
-#| msgid "3rd"
 msgid "red"
 msgstr "red"
 
 #: ../e-util/e-color-combo.c:100
-#| msgid "range"
 msgid "orange"
 msgstr "orange"
 
@@ -12090,7 +11694,6 @@ msgid "gray"
 msgstr "gray"
 
 #: ../e-util/e-color-combo.c:108
-#| msgid "Image"
 msgid "magenta"
 msgstr "magenta"
 
@@ -12115,7 +11718,6 @@ msgid "bright blue"
 msgstr "bright blue"
 
 #: ../e-util/e-color-combo.c:114
-#| msgid "_Required people"
 msgid "red purple"
 msgstr "red purple"
 
@@ -12128,7 +11730,6 @@ msgid "pink"
 msgstr "pink"
 
 #: ../e-util/e-color-combo.c:118
-#| msgid "daylight savings time"
 msgid "light orange"
 msgstr "light orange"
 
@@ -12298,7 +11899,6 @@ msgstr "S_ad"
 
 #. Translators: ;-)
 #: ../e-util/e-emoticon-chooser.c:44
-#| msgid "_Window"
 msgid "_Wink"
 msgstr "_Wink"
 
@@ -12314,7 +11914,6 @@ msgstr "Laug_h"
 
 #. Translators: :-|
 #: ../e-util/e-emoticon-chooser.c:50
-#| msgid "_Plain text"
 msgid "_Plain"
 msgstr "_Plain"
 
@@ -12390,7 +11989,6 @@ msgstr "De_vilish"
 
 #. Translators: :-(|)
 #: ../e-util/e-emoticon-chooser.c:80
-#| msgid "_Mon"
 msgid "_Monkey"
 msgstr "_Monkey"
 
@@ -12533,23 +12131,23 @@ msgstr "Select a time to compare against"
 msgid "Choose a File"
 msgstr "Choose a File"
 
-#: ../e-util/e-filter-rule.c:761
+#: ../e-util/e-filter-rule.c:765
 msgid "R_ule name:"
 msgstr "R_ule name:"
 
-#: ../e-util/e-filter-rule.c:811
+#: ../e-util/e-filter-rule.c:815
 msgid "all the following conditions"
 msgstr "all the following conditions"
 
-#: ../e-util/e-filter-rule.c:812
+#: ../e-util/e-filter-rule.c:816
 msgid "any of the following conditions"
 msgstr "any of the following conditions"
 
-#: ../e-util/e-filter-rule.c:818
+#: ../e-util/e-filter-rule.c:822
 msgid "_Find items which match:"
 msgstr "_Find items which match:"
 
-#: ../e-util/e-filter-rule.c:841
+#: ../e-util/e-filter-rule.c:845
 msgid "Find items that meet the following conditions"
 msgstr "Find items that meet the following conditions"
 
@@ -12557,7 +12155,7 @@ msgstr "Find items that meet the following conditions"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:856 ../e-util/e-html-editor-page-dialog.c:61
+#: ../e-util/e-filter-rule.c:860 ../e-util/e-html-editor-page-dialog.c:61
 #: ../e-util/e-mail-identity-combo-box.c:479
 #: ../e-util/e-mail-signature-combo-box.c:367
 #: ../libemail-engine/camel-null-store.c:27
@@ -12566,638 +12164,553 @@ msgstr "Find items that meet the following conditions"
 msgid "None"
 msgstr "None"
 
-#: ../e-util/e-filter-rule.c:857
+#: ../e-util/e-filter-rule.c:861
 msgid "All related"
 msgstr "All related"
 
-#: ../e-util/e-filter-rule.c:858 ../e-util/e-send-options.ui.h:19
+#: ../e-util/e-filter-rule.c:862 ../e-util/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Replies"
 
-#: ../e-util/e-filter-rule.c:859
+#: ../e-util/e-filter-rule.c:863
 msgid "Replies and parents"
 msgstr "Replies and parents"
 
-#: ../e-util/e-filter-rule.c:860
+#: ../e-util/e-filter-rule.c:864
 msgid "No reply or parent"
 msgstr "No reply or parent"
 
-#: ../e-util/e-filter-rule.c:863
+#: ../e-util/e-filter-rule.c:867
 msgid "I_nclude threads:"
 msgstr "I_nclude threads:"
 
-#: ../e-util/e-filter-rule.c:942
+#: ../e-util/e-filter-rule.c:946
 msgid "A_dd Condition"
 msgstr "A_dd Condition"
 
-#: ../e-util/e-filter-rule.c:1256 ../e-util/filter.ui.h:1
+#: ../e-util/e-filter-rule.c:1260 ../e-util/filter.ui.h:1
 #: ../mail/em-utils.c:165
 msgid "Incoming"
 msgstr "Incoming"
 
-#: ../e-util/e-filter-rule.c:1256 ../mail/em-utils.c:166
+#: ../e-util/e-filter-rule.c:1260 ../mail/em-utils.c:166
 msgid "Outgoing"
 msgstr "Outgoing"
 
-#: ../e-util/e-html-editor-actions.c:58
-#| msgid "Failed to open folder."
+#: ../e-util/e-html-editor-actions.c:82
 msgid "Failed to insert HTML file."
 msgstr "Failed to insert HTML file."
 
-#: ../e-util/e-html-editor-actions.c:96
-#| msgid "Failed to import certificate"
+#: ../e-util/e-html-editor-actions.c:120
 msgid "Failed to insert text file."
 msgstr "Failed to insert text file."
 
-#: ../e-util/e-html-editor-actions.c:297
-#| msgid "Input File"
+#: ../e-util/e-html-editor-actions.c:321
 msgid "Insert HTML File"
 msgstr "Insert HTML File"
 
-#: ../e-util/e-html-editor-actions.c:303
-#| msgid "HTML _Mode"
+#: ../e-util/e-html-editor-actions.c:327
 msgid "HTML file"
 msgstr "HTML file"
 
-#: ../e-util/e-html-editor-actions.c:330
-#| msgid "Inline Image"
+#: ../e-util/e-html-editor-actions.c:354
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: ../e-util/e-html-editor-actions.c:388
-#| msgid "Increase the text size"
+#: ../e-util/e-html-editor-actions.c:412
 msgid "Insert text file"
 msgstr "Insert text file"
 
-#: ../e-util/e-html-editor-actions.c:394
-#| msgid "Select a file"
+#: ../e-util/e-html-editor-actions.c:418
 msgid "Text file"
 msgstr "Text file"
 
-#: ../e-util/e-html-editor-actions.c:842
-#| msgid "Copy selected events to the clipboard"
+#: ../e-util/e-html-editor-actions.c:866
 msgid "Copy selected text to the clipboard"
 msgstr "Copy selected text to the clipboard"
 
-#: ../e-util/e-html-editor-actions.c:849
-#| msgid "Cut selected events to the clipboard"
+#: ../e-util/e-html-editor-actions.c:873
 msgid "Cut selected text to the clipboard"
 msgstr "Cut selected text to the clipboard"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:856
-#| msgid "Paste events from the clipboard"
+#: ../e-util/e-html-editor-actions.c:880
 msgid "Paste text from the clipboard"
 msgstr "Paste text from the clipboard"
 
-#: ../e-util/e-html-editor-actions.c:863
+#: ../e-util/e-html-editor-actions.c:887
 msgid "Redo the last undone action"
 msgstr "Redo the last undone action"
 
-#: ../e-util/e-html-editor-actions.c:877
+#: ../e-util/e-html-editor-actions.c:901
 msgid "Undo the last action"
 msgstr "Undo the last action"
 
-#: ../e-util/e-html-editor-actions.c:898
+#: ../e-util/e-html-editor-actions.c:922
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ../e-util/e-html-editor-actions.c:905
-#| msgid "Tool_bar Style"
+#: ../e-util/e-html-editor-actions.c:929
 msgid "_Paragraph Style"
 msgstr "_Paragraph Style"
 
-#: ../e-util/e-html-editor-actions.c:919
-#: ../e-util/e-html-editor-image-dialog.c:588
-#| msgid "A_lignment"
+#: ../e-util/e-html-editor-actions.c:943
+#: ../e-util/e-html-editor-image-dialog.c:587
 msgid "_Alignment"
 msgstr "_Alignment"
 
-#: ../e-util/e-html-editor-actions.c:926
-#| msgid "_Languages"
+#: ../e-util/e-html-editor-actions.c:950
 msgid "Current _Languages"
 msgstr "Current _Languages"
 
-#: ../e-util/e-html-editor-actions.c:943
+#: ../e-util/e-html-editor-actions.c:967
 msgid "_Increase Indent"
 msgstr "_Increase Indent"
 
-#: ../e-util/e-html-editor-actions.c:945
+#: ../e-util/e-html-editor-actions.c:969
 msgid "Increase Indent"
 msgstr "Increase Indent"
 
-#: ../e-util/e-html-editor-actions.c:950
+#: ../e-util/e-html-editor-actions.c:974
 msgid "_HTML File..."
 msgstr "_HTML File..."
 
-#: ../e-util/e-html-editor-actions.c:957
+#: ../e-util/e-html-editor-actions.c:981
 msgid "Te_xt File..."
 msgstr "Te_xt File..."
 
-#: ../e-util/e-html-editor-actions.c:964
+#: ../e-util/e-html-editor-actions.c:988
 msgid "Paste _Quotation"
 msgstr "Paste _Quotation"
 
-#: ../e-util/e-html-editor-actions.c:971
-#| msgid "_Find in Memo..."
+#: ../e-util/e-html-editor-actions.c:995
 msgid "_Find..."
 msgstr "_Find..."
 
-#: ../e-util/e-html-editor-actions.c:973
+#: ../e-util/e-html-editor-actions.c:997
 msgid "Search for text"
 msgstr "Search for text"
 
-#: ../e-util/e-html-editor-actions.c:978
-#| msgid "Find _next"
+#: ../e-util/e-html-editor-actions.c:1002
 msgid "Find A_gain"
 msgstr "Find A_gain"
 
-#: ../e-util/e-html-editor-actions.c:985
-#| msgid "_Replace"
+#: ../e-util/e-html-editor-actions.c:1009
 msgid "Re_place..."
 msgstr "Re_place..."
 
-#: ../e-util/e-html-editor-actions.c:987
+#: ../e-util/e-html-editor-actions.c:1011
 msgid "Search for and replace text"
 msgstr "Search for and replace text"
 
-#: ../e-util/e-html-editor-actions.c:992
-#| msgid "Canceling..."
+#: ../e-util/e-html-editor-actions.c:1016
 msgid "Check _Spelling..."
 msgstr "Check _Spelling..."
 
-#: ../e-util/e-html-editor-actions.c:999
+#: ../e-util/e-html-editor-actions.c:1023
 msgid "_Decrease Indent"
 msgstr "_Decrease Indent"
 
-#: ../e-util/e-html-editor-actions.c:1001
+#: ../e-util/e-html-editor-actions.c:1025
 msgid "Decrease Indent"
 msgstr "Decrease Indent"
 
-#: ../e-util/e-html-editor-actions.c:1006
-#| msgid "Max lines"
+#: ../e-util/e-html-editor-actions.c:1030
 msgid "_Wrap Lines"
 msgstr "_Wrap Lines"
 
 #. Center
-#: ../e-util/e-html-editor-actions.c:1016
+#: ../e-util/e-html-editor-actions.c:1040
 #: ../e-util/e-html-editor-paragraph-dialog.c:110
 msgid "_Center"
 msgstr "_Centre"
 
-#: ../e-util/e-html-editor-actions.c:1018
-#| msgid "A_lignment"
+#: ../e-util/e-html-editor-actions.c:1042
 msgid "Center Alignment"
 msgstr "Centre Alignment"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1023
+#: ../e-util/e-html-editor-actions.c:1047
 #: ../e-util/e-html-editor-paragraph-dialog.c:101
-#| msgid "Left:"
 msgid "_Left"
 msgstr "_Left"
 
-#: ../e-util/e-html-editor-actions.c:1025
-#| msgid "A_lignment"
+#: ../e-util/e-html-editor-actions.c:1049
 msgid "Left Alignment"
 msgstr "Left Alignment"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1030
+#: ../e-util/e-html-editor-actions.c:1054
 #: ../e-util/e-html-editor-paragraph-dialog.c:119
-#| msgid "Right:"
 msgid "_Right"
 msgstr "_Right"
 
-#: ../e-util/e-html-editor-actions.c:1032
-#| msgid "A_lignment"
+#: ../e-util/e-html-editor-actions.c:1056
 msgid "Right Alignment"
 msgstr "Right Alignment"
 
-#: ../e-util/e-html-editor-actions.c:1040
+#: ../e-util/e-html-editor-actions.c:1064
 #: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1042
+#: ../e-util/e-html-editor-actions.c:1066
 msgid "HTML editing mode"
 msgstr "HTML editing mode"
 
-#: ../e-util/e-html-editor-actions.c:1047
-#| msgid "Plain Text"
+#: ../e-util/e-html-editor-actions.c:1071
 msgid "Plain _Text"
 msgstr "Plain _Text"
 
-#: ../e-util/e-html-editor-actions.c:1049
-#| msgid "Plain Text Mode"
+#: ../e-util/e-html-editor-actions.c:1073
 msgid "Plain text editing mode"
 msgstr "Plain text editing mode"
 
-#: ../e-util/e-html-editor-actions.c:1057
-#| msgid "Normal"
+#: ../e-util/e-html-editor-actions.c:1081
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../e-util/e-html-editor-actions.c:1064
-#| msgid "Header"
+#: ../e-util/e-html-editor-actions.c:1088
 msgid "Header _1"
 msgstr "Header _1"
 
-#: ../e-util/e-html-editor-actions.c:1071
-#| msgid "Header"
+#: ../e-util/e-html-editor-actions.c:1095
 msgid "Header _2"
 msgstr "Header _2"
 
-#: ../e-util/e-html-editor-actions.c:1078
-#| msgid "Header"
+#: ../e-util/e-html-editor-actions.c:1102
 msgid "Header _3"
 msgstr "Header _3"
 
-#: ../e-util/e-html-editor-actions.c:1085
-#| msgid "Header"
+#: ../e-util/e-html-editor-actions.c:1109
 msgid "Header _4"
 msgstr "Header _4"
 
-#: ../e-util/e-html-editor-actions.c:1092
-#| msgid "Header"
+#: ../e-util/e-html-editor-actions.c:1116
 msgid "Header _5"
 msgstr "Header _5"
 
-#: ../e-util/e-html-editor-actions.c:1099
-#| msgid "Header"
+#: ../e-util/e-html-editor-actions.c:1123
 msgid "Header _6"
 msgstr "Header _6"
 
-#: ../e-util/e-html-editor-actions.c:1106
-#| msgid "View _Unformatted"
+#: ../e-util/e-html-editor-actions.c:1130
 msgid "_Preformatted"
 msgstr "_Preformatted"
 
-#: ../e-util/e-html-editor-actions.c:1113
-#| msgid "Address"
+#: ../e-util/e-html-editor-actions.c:1137
 msgid "A_ddress"
 msgstr "A_ddress"
 
-#: ../e-util/e-html-editor-actions.c:1120
-#| msgid "D_elete Memo List"
+#: ../e-util/e-html-editor-actions.c:1144
 msgid "_Bulleted List"
 msgstr "_Bulleted List"
 
-#: ../e-util/e-html-editor-actions.c:1127
+#: ../e-util/e-html-editor-actions.c:1151
 msgid "_Roman Numeral List"
 msgstr "_Roman Numeral List"
 
-#: ../e-util/e-html-editor-actions.c:1134
-#| msgid "Retrieve _List"
+#: ../e-util/e-html-editor-actions.c:1158
 msgid "Numbered _List"
 msgstr "Numbered _List"
 
-#: ../e-util/e-html-editor-actions.c:1141
+#: ../e-util/e-html-editor-actions.c:1165
 msgid "_Alphabetical List"
 msgstr "_Alphabetical List"
 
-#: ../e-util/e-html-editor-actions.c:1157
-#: ../e-util/e-html-editor-actions.c:1195
-#| msgid "Save _Image..."
+#: ../e-util/e-html-editor-actions.c:1181
+#: ../e-util/e-html-editor-actions.c:1219
 msgid "_Image..."
 msgstr "_Image..."
 
 #. Translators: This is an action tooltip
-#: ../e-util/e-html-editor-actions.c:1160
-#| msgid "Inline Image"
+#: ../e-util/e-html-editor-actions.c:1184
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: ../e-util/e-html-editor-actions.c:1165
-#: ../e-util/e-html-editor-actions.c:1202
+#: ../e-util/e-html-editor-actions.c:1189
+#: ../e-util/e-html-editor-actions.c:1226
 msgid "_Link..."
 msgstr "_Link..."
 
-#: ../e-util/e-html-editor-actions.c:1167
-#| msgid "_Insert"
+#: ../e-util/e-html-editor-actions.c:1191
 msgid "Insert Link"
 msgstr "Insert Link"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1173
-#: ../e-util/e-html-editor-actions.c:1217
-#| msgid "_Rename..."
+#: ../e-util/e-html-editor-actions.c:1197
+#: ../e-util/e-html-editor-actions.c:1241
 msgid "_Rule..."
 msgstr "_Rule..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1176
-#| msgid "_Insert"
+#: ../e-util/e-html-editor-actions.c:1200
 msgid "Insert Rule"
 msgstr "Insert Rule"
 
-#: ../e-util/e-html-editor-actions.c:1181
-#: ../e-util/e-html-editor-actions.c:1224
-#| msgid "Table"
+#: ../e-util/e-html-editor-actions.c:1205
+#: ../e-util/e-html-editor-actions.c:1248
 msgid "_Table..."
 msgstr "_Table..."
 
-#: ../e-util/e-html-editor-actions.c:1183
-#| msgid "Task Table"
+#: ../e-util/e-html-editor-actions.c:1207
 msgid "Insert Table"
 msgstr "Insert Table"
 
-#: ../e-util/e-html-editor-actions.c:1188
+#: ../e-util/e-html-editor-actions.c:1212
 msgid "_Cell..."
 msgstr "_Cell..."
 
-#: ../e-util/e-html-editor-actions.c:1209
-#| msgid "Save _Image..."
+#: ../e-util/e-html-editor-actions.c:1233
 msgid "Pa_ge..."
 msgstr "Pa_ge..."
 
-#: ../e-util/e-html-editor-actions.c:1233
-#| msgid "Folder Size"
+#: ../e-util/e-html-editor-actions.c:1257
 msgid "Font _Size"
 msgstr "Font _Size"
 
-#: ../e-util/e-html-editor-actions.c:1240
-#| msgid "_Forward style:"
+#: ../e-util/e-html-editor-actions.c:1264
 msgid "_Font Style"
 msgstr "_Font Style"
 
-#: ../e-util/e-html-editor-actions.c:1247
+#: ../e-util/e-html-editor-actions.c:1271
 msgid "Paste As _Text"
 msgstr "Paste As _Text"
 
-#: ../e-util/e-html-editor-actions.c:1258
+#: ../e-util/e-html-editor-actions.c:1282
 #: ../e-util/e-html-editor-text-dialog.c:203
-#| msgid "Bold"
 msgid "_Bold"
 msgstr "_Bold"
 
-#: ../e-util/e-html-editor-actions.c:1260
+#: ../e-util/e-html-editor-actions.c:1284
 msgid "Bold"
 msgstr "Bold"
 
-#: ../e-util/e-html-editor-actions.c:1266
+#: ../e-util/e-html-editor-actions.c:1290
 #: ../e-util/e-html-editor-text-dialog.c:214
-#| msgid "Italy"
 msgid "_Italic"
 msgstr "_Italic"
 
-#: ../e-util/e-html-editor-actions.c:1268
-#| msgid "Italy"
+#: ../e-util/e-html-editor-actions.c:1292
 msgid "Italic"
 msgstr "Italic"
 
-#: ../e-util/e-html-editor-actions.c:1274
-#| msgid "Plain Text"
+#: ../e-util/e-html-editor-actions.c:1298
 msgid "_Plain Text"
 msgstr "_Plain Text"
 
-#: ../e-util/e-html-editor-actions.c:1282
+#: ../e-util/e-html-editor-actions.c:1306
 #: ../e-util/e-html-editor-text-dialog.c:235
-#| msgid "Strikeout"
 msgid "_Strikethrough"
 msgstr "_Strikethrough"
 
-#: ../e-util/e-html-editor-actions.c:1284
-#| msgid "Strikeout"
+#: ../e-util/e-html-editor-actions.c:1308
 msgid "Strikethrough"
 msgstr "Strikethrough"
 
-#: ../e-util/e-html-editor-actions.c:1290
+#: ../e-util/e-html-editor-actions.c:1314
 #: ../e-util/e-html-editor-text-dialog.c:225
-#| msgid "Undefined"
 msgid "_Underline"
 msgstr "_Underline"
 
-#: ../e-util/e-html-editor-actions.c:1292
-#| msgid "Undefined"
+#: ../e-util/e-html-editor-actions.c:1316
 msgid "Underline"
 msgstr "Underline"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1302
+#: ../e-util/e-html-editor-actions.c:1326
 msgid "-2"
 msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1310
-#| msgid "1"
+#: ../e-util/e-html-editor-actions.c:1334
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1318
+#: ../e-util/e-html-editor-actions.c:1342
 msgid "+0"
 msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1326
-#| msgid "1"
+#: ../e-util/e-html-editor-actions.c:1350
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1334
+#: ../e-util/e-html-editor-actions.c:1358
 msgid "+2"
 msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1342
+#: ../e-util/e-html-editor-actions.c:1366
 msgid "+3"
 msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1350
+#: ../e-util/e-html-editor-actions.c:1374
 msgid "+4"
 msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1369
-#| msgid "_Contents"
+#: ../e-util/e-html-editor-actions.c:1393
 msgid "Cell Contents"
 msgstr "Cell Contents"
 
-#: ../e-util/e-html-editor-actions.c:1376
-#| msgid "Bold Column"
+#: ../e-util/e-html-editor-actions.c:1400
 msgid "Column"
 msgstr "Column"
 
-#: ../e-util/e-html-editor-actions.c:1383
-#| msgid "Low"
+#: ../e-util/e-html-editor-actions.c:1407
 msgid "Row"
 msgstr "Row"
 
-#: ../e-util/e-html-editor-actions.c:1390
+#: ../e-util/e-html-editor-actions.c:1414
 msgid "Table"
 msgstr "Table"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1400
-#| msgid "Table Cell"
+#: ../e-util/e-html-editor-actions.c:1424
 msgid "Table Delete"
 msgstr "Table Delete"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1408
-#| msgid "Table Cell"
+#: ../e-util/e-html-editor-actions.c:1432
 msgid "Table Insert"
 msgstr "Table Insert"
 
-#: ../e-util/e-html-editor-actions.c:1415
-#| msgid "_Properties"
+#: ../e-util/e-html-editor-actions.c:1439
 msgid "Properties"
 msgstr "Properties"
 
-#: ../e-util/e-html-editor-actions.c:1433
-#| msgid "Column Width"
+#: ../e-util/e-html-editor-actions.c:1457
 msgid "Column After"
 msgstr "Column After"
 
-#: ../e-util/e-html-editor-actions.c:1440
+#: ../e-util/e-html-editor-actions.c:1464
 msgid "Column Before"
 msgstr "Column Before"
 
-#: ../e-util/e-html-editor-actions.c:1447
-#| msgid "_Insert"
+#: ../e-util/e-html-editor-actions.c:1471
 msgid "Insert _Link"
 msgstr "Insert _Link"
 
-#: ../e-util/e-html-editor-actions.c:1454
+#: ../e-util/e-html-editor-actions.c:1478
 msgid "Row Above"
 msgstr "Row Above"
 
-#: ../e-util/e-html-editor-actions.c:1461
+#: ../e-util/e-html-editor-actions.c:1485
 msgid "Row Below"
 msgstr "Row Below"
 
-#: ../e-util/e-html-editor-actions.c:1468
+#: ../e-util/e-html-editor-actions.c:1492
 msgid "Cell..."
 msgstr "Cell..."
 
-#: ../e-util/e-html-editor-actions.c:1475
-#| msgid "Image"
+#: ../e-util/e-html-editor-actions.c:1499
 msgid "Image..."
 msgstr "Image..."
 
-#: ../e-util/e-html-editor-actions.c:1482
+#: ../e-util/e-html-editor-actions.c:1506
 msgid "Link..."
 msgstr "Link..."
 
-#: ../e-util/e-html-editor-actions.c:1489
-#| msgid "Pager"
+#: ../e-util/e-html-editor-actions.c:1513
 msgid "Page..."
 msgstr "Page..."
 
-#: ../e-util/e-html-editor-actions.c:1496
-#| msgid "Paraguay"
+#: ../e-util/e-html-editor-actions.c:1520
 msgid "Paragraph..."
 msgstr "Paragraph..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1504
-#| msgid "Full _Name..."
+#: ../e-util/e-html-editor-actions.c:1528
 msgid "Rule..."
 msgstr "Rule..."
 
-#: ../e-util/e-html-editor-actions.c:1511
-#| msgid "Table"
+#: ../e-util/e-html-editor-actions.c:1535
 msgid "Table..."
 msgstr "Table..."
 
-#: ../e-util/e-html-editor-actions.c:1518
-#| msgid "Text"
+#: ../e-util/e-html-editor-actions.c:1542
 msgid "Text..."
 msgstr "Text..."
 
-#: ../e-util/e-html-editor-actions.c:1525
-#| msgid "Remove"
+#: ../e-util/e-html-editor-actions.c:1549
 msgid "Remove Link"
 msgstr "Remove Link"
 
-#: ../e-util/e-html-editor-actions.c:1542
-#| msgid "Add \"%s\" to Dictionary"
+#: ../e-util/e-html-editor-actions.c:1566
 msgid "Add Word to Dictionary"
 msgstr "Add Word to Dictionary"
 
-#: ../e-util/e-html-editor-actions.c:1549
-#| msgid "Color for _misspelled words:"
+#: ../e-util/e-html-editor-actions.c:1573
 msgid "Ignore Misspelled Word"
 msgstr "Ignore Misspelt Word"
 
-#: ../e-util/e-html-editor-actions.c:1556
+#: ../e-util/e-html-editor-actions.c:1580
 msgid "Add Word To"
 msgstr "Add Word To"
 
-#: ../e-util/e-html-editor-actions.c:1565
-#| msgid "(no suggestions)"
+#: ../e-util/e-html-editor-actions.c:1589
 msgid "More Suggestions"
 msgstr "More Suggestions"
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../e-util/e-html-editor-actions.c:1689
+#: ../e-util/e-html-editor-actions.c:1713
 #, c-format
-#| msgid "Add \"%s\" to Dictionary"
 msgid "%s Dictionary"
 msgstr "%s Dictionary"
 
-#: ../e-util/e-html-editor-actions.c:1768
+#: ../e-util/e-html-editor-actions.c:1792
 msgid "_Emoticon"
 msgstr "_Emoticon"
 
-#: ../e-util/e-html-editor-actions.c:1769
-#| msgid "Insert Send options"
+#: ../e-util/e-html-editor-actions.c:1793
 msgid "Insert Emoticon"
 msgstr "Insert Emoticon"
 
-#: ../e-util/e-html-editor-actions.c:1837
-#| msgid "_Replace"
+#: ../e-util/e-html-editor-actions.c:1861
 msgid "Re_place"
 msgstr "Re_place"
 
-#: ../e-util/e-html-editor-actions.c:1840
-#| msgid "Image"
+#: ../e-util/e-html-editor-actions.c:1864
 msgid "_Image"
 msgstr "_Image"
 
-#: ../e-util/e-html-editor-actions.c:1843
+#: ../e-util/e-html-editor-actions.c:1867
 msgid "_Link"
 msgstr "_Link"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1847
-#| msgid "Add Rule"
+#: ../e-util/e-html-editor-actions.c:1871
 msgid "_Rule"
 msgstr "_Rule"
 
-#: ../e-util/e-html-editor-actions.c:1850
+#: ../e-util/e-html-editor-actions.c:1874
 #: ../e-util/e-html-editor-cell-dialog.c:450
-#| msgid "Table"
 msgid "_Table"
 msgstr "_Table"
 
 #: ../e-util/e-html-editor.c:689
-#| msgid "Paraguay"
 msgid "Paragraph Style"
 msgstr "Paragraph Style"
 
 #: ../e-util/e-html-editor.c:703
-#| msgid "Edit Reminder"
 msgid "Editing Mode"
 msgstr "Editing Mode"
 
 #: ../e-util/e-html-editor.c:715
-#| msgid "Unset Color"
 msgid "Font Color"
 msgstr "Font Colour"
 
 #: ../e-util/e-html-editor.c:725
-#| msgid "Folder Size"
 msgid "Font Size"
 msgstr "Font Size"
 
 #: ../e-util/e-html-editor-cell-dialog.c:410
-#| msgid "<b>Home</b>"
 msgid "<b>Scope</b>"
 msgstr "<b>Scope</b>"
 
@@ -13220,7 +12733,6 @@ msgstr "<b>Alignment &amp; Behaviour</b>"
 #: ../e-util/e-html-editor-cell-dialog.c:486
 #: ../e-util/e-html-editor-hrule-dialog.c:330
 #: ../e-util/e-html-editor-table-dialog.c:651
-#| msgid "Left:"
 msgid "Left"
 msgstr "Left"
 
@@ -13233,60 +12745,50 @@ msgstr "Centre"
 #: ../e-util/e-html-editor-cell-dialog.c:488
 #: ../e-util/e-html-editor-hrule-dialog.c:334
 #: ../e-util/e-html-editor-table-dialog.c:653
-#| msgid "Right:"
 msgid "Right"
 msgstr "Right"
 
 #: ../e-util/e-html-editor-cell-dialog.c:496
-#| msgid "Horizontal Position"
 msgid "_Horizontal:"
 msgstr "_Horizontal:"
 
 #: ../e-util/e-html-editor-cell-dialog.c:504
-#: ../e-util/e-html-editor-image-dialog.c:578
-#| msgid "Top:"
+#: ../e-util/e-html-editor-image-dialog.c:577
 msgid "Top"
 msgstr "Top"
 
 #: ../e-util/e-html-editor-cell-dialog.c:505
-#: ../e-util/e-html-editor-image-dialog.c:579
-#| msgid "_Middle:"
+#: ../e-util/e-html-editor-image-dialog.c:578
 msgid "Middle"
 msgstr "Middle"
 
 #: ../e-util/e-html-editor-cell-dialog.c:506
-#: ../e-util/e-html-editor-image-dialog.c:580
-#| msgid "Bottom:"
+#: ../e-util/e-html-editor-image-dialog.c:579
 msgid "Bottom"
 msgstr "Bottom"
 
 #: ../e-util/e-html-editor-cell-dialog.c:514
-#| msgid "_Vertical View"
 msgid "_Vertical:"
 msgstr "_Vertical:"
 
 #. Wrap Text
 #: ../e-util/e-html-editor-cell-dialog.c:520
-#| msgid "Plain Text"
 msgid "_Wrap Text"
 msgstr "_Wrap Text"
 
 #. Header Style
 #: ../e-util/e-html-editor-cell-dialog.c:528
-#| msgid "Header Value"
 msgid "_Header Style"
 msgstr "_Header Style"
 
 #: ../e-util/e-html-editor-cell-dialog.c:542
-#: ../e-util/e-html-editor-image-dialog.c:518
+#: ../e-util/e-html-editor-image-dialog.c:517
 #: ../e-util/e-html-editor-table-dialog.c:563
-#| msgid "<b>Notes</b>"
 msgid "<b>Layout</b>"
 msgstr "<b>Layout</b>"
 
 #. Width
 #: ../e-util/e-html-editor-cell-dialog.c:553
-#| msgid "Width"
 msgid "_Width"
 msgstr "_Width"
 
@@ -13300,49 +12802,41 @@ msgstr "Co_lumn Span:"
 
 #: ../e-util/e-html-editor-cell-dialog.c:614
 #: ../e-util/e-html-editor-table-dialog.c:667
-#| msgid "<b>Basics</b>"
 msgid "<b>Background</b>"
 msgstr "<b>Background</b>"
 
 #: ../e-util/e-html-editor-cell-dialog.c:627
 #: ../e-util/e-html-editor-table-dialog.c:680
-#| msgid "Event Transparency"
 msgid "Transparent"
 msgstr "Transparent"
 
 #: ../e-util/e-html-editor-cell-dialog.c:635
-#| msgid "Color:"
 msgid "C_olor:"
 msgstr "C_olour:"
 
 #: ../e-util/e-html-editor-cell-dialog.c:643
-#: ../e-util/e-html-editor-image-dialog.c:480
+#: ../e-util/e-html-editor-image-dialog.c:479
 #: ../e-util/e-html-editor-table-dialog.c:696
-#| msgid "Choose Image"
 msgid "Choose Background Image"
 msgstr "Choose Background Image"
 
 #: ../e-util/e-html-editor-cell-dialog.c:648
-#: ../e-util/e-html-editor-image-dialog.c:486
+#: ../e-util/e-html-editor-image-dialog.c:485
 #: ../e-util/e-html-editor-table-dialog.c:701
-#| msgid "Image"
 msgid "Images"
 msgstr "Images"
 
 #: ../e-util/e-html-editor-cell-dialog.c:661
-#| msgid "Image"
 msgid "_Image:"
 msgstr "_Image:"
 
 #: ../e-util/e-html-editor-cell-dialog.c:668
 #: ../e-util/e-html-editor-page-dialog.c:497
 #: ../e-util/e-html-editor-table-dialog.c:721
-#| msgid "_No image"
 msgid "_Remove image"
 msgstr "_Remove image"
 
 #: ../e-util/e-html-editor-cell-dialog.c:688
-#| msgid "_Properties"
 msgid "Cell Properties"
 msgstr "Cell Properties"
 
@@ -13353,51 +12847,42 @@ msgstr "No match found"
 
 #: ../e-util/e-html-editor-find-dialog.c:217
 #: ../e-util/e-html-editor-replace-dialog.c:297
-#| msgid "Search _base:"
 msgid "Search _backwards"
 msgstr "Search _backwards"
 
 #: ../e-util/e-html-editor-find-dialog.c:224
-#| msgid "Case _sensitive"
 msgid "Case _Sensitive"
 msgstr "Case _Sensitive"
 
 #: ../e-util/e-html-editor-find-dialog.c:231
-#| msgid "_Search"
 msgid "_Wrap Search"
 msgstr "_Wrap Search"
 
 #: ../e-util/e-html-editor-find-dialog.c:270
-#| msgid "_Find Now"
 msgid "Find"
 msgstr "Find"
 
 #: ../e-util/e-html-editor-hrule-dialog.c:265
-#| msgid "<b>Time</b>"
 msgid "<b>Size</b>"
 msgstr "<b>Size</b>"
 
 #. Width
 #: ../e-util/e-html-editor-hrule-dialog.c:285
-#: ../e-util/e-html-editor-image-dialog.c:536
+#: ../e-util/e-html-editor-image-dialog.c:535
 #: ../e-util/e-html-editor-table-dialog.c:574
-#| msgid "Width:"
 msgid "_Width:"
 msgstr "_Width:"
 
 #: ../e-util/e-html-editor-hrule-dialog.c:310
-#| msgid "Size:"
 msgid "_Size:"
 msgstr "_Size:"
 
 #: ../e-util/e-html-editor-hrule-dialog.c:317
-#| msgid "<b>Notes</b>"
 msgid "<b>Style</b>"
 msgstr "<b>Style</b>"
 
 #: ../e-util/e-html-editor-hrule-dialog.c:342
 #: ../e-util/e-html-editor-table-dialog.c:660
-#| msgid "A_lignment"
 msgid "_Alignment:"
 msgstr "_Alignment:"
 
@@ -13407,66 +12892,59 @@ msgid "S_haded"
 msgstr "S_haded"
 
 #: ../e-util/e-html-editor-hrule-dialog.c:365
-#| msgid "Folder Properties"
 msgid "Rule properties"
 msgstr "Rule properties"
 
-#: ../e-util/e-html-editor-image-dialog.c:468
+#: ../e-util/e-html-editor-image-dialog.c:467
 #: ../e-util/e-html-editor-paragraph-dialog.c:66
 #: ../e-util/e-html-editor-table-dialog.c:517
 msgid "<b>General</b>"
 msgstr "<b>General</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:497
-#| msgid "Source"
+#: ../e-util/e-html-editor-image-dialog.c:496
 msgid "_Source:"
 msgstr "_Source:"
 
-#: ../e-util/e-html-editor-image-dialog.c:560
-#| msgid "Height:"
+#: ../e-util/e-html-editor-image-dialog.c:559
 msgid "_Height:"
 msgstr "_Height:"
 
-#: ../e-util/e-html-editor-image-dialog.c:601
+#: ../e-util/e-html-editor-image-dialog.c:600
 msgid "_X-Padding:"
 msgstr "_X-Padding:"
 
-#: ../e-util/e-html-editor-image-dialog.c:617
+#: ../e-util/e-html-editor-image-dialog.c:616
 msgid "_Y-Padding:"
 msgstr "_Y-Padding:"
 
-#: ../e-util/e-html-editor-image-dialog.c:633
+#: ../e-util/e-html-editor-image-dialog.c:632
 #: ../e-util/e-html-editor-table-dialog.c:641
 msgid "_Border:"
 msgstr "_Border:"
 
-#: ../e-util/e-html-editor-image-dialog.c:643
-#| msgid "<b>Action</b>"
+#: ../e-util/e-html-editor-image-dialog.c:642
 msgid "<b>Link</b>"
 msgstr "<b>Link</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:661
-#: ../e-util/e-html-editor-link-dialog.c:222
+#: ../e-util/e-html-editor-image-dialog.c:660
+#: ../e-util/e-html-editor-link-dialog.c:221
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../e-util/e-html-editor-image-dialog.c:666
-#: ../e-util/e-html-editor-link-dialog.c:227
+#: ../e-util/e-html-editor-image-dialog.c:665
+#: ../e-util/e-html-editor-link-dialog.c:226
 msgid "_Test URL..."
 msgstr "_Test URL..."
 
-#: ../e-util/e-html-editor-image-dialog.c:683
-#| msgid "Category Properties"
+#: ../e-util/e-html-editor-image-dialog.c:682
 msgid "Image Properties"
 msgstr "Image Properties"
 
-#: ../e-util/e-html-editor-link-dialog.c:251
-#| msgid "_Remove"
+#: ../e-util/e-html-editor-link-dialog.c:250
 msgid "_Remove Link"
 msgstr "_Remove Link"
 
-#: ../e-util/e-html-editor-link-dialog.c:276
-#| msgid "Font Properties"
+#: ../e-util/e-html-editor-link-dialog.c:275
 msgid "Link Properties"
 msgstr "Link Properties"
 
@@ -13496,17 +12974,14 @@ msgid "Draft"
 msgstr "Draft"
 
 #: ../e-util/e-html-editor-page-dialog.c:133
-#| msgid "Paper"
 msgid "Graph Paper"
 msgstr "Graph Paper"
 
 #: ../e-util/e-html-editor-page-dialog.c:381
-#| msgid "<b>Work</b>"
 msgid "<b>Colors</b>"
 msgstr "<b>Colours</b>"
 
 #: ../e-util/e-html-editor-page-dialog.c:400
-#| msgid "Text"
 msgid "_Text:"
 msgstr "_Text:"
 
@@ -13519,18 +12994,15 @@ msgid "_Visited Link:"
 msgstr "_Visited Link:"
 
 #: ../e-util/e-html-editor-page-dialog.c:445
-#| msgid "Set as _Background"
 msgid "_Background:"
 msgstr "_Background:"
 
 #: ../e-util/e-html-editor-page-dialog.c:453
-#| msgid "<b>Account Name</b>"
 msgid "<b>Background Image</b>"
 msgstr "<b>Background Image</b>"
 
 #: ../e-util/e-html-editor-page-dialog.c:475
 #: ../modules/calendar/e-calendar-preferences.ui.h:80
-#| msgid "Template:"
 msgid "_Template:"
 msgstr "_Template:"
 
@@ -13539,55 +13011,45 @@ msgid "Select a file"
 msgstr "Select a file"
 
 #: ../e-util/e-html-editor-page-dialog.c:490
-#| msgid "_Custom"
 msgid "_Custom:"
 msgstr "_Custom:"
 
 #: ../e-util/e-html-editor-page-dialog.c:517
-#| msgid "_Properties"
 msgid "Page Properties"
 msgstr "Page Properties"
 
 #: ../e-util/e-html-editor-paragraph-dialog.c:83
-#| msgid "Style name:"
 msgid "_Style:"
 msgstr "_Style:"
 
 #: ../e-util/e-html-editor-paragraph-dialog.c:90
-#| msgid "<b>Time</b>"
 msgid "<b>Alignment</b>"
 msgstr "<b>Alignment</b>"
 
 #: ../e-util/e-html-editor-paragraph-dialog.c:155
-#| msgid "Category Properties"
 msgid "Paragraph Properties"
 msgstr "Paragraph Properties"
 
 #: ../e-util/e-html-editor-replace-dialog.c:92
 #, c-format
-#| msgid "occurrences"
 msgid "%d occurrence replaced"
 msgid_plural "%d occurrences replaced"
 msgstr[0] "%d occurrence replaced"
 msgstr[1] "%d occurrences replaced"
 
 #: ../e-util/e-html-editor-replace-dialog.c:280
-#| msgid "_Replace"
 msgid "R_eplace:"
 msgstr "R_eplace:"
 
 #: ../e-util/e-html-editor-replace-dialog.c:289
-#| msgid "O_pen With"
 msgid "_With:"
 msgstr "_With:"
 
 #: ../e-util/e-html-editor-replace-dialog.c:301
-#| msgid "Case _sensitive"
 msgid "_Case sensitive"
 msgstr "_Case sensitive"
 
 #: ../e-util/e-html-editor-replace-dialog.c:305
-#| msgid "Always search"
 msgid "Wra_p search"
 msgstr "Wra_p search"
 
@@ -13601,12 +13063,10 @@ msgid "_Replace"
 msgstr "_Replace"
 
 #: ../e-util/e-html-editor-replace-dialog.c:331
-#| msgid "Reply to _All"
 msgid "Replace _All"
 msgstr "Replace _All"
 
 #: ../e-util/e-html-editor-replace-dialog.c:351
-#| msgid "_Replace"
 msgctxt "dialog-title"
 msgid "Replace"
 msgstr "Replace"
@@ -13617,19 +13077,16 @@ msgid "<b>Suggestions for '%s'</b>"
 msgstr "<b>Suggestions for '%s'</b>"
 
 #: ../e-util/e-html-editor-spell-check-dialog.c:390
-#| msgid "<b>Options</b>"
 msgid "<b>Suggestions</b>"
 msgstr "<b>Suggestions</b>"
 
 #. Replace
 #: ../e-util/e-html-editor-spell-check-dialog.c:425
-#| msgid "_Replace"
 msgid "Replace"
 msgstr "Replace"
 
 #. Replace All
 #: ../e-util/e-html-editor-spell-check-dialog.c:434
-#| msgid "_Replace"
 msgid "Replace All"
 msgstr "Replace All"
 
@@ -13646,18 +13103,15 @@ msgstr "Skip"
 
 #. Back
 #: ../e-util/e-html-editor-spell-check-dialog.c:461
-#| msgid "Go Back"
 msgid "Back"
 msgstr "Back"
 
 #: ../e-util/e-html-editor-spell-check-dialog.c:470
-#| msgid "<b>Action</b>"
 msgid "<b>Dictionary</b>"
 msgstr "<b>Dictionary</b>"
 
 #. Add Word button
 #: ../e-util/e-html-editor-spell-check-dialog.c:490
-#| msgid "Add Folder"
 msgid "Add word"
 msgstr "Add word"
 
@@ -13670,33 +13124,27 @@ msgid "_Rows:"
 msgstr "_Rows:"
 
 #: ../e-util/e-html-editor-table-dialog.c:556
-#| msgid "_Table column:"
 msgid "C_olumns:"
 msgstr "C_olumns:"
 
 #: ../e-util/e-html-editor-table-dialog.c:607
-#| msgid "Spacing"
 msgid "_Spacing:"
 msgstr "_Spacing:"
 
 #: ../e-util/e-html-editor-table-dialog.c:624
-#| msgid "Loading"
 msgid "_Padding:"
 msgstr "_Padding:"
 
 #: ../e-util/e-html-editor-table-dialog.c:688
 #: ../e-util/e-html-editor-text-dialog.c:250
-#| msgid "Color:"
 msgid "_Color:"
 msgstr "_Colour:"
 
 #: ../e-util/e-html-editor-table-dialog.c:714
-#| msgid "Image"
 msgid "Image:"
 msgstr "Image:"
 
 #: ../e-util/e-html-editor-table-dialog.c:741
-#| msgid "Calendar Properties"
 msgid "Table Properties"
 msgstr "Table Properties"
 
@@ -13705,7 +13153,6 @@ msgid "Si_ze:"
 msgstr "Si_ze:"
 
 #: ../e-util/e-html-editor-text-dialog.c:285
-#| msgid "Font Properties"
 msgid "Text Properties"
 msgstr "Text Properties"
 
@@ -13743,10 +13190,6 @@ msgid "Please select the information that you would like to import:"
 msgstr "Please select the information that you would like to import:"
 
 #: ../e-util/e-import-assistant.c:538
-#| msgid ""
-#| "Evolution checked for settings to import from the following applications: "
-#| "Pine, Netscape, Elm, iCalendar. No importable settings found. If you "
-#| "would like to try again, please click the \"Back\" button."
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
@@ -13881,36 +13324,35 @@ msgstr ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
 
-#: ../e-util/e-misc-utils.c:253
+#: ../e-util/e-misc-utils.c:255
 msgid "Could not open the link."
 msgstr "Could not open the link."
 
-#: ../e-util/e-misc-utils.c:336
+#: ../e-util/e-misc-utils.c:338
 msgid "Could not display help for Evolution."
 msgstr "Could not display help for Evolution."
 
-#: ../e-util/e-misc-utils.c:2501
+#: ../e-util/e-misc-utils.c:2503
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "Opening calendar '%s'"
 
-#: ../e-util/e-misc-utils.c:2504
+#: ../e-util/e-misc-utils.c:2506
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "Opening memo list '%s'"
 
-#: ../e-util/e-misc-utils.c:2507
+#: ../e-util/e-misc-utils.c:2509
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "Opening task list '%s'"
 
-#: ../e-util/e-misc-utils.c:2510
+#: ../e-util/e-misc-utils.c:2512
 #, c-format
-#| msgid "Opening store '%s'"
 msgid "Opening address book '%s'"
 msgstr "Opening address book '%s'"
 
-#: ../e-util/e-misc-utils.c:3288
+#: ../e-util/e-misc-utils.c:3290
 #: ../modules/mailto-handler/evolution-mailto-handler.c:148
 msgid "_Do not show this message again"
 msgstr "_Do not show this message again"
@@ -14040,7 +13482,6 @@ msgstr ""
 "The printing system did not report any additional details about the error."
 
 #: ../e-util/e-proxy-editor.c:325
-#| msgid "Method:"
 msgid "_Method:"
 msgstr "_Method:"
 
@@ -14049,47 +13490,38 @@ msgid "Defer to Desktop Settings"
 msgstr "Defer to Desktop Settings"
 
 #: ../e-util/e-proxy-editor.c:351
-#| msgid "Junk Settings"
 msgid "_Open Desktop Settings"
 msgstr "_Open Desktop Settings"
 
 #: ../e-util/e-proxy-editor.c:377
-#| msgid "_Manual"
 msgid "Manual"
 msgstr "Manual"
 
 #: ../e-util/e-proxy-editor.c:396
-#| msgid "H_TTP Proxy:"
 msgid "_HTTP Proxy:"
 msgstr "_HTTP Proxy:"
 
 #: ../e-util/e-proxy-editor.c:427
-#| msgid "H_TTP Proxy:"
 msgid "H_TTPS Proxy:"
 msgstr "H_TTPS Proxy:"
 
 #: ../e-util/e-proxy-editor.c:458
-#| msgid "SOC_KS Proxy:"
 msgid "_Socks Proxy:"
 msgstr "_Socks Proxy:"
 
 #: ../e-util/e-proxy-editor.c:489
-#| msgid "Ignore"
 msgid "_Ignore Hosts:"
 msgstr "_Ignore Hosts:"
 
 #: ../e-util/e-proxy-editor.c:515
-#| msgid "Automatic Contacts"
 msgid "Automatic"
 msgstr "Automatic"
 
 #: ../e-util/e-proxy-editor.c:534
-#| msgid "Configuration"
 msgid "Configuration _URL:"
 msgstr "Configuration _URL:"
 
 #: ../e-util/e-proxy-editor.c:560
-#| msgid "No _Proxy for:"
 msgid "No proxy"
 msgstr "No proxy"
 
@@ -14118,17 +13550,14 @@ msgstr ""
 "and apply them to specific accounts"
 
 #: ../e-util/e-proxy-selector.c:85
-#| msgid "_Custom binary:"
 msgid "Custom Proxy"
 msgstr "Custom Proxy"
 
 #: ../e-util/e-proxy-selector.c:487
-#| msgid "Create a new appointment"
 msgid "Create a new proxy profile"
 msgstr "Create a new proxy profile"
 
 #: ../e-util/e-proxy-selector.c:492
-#| msgid "Delete the selected memo list"
 msgid "Delete the selected proxy profile"
 msgstr "Delete the selected proxy profile"
 
@@ -14337,7 +13766,6 @@ msgid "Name:"
 msgstr "Name:"
 
 #: ../e-util/e-source-config.c:813
-#| msgid "Label name cannot be empty."
 msgid "Name cannot be empty"
 msgstr "Name cannot be empty"
 
@@ -14352,7 +13780,6 @@ msgid "Use a secure connection"
 msgstr "Use a secure connection"
 
 #: ../e-util/e-source-config.c:1439
-#| msgid "Unset _trust for SSL certificate"
 msgid "Unset _trust for SSL/TLS certificate"
 msgstr "Unset _trust for SSL/TLS certificate"
 
@@ -14361,31 +13788,26 @@ msgid "User"
 msgstr "User"
 
 #: ../e-util/e-source-selector.c:3214
-#| msgid "Show %s"
 msgid "Show"
 msgstr "Show"
 
 #: ../e-util/e-source-selector.c:3221
-#| msgid "Group Reply"
 msgid "Group name"
 msgstr "Group name"
 
-#: ../e-util/e-source-selector.c:3376 ../mail/e-mail-display.c:746
+#: ../e-util/e-source-selector.c:3376 ../mail/e-mail-display.c:742
 msgid "_Hide"
 msgstr "_Hide"
 
 #: ../e-util/e-source-selector.c:3376 ../e-util/e-source-selector.c:3475
-#| msgid "Show %s"
 msgid "_Show"
 msgstr "_Show"
 
 #: ../e-util/e-source-selector.c:3428
-#| msgid "Manager"
 msgid "Manage Groups"
 msgstr "Manage Groups"
 
 #: ../e-util/e-source-selector.c:3440
-#| msgid "A_vailable Fields:"
 msgid "Available Groups:"
 msgstr "Available Groups:"
 
@@ -14400,7 +13822,6 @@ msgstr "Select destination"
 #. Translators: %s is the language ISO code.
 #: ../e-util/e-spell-dictionary.c:266
 #, c-format
-#| msgid "Unknown"
 msgctxt "language"
 msgid "Unknown (%s)"
 msgstr "Unknown (%s)"
@@ -14409,8 +13830,6 @@ msgstr "Unknown (%s)"
 #. * second is the country name. Example: "French (France)"
 #: ../e-util/e-spell-dictionary.c:281 ../e-util/e-spell-dictionary.c:286
 #, c-format
-#| msgctxt "folder-display"
-#| msgid "%s (%u%s)"
 msgctxt "language"
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -14540,27 +13959,22 @@ msgid "click to add"
 msgstr "click to add"
 
 #: ../e-util/e-table-column-selector.c:264
-#| msgid "Move selected messages to another folder"
 msgid "Move selected column names to top"
 msgstr "Move selected column names to top"
 
 #: ../e-util/e-table-column-selector.c:269
-#| msgid "Move selected contacts to another address book"
 msgid "Move selected column names up one row"
 msgstr "Move selected column names up one row"
 
 #: ../e-util/e-table-column-selector.c:274
-#| msgid "Move selected contacts to another address book"
 msgid "Move selected column names down one row"
 msgstr "Move selected column names down one row"
 
 #: ../e-util/e-table-column-selector.c:279
-#| msgid "Move selected messages to another folder"
 msgid "Move selected column names to bottom"
 msgstr "Move selected column names to bottom"
 
 #: ../e-util/e-table-column-selector.c:284
-#| msgid "Select all visible memos"
 msgid "Select all column names"
 msgstr "Select all column names"
 
@@ -14585,12 +13999,10 @@ msgid "Show Fields"
 msgstr "Show Fields"
 
 #: ../e-util/e-table-config.c:559
-#| msgid "Choose a folder for saving sent messages."
 msgid "Choose the order of information to appear in the message list."
 msgstr "Choose the order of information to appear in the message list."
 
 #: ../e-util/e-table-config.ui.h:2
-#| msgid "_Append"
 msgid "_Apply"
 msgstr "_Apply"
 
@@ -14693,7 +14105,6 @@ msgid "Sort _Descending"
 msgstr "Sort _Descending"
 
 #: ../e-util/e-table-header-item.c:1648
-#| msgid "Task sort"
 msgid "_Reset sort"
 msgstr "_Reset sort"
 
@@ -14780,12 +14191,10 @@ msgid "Timezone drop-down combination box"
 msgstr "Timezone drop-down combination box"
 
 #: ../e-util/e-url-entry.c:108
-#| msgid "Click here to go to URL"
 msgid "Click here to open the URL"
 msgstr "Click here to open the URL"
 
 #: ../e-util/e-url-entry.c:110
-#| msgid "Enter Passphrase"
 msgid "Enter a URL here"
 msgstr "Enter a URL here"
 
@@ -14828,12 +14237,10 @@ msgid "_Copy Email Address"
 msgstr "_Copy E-mail Address"
 
 #: ../e-util/e-web-view.c:364
-#| msgid "Copy _Email Address"
 msgid "Copy _Raw Email Address"
 msgstr "Copy _Raw E-mail Address"
 
 #: ../e-util/e-web-view.c:366
-#| msgid "Copy the email address to the clipboard"
 msgid "Copy the raw email address to the clipboard"
 msgstr "Copy the raw e-mail address to the clipboard"
 
@@ -14853,51 +14260,47 @@ msgstr "Save _Image…"
 msgid "Save the image to a file"
 msgstr "Save the image to a file"
 
-#: ../e-util/e-web-view.c:410 ../e-util/e-web-view.c:1839
+#: ../e-util/e-web-view.c:410 ../e-util/e-web-view.c:1826
 msgid "Select all text and images"
 msgstr "Select all text and images"
 
-#: ../e-util/e-web-view.c:1294
+#: ../e-util/e-web-view.c:1284
 #, c-format
 msgid "Click to call %s"
 msgstr "Click to call %s"
 
-#: ../e-util/e-web-view.c:1296
+#: ../e-util/e-web-view.c:1286
 msgid "Click to hide/unhide addresses"
 msgstr "Click to hide/unhide addresses"
 
-#: ../e-util/e-web-view.c:1307
+#: ../e-util/e-web-view.c:1297
 #, c-format
-#| msgid "Enter the recipients of the message"
 msgid "Go to the section %s of the message"
 msgstr "Go to the section %s of the message"
 
-#: ../e-util/e-web-view.c:1309
-#| msgid "Enter the recipients of the message"
+#: ../e-util/e-web-view.c:1299
 msgid "Go to the beginning of the message"
 msgstr "Go to the beginning of the message"
 
-#: ../e-util/e-web-view.c:1313
+#: ../e-util/e-web-view.c:1303
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
 
-#: ../e-util/e-web-view.c:3655
-#| msgid "Copy the image to the clipboard"
+#: ../e-util/e-web-view.c:3672
 msgid "Copying image to clipboard"
 msgstr "Copying image to clipboard"
 
-#: ../e-util/e-web-view.c:3843
+#: ../e-util/e-web-view.c:3860
 msgid "Save Image"
 msgstr "Save Image"
 
-#: ../e-util/e-web-view.c:3879
+#: ../e-util/e-web-view.c:3896
 #, c-format
-#| msgid "Moving messages to '%s'"
 msgid "Saving image to '%s'"
 msgstr "Saving image to '%s'"
 
-#: ../e-util/e-web-view.c:3974
+#: ../e-util/e-web-view.c:3991
 #, c-format
 msgid "Cannot get URI '%s', do not know how to download it."
 msgstr "Cannot get URI '%s', do not know how to download it."
@@ -14963,7 +14366,6 @@ msgid "Please choose another name."
 msgstr "Please choose another name."
 
 #: ../e-util/filter.error.xml.h:12
-#| msgid "Missing date."
 msgid "Missing condition."
 msgstr "Missing condition."
 
@@ -14972,22 +14374,18 @@ msgid "Filter should have at least one condition."
 msgstr "Filter should have at least one condition."
 
 #: ../e-util/filter.error.xml.h:14
-#| msgid "Missing date."
 msgid "Missing value."
 msgstr "Missing value."
 
 #: ../e-util/filter.error.xml.h:15
-#| msgid "Label name cannot be empty."
 msgid "One or more values cannot be empty."
 msgstr "One or more values cannot be empty."
 
 #: ../e-util/filter.error.xml.h:16
-#| msgid "Are you sure you want to delete the '{0}' task?"
 msgid "Are you sure you want to remove rule '{0}'?"
 msgstr "Are you sure you want to remove rule '{0}'?"
 
 #: ../e-util/filter.error.xml.h:17
-#| msgid "_Keep Data"
 msgid "_Keep"
 msgstr "_Keep"
 
@@ -15133,12 +14531,10 @@ msgid "Please provide an unique name to identify this signature."
 msgstr "Please provide an unique name to identify this signature."
 
 #: ../e-util/widgets.error.xml.h:6
-#| msgid "Copy the image to the clipboard"
 msgid "Unable to copy image to clipboard."
 msgstr "Unable to copy image to clipboard."
 
 #: ../e-util/widgets.error.xml.h:7
-#| msgid "Unable to save {0}."
 msgid "Unable to save image."
 msgstr "Unable to save image."
 
@@ -15171,13 +14567,10 @@ msgstr ""
 "Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
 
 #: ../libemail-engine/camel-sasl-oauth2-google.c:29
-#| msgid "OAuth2"
 msgid "OAuth2 Google"
 msgstr "OAuth2 Google"
 
 #: ../libemail-engine/camel-sasl-oauth2-google.c:30
-#| msgid ""
-#| "This option will use an OAuth 2.0 access token to connect to the server"
 msgid ""
 "This option will use an OAuth 2.0 access token to connect to the Google "
 "server"
@@ -15204,43 +14597,43 @@ msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
 #: ../libemail-engine/e-mail-folder-utils.c:684
-#: ../libemail-engine/e-mail-folder-utils.c:938
+#: ../libemail-engine/e-mail-folder-utils.c:946
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Retrieving %d message"
 msgstr[1] "Retrieving %d messages"
 
-#: ../libemail-engine/e-mail-folder-utils.c:778
+#: ../libemail-engine/e-mail-folder-utils.c:786
 msgid "Scanning messages for duplicates"
 msgstr "Scanning messages for duplicates"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1151
+#: ../libemail-engine/e-mail-folder-utils.c:1159
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Removing folder '%s'"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1332
+#: ../libemail-engine/e-mail-folder-utils.c:1340
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "File \"%s\" has been removed."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1336
+#: ../libemail-engine/e-mail-folder-utils.c:1344
 msgid "File has been removed."
 msgstr "File has been removed."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1413
+#: ../libemail-engine/e-mail-folder-utils.c:1421
 msgid "Removing attachments"
 msgstr "Removing attachments"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1577
+#: ../libemail-engine/e-mail-folder-utils.c:1593
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Saving %d message"
 msgstr[1] "Saving %d messages"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1955
+#: ../libemail-engine/e-mail-folder-utils.c:1971
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Invalid folder URI '%s'"
@@ -15248,36 +14641,36 @@ msgstr "Invalid folder URI '%s'"
 #. Some local folders
 #: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-properties.c:778
 #: ../mail/em-folder-tree-model.c:1212 ../mail/importers/kmail-libs.c:141
-#: ../modules/mail/e-mail-shell-view-private.c:1048
-#: ../modules/mail/e-mail-shell-view-private.c:1059
+#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Inbox"
 msgstr "Inbox"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
 #: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1205
 #: ../mail/importers/kmail-libs.c:147
-#: ../modules/mail/e-mail-shell-view-private.c:1046
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 msgid "Drafts"
 msgstr "Drafts"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
 #: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1216
 #: ../mail/importers/kmail-libs.c:143
-#: ../modules/mail/e-mail-shell-view-private.c:1050
+#: ../modules/mail/e-mail-shell-view-private.c:1055
 msgid "Outbox"
 msgstr "Outbox"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
 #: ../libemail-engine/e-mail-session.c:130 ../mail/em-folder-tree-model.c:1220
 #: ../mail/importers/kmail-libs.c:145
-#: ../modules/mail/e-mail-shell-view-private.c:1052
+#: ../modules/mail/e-mail-shell-view-private.c:1057
 msgid "Sent"
 msgstr "Sent"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
 #: ../libemail-engine/e-mail-session.c:131 ../mail/em-folder-tree-model.c:1208
 #: ../mail/importers/kmail-libs.c:149
-#: ../modules/mail/e-mail-shell-view-private.c:1054
+#: ../modules/mail/e-mail-shell-view-private.c:1059
 #: ../plugins/templates/e-templates-store.c:2214
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
@@ -15305,19 +14698,16 @@ msgstr ""
 
 #: ../libemail-engine/e-mail-session.c:2405
 #, c-format
-#| msgid "Creating folder '%s'"
 msgid "Waiting for '%s'"
 msgstr "Waiting for '%s'"
 
 #: ../libemail-engine/e-mail-session-utils.c:540
-#| msgid "No HTML stream available"
 msgid "No mail transport service available"
 msgstr "No mail transport service available"
 
 #: ../libemail-engine/e-mail-session-utils.c:630
 #: ../libemail-engine/mail-ops.c:720
 #, c-format
-#| msgid "Moving messages to '%s'"
 msgid "Posting message to '%s'"
 msgstr "Posting message to '%s'"
 
@@ -15331,7 +14721,6 @@ msgstr "Failed to apply outgoing filters: %s"
 #: ../libemail-engine/e-mail-session-utils.c:732
 #: ../libemail-engine/mail-ops.c:780 ../libemail-engine/mail-ops.c:815
 #, c-format
-#| msgid "Moving messages to '%s'"
 msgid "Storing sent message to '%s'"
 msgstr "Storing sent message to '%s'"
 
@@ -15419,7 +14808,6 @@ msgstr[0] "Failed to send a message"
 msgstr[1] "Failed to send %d of %d messages"
 
 #: ../libemail-engine/mail-ops.c:1064
-#| msgid "Cancelled"
 msgid "Cancelled."
 msgstr "Cancelled."
 
@@ -15459,7 +14847,6 @@ msgstr "Emptying wastebasket in '%s'"
 
 #: ../libemail-engine/mail-ops.c:1598
 #, c-format
-#| msgid "Scanning folders in '%s'"
 msgid "Processing folder changes in '%s'"
 msgstr "Processing folder changes in '%s'"
 
@@ -15517,14 +14904,10 @@ msgstr[1] ""
 "\"%s\"."
 
 #: ../mail/e-mail-account-manager.c:117 ../mail/e-mail-account-manager.c:204
-#| msgid "All Accounts"
 msgid "Open _Online Accounts"
 msgstr "Open _Online Accounts"
 
 #: ../mail/e-mail-account-manager.c:143 ../mail/e-mail-account-manager.c:230
-#| msgid ""
-#| "This option will connect to the server by way of the GNOME Online "
-#| "Accounts service"
 msgid "This account was created through the Online Accounts service."
 msgstr "This account was created through the Online Accounts service."
 
@@ -15570,7 +14953,6 @@ msgstr "(No Subject)"
 
 #. GtkAssistant's back button label.
 #: ../mail/e-mail-config-assistant.c:46
-#| msgid "Go Back"
 msgid "Go _Back"
 msgstr "Go _Back"
 
@@ -15584,12 +14966,10 @@ msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistant"
 
 #: ../mail/e-mail-config-assistant.c:954
-#| msgid "_Restore Defaults"
 msgid "_Revise Details"
 msgstr "_Revise Details"
 
 #: ../mail/e-mail-config-auth-check.c:177
-#| msgid "_Authentication Type"
 msgid "Querying authentication types..."
 msgstr "Querying authentication types..."
 
@@ -15616,12 +14996,10 @@ msgid "Done"
 msgstr "Done"
 
 #: ../mail/e-mail-config-defaults-page.c:377
-#| msgid "Printer settings"
 msgid "Checking server settings..."
 msgstr "Checking server settings..."
 
 #: ../mail/e-mail-config-defaults-page.c:495
-#| msgid "Shell Settings"
 msgctxt "ReplyForward"
 msgid "Use global setting"
 msgstr "Use global setting"
@@ -15642,8 +15020,6 @@ msgid "Quoted"
 msgstr "Quoted"
 
 #: ../mail/e-mail-config-defaults-page.c:503 ../mail/mail-config.ui.h:29
-#| msgctxt "ReplyForward"
-#| msgid "Do not quote"
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Do Not Quote"
@@ -15673,23 +15049,19 @@ msgid "S_ave replies in the folder of the message being replied to"
 msgstr "S_ave replies in the folder of the message being replied to"
 
 #: ../mail/e-mail-config-defaults-page.c:908
-#| msgid "_Trash Folder:"
 msgid "Archi_ve Folder:"
 msgstr "Archi_ve Folder:"
 
 #: ../mail/e-mail-config-defaults-page.c:918
 #: ../modules/mail/em-mailer-prefs.c:1403
-#| msgid "Choose folders to post the message to."
 msgid "Choose a folder to archive messages to."
 msgstr "Choose a folder to archive messages to."
 
 #: ../mail/e-mail-config-defaults-page.c:932
-#| msgid "_Trash Folder:"
 msgid "_Templates Folder:"
 msgstr "_Templates Folder:"
 
 #: ../mail/e-mail-config-defaults-page.c:942
-#| msgid "Choose a folder for deleted messages."
 msgid "Choose a folder to use for template messages."
 msgstr "Choose a folder to use for template messages."
 
@@ -15698,7 +15070,6 @@ msgid "_Restore Defaults"
 msgstr "_Restore Defaults"
 
 #: ../mail/e-mail-config-defaults-page.c:981
-#| msgid "Local Folders"
 msgid "_Lookup Folders"
 msgstr "_Lookup Folders"
 
@@ -15731,7 +15102,6 @@ msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Always _blind carbon-copy (bcc) to:"
 
 #: ../mail/e-mail-config-defaults-page.c:1092
-#| msgid "_Reply style:"
 msgid "Re_ply style:"
 msgstr "Re_ply style:"
 
@@ -15776,9 +15146,6 @@ msgstr "Account Information"
 
 #: ../mail/e-mail-config-identity-page.c:370
 #: ../mail/e-mail-config-summary-page.c:353
-#| msgid ""
-#| "Type the name by which you would like to refer to this account.\n"
-#| "For example, \"Work\" or \"Personal\"."
 msgid ""
 "The above name will be used to identify this account.\n"
 "Use for example, \"Work\" or \"Personal\"."
@@ -15822,28 +15189,23 @@ msgstr "_Look up mail server details based on the entered e-mail address"
 #. This is only a warning, not a blocker
 #. complete = complete && correct;
 #: ../mail/e-mail-config-identity-page.c:630
-#| msgid "Label name cannot be empty."
 msgid "Full Name should not be empty"
 msgstr "Full Name should not be empty"
 
 #: ../mail/e-mail-config-identity-page.c:637
-#| msgid "Label name cannot be empty."
 msgid "Email Address cannot be empty"
 msgstr "E-mail Address cannot be empty"
 
 #: ../mail/e-mail-config-identity-page.c:642
-#| msgid "File is not a valid .desktop file"
 msgid "Email Address is not a valid email"
 msgstr "E-mail Address is not a valid email"
 
 #: ../mail/e-mail-config-identity-page.c:654
-#| msgid "File is not a valid .desktop file"
 msgid "Reply To is not a valid email"
 msgstr "Reply To is not a valid e-mail"
 
 #: ../mail/e-mail-config-identity-page.c:665
 #: ../mail/e-mail-config-summary-page.c:632
-#| msgid "Label name cannot be empty."
 msgid "Account Name cannot be empty"
 msgstr "Account Name cannot be empty"
 
@@ -15871,7 +15233,6 @@ msgstr "Receiving E-mail"
 #. The first '%s' is a key ID, the second '%s' is a display name of the key.
 #: ../mail/e-mail-config-security-page.c:251
 #, c-format
-#| msgid "Task - %s"
 msgctxt "PGPKeyDescription"
 msgid "%s - %s"
 msgstr "%s - %s"
@@ -15927,7 +15288,6 @@ msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Al_ways sign outgoing messages when using this account"
 
 #: ../mail/e-mail-config-security-page.c:466
-#| msgid "Always encrypt outgoing messages when using this account"
 msgid "Always enc_rypt outgoing messages when using this account"
 msgstr "Always enc_rypt outgoing messages when using this account"
 
@@ -16047,10 +15407,6 @@ msgid "Account Summary"
 msgstr "Account Summary"
 
 #: ../mail/e-mail-config-welcome-page.c:156
-#| msgid ""
-#| "Welcome to the Evolution Mail Configuration Assistant.\n"
-#| "\n"
-#| "Click \"Continue\" to begin."
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -16093,33 +15449,31 @@ msgstr "Send a reply message to this address"
 msgid "Create Search _Folder"
 msgstr "Create Search _Folder"
 
-#: ../mail/e-mail-display.c:753
+#: ../mail/e-mail-display.c:749
 msgid "Hid_e All"
 msgstr "Hid_e All"
 
-#: ../mail/e-mail-display.c:760
+#: ../mail/e-mail-display.c:756
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: ../mail/e-mail-display.c:767
+#: ../mail/e-mail-display.c:763
 msgid "Vie_w All Inline"
 msgstr "Vie_w All Inline"
 
-#: ../mail/e-mail-display.c:774
+#: ../mail/e-mail-display.c:770
 msgid "_Zoom to 100%"
 msgstr "_Zoom to 100%"
 
-#: ../mail/e-mail-display.c:776
-#| msgid "Reset the text to its original size"
+#: ../mail/e-mail-display.c:772
 msgid "Zoom the image to its natural size"
 msgstr "Zoom the image to its natural size"
 
-#: ../mail/e-mail-display.c:781
-#| msgid "Close this window"
+#: ../mail/e-mail-display.c:777
 msgid "_Zoom to window"
 msgstr "_Zoom to window"
 
-#: ../mail/e-mail-display.c:783
+#: ../mail/e-mail-display.c:779
 msgid "Zoom large images to not be wider than the window width"
 msgstr "Zoom large images to not be wider than the window width"
 
@@ -16142,44 +15496,36 @@ msgstr "Folder _name:"
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
 #: ../mail/e-mail-free-form-exp.c:236
-#| msgid "Answered"
 msgctxt "ffe"
 msgid "Answered"
 msgstr "Answered"
 
 #: ../mail/e-mail-free-form-exp.c:237
-#| msgid "Deleted"
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "Deleted"
 
 #: ../mail/e-mail-free-form-exp.c:238
-#| msgid "Draft"
 msgctxt "ffe"
 msgid "Draft"
 msgstr "Draft"
 
 #: ../mail/e-mail-free-form-exp.c:239
-#| msgid "Flagged"
 msgctxt "ffe"
 msgid "Flagged"
 msgstr "Flagged"
 
 #: ../mail/e-mail-free-form-exp.c:240
-#| msgid "Seen"
 msgctxt "ffe"
 msgid "Seen"
 msgstr "Seen"
 
 #: ../mail/e-mail-free-form-exp.c:241
-#| msgid "Attachment"
-#| msgid_plural "Attachments"
 msgctxt "ffe"
 msgid "Attachment"
 msgstr "Attachment"
 
 #: ../mail/e-mail-free-form-exp.c:489
-#| msgid "now"
 msgctxt "ffe"
 msgid "no"
 msgstr "no"
@@ -16243,52 +15589,42 @@ msgid "Color"
 msgstr "Colour"
 
 #: ../mail/e-mail-notes.c:321 ../mail/e-mail-notes.c:719
-#| msgid "Message Fonts"
 msgid "Message Note"
 msgstr "Message Note"
 
 #: ../mail/e-mail-notes.c:639
-#| msgid "Copying messages into folder %s"
 msgid "Cannot find message in its folder summary"
 msgstr "Cannot find message in its folder summary"
 
 #: ../mail/e-mail-notes.c:842
-#| msgid "Formatting Message..."
 msgid "Storing changes..."
 msgstr "Storing changes..."
 
 #: ../mail/e-mail-notes.c:968
-#| msgid "_Edit Message"
 msgid "Edit Message Note"
 msgstr "Edit Message Note"
 
 #: ../mail/e-mail-notes.c:1122
-#| msgid "Retrieving Message..."
 msgid "Retrieving message..."
 msgstr "Retrieving message..."
 
 #: ../mail/e-mail-print-config-headers.c:165
-#| msgid "Move selected messages to another folder"
 msgid "Move selected headers to top"
 msgstr "Move selected headers to top"
 
 #: ../mail/e-mail-print-config-headers.c:170
-#| msgid "Move selected messages to another folder"
 msgid "Move selected headers up one row"
 msgstr "Move selected headers up one row"
 
 #: ../mail/e-mail-print-config-headers.c:175
-#| msgid "Move selected messages to another folder"
 msgid "Move selected headers down one row"
 msgstr "Move selected headers down one row"
 
 #: ../mail/e-mail-print-config-headers.c:180
-#| msgid "Move selected messages to another folder"
 msgid "Move selected headers to bottom"
 msgstr "Move selected headers to bottom"
 
 #: ../mail/e-mail-print-config-headers.c:185
-#| msgid "Select _All Messages"
 msgid "Select all headers"
 msgstr "Select all headers"
 
@@ -16327,7 +15663,6 @@ msgid "C_opy"
 msgstr "C_opy"
 
 #: ../mail/e-mail-reader.c:488
-#| msgid "Generating message list"
 msgid "Deleting message note..."
 msgstr "Deleting message note..."
 
@@ -16362,7 +15697,6 @@ msgid "_Archive..."
 msgstr "_Archive..."
 
 #: ../mail/e-mail-reader.c:2013
-#| msgid "Move selected messages to another folder"
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "Move selected messages to the Archive folder for the account"
 
@@ -16391,32 +15725,26 @@ msgid "Mark the selected messages for deletion"
 msgstr "Mark the selected messages for deletion"
 
 #: ../mail/e-mail-reader.c:2039
-#| msgid "_Add Attachment..."
 msgid "_Add note..."
 msgstr "_Add note..."
 
 #: ../mail/e-mail-reader.c:2041
-#| msgid "Create a new memo from the selected message"
 msgid "Add a note for the selected message"
 msgstr "Add a note for the selected message"
 
 #: ../mail/e-mail-reader.c:2046
-#| msgid "Delete Any Items"
 msgid "Delete no_te"
 msgstr "Delete no_te"
 
 #: ../mail/e-mail-reader.c:2048
-#| msgid "Create a new event from the selected message"
 msgid "Delete the note for the selected message"
 msgstr "Delete the note for the selected message"
 
 #: ../mail/e-mail-reader.c:2053
-#| msgid "_Edit..."
 msgid "_Edit note..."
 msgstr "_Edit note..."
 
 #: ../mail/e-mail-reader.c:2055
-#| msgid "Create a new memo from the selected message"
 msgid "Edit a note for the selected message"
 msgstr "Edit a note for the selected message"
 
@@ -16548,7 +15876,6 @@ msgid "Mark new mails in a subthread as read automatically"
 msgstr "Mark new mails in a subthread as read automatically"
 
 #: ../mail/e-mail-reader.c:2179 ../mail/e-mail-reader.c:2566
-#| msgid "Next _Thread"
 msgid "_Ignore Thread"
 msgstr "_Ignore Thread"
 
@@ -16589,7 +15916,6 @@ msgid "Mark the selected messages as having been read"
 msgstr "Mark the selected messages as having been read"
 
 #: ../mail/e-mail-reader.c:2214 ../mail/e-mail-reader.c:2586
-#| msgid "Could not create publish thread."
 msgid "Do not _Ignore Subthread"
 msgstr "Do not _Ignore Subthread"
 
@@ -16982,12 +16308,10 @@ msgid "Allow remote content from %s"
 msgstr "Allow remote content from %s"
 
 #: ../mail/e-mail-reader.c:5462
-#| msgid "_Do not show this message again"
 msgid "Do not show this message again"
 msgstr "Do not show this message again"
 
 #: ../mail/e-mail-reader.c:5510
-#| msgid "Header content"
 msgid "Load remote content"
 msgstr "Load remote content"
 
@@ -17001,7 +16325,6 @@ msgid "Refreshing folder '%s'"
 msgstr "Refreshing folder '%s'"
 
 #: ../mail/e-mail-reader-utils.c:1163
-#| msgid "Preview data to be imported"
 msgid "Marking thread to be ignored"
 msgstr "Marking thread to be ignored"
 
@@ -17060,7 +16383,6 @@ msgid "Parsing message"
 msgstr "Parsing message"
 
 #: ../mail/e-mail-request.c:272
-#| msgid "These messages are not copies."
 msgid "The message has no text content."
 msgstr "The message has no text content."
 
@@ -17081,7 +16403,6 @@ msgstr "No data source found for UID '%s'"
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
 #: ../mail/em-composer-utils.c:390
 #, c-format
-#| msgid "Are you sure you want to send a message with only BCC recipients?"
 msgid "Are you sure you want to send a message with %d To and CC recipients?"
 msgid_plural ""
 "Are you sure you want to send a message with %d To and CC recipients?"
@@ -17121,7 +16442,6 @@ msgstr[1] ""
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
 #: ../mail/em-composer-utils.c:791
-#| msgid "Imports ICS attachments to calendar."
 msgid "Waiting for attachments to load..."
 msgstr "Waiting for attachments to load..."
 
@@ -17145,16 +16465,16 @@ msgstr "-------- Forwarded Message --------"
 msgid "-----Original Message-----"
 msgstr "-----Original Message-----"
 
-#: ../mail/em-composer-utils.c:3020
+#: ../mail/em-composer-utils.c:2968
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3492
+#: ../mail/em-composer-utils.c:3440
 msgid "Posting destination"
 msgstr "Posting destination"
 
-#: ../mail/em-composer-utils.c:3497
+#: ../mail/em-composer-utils.c:3445
 msgid "Choose folders to post the message to."
 msgstr "Choose folders to post the message to."
 
@@ -17163,11 +16483,11 @@ msgid "Select Folder"
 msgstr "Select Folder"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:587
+#: ../mail/em-filter-rule.c:597
 msgid "Then"
 msgstr "Then"
 
-#: ../mail/em-filter-rule.c:652
+#: ../mail/em-filter-rule.c:662
 msgid "Add Ac_tion"
 msgstr "Add Ac_tion"
 
@@ -17205,39 +16525,33 @@ msgstr "_Archive this folder using these settings:"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
 #: ../mail/em-folder-properties.c:598
-#| msgid "Sent _Messages Folder:"
 msgctxt "autoarchive"
 msgid "_Cleanup messages older than"
 msgstr "_Cleanup messages older than"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
 #: ../mail/em-folder-properties.c:614
-#| msgid "days"
 msgctxt "autoarchive"
 msgid "days"
 msgstr "days"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
 #: ../mail/em-folder-properties.c:616
-#| msgid "weeks"
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "weeks"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
 #: ../mail/em-folder-properties.c:618
-#| msgid "months"
 msgctxt "autoarchive"
 msgid "months"
 msgstr "months"
 
 #: ../mail/em-folder-properties.c:624
-#| msgid "Move selected messages to another folder"
 msgid "Move old messages to the default archive _folder"
 msgstr "Move old messages to the default archive _folder"
 
 #: ../mail/em-folder-properties.c:635
-#| msgid "Moving messages to '%s'"
 msgid "_Move old messages to:"
 msgstr "_Move old messages to:"
 
@@ -17246,12 +16560,10 @@ msgid "AutoArchive folder"
 msgstr "AutoArchive folder"
 
 #: ../mail/em-folder-properties.c:639
-#| msgid "Select folder to import into"
 msgid "Select folder to use for AutoArchive"
 msgstr "Select folder to use for AutoArchive"
 
 #: ../mail/em-folder-properties.c:645
-#| msgid "_Delete junk messages"
 msgid "_Delete old messages"
 msgstr "_Delete old messages"
 
@@ -17268,7 +16580,6 @@ msgid "<click here to select a folder>"
 msgstr "<click here to select a folder>"
 
 #: ../mail/em-folder-selector.c:398
-#| msgid "Create a new mail folder"
 msgid "Create a new folder"
 msgstr "Create a new folder"
 
@@ -17341,7 +16652,7 @@ msgid "Subscribe To _All"
 msgstr "Subscribe To _All"
 
 #: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1914
-#: ../mail/mail.error.xml.h:73 ../modules/mail/e-mail-shell-view-actions.c:1808
+#: ../mail/mail.error.xml.h:73 ../modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
@@ -17354,7 +16665,7 @@ msgid "Unsubscribe From _All"
 msgstr "Unsubscribe From _All"
 
 #: ../mail/em-subscription-editor.c:1339
-#: ../modules/mail/e-mail-shell-view-private.c:1025
+#: ../modules/mail/e-mail-shell-view-private.c:1030
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -17362,7 +16673,7 @@ msgstr[0] "%d unread, "
 msgstr[1] "%d unread, "
 
 #: ../mail/em-subscription-editor.c:1343
-#: ../modules/mail/e-mail-shell-view-private.c:1035
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -17394,7 +16705,7 @@ msgid "Su_bscribe"
 msgstr "Su_bscribe"
 
 #: ../mail/em-subscription-editor.c:1913
-#: ../modules/mail/e-mail-shell-view-actions.c:1810
+#: ../modules/mail/e-mail-shell-view-actions.c:1825
 msgid "Unsubscribe from the selected folder"
 msgstr "Unsubscribe from the selected folder"
 
@@ -17419,8 +16730,8 @@ msgid "Refresh the folder list"
 msgstr "Refresh the folder list"
 
 #: ../mail/em-subscription-editor.c:1976
-#: ../modules/mail/e-mail-shell-view-actions.c:1709
-#: ../modules/mail/e-mail-shell-view-actions.c:1780
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
 msgid "_Refresh"
 msgstr "_Refresh"
 
@@ -17430,7 +16741,6 @@ msgstr "Stop the current operation"
 
 #: ../mail/em-subscription-editor.c:1988
 #: ../modules/addressbook/e-book-shell-view-actions.c:1001
-#| msgid "Stop"
 msgid "_Stop"
 msgstr "_Stop"
 
@@ -17455,7 +16765,6 @@ msgid "Messages from %s"
 msgstr "Messages from %s"
 
 #: ../mail/em-utils.c:1680
-#| msgid "_Delete junk messages"
 msgid "Deleting old messages"
 msgstr "Deleting old messages"
 
@@ -17587,7 +16896,6 @@ msgstr "Expression"
 
 #: ../mail/filtertypes.xml.in.h:24 ../mail/searchtypes.xml.in.h:26
 #: ../mail/vfoldertypes.xml.in.h:26
-#| msgid "Expression"
 msgid "Free Form Expression"
 msgstr "Free Form Expression"
 
@@ -17628,13 +16936,11 @@ msgstr "Size (kB)"
 
 #: ../mail/filtertypes.xml.in.h:34 ../mail/searchtypes.xml.in.h:36
 #: ../mail/vfoldertypes.xml.in.h:36
-#| msgid "is greater than"
 msgid "is greater than or equal to"
 msgstr "is greater than or equal to"
 
 #: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
 #: ../mail/vfoldertypes.xml.in.h:37
-#| msgid "is less than"
 msgid "is less than or equal to"
 msgstr "is less than or equal to"
 
@@ -17676,13 +16982,11 @@ msgstr "is not Flagged"
 
 #: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
 #: ../mail/vfoldertypes.xml.in.h:48
-#| msgid "% Completed"
 msgid "is Completed"
 msgstr "is Completed"
 
 #: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
 #: ../mail/vfoldertypes.xml.in.h:49
-#| msgid "% Completed"
 msgid "is not Completed"
 msgstr "is not Completed"
 
@@ -17851,24 +17155,21 @@ msgstr "Importer Berkeley Mailbox format folders"
 
 #: ../mail/importers/kmail-importer.c:263
 #, c-format
-#| msgid "Address"
 msgid "%d Address"
 msgid_plural "%d Addresses"
 msgstr[0] "%d Address"
 msgstr[1] "%d Addresses"
 
 #: ../mail/importers/kmail-importer.c:354
-#| msgid "Evolution Elm importer"
 msgid "Evolution KMail importer"
 msgstr "Evolution KMail importer"
 
 #: ../mail/importers/kmail-importer.c:355
-#| msgid "Import mail from Elm."
 msgid "Import mail and contacts from KMail."
 msgstr "Import mail and contacts from KMail."
 
 #: ../mail/importers/kmail-libs.c:152
-#: ../modules/mail/e-mail-shell-view-private.c:1056
+#: ../modules/mail/e-mail-shell-view-private.c:1061
 msgid "Trash"
 msgstr "Wastebasket"
 
@@ -17877,7 +17178,6 @@ msgid "Importing mailbox"
 msgstr "Importing mailbox"
 
 #: ../mail/importers/mail-importer.c:60
-#| msgid "Import mail from Elm."
 msgid "Importing mail and contacts from KMail"
 msgstr "Importing mail and contacts from KMail"
 
@@ -17981,7 +17281,6 @@ msgid "For_mat messages in HTML"
 msgstr "For_mat messages in HTML"
 
 #: ../mail/mail-config.ui.h:10
-#| msgid "Automatically insert _emoticon images"
 msgid "Automatically insert _emoticons"
 msgstr "Automatically insert _emoticons"
 
@@ -17998,7 +17297,6 @@ msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Encode filenames in an _Outlook/GMail way"
 
 #: ../mail/mail-config.ui.h:14
-#| msgid "Saving message to Outbox."
 msgid "Send messages through Outbo_x folder"
 msgstr "Send messages through Outbo_x folder"
 
@@ -18099,7 +17397,6 @@ msgstr "Sending a message with only _Bcc recipients defined"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:46
-#| msgid "Sending a message with only _Bcc recipients defined"
 msgid "Sending a message to many _To and CC recipients"
 msgstr "Sending a message to many _To and CC recipients"
 
@@ -18125,7 +17422,6 @@ msgstr "Sending a message with _recipients not entered as mail addresses"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:56
-#| msgid "Sending a message with an _empty subject line"
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "Sending a message using _key accelerator (Ctrl+Enter)"
 
@@ -18135,19 +17431,16 @@ msgstr "Confirmations"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
 #: ../mail/mail-config.ui.h:61
-#| msgid "Search Folders"
 msgid "Use for Folders"
 msgstr "Use for Folders"
 
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
 #: ../mail/mail-config.ui.h:66
-#| msgid "Sender or Recipients"
 msgid "Use for Recipients"
 msgstr "Use for Recipients"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
 #: ../mail/mail-config.ui.h:68 ../modules/mail/em-composer-prefs.c:863
-#| msgid "_Account:"
 msgid "Account"
 msgstr "Account"
 
@@ -18172,7 +17465,6 @@ msgid "_Folder override has precedence over Recipient override"
 msgstr "_Folder override has precedence over Recipient override"
 
 #: ../mail/mail-config.ui.h:72
-#| msgid "Source Account"
 msgid "Send Account"
 msgstr "Send Account"
 
@@ -18266,7 +17558,6 @@ msgid "Archive Mail"
 msgstr "Archive Mail"
 
 #: ../mail/mail-config.ui.h:101
-#| msgid "On This Computer"
 msgid "On This Computer A_rchive folder:"
 msgstr "On This Computer A_rchive folder:"
 
@@ -18284,32 +17575,26 @@ 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:106
-#| msgid "Loading memos at %s"
 msgid "Loading Remote Content"
 msgstr "Loading Remote Content"
 
 #: ../mail/mail-config.ui.h:107
-#| msgid "_Never load images from the Internet"
 msgid "_Never load remote content from the Internet"
 msgstr "_Never load remote content from the Internet"
 
 #: ../mail/mail-config.ui.h:108
-#| msgid "_Load images only in messages from contacts"
 msgid "_Load remote content only in messages from contacts"
 msgstr "_Load remote content only in messages from contacts"
 
 #: ../mail/mail-config.ui.h:109
-#| msgid "_Always load images from the Internet"
 msgid "_Always load remote content from the Internet"
 msgstr "_Always load remote content from the Internet"
 
 #: ../mail/mail-config.ui.h:110
-#| msgid "_Show the photograph of sender in the message preview"
 msgid "Notify about _missing remote content in the message preview"
 msgstr "Notify about _missing remote content in the message preview"
 
 #: ../mail/mail-config.ui.h:111
-#| msgid "_Add"
 msgid "Add"
 msgstr "Add"
 
@@ -18318,12 +17603,10 @@ msgid "Remove"
 msgstr "Remove"
 
 #: ../mail/mail-config.ui.h:113
-#| msgid "Allow newlines"
 msgid "Allow for sites:"
 msgstr "Allow for sites:"
 
 #: ../mail/mail-config.ui.h:114
-#| msgid "All local folders"
 msgid "Allow for senders:"
 msgstr "Allow for senders:"
 
@@ -18370,7 +17653,6 @@ msgid "_Delete junk messages"
 msgstr "_Delete junk messages"
 
 #: ../mail/mail-config.ui.h:126
-#| msgid "Junk Settings"
 msgid "Junk Test Options"
 msgstr "Junk Test Options"
 
@@ -18642,9 +17924,6 @@ msgid "Use default drafts folder?"
 msgstr "Use default drafts folder?"
 
 #: ../mail/mail.error.xml.h:34
-#| msgid ""
-#| "Unable to open the drafts folder for this account. Use the system drafts "
-#| "folder instead?"
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?\n"
@@ -18684,7 +17963,7 @@ msgstr ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 
-#: ../mail/mail.error.xml.h:42 ../modules/mail/e-mail-shell-view-actions.c:1695
+#: ../mail/mail.error.xml.h:42 ../modules/mail/e-mail-shell-view-actions.c:1710
 msgid "_Empty Trash"
 msgstr "_Empty Wastebasket"
 
@@ -18792,7 +18071,6 @@ msgstr ""
 "will be deleted permanently."
 
 #: ../mail/mail.error.xml.h:70
-#| msgid "Really delete folder \"{0}\"?"
 msgid "Really unsubscribe folder \"{0}\"?"
 msgstr "Really unsubscribe folder \"{0}\"?"
 
@@ -18807,7 +18085,6 @@ msgstr ""
 ">Subscriptions... menu."
 
 #: ../mail/mail.error.xml.h:72
-#| msgid "_Unsubscribe"
 msgid "Do _Not Unsubscribe"
 msgstr "Do _Not Unsubscribe"
 
@@ -19052,7 +18329,6 @@ msgstr ""
 "Failed to query server for a list of supported authentication mechanisms."
 
 #: ../mail/mail.error.xml.h:130
-#| msgid "Failed to get server URL."
 msgid "Failed to get server setup."
 msgstr "Failed to get server setup."
 
@@ -19109,12 +18385,10 @@ msgid "Should Evolution close this window when replying or forwarding?"
 msgstr "Should Evolution close this window when replying or forwarding?"
 
 #: ../mail/mail.error.xml.h:142
-#| msgid "_Always"
 msgid "_Yes, Always"
 msgstr "_Yes, Always"
 
 #: ../mail/mail.error.xml.h:143
-#| msgid "Never"
 msgid "_No, Never"
 msgstr "_No, Never"
 
@@ -19127,17 +18401,14 @@ msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 
 #: ../mail/mail.error.xml.h:147
-#| msgid "Do _not Send"
 msgid "Do _not copy"
 msgstr "Do _not copy"
 
 #: ../mail/mail.error.xml.h:148
-#| msgid "_Always"
 msgid "_Always copy"
 msgstr "_Always copy"
 
 #: ../mail/mail.error.xml.h:149
-#| msgid "N_ever"
 msgid "N_ever copy"
 msgstr "N_ever copy"
 
@@ -19150,17 +18421,14 @@ msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 
 #: ../mail/mail.error.xml.h:153
-#| msgid "Do _not Send"
 msgid "Do _not move"
 msgstr "Do _not move"
 
 #: ../mail/mail.error.xml.h:154
-#| msgid "_Always"
 msgid "_Always move"
 msgstr "_Always move"
 
 #: ../mail/mail.error.xml.h:155
-#| msgid "N_ever"
 msgid "N_ever move"
 msgstr "N_ever move"
 
@@ -19211,7 +18479,6 @@ msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Folder '{0}' doesn't contain any duplicate messages."
 
 #: ../mail/mail.error.xml.h:167
-#| msgid "Failed to disconnect account &quot;{0}&quot;."
 msgid "Failed to connect account &quot;{0}&quot;."
 msgstr "Failed to connect account &quot;{0}&quot;."
 
@@ -19232,7 +18499,6 @@ msgid "{0}"
 msgstr "{0}"
 
 #: ../mail/mail.error.xml.h:172
-#| msgid "Not available in offline mode"
 msgid "Message is not available in offline mode."
 msgstr "Message is not available in offline mode."
 
@@ -19263,7 +18529,6 @@ msgid "Failed to retrieve messages."
 msgstr "Failed to retrieve messages."
 
 #: ../mail/mail.error.xml.h:178
-#| msgid "Failed to save messages to disk."
 msgid "Failed to mark messages as read."
 msgstr "Failed to mark messages as read."
 
@@ -19328,7 +18593,6 @@ msgid "Failed to unmark subthread from being ignored in folder '{0}'"
 msgstr "Failed to unmark subthread from being ignored in folder '{0}'"
 
 #: ../mail/mail.error.xml.h:193
-#| msgid "Request a _read receipt for this message"
 msgid "Remote content download had been blocked for this message."
 msgstr "Remote content download had been blocked for this message."
 
@@ -19342,7 +18606,6 @@ msgstr ""
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
 #: ../mail/mail.error.xml.h:196
-#| msgid "Completed on"
 msgid "{0}, Completed on {1}"
 msgstr "{0}, Completed on {1}"
 
@@ -19357,19 +18620,16 @@ msgid "Overdue: {0} by {1}"
 msgstr "Overdue: {0} by {1}"
 
 #: ../mail/mail.error.xml.h:202
-#| msgid "This signature has been changed, but has not been saved."
 msgid "This message note has been changed, but has not been saved."
 msgstr "This message note has been changed, but has not been saved."
 
 #. Translators: {0} is the name of the folder where the delete of the message note failed.
 #: ../mail/mail.error.xml.h:205
-#| msgid "Copy selected messages to another folder"
 msgid "Failed to delete message note in folder '{0}'"
 msgstr "Failed to delete message note in folder '{0}'"
 
 #. Translators: {0} is the name of the folder where the store of the message note failed.
 #: ../mail/mail.error.xml.h:207
-#| msgid "Failed to stream mail message content to Bogofilter: "
 msgid "Failed to store message note in folder '{0}'"
 msgstr "Failed to store message note in folder '{0}'"
 
@@ -19405,13 +18665,11 @@ msgstr "Deleting junk and expunging wastebasket at '%s'"
 
 #: ../mail/mail-send-recv.c:1458
 #, c-format
-#| msgid "Reconnecting to '%s'"
 msgid "Deleting junk at '%s'"
 msgstr "Deleting junk at '%s'"
 
 #: ../mail/mail-send-recv.c:1460
 #, c-format
-#| msgid "Emptying trash in '%s'"
 msgid "Expunging trash at '%s'"
 msgstr "Expunging wastebasket at '%s'"
 
@@ -19563,33 +18821,32 @@ msgid "Subject or Addresses contains"
 msgstr "Subject or Addresses contains"
 
 #: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2224
+#: ../modules/mail/e-mail-shell-view-actions.c:2239
 msgid "Recipients contain"
 msgstr "Recipients contain"
 
 #: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2217
+#: ../modules/mail/e-mail-shell-view-actions.c:2232
 msgid "Message contains"
 msgstr "Message contains"
 
 #: ../mail/searchtypes.xml.in.h:60
-#: ../modules/mail/e-mail-shell-view-actions.c:2238
+#: ../modules/mail/e-mail-shell-view-actions.c:2253
 msgid "Subject contains"
 msgstr "Subject contains"
 
 #: ../mail/searchtypes.xml.in.h:61
-#: ../modules/mail/e-mail-shell-view-actions.c:2231
+#: ../modules/mail/e-mail-shell-view-actions.c:2246
 msgid "Sender contains"
 msgstr "Sender contains"
 
 #: ../mail/searchtypes.xml.in.h:62
-#: ../modules/mail/e-mail-shell-view-actions.c:2203
+#: ../modules/mail/e-mail-shell-view-actions.c:2218
 msgid "Body contains"
 msgstr "Body contains"
 
 #: ../mail/searchtypes.xml.in.h:63
-#: ../modules/mail/e-mail-shell-view-actions.c:2210
-#| msgid "Expression"
+#: ../modules/mail/e-mail-shell-view-actions.c:2225
 msgid "Free form expression"
 msgstr "Free form expression"
 
@@ -19697,7 +18954,6 @@ msgid "Delete the selected address book"
 msgstr "Delete the selected address book"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:952
-#| msgid "Mo_ve to Address Book..."
 msgid "_Manage Address Book groups..."
 msgstr "_Manage Address Book groups..."
 
@@ -19734,7 +18990,6 @@ msgid "Re_fresh"
 msgstr "Re_fresh"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:982
-#| msgid "Rename the selected address book"
 msgid "Refresh the selected address book"
 msgstr "Refresh the selected address book"
 
@@ -19750,7 +19005,7 @@ msgstr "Show map with all contacts from selected address book"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1299
 #: ../modules/calendar/e-memo-shell-view-actions.c:621
 #: ../modules/calendar/e-task-shell-view-actions.c:747
-#: ../modules/mail/e-mail-shell-view-actions.c:1787
+#: ../modules/mail/e-mail-shell-view-actions.c:1802
 msgid "_Rename..."
 msgstr "_Rename…"
 
@@ -19831,7 +19086,7 @@ msgstr "_Actions"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1080
 #: ../modules/calendar/e-memo-shell-view-actions.c:665
 #: ../modules/calendar/e-task-shell-view-actions.c:819
-#: ../modules/mail/e-mail-shell-view-actions.c:1959
+#: ../modules/mail/e-mail-shell-view-actions.c:1974
 msgid "_Preview"
 msgstr "_Preview"
 
@@ -19839,7 +19094,6 @@ msgstr "_Preview"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1491
 #: ../modules/calendar/e-memo-shell-view-actions.c:682
 #: ../modules/calendar/e-task-shell-view-actions.c:836
-#| msgid "_Manager:"
 msgid "_Manage groups..."
 msgstr "_Manage groups..."
 
@@ -19866,7 +19120,7 @@ msgstr "Show maps in contact preview window"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1166
 #: ../modules/calendar/e-memo-shell-view-actions.c:743
 #: ../modules/calendar/e-task-shell-view-actions.c:909
-#: ../modules/mail/e-mail-shell-view-actions.c:2105
+#: ../modules/mail/e-mail-shell-view-actions.c:2120
 msgid "_Classic View"
 msgstr "_Classic View"
 
@@ -19877,7 +19131,7 @@ msgstr "Show contact preview below the contact list"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1173
 #: ../modules/calendar/e-memo-shell-view-actions.c:750
 #: ../modules/calendar/e-task-shell-view-actions.c:916
-#: ../modules/mail/e-mail-shell-view-actions.c:2112
+#: ../modules/mail/e-mail-shell-view-actions.c:2127
 msgid "_Vertical View"
 msgstr "_Vertical View"
 
@@ -19896,7 +19150,7 @@ msgstr "Unmatched"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1657
 #: ../modules/calendar/e-memo-shell-view-actions.c:777
 #: ../modules/calendar/e-task-shell-view-actions.c:978
-#: ../modules/mail/e-mail-shell-view-actions.c:2196
+#: ../modules/mail/e-mail-shell-view-actions.c:2211
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Advanced Search"
@@ -19985,7 +19239,6 @@ msgid "_Restart Evolution after backup"
 msgstr "_Restart Evolution after backup"
 
 #: ../modules/backup-restore/evolution-backup-restore.c:285
-#| msgid "_Restart Evolution after restore"
 msgid "Re_start Evolution after restore"
 msgstr "Re_start Evolution after restore"
 
@@ -20120,7 +19373,6 @@ msgid "Invalid Evolution backup file"
 msgstr "Invalid Evolution backup file"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#| msgid "Invalid Evolution backup file"
 msgid "File '{0}' is not a valid Evolution backup file."
 msgstr "File '{0}' is not a valid Evolution backup file."
 
@@ -20137,7 +19389,6 @@ msgstr ""
 "make sure that you save any unsaved data before proceeding."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
-#| msgid "Close and Back up Evolution"
 msgid "Close and _Back up Evolution"
 msgstr "Close and _Back up Evolution"
 
@@ -20160,7 +19411,6 @@ msgstr ""
 "backup."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
-#| msgid "Close and Restore Evolution"
 msgid "Close and _Restore Evolution"
 msgstr "Close and _Restore Evolution"
 
@@ -20199,7 +19449,6 @@ msgid "Bogofilter"
 msgstr "Bogofilter"
 
 #: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
-#| msgid "Junk filtering software:"
 msgid "Junk filter using Bogofilter"
 msgstr "Junk filter using Bogofilter"
 
@@ -20209,7 +19458,6 @@ msgstr "Junk filter using Bogofilter"
 #: ../modules/cal-config-google/e-cal-config-gtasks.c:117
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:433
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:468
-#| msgid "Label name cannot be empty."
 msgid "User name cannot be empty"
 msgstr "User name cannot be empty"
 
@@ -20219,7 +19467,6 @@ msgstr "Standard LDAP Port"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:631
-#| msgid "LDAP over SSL (deprecated)"
 msgid "LDAP over SSL/TLS (deprecated)"
 msgstr "LDAP over SSL/TLS (deprecated)"
 
@@ -20228,7 +19475,6 @@ msgid "Microsoft Global Catalog"
 msgstr "Microsoft Global Catalogue"
 
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
-#| msgid "Microsoft Global Catalog over SSL"
 msgid "Microsoft Global Catalog over SSL/TLS"
 msgstr "Microsoft Global Catalog over SSL/TLS"
 
@@ -20356,12 +19602,10 @@ msgstr "Browse until limit is reached"
 #: ../modules/book-config-ldap/evolution-book-config-ldap.c:978
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:414
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:450
-#| msgid "Label name cannot be empty."
 msgid "Server address cannot be empty"
 msgstr "Server address cannot be empty"
 
 #: ../modules/book-config-webdav/evolution-book-config-webdav.c:92
-#| msgid "New Address Book"
 msgid "Choose an Address Book"
 msgstr "Choose an Address Book"
 
@@ -20372,7 +19616,6 @@ msgid "URL:"
 msgstr "URL:"
 
 #: ../modules/book-config-webdav/evolution-book-config-webdav.c:249
-#| msgid "Add Address Book"
 msgid "Find Address Books"
 msgstr "Find Address Books"
 
@@ -20460,7 +19703,6 @@ msgstr "Allow Evolution to update the file"
 #. * This string is just a fallback mechanism for systems on
 #. * which _NL_MEASUREMENT_MEASUREMENT is not available.
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:186
-#| msgid "Default"
 msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "default:mm"
@@ -20483,12 +19725,10 @@ msgid "Kelvin (K)"
 msgstr "Kelvin (K)"
 
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
-#| msgid "_Units:"
 msgid "Units:"
 msgstr "Units:"
 
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:321
-#| msgid "Label name cannot be empty."
 msgid "Location cannot be empty"
 msgstr "Location cannot be empty"
 
@@ -20498,17 +19738,14 @@ msgid "I_mport"
 msgstr "I_mport"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:337
-#| msgid "Importing data."
 msgid "Importing an event"
 msgstr "Importing an event"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:341
-#| msgid "Importing mailbox"
 msgid "Importing a memo"
 msgstr "Importing a memo"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:345
-#| msgid "Importing data."
 msgid "Importing a task"
 msgstr "Importing a task"
 
@@ -20517,7 +19754,6 @@ msgid "Select a Calendar"
 msgstr "Select a Calendar"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:410
-#| msgid "D_elete Memo List"
 msgid "Select a Memo List"
 msgstr "Select a Memo List"
 
@@ -20530,12 +19766,10 @@ msgid "I_mport to Calendar"
 msgstr "I_mport to Calendar"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:431
-#| msgid "I_mport to Tasks"
 msgid "I_mport to Memo List"
 msgstr "I_mport to Memo List"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:438
-#| msgid "I_mport to Tasks"
 msgid "I_mport to Task List"
 msgstr "I_mport to Task List"
 
@@ -20546,37 +19780,31 @@ msgstr "New Memo List"
 
 #: ../modules/calendar/e-cal-base-shell-sidebar.c:556
 #, c-format
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Copying an event into the calendar '%s'"
 msgstr "Copying an event into the calendar '%s'"
 
 #: ../modules/calendar/e-cal-base-shell-sidebar.c:557
 #, c-format
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Moving an event into the calendar '%s'"
 msgstr "Moving an event into the calendar '%s'"
 
 #: ../modules/calendar/e-cal-base-shell-sidebar.c:562
 #, c-format
-#| msgid "Opening memo list '%s'"
 msgid "Copying a memo into the memo list '%s'"
 msgstr "Copying a memo into the memo list '%s'"
 
 #: ../modules/calendar/e-cal-base-shell-sidebar.c:563
 #, c-format
-#| msgid "Show memo preview below the memo list"
 msgid "Moving a memo into the memo list '%s'"
 msgstr "Moving a memo into the memo list '%s'"
 
 #: ../modules/calendar/e-cal-base-shell-sidebar.c:568
 #, c-format
-#| msgid "Opening task list '%s'"
 msgid "Copying a task into the task list '%s'"
 msgstr "Copying a task into the task list '%s'"
 
 #: ../modules/calendar/e-cal-base-shell-sidebar.c:569
 #, c-format
-#| msgid "Show task preview below the task list"
 msgid "Moving a task into the task list '%s'"
 msgstr "Moving a task into the task list '%s'"
 
@@ -20772,7 +20000,6 @@ msgid "Create events, memos and tasks as _Private by default"
 msgstr "Create events, memos and tasks as _Private by default"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:49
-#| msgid "Send Options"
 msgid "View Options"
 msgstr "View Options"
 
@@ -20785,7 +20012,6 @@ 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:52
-#| msgid "Show appointment end times in week and month views"
 msgid "Show appointment _icons in the month view"
 msgstr "Show appointment _icons in the month view"
 
@@ -20838,7 +20064,6 @@ msgid "Display reminders in _notification area only"
 msgstr "Display reminders in _notification area only"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:68
-#| msgid "Delete completed tasks"
 msgid "Display reminders for completed _tasks"
 msgstr "Display reminders for completed _tasks"
 
@@ -20950,7 +20175,6 @@ msgid "Purge events older than"
 msgstr "Purge events older than"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:926
-#| msgid "Make this Occurrence _Movable"
 msgid "Making an occurrence movable"
 msgstr "Making an occurrence movable"
 
@@ -21003,7 +20227,6 @@ msgid "Select a specific date"
 msgstr "Select a specific date"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1264
-#| msgid "_New Calendar..."
 msgid "_Manage Calendar groups..."
 msgstr "_Manage Calendar groups..."
 
@@ -21033,7 +20256,6 @@ msgid "Rename the selected calendar"
 msgstr "Rename the selected calendar"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1306
-#| msgid "Find _next"
 msgid "Find _Next"
 msgstr "Find _Next"
 
@@ -21042,7 +20264,6 @@ msgid "Find next occurrence of the current search string"
 msgstr "Find next occurrence of the current search string"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1313
-#| msgid "Find _previous"
 msgid "Find _Previous"
 msgstr "Find _Previous"
 
@@ -21051,7 +20272,6 @@ msgid "Find previous occurrence of the current search string"
 msgstr "Find previous occurrence of the current search string"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1320
-#| msgid "Stop _running search"
 msgid "Stop _Running Search"
 msgstr "Stop _Running Search"
 
@@ -21060,7 +20280,6 @@ msgid "Stop currently running search"
 msgstr "Stop currently running search"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1327
-#| msgid "Local Calendars"
 msgid "Sho_w All Calendars"
 msgstr "Sho_w All Calendars"
 
@@ -21236,7 +20455,6 @@ msgstr "Summary contains"
 #: ../modules/calendar/e-memo-shell-view-actions.c:822
 #: ../modules/calendar/e-task-shell-view-actions.c:1009
 #: ../modules/calendar/e-task-shell-view-actions.c:1023
-#| msgid "_Print..."
 msgid "Print..."
 msgstr "Print..."
 
@@ -21463,7 +20681,6 @@ msgid "Show _Only This Memo List"
 msgstr "Show _Only This Memo List"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:635
-#| msgid "Show _Only This Memo List"
 msgid "Sho_w All Memo Lists"
 msgstr "Sho_w All Memo Lists"
 
@@ -21582,7 +20799,6 @@ msgid "Delete the selected task list"
 msgstr "Delete the selected task list"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:719
-#| msgid "Task List Group"
 msgid "_Manage Task List groups..."
 msgstr "_Manage Task List groups..."
 
@@ -21599,7 +20815,6 @@ msgid "Rename the selected task list"
 msgstr "Rename the selected task list"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:754
-#| msgid "Show _Only This Task List"
 msgid "Sho_w All Task Lists"
 msgstr "Sho_w All Task Lists"
 
@@ -21897,13 +21112,11 @@ msgstr "%s has sent back the following meeting response:"
 
 #: ../modules/itip-formatter/itip-view.c:476
 #, c-format
-#| msgid "%s through %s has canceled the following meeting:"
 msgid "%s through %s has cancelled the following meeting:"
 msgstr "%s through %s has cancelled the following meeting:"
 
 #: ../modules/itip-formatter/itip-view.c:478
 #, c-format
-#| msgid "%s has canceled the following meeting:"
 msgid "%s has cancelled the following meeting:"
 msgstr "%s has cancelled the following meeting:"
 
@@ -21990,13 +21203,11 @@ msgstr "%s has sent back the following assigned task response:"
 
 #: ../modules/itip-formatter/itip-view.c:566
 #, c-format
-#| msgid "%s through %s has canceled the following assigned task:"
 msgid "%s through %s has cancelled the following assigned task:"
 msgstr "%s through %s has cancelled the following assigned task:"
 
 #: ../modules/itip-formatter/itip-view.c:568
 #, c-format
-#| msgid "%s has canceled the following assigned task:"
 msgid "%s has cancelled the following assigned task:"
 msgstr "%s has cancelled the following assigned task:"
 
@@ -22042,270 +21253,267 @@ msgstr "%s wishes to add to an existing memo:"
 
 #: ../modules/itip-formatter/itip-view.c:632
 #, c-format
-#| msgid "%s through %s has canceled the following shared memo:"
 msgid "%s through %s has cancelled the following shared memo:"
 msgstr "%s through %s has cancelled the following shared memo:"
 
 #: ../modules/itip-formatter/itip-view.c:634
 #, c-format
-#| msgid "%s has canceled the following shared memo:"
 msgid "%s has cancelled the following shared memo:"
 msgstr "%s has cancelled the following shared memo:"
 
-#: ../modules/itip-formatter/itip-view.c:893
+#: ../modules/itip-formatter/itip-view.c:859
 msgid "All day:"
 msgstr "All day:"
 
-#: ../modules/itip-formatter/itip-view.c:899
+#: ../modules/itip-formatter/itip-view.c:865
 msgid "Start day:"
 msgstr "Start day:"
 
-#: ../modules/itip-formatter/itip-view.c:899
-#: ../modules/itip-formatter/itip-view.c:1725
+#: ../modules/itip-formatter/itip-view.c:865
+#: ../modules/itip-formatter/itip-view.c:1667
 msgid "Start time:"
 msgstr "Start time:"
 
-#: ../modules/itip-formatter/itip-view.c:908
+#: ../modules/itip-formatter/itip-view.c:874
 msgid "End day:"
 msgstr "End day:"
 
-#: ../modules/itip-formatter/itip-view.c:908
-#: ../modules/itip-formatter/itip-view.c:1726
+#: ../modules/itip-formatter/itip-view.c:874
+#: ../modules/itip-formatter/itip-view.c:1668
 msgid "End time:"
 msgstr "End time:"
 
-#: ../modules/itip-formatter/itip-view.c:1255
+#: ../modules/itip-formatter/itip-view.c:1205
 msgid "Ope_n Calendar"
 msgstr "Ope_n Calendar"
 
-#: ../modules/itip-formatter/itip-view.c:1258
+#: ../modules/itip-formatter/itip-view.c:1208
 msgid "_Decline all"
 msgstr "_Decline all"
 
-#: ../modules/itip-formatter/itip-view.c:1261
+#: ../modules/itip-formatter/itip-view.c:1211
 msgid "_Decline"
 msgstr "_Decline"
 
-#: ../modules/itip-formatter/itip-view.c:1264
+#: ../modules/itip-formatter/itip-view.c:1214
 msgid "_Tentative all"
 msgstr "_Tentative all"
 
-#: ../modules/itip-formatter/itip-view.c:1267
+#: ../modules/itip-formatter/itip-view.c:1217
 msgid "_Tentative"
 msgstr "_Tentative"
 
-#: ../modules/itip-formatter/itip-view.c:1270
+#: ../modules/itip-formatter/itip-view.c:1220
 msgid "Acce_pt all"
 msgstr "Acce_pt all"
 
-#: ../modules/itip-formatter/itip-view.c:1273
+#: ../modules/itip-formatter/itip-view.c:1223
 msgid "Acce_pt"
 msgstr "Acce_pt"
 
-#: ../modules/itip-formatter/itip-view.c:1276
+#: ../modules/itip-formatter/itip-view.c:1226
 msgid "Send _Information"
 msgstr "Send _Information"
 
-#: ../modules/itip-formatter/itip-view.c:1279
+#: ../modules/itip-formatter/itip-view.c:1229
 msgid "_Update Attendee Status"
 msgstr "_Update Attendee Status"
 
-#: ../modules/itip-formatter/itip-view.c:1282
+#: ../modules/itip-formatter/itip-view.c:1232
 #: ../smime/gui/certificate-manager.c:1679
 msgid "_Update"
 msgstr "_Update"
 
-#: ../modules/itip-formatter/itip-view.c:1728
-#: ../modules/itip-formatter/itip-view.c:1776
-#: ../modules/itip-formatter/itip-view.c:1847
+#: ../modules/itip-formatter/itip-view.c:1670
+#: ../modules/itip-formatter/itip-view.c:1718
+#: ../modules/itip-formatter/itip-view.c:1789
 msgid "Comment:"
 msgstr "Comment:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1764
+#: ../modules/itip-formatter/itip-view.c:1706
 msgid "Send reply to sender"
 msgstr "Send reply to sender"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1779
+#: ../modules/itip-formatter/itip-view.c:1721
 msgid "Send _updates to attendees"
 msgstr "Send _updates to attendees"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1782
+#: ../modules/itip-formatter/itip-view.c:1724
 msgid "_Apply to all instances"
 msgstr "_Apply to all instances"
 
-#: ../modules/itip-formatter/itip-view.c:1783
+#: ../modules/itip-formatter/itip-view.c:1725
 msgid "Show time as _free"
 msgstr "Show time as _free"
 
-#: ../modules/itip-formatter/itip-view.c:1784
+#: ../modules/itip-formatter/itip-view.c:1726
 msgid "_Preserve my reminder"
 msgstr "_Preserve my reminder"
 
-#: ../modules/itip-formatter/itip-view.c:1785
+#: ../modules/itip-formatter/itip-view.c:1727
 msgid "_Inherit reminder"
 msgstr "_Inherit reminder"
 
-#: ../modules/itip-formatter/itip-view.c:2102
+#: ../modules/itip-formatter/itip-view.c:2036
 msgid "_Tasks:"
 msgstr "_Tasks:"
 
-#: ../modules/itip-formatter/itip-view.c:2105
+#: ../modules/itip-formatter/itip-view.c:2039
 msgid "_Memos:"
 msgstr "_Memos:"
 
-#: ../modules/itip-formatter/itip-view.c:3059
+#: ../modules/itip-formatter/itip-view.c:2952
 msgid "Sa_ve"
 msgstr "Sa_ve"
 
-#: ../modules/itip-formatter/itip-view.c:3499
-#: ../modules/itip-formatter/itip-view.c:4955
+#: ../modules/itip-formatter/itip-view.c:3392
+#: ../modules/itip-formatter/itip-view.c:4848
 msgid "Attendee status updated"
 msgstr "Attendee status updated"
 
-#: ../modules/itip-formatter/itip-view.c:3664
+#: ../modules/itip-formatter/itip-view.c:3557
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "An appointment in the calendar '%s' conflicts with this meeting"
 
-#: ../modules/itip-formatter/itip-view.c:3694
+#: ../modules/itip-formatter/itip-view.c:3587
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Found the appointment in the calendar '%s'"
 
-#: ../modules/itip-formatter/itip-view.c:3828
+#: ../modules/itip-formatter/itip-view.c:3721
 msgid "Unable to find any calendars"
 msgstr "Unable to find any calendars"
 
-#: ../modules/itip-formatter/itip-view.c:3836
+#: ../modules/itip-formatter/itip-view.c:3729
 msgid "Unable to find this meeting in any calendar"
 msgstr "Unable to find this meeting in any calendar"
 
-#: ../modules/itip-formatter/itip-view.c:3841
+#: ../modules/itip-formatter/itip-view.c:3734
 msgid "Unable to find this task in any task list"
 msgstr "Unable to find this task in any task list"
 
-#: ../modules/itip-formatter/itip-view.c:3846
+#: ../modules/itip-formatter/itip-view.c:3739
 msgid "Unable to find this memo in any memo list"
 msgstr "Unable to find this memo in any memo list"
 
-#: ../modules/itip-formatter/itip-view.c:4190
+#: ../modules/itip-formatter/itip-view.c:4083
 msgid "Opening the calendar. Please wait..."
 msgstr "Opening the calendar. Please wait…"
 
-#: ../modules/itip-formatter/itip-view.c:4195
+#: ../modules/itip-formatter/itip-view.c:4088
 msgid "Searching for an existing version of this appointment"
 msgstr "Searching for an existing version of this appointment"
 
-#: ../modules/itip-formatter/itip-view.c:4594
+#: ../modules/itip-formatter/itip-view.c:4487
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Unable to send item to calendar '%s'.  %s"
 
-#: ../modules/itip-formatter/itip-view.c:4609
+#: ../modules/itip-formatter/itip-view.c:4502
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Sent to calendar '%s' as accepted"
 
-#: ../modules/itip-formatter/itip-view.c:4614
+#: ../modules/itip-formatter/itip-view.c:4507
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Sent to calendar '%s' as tentative"
 
-#: ../modules/itip-formatter/itip-view.c:4620
+#: ../modules/itip-formatter/itip-view.c:4513
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Sent to calendar '%s' as declined"
 
-#: ../modules/itip-formatter/itip-view.c:4626
+#: ../modules/itip-formatter/itip-view.c:4519
 #, c-format
-#| msgid "Sent to calendar '%s' as canceled"
 msgid "Sent to calendar '%s' as cancelled"
 msgstr "Sent to calendar '%s' as cancelled"
 
-#: ../modules/itip-formatter/itip-view.c:4646
-#: ../modules/itip-formatter/itip-view.c:5092
-#: ../modules/itip-formatter/itip-view.c:5195
+#: ../modules/itip-formatter/itip-view.c:4539
+#: ../modules/itip-formatter/itip-view.c:4985
+#: ../modules/itip-formatter/itip-view.c:5088
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Saving changes to the calendar. Please wait…"
 
-#: ../modules/itip-formatter/itip-view.c:4687
+#: ../modules/itip-formatter/itip-view.c:4580
 msgid "Unable to parse item"
 msgstr "Unable to parse item"
 
-#: ../modules/itip-formatter/itip-view.c:4879
+#: ../modules/itip-formatter/itip-view.c:4772
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organiser has removed the delegate %s "
 
-#: ../modules/itip-formatter/itip-view.c:4896
+#: ../modules/itip-formatter/itip-view.c:4789
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Sent a cancellation notice to the delegate"
 
-#: ../modules/itip-formatter/itip-view.c:4900
+#: ../modules/itip-formatter/itip-view.c:4793
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Could not send the cancellation notice to the delegate"
 
-#: ../modules/itip-formatter/itip-view.c:4947
+#: ../modules/itip-formatter/itip-view.c:4840
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Unable to update attendee. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4982
+#: ../modules/itip-formatter/itip-view.c:4875
 msgid "The meeting is invalid and cannot be updated"
 msgstr "The meeting is invalid and cannot be updated"
 
-#: ../modules/itip-formatter/itip-view.c:5057
+#: ../modules/itip-formatter/itip-view.c:4950
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Attendee status could not be updated because the status is invalid"
 
-#: ../modules/itip-formatter/itip-view.c:5128
-#: ../modules/itip-formatter/itip-view.c:5166
+#: ../modules/itip-formatter/itip-view.c:5021
+#: ../modules/itip-formatter/itip-view.c:5059
 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"
 
-#: ../modules/itip-formatter/itip-view.c:5227
+#: ../modules/itip-formatter/itip-view.c:5120
 msgid "Meeting information sent"
 msgstr "Meeting information sent"
 
-#: ../modules/itip-formatter/itip-view.c:5232
+#: ../modules/itip-formatter/itip-view.c:5125
 msgid "Task information sent"
 msgstr "Task information sent"
 
-#: ../modules/itip-formatter/itip-view.c:5237
+#: ../modules/itip-formatter/itip-view.c:5130
 msgid "Memo information sent"
 msgstr "Memo information sent"
 
-#: ../modules/itip-formatter/itip-view.c:5248
+#: ../modules/itip-formatter/itip-view.c:5141
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Unable to send meeting information, the meeting does not exist"
 
-#: ../modules/itip-formatter/itip-view.c:5253
+#: ../modules/itip-formatter/itip-view.c:5146
 msgid "Unable to send task information, the task does not exist"
 msgstr "Unable to send task information, the task does not exist"
 
-#: ../modules/itip-formatter/itip-view.c:5258
+#: ../modules/itip-formatter/itip-view.c:5151
 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.
-#: ../modules/itip-formatter/itip-view.c:5323
+#: ../modules/itip-formatter/itip-view.c:5216
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5328
+#: ../modules/itip-formatter/itip-view.c:5221
 msgid "Save Calendar"
 msgstr "Save Calendar"
 
-#: ../modules/itip-formatter/itip-view.c:5376
-#: ../modules/itip-formatter/itip-view.c:5389
+#: ../modules/itip-formatter/itip-view.c:5269
+#: ../modules/itip-formatter/itip-view.c:5282
 msgid "The calendar attached is not valid"
 msgstr "The calendar attached is not valid"
 
-#: ../modules/itip-formatter/itip-view.c:5377
-#: ../modules/itip-formatter/itip-view.c:5390
+#: ../modules/itip-formatter/itip-view.c:5270
+#: ../modules/itip-formatter/itip-view.c:5283
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -22313,15 +21521,15 @@ msgstr ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 
-#: ../modules/itip-formatter/itip-view.c:5432
-#: ../modules/itip-formatter/itip-view.c:5462
-#: ../modules/itip-formatter/itip-view.c:5565
+#: ../modules/itip-formatter/itip-view.c:5325
+#: ../modules/itip-formatter/itip-view.c:5355
+#: ../modules/itip-formatter/itip-view.c:5458
 msgid "The item in the calendar is not valid"
 msgstr "The item in the calendar is not valid"
 
-#: ../modules/itip-formatter/itip-view.c:5433
-#: ../modules/itip-formatter/itip-view.c:5463
-#: ../modules/itip-formatter/itip-view.c:5566
+#: ../modules/itip-formatter/itip-view.c:5326
+#: ../modules/itip-formatter/itip-view.c:5356
+#: ../modules/itip-formatter/itip-view.c:5459
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -22329,11 +21537,11 @@ msgstr ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 
-#: ../modules/itip-formatter/itip-view.c:5478
+#: ../modules/itip-formatter/itip-view.c:5371
 msgid "The calendar attached contains multiple items"
 msgstr "The calendar attached contains multiple items"
 
-#: ../modules/itip-formatter/itip-view.c:5479
+#: ../modules/itip-formatter/itip-view.c:5372
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -22341,24 +21549,24 @@ msgstr ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 
-#: ../modules/itip-formatter/itip-view.c:5974
+#: ../modules/itip-formatter/itip-view.c:5890
 msgctxt "cal-itip"
 msgid "None"
 msgstr "None"
 
-#: ../modules/itip-formatter/itip-view.c:5990
+#: ../modules/itip-formatter/itip-view.c:5906
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
-#: ../modules/itip-formatter/itip-view.c:6150
+#: ../modules/itip-formatter/itip-view.c:6072
 msgid "This meeting recurs"
 msgstr "This meeting recurs"
 
-#: ../modules/itip-formatter/itip-view.c:6153
+#: ../modules/itip-formatter/itip-view.c:6075
 msgid "This task recurs"
 msgstr "This task recurs"
 
-#: ../modules/itip-formatter/itip-view.c:6156
+#: ../modules/itip-formatter/itip-view.c:6078
 msgid "This memo recurs"
 msgstr "This memo recurs"
 
@@ -22403,7 +21611,6 @@ msgid "Choose a MH mail directory"
 msgstr "Choose a MH mail directory"
 
 #: ../modules/mail-config/e-mail-config-local-accounts.c:270
-#| msgid "Label name cannot be empty."
 msgid "MH mail directory cannot be empty"
 msgstr "MH mail directory cannot be empty"
 
@@ -22416,7 +21623,6 @@ msgid "Choose a local delivery file"
 msgstr "Choose a local delivery file"
 
 #: ../modules/mail-config/e-mail-config-local-accounts.c:294
-#| msgid "Label name cannot be empty."
 msgid "Local delivery file cannot be empty"
 msgstr "Local delivery file cannot be empty"
 
@@ -22425,7 +21631,6 @@ msgid "Choose a Maildir mail directory"
 msgstr "Choose a Maildir mail directory"
 
 #: ../modules/mail-config/e-mail-config-local-accounts.c:318
-#| msgid "Label name cannot be empty."
 msgid "Maildir mail directory cannot be empty"
 msgstr "Maildir mail directory cannot be empty"
 
@@ -22438,7 +21643,6 @@ msgid "Choose a mbox spool file"
 msgstr "Choose a mbox spool file"
 
 #: ../modules/mail-config/e-mail-config-local-accounts.c:342
-#| msgid "Label name cannot be empty."
 msgid "Mbox spool file cannot be empty"
 msgstr "Mbox spool file cannot be empty"
 
@@ -22451,7 +21655,6 @@ msgid "Choose a mbox spool directory"
 msgstr "Choose a mbox spool directory"
 
 #: ../modules/mail-config/e-mail-config-local-accounts.c:366
-#| msgid "Label name cannot be empty."
 msgid "Mbox spool directory cannot be empty"
 msgstr "Mbox spool directory cannot be empty"
 
@@ -22481,7 +21684,6 @@ msgstr "User_name:"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:264
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:326
-#| msgid "_Forget Passwords"
 msgid "_Forget password"
 msgstr "_Forget password"
 
@@ -22497,7 +21699,6 @@ msgstr "STARTTLS after connecting"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:309
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:252
-#| msgid "SSL on a dedicated port"
 msgid "TLS on a dedicated port"
 msgstr "TLS on a dedicated port"
 
@@ -22528,12 +21729,10 @@ msgstr ""
 "   %R - stands for the recipient addresses"
 
 #: ../modules/mail-config/e-mail-config-sendmail-backend.c:137
-#| msgid "Not available in offline mode"
 msgid "Send mail also when in offline _mode"
 msgstr "Send mail also when in offline _mode"
 
 #: ../modules/mail-config/e-mail-config-sendmail-backend.c:210
-#| msgid "Label name cannot be empty."
 msgid "Custom binary cannot be empty"
 msgstr "Custom binary cannot be empty"
 
@@ -22616,14 +21815,12 @@ msgstr "Method to detect _online state:"
 
 #. Always as the first
 #: ../modules/mail/e-mail-shell-backend.c:758
-#| msgid "Default"
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Default"
 
 #. Always as the last
 #: ../modules/mail/e-mail-shell-backend.c:772
-#| msgid "Allow newlines"
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Always Online"
@@ -22652,257 +21849,251 @@ msgid "None"
 msgstr "None"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:736
-#| msgid "Mark all messages as read"
 msgid "Marking messages as read..."
 msgstr "Marking messages as read..."
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1095
-#| msgid "Copy to Folder"
 msgid "Go to Folder"
 msgstr "Go to Folder"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1099
-#| msgid "Select"
 msgid "_Select"
 msgstr "_Select"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1688
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "_Disable Account"
 msgstr "_Disable Account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1690
+#: ../modules/mail/e-mail-shell-view-actions.c:1705
 msgid "Disable this account"
 msgstr "Disable this account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1697
+#: ../modules/mail/e-mail-shell-view-actions.c:1712
 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:1704
+#: ../modules/mail/e-mail-shell-view-actions.c:1719
 msgid "Edit properties of this account"
 msgstr "Edit properties of this account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1711
+#: ../modules/mail/e-mail-shell-view-actions.c:1726
 msgid "Refresh list of folders of this account"
 msgstr "Refresh list of folders of this account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1716
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "_Download Messages for Offline Usage"
 msgstr "_Download Messages for Offline Usage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1718
+#: ../modules/mail/e-mail-shell-view-actions.c:1733
 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:1723
+#: ../modules/mail/e-mail-shell-view-actions.c:1738
 msgid "Fl_ush Outbox"
 msgstr "Fl_ush Outbox"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1730
+#: ../modules/mail/e-mail-shell-view-actions.c:1745
 msgid "_Copy Folder To..."
 msgstr "_Copy Folder To…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1732
+#: ../modules/mail/e-mail-shell-view-actions.c:1747
 msgid "Copy the selected folder into another folder"
 msgstr "Copy the selected folder into another folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1739
+#: ../modules/mail/e-mail-shell-view-actions.c:1754
 msgid "Permanently remove this folder"
 msgstr "Permanently remove this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1744
+#: ../modules/mail/e-mail-shell-view-actions.c:1759
 msgid "E_xpunge"
 msgstr "E_xpunge"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1746
+#: ../modules/mail/e-mail-shell-view-actions.c:1761
 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:1751
-#: ../modules/mail/e-mail-shell-view-actions.c:1859
+#: ../modules/mail/e-mail-shell-view-actions.c:1766
+#: ../modules/mail/e-mail-shell-view-actions.c:1874
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_k All Messages as Read"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1753
-#: ../modules/mail/e-mail-shell-view-actions.c:1861
+#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1876
 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:1758
+#: ../modules/mail/e-mail-shell-view-actions.c:1773
 msgid "_Move Folder To..."
 msgstr "_Move Folder To…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1760
+#: ../modules/mail/e-mail-shell-view-actions.c:1775
 msgid "Move the selected folder into another folder"
 msgstr "Move the selected folder into another folder"
 
 #. Translators: An action caption to create a new mail folder
-#: ../modules/mail/e-mail-shell-view-actions.c:1766
+#: ../modules/mail/e-mail-shell-view-actions.c:1781
 msgid "_New..."
 msgstr "_New…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1783
 msgid "Create a new folder for storing mail"
 msgstr "Create a new folder for storing mail"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
+#: ../modules/mail/e-mail-shell-view-actions.c:1790
 msgid "Change the properties of this folder"
 msgstr "Change the properties of this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1782
+#: ../modules/mail/e-mail-shell-view-actions.c:1797
 msgid "Refresh the folder"
 msgstr "Refresh the folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1789
+#: ../modules/mail/e-mail-shell-view-actions.c:1804
 msgid "Change the name of this folder"
 msgstr "Change the name of this folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1794
+#: ../modules/mail/e-mail-shell-view-actions.c:1809
 msgid "Select Message _Thread"
 msgstr "Select Message _Thread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1796
+#: ../modules/mail/e-mail-shell-view-actions.c:1811
 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:1801
+#: ../modules/mail/e-mail-shell-view-actions.c:1816
 msgid "Select Message S_ubthread"
 msgstr "Select Message S_ubthread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1803
+#: ../modules/mail/e-mail-shell-view-actions.c:1818
 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:1815
+#: ../modules/mail/e-mail-shell-view-actions.c:1830
 msgid "Empty _Trash"
 msgstr "Empty Was_tebasket"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1817
+#: ../modules/mail/e-mail-shell-view-actions.c:1832
 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:1822
-#| msgid "Copy to Folder"
+#: ../modules/mail/e-mail-shell-view-actions.c:1837
 msgid "Go to _Folder"
 msgstr "Go to _Folder"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1824
-#| msgid "Click here to select folders to post to"
+#: ../modules/mail/e-mail-shell-view-actions.c:1839
 msgid "Opens a dialog to select a folder to go to"
 msgstr "Opens a dialog to select a folder to go to"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1829
+#: ../modules/mail/e-mail-shell-view-actions.c:1844
 msgid "_New Label"
 msgstr "_New Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1838
+#: ../modules/mail/e-mail-shell-view-actions.c:1853
 msgid "N_one"
 msgstr "N_one"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1852
+#: ../modules/mail/e-mail-shell-view-actions.c:1867
 msgid "_Manage Subscriptions"
 msgstr "_Manage Subscriptions"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1854
-#: ../modules/mail/e-mail-shell-view-actions.c:1938
+#: ../modules/mail/e-mail-shell-view-actions.c:1869
+#: ../modules/mail/e-mail-shell-view-actions.c:1953
 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:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1887
+#: ../modules/mail/e-mail-shell-view-actions.c:1881
+#: ../modules/mail/e-mail-shell-view-actions.c:1902
 msgid "Send / _Receive"
 msgstr "Send / _Receive"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1868
+#: ../modules/mail/e-mail-shell-view-actions.c:1883
 msgid "Send queued items and retrieve new items"
 msgstr "Send queued items and retrieve new items"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1873
+#: ../modules/mail/e-mail-shell-view-actions.c:1888
 msgid "R_eceive All"
 msgstr "R_eceive All"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1875
+#: ../modules/mail/e-mail-shell-view-actions.c:1890
 msgid "Receive new items from all accounts"
 msgstr "Receive new items from all accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1880
+#: ../modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_Send All"
 msgstr "_Send All"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1882
+#: ../modules/mail/e-mail-shell-view-actions.c:1897
 msgid "Send queued items in all accounts"
 msgstr "Send queued items in all accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1910
+#: ../modules/mail/e-mail-shell-view-actions.c:1925
 msgid "Cancel the current mail operation"
 msgstr "Cancel the current mail operation"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1915
+#: ../modules/mail/e-mail-shell-view-actions.c:1930
 msgid "Collapse All _Threads"
 msgstr "Collapse All _Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1917
+#: ../modules/mail/e-mail-shell-view-actions.c:1932
 msgid "Collapse all message threads"
 msgstr "Collapse all message threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1922
+#: ../modules/mail/e-mail-shell-view-actions.c:1937
 msgid "E_xpand All Threads"
 msgstr "E_xpand All Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1924
+#: ../modules/mail/e-mail-shell-view-actions.c:1939
 msgid "Expand all message threads"
 msgstr "Expand all message threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1929
+#: ../modules/mail/e-mail-shell-view-actions.c:1944
 msgid "_Message Filters"
 msgstr "_Message Filters"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1931
+#: ../modules/mail/e-mail-shell-view-actions.c:1946
 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:1936
+#: ../modules/mail/e-mail-shell-view-actions.c:1951
 msgid "_Subscriptions..."
 msgstr "_Subscriptions…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1945
+#: ../modules/mail/e-mail-shell-view-actions.c:1960
 msgid "F_older"
 msgstr "F_older"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1952
+#: ../modules/mail/e-mail-shell-view-actions.c:1967
 msgid "_Label"
 msgstr "_Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1969
+#: ../modules/mail/e-mail-shell-view-actions.c:1984
 msgid "C_reate Search Folder From Search..."
 msgstr "C_reate Search Folder From Search…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1976
+#: ../modules/mail/e-mail-shell-view-actions.c:1991
 msgid "Search F_olders"
 msgstr "Search F_olders"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1978
+#: ../modules/mail/e-mail-shell-view-actions.c:1993
 msgid "Create or edit search folder definitions"
 msgstr "Create or edit search folder definitions"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2017
+#: ../modules/mail/e-mail-shell-view-actions.c:2032
 msgid "_New Folder..."
 msgstr "_New Folder…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2045
+#: ../modules/mail/e-mail-shell-view-actions.c:2060
 msgid "Show Message _Preview"
 msgstr "Show Message _Preview"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2047
+#: ../modules/mail/e-mail-shell-view-actions.c:2062
 msgid "Show message preview pane"
 msgstr "Show message preview pane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2053
+#: ../modules/mail/e-mail-shell-view-actions.c:2068
 msgid "Show _Attachment Bar"
 msgstr "Show _Attachment Bar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2055
-#| msgid "Show message preview below the message list"
+#: ../modules/mail/e-mail-shell-view-actions.c:2070
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments"
@@ -22910,103 +22101,99 @@ msgstr ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2061
+#: ../modules/mail/e-mail-shell-view-actions.c:2076
 msgid "Show _Deleted Messages"
 msgstr "Show _Deleted Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2063
+#: ../modules/mail/e-mail-shell-view-actions.c:2078
 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:2069
-#| msgid "Show Hidde_n Messages"
+#: ../modules/mail/e-mail-shell-view-actions.c:2084
 msgid "Show _Junk Messages"
 msgstr "Show _Junk Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2071
-#| msgid "Show deleted messages with a line through them"
+#: ../modules/mail/e-mail-shell-view-actions.c:2086
 msgid "Show junk messages with a red line through them"
 msgstr "Show junk messages with a red line through them"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2077
+#: ../modules/mail/e-mail-shell-view-actions.c:2092
 msgid "_Group By Threads"
 msgstr "_Group By Threads"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2079
+#: ../modules/mail/e-mail-shell-view-actions.c:2094
 msgid "Threaded message list"
 msgstr "Threaded message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2085
+#: ../modules/mail/e-mail-shell-view-actions.c:2100
 msgid "_Unmatched Folder Enabled"
 msgstr "_Unmatched Folder Enabled"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2087
+#: ../modules/mail/e-mail-shell-view-actions.c:2102
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Toggles whether Unmatched search folder is enabled"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2107
+#: ../modules/mail/e-mail-shell-view-actions.c:2122
 msgid "Show message preview below the message list"
 msgstr "Show message preview below the message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2114
+#: ../modules/mail/e-mail-shell-view-actions.c:2129
 msgid "Show message preview alongside the message list"
 msgstr "Show message preview alongside the message list"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2122
+#: ../modules/mail/e-mail-shell-view-actions.c:2137
 msgid "All Messages"
 msgstr "All Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2129
+#: ../modules/mail/e-mail-shell-view-actions.c:2144
 msgid "Important Messages"
 msgstr "Important Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2136
+#: ../modules/mail/e-mail-shell-view-actions.c:2151
 msgid "Last 5 Days' Messages"
 msgstr "Last 5 Days' Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2143
+#: ../modules/mail/e-mail-shell-view-actions.c:2158
 msgid "Messages Not Junk"
 msgstr "Messages Not Junk"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2150
+#: ../modules/mail/e-mail-shell-view-actions.c:2165
 msgid "Messages with Attachments"
 msgstr "Messages with Attachments"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2157
-#| msgid "Messages with Attachments"
+#: ../modules/mail/e-mail-shell-view-actions.c:2172
 msgid "Messages with Notes"
 msgstr "Messages with Notes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2164
+#: ../modules/mail/e-mail-shell-view-actions.c:2179
 msgid "No Label"
 msgstr "No Label"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2171
+#: ../modules/mail/e-mail-shell-view-actions.c:2186
 msgid "Read Messages"
 msgstr "Read Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2178
+#: ../modules/mail/e-mail-shell-view-actions.c:2193
 msgid "Unread Messages"
 msgstr "Unread Messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2185
-#| msgid "Message Header"
+#: ../modules/mail/e-mail-shell-view-actions.c:2200
 msgid "Message Thread"
 msgstr "Message Thread"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2245
+#: ../modules/mail/e-mail-shell-view-actions.c:2260
 msgid "Subject or Addresses contain"
 msgstr "Subject or Addresses contain"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2255
+#: ../modules/mail/e-mail-shell-view-actions.c:2270
 msgid "All Accounts"
 msgstr "All Accounts"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2262
+#: ../modules/mail/e-mail-shell-view-actions.c:2277
 msgid "Current Account"
 msgstr "Current Account"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2269
+#: ../modules/mail/e-mail-shell-view-actions.c:2284
 msgid "Current Folder"
 msgstr "Current Folder"
 
@@ -23018,65 +22205,62 @@ msgstr "All Account Search"
 msgid "Account Search"
 msgstr "Account Search"
 
-#: ../modules/mail/e-mail-shell-view-private.c:953
+#: ../modules/mail/e-mail-shell-view-private.c:958
 #, 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:962
-#: ../modules/mail/e-mail-shell-view-private.c:979
+#: ../modules/mail/e-mail-shell-view-private.c:967
+#: ../modules/mail/e-mail-shell-view-private.c:984
 #, 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:988
-#: ../modules/mail/e-mail-shell-view-private.c:994
+#: ../modules/mail/e-mail-shell-view-private.c:993
+#: ../modules/mail/e-mail-shell-view-private.c:999
 #, 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:1001
+#: ../modules/mail/e-mail-shell-view-private.c:1006
 #, 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:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1012
 #, 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:1013
+#: ../modules/mail/e-mail-shell-view-private.c:1018
 #, 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:1030
+#: ../modules/mail/e-mail-shell-view-private.c:1035
 #, c-format
-#| msgid "%d unread, "
-#| msgid_plural "%d unread, "
 msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d unread"
 msgstr[1] "%d unread"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1548
+#: ../modules/mail/e-mail-shell-view-private.c:1553
 msgid "Send / Receive"
 msgstr "Send / Receive"
 
 #: ../modules/mail/em-composer-prefs.c:413
-#| msgid "Select Folder"
 msgid "Select Folder to Add"
 msgstr "Select Folder to Add"
 
@@ -23085,22 +22269,18 @@ msgid "Folder"
 msgstr "Folder"
 
 #: ../modules/mail/em-composer-prefs.c:919
-#| msgid "Recipients"
 msgid "Recipient"
 msgstr "Recipient"
 
 #: ../modules/mail/em-composer-prefs.c:1204
-#| msgid "_Save to Outbox"
 msgid "Keep in Outbox"
 msgstr "Keep in Outbox"
 
 #: ../modules/mail/em-composer-prefs.c:1205
-#| msgid "Send private reply?"
 msgid "Send immediately"
 msgstr "Send immediately"
 
 #: ../modules/mail/em-composer-prefs.c:1206
-#| msgid "15 minutes"
 msgid "Send after 5 minutes"
 msgstr "Send after 5 minutes"
 
@@ -23113,17 +22293,14 @@ msgid "On exit, every time"
 msgstr "On exit, every time"
 
 #: ../modules/mail/em-mailer-prefs.c:80
-#| msgid "On exit, once per day"
 msgid "Once per day"
 msgstr "Once per day"
 
 #: ../modules/mail/em-mailer-prefs.c:81
-#| msgid "On exit, once per week"
 msgid "Once per week"
 msgstr "Once per week"
 
 #: ../modules/mail/em-mailer-prefs.c:82
-#| msgid "On exit, once per month"
 msgid "Once per month"
 msgstr "Once per month"
 
@@ -23274,15 +22451,11 @@ msgstr ""
 
 #: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
 #: ../modules/prefer-plain/plugin/config-ui.c:46
-#| msgid "Show plain text if present"
 msgid "Show plain text if present, or HTML source"
 msgstr "Show plain text if present, or HTML source"
 
 #: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:89
 #: ../modules/prefer-plain/plugin/config-ui.c:47
-#| msgid ""
-#| "Show plain text part, if present, otherwise let Evolution choose the best "
-#| "part to show."
 msgid "Show plain text part, if present, otherwise the HTML part source."
 msgstr "Show plain text part, if present, otherwise the HTML part source."
 
@@ -23361,7 +22534,6 @@ msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
 #: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
-#| msgid "Junk filtering software:"
 msgid "Junk filter using SpamAssassin"
 msgstr "Junk filter using SpamAssassin"
 
@@ -23844,7 +23016,6 @@ msgstr ""
 "For Vim use \"gvim -f\""
 
 #: ../plugins/external-editor/external-editor.c:124
-#| msgid "Automatically launch when a new mail is edited"
 msgid "_Automatically launch when a new mail is edited"
 msgstr "_Automatically launch when a new mail is edited"
 
@@ -23914,7 +23085,6 @@ msgid "Load new _Face picture"
 msgstr "Load new _Face picture"
 
 #: ../plugins/face/face.c:449
-#| msgid "Choose Image"
 msgid "Change Face Image"
 msgstr "Change Face Image"
 
@@ -23965,8 +23135,6 @@ msgid "Not an image"
 msgstr "Not an image"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:8
-#| msgid ""
-#| "The file you selected does not look like a valid .png image. Error: {0}"
 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}"
 
@@ -23979,12 +23147,10 @@ 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:422
-#| msgid "_Message Source"
 msgid "Copy _Message Archive URL"
 msgstr "Copy _Message Archive URL"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:424
-#| msgid "Redirect (bounce) the selected message to someone"
 msgid "Copy direct URL for the selected message in its archive"
 msgstr "Copy direct URL for the selected message in its archive"
 
@@ -24197,21 +23363,18 @@ msgstr "Created from a mail by %s"
 
 #. Translators: Dialog button to Cancel edit of an existing event/memo/task
 #: ../plugins/mail-to-task/mail-to-task.c:561
-#| msgid "Cancel"
 msgctxt "mail-to-task"
 msgid "_Cancel"
 msgstr "_Cancel"
 
 #. Translators: Dialog button to Edit an existing event/memo/task
 #: ../plugins/mail-to-task/mail-to-task.c:563
-#| msgid "_Edit"
 msgctxt "mail-to-task"
 msgid "_Edit"
 msgstr "_Edit"
 
 #. Translators: Dialog button to create a New event/memo/task
 #: ../plugins/mail-to-task/mail-to-task.c:565
-#| msgid "_New"
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "_New"
@@ -24674,7 +23837,6 @@ msgid "Select destination file"
 msgstr "Select destination file"
 
 #: ../plugins/save-calendar/save-calendar.c:188
-#| msgid "_Save As..."
 msgid "_Save As"
 msgstr "_Save As"
 
@@ -24705,7 +23867,6 @@ msgstr ""
 "an e-mail you are replying to."
 
 #: ../plugins/templates/templates.c:1286
-#| msgid "Saving message to Outbox."
 msgid "Saving message template"
 msgstr "Saving message template"
 
@@ -24742,7 +23903,6 @@ msgid "New _Window"
 msgstr "New _Window"
 
 #: ../shell/e-shell.c:1223
-#| msgid "_Quick Reference"
 msgid "Quick _Reference"
 msgstr "Quick _Reference"
 
@@ -24751,7 +23911,6 @@ msgid "_About"
 msgstr "_About"
 
 #: ../shell/e-shell.c:1226 ../shell/e-shell-window-actions.c:862
-#| msgid "Quit"
 msgid "_Quit"
 msgstr "_Quit"
 
@@ -25021,7 +24180,6 @@ msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Display window buttons using the desktop toolbar setting"
 
 #: ../shell/e-shell-window-actions.c:1106
-#| msgid "Save Current View"
 msgid "Delete Current View"
 msgstr "Delete Current View"
 
@@ -25065,7 +24223,6 @@ msgstr "Select view: %s"
 
 #: ../shell/e-shell-window-actions.c:1647
 #, c-format
-#| msgid "Select view: %s"
 msgid "Delete view: %s"
 msgstr "Delete view: %s"
 
@@ -25076,7 +24233,6 @@ msgstr "Execute these search parameters"
 #. Translators: a 'New' toolbar button caption which is context sensitive and
 #. runs one of the actions under File->New menu
 #: ../shell/e-shell-window.c:567
-#| msgid "New"
 msgctxt "toolbar-button"
 msgid "New"
 msgstr "New"
@@ -25249,7 +24405,6 @@ msgstr ""
 "upgrading to Evolution 3."
 
 #: ../shell/shell.error.xml.h:11
-#| msgid "Unknown background operation"
 msgid "Close Evolution with pending background operations?"
 msgstr "Close Evolution with pending background operations?"
 
@@ -25264,57 +24419,46 @@ msgstr ""
 "close immediately, or keep waiting?"
 
 #: ../shell/shell.error.xml.h:13
-#| msgid "Choose Image"
 msgid "_Close Immediately"
 msgstr "_Close Immediately"
 
 #: ../shell/shell.error.xml.h:14
-#| msgid "Waiting..."
 msgid "Keep _Waiting"
 msgstr "Keep _Waiting"
 
 #: ../shell/shell.error.xml.h:15
-#| msgid "Failed to get server URL."
 msgid "Failed to get values from '{0}'"
 msgstr "Failed to get values from '{0}'"
 
 #: ../shell/shell.error.xml.h:16
-#| msgid "Failed to authenticate.\n"
 msgid "Failed to invoke authenticate for '{0}'"
 msgstr "Failed to invoke authenticate for '{0}'"
 
 #: ../shell/shell.error.xml.h:17
-#| msgid "Failed to open client '%s': %s"
 msgid "Failed to connect '{0}'"
 msgstr "Failed to connect '{0}'"
 
 #: ../shell/shell.error.xml.h:18
-#| msgid "_Recover"
 msgid "_Reconnect"
 msgstr "_Reconnect"
 
 #: ../shell/shell.error.xml.h:19
-#| msgid "Delete address book '{0}'?"
 msgid "Failed to connect address book '{0}'"
 msgstr "Failed to connect address book '{0}'"
 
 #: ../shell/shell.error.xml.h:20
-#| msgid "Delete calendar '{0}'?"
 msgid "Failed to connect calendar '{0}'"
 msgstr "Failed to connect calendar '{0}'"
 
 #: ../shell/shell.error.xml.h:21
-#| msgid "Failed to disconnect account &quot;{0}&quot;."
 msgid "Failed to connect mail account '{0}'"
 msgstr "Failed to connect mail account '{0}'"
 
 #: ../shell/shell.error.xml.h:22
-#| msgid "Delete memo list '{0}'?"
 msgid "Failed to connect memo list '{0}'"
 msgstr "Failed to connect memo list '{0}'"
 
 #: ../shell/shell.error.xml.h:23
-#| msgid "Delete task list '{0}'?"
 msgid "Failed to connect task list '{0}'"
 msgstr "Failed to connect task list '{0}'"
 
@@ -25443,19 +24587,16 @@ msgid "%s-backup.p12"
 msgstr "%s-backup.p12"
 
 #: ../smime/gui/certificate-manager.c:743
-#| msgid "Certificate"
 msgid "Backup Certificate"
 msgstr "Backup Certificate"
 
 #. filename selection
 #: ../smime/gui/certificate-manager.c:757
-#| msgid "_Filename:"
 msgid "_File name:"
 msgstr "_File name:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
 #: ../smime/gui/certificate-manager.c:762
-#| msgid "Please select a folder"
 msgid "Please select a file..."
 msgstr "Please select a file..."
 
@@ -25475,7 +24616,6 @@ msgstr ""
 "You must set this password to proceed with the backup."
 
 #: ../smime/gui/certificate-manager.c:801
-#| msgid "_Password:"
 msgid "_Repeat Password:"
 msgstr "_Repeat Password:"
 
@@ -25497,12 +24637,10 @@ msgstr ""
 "Please record it in a safe location."
 
 #: ../smime/gui/certificate-manager.c:873
-#| msgid "No email address provided"
 msgid "No file name provided"
 msgstr "No file name provided"
 
 #: ../smime/gui/certificate-manager.c:877
-#| msgid "Failed to import certificate"
 msgid "Failed to backup key and certificate"
 msgstr "Failed to backup key and certificate"
 
@@ -25520,13 +24658,11 @@ msgid "Ask when used"
 msgstr "Ask when used"
 
 #: ../smime/gui/certificate-manager.c:1134
-#| msgid "Never"
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Never"
 
 #: ../smime/gui/certificate-manager.c:1136
-#| msgid "Margins"
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr "Marginally"
@@ -25547,13 +24683,11 @@ msgid "Temporarily"
 msgstr "Temporarily"
 
 #: ../smime/gui/certificate-manager.c:1348
-#| msgid "Certificate Authority Trust"
 msgid "Change certificate trust"
 msgstr "Change certificate trust"
 
 #: ../smime/gui/certificate-manager.c:1360
 #, c-format
-#| msgid "Cannot get transport for account '%s'"
 msgid "Change trust for the host '%s':"
 msgstr "Change trust for the host '%s':"
 
@@ -25563,7 +24697,6 @@ msgid "_Ask when used"
 msgstr "_Ask when used"
 
 #: ../smime/gui/certificate-manager.c:1385
-#| msgid "Unset _trust for SSL certificate"
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "_Never trust this certificate"
@@ -25579,21 +24712,16 @@ msgid "_Marginally trusted"
 msgstr "_Marginally trusted"
 
 #: ../smime/gui/certificate-manager.c:1388
-#| msgid "R_eply requested"
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "_Fully trusted"
 
 #: ../smime/gui/certificate-manager.c:1389
-#| msgid "R_eply requested"
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "_Ultimately trusted"
 
 #: ../smime/gui/certificate-manager.c:1393
-#| msgid ""
-#| "Before trusting this CA for any purpose, you should examine its "
-#| "certificate and its policy and procedures (if available)."
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
@@ -25602,17 +24730,14 @@ msgstr ""
 "and procedures (if available)."
 
 #: ../smime/gui/certificate-manager.c:1408
-#| msgid "_View Certificate"
 msgid "_Display certificate"
 msgstr "_Display certificate"
 
 #: ../smime/gui/certificate-manager.c:1613
-#| msgid "You have certificates on file that identify these people:"
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "You have certificates on file that identify these mail servers:"
 
 #: ../smime/gui/certificate-manager.c:1644
-#| msgid "_List name:"
 msgid "Host name"
 msgstr "Host name"
 
@@ -25621,7 +24746,6 @@ msgid "Issuer"
 msgstr "Issuer"
 
 #: ../smime/gui/certificate-manager.c:1647
-#| msgid "Fingerprints"
 msgid "Fingerprint"
 msgstr "Fingerprint"
 
@@ -25630,7 +24754,6 @@ msgid "Trust"
 msgstr "Trust"
 
 #: ../smime/gui/certificate-manager.c:1669
-#| msgid "_Edit CA Trust"
 msgid "_Edit Trust"
 msgstr "_Edit Trust"
 
@@ -25668,7 +24791,6 @@ msgstr ""
 
 #: ../smime/gui/component.c:55
 #, c-format
-#| msgid "Enter the password for '%s'"
 msgid "Enter the password for '%s', token '%s'"
 msgstr "Enter the password for '%s', token '%s'"
 
@@ -25754,7 +24876,6 @@ msgstr ""
 "and its policy and procedures (if available)."
 
 #: ../smime/gui/smime-ui.ui.h:25
-#| msgid "Certificate"
 msgid "C_ertificate:"
 msgstr "C_ertificate:"
 
@@ -25801,7 +24922,6 @@ msgstr "Enter password for PKCS12 file:"
 
 #: ../smime/lib/e-pkcs12.c:328
 #, c-format
-#| msgid "Unable to create new folder `%s': %s"
 msgid "Unable to create export context, err_code: %i"
 msgstr "Unable to create export context, err_code: %i"
 
@@ -25812,19 +24932,16 @@ msgstr "Unable to set up password integrity, err_code: %i"
 
 #: ../smime/lib/e-pkcs12.c:345
 #, c-format
-#| msgid "Unable to create new folder `%s': %s"
 msgid "Unable to create safe bag, err_code: %i"
 msgstr "Unable to create safe bag, err_code: %i"
 
 #: ../smime/lib/e-pkcs12.c:363
 #, c-format
-#| msgid "Unable to book a resource, error: %s"
 msgid "Unable to add key/cert to the store, err_code: %i"
 msgstr "Unable to add key/cert to the store, err_code: %i"
 
 #: ../smime/lib/e-pkcs12.c:381
 #, c-format
-#| msgid "Unable to book a resource, error: %s"
 msgid "Unable to write store to disk, err_code: %i"
 msgstr "Unable to write store to disk, err_code: %i"
 



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